From a61ae9894f0af4a35a3ffcfaf2c18f1d06775a67 Mon Sep 17 00:00:00 2001 From: NotAlexNoyle Date: Mon, 10 Aug 2026 11:10:11 -0400 Subject: [PATCH] v2.4 Release --- CHANGELOG.md | 139 +-- README.md | 91 +- build.gradle.kts | 2 +- placeholder-info.txt | 5 - .../java/net/trueog/unionsog/ChatBlock.java | 8 +- .../java/net/trueog/unionsog/ClanRequest.java | 10 - src/main/java/net/trueog/unionsog/Helper.java | 97 +-- src/main/java/net/trueog/unionsog/Kill.java | 10 +- .../net/trueog/unionsog/PermissionLevel.java | 5 - .../java/net/trueog/unionsog/Proposal.java | 179 ++++ .../net/trueog/unionsog/ProposalType.java | 45 + src/main/java/net/trueog/unionsog/Rank.java | 142 ---- .../net/trueog/unionsog/RankPermission.java | 99 --- .../java/net/trueog/unionsog/Request.java | 48 +- .../net/trueog/unionsog/TeleportState.java | 10 +- .../trueog/unionsog/{Clan.java => Union.java} | 792 ++++++------------ .../{ClanPlayer.java => UnionPlayer.java} | 239 ++---- .../net/trueog/unionsog/UnionRequest.java | 15 + .../java/net/trueog/unionsog/UnionsOG.java | 66 +- src/main/java/net/trueog/unionsog/War.java | 26 +- .../net/trueog/unionsog/chat/SCMessage.java | 30 +- .../chat/handlers/DiscordChatHandler.java | 12 +- .../chat/handlers/SpigotChatHandler.java | 6 +- .../chat/handlers/SpyChatHandler.java | 12 +- .../unionsog/commands/ClanPlayerInput.java | 43 - .../unionsog/commands/GroupAliasCommand.java | 58 ++ .../unionsog/commands/SCCommandManager.java | 39 +- .../{ClanInput.java => UnionInput.java} | 20 +- .../unionsog/commands/UnionPlayerInput.java | 43 + .../commands/clan/AllyChatCommand.java | 87 -- .../unionsog/commands/clan/ChatCommand.java | 110 --- .../unionsog/commands/clan/ClanCommands.java | 543 ------------ .../commands/clan/LeaderCommands.java | 228 ----- .../unionsog/commands/clan/RankCommand.java | 259 ------ .../completions/AbstractCompletion.java | 6 +- ...pletion.java => AllMembersCompletion.java} | 10 +- .../completions/AllNonLeadersCompletion.java | 36 - ...etion.java => AlliedUnionsCompletion.java} | 14 +- .../completions/ClanLeadersCompletion.java | 49 -- .../completions/ClanNonLeadersCompletion.java | 50 -- .../completions/ListTypeCompletion.java | 2 +- .../completions/NonMembersCompletion.java | 2 +- .../RankPermissionsCompletion.java | 33 - .../commands/completions/RanksCompletion.java | 49 -- .../completions/RivalsCompletion.java | 8 +- ...letion.java => UnionColorsCompletion.java} | 6 +- ...etion.java => UnionMembersCompletion.java} | 16 +- ...sCompletion.java => UnionsCompletion.java} | 24 +- ...tion.java => WarringUnionsCompletion.java} | 14 +- .../conditions/AbstractCondition.java | 4 +- ...ndition.java => AlliedUnionCondition.java} | 22 +- .../commands/conditions/CanVoteCondition.java | 18 +- .../conditions/CanWarTargetCondition.java | 29 +- .../commands/conditions/Conditions.java | 14 +- ...tion.java => DifferentUnionCondition.java} | 22 +- .../conditions/InputClanMemberCondition.java | 46 - .../conditions/InputUnionMemberCondition.java | 46 + .../commands/conditions/LeaderCondition.java | 44 - .../conditions/MinimumToAllyCondition.java | 10 +- .../conditions/MinimumToRivalCondition.java | 10 +- .../conditions/NotBannedInputCondition.java | 14 +- .../conditions/NotInClanCondition.java | 52 -- .../conditions/NotInUnionCondition.java | 52 ++ .../commands/conditions/OnlineCondition.java | 18 +- ...n.java => PlayerUnionMemberCondition.java} | 8 +- .../conditions/RankPermissionCondition.java | 49 -- .../commands/conditions/RivableCondition.java | 8 +- .../conditions/SameClanCondition.java | 49 -- .../conditions/SameUnionCondition.java | 51 ++ ...n.java => SenderUnionMemberCondition.java} | 8 +- .../conditions/TeleportCondition.java | 10 +- .../conditions/TeleportInputCondition.java | 12 +- ...ndition.java => UnionMemberCondition.java} | 16 +- .../contexts/AbstractContextResolver.java | 6 +- .../contexts/ClanContextResolver.java | 32 - .../contexts/ClanInputContextResolver.java | 44 - .../contexts/ClanPlayerContextResolver.java | 34 - .../unionsog/commands/contexts/Contexts.java | 14 +- .../contexts/RankContextResolver.java | 45 - .../contexts/UnionContextResolver.java | 32 + .../contexts/UnionInputContextResolver.java | 44 + .../contexts/UnionPlayerContextResolver.java | 34 + ...a => UnionPlayerInputContextResolver.java} | 20 +- .../unionsog/commands/data/Alliances.java | 12 +- .../unionsog/commands/data/ClanProfile.java | 57 -- .../unionsog/commands/data/ClanRoster.java | 88 -- .../trueog/unionsog/commands/data/Kills.java | 4 +- .../unionsog/commands/data/Leaderboard.java | 28 +- .../trueog/unionsog/commands/data/Lookup.java | 57 +- .../unionsog/commands/data/Rivalries.java | 12 +- .../unionsog/commands/data/Sendable.java | 6 +- .../{ClanCoords.java => UnionCoords.java} | 17 +- .../data/{ClanList.java => UnionList.java} | 66 +- .../unionsog/commands/data/UnionProfile.java | 55 ++ .../unionsog/commands/data/UnionRoster.java | 69 ++ .../data/{ClanStats.java => UnionStats.java} | 28 +- .../trueog/unionsog/commands/data/Vitals.java | 25 +- .../commands/general/GeneralCommands.java | 120 +-- .../unionsog/commands/staff/BankCommand.java | 64 +- .../unionsog/commands/staff/BbCommand.java | 34 +- .../commands/staff/StaffCommands.java | 229 ++--- .../commands/union/AllyChatCommand.java | 87 ++ .../commands/{clan => union}/BankCommand.java | 74 +- .../commands/{clan => union}/BbCommand.java | 32 +- .../unionsog/commands/union/ChatCommand.java | 110 +++ .../{clan => union}/DataCommands.java | 34 +- .../{clan => union}/HomeCommands.java | 73 +- .../commands/{clan => union}/LandCommand.java | 46 +- .../{clan => union}/ToggleCommand.java | 34 +- .../commands/union/UnionCommands.java | 638 ++++++++++++++ .../conversation/ConfirmationPrompt.java | 20 +- .../conversation/CreateRankNamePrompt.java | 64 -- ...Prompt.java => CreateUnionNamePrompt.java} | 56 +- ...gPrompt.java => CreateUnionTagPrompt.java} | 16 +- .../unionsog/conversation/DisbandPrompt.java | 15 +- .../unionsog/conversation/ResetKdrPrompt.java | 12 +- .../unionsog/conversation/ResignPrompt.java | 27 +- .../trueog/unionsog/events/AddKillEvent.java | 12 +- .../unionsog/events/AllyClanAddEvent.java | 49 -- .../unionsog/events/AllyClanRemoveEvent.java | 49 -- .../unionsog/events/AllyUnionAddEvent.java | 49 ++ .../unionsog/events/AllyUnionRemoveEvent.java | 49 ++ .../unionsog/events/BankDepositEvent.java | 16 +- .../unionsog/events/BankWithdrawEvent.java | 16 +- .../net/trueog/unionsog/events/ChatEvent.java | 21 +- .../unionsog/events/CreateRankEvent.java | 54 -- ...teClanEvent.java => CreateUnionEvent.java} | 14 +- .../unionsog/events/DeleteRankEvent.java | 68 -- ...dClanEvent.java => DisbandUnionEvent.java} | 14 +- .../events/EconomyTransactionEvent.java | 2 +- .../unionsog/events/HomeRegroupEvent.java | 22 +- .../unionsog/events/PlayerHomeClearEvent.java | 18 +- .../unionsog/events/PlayerHomeSetEvent.java | 18 +- ...Event.java => PlayerJoinedUnionEvent.java} | 20 +- .../events/PlayerKickedClanEvent.java | 50 -- ...Event.java => PlayerKickedUnionEvent.java} | 20 +- .../events/PlayerRankUpdateEvent.java | 100 --- .../unionsog/events/PlayerResetKdrEvent.java | 14 +- .../unionsog/events/PreCreateRankEvent.java | 75 -- ...lanEvent.java => PreCreateUnionEvent.java} | 4 +- .../unionsog/events/RivalClanAddEvent.java | 49 -- ...moteEvent.java => RivalUnionAddEvent.java} | 23 +- ...eEvent.java => RivalUnionRemoveEvent.java} | 22 +- .../unionsog/events/TagChangeEvent.java | 12 +- ...vent.java => UnionBalanceUpdateEvent.java} | 28 +- ...ent.java => UnionPlayerTeleportEvent.java} | 10 +- .../unionsog/hooks/discord/DiscordHook.java | 318 +++---- .../hooks/papi/PlaceholderResolver.java | 8 +- .../hooks/papi/UnionsOGMiniPlaceholders.java | 20 +- .../hooks/papi/UnionsOGPlaceholderEngine.java | 77 +- .../papi/resolvers/ListSizeResolver.java | 4 +- .../papi/resolvers/MemberStatusResolver.java | 10 +- .../papi/resolvers/PlayerColorResolver.java | 30 +- .../resolvers/RankingPositionResolver.java | 20 +- .../providers/GriefPreventionProvider.java | 8 +- .../unionsog/listeners/FriendlyFire.java | 26 +- .../unionsog/listeners/LandProtection.java | 29 +- .../unionsog/listeners/PlayerDeath.java | 44 +- .../unionsog/listeners/PvPOnlyInWar.java | 20 +- .../unionsog/listeners/SCPlayerListener.java | 75 +- .../listeners/TamableMobsSharing.java | 30 +- .../net/trueog/unionsog/loggers/BankLog.java | 24 +- .../trueog/unionsog/loggers/BankOperator.java | 4 +- .../unionsog/loggers/CSVBankLogger.java | 2 +- .../trueog/unionsog/managers/ChatManager.java | 50 +- .../unionsog/managers/PermissionsManager.java | 279 ++---- .../unionsog/managers/ProposalManager.java | 374 +++++++++ .../unionsog/managers/ProtectionManager.java | 68 +- .../unionsog/managers/RequestManager.java | 397 ++------- .../unionsog/managers/SettingsManager.java | 138 ++- .../unionsog/managers/StorageManager.java | 618 +++++++++----- .../unionsog/managers/TeleportManager.java | 52 +- .../{ClanManager.java => UnionManager.java} | 361 ++++---- .../migrations/ChatFormatMigration.java | 34 +- .../migrations/UnionBankZeroMigration.java | 14 +- .../legacy/LegacyUnionsDatabaseMigration.java | 65 +- .../LegacyUnionsDatabaseMigrationRunner.java | 26 +- .../trueog/unionsog/proxy/BungeeManager.java | 36 +- .../trueog/unionsog/proxy/ProxyManager.java | 12 +- .../proxy/adapters/SCMessageAdapter.java | 6 +- ...apter.java => UnionPlayerListAdapter.java} | 20 +- ...ava => UnionPlayerTypeAdapterFactory.java} | 30 +- .../trueog/unionsog/proxy/listeners/Chat.java | 2 +- .../{DeleteClan.java => DeleteUnion.java} | 14 +- ...ClanPlayer.java => DeleteUnionPlayer.java} | 6 +- .../proxy/listeners/MessageListener.java | 6 +- .../unionsog/proxy/listeners/UpdateClan.java | 43 - .../proxy/listeners/UpdateClanPlayer.java | 43 - .../unionsog/proxy/listeners/UpdateUnion.java | 43 + .../proxy/listeners/UpdateUnionPlayer.java | 43 + .../unionsog/tasks/PlayerHeadCacheTask.java | 8 +- .../unionsog/ui/InventoryController.java | 24 +- .../trueog/unionsog/ui/InventoryDrawer.java | 17 +- .../net/trueog/unionsog/ui/SCComponent.java | 21 +- .../unionsog/ui/frames/AddAllyFrame.java | 17 +- .../ui/frames/AddPermissionFrame.java | 109 --- .../unionsog/ui/frames/AddRivalFrame.java | 17 +- .../unionsog/ui/frames/AlliesFrame.java | 21 +- .../trueog/unionsog/ui/frames/Components.java | 100 +-- .../unionsog/ui/frames/CoordsFrame.java | 14 +- .../unionsog/ui/frames/InviteFrame.java | 13 +- .../ui/frames/LanguageSelectorFrame.java | 48 +- .../unionsog/ui/frames/LeaderboardFrame.java | 22 +- .../trueog/unionsog/ui/frames/MainFrame.java | 55 +- .../unionsog/ui/frames/PermissionsFrame.java | 110 --- .../ui/frames/PlayerDetailsFrame.java | 84 +- .../unionsog/ui/frames/ProposalFrame.java | 123 +++ .../trueog/unionsog/ui/frames/RanksFrame.java | 159 ---- .../unionsog/ui/frames/RivalsFrame.java | 21 +- .../unionsog/ui/frames/RosterFrame.java | 20 +- ...tailsFrame.java => UnionDetailsFrame.java} | 188 ++--- ...ClanListFrame.java => UnionListFrame.java} | 34 +- .../unionsog/ui/frames/WarningFrame.java | 33 +- .../ui/frames/staff/PlayerDetailsFrame.java | 25 +- .../ui/frames/staff/PlayerListFrame.java | 2 +- .../unionsog/ui/frames/staff/StaffFrame.java | 18 +- ...tailsFrame.java => UnionDetailsFrame.java} | 46 +- ...ClanListFrame.java => UnionListFrame.java} | 26 +- .../trueog/unionsog/utils/TagValidator.java | 20 +- .../trueog/unionsog/utils/VanishUtils.java | 22 +- .../net/trueog/unionsog/uuid/UUIDFetcher.java | 12 +- .../trueog/unionsog/uuid/UUIDMigration.java | 4 +- src/main/resources/config.yml | 69 +- src/main/resources/messages.properties | 467 ++++++----- src/main/resources/messages_ar_SA.properties | 2 +- src/main/resources/messages_be_BY.properties | 40 +- src/main/resources/messages_cs_CZ.properties | 78 +- src/main/resources/messages_de_DE.properties | 413 +++++---- src/main/resources/messages_es_ES.properties | 413 +++++---- src/main/resources/messages_fi_FI.properties | 413 +++++---- src/main/resources/messages_fr_FR.properties | 413 +++++---- src/main/resources/messages_hu_HU.properties | 413 +++++---- src/main/resources/messages_it_IT.properties | 413 +++++---- src/main/resources/messages_ja_JP.properties | 299 ++++--- src/main/resources/messages_lt_LT.properties | 407 +++++---- src/main/resources/messages_nl_NL.properties | 403 +++++---- src/main/resources/messages_no_NO.properties | 22 +- src/main/resources/messages_pl_PL.properties | 411 +++++---- src/main/resources/messages_pt_BR.properties | 413 +++++---- src/main/resources/messages_pt_PT.properties | 413 +++++---- src/main/resources/messages_ro_RO.properties | 8 +- src/main/resources/messages_ru_RU.properties | 413 +++++---- src/main/resources/messages_sv_SE.properties | 407 +++++---- src/main/resources/messages_th_TH.properties | 14 +- src/main/resources/messages_tr_TR.properties | 409 +++++---- src/main/resources/messages_uk_UA.properties | 413 +++++---- src/main/resources/messages_vi_VN.properties | 58 +- src/main/resources/messages_zh_CN.properties | 413 +++++---- src/main/resources/messages_zh_TW.properties | 413 +++++---- src/main/resources/plugin.yml | 197 ++--- ...cyUnionsDatabaseMigrationDatabaseTest.java | 27 +- wiki/README.md | 17 +- wiki/SUMMARY.md | 15 +- .../aliances-and-rivalries.md | 33 - .../alliances-and-rivalries.md | 47 ++ wiki/commands-and-permissions/commands.md | 224 +++-- wiki/commands-and-permissions/permissions.md | 223 ++--- .../proposals-and-voting.md | 69 ++ .../ranks-with-permissions.md | 83 -- wiki/how-to-setup/clan-upkeep.md | 35 - wiki/how-to-setup/configuration.md | 596 ++++++------- wiki/how-to-setup/member-fee.md | 42 - wiki/how-to-setup/translation.md | 13 +- ...rs-name.md => union-below-players-name.md} | 11 +- ...clan-on-tablist.md => union-on-tablist.md} | 11 +- wiki/other/known-issues.md | 2 +- wiki/other/land-claims.md | 20 +- wiki/other/placeholderapi-support.md | 173 ++-- wiki/other/simpleclans-api.md | 61 -- wiki/other/unions-og-api.md | 89 ++ 270 files changed, 10418 insertions(+), 12543 deletions(-) delete mode 100644 src/main/java/net/trueog/unionsog/ClanRequest.java delete mode 100644 src/main/java/net/trueog/unionsog/PermissionLevel.java create mode 100644 src/main/java/net/trueog/unionsog/Proposal.java create mode 100644 src/main/java/net/trueog/unionsog/ProposalType.java delete mode 100644 src/main/java/net/trueog/unionsog/Rank.java delete mode 100644 src/main/java/net/trueog/unionsog/RankPermission.java rename src/main/java/net/trueog/unionsog/{Clan.java => Union.java} (62%) rename src/main/java/net/trueog/unionsog/{ClanPlayer.java => UnionPlayer.java} (78%) create mode 100644 src/main/java/net/trueog/unionsog/UnionRequest.java delete mode 100644 src/main/java/net/trueog/unionsog/commands/ClanPlayerInput.java create mode 100644 src/main/java/net/trueog/unionsog/commands/GroupAliasCommand.java rename src/main/java/net/trueog/unionsog/commands/{ClanInput.java => UnionInput.java} (51%) create mode 100644 src/main/java/net/trueog/unionsog/commands/UnionPlayerInput.java delete mode 100644 src/main/java/net/trueog/unionsog/commands/clan/AllyChatCommand.java delete mode 100644 src/main/java/net/trueog/unionsog/commands/clan/ChatCommand.java delete mode 100644 src/main/java/net/trueog/unionsog/commands/clan/ClanCommands.java delete mode 100644 src/main/java/net/trueog/unionsog/commands/clan/LeaderCommands.java delete mode 100644 src/main/java/net/trueog/unionsog/commands/clan/RankCommand.java rename src/main/java/net/trueog/unionsog/commands/completions/{AllLeadersCompletion.java => AllMembersCompletion.java} (66%) delete mode 100644 src/main/java/net/trueog/unionsog/commands/completions/AllNonLeadersCompletion.java rename src/main/java/net/trueog/unionsog/commands/completions/{AlliedClansCompletion.java => AlliedUnionsCompletion.java} (67%) delete mode 100644 src/main/java/net/trueog/unionsog/commands/completions/ClanLeadersCompletion.java delete mode 100644 src/main/java/net/trueog/unionsog/commands/completions/ClanNonLeadersCompletion.java delete mode 100644 src/main/java/net/trueog/unionsog/commands/completions/RankPermissionsCompletion.java delete mode 100644 src/main/java/net/trueog/unionsog/commands/completions/RanksCompletion.java rename src/main/java/net/trueog/unionsog/commands/completions/{ClanColorsCompletion.java => UnionColorsCompletion.java} (78%) rename src/main/java/net/trueog/unionsog/commands/completions/{ClanMembersCompletion.java => UnionMembersCompletion.java} (66%) rename src/main/java/net/trueog/unionsog/commands/completions/{ClansCompletion.java => UnionsCompletion.java} (54%) rename src/main/java/net/trueog/unionsog/commands/completions/{WarringClansCompletion.java => WarringUnionsCompletion.java} (64%) rename src/main/java/net/trueog/unionsog/commands/conditions/{AlliedClanCondition.java => AlliedUnionCondition.java} (51%) rename src/main/java/net/trueog/unionsog/commands/conditions/{DifferentClanCondition.java => DifferentUnionCondition.java} (53%) delete mode 100644 src/main/java/net/trueog/unionsog/commands/conditions/InputClanMemberCondition.java create mode 100644 src/main/java/net/trueog/unionsog/commands/conditions/InputUnionMemberCondition.java delete mode 100644 src/main/java/net/trueog/unionsog/commands/conditions/LeaderCondition.java delete mode 100644 src/main/java/net/trueog/unionsog/commands/conditions/NotInClanCondition.java create mode 100644 src/main/java/net/trueog/unionsog/commands/conditions/NotInUnionCondition.java rename src/main/java/net/trueog/unionsog/commands/conditions/{PlayerClanMemberCondition.java => PlayerUnionMemberCondition.java} (78%) delete mode 100644 src/main/java/net/trueog/unionsog/commands/conditions/RankPermissionCondition.java delete mode 100644 src/main/java/net/trueog/unionsog/commands/conditions/SameClanCondition.java create mode 100644 src/main/java/net/trueog/unionsog/commands/conditions/SameUnionCondition.java rename src/main/java/net/trueog/unionsog/commands/conditions/{SenderClanMemberCondition.java => SenderUnionMemberCondition.java} (68%) rename src/main/java/net/trueog/unionsog/commands/conditions/{ClanMemberCondition.java => UnionMemberCondition.java} (55%) delete mode 100644 src/main/java/net/trueog/unionsog/commands/contexts/ClanContextResolver.java delete mode 100644 src/main/java/net/trueog/unionsog/commands/contexts/ClanInputContextResolver.java delete mode 100644 src/main/java/net/trueog/unionsog/commands/contexts/ClanPlayerContextResolver.java delete mode 100644 src/main/java/net/trueog/unionsog/commands/contexts/RankContextResolver.java create mode 100644 src/main/java/net/trueog/unionsog/commands/contexts/UnionContextResolver.java create mode 100644 src/main/java/net/trueog/unionsog/commands/contexts/UnionInputContextResolver.java create mode 100644 src/main/java/net/trueog/unionsog/commands/contexts/UnionPlayerContextResolver.java rename src/main/java/net/trueog/unionsog/commands/contexts/{ClanPlayerInputContextResolver.java => UnionPlayerInputContextResolver.java} (65%) delete mode 100644 src/main/java/net/trueog/unionsog/commands/data/ClanProfile.java delete mode 100644 src/main/java/net/trueog/unionsog/commands/data/ClanRoster.java rename src/main/java/net/trueog/unionsog/commands/data/{ClanCoords.java => UnionCoords.java} (78%) rename src/main/java/net/trueog/unionsog/commands/data/{ClanList.java => UnionList.java} (70%) create mode 100644 src/main/java/net/trueog/unionsog/commands/data/UnionProfile.java create mode 100644 src/main/java/net/trueog/unionsog/commands/data/UnionRoster.java rename src/main/java/net/trueog/unionsog/commands/data/{ClanStats.java => UnionStats.java} (77%) create mode 100644 src/main/java/net/trueog/unionsog/commands/union/AllyChatCommand.java rename src/main/java/net/trueog/unionsog/commands/{clan => union}/BankCommand.java (63%) rename src/main/java/net/trueog/unionsog/commands/{clan => union}/BbCommand.java (59%) create mode 100644 src/main/java/net/trueog/unionsog/commands/union/ChatCommand.java rename src/main/java/net/trueog/unionsog/commands/{clan => union}/DataCommands.java (63%) rename src/main/java/net/trueog/unionsog/commands/{clan => union}/HomeCommands.java (62%) rename src/main/java/net/trueog/unionsog/commands/{clan => union}/LandCommand.java (79%) rename src/main/java/net/trueog/unionsog/commands/{clan => union}/ToggleCommand.java (71%) create mode 100644 src/main/java/net/trueog/unionsog/commands/union/UnionCommands.java delete mode 100644 src/main/java/net/trueog/unionsog/conversation/CreateRankNamePrompt.java rename src/main/java/net/trueog/unionsog/conversation/{CreateClanNamePrompt.java => CreateUnionNamePrompt.java} (53%) rename src/main/java/net/trueog/unionsog/conversation/{CreateClanTagPrompt.java => CreateUnionTagPrompt.java} (80%) delete mode 100644 src/main/java/net/trueog/unionsog/events/AllyClanAddEvent.java delete mode 100644 src/main/java/net/trueog/unionsog/events/AllyClanRemoveEvent.java create mode 100644 src/main/java/net/trueog/unionsog/events/AllyUnionAddEvent.java create mode 100644 src/main/java/net/trueog/unionsog/events/AllyUnionRemoveEvent.java delete mode 100644 src/main/java/net/trueog/unionsog/events/CreateRankEvent.java rename src/main/java/net/trueog/unionsog/events/{CreateClanEvent.java => CreateUnionEvent.java} (62%) delete mode 100644 src/main/java/net/trueog/unionsog/events/DeleteRankEvent.java rename src/main/java/net/trueog/unionsog/events/{DisbandClanEvent.java => DisbandUnionEvent.java} (72%) rename src/main/java/net/trueog/unionsog/events/{PlayerDemoteEvent.java => PlayerJoinedUnionEvent.java} (54%) delete mode 100644 src/main/java/net/trueog/unionsog/events/PlayerKickedClanEvent.java rename src/main/java/net/trueog/unionsog/events/{PlayerJoinedClanEvent.java => PlayerKickedUnionEvent.java} (54%) delete mode 100644 src/main/java/net/trueog/unionsog/events/PlayerRankUpdateEvent.java delete mode 100644 src/main/java/net/trueog/unionsog/events/PreCreateRankEvent.java rename src/main/java/net/trueog/unionsog/events/{PreCreateClanEvent.java => PreCreateUnionEvent.java} (84%) delete mode 100644 src/main/java/net/trueog/unionsog/events/RivalClanAddEvent.java rename src/main/java/net/trueog/unionsog/events/{PlayerPromoteEvent.java => RivalUnionAddEvent.java} (51%) rename src/main/java/net/trueog/unionsog/events/{RivalClanRemoveEvent.java => RivalUnionRemoveEvent.java} (50%) rename src/main/java/net/trueog/unionsog/events/{ClanBalanceUpdateEvent.java => UnionBalanceUpdateEvent.java} (78%) rename src/main/java/net/trueog/unionsog/events/{ClanPlayerTeleportEvent.java => UnionPlayerTeleportEvent.java} (78%) create mode 100644 src/main/java/net/trueog/unionsog/managers/ProposalManager.java rename src/main/java/net/trueog/unionsog/managers/{ClanManager.java => UnionManager.java} (74%) rename src/main/java/net/trueog/unionsog/proxy/adapters/{ClanPlayerListAdapter.java => UnionPlayerListAdapter.java} (62%) rename src/main/java/net/trueog/unionsog/proxy/adapters/{ClanPlayerTypeAdapterFactory.java => UnionPlayerTypeAdapterFactory.java} (51%) rename src/main/java/net/trueog/unionsog/proxy/listeners/{DeleteClan.java => DeleteUnion.java} (62%) rename src/main/java/net/trueog/unionsog/proxy/listeners/{DeleteClanPlayer.java => DeleteUnionPlayer.java} (75%) delete mode 100644 src/main/java/net/trueog/unionsog/proxy/listeners/UpdateClan.java delete mode 100644 src/main/java/net/trueog/unionsog/proxy/listeners/UpdateClanPlayer.java create mode 100644 src/main/java/net/trueog/unionsog/proxy/listeners/UpdateUnion.java create mode 100644 src/main/java/net/trueog/unionsog/proxy/listeners/UpdateUnionPlayer.java delete mode 100644 src/main/java/net/trueog/unionsog/ui/frames/AddPermissionFrame.java delete mode 100644 src/main/java/net/trueog/unionsog/ui/frames/PermissionsFrame.java create mode 100644 src/main/java/net/trueog/unionsog/ui/frames/ProposalFrame.java delete mode 100644 src/main/java/net/trueog/unionsog/ui/frames/RanksFrame.java rename src/main/java/net/trueog/unionsog/ui/frames/{ClanDetailsFrame.java => UnionDetailsFrame.java} (51%) rename src/main/java/net/trueog/unionsog/ui/frames/{ClanListFrame.java => UnionListFrame.java} (65%) rename src/main/java/net/trueog/unionsog/ui/frames/staff/{ClanDetailsFrame.java => UnionDetailsFrame.java} (62%) rename src/main/java/net/trueog/unionsog/ui/frames/staff/{ClanListFrame.java => UnionListFrame.java} (75%) delete mode 100644 wiki/commands-and-permissions/aliances-and-rivalries.md create mode 100644 wiki/commands-and-permissions/alliances-and-rivalries.md create mode 100644 wiki/commands-and-permissions/proposals-and-voting.md delete mode 100644 wiki/commands-and-permissions/ranks-with-permissions.md delete mode 100644 wiki/how-to-setup/clan-upkeep.md delete mode 100644 wiki/how-to-setup/member-fee.md rename wiki/how-to-setup/{clan-below-players-name.md => union-below-players-name.md} (74%) rename wiki/how-to-setup/{clan-on-tablist.md => union-on-tablist.md} (72%) delete mode 100644 wiki/other/simpleclans-api.md create mode 100644 wiki/other/unions-og-api.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 44408533..fed2ac5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,61 +4,104 @@ This changelog records only changes made by the Unions-OG soft fork relative to upstream [SimpleClans](https://github.com/RoinujNosde/SimpleClans). Changes inherited unchanged from SimpleClans are intentionally omitted. +## [2.4] - 2026-08-10 + +### Added + +- Unions decide by member vote. `disband`, `home set` and `war start` now open + a proposal that passes when half the members are in favour, is rejected once + half becomes unreachable, and expires after 7 days. Votes are stored in the + database, so members can vote when they next log in. +- `/union vote` shows the open proposal and its tally; `/union vote yes|no` + casts a vote. A vote screen in the GUI does the same, and is shown once on + login to members who have not voted. +- Disbanding a union splits its bank evenly between all members. Inert until + union bank accounts are enabled. +- `/clan`, `/clans`, `/factions`, `/guilds`, `/party`, `/tribe`, `/nation`, + `/crew`, `/squad` and `/gang` tell the player to use `/union` instead. + `/f`, `/faction` and `/guild` are left to Utilities-OG. + +### Changed + +- Unions are flat. Every union command is member-level, and the three actions + above are the only ones needing more than one member's say-so. +- Folded `unionsog.leader.*` into `unionsog.member.*`, which is granted by + default. Union ally management is `unionsog.member.ally-set` and union + friendly fire is `unionsog.member.union-ff`, to avoid clashing with the + existing ally-chat and personal-friendly-fire nodes. +- Renamed clan to union across the API, config sections and message keys: + `Clan` is `Union`, `clan:` is `union:`, `clanchat:` is `unionchat:`. + Database identifiers and PlaceholderAPI placeholder names deliberately keep + their `clan` spelling. +- Renamed `/union clanff` to `/union unionff`. +- Chat and display formats accept `{union}`; `{clan}` still works. +- A union now ends with its last member. +- `/union war start` no longer asks the target union, so the member-count + guard always applies. Removed `war-and-protection.war-start.request-enabled`. +- Inter-union requests are answered by the first member of the asked union + rather than by its leaders. +- Set the union GUI title to "Union Management". + +### Removed + +- Ranks, promotion and demotion, with their commands, settings, events and GUI + screens. +- The leader role: no leader flag, leader-only command, tag colour, Discord + role or `sc_leader` LuckPerms group. The `sc_players.leader` column is kept + and always written `0` for data compatibility. +- The leaders-only land creation option. +- The in-game Crowdin translation prompts. + +### Fixed + +- `/union lookup` and `/union profile` no longer print a literal + `%player_rank%` or `%clan_leaders%`. +- Removed a stale `%rank%` token from the default chat formats. +- `/union unionff block` now requires union membership, matching + `/union unionff allow`. +- The legacy database importer no longer reads or writes leader relationships. + ## [2.3] - Initial release ### Added -- Added `/union` and `/unions` as primary command aliases while retaining - `/clan` and `/clans`. -- Added `/u [message]` for union chat. Running `/u` without a message toggles - the player's union-chat channel. -- Added `/union color ` with named, legacy, and hex color support, - governed by `unionsog.leader.color`. -- Added `simpleunions` PlaceholderAPI aliases alongside the legacy - `simpleclans` identifier. -- Added MiniPlaceholders support through Utilities-OG, including clan/union - aliases and relational placeholders. -- Added a stable `&8None` result for the no-union color-tag placeholder. -- Added a Union Banking preview to the main GUI. -- Added a configuration-gated legacy database migration from `unions_parties` and - `unions_players` into the configured Unions-OG tables. The migration: - - Never modifies the legacy source tables. - - Requires empty, transactional destination tables. - - Runs in a transaction and records successful application for idempotency. - - Preserves membership and leader relationships, resolves duplicate tags, - and supplies deterministic player-name placeholders when needed. - - Aborts plugin startup on configuration, connection, validation, or import - failure so the server cannot continue with partially migrated data. - - Includes unit and database-backed tests for mapping, idempotency, safety, - and rollback behavior. -- Renamed the plugin and artifact to Unions-OG and changed user-facing clan - terminology to union. -- Moved the Java and Gradle namespace to `net.trueog.unionsog`, the plugin main - class to `net.trueog.unionsog.UnionsOG`, and permission nodes to - `unionsog.*`. -- Disabled verification as a gameplay gate; newly created unions are treated - as verified while the stored field remains for data compatibility. -- Reserved `None` as a union name or tag to avoid ambiguity with the - no-union display value. -- Disabled bulletin-board messages on login by default. -- Replaced Vault economy access with DiamondBank-OG and its shard-based player - balances. Legacy Vault-denominated union balances are zeroed once. -- Temporarily disabled union-bank commands and detail-screen controls until - DiamondBank-OG provides union-owned accounts; the main GUI shows a preview - in their place. +- `/union` and `/unions` as primary command aliases, keeping `/clan` and + `/clans`. +- `/u [message]` for union chat. Running `/u` alone toggles the channel. +- `/union color ` with named, legacy and hex color support. +- `simpleunions` PlaceholderAPI aliases alongside the legacy `simpleclans` + identifier, plus MiniPlaceholders support through Utilities-OG. +- A Union Banking preview in the main GUI. +- A configuration-gated legacy database migration from `unions_parties` and + `unions_players`. It never touches the source tables, requires empty + transactional destinations, is idempotent, and aborts startup on failure so + the server cannot run on partially migrated data. + +### Changed + +- Renamed the plugin and artifact to Unions-OG, moved the namespace to + `net.trueog.unionsog` and permission nodes to `unionsog.*`. +- Replaced Vault with DiamondBank-OG and its shard-based balances. Legacy + Vault-denominated union balances are zeroed once. Union-bank commands are + disabled until DiamondBank-OG provides union-owned accounts. +- Unions are treated as verified without the upstream verification workflow. +- Reserved `None` as a union name or tag, and made the no-union color-tag + placeholder return a stable `&8None`. +- Bulletin-board messages no longer show on login by default. - Reordered the main GUI around the union overview, banking preview, lists, - leaderboards, and administrative tools. -- Replaced the legacy WorldGuard 6 reflection provider with the WorldEdit and + leaderboards and administrative tools. +- Replaced the WorldGuard 6 reflection provider with the WorldEdit and WorldGuard 7 APIs. -- Updated MySQL driver loading for Connector/J 8, the legacy Connector/J - class name, MariaDB, and JDBC service discovery. +- Updated MySQL driver loading for Connector/J 8, MariaDB and JDBC service + discovery. - Migrated the build from Maven to Gradle with a Java 17 toolchain, - reproducible shaded jars, formatting checks, and the Utilities-OG and - DiamondBank-OG submodules. -- Removed the Vault dependency and the scheduled Vault-backed member-fee and - upkeep tasks. -- Removed the legacy WorldGuard 6 provider. -- Removed bStats telemetry from the fork. + reproducible shaded jars, and the Utilities-OG and DiamondBank-OG submodules. + +### Removed + +- The Vault dependency, along with the member-fee and upkeep tasks it backed. +- The legacy WorldGuard 6 provider. +- bStats telemetry. ## Fork baseline diff --git a/README.md b/README.md index fb9bceda..abbc4652 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ A full-featured union system for PvP Minecraft servers. > TrueOG Network. Upstream behavior is retained where practical, while > branding, integrations, and selected gameplay behavior intentionally differ. -Current fork version: **2.3** +Current fork version: **2.4** - [Fork-only changelog](CHANGELOG.md) - [PlaceholderAPI and MiniPlaceholders reference](placeholder-info.txt) @@ -18,16 +18,52 @@ Current fork version: **2.3** ## Main fork differences -- Uses Unions-OG branding and union terminology. -- Provides `/union` and `/unions` while keeping `/clan` and `/clans` as - compatibility aliases. +### Flat unions + +Unions have no internal hierarchy. Ranks, promotion, demotion and the leader +role itself were removed, so every member holds the same powers. + +- Every union command is member-level. There is no leader flag, no rank + system, and no way to grant one member authority over another. +- A union ends with its last member: resigning, or being kicked or moved out + as the only member, disbands it. + +### Decisions by member consensus + +Three actions need a vote of the union's own members instead of a leader's +say-so: **disband**, **home set**, and **war start**. + +- A proposal passes as soon as half the members (rounded up) vote in favour, + and is rejected as soon as enough vote against that half can no longer be + reached. +- Votes are stored in the database, so a member who is offline when a + proposal opens can still vote the next time they log in. Proposals expire + after 7 days. +- A union can only have one proposal open at a time. +- Members vote with `/union vote yes|no`, or by clicking the vote buttons in + the union GUI. The GUI is presented once on login to members who have not + voted yet. +- `/union vote` on its own shows the open proposal and the running tally. + +### Other differences + +- Uses Unions-OG branding and union terminology throughout, including config + sections (`union:`, `unionchat:`) and message keys. +- Provides `/union` and `/unions`. Other group words — `/clan`, `/clans`, + `/factions`, `/guilds`, `/party`, `/tribe`, `/nation`, `/crew`, `/squad` and + `/gang` — are registered as signposts that tell the player to run the same command with + `/union` instead. `/f`, `/faction` and `/guild` belong to Utilities-OG, + which already redirects them. - Uses `/u` for union chat; a bare `/u` toggles the union-chat channel. -- Adds `/union color ` with the `unionsog.leader.color` permission. +- Adds `/union rename ` and `/union color `, both open to any + member. +- Union-wide friendly fire is `/union unionff allow|block`. - Supports both `simpleclans` and `simpleunions` placeholder identifiers in PlaceholderAPI and MiniPlaceholders. - Uses DiamondBank-OG instead of Vault for player economy access. Union-owned bank accounts remain under development, so their commands are currently - disabled. + disabled. Once enabled, disbanding a union splits its bank evenly between + all members. - Treats unions as verified without requiring the upstream verification workflow. - Includes a configuration-gated, transactional importer for the legacy @@ -39,16 +75,21 @@ there. ## Documentation -The [SimpleClans documentation](https://simpleclans.gitbook.io/simpleclans/) -remains the baseline reference for inherited features. It uses upstream clan -terminology, and fork-specific commands, permissions, banking behavior, and -integrations may differ. +The [Unions-OG wiki](wiki/) documents this fork, and is the reference to use. -- [Upstream commands](https://simpleclans.gitbook.io/simpleclans/commands-and-permissions/commands) -- [Upstream permissions](https://simpleclans.gitbook.io/simpleclans/commands-and-permissions/permissions) -- [Upstream configuration](https://simpleclans.gitbook.io/simpleclans/how-to-setup/configuration) -- [Upstream ranks](https://simpleclans.gitbook.io/simpleclans/commands-and-permissions/ranks-with-permissions) -- [Upstream land protection integrations](https://simpleclans.gitbook.io/simpleclans/other/land-claims) +- [Commands](wiki/commands-and-permissions/commands.md) +- [Permissions](wiki/commands-and-permissions/permissions.md) +- [Proposals and Voting](wiki/commands-and-permissions/proposals-and-voting.md) +- [Union Alliances and Rivalries](wiki/commands-and-permissions/alliances-and-rivalries.md) +- [Configuration](wiki/how-to-setup/configuration.md) +- [PlaceholderAPI Support](wiki/other/placeholderapi-support.md) +- [API example](wiki/other/unions-og-api.md) + +> [!WARNING] +> The [upstream SimpleClans documentation](https://simpleclans.gitbook.io/simpleclans/) +> no longer describes this fork. Its pages on leaders, ranks, promotion, +> demotion, member fees and upkeep do **not** apply, and its command, +> permission and configuration names have all been renamed here. For the unmodified upstream plugin and its public releases, use the [SimpleClans Spigot page](https://www.spigotmc.org/resources/simpleclans.71242/). @@ -64,16 +105,28 @@ git submodule update --init --recursive ``` The shaded plugin is produced under `build/libs/` with the -`Unions-OG-2.3.jar` name. +`Unions-OG-2.4.jar` name. ## Developer compatibility - Java and Gradle namespace: `net.trueog.unionsog` - Bukkit main class: `net.trueog.unionsog.UnionsOG` -- Permission prefix: `unionsog.*` -- Command aliases: `union`, `unions`, `clan`, and `clans` +- API types use union naming: `Union`, `UnionPlayer`, `UnionManager`, + `Proposal`, `DisbandUnionEvent` +- Permission prefix: `unionsog.*`. Union actions all live under + `unionsog.member.*`, which is granted by default; there is no + `unionsog.leader.*` tree +- Command aliases: `union` and `unions`. Other group words are redirect-only + signposts, not aliases, and never execute a union command - Placeholder identifiers: `simpleunions` and the retained `simpleclans` - compatibility identifier + compatibility identifier. Placeholder **names** deliberately keep their + upstream `clan` spelling (`%simpleunions_clan_name%`) so existing setups + keep resolving +- Database identifiers are unchanged for live-data compatibility: the table + prefix stays `sc_`, and the `clans` table and `leader` column are retained + even though the leader column is no longer used +- Chat and display formats accept `{union}`; the legacy `{clan}` token still + works The old SimpleClans Maven coordinates and Java packages do not describe this fork and should not be used as Unions-OG API coordinates. diff --git a/build.gradle.kts b/build.gradle.kts index c76fe52d..9ff04cbf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -29,7 +29,7 @@ kotlin { jvmToolchain(17) } /* ----------------------------- Metadata ------------------------------ */ group = "net.trueog.unionsog" // Declare bundle identifier. -version = "2.3" // Declare plugin version (will be in .jar). +version = "2.4" // Declare plugin version (will be in .jar). val apiVersion = "1.19" // Declare minecraft server target version. diff --git a/placeholder-info.txt b/placeholder-info.txt index a1a321f8..56c4cfeb 100644 --- a/placeholder-info.txt +++ b/placeholder-info.txt @@ -41,7 +41,6 @@ These resolve against the requested player: - name - clean_name -- is_leader - lastseendays - total_kills - rival_kills @@ -66,9 +65,6 @@ These resolve against the requested player: - is_bb_enabled - is_invite_enabled - is_tag_enabled -- rank_displayname -- has_rank -- rank - is_muted - is_mutedally @@ -103,7 +99,6 @@ These resolve against the requested player's union: - rivals_count - is_permanent - onlinemembers_count -- leader_size - total_kdr - topclans_position - total_deaths diff --git a/src/main/java/net/trueog/unionsog/ChatBlock.java b/src/main/java/net/trueog/unionsog/ChatBlock.java index 9104fb54..debbcc1b 100644 --- a/src/main/java/net/trueog/unionsog/ChatBlock.java +++ b/src/main/java/net/trueog/unionsog/ChatBlock.java @@ -762,7 +762,7 @@ public class ChatBlock { } - public static void sendMessage(@Nullable ClanPlayer receiver, @NotNull String msg) { + public static void sendMessage(@Nullable UnionPlayer receiver, @NotNull String msg) { if (receiver == null) { @@ -774,7 +774,7 @@ public class ChatBlock { } - // ClanCommands#setbanner, LandCommands#Allow/BlockCommand/verify, + // UnionCommands#setbanner, LandCommands#Allow/BlockCommand/verify, // StaffCommands#kick, etc public static void sendMessageKey(@Nullable CommandSender receiver, @NotNull String key, @NotNull Object... args) { @@ -782,9 +782,9 @@ public class ChatBlock { } - public static void sendMessageKey(@NotNull ClanPlayer clanPlayer, @NotNull String key, @NotNull Object... args) { + public static void sendMessageKey(@NotNull UnionPlayer unionPlayer, @NotNull String key, @NotNull Object... args) { - sendMessageKey(clanPlayer.toPlayer(), key, args); + sendMessageKey(unionPlayer.toPlayer(), key, args); } diff --git a/src/main/java/net/trueog/unionsog/ClanRequest.java b/src/main/java/net/trueog/unionsog/ClanRequest.java deleted file mode 100644 index cc9a55a4..00000000 --- a/src/main/java/net/trueog/unionsog/ClanRequest.java +++ /dev/null @@ -1,10 +0,0 @@ -package net.trueog.unionsog; - -/** - * Clan Requests - * - * @author phaed - */ -public enum ClanRequest { - DEMOTE, PROMOTE, DISBAND, INVITE, CREATE_ALLY, BREAK_RIVALRY, START_WAR, END_WAR, RENAME -} diff --git a/src/main/java/net/trueog/unionsog/Helper.java b/src/main/java/net/trueog/unionsog/Helper.java index bca96ddf..f9b11e4f 100644 --- a/src/main/java/net/trueog/unionsog/Helper.java +++ b/src/main/java/net/trueog/unionsog/Helper.java @@ -1,8 +1,6 @@ package net.trueog.unionsog; import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; import net.trueog.unionsog.managers.PermissionsManager; import org.bukkit.Location; @@ -39,7 +37,6 @@ import static net.trueog.unionsog.utils.ChatUtils.stripColors; public final class Helper { private static final Gson GSON = new Gson(); - private static final Type RANKS_TYPE = TypeToken.getParameterized(List.class, Rank.class).getType(); private static final Type RESIGN_TYPE = TypeToken.getParameterized(Map.class, String.class, Long.class).getType(); private Helper() { @@ -140,69 +137,6 @@ public final class Helper { } - /** - * Parses a list of ranks from the specified Json String - * - * @param json the Json String - * @return a list of ranks or null if the JSON String is null/empty - */ - public static @Nullable List ranksFromJson(@Nullable String json) { - - if (json != null && !json.isEmpty()) { - - JsonObject object = GSON.fromJson(json, JsonObject.class); - JsonElement ranks = object.get("ranks"); - return GSON.fromJson(ranks, RANKS_TYPE); - - } - - return null; - - } - - /** - * Parses the default rank from the specified Json String - * - * @param json the Json String - * @return the default rank or null if not found and/or it does not exist - */ - public static @Nullable String defaultRankFromJson(@Nullable String json) { - - if (json != null && !json.isEmpty()) { - - JsonObject object = GSON.fromJson(json, JsonObject.class); - JsonElement defaultRank = object.get("defaultRank"); - if (defaultRank != null && !defaultRank.isJsonNull()) { - - return defaultRank.getAsString(); - - } - - } - - return null; - - } - - /** - * Converts a list of ranks and the default rank to a JSON String - * - * @param ranks the ranks - * @param defaultRank the default rank - * @return a JSON String - */ - public static String ranksToJson(List ranks, @Nullable String defaultRank) { - - if (ranks == null) - ranks = new ArrayList<>(); - - JsonObject object = new JsonObject(); - object.add("ranks", GSON.toJsonTree(ranks)); - object.addProperty("defaultRank", defaultRank); - return object.toString(); - - } - /** * Converts a resign times map to a JSON String * @@ -327,25 +261,6 @@ public final class Helper { } - /** - * Converts the Permission values array to a String array - * - * @return - */ - public static String[] fromPermissionArray() { - - RankPermission[] permissions = RankPermission.values(); - String[] sa = new String[permissions.length]; - for (int i = 0; i < permissions.length; i++) { - - sa[i] = permissions[i].toString(); - - } - - return sa; - - } - /** * Cleans up the tag from color codes and makes it lowercase * @@ -379,16 +294,16 @@ public final class Helper { } /** - * Remove offline players from a ClanPlayer array + * Remove offline players from a UnionPlayer array * * @param in * @return */ - public static List stripOffLinePlayers(List in) { + public static List stripOffLinePlayers(List in) { - List out = new ArrayList<>(); + List out = new ArrayList<>(); - for (ClanPlayer cp : in) { + for (UnionPlayer cp : in) { if (cp.toPlayer() != null) { @@ -475,10 +390,10 @@ public final class Helper { } @NotNull - public static String getFormattedClanStatus(Clan clan, CommandSender sender) { + public static String getFormattedUnionStatus(Union union, CommandSender sender) { ArrayList statuses = new ArrayList<>(); - if (clan.isPermanent()) { + if (union.isPermanent()) { statuses.add(lang("permanent", sender)); diff --git a/src/main/java/net/trueog/unionsog/Kill.java b/src/main/java/net/trueog/unionsog/Kill.java index 269c969f..f144aa4c 100644 --- a/src/main/java/net/trueog/unionsog/Kill.java +++ b/src/main/java/net/trueog/unionsog/Kill.java @@ -4,11 +4,11 @@ import java.time.LocalDateTime; public class Kill { - private final ClanPlayer killer; - private final ClanPlayer victim; + private final UnionPlayer killer; + private final UnionPlayer victim; private final LocalDateTime time; - public Kill(ClanPlayer killer, ClanPlayer victim, LocalDateTime time) { + public Kill(UnionPlayer killer, UnionPlayer victim, LocalDateTime time) { this.killer = killer; this.victim = victim; @@ -16,13 +16,13 @@ public class Kill { } - public ClanPlayer getKiller() { + public UnionPlayer getKiller() { return killer; } - public ClanPlayer getVictim() { + public UnionPlayer getVictim() { return victim; diff --git a/src/main/java/net/trueog/unionsog/PermissionLevel.java b/src/main/java/net/trueog/unionsog/PermissionLevel.java deleted file mode 100644 index 3d5d343c..00000000 --- a/src/main/java/net/trueog/unionsog/PermissionLevel.java +++ /dev/null @@ -1,5 +0,0 @@ -package net.trueog.unionsog; - -public enum PermissionLevel { - LEADER, TRUSTED -} diff --git a/src/main/java/net/trueog/unionsog/Proposal.java b/src/main/java/net/trueog/unionsog/Proposal.java new file mode 100644 index 00000000..302caa8f --- /dev/null +++ b/src/main/java/net/trueog/unionsog/Proposal.java @@ -0,0 +1,179 @@ +package net.trueog.unionsog; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; +import java.util.UUID; + +/** + * A decision put to a union's own members. + *

+ * A proposal passes as soon as half of the union's members have voted yes, and + * is rejected as soon as enough members have voted no that half can no longer + * be reached. Votes survive logouts and restarts, so members can answer the + * next time they log in. + *

+ */ +public final class Proposal { + + private final @NotNull ProposalType type; + private final @NotNull String unionTag; + private final @NotNull UUID proposer; + private final @NotNull String target; + private final long createdAt; + private final Map votes = new LinkedHashMap<>(); + + public Proposal(@NotNull ProposalType type, @NotNull String unionTag, @NotNull UUID proposer, + @NotNull String target, long createdAt) + { + + this.type = type; + this.unionTag = unionTag; + this.proposer = proposer; + this.target = target; + this.createdAt = createdAt; + + } + + public @NotNull ProposalType getType() { + + return type; + + } + + public @NotNull String getUnionTag() { + + return unionTag; + + } + + public @NotNull UUID getProposer() { + + return proposer; + + } + + /** + * @return the proposal's payload, empty for proposals that do not need one + */ + public @NotNull String getTarget() { + + return target; + + } + + public long getCreatedAt() { + + return createdAt; + + } + + public @NotNull Map getVotes() { + + return Collections.unmodifiableMap(votes); + + } + + public void putVote(@NotNull UUID voter, boolean inFavour) { + + votes.put(voter, inFavour); + + } + + public void putVotes(@NotNull Map votes) { + + this.votes.putAll(votes); + + } + + public @Nullable Boolean getVote(@NotNull UUID voter) { + + return votes.get(voter); + + } + + public boolean hasVoted(@NotNull UUID voter) { + + return votes.containsKey(voter); + + } + + /** + * Drops the votes of players who are no longer members of the union, so that + * someone leaving cannot keep holding a proposal open. + * + * @param members the current members + */ + public void retainVoters(@NotNull Iterable members) { + + Set current = new HashSet<>(); + for (UnionPlayer cp : members) { + + current.add(cp.getUniqueId()); + + } + + votes.keySet().retainAll(current); + + } + + public int countVotes(boolean inFavour) { + + int count = 0; + for (Boolean vote : votes.values()) { + + if (vote == inFavour) { + + count++; + + } + + } + + return count; + + } + + /** + * The number of yes votes needed, which is half of the union rounded up. + * + * @param memberCount the union's member count + */ + public static int votesNeeded(int memberCount) { + + return (memberCount + 1) / 2; + + } + + /** + * @param memberCount the union's member count + * @return whether enough members are in favour + */ + public boolean isPassed(int memberCount) { + + return countVotes(true) >= votesNeeded(memberCount); + + } + + /** + * @param memberCount the union's member count + * @return whether so many members are against that it can no longer pass + */ + public boolean isRejected(int memberCount) { + + return countVotes(false) > memberCount - votesNeeded(memberCount); + + } + + public boolean isExpired(long now, long lifetimeMillis) { + + return now - createdAt >= lifetimeMillis; + + } + +} diff --git a/src/main/java/net/trueog/unionsog/ProposalType.java b/src/main/java/net/trueog/unionsog/ProposalType.java new file mode 100644 index 00000000..7ae1fc64 --- /dev/null +++ b/src/main/java/net/trueog/unionsog/ProposalType.java @@ -0,0 +1,45 @@ +package net.trueog.unionsog; + +/** + * The decisions a union's own members vote on. + * + * @see Proposal + */ +public enum ProposalType { + + /** + * Disband the union. The target is unused. + */ + DISBAND, + /** + * Move the union's home base. The target is the serialized location. + */ + SET_HOME, + /** + * Declare war on another union. The target is that union's tag. + */ + START_WAR; + + public static @org.jetbrains.annotations.Nullable ProposalType fromName( + @org.jetbrains.annotations.Nullable String name) + { + + if (name == null) { + + return null; + + } + + try { + + return valueOf(name); + + } catch (IllegalArgumentException ex) { + + return null; + + } + + } + +} diff --git a/src/main/java/net/trueog/unionsog/Rank.java b/src/main/java/net/trueog/unionsog/Rank.java deleted file mode 100644 index 51f5d48a..00000000 --- a/src/main/java/net/trueog/unionsog/Rank.java +++ /dev/null @@ -1,142 +0,0 @@ -package net.trueog.unionsog; - -import org.jetbrains.annotations.Nullable; - -import java.util.HashSet; -import java.util.Set; - -/** - * - * @author RoinujNosde - */ -public class Rank implements Comparable { - - private String name; - private String displayName; - private Set permissions; - - public Rank(String name) { - - setName(name); - permissions = new HashSet<>(); - setDisplayName(displayName); - - } - - public Rank(String name, @Nullable String displayName, Set permissions) { - - setName(name); - setDisplayName(displayName); - setPermissions(permissions); - - } - - public void setName(String name) { - - if (name == null || name.isEmpty()) { - - throw new IllegalArgumentException("name cannot be null or empty"); - - } - - this.name = name; - - } - - public void setDisplayName(@Nullable String displayName) { - - if (displayName == null || displayName.isEmpty()) { - - displayName = name; - - } - - this.displayName = displayName; - - } - - public void setPermissions(Set permissions) { - - if (permissions == null) { - - permissions = new HashSet<>(); - - } - - this.permissions = permissions; - - } - - @Override - public int hashCode() { - - final int prime = 31; - int result = 1; - result = prime * result + ((name == null) ? 0 : name.hashCode()); - return result; - - } - - @Override - public boolean equals(Object obj) { - - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - Rank other = (Rank) obj; - if (name == null) { - - if (other.name != null) - return false; - - } else if (!name.equals(other.name)) - return false; - - return true; - - } - - /** - * Returns the rank's permissions - * - * @return - */ - public Set getPermissions() { - - return permissions; - - } - - /** - * Returns the rank's display name - * - * @return - */ - public String getDisplayName() { - - return displayName; - - } - - /** - * Returns the rank's name - * - * @return - */ - public String getName() { - - return name; - - } - - @Override - public int compareTo(Rank other) { - - return Integer.compare(permissions.size(), other.permissions.size()); - - } - -} diff --git a/src/main/java/net/trueog/unionsog/RankPermission.java b/src/main/java/net/trueog/unionsog/RankPermission.java deleted file mode 100644 index 346f1e21..00000000 --- a/src/main/java/net/trueog/unionsog/RankPermission.java +++ /dev/null @@ -1,99 +0,0 @@ -package net.trueog.unionsog; - -import org.jetbrains.annotations.Contract; -import org.jetbrains.annotations.Nullable; - -/** - * - * @author RoinujNosde - * - */ -public enum RankPermission { - - ALLY_ADD("unionsog.leader.ally", PermissionLevel.LEADER), - ALLY_CHAT("unionsog.member.ally", PermissionLevel.TRUSTED), - ALLY_REMOVE("unionsog.leader.ally", PermissionLevel.LEADER), - BANK_BALANCE("unionsog.member.bank", PermissionLevel.TRUSTED), - BANK_DEPOSIT("unionsog.member.bank", PermissionLevel.LEADER), - BANK_WITHDRAW("unionsog.member.bank", PermissionLevel.LEADER), - BB_ADD("unionsog.member.bb-add", PermissionLevel.TRUSTED), - BB_CLEAR("unionsog.leader.bb-clear", PermissionLevel.LEADER), - COORDS("unionsog.member.coords", PermissionLevel.TRUSTED), - REGROUP_HOME("unionsog.leader.regroup.home", PermissionLevel.LEADER), - REGROUP_ME("unionsog.leader.regroup.me", PermissionLevel.LEADER), - HOME_SET("unionsog.leader.home-set", PermissionLevel.LEADER), - HOME_TP("unionsog.member.home", PermissionLevel.TRUSTED), INVITE("unionsog.leader.invite", PermissionLevel.LEADER), - KICK("unionsog.leader.kick", PermissionLevel.LEADER), COLOR("unionsog.leader.color", PermissionLevel.LEADER), - RANK_DISPLAYNAME("unionsog.leader.rank.setdisplayname", PermissionLevel.LEADER), - RANK_LIST("unionsog.leader.rank.list", PermissionLevel.LEADER), - RIVAL_ADD("unionsog.leader.rival", PermissionLevel.LEADER), - RIVAL_REMOVE("unionsog.leader.rival", PermissionLevel.LEADER), - WAR_END("unionsog.leader.war", PermissionLevel.LEADER), WAR_START("unionsog.leader.war", PermissionLevel.LEADER), - STATS("unionsog.member.stats", PermissionLevel.TRUSTED), VITALS("unionsog.member.vitals", PermissionLevel.TRUSTED), - KILLS("unionsog.member.kills", PermissionLevel.TRUSTED), - DESCRIPTION("unionsog.leader.description", PermissionLevel.LEADER), - MOSTKILLED("unionsog.mod.mostkilled", PermissionLevel.TRUSTED), - FRIENDLYFIRE("unionsog.leader.ff", PermissionLevel.LEADER), - SETBANNER("unionsog.leader.setbanner", PermissionLevel.LEADER); - - private final String bukkitPermission; - private final PermissionLevel permissionLevel; - - RankPermission(String bukkitPermission, PermissionLevel permissionLevel) { - - this.bukkitPermission = bukkitPermission; - this.permissionLevel = permissionLevel; - - } - - /** - * - * @return the Bukkit equivalent to this rank permission - */ - public String getBukkitPermission() { - - return bukkitPermission; - - } - - /** - * - * @return the PermissionLevel - * - */ - public PermissionLevel getPermissionLevel() { - - return permissionLevel; - - } - - @Override - public String toString() { - - return super.toString().replace("_", ".").toLowerCase(); - - } - - /** - * - * @param permission the permission - * @return true if this is a valid rank permission - */ - @Contract("null -> false") - public static boolean isValid(@Nullable String permission) { - - for (RankPermission p : values()) { - - if (p.toString().equalsIgnoreCase(permission)) { - - return true; - - } - - } - - return false; - - } - -} diff --git a/src/main/java/net/trueog/unionsog/Request.java b/src/main/java/net/trueog/unionsog/Request.java index a69593d7..b390546e 100644 --- a/src/main/java/net/trueog/unionsog/Request.java +++ b/src/main/java/net/trueog/unionsog/Request.java @@ -13,21 +13,21 @@ import static net.trueog.unionsog.managers.SettingsManager.ConfigField.REQUEST_M */ public final class Request { - private List acceptors = new ArrayList<>(); - private Clan clan; + private List acceptors = new ArrayList<>(); + private Union union; private String msg; private String target; - private ClanRequest type; - private ClanPlayer requester; + private UnionRequest type; + private UnionPlayer requester; private int askCount; - public Request(ClanRequest type, @Nullable List acceptors, ClanPlayer requester, String target, - Clan clan, String msg) + public Request(UnionRequest type, @Nullable List acceptors, UnionPlayer requester, String target, + Union union, String msg) { this.type = type; this.target = target; - this.clan = clan; + this.union = union; this.msg = msg; if (acceptors != null) { @@ -44,7 +44,7 @@ public final class Request { /** * @return the type */ - public ClanRequest getType() { + public UnionRequest getType() { return type; @@ -53,7 +53,7 @@ public final class Request { /** * @param type the type to set */ - public void setType(ClanRequest type) { + public void setType(UnionRequest type) { this.type = type; @@ -62,7 +62,7 @@ public final class Request { /** * @return the acceptors */ - public List getAcceptors() { + public List getAcceptors() { return Collections.unmodifiableList(acceptors); @@ -71,27 +71,27 @@ public final class Request { /** * @param acceptors the acceptors to set */ - public void setAcceptors(List acceptors) { + public void setAcceptors(List acceptors) { this.acceptors = acceptors; } /** - * @return the clan + * @return the union */ - public Clan getClan() { + public Union getUnion() { - return clan; + return union; } /** - * @param clan the clan to set + * @param union the union to set */ - public void setClan(Clan clan) { + public void setUnion(Union union) { - this.clan = clan; + this.union = union; } @@ -133,7 +133,7 @@ public final class Request { public void vote(String playerName, VoteResult vote) { - for (ClanPlayer cp : acceptors) { + for (UnionPlayer cp : acceptors) { if (cp.getName().equalsIgnoreCase(playerName)) { @@ -148,7 +148,7 @@ public final class Request { @SuppressWarnings("BooleanMethodIsAlwaysInverted") public boolean votingFinished() { - for (ClanPlayer cp : acceptors) { + for (UnionPlayer cp : acceptors) { if (cp.getVote() == null) { @@ -166,7 +166,7 @@ public final class Request { List out = new ArrayList<>(); - for (ClanPlayer cp : acceptors) { + for (UnionPlayer cp : acceptors) { if (cp.getVote() != null && cp.getVote().equals(VoteResult.DENY)) { @@ -184,7 +184,7 @@ public final class Request { List out = new ArrayList<>(); - for (ClanPlayer cp : acceptors) { + for (UnionPlayer cp : acceptors) { if (cp.getVote() != null && cp.getVote().equals(VoteResult.ACCEPT)) { @@ -203,7 +203,7 @@ public final class Request { */ public void cleanVotes() { - for (ClanPlayer cp : acceptors) { + for (UnionPlayer cp : acceptors) { cp.setVote(null); @@ -214,7 +214,7 @@ public final class Request { /** * @return the requester */ - public ClanPlayer getRequester() { + public UnionPlayer getRequester() { return requester; @@ -223,7 +223,7 @@ public final class Request { /** * @param requester the requester to set */ - public void setRequester(ClanPlayer requester) { + public void setRequester(UnionPlayer requester) { this.requester = requester; diff --git a/src/main/java/net/trueog/unionsog/TeleportState.java b/src/main/java/net/trueog/unionsog/TeleportState.java index 54981735..188a9625 100644 --- a/src/main/java/net/trueog/unionsog/TeleportState.java +++ b/src/main/java/net/trueog/unionsog/TeleportState.java @@ -11,15 +11,15 @@ public class TeleportState { private final Location origin; private final Location destination; private int counter; - private final String clanName; + private final String unionName; private boolean processing; - public TeleportState(Player player, Location destination, String clanName, int counter) { + public TeleportState(Player player, Location destination, String unionName, int counter) { this.offlinePlayer = player; this.destination = destination; this.origin = player.getLocation(); - this.clanName = clanName; + this.unionName = unionName; this.counter = counter; } @@ -71,9 +71,9 @@ public class TeleportState { } - public String getClanName() { + public String getUnionName() { - return this.clanName; + return this.unionName; } diff --git a/src/main/java/net/trueog/unionsog/Clan.java b/src/main/java/net/trueog/unionsog/Union.java similarity index 62% rename from src/main/java/net/trueog/unionsog/Clan.java rename to src/main/java/net/trueog/unionsog/Union.java index ddf21160..314d4154 100644 --- a/src/main/java/net/trueog/unionsog/Clan.java +++ b/src/main/java/net/trueog/unionsog/Union.java @@ -8,6 +8,7 @@ import net.trueog.unionsog.hooks.papi.Placeholder; import net.trueog.unionsog.loggers.BankLog; import net.trueog.unionsog.loggers.BankLogger; import net.trueog.unionsog.loggers.BankOperator; +import net.trueog.unionsog.managers.PermissionsManager; import net.trueog.unionsog.managers.SettingsManager; import net.trueog.unionsog.utils.ChatUtils; import net.trueog.unionsog.utils.CurrencyFormat; @@ -30,7 +31,7 @@ import java.util.stream.Collectors; import static net.trueog.unionsog.EconomyResponse.*; import static net.trueog.unionsog.UnionsOG.lang; -import static net.trueog.unionsog.events.ClanBalanceUpdateEvent.Cause; +import static net.trueog.unionsog.events.UnionBalanceUpdateEvent.Cause; import static net.trueog.unionsog.loggers.BankLogger.Operation.*; import static net.trueog.unionsog.managers.SettingsManager.ConfigField.*; import static org.bukkit.ChatColor.*; @@ -38,7 +39,7 @@ import static org.bukkit.ChatColor.*; /** * @author phaed */ -public class Clan implements Serializable, Comparable { +public class Union implements Serializable, Comparable { private static final long serialVersionUID = 1L; private static final String WARRING_KEY = "warring"; @@ -55,24 +56,22 @@ public class Clan implements Serializable, Comparable { private List allies = new ArrayList<>(); private List rivals = new ArrayList<>(); private List bb = new ArrayList<>(); - private final List members = new ArrayList<>(); + private final List members = new ArrayList<>(); private Flags flags = new Flags(null); private boolean feeEnabled; - private List ranks = new ArrayList<>(); - private @Nullable String defaultRank = null; private @Nullable ItemStack banner; /** * */ - public Clan() { + public Union() { this.capeUrl = ""; this.tag = ""; } - public Clan(String tag, String name) { + public Union(String tag, String name) { this.tag = Helper.cleanTag(tag); this.colorTag = ChatUtils.parseColors(tag); @@ -80,7 +79,7 @@ public class Clan implements Serializable, Comparable { this.founded = (new Date()).getTime(); this.lastUsed = (new Date()).getTime(); this.capeUrl = ""; - if (UnionsOG.getInstance().getSettingsManager().is(CLAN_FF_ON_BY_DEFAULT)) { + if (UnionsOG.getInstance().getSettingsManager().is(UNION_FF_ON_BY_DEFAULT)) { friendlyFire = true; @@ -98,19 +97,19 @@ public class Clan implements Serializable, Comparable { @Override public boolean equals(@Nullable Object obj) { - if (!(obj instanceof Clan)) { + if (!(obj instanceof Union)) { return false; } - Clan other = (Clan) obj; + Union other = (Union) obj; return other.getTag().equals(this.getTag()); } @Override - public int compareTo(Clan other) { + public int compareTo(Union other) { return this.getTag().compareToIgnoreCase(other.getTag()); @@ -124,7 +123,7 @@ public class Clan implements Serializable, Comparable { } /** - * Deposits Shards to the clan + * Deposits Shards to the union */ public EconomyResponse deposit(@NotNull BankOperator sender, @NotNull Cause cause, double amount) { @@ -148,7 +147,7 @@ public class Clan implements Serializable, Comparable { } /** - * Withdraws Shards from the clan + * Withdraws Shards from the union */ public EconomyResponse withdraw(@NotNull BankOperator sender, @NotNull Cause cause, double amount) { @@ -178,7 +177,7 @@ public class Clan implements Serializable, Comparable { } /** - * Returns the clan's name + * Returns the union's name * * @return the name */ @@ -201,7 +200,7 @@ public class Clan implements Serializable, Comparable { } /** - * Returns the clan's description + * Returns the union's description * * @return the description or null if it doesn't have one */ @@ -221,7 +220,7 @@ public class Clan implements Serializable, Comparable { } /** - * Sets the clan's fee + * Sets the union's fee */ public void setMemberFee(double fee) { @@ -236,7 +235,7 @@ public class Clan implements Serializable, Comparable { } /** - * Returns the clan's fee + * Returns the union's fee * * @return the fee */ @@ -247,7 +246,7 @@ public class Clan implements Serializable, Comparable { } /** - * Returns the clan's balance + * Returns the union's balance * * @return the balance */ @@ -259,7 +258,7 @@ public class Clan implements Serializable, Comparable { } /** - * Returns the clan's balance (in Shards) formatted as Diamonds + * Returns the union's balance (in Shards) formatted as Diamonds * * @return the balance formatted */ @@ -287,7 +286,7 @@ public class Clan implements Serializable, Comparable { EconomyResponse response = SUCCESS; - ClanBalanceUpdateEvent event = new ClanBalanceUpdateEvent(operator, this, getBalance(), balance, cause); + UnionBalanceUpdateEvent event = new UnionBalanceUpdateEvent(operator, this, getBalance(), balance, cause); Bukkit.getPluginManager().callEvent(event); if (event.isCancelled()) { @@ -304,7 +303,7 @@ public class Clan implements Serializable, Comparable { } - UnionsOG.getInstance().getStorageManager().updateClan(this); + UnionsOG.getInstance().getStorageManager().updateUnion(this); } @@ -313,7 +312,7 @@ public class Clan implements Serializable, Comparable { } /** - * Returns the clan's tag clean (no colors) + * Returns the union's tag clean (no colors) * * @return the tag */ @@ -336,7 +335,7 @@ public class Clan implements Serializable, Comparable { } /** - * Returns the first color in the clan's tag + * Returns the first color in the union's tag * * @return the color code or an empty string if there is no color */ @@ -371,7 +370,7 @@ public class Clan implements Serializable, Comparable { } /** - * Updates last used date to today (does not update clan on db) + * Updates last used date to today (does not update union on db) */ public void updateLastUsed() { @@ -380,7 +379,7 @@ public class Clan implements Serializable, Comparable { } /** - * Returns the number of days the clan has been inactive + * Returns the number of days the union has been inactive */ @Placeholder("inactivedays") public int getInactiveDays() { @@ -391,7 +390,7 @@ public class Clan implements Serializable, Comparable { } /** - * Returns the max number of days the clan can be inactive A {@literal <=} 0 + * Returns the max number of days the union can be inactive A {@literal <=} 0 * means it won't be purged */ public int getMaxInactiveDays() { @@ -402,7 +401,7 @@ public class Clan implements Serializable, Comparable { } - return UnionsOG.getInstance().getSettingsManager().getInt(PURGE_INACTIVE_CLAN_DAYS); + return UnionsOG.getInstance().getSettingsManager().getInt(PURGE_INACTIVE_UNION_DAYS); } @@ -418,7 +417,7 @@ public class Clan implements Serializable, Comparable { } /** - * Check whether this clan allows friendly fire + * Check whether this union allows friendly fire * * @return the friendlyFire */ @@ -430,7 +429,7 @@ public class Clan implements Serializable, Comparable { } /** - * Sets the friendly fire status of this clan (does not update clan on db) + * Sets the friendly fire status of this union (does not update union on db) * * @param friendlyFire the friendlyFire to set */ @@ -441,7 +440,7 @@ public class Clan implements Serializable, Comparable { } /** - * Check if the player is a member of this clan + * Check if the player is a member of this union * * @param player the Player * @return confirmation @@ -453,14 +452,14 @@ public class Clan implements Serializable, Comparable { } /** - * Check if the player is a member of this clan + * Check if the player is a member of this union * * @param uuid the Player's UUID * @return confirmation */ public boolean isMember(UUID uuid) { - for (ClanPlayer cp : members) { + for (UnionPlayer cp : members) { if (cp.getUniqueId().equals(uuid)) { @@ -556,7 +555,7 @@ public class Clan implements Serializable, Comparable { } /** - * Returns the color tag for this clan + * Returns the color tag for this union * * @return the colorTag */ @@ -568,7 +567,7 @@ public class Clan implements Serializable, Comparable { } // Returns the color tag wrapped in dark gray brackets with a trailing space, - // blank when resolved without a clan. + // blank when resolved without a union. @Placeholder("bracket_tag") public String getBracketTag() { @@ -593,7 +592,7 @@ public class Clan implements Serializable, Comparable { public void addBb(String msg) { addBbWithoutSaving(msg); - UnionsOG.getInstance().getStorageManager().updateClan(this); + UnionsOG.getInstance().getStorageManager().updateUnion(this); } @@ -621,12 +620,12 @@ public class Clan implements Serializable, Comparable { /** * Adds a bulletin board message without announcer and saves it to the database * - * @param updateLastUsed should the clan's last used time be updated as well? + * @param updateLastUsed should the union's last used time be updated as well? */ public void addBb(String msg, boolean updateLastUsed) { addBbWithoutSaving(msg); - UnionsOG.getInstance().getStorageManager().updateClan(this, updateLastUsed); + UnionsOG.getInstance().getStorageManager().updateUnion(this, updateLastUsed); } @@ -636,14 +635,14 @@ public class Clan implements Serializable, Comparable { public void clearBb() { bb.clear(); - UnionsOG.getInstance().getStorageManager().updateClan(this); + UnionsOG.getInstance().getStorageManager().updateUnion(this); } /** * (used internally) */ - public void importMember(ClanPlayer cp) { + public void importMember(UnionPlayer cp) { if (!members.contains(cp)) { @@ -663,7 +662,7 @@ public class Clan implements Serializable, Comparable { } /** - * Get total clan size + * Get total union size */ @Placeholder("size") public int getSize() { @@ -728,7 +727,7 @@ public class Clan implements Serializable, Comparable { } /** - * Returns the cape url for this clan + * Returns the cape url for this union * * @return the capeUrl */ @@ -818,20 +817,20 @@ public class Clan implements Serializable, Comparable { } /** - * Returns a separator delimited string with all the ally clan's colored tags + * Returns a separator delimited string with all the ally union's colored tags */ public String getAllyString(String sep, @Nullable CommandSender viewer) { String coloredAllies = getAllies().stream() - .map(allyTag -> UnionsOG.getInstance().getClanManager().getClan(allyTag)).filter(Objects::nonNull) - .map(Clan::getColorTag).collect(Collectors.joining(sep)); + .map(allyTag -> UnionsOG.getInstance().getUnionManager().getUnion(allyTag)).filter(Objects::nonNull) + .map(Union::getColorTag).collect(Collectors.joining(sep)); return coloredAllies.isEmpty() ? lang("none", viewer) : coloredAllies; } /** - * @deprecated use {@link Clan#getAllyString(String, CommandSender)} + * @deprecated use {@link Union#getAllyString(String, CommandSender)} */ @Deprecated public String getAllyString(String sep) { @@ -841,12 +840,12 @@ public class Clan implements Serializable, Comparable { } /** - * Returns a separator delimited string with all the rival clan's colored tags + * Returns a separator delimited string with all the rival union's colored tags */ public String getRivalString(String sep, @Nullable CommandSender viewer) { String coloredRivals = getRivals().stream() - .map(rivalTag -> UnionsOG.getInstance().getClanManager().getClan(rivalTag)).filter(Objects::nonNull) + .map(rivalTag -> UnionsOG.getInstance().getUnionManager().getUnion(rivalTag)).filter(Objects::nonNull) .map(rival -> isWarring(rival) ? DARK_RED + "[" + rival.getTag() + "]" : rival.getColorTag()) .map(ChatUtils::parseColors).collect(Collectors.joining(sep)); @@ -855,7 +854,7 @@ public class Clan implements Serializable, Comparable { } /** - * @deprecated use {@link Clan#getRivalString(String, CommandSender)} + * @deprecated use {@link Union#getRivalString(String, CommandSender)} */ @Deprecated public String getRivalString(String sep) { @@ -865,122 +864,50 @@ public class Clan implements Serializable, Comparable { } /** - * Returns a separator delimited string with all the leaders - * - * @return the formatted leaders string - */ - public String getLeadersString(String prefix, String sep) { - - return members.stream().filter(ClanPlayer::isLeader).map(ClanPlayer::getName) - .collect(Collectors.joining(sep, prefix, "")); - - } - - /** - * Check if a player is a leader of a clan - * - * @return the leaders - */ - public boolean isLeader(Player player) { - - return isLeader(player.getUniqueId()); - - } - - /** - * Check if a player is a leader of a clan - * - * @return the leaders - */ - public boolean isLeader(UUID playerUniqueId) { - - if (isMember(playerUniqueId)) { - - ClanPlayer cp = UnionsOG.getInstance().getClanManager().getClanPlayer(playerUniqueId); - - return cp != null && cp.isLeader(); - - } - - return false; - - } - - @SuppressWarnings("deprecation") - public boolean isLeader(String playerName) { - - return isLeader(Bukkit.getOfflinePlayer(playerName).getUniqueId()); - - } - - /** - * Get all members (leaders, and non-leaders) in the clan + * Get all members in the union * * @return the members */ - public List getMembers() { + public List getMembers() { return new ArrayList<>(members); } /** - * Get all online members (leaders, and non-leaders) in the clan + * Get all online members in the union * * @return the members */ @Placeholder(value = "onlinemembers_count", resolver = "list_size", config = "filter_vanished") - public List getOnlineMembers() { + public List getOnlineMembers() { return members.stream().filter(cp -> cp.toPlayer() != null).collect(Collectors.toList()); } /** - * Get all leaders in the clan + * Get all union's members * - * @return the leaders - */ - @Placeholder(value = "leader_size", resolver = "list_size") - public List getLeaders() { - - return members.stream().filter(ClanPlayer::isLeader).collect(Collectors.toList()); - - } - - /** - * Get all non-leader players in the clan - * - * @return non leaders - */ - public List getNonLeaders() { - - return members.stream().filter(cp -> !cp.isLeader()).collect(Collectors.toList()); - - } - - /** - * Get all clan's members - * - * @deprecated use {@link Clan#getMembers()} + * @deprecated use {@link Union#getMembers()} */ @Deprecated - public List getAllMembers() { + public List getAllMembers() { return getMembers(); } /** - * Get all the ally clan's members + * Get all the ally union's members */ - public Set getAllAllyMembers() { + public Set getAllAllyMembers() { - Set out = new HashSet<>(); + Set out = new HashSet<>(); for (String tag : allies) { - Clan ally = UnionsOG.getInstance().getClanManager().getClan(tag); + Union ally = UnionsOG.getInstance().getUnionManager().getUnion(tag); if (ally != null) { @@ -995,7 +922,7 @@ public class Clan implements Serializable, Comparable { } /** - * Gets the clan's total KDR + * Gets the union's total KDR */ @Placeholder(value = "total_kdr", resolver = "kdr") @Placeholder(value = "topclans_position", resolver = "ranking_position") @@ -1010,7 +937,7 @@ public class Clan implements Serializable, Comparable { double totalWeightedKills = 0; int totalDeaths = 0; - for (ClanPlayer cp : members) { + for (UnionPlayer cp : members) { totalWeightedKills += cp.getWeightedKills(); totalDeaths += cp.getDeaths(); @@ -1028,7 +955,7 @@ public class Clan implements Serializable, Comparable { } /** - * Gets the clan's total KDR + * Gets the union's total KDR */ @Placeholder("total_deaths") public int getTotalDeaths() { @@ -1041,7 +968,7 @@ public class Clan implements Serializable, Comparable { } - for (ClanPlayer cp : members) { + for (UnionPlayer cp : members) { totalDeaths += cp.getDeaths(); @@ -1052,7 +979,7 @@ public class Clan implements Serializable, Comparable { } /** - * Gets average weighted kills for the clan + * Gets average weighted kills for the union */ @Placeholder("average_wk") public int getAverageWK() { @@ -1065,7 +992,7 @@ public class Clan implements Serializable, Comparable { } - for (ClanPlayer cp : members) { + for (UnionPlayer cp : members) { total += cp.getWeightedKills(); @@ -1083,14 +1010,14 @@ public class Clan implements Serializable, Comparable { } /** - * Gets total rival kills for the clan + * Gets total rival kills for the union */ @Placeholder("total_rival") public int getTotalRival() { int total = 0; - for (ClanPlayer cp : getMembers()) { + for (UnionPlayer cp : getMembers()) { total += cp.getRivalKills(); @@ -1101,14 +1028,14 @@ public class Clan implements Serializable, Comparable { } /** - * Gets total neutral kills for the clan + * Gets total neutral kills for the union */ @Placeholder("total_neutral") public int getTotalNeutral() { int total = 0; - for (ClanPlayer cp : getMembers()) { + for (UnionPlayer cp : getMembers()) { total += cp.getNeutralKills(); @@ -1119,14 +1046,14 @@ public class Clan implements Serializable, Comparable { } /** - * Gets total civilian kills for the clan + * Gets total civilian kills for the union */ @Placeholder("total_civilian") public int getTotalCivilian() { int total = 0; - for (ClanPlayer cp : getMembers()) { + for (UnionPlayer cp : getMembers()) { total += cp.getCivilianKills(); @@ -1141,7 +1068,7 @@ public class Clan implements Serializable, Comparable { int total = 0; - for (ClanPlayer cp : getMembers()) { + for (UnionPlayer cp : getMembers()) { total += cp.getAllyKills(); @@ -1152,160 +1079,100 @@ public class Clan implements Serializable, Comparable { } /** - * Check whether the clan has crossed the rival limit + * Check whether the union has crossed the rival limit */ public boolean reachedRivalLimit() { int rivalCount = rivals.size(); - int clanCount = UnionsOG.getInstance().getClanManager().getRivableClanCount() - 1; + int unionCount = UnionsOG.getInstance().getUnionManager().getRivableUnionCount() - 1; double rivalPercent = UnionsOG.getInstance().getSettingsManager().getPercent(RIVAL_LIMIT_PERCENT); - double limit = ((double) clanCount) * (rivalPercent / ((double) 100)); + double limit = ((double) unionCount) * (rivalPercent / ((double) 100)); return rivalCount > limit; } /** - * Add a new player to the clan + * Add a new player to the union */ - public void addPlayerToClan(ClanPlayer cp) { + public void addPlayerToUnion(UnionPlayer cp) { - cp.removePastClan(getColorTag()); - cp.setClan(this); - cp.setLeader(false); + cp.removePastUnion(getColorTag()); + cp.setUnion(this); cp.setJoinDate(new Date().getTime()); - cp.setTrusted(UnionsOG.getInstance().getSettingsManager().is(CLAN_TRUST_MEMBERS_BY_DEFAULT)); - if (defaultRank != null) { - - cp.setRank(defaultRank); - - } - + cp.setTrusted(UnionsOG.getInstance().getSettingsManager().is(UNION_TRUST_MEMBERS_BY_DEFAULT)); importMember(cp); - UnionsOG.getInstance().getStorageManager().updateClanPlayer(cp); - UnionsOG.getInstance().getStorageManager().updateClan(this); + UnionsOG.getInstance().getStorageManager().updateUnionPlayer(cp); + UnionsOG.getInstance().getStorageManager().updateUnion(this); - // add clan permission - UnionsOG.getInstance().getPermissionsManager().addClanPermissions(cp); + // add union permission + UnionsOG.getInstance().getPermissionsManager().addUnionPermissions(cp); UnionsOG.getInstance().getPermissionsManager().addPlayerPermissions(cp); Player player = UnionsOG.getInstance().getServer().getPlayer(cp.getUniqueId()); if (player != null) { - UnionsOG.getInstance().getClanManager().updateDisplayName(player); + UnionsOG.getInstance().getUnionManager().updateDisplayName(player); } - Bukkit.getPluginManager().callEvent(new PlayerJoinedClanEvent(this, cp)); + Bukkit.getPluginManager().callEvent(new PlayerJoinedUnionEvent(this, cp)); } @SuppressWarnings("deprecation") - public void removePlayerFromClan(String playerName) { + public void removePlayerFromUnion(String playerName) { - removePlayerFromClan(Bukkit.getOfflinePlayer(playerName).getUniqueId()); + removePlayerFromUnion(Bukkit.getOfflinePlayer(playerName).getUniqueId()); } /** - * Remove a player from a clan + * Remove a player from a union */ - public void removePlayerFromClan(UUID playerUniqueId) { + public void removePlayerFromUnion(UUID playerUniqueId) { - ClanPlayer cp = UnionsOG.getInstance().getClanManager().getClanPlayer(playerUniqueId); + UnionPlayer cp = UnionsOG.getInstance().getUnionManager().getUnionPlayer(playerUniqueId); if (cp == null || !isMember(playerUniqueId)) { return; } - // remove clan group-permission - UnionsOG.getInstance().getPermissionsManager().removeClanPermissions(cp); + // remove union group-permission + UnionsOG.getInstance().getPermissionsManager().removeUnionPermissions(cp); // remove permissions - UnionsOG.getInstance().getPermissionsManager().removeClanPlayerPermissions(cp); + UnionsOG.getInstance().getPermissionsManager().removeUnionPlayerPermissions(cp); - cp.setClan(null); - cp.addPastClan(getColorTag() + (cp.isLeader() ? DARK_RED + "*" : "")); - cp.setLeader(false); + cp.setUnion(null); + cp.addPastUnion(getColorTag()); cp.setTrusted(false); cp.setJoinDate(0); - cp.setRank(null); removeMember(playerUniqueId); - UnionsOG.getInstance().getStorageManager().updateClanPlayer(cp); - UnionsOG.getInstance().getStorageManager().updateClan(this); + UnionsOG.getInstance().getStorageManager().updateUnionPlayer(cp); + UnionsOG.getInstance().getStorageManager().updateUnion(this); Player matched = UnionsOG.getInstance().getServer().getPlayer(playerUniqueId); if (matched != null) { - UnionsOG.getInstance().getClanManager().updateDisplayName(matched); + UnionsOG.getInstance().getUnionManager().updateDisplayName(matched); } - Bukkit.getPluginManager().callEvent(new PlayerKickedClanEvent(this, cp)); - - } - - @SuppressWarnings("deprecation") - public void promote(String playerName) { - - promote(Bukkit.getOfflinePlayer(playerName).getUniqueId()); + Bukkit.getPluginManager().callEvent(new PlayerKickedUnionEvent(this, cp)); } /** - * Promote a member to a leader of a clan + * Add an ally to a union, and the union to the ally */ - public void promote(UUID playerUniqueId) { - - ClanPlayer cp = UnionsOG.getInstance().getClanManager().getCreateClanPlayer(playerUniqueId); - - cp.setLeader(true); - cp.setTrusted(true); - - UnionsOG.getInstance().getStorageManager().updateClanPlayer(cp); - UnionsOG.getInstance().getStorageManager().updateClan(this); - - // add clan permission - UnionsOG.getInstance().getPermissionsManager().addClanPermissions(cp); - Bukkit.getPluginManager().callEvent(new PlayerPromoteEvent(this, cp)); - - } - - @SuppressWarnings("deprecation") - public void demote(String playerName) { - - demote(Bukkit.getOfflinePlayer(playerName).getUniqueId()); - - } - - /** - * Demote a leader back to a member of a clan - */ - public void demote(UUID playerUniqueId) { - - ClanPlayer cp = UnionsOG.getInstance().getClanManager().getCreateClanPlayer(playerUniqueId); - - cp.setLeader(false); - - UnionsOG.getInstance().getStorageManager().updateClanPlayer(cp); - UnionsOG.getInstance().getStorageManager().updateClan(this); - - // add clan permission - UnionsOG.getInstance().getPermissionsManager().addClanPermissions(cp); - Bukkit.getPluginManager().callEvent(new PlayerDemoteEvent(this, cp)); - - } - - /** - * Add an ally to a clan, and the clan to the ally - */ - public void addAlly(Clan ally) { + public void addAlly(Union ally) { removeRival(ally.getTag()); addAlly(ally.getTag()); @@ -1313,30 +1180,30 @@ public class Clan implements Serializable, Comparable { ally.removeRival(getTag()); ally.addAlly(getTag()); - UnionsOG.getInstance().getStorageManager().updateClan(this); - UnionsOG.getInstance().getStorageManager().updateClan(ally); - Bukkit.getPluginManager().callEvent(new AllyClanAddEvent(this, ally)); + UnionsOG.getInstance().getStorageManager().updateUnion(this); + UnionsOG.getInstance().getStorageManager().updateUnion(ally); + Bukkit.getPluginManager().callEvent(new AllyUnionAddEvent(this, ally)); } /** - * Remove an ally from the clan, and the clan from the ally + * Remove an ally from the union, and the union from the ally */ - public void removeAlly(Clan ally) { + public void removeAlly(Union ally) { removeAlly(ally.getTag()); ally.removeAlly(getTag()); - UnionsOG.getInstance().getStorageManager().updateClan(this); - UnionsOG.getInstance().getStorageManager().updateClan(ally); - Bukkit.getPluginManager().callEvent(new AllyClanRemoveEvent(this, ally)); + UnionsOG.getInstance().getStorageManager().updateUnion(this); + UnionsOG.getInstance().getStorageManager().updateUnion(ally); + Bukkit.getPluginManager().callEvent(new AllyUnionRemoveEvent(this, ally)); } /** - * Add a rival to the clan, and the clan to the rival + * Add a rival to the union, and the union to the rival */ - public void addRival(Clan rival) { + public void addRival(Union rival) { removeAlly(rival.getTag()); addRival(rival.getTag()); @@ -1344,28 +1211,28 @@ public class Clan implements Serializable, Comparable { rival.removeAlly(getTag()); rival.addRival(getTag()); - UnionsOG.getInstance().getStorageManager().updateClan(this); - UnionsOG.getInstance().getStorageManager().updateClan(rival); - Bukkit.getPluginManager().callEvent(new RivalClanAddEvent(this, rival)); + UnionsOG.getInstance().getStorageManager().updateUnion(this); + UnionsOG.getInstance().getStorageManager().updateUnion(rival); + Bukkit.getPluginManager().callEvent(new RivalUnionAddEvent(this, rival)); } /** - * Removes a rival from the clan, the clan from the rival + * Removes a rival from the union, the union from the rival */ - public void removeRival(Clan rival) { + public void removeRival(Union rival) { removeRival(rival.getTag()); rival.removeRival(getTag()); - UnionsOG.getInstance().getStorageManager().updateClan(this); - UnionsOG.getInstance().getStorageManager().updateClan(rival); - Bukkit.getPluginManager().callEvent(new RivalClanRemoveEvent(this, rival)); + UnionsOG.getInstance().getStorageManager().updateUnion(this); + UnionsOG.getInstance().getStorageManager().updateUnion(rival); + Bukkit.getPluginManager().callEvent(new RivalUnionRemoveEvent(this, rival)); } /** - * Check whether any clan member is online + * Check whether any union member is online */ @Placeholder("is_anyonline") public boolean isAnyOnline() { @@ -1375,177 +1242,68 @@ public class Clan implements Serializable, Comparable { } /** - * Checks if there are enough leaders online to vote - * - * @param cp the one to demote - * @return true if there are + * Change a union's tag */ - public boolean enoughLeadersOnlineToDemote(ClanPlayer cp) { - - List online = getOnlineLeaders(); - online.remove(cp); - - double minimum = UnionsOG.getInstance().getSettingsManager().getPercent(CLAN_PERCENTAGE_ONLINE_TO_DEMOTE); - // all leaders minus the one being demoted - double totalLeaders = getLeaders().size() - 1; - double onlineLeaders = online.size(); - - return ((onlineLeaders / totalLeaders) * 100) >= minimum; - - } - - /** - * Gets the online leaders - * - * @return the online leaders - */ - public List getOnlineLeaders() { - - return getOnlineMembers().stream().filter(ClanPlayer::isLeader).collect(Collectors.toList()); - - } - - /** - * Check whether all leaders of a clan are online - */ - public boolean allLeadersOnline() { - - List leaders = getLeaders(); - - for (ClanPlayer leader : leaders) { - - if (leader.toPlayer() == null) { - - return false; - - } - - } - - return true; - - } - - /** - * Check whether all leaders, except for the one passed in, are online - */ - @Deprecated - public boolean allOtherLeadersOnline(String playerName) { - - List leaders = getLeaders(); - - for (ClanPlayer leader : leaders) { - - if (leader.getName().equalsIgnoreCase(playerName)) { - - continue; - - } - - if (leader.toPlayer() == null) { - - return false; - - } - - } - - return true; - - } - - /** - * Check whether all leaders, except for the one passed in, are online - */ - public boolean allOtherLeadersOnline(UUID playerUniqueId) { - - List leaders = getLeaders(); - - for (ClanPlayer leader : leaders) { - - if (leader.getUniqueId().equals(playerUniqueId)) { - - continue; - - } - - if (leader.toPlayer() == null) { - - return false; - - } - - } - - return true; - - } - - /** - * Change a clan's tag - */ - public void changeClanTag(String tag) { + public void changeUnionTag(String tag) { setColorTag(tag); - UnionsOG.getInstance().getStorageManager().updateClan(this); + UnionsOG.getInstance().getStorageManager().updateUnion(this); } /** - * Announce message to a whole clan + * Announce message to a whole union */ - public void clanAnnounce(String playerName, String msg) { + public void unionAnnounce(String playerName, String msg) { - String message = UnionsOG.getInstance().getSettingsManager().getColored(CLANCHAT_ANNOUNCEMENT_COLOR) + msg; + String message = UnionsOG.getInstance().getSettingsManager().getColored(UNIONCHAT_ANNOUNCEMENT_COLOR) + msg; - for (ClanPlayer cp : getMembers()) { + for (UnionPlayer cp : getMembers()) { ChatBlock.sendMessage(cp, message); } - Bukkit.getConsoleSender().sendMessage(AQUA + "[" + lang("clan.announce") + AQUA + "] " + AQUA + "[" + Bukkit.getConsoleSender().sendMessage(AQUA + "[" + lang("union.announce") + AQUA + "] " + AQUA + "[" + Helper.getColorName(playerName) + WHITE + "] " + message); } /** - * Announce message to all the leaders of a clan + * Announce message to all the members of a union */ - public void leaderAnnounce(String msg) { + public void memberAnnounce(String msg) { - String message = UnionsOG.getInstance().getSettingsManager().getColored(CLANCHAT_ANNOUNCEMENT_COLOR) + msg; + String message = UnionsOG.getInstance().getSettingsManager().getColored(UNIONCHAT_ANNOUNCEMENT_COLOR) + msg; - List leaders = getLeaders(); - - for (ClanPlayer cp : leaders) { + for (UnionPlayer cp : getMembers()) { ChatBlock.sendMessage(cp, message); } - Bukkit.getConsoleSender().sendMessage(AQUA + "[" + lang("leader.announce") + AQUA + "] " + WHITE + message); + Bukkit.getConsoleSender().sendMessage(AQUA + "[" + lang("union.announce") + AQUA + "] " + WHITE + message); } /** - * Add a new bb message and announce it to all online members of a clan + * Add a new bb message and announce it to all online members of a union */ public void addBb(String announcerName, String msg) { addBb(msg); - clanAnnounce(announcerName, + unionAnnounce(announcerName, UnionsOG.getInstance().getSettingsManager().getColored(BB_PREFIX) + ChatUtils.parseColors(msg)); } /** - * Add a new bb message and announce it to all online members of a clan + * Add a new bb message and announce it to all online members of a union */ public void addBb(String announcerName, String msg, boolean updateLastUsed) { addBb(msg, updateLastUsed); - clanAnnounce(announcerName, + unionAnnounce(announcerName, UnionsOG.getInstance().getSettingsManager().getColored(BB_PREFIX) + ChatUtils.parseColors(msg)); } @@ -1644,7 +1402,7 @@ public class Clan implements Serializable, Comparable { } /** - * Disbands the clan + * Disbands the union * * @param sender who is trying to disband * @param announce should it be announced? @@ -1652,8 +1410,8 @@ public class Clan implements Serializable, Comparable { */ public void disband(@Nullable CommandSender sender, boolean announce, boolean force) { - Collection clanPlayers = UnionsOG.getInstance().getClanManager().getAllClanPlayers(); - List clans = UnionsOG.getInstance().getClanManager().getClans(); + Collection unionPlayers = UnionsOG.getInstance().getUnionManager().getAllUnionPlayers(); + List unions = UnionsOG.getInstance().getUnionManager().getUnions(); if (isPermanent() && !force) { @@ -1666,40 +1424,40 @@ public class Clan implements Serializable, Comparable { if (UnionsOG.getInstance().getSettingsManager().is(DISABLE_MESSAGES) && sender != null) { - clanAnnounce(sender.getName(), AQUA + lang("clan.has.been.disbanded", getName())); + unionAnnounce(sender.getName(), AQUA + lang("union.has.been.disbanded", getName())); } else { - UnionsOG.getInstance().getClanManager() - .serverAnnounce(AQUA + lang("clan.has.been.disbanded", getName())); + UnionsOG.getInstance().getUnionManager() + .serverAnnounce(AQUA + lang("union.has.been.disbanded", getName())); } } - UnionsOG.getInstance().getPermissionsManager().removeClanPermissions(this); - for (ClanPlayer cp : clanPlayers) { + payOutBankOnDisband(); + + UnionsOG.getInstance().getPermissionsManager().removeUnionPermissions(this); + for (UnionPlayer cp : unionPlayers) { if (cp.getTag().equals(getTag())) { - cp.setClan(null); + cp.setUnion(null); cp.setJoinDate(0); - cp.setRank(null); - cp.addPastClan(getColorTag() + (cp.isLeader() ? DARK_RED + "*" : "")); - cp.setLeader(false); + cp.addPastUnion(getColorTag()); } } - Bukkit.getPluginManager().callEvent(new DisbandClanEvent(sender, this)); - clans.remove(this); + Bukkit.getPluginManager().callEvent(new DisbandUnionEvent(sender, this)); + unions.remove(this); - for (Clan c : clans) { + for (Union c : unions) { - String disbanded = lang("clan.disbanded"); + String disbanded = lang("union.disbanded"); - if (c.removeWarringClan(this)) { + if (c.removeWarringUnion(this)) { c.addBb(disbanded, lang("you.are.no.longer.at.war", c.getName(), getColorTag())); @@ -1720,16 +1478,63 @@ public class Clan implements Serializable, Comparable { } UnionsOG.getInstance().getRequestManager().removeRequest(getTag()); + UnionsOG.getInstance().getProposalManager().remove(getTag()); UnionsOG.getInstance().getServer().getScheduler().scheduleSyncDelayedTask(UnionsOG.getInstance(), () -> { - UnionsOG.getInstance().getClanManager().removeClan(getTag()); - UnionsOG.getInstance().getStorageManager().deleteClan(this); + UnionsOG.getInstance().getUnionManager().removeUnion(getTag()); + UnionsOG.getInstance().getStorageManager().deleteUnion(this); }, 1); } + /** + * Splits the union's bank evenly between its members. Shards that cannot be + * divided evenly go to the first members in roster order, so nothing is lost. + *

+ * Does nothing while no economy is available, in which case the balance simply + * disappears with the union, as it does today. + *

+ */ + private void payOutBankOnDisband() { + + PermissionsManager permissions = UnionsOG.getInstance().getPermissionsManager(); + long shards = (long) getBalance(); + List members = getMembers(); + + if (!permissions.hasEconomy() || shards <= 0 || members.isEmpty()) { + + return; + + } + + long each = shards / members.size(); + long remainder = shards % members.size(); + + for (int i = 0; i < members.size(); i++) { + + UnionPlayer member = members.get(i); + long payout = each + (i < remainder ? 1 : 0); + if (payout <= 0) { + + continue; + + } + + if (permissions.grantPlayerShards(member.getUniqueId(), payout, "union disband payout")) { + + ChatBlock.sendMessage(member, + AQUA + lang("union.disbanded.payout", member, CurrencyFormat.formatShards(payout))); + + } + + } + + setBalance(BankOperator.INTERNAL, Cause.INTERNAL, SET, 0); + + } + public void disband() { disband(null, true, false); @@ -1737,7 +1542,7 @@ public class Clan implements Serializable, Comparable { } /** - * Whether this clan can be rivaled + * Whether this union can be rivaled */ @Placeholder("is_unrivable") public boolean isUnrivable() { @@ -1747,9 +1552,9 @@ public class Clan implements Serializable, Comparable { } /** - * Returns whether this clan is warring with another clan + * Returns whether this union is warring with another union * - * @param tag the tag of the clan we are at war with + * @param tag the tag of the union we are at war with */ public boolean isWarring(String tag) { @@ -1758,54 +1563,54 @@ public class Clan implements Serializable, Comparable { } /** - * Returns whether this clan is warring with another clan + * Returns whether this union is warring with another union * - * @param clan the clan we are testing against + * @param union the union we are testing against */ - public boolean isWarring(Clan clan) { + public boolean isWarring(Union union) { - return isWarring(clan.getTag()); + return isWarring(union.getTag()); } /** - * Add a clan to be at war with + * Add a union to be at war with */ - public void addWarringClan(@Nullable ClanPlayer requestPlayer, Clan targetClan) { + public void addWarringUnion(@Nullable UnionPlayer requestPlayer, Union targetUnion) { List warring = flags.getStringList(WARRING_KEY); - if (!warring.contains(targetClan.getTag())) { + if (!warring.contains(targetUnion.getTag())) { - warring.add(targetClan.getTag()); + warring.add(targetUnion.getTag()); flags.put(WARRING_KEY, warring); if (requestPlayer != null) { - addBb(requestPlayer.getName(), lang("you.are.at.war", getName(), targetClan.getColorTag())); + addBb(requestPlayer.getName(), lang("you.are.at.war", getName(), targetUnion.getColorTag())); } - UnionsOG.getInstance().getStorageManager().updateClan(this); + UnionsOG.getInstance().getStorageManager().updateUnion(this); } } - public void addWarringClan(Clan targetClan) { + public void addWarringUnion(Union targetUnion) { - addWarringClan(null, targetClan); + addWarringUnion(null, targetUnion); } /** - * Remove a warring clan + * Remove a warring union */ - public boolean removeWarringClan(Clan clan) { + public boolean removeWarringUnion(Union union) { List warring = flags.getStringList(WARRING_KEY); - if (warring.remove(clan.getTag())) { + if (warring.remove(union.getTag())) { flags.put(WARRING_KEY, warring); - UnionsOG.getInstance().getStorageManager().updateClan(this); + UnionsOG.getInstance().getStorageManager().updateUnion(this); return true; } @@ -1815,14 +1620,14 @@ public class Clan implements Serializable, Comparable { } /** - * Return a collection of all the warring clans + * Return a collection of all the warring unions * - * @return the clan list + * @return the union list */ - public List getWarringClans() { + public List getWarringUnions() { return flags.getStringList(WARRING_KEY).stream() - .map(tag -> UnionsOG.getInstance().getClanManager().getClan(tag)).collect(Collectors.toList()); + .map(tag -> UnionsOG.getInstance().getUnionManager().getUnion(tag)).collect(Collectors.toList()); } @@ -1854,9 +1659,9 @@ public class Clan implements Serializable, Comparable { Iterator iterator = warring.iterator(); while (iterator.hasNext()) { - String clanTag = iterator.next(); - Clan clan = UnionsOG.getInstance().getClanManager().getClan(clanTag); - if (clan == null) { + String unionTag = iterator.next(); + Union union = UnionsOG.getInstance().getUnionManager().getUnion(unionTag); + if (union == null) { iterator.remove(); @@ -1880,7 +1685,7 @@ public class Clan implements Serializable, Comparable { String name = UnionsOG.getInstance().getProxyManager().getServerName(); flags.put("homeServer", name); - UnionsOG.getInstance().getStorageManager().updateClan(this); + UnionsOG.getInstance().getStorageManager().updateUnion(this); } @@ -1910,15 +1715,14 @@ public class Clan implements Serializable, Comparable { } - public String getTagLabel(boolean isLeader) { + public String getTagLabel() { SettingsManager sm = UnionsOG.getInstance().getSettingsManager(); - String bracketColor = isLeader ? sm.getColored(TAG_BRACKET_LEADER_COLOR) : sm.getColored(TAG_BRACKET_COLOR); + String bracketColor = sm.getColored(TAG_BRACKET_COLOR); String bracketDefaultColor = sm.getColored(TAG_DEFAULT_COLOR); String bracketLeft = sm.getColored(TAG_BRACKET_LEFT); String bracketRight = sm.getColored(TAG_BRACKET_RIGHT); - String tagSeparatorColor = isLeader ? sm.getColored(TAG_SEPARATOR_LEADER_COLOR) - : sm.getColored(TAG_SEPARATOR_COLOR); + String tagSeparatorColor = sm.getColored(TAG_SEPARATOR_COLOR); String tagSeparator = sm.getString(TAG_SEPARATOR_CHAR); return bracketColor + bracketLeft + bracketDefaultColor + getColorTag() + bracketColor + bracketRight @@ -1984,136 +1788,6 @@ public class Clan implements Serializable, Comparable { } - /** - * Checks if the clan has the specified rank - * - * @param name the rank - */ - public boolean hasRank(@Nullable String name) { - - return getRank(name) != null; - - } - - /** - * Creates a rank - */ - public void createRank(String name) { - - Rank rank = new Rank(name); - ranks.add(rank); - - } - - /** - * Returns the clan's ranks - * - * @return the ranks - */ - public List getRanks() { - - return ranks; - - } - - /** - * Sets the clan's ranks - */ - public void setRanks(@Nullable List ranks) { - - if (ranks == null) { - - ranks = new ArrayList<>(); - - } - - this.ranks = ranks; - - } - - /** - * Deletes a rank with the specified name - */ - public void deleteRank(String name) { - - Rank r = getRank(name); - if (r != null) { - - ranks.remove(r); - - getMembers().forEach(cp -> { - - if (Objects.equals(cp.getRankId(), r.getName())) { - - cp.setRank(""); - UnionsOG.getInstance().getStorageManager().updateClanPlayer(cp); - - } - - }); - - } - - } - - /** - * Gets a rank with the specified name or null if not found - * - * @param name the rank name - * @return a rank or null - */ - public @Nullable Rank getRank(@Nullable String name) { - - if (name != null) { - - for (Rank r : ranks) { - - if (r.getName().equals(name)) { - - return r; - - } - - } - - } - - return null; - - } - - /** - * Sets the default rank for this clan. - * - * @param name The name of the rank to be set as default - */ - public void setDefaultRank(@Nullable String name) { - - // I don't know how this could happen, but if it somehow does, here's a check - // for it - if (!hasRank(name)) { - - defaultRank = null; - - } else { - - defaultRank = name; - - } - - } - - /** - * Gets the default rank for this clan. - * - * @return The default rank or null if there is no default - */ - public @Nullable String getDefaultRank() { - - return defaultRank; - - } - public void setBanner(@Nullable ItemStack banner) { if (banner == null) { diff --git a/src/main/java/net/trueog/unionsog/ClanPlayer.java b/src/main/java/net/trueog/unionsog/UnionPlayer.java similarity index 78% rename from src/main/java/net/trueog/unionsog/ClanPlayer.java rename to src/main/java/net/trueog/unionsog/UnionPlayer.java index 4f0b83af..3ad359d5 100644 --- a/src/main/java/net/trueog/unionsog/ClanPlayer.java +++ b/src/main/java/net/trueog/unionsog/UnionPlayer.java @@ -26,34 +26,33 @@ import static net.trueog.unionsog.managers.SettingsManager.ConfigField.*; /** * @author phaed */ -public class ClanPlayer implements Serializable, Comparable { +public class UnionPlayer implements Serializable, Comparable { private static final long serialVersionUID = 1L; private UUID uniqueId; private String displayName; - private boolean leader; private boolean trusted; private String tag; - private @Nullable Clan clan; + private @Nullable Union union; private boolean friendlyFire; private final Map kills = new HashMap<>(); private int deaths; private long lastSeen; private long joinDate; - private final Set pastClans = new LinkedHashSet<>(); + private final Set pastUnions = new LinkedHashSet<>(); private final Map resignTimes = new HashMap<>(); private @Nullable VoteResult vote; private Flags flags = new Flags(null); private boolean allyChatMute = false; - private boolean clanChatMute = false; + private boolean unionChatMute = false; private @Nullable Locale locale; /** * */ - public ClanPlayer() { + public UnionPlayer() { this.tag = ""; @@ -63,7 +62,7 @@ public class ClanPlayer implements Serializable, Comparable { * */ @Deprecated - public ClanPlayer(String playerName) { + public UnionPlayer(String playerName) { this(Bukkit.getOfflinePlayer(playerName).getUniqueId()); @@ -72,7 +71,7 @@ public class ClanPlayer implements Serializable, Comparable { /** * @param uuid the Player's UUID */ - public ClanPlayer(UUID uuid) { + public UnionPlayer(UUID uuid) { uniqueId = uuid; Player onlinePlayer = UnionsOG.getInstance().getServer().getPlayer(uuid); @@ -103,19 +102,19 @@ public class ClanPlayer implements Serializable, Comparable { @Override public boolean equals(Object obj) { - if (!(obj instanceof ClanPlayer)) { + if (!(obj instanceof UnionPlayer)) { return false; } - ClanPlayer other = (ClanPlayer) obj; + UnionPlayer other = (UnionPlayer) obj; return other.getName().equals(getName()); } @Override - public int compareTo(ClanPlayer other) { + public int compareTo(UnionPlayer other) { return getUniqueId().compareTo(other.getUniqueId()); @@ -185,46 +184,17 @@ public class ClanPlayer implements Serializable, Comparable { } - /** - * Whether this player is a leader or not - * - * @return the leader - */ - @Placeholder("is_leader") - public boolean isLeader() { - - return leader; - - } - - /** - * Sets this player as a leader (does not update clanplayer to db) - * - * @param leader the leader to set - */ - public void setLeader(boolean leader) { - - if (leader) { - - trusted = true; - - } - - this.leader = leader; - - } - /** * Check whether the player is an ally with another player */ public boolean isAlly(Player player) { - ClanPlayer allycp = UnionsOG.getInstance().getClanManager().getClanPlayer(player); + UnionPlayer allycp = UnionsOG.getInstance().getUnionManager().getUnionPlayer(player); if (allycp != null) { // noinspection ConstantConditions - return allycp.getClan().isAlly(tag); + return allycp.getUnion().isAlly(tag); } @@ -237,12 +207,12 @@ public class ClanPlayer implements Serializable, Comparable { */ public boolean isRival(Player player) { - ClanPlayer allycp = UnionsOG.getInstance().getClanManager().getClanPlayer(player); + UnionPlayer allycp = UnionsOG.getInstance().getUnionManager().getUnionPlayer(player); if (allycp != null) { // noinspection ConstantConditions - return allycp.getClan().isRival(tag); + return allycp.getUnion().isRival(tag); } @@ -361,7 +331,7 @@ public class ClanPlayer implements Serializable, Comparable { } /** - * Adds one rival kill to this player (does not update clanplayer to db) + * Adds one rival kill to this player (does not update unionplayer to db) */ @Deprecated public void addRivalKill() { @@ -394,7 +364,7 @@ public class ClanPlayer implements Serializable, Comparable { } /** - * Adds one civilian kill to this player (does not update clanplayer to db) + * Adds one civilian kill to this player (does not update unionplayer to db) */ @Deprecated public void addCivilianKill() { @@ -427,7 +397,7 @@ public class ClanPlayer implements Serializable, Comparable { } /** - * Adds one civilian kill to this player (does not update clanplayer to db) + * Adds one civilian kill to this player (does not update unionplayer to db) */ @Deprecated public void addNeutralKill() { @@ -472,7 +442,7 @@ public class ClanPlayer implements Serializable, Comparable { /** * Sets whether this player is allowing friendly fire (does not update - * clanplayer to db) + * unionplayer to db) * * @param friendlyFire the friendlyFire to set */ @@ -528,7 +498,7 @@ public class ClanPlayer implements Serializable, Comparable { } /** - * Adds one death to this player (does not update clanplayer to db) + * Adds one death to this player (does not update unionplayer to db) */ public void addDeath() { @@ -578,8 +548,8 @@ public class ClanPlayer implements Serializable, Comparable { } /** - * Returns the player's join date to his current clan in milliseconds, 0 if not - * in a clan + * Returns the player's join date to his current union in milliseconds, 0 if not + * in a union * * @return the joinDate */ @@ -601,7 +571,7 @@ public class ClanPlayer implements Serializable, Comparable { } /** - * Returns a string representation of the join date, blank if not in a clan + * Returns a string representation of the join date, blank if not in a union */ @Placeholder("join_date") public String getJoinDateString() { @@ -663,92 +633,92 @@ public class ClanPlayer implements Serializable, Comparable { /** * (used internally) * - * @return the PackedPastClans + * @return the PackedPastUnions */ - public String getPackedPastClans() { + public String getPackedPastUnions() { - return String.join("|", getPastClans()); + return String.join("|", getPastUnions()); } /** * (used internally) * - * @param packedPastClans the packedPastClans to set + * @param packedPastUnions the packedPastUnions to set */ - public void setPackedPastClans(String packedPastClans) { + public void setPackedPastUnions(String packedPastUnions) { - String[] clans = packedPastClans.split("\\|"); - Collections.addAll(pastClans, clans); + String[] unions = packedPastUnions.split("\\|"); + Collections.addAll(pastUnions, unions); } /** - * Adds a past clan to the player (does not update the clanplayer to db) + * Adds a past union to the player (does not update the unionplayer to db) */ - public void addPastClan(String tag) { + public void addPastUnion(String tag) { - getPastClans().add(tag); + getPastUnions().add(tag); } /** - * Removes a past clan from the player (does not update the clanplayer to db) + * Removes a past union from the player (does not update the unionplayer to db) * - * @param tag is the clan's colored tag + * @param tag is the union's colored tag */ - public void removePastClan(String tag) { + public void removePastUnion(String tag) { - getPastClans().remove(tag); + getPastUnions().remove(tag); } /** * @param sep the separator - * @return a separator delimited string with the color tags for all past clans + * @return a separator delimited string with the color tags for all past unions * this player has been in */ @NotNull - public String getPastClansString(@NotNull String sep) { + public String getPastUnionsString(@NotNull String sep) { - return getPastClansString(sep, null); + return getPastUnionsString(sep, null); } /** * @param sep the separator - * @param viewer the Player viewing the clan's string - * @return a separator delimited string with the color tags for all past clans + * @param viewer the Player viewing the union's string + * @return a separator delimited string with the color tags for all past unions * this player has been in */ @NotNull - public String getPastClansString(String sep, @Nullable Player viewer) { + public String getPastUnionsString(String sep, @Nullable Player viewer) { - if (getPastClans().isEmpty()) { + if (getPastUnions().isEmpty()) { return lang("none", viewer); } SettingsManager settings = UnionsOG.getInstance().getSettingsManager(); - return getPastClans().stream().sorted(Collections.reverseOrder()).limit(settings.getInt(PAST_CLANS_LIMIT)) + return getPastUnions().stream().sorted(Collections.reverseOrder()).limit(settings.getInt(PAST_UNIONS_LIMIT)) .collect(Collectors.joining(sep)); } /** - * Returns a list with all past clans color tags this player has been in + * Returns a list with all past unions color tags this player has been in * - * @return the pastClans + * @return the pastUnions */ - public Set getPastClans() { + public Set getPastUnions() { - return pastClans; + return pastUnions; } /** - * Returns a map containing the time the player resigned from certain clans + * Returns a map containing the time the player resigned from certain unions * * @return the resign times */ @@ -759,7 +729,7 @@ public class ClanPlayer implements Serializable, Comparable { } /** - * Returns the time in millis when the player resigned from the clan + * Returns the time in millis when the player resigned from the union * * @return the time in millis */ @@ -793,7 +763,7 @@ public class ClanPlayer implements Serializable, Comparable { } /** - * Adds the clan to the resign times map + * Adds the union to the resign times map */ public void addResignTime(String tag) { @@ -803,41 +773,41 @@ public class ClanPlayer implements Serializable, Comparable { } /** - * Returns this player's clan + * Returns this player's union * - * @return the clan + * @return the union */ @Nullable @Placeholder(value = "in_clan", resolver = "not_null_return") - public Clan getClan() { + public Union getUnion() { - return clan; + return union; } /** * (used internally) * - * @param clan the clan to set + * @param union the union to set */ - public void setClan(@Nullable Clan clan) { + public void setUnion(@Nullable Union union) { - if (clan == null) { + if (union == null) { tag = ""; } else { - tag = clan.getTag(); + tag = union.getTag(); } - this.clan = clan; + this.union = union; } /** - * Returns this player's clan's tag. Empty string if he's not in a clan. + * Returns this player's union's tag. Empty string if he's not in a union. * * @return the tag */ @@ -849,20 +819,20 @@ public class ClanPlayer implements Serializable, Comparable { } /** - * Returns this player's clan's tag label. Empty string if he's not in a clan. + * Returns this player's union's tag label. Empty string if he's not in a union. * * @return the tag */ @Placeholder("tag_label") public String getTagLabel() { - if (clan == null) { + if (union == null) { return ""; } - return clan.getTagLabel(isLeader()); + return union.getTagLabel(); } @@ -880,7 +850,7 @@ public class ClanPlayer implements Serializable, Comparable { } /** - * Sets this player's trusted status (does not update the clanplayer to db) + * Sets this player's trusted status (does not update the unionplayer to db) * * @param trusted the trusted to set */ @@ -948,7 +918,7 @@ public class ClanPlayer implements Serializable, Comparable { } @Deprecated - public boolean isClanChat() { + public boolean isUnionChat() { return true; @@ -965,7 +935,7 @@ public class ClanPlayer implements Serializable, Comparable { } @Deprecated - public void setClanChat(boolean clanChat) { + public void setUnionChat(boolean unionChat) { } @@ -985,7 +955,7 @@ public class ClanPlayer implements Serializable, Comparable { public void setBbEnabled(boolean bbEnabled) { flags.put("bb-enabled", bbEnabled); - UnionsOG.getInstance().getStorageManager().updateClanPlayer(this); + UnionsOG.getInstance().getStorageManager().updateUnionPlayer(this); } @@ -999,7 +969,7 @@ public class ClanPlayer implements Serializable, Comparable { public void setInviteEnabled(boolean inviteEnabled) { flags.put("invite", inviteEnabled); - UnionsOG.getInstance().getStorageManager().updateClanPlayer(this); + UnionsOG.getInstance().getStorageManager().updateUnionPlayer(this); } @@ -1026,8 +996,8 @@ public class ClanPlayer implements Serializable, Comparable { flags.put("hide-tag", tagEnabled); - UnionsOG.getInstance().getStorageManager().updateClanPlayer(this); - UnionsOG.getInstance().getClanManager().updateDisplayName(toPlayer()); + UnionsOG.getInstance().getStorageManager().updateUnionPlayer(this); + UnionsOG.getInstance().getUnionManager().updateDisplayName(toPlayer()); } @@ -1038,59 +1008,6 @@ public class ClanPlayer implements Serializable, Comparable { } - @Placeholder("rank_displayname") - public String getRankDisplayName() { - - if (clan != null) { - - Rank r = clan.getRank(getRankId()); - if (r != null) { - - return r.getDisplayName(); - - } - - } - - return ""; - - } - - @Placeholder("has_rank") - public boolean hasRank() { - - return !getRankId().isEmpty(); - - } - - @Placeholder("rank") - public @NotNull String getRankId() { - - return flags.getString("rank", ""); - - } - - /** - * Gets the rank displayname - */ - @Deprecated - public String getRank() { - - return getRankDisplayName(); - - } - - /** - * Sets the rank id - * - * @param rank the rank id - */ - public void setRank(@Nullable String rank) { - - flags.put("rank", rank == null ? "" : rank); - - } - public @Nullable Locale getLocale() { return locale; @@ -1121,8 +1038,8 @@ public class ClanPlayer implements Serializable, Comparable { switch (channel) { - case CLAN: - clanChatMute = b; + case UNION: + unionChatMute = b; break; case ALLY: allyChatMute = b; @@ -1132,17 +1049,17 @@ public class ClanPlayer implements Serializable, Comparable { } /** - * @deprecated use {@link ClanPlayer#mute(Channel, boolean)} + * @deprecated use {@link UnionPlayer#mute(Channel, boolean)} */ @Deprecated public void setMuted(boolean b) { - clanChatMute = b; + unionChatMute = b; } /** - * @deprecated use {@link ClanPlayer#mute(Channel, boolean)} + * @deprecated use {@link UnionPlayer#mute(Channel, boolean)} */ @Deprecated public void setMutedAlly(boolean b) { @@ -1154,7 +1071,7 @@ public class ClanPlayer implements Serializable, Comparable { @Placeholder("is_muted") public boolean isMuted() { - return clanChatMute; + return unionChatMute; } @@ -1199,7 +1116,7 @@ public class ClanPlayer implements Serializable, Comparable { } public enum Channel { - CLAN, ALLY, NONE + UNION, ALLY, NONE } } diff --git a/src/main/java/net/trueog/unionsog/UnionRequest.java b/src/main/java/net/trueog/unionsog/UnionRequest.java new file mode 100644 index 00000000..21ec2a10 --- /dev/null +++ b/src/main/java/net/trueog/unionsog/UnionRequest.java @@ -0,0 +1,15 @@ +package net.trueog.unionsog; + +/** + * Requests that are sent to another union and resolved by the first member of + * that union who answers. + *

+ * Decisions that only concern a union's own members are not requests, they are + * {@link Proposal}s and need a consensus of that union's members. + *

+ * + * @author phaed + */ +public enum UnionRequest { + INVITE, CREATE_ALLY, BREAK_RIVALRY, END_WAR +} diff --git a/src/main/java/net/trueog/unionsog/UnionsOG.java b/src/main/java/net/trueog/unionsog/UnionsOG.java index efa0c3d8..64d239a9 100644 --- a/src/main/java/net/trueog/unionsog/UnionsOG.java +++ b/src/main/java/net/trueog/unionsog/UnionsOG.java @@ -1,6 +1,7 @@ package net.trueog.unionsog; import co.aikar.commands.BukkitCommandIssuer; +import net.trueog.unionsog.commands.GroupAliasCommand; import net.trueog.unionsog.commands.SCCommandManager; import net.trueog.unionsog.hooks.papi.UnionsOGExpansion; import net.trueog.unionsog.hooks.papi.UnionsOGMiniPlaceholders; @@ -22,6 +23,7 @@ import net.trueog.unionsog.utils.ChatUtils; import net.trueog.unionsog.utils.TagValidator; import net.trueog.unionsog.uuid.UUIDMigration; import org.bukkit.command.CommandSender; +import org.bukkit.command.PluginCommand; import org.bukkit.entity.Player; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; @@ -50,8 +52,9 @@ public class UnionsOG extends JavaPlugin { private static LanguageResource languageResource; private static final Logger logger = Logger.getLogger("Unions-OG"); private SCCommandManager commandManager; - private ClanManager clanManager; + private UnionManager unionManager; private RequestManager requestManager; + private ProposalManager proposalManager; private StorageManager storageManager; private SettingsManager settingsManager; private PermissionsManager permissionsManager; @@ -124,7 +127,7 @@ public class UnionsOG extends JavaPlugin { permissionsManager = new PermissionsManager(); requestManager = new RequestManager(); - clanManager = new ClanManager(); + unionManager = new UnionManager(); proxyManager = new BungeeManager(this); try { @@ -138,6 +141,7 @@ public class UnionsOG extends JavaPlugin { } + proposalManager = new ProposalManager(); teleportManager = new TeleportManager(); protectionManager = new ProtectionManager(); protectionManager.registerListeners(); @@ -151,6 +155,8 @@ public class UnionsOG extends JavaPlugin { new UnionBankZeroMigration(this).migrate(); // TODO: end + registerGroupAliases(); + tagValidator = new TagValidator(settingsManager, permissionsManager); logStatus(); @@ -161,13 +167,34 @@ public class UnionsOG extends JavaPlugin { } + /** + * Points other group plugins' command words at {@code /union}. + */ + private void registerGroupAliases() { + + GroupAliasCommand executor = new GroupAliasCommand(); + for (String alias : GroupAliasCommand.ALIASES) { + + PluginCommand command = getCommand(alias); + if (command == null) { + + getLogger().warning("Group alias /" + alias + " is not registered in plugin.yml, skipping it."); + continue; + + } + + command.setExecutor(executor); + command.setTabCompleter(executor); + + } + + } + private void logStatus() { getLogger().info("Multithreading: " + settingsManager.is(PERFORMANCE_USE_THREADS)); getLogger().info("BungeeCord: " + settingsManager.is(PERFORMANCE_USE_BUNGEECORD)); getLogger().info("HEX support: " + ChatUtils.HEX_COLOR_SUPPORT); - getLogger().info( - "Help us translate Unions-OG to your language! " + "Access https://crowdin.com/project/simpleclans/"); } @@ -249,11 +276,11 @@ public class UnionsOG extends JavaPlugin { } /** - * @return the clanManager + * @return the unionManager */ - public ClanManager getClanManager() { + public UnionManager getUnionManager() { - return clanManager; + return unionManager; } @@ -266,6 +293,15 @@ public class UnionsOG extends JavaPlugin { } + /** + * @return the proposalManager + */ + public ProposalManager getProposalManager() { + + return proposalManager; + + } + /** * @return the storageManager */ @@ -343,14 +379,14 @@ public class UnionsOG extends JavaPlugin { } @Nullable - public static String optionalLang(@NotNull String key, @Nullable ClanPlayer clanPlayer, Object... arguments) { + public static String optionalLang(@NotNull String key, @Nullable UnionPlayer unionPlayer, Object... arguments) { Locale locale = instance.getSettingsManager().getLanguage(); - if (clanPlayer != null && clanPlayer.getLocale() != null + if (unionPlayer != null && unionPlayer.getLocale() != null && instance.getSettingsManager().is(LANGUAGE_SELECTOR)) { - locale = clanPlayer.getLocale(); + locale = unionPlayer.getLocale(); } @@ -376,14 +412,14 @@ public class UnionsOG extends JavaPlugin { @Nullable public static String optionalLang(@NotNull String key, @Nullable Player player, Object... arguments) { - ClanPlayer clanPlayer = null; + UnionPlayer unionPlayer = null; if (player != null) { - clanPlayer = instance.getClanManager().getAnyClanPlayer(player.getUniqueId()); + unionPlayer = instance.getUnionManager().getAnyUnionPlayer(player.getUniqueId()); } - return optionalLang(key, clanPlayer, arguments); + return optionalLang(key, unionPlayer, arguments); } @@ -396,9 +432,9 @@ public class UnionsOG extends JavaPlugin { } @NotNull - public static String lang(@NotNull String key, @Nullable ClanPlayer clanPlayer, Object... arguments) { + public static String lang(@NotNull String key, @Nullable UnionPlayer unionPlayer, Object... arguments) { - String lang = optionalLang(key, clanPlayer, arguments); + String lang = optionalLang(key, unionPlayer, arguments); return (lang == null) ? key : lang; } diff --git a/src/main/java/net/trueog/unionsog/War.java b/src/main/java/net/trueog/unionsog/War.java index 5999d4a0..b0951e69 100644 --- a/src/main/java/net/trueog/unionsog/War.java +++ b/src/main/java/net/trueog/unionsog/War.java @@ -9,36 +9,36 @@ import java.util.Map; public class War { - private final Map clans = new HashMap<>(); + private final Map unions = new HashMap<>(); - public War(@NotNull Clan clan1, @NotNull Clan clan2) { + public War(@NotNull Union union1, @NotNull Union union2) { - clans.put(clan1, 0); - clans.put(clan2, 0); + unions.put(union1, 0); + unions.put(union2, 0); } - public List getClans() { + public List getUnions() { - return new ArrayList<>(clans.keySet()); + return new ArrayList<>(unions.keySet()); } public int getTotalCasualties() { - return clans.values().stream().mapToInt(value -> value).sum(); + return unions.values().stream().mapToInt(value -> value).sum(); } - public int getCasualties(@NotNull Clan clan) { + public int getCasualties(@NotNull Union union) { - return clans.getOrDefault(clan, 0); + return unions.getOrDefault(union, 0); } - public void increaseCasualties(@NotNull Clan clan) { + public void increaseCasualties(@NotNull Union union) { - clans.computeIfPresent(clan, (c, i) -> i + 1); + unions.computeIfPresent(union, (c, i) -> i + 1); } @@ -53,7 +53,7 @@ public class War { if (obj instanceof War) { - return clans.equals(((War) obj).clans); + return unions.equals(((War) obj).unions); } @@ -64,7 +64,7 @@ public class War { @Override public int hashCode() { - return clans.hashCode(); + return unions.hashCode(); } diff --git a/src/main/java/net/trueog/unionsog/chat/SCMessage.java b/src/main/java/net/trueog/unionsog/chat/SCMessage.java index 2e0822a7..eb36ee03 100644 --- a/src/main/java/net/trueog/unionsog/chat/SCMessage.java +++ b/src/main/java/net/trueog/unionsog/chat/SCMessage.java @@ -1,6 +1,6 @@ package net.trueog.unionsog.chat; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; @@ -9,22 +9,22 @@ import java.util.List; public class SCMessage implements Cloneable { private final Source source; - private final ClanPlayer.Channel channel; - private final ClanPlayer sender; - private List receivers; + private final UnionPlayer.Channel channel; + private final UnionPlayer sender; + private List receivers; private String content; /** * Creates a message with initial parameters * * @param source The source of message - * @param channel The channel of clan player - * @param sender The clan player sender + * @param channel The channel of union player + * @param sender The union player sender * @param content The content of message - * @param receivers The clan players, who will receive the content + * @param receivers The union players, who will receive the content */ - public SCMessage(@NotNull Source source, @NotNull ClanPlayer.Channel channel, @NotNull ClanPlayer sender, - String content, @NotNull List receivers) + public SCMessage(@NotNull Source source, @NotNull UnionPlayer.Channel channel, @NotNull UnionPlayer sender, + String content, @NotNull List receivers) { this.source = source; @@ -38,10 +38,10 @@ public class SCMessage implements Cloneable { /** * Creates a new SCMessage without receivers * - * @see SCMessage#SCMessage(Source, ClanPlayer.Channel, ClanPlayer, String, + * @see SCMessage#SCMessage(Source, UnionPlayer.Channel, UnionPlayer, String, * List) instantiate with initial receievers */ - public SCMessage(@NotNull Source source, @NotNull ClanPlayer.Channel channel, @NotNull ClanPlayer sender, + public SCMessage(@NotNull Source source, @NotNull UnionPlayer.Channel channel, @NotNull UnionPlayer sender, String content) { @@ -49,13 +49,13 @@ public class SCMessage implements Cloneable { } - public ClanPlayer.Channel getChannel() { + public UnionPlayer.Channel getChannel() { return channel; } - public ClanPlayer getSender() { + public UnionPlayer getSender() { return sender; @@ -73,7 +73,7 @@ public class SCMessage implements Cloneable { } - public List getReceivers() { + public List getReceivers() { return receivers; @@ -85,7 +85,7 @@ public class SCMessage implements Cloneable { } - public void setReceivers(@NotNull List receivers) { + public void setReceivers(@NotNull List receivers) { this.receivers = receivers; diff --git a/src/main/java/net/trueog/unionsog/chat/handlers/DiscordChatHandler.java b/src/main/java/net/trueog/unionsog/chat/handlers/DiscordChatHandler.java index b1c5a0b2..f63a0de5 100644 --- a/src/main/java/net/trueog/unionsog/chat/handlers/DiscordChatHandler.java +++ b/src/main/java/net/trueog/unionsog/chat/handlers/DiscordChatHandler.java @@ -2,7 +2,7 @@ package net.trueog.unionsog.chat.handlers; import github.scarsz.discordsrv.dependencies.jda.api.entities.TextChannel; import github.scarsz.discordsrv.util.DiscordUtil; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import net.trueog.unionsog.chat.ChatHandler; import net.trueog.unionsog.chat.SCMessage; import net.trueog.unionsog.hooks.discord.DiscordHook; @@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull; import java.util.Objects; import java.util.Optional; -import static net.trueog.unionsog.ClanPlayer.Channel.CLAN; +import static net.trueog.unionsog.UnionPlayer.Channel.UNION; import static net.trueog.unionsog.chat.SCMessage.Source; import static net.trueog.unionsog.chat.SCMessage.Source.SPIGOT; import static net.trueog.unionsog.managers.SettingsManager.ConfigField.DISCORDCHAT_FORMAT_TO; @@ -26,7 +26,7 @@ public class DiscordChatHandler implements ChatHandler { @Override public void sendMessage(@NotNull SCMessage message) { - if (message.getChannel() != CLAN) { + if (message.getChannel() != UNION) { return; @@ -35,15 +35,15 @@ public class DiscordChatHandler implements ChatHandler { String format = settingsManager.getString(DISCORDCHAT_FORMAT_TO); String formattedMessage = ChatUtils.stripColors(chatManager.parseChatFormat(format, message)); - Clan clan = message.getSender().getClan(); - if (clan == null) { + Union union = message.getSender().getUnion(); + if (union == null) { return; } DiscordHook discordHook = Objects.requireNonNull(chatManager.getDiscordHook(), "DiscordHook cannot be null"); - Optional channel = discordHook.getCachedChannel(clan.getTag()); + Optional channel = discordHook.getCachedChannel(union.getTag()); channel.ifPresent(textChannel -> DiscordUtil.sendMessage(textChannel, formattedMessage)); } diff --git a/src/main/java/net/trueog/unionsog/chat/handlers/SpigotChatHandler.java b/src/main/java/net/trueog/unionsog/chat/handlers/SpigotChatHandler.java index 7a300034..c9800b66 100644 --- a/src/main/java/net/trueog/unionsog/chat/handlers/SpigotChatHandler.java +++ b/src/main/java/net/trueog/unionsog/chat/handlers/SpigotChatHandler.java @@ -1,7 +1,7 @@ package net.trueog.unionsog.chat.handlers; import net.trueog.unionsog.ChatBlock; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.chat.ChatHandler; import net.trueog.unionsog.chat.SCMessage; import net.trueog.unionsog.events.ChatEvent; @@ -47,7 +47,7 @@ public class SpigotChatHandler implements ChatHandler { plugin.getLogger().info(ChatUtils.stripColors(formattedMessage)); - for (ClanPlayer cp : message.getReceivers()) { + for (UnionPlayer cp : message.getReceivers()) { ChatBlock.sendMessage(cp, formattedMessage); @@ -59,7 +59,7 @@ public class SpigotChatHandler implements ChatHandler { } - private String stripColorsAndFormatsPerPermission(ClanPlayer sender, String message) { + private String stripColorsAndFormatsPerPermission(UnionPlayer sender, String message) { if (!permissionsManager.has(sender.toPlayer(), "unionsog.member.chat.color")) { diff --git a/src/main/java/net/trueog/unionsog/chat/handlers/SpyChatHandler.java b/src/main/java/net/trueog/unionsog/chat/handlers/SpyChatHandler.java index a2584abf..205c5734 100644 --- a/src/main/java/net/trueog/unionsog/chat/handlers/SpyChatHandler.java +++ b/src/main/java/net/trueog/unionsog/chat/handlers/SpyChatHandler.java @@ -1,7 +1,7 @@ package net.trueog.unionsog.chat.handlers; import net.trueog.unionsog.ChatBlock; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.chat.ChatHandler; import net.trueog.unionsog.chat.SCMessage; import net.trueog.unionsog.utils.ChatUtils; @@ -32,9 +32,9 @@ public class SpyChatHandler implements ChatHandler { message.setContent(ChatUtils.stripColors(message.getContent())); String formattedMessage = chatManager.parseChatFormat(format, message); - List onlineSpies = getOnlineSpies(); + List onlineSpies = getOnlineSpies(); - // Don't send a duplicate message if a spy is inside the clan + // Don't send a duplicate message if a spy is inside the union onlineSpies.removeAll(message.getReceivers()); onlineSpies.forEach(receiver -> ChatBlock.sendMessage(receiver, formattedMessage)); @@ -48,12 +48,12 @@ public class SpyChatHandler implements ChatHandler { } - private List getOnlineSpies() { + private List getOnlineSpies() { return new ArrayList<>(Bukkit.getOnlinePlayers()).stream().filter(Objects::nonNull) .filter(player -> permissionsManager.has(player, "unionsog.admin.all-seeing-eye")) - .map(player -> plugin.getClanManager().getCreateClanPlayer(player.getUniqueId())) - .filter(Objects::nonNull).filter(clanPlayer -> !clanPlayer.isMuted()).collect(Collectors.toList()); + .map(player -> plugin.getUnionManager().getCreateUnionPlayer(player.getUniqueId())) + .filter(Objects::nonNull).filter(unionPlayer -> !unionPlayer.isMuted()).collect(Collectors.toList()); } diff --git a/src/main/java/net/trueog/unionsog/commands/ClanPlayerInput.java b/src/main/java/net/trueog/unionsog/commands/ClanPlayerInput.java deleted file mode 100644 index 7becd0ca..00000000 --- a/src/main/java/net/trueog/unionsog/commands/ClanPlayerInput.java +++ /dev/null @@ -1,43 +0,0 @@ -package net.trueog.unionsog.commands; - -import net.trueog.unionsog.ClanPlayer; -import org.jetbrains.annotations.NotNull; - -import java.util.Objects; - -public class ClanPlayerInput { - - private final ClanPlayer clanPlayer; - - public ClanPlayerInput(@NotNull ClanPlayer clanPlayer) { - - this.clanPlayer = clanPlayer; - - } - - public ClanPlayer getClanPlayer() { - - return clanPlayer; - - } - - @Override - public boolean equals(Object o) { - - if (this == o) - return true; - if (o == null || getClass() != o.getClass()) - return false; - ClanPlayerInput that = (ClanPlayerInput) o; - return clanPlayer.equals(that.clanPlayer); - - } - - @Override - public int hashCode() { - - return Objects.hash(clanPlayer); - - } - -} diff --git a/src/main/java/net/trueog/unionsog/commands/GroupAliasCommand.java b/src/main/java/net/trueog/unionsog/commands/GroupAliasCommand.java new file mode 100644 index 00000000..39d777ec --- /dev/null +++ b/src/main/java/net/trueog/unionsog/commands/GroupAliasCommand.java @@ -0,0 +1,58 @@ +package net.trueog.unionsog.commands; + +import net.trueog.unionsog.ChatBlock; +import net.trueog.unionsog.UnionsOG; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.command.TabCompleter; +import org.jetbrains.annotations.NotNull; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import static net.trueog.unionsog.UnionsOG.lang; +import static net.trueog.unionsog.managers.SettingsManager.ConfigField.COMMANDS_UNION; + +/** + * Points players at {@code /union} when they reach for another server's word + * for the same thing, such as {@code /clan} or {@code /guilds}. + *

+ * These are registered as plain Bukkit commands rather than command aliases so + * they never execute anything: the player is told what to type instead, with + * their own arguments carried over. + *

+ */ +public class GroupAliasCommand implements CommandExecutor, TabCompleter { + + /** + * Words other group plugins use for a union. Deliberately excludes {@code f}, + * {@code faction} and {@code guild}, which Utilities-OG already redirects. + */ + public static final List ALIASES = Collections.unmodifiableList( + Arrays.asList("clan", "clans", "factions", "guilds", "party", "tribe", "nation", "crew", "squad", "gang")); + + @Override + public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, + String[] args) + { + + String union = UnionsOG.getInstance().getSettingsManager().getString(COMMANDS_UNION); + String arguments = args.length == 0 ? "" : " " + String.join(" ", args); + + ChatBlock.sendMessage(sender, lang("use.union.instead", sender, union + arguments, label)); + return true; + + } + + @Override + public List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, + String[] args) + { + + return Collections.emptyList(); + + } + +} diff --git a/src/main/java/net/trueog/unionsog/commands/SCCommandManager.java b/src/main/java/net/trueog/unionsog/commands/SCCommandManager.java index 74ff89a2..dfff3cfe 100644 --- a/src/main/java/net/trueog/unionsog/commands/SCCommandManager.java +++ b/src/main/java/net/trueog/unionsog/commands/SCCommandManager.java @@ -6,7 +6,7 @@ import co.aikar.commands.CommandIssuer; import co.aikar.commands.PaperCommandManager; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.Helper; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.commands.completions.AbstractAsyncCompletion; @@ -65,7 +65,7 @@ public class SCCommandManager extends PaperCommandManager { private void registerDependencies() { - registerDependency(ClanManager.class, plugin.getClanManager()); + registerDependency(UnionManager.class, plugin.getUnionManager()); registerDependency(SettingsManager.class, plugin.getSettingsManager()); registerDependency(StorageManager.class, plugin.getStorageManager()); registerDependency(PermissionsManager.class, plugin.getPermissionsManager()); @@ -220,7 +220,7 @@ public class SCCommandManager extends PaperCommandManager { // TODO: start - remove with UnionBankZeroMigration once union bank accounts // exist. Union banks hold no real value yet, so their commands stay // unregistered. - if (c == net.trueog.unionsog.commands.clan.BankCommand.class + if (c == net.trueog.unionsog.commands.union.BankCommand.class || c == net.trueog.unionsog.commands.staff.BankCommand.class) { @@ -247,24 +247,23 @@ public class SCCommandManager extends PaperCommandManager { private void addReplacements() { SettingsManager sm = plugin.getSettingsManager(); - getCommandReplacements().addReplacements("basic_conditions", "not_blacklisted|not_banned", "clan", - getClanCommandAliases(sm), "deny", sm.getString(COMMANDS_DENY) + "|deny", "more", + getCommandReplacements().addReplacements("basic_conditions", "not_blacklisted|not_banned", "union", + getUnionCommandAliases(sm), "deny", sm.getString(COMMANDS_DENY) + "|deny", "more", sm.getString(COMMANDS_MORE), "ally_chat", sm.getString(COMMANDS_ALLY), "accept", - sm.getString(COMMANDS_ACCEPT) + "|accept", "clan_chat", sm.getString(COMMANDS_CLAN_CHAT)); + sm.getString(COMMANDS_ACCEPT) + "|accept", "union_chat", sm.getString(COMMANDS_UNION_CHAT)); SUBCOMMANDS.forEach(s -> processReplacement(s, "", ".command", true)); COMPLETIONS.forEach(s -> processReplacement(s, "compl:", ".completion", false)); } - private String getClanCommandAliases(SettingsManager sm) { + private String getUnionCommandAliases(SettingsManager sm) { Set aliases = new LinkedHashSet<>(); - aliases.add(sm.getString(COMMANDS_CLAN)); + aliases.add(sm.getString(COMMANDS_UNION)); aliases.add("union"); aliases.add("unions"); - aliases.add("clan"); - aliases.add("clans"); + // clan and clans are not aliases; GroupAliasCommand redirects them. return String.join("|", aliases); } @@ -316,7 +315,7 @@ public class SCCommandManager extends PaperCommandManager { private void processReplacement(String key, String prefix, String suffix, boolean hasFallback) { - String replacement = optionalLang(key + suffix, (ClanPlayer) null); + String replacement = optionalLang(key + suffix, (UnionPlayer) null); if (replacement == null) { replacement = key; @@ -336,16 +335,14 @@ public class SCCommandManager extends PaperCommandManager { static { - SUBCOMMANDS = Arrays.asList("setbanner", "resetkdr", "place", "rank", "home", "war", "regroup", "mostkilled", - "kills", "globalff", "reload", "unban", "ban", "disband", "resign", "ff", "clanff", "demote", "promote", - "untrust", "trust", "purge", "bank", "kick", "invite", "toggle", "modtag", "bb", "display", "clear", - "rival", "ally", "add", "remove", "stats", "coords", "vitals", "rivalries", "alliances", "leaderboard", - "allow", "block", "auto", "check", "assign", "unassign", "delete", "me", "setdisplayname", - "permissions", "tag", "deposit", "withdraw", "set", "status", "tp", "all", "everyone", "lookup", - "roster", "profile", "list", "create", "description", "start", "end", "admin", "help", "mod", - "setdefault", "removedefault", "land", "break", "interact", "place_block", "damage", "interact_entity", - "container", "permanent", "take", "give", "join", "leave", "mute", "confirm", "balance", "discord", - "rename", "locale", "color"); + SUBCOMMANDS = Arrays.asList("setbanner", "resetkdr", "place", "home", "war", "regroup", "mostkilled", "kills", + "globalff", "reload", "unban", "ban", "disband", "resign", "ff", "unionff", "vote", "yes", "no", + "purge", "bank", "kick", "invite", "toggle", "modtag", "bb", "display", "clear", "rival", "ally", "add", + "remove", "stats", "coords", "vitals", "rivalries", "alliances", "leaderboard", "allow", "block", + "auto", "check", "delete", "me", "tag", "deposit", "withdraw", "set", "status", "tp", "all", "everyone", + "lookup", "roster", "profile", "list", "create", "description", "start", "end", "admin", "help", "mod", + "land", "break", "interact", "place_block", "damage", "interact_entity", "container", "permanent", + "take", "give", "join", "leave", "mute", "confirm", "balance", "discord", "rename", "locale", "color"); COMPLETIONS = Arrays.asList("tag", "name"); diff --git a/src/main/java/net/trueog/unionsog/commands/ClanInput.java b/src/main/java/net/trueog/unionsog/commands/UnionInput.java similarity index 51% rename from src/main/java/net/trueog/unionsog/commands/ClanInput.java rename to src/main/java/net/trueog/unionsog/commands/UnionInput.java index 6971be95..e92c1938 100644 --- a/src/main/java/net/trueog/unionsog/commands/ClanInput.java +++ b/src/main/java/net/trueog/unionsog/commands/UnionInput.java @@ -1,23 +1,23 @@ package net.trueog.unionsog.commands; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import org.jetbrains.annotations.NotNull; import java.util.Objects; -public class ClanInput { +public class UnionInput { - private final Clan clan; + private final Union union; - public ClanInput(@NotNull Clan clan) { + public UnionInput(@NotNull Union union) { - this.clan = clan; + this.union = union; } - public Clan getClan() { + public Union getUnion() { - return clan; + return union; } @@ -28,15 +28,15 @@ public class ClanInput { return true; if (o == null || getClass() != o.getClass()) return false; - ClanInput clanInput = (ClanInput) o; - return clan.equals(clanInput.clan); + UnionInput unionInput = (UnionInput) o; + return union.equals(unionInput.union); } @Override public int hashCode() { - return Objects.hash(clan); + return Objects.hash(union); } diff --git a/src/main/java/net/trueog/unionsog/commands/UnionPlayerInput.java b/src/main/java/net/trueog/unionsog/commands/UnionPlayerInput.java new file mode 100644 index 00000000..74e210d2 --- /dev/null +++ b/src/main/java/net/trueog/unionsog/commands/UnionPlayerInput.java @@ -0,0 +1,43 @@ +package net.trueog.unionsog.commands; + +import net.trueog.unionsog.UnionPlayer; +import org.jetbrains.annotations.NotNull; + +import java.util.Objects; + +public class UnionPlayerInput { + + private final UnionPlayer unionPlayer; + + public UnionPlayerInput(@NotNull UnionPlayer unionPlayer) { + + this.unionPlayer = unionPlayer; + + } + + public UnionPlayer getUnionPlayer() { + + return unionPlayer; + + } + + @Override + public boolean equals(Object o) { + + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; + UnionPlayerInput that = (UnionPlayerInput) o; + return unionPlayer.equals(that.unionPlayer); + + } + + @Override + public int hashCode() { + + return Objects.hash(unionPlayer); + + } + +} diff --git a/src/main/java/net/trueog/unionsog/commands/clan/AllyChatCommand.java b/src/main/java/net/trueog/unionsog/commands/clan/AllyChatCommand.java deleted file mode 100644 index dfa56888..00000000 --- a/src/main/java/net/trueog/unionsog/commands/clan/AllyChatCommand.java +++ /dev/null @@ -1,87 +0,0 @@ -package net.trueog.unionsog.commands.clan; - -import co.aikar.commands.BaseCommand; -import co.aikar.commands.annotation.*; -import net.trueog.unionsog.ChatBlock; -import net.trueog.unionsog.ClanPlayer; -import net.trueog.unionsog.managers.ChatManager; -import net.trueog.unionsog.managers.SettingsManager; -import net.trueog.unionsog.managers.StorageManager; - -import static net.trueog.unionsog.ClanPlayer.Channel.ALLY; -import static net.trueog.unionsog.ClanPlayer.Channel.NONE; -import static net.trueog.unionsog.UnionsOG.lang; -import static net.trueog.unionsog.chat.SCMessage.Source.SPIGOT; - -@CommandAlias("%ally_chat") -@Description("{@@command.description.ally}") -@CommandPermission("unionsog.member.ally") -@Conditions("%basic_conditions|clan_member|can_chat:type=ALLY|rank:name=ALLY_CHAT") -public class AllyChatCommand extends BaseCommand { - - @Dependency - private ChatManager chatManager; - @Dependency - private SettingsManager settingsManager; - @Dependency - private StorageManager storageManager; - - @Default - @HelpSearchTags("chat") - public void sendMessage(ClanPlayer cp, @Name("message") String message) { - - chatManager.processChat(SPIGOT, ALLY, cp, message); - - } - - @Subcommand("%join") - public void join(ClanPlayer clanPlayer) { - - if (clanPlayer.getChannel() == ALLY) { - - ChatBlock.sendMessage(clanPlayer, lang("already.joined.ally.chat")); - return; - - } - - clanPlayer.setChannel(ALLY); - storageManager.updateClanPlayer(clanPlayer); - ChatBlock.sendMessage(clanPlayer, lang("joined.ally.chat")); - - } - - @Subcommand("%leave") - public void leave(ClanPlayer clanPlayer) { - - if (clanPlayer.getChannel() == ALLY) { - - clanPlayer.setChannel(NONE); - storageManager.updateClanPlayer(clanPlayer); - ChatBlock.sendMessage(clanPlayer, lang("left.ally.chat", clanPlayer)); - - } else { - - ChatBlock.sendMessage(clanPlayer, lang("chat.didnt.join", clanPlayer)); - - } - - } - - @Subcommand("%mute") - public void mute(ClanPlayer clanPlayer) { - - if (!clanPlayer.isMutedAlly()) { - - clanPlayer.mute(ALLY, true); - ChatBlock.sendMessage(clanPlayer, lang("muted.ally.chat", clanPlayer)); - - } else { - - clanPlayer.mute(ALLY, false); - ChatBlock.sendMessage(clanPlayer, lang("unmuted.ally.chat", clanPlayer)); - - } - - } - -} diff --git a/src/main/java/net/trueog/unionsog/commands/clan/ChatCommand.java b/src/main/java/net/trueog/unionsog/commands/clan/ChatCommand.java deleted file mode 100644 index f9d92aaa..00000000 --- a/src/main/java/net/trueog/unionsog/commands/clan/ChatCommand.java +++ /dev/null @@ -1,110 +0,0 @@ -package net.trueog.unionsog.commands.clan; - -import co.aikar.commands.BaseCommand; -import co.aikar.commands.annotation.*; -import net.trueog.unionsog.ChatBlock; -import net.trueog.unionsog.ClanPlayer; -import net.trueog.unionsog.managers.ChatManager; -import net.trueog.unionsog.managers.StorageManager; - -import static net.trueog.unionsog.ClanPlayer.Channel.CLAN; -import static net.trueog.unionsog.ClanPlayer.Channel.NONE; -import static net.trueog.unionsog.UnionsOG.lang; -import static net.trueog.unionsog.chat.SCMessage.Source.SPIGOT; - -@CommandAlias("%clan_chat") -@Conditions("%basic_conditions|clan_member|can_chat:type=CLAN") -@CommandPermission("unionsog.member.chat") -@Description("{@@command.description.chat}") -public class ChatCommand extends BaseCommand { - - @Dependency - private ChatManager chatManager; - @Dependency - private StorageManager storageManager; - - @Default - @HelpSearchTags("chat") - public void sendMessage(ClanPlayer cp, @Optional @Name("message") String message) { - - if (message == null || message.isBlank()) { - - toggle(cp); - return; - - } - - chatManager.processChat(SPIGOT, CLAN, cp, message); - - } - - // Bare command flips the player in or out of the union chat channel. - private void toggle(ClanPlayer clanPlayer) { - - if (clanPlayer.getChannel() == CLAN) { - - clanPlayer.setChannel(NONE); - storageManager.updateClanPlayer(clanPlayer); - ChatBlock.sendMessage(clanPlayer, lang("left.clan.chat", clanPlayer)); - - } else { - - clanPlayer.setChannel(CLAN); - storageManager.updateClanPlayer(clanPlayer); - ChatBlock.sendMessage(clanPlayer, lang("joined.clan.chat")); - - } - - } - - @Subcommand("%join") - public void join(ClanPlayer clanPlayer) { - - if (clanPlayer.getChannel() == CLAN) { - - ChatBlock.sendMessage(clanPlayer, lang("already.joined.clan.chat")); - return; - - } - - clanPlayer.setChannel(CLAN); - storageManager.updateClanPlayer(clanPlayer); - ChatBlock.sendMessage(clanPlayer, lang("joined.clan.chat")); - - } - - @Subcommand("%leave") - public void leave(ClanPlayer clanPlayer) { - - if (clanPlayer.getChannel() == CLAN) { - - clanPlayer.setChannel(NONE); - storageManager.updateClanPlayer(clanPlayer); - ChatBlock.sendMessage(clanPlayer, lang("left.clan.chat", clanPlayer)); - - } else { - - ChatBlock.sendMessage(clanPlayer, lang("chat.didnt.join", clanPlayer)); - - } - - } - - @Subcommand("%mute") - public void mute(ClanPlayer clanPlayer) { - - if (!clanPlayer.isMuted()) { - - clanPlayer.mute(CLAN, true); - ChatBlock.sendMessage(clanPlayer, lang("muted.clan.chat", clanPlayer)); - - } else { - - clanPlayer.mute(CLAN, false); - ChatBlock.sendMessage(clanPlayer, lang("unmuted.clan.chat", clanPlayer)); - - } - - } - -} diff --git a/src/main/java/net/trueog/unionsog/commands/clan/ClanCommands.java b/src/main/java/net/trueog/unionsog/commands/clan/ClanCommands.java deleted file mode 100644 index f5e82981..00000000 --- a/src/main/java/net/trueog/unionsog/commands/clan/ClanCommands.java +++ /dev/null @@ -1,543 +0,0 @@ -package net.trueog.unionsog.commands.clan; - -import co.aikar.commands.BaseCommand; -import co.aikar.commands.annotation.*; -import net.trueog.unionsog.*; -import net.trueog.unionsog.commands.ClanInput; -import net.trueog.unionsog.commands.ClanPlayerInput; -import net.trueog.unionsog.conversation.ResignPrompt; -import net.trueog.unionsog.conversation.SCConversation; -import net.trueog.unionsog.events.TagChangeEvent; -import net.trueog.unionsog.managers.*; -import net.trueog.unionsog.utils.ChatUtils; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; - -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; - -import static net.trueog.unionsog.UnionsOG.lang; -import static net.trueog.unionsog.managers.SettingsManager.ConfigField.*; -import static org.bukkit.ChatColor.AQUA; -import static org.bukkit.ChatColor.RED; - -@CommandAlias("%clan") -@Conditions("%basic_conditions") -public class ClanCommands extends BaseCommand { - - private static final Map CLAN_COLORS = new LinkedHashMap<>(); - - static { - - CLAN_COLORS.put("black", "&0"); - CLAN_COLORS.put("dark_blue", "&1"); - CLAN_COLORS.put("dark_green", "&2"); - CLAN_COLORS.put("dark_aqua", "&3"); - CLAN_COLORS.put("dark_red", "&4"); - CLAN_COLORS.put("dark_purple", "&5"); - CLAN_COLORS.put("gold", "&6"); - CLAN_COLORS.put("gray", "&7"); - CLAN_COLORS.put("dark_gray", "&8"); - CLAN_COLORS.put("blue", "&9"); - CLAN_COLORS.put("green", "&a"); - CLAN_COLORS.put("aqua", "&b"); - CLAN_COLORS.put("red", "&c"); - CLAN_COLORS.put("light_purple", "&d"); - CLAN_COLORS.put("yellow", "&e"); - CLAN_COLORS.put("white", "&f"); - - } - - @Dependency - private UnionsOG plugin; - @Dependency - private SettingsManager settings; - @Dependency - private ClanManager cm; - @Dependency - private StorageManager storage; - @Dependency - private PermissionsManager permissions; - @Dependency - private RequestManager requestManager; - @Dependency - private ProtectionManager protectionManager; - - @Subcommand("%war %start") - @CommandPermission("unionsog.leader.war") - @Conditions("rank:name=WAR_START") - @Description("{@@command.description.war.start}") - @CommandCompletion("@rivals") - public void startWar(Player player, ClanPlayer requester, Clan requestClan, - @Conditions("can_war_target") @Name("clan") ClanInput targetClanInput) - { - - Clan targetClan = targetClanInput.getClan(); - - List onlineLeaders = Helper.stripOffLinePlayers(requestClan.getLeaders()); - - if (settings.is(WAR_START_REQUEST_ENABLED)) { - - if (!onlineLeaders.isEmpty()) { - - requestManager.addWarStartRequest(requester, targetClan, requestClan); - ChatBlock.sendMessage(player, - AQUA + lang("leaders.have.been.asked.to.accept.the.war.request", player, targetClan.getName())); - - } else { - - ChatBlock.sendMessage(player, RED + lang("at.least.one.leader.accept.the.alliance", player)); - - } - - } else { - - protectionManager.addWar(requester, requestClan, targetClan); - - } - - } - - @Subcommand("%war %end") - @CommandPermission("unionsog.leader.war") - @Conditions("rank:name=WAR_END") - @Description("{@@command.description.war.end}") - @CommandCompletion("@warring_clans") - public void endWar(ClanPlayer cp, Clan issuerClan, @Name("clan") ClanInput other) { - - Clan war = other.getClan(); - if (issuerClan.isWarring(war.getTag())) { - - requestManager.addWarEndRequest(cp, war, issuerClan); - ChatBlock.sendMessage(cp, AQUA + lang("leaders.asked.to.end.rivalry", cp, war.getName())); - - } else { - - ChatBlock.sendMessage(cp, RED + lang("clans.not.at.war", cp)); - - } - - } - - @Subcommand("%color") - @CommandPermission("unionsog.leader.color") - @Conditions("rank:name=COLOR") - @CommandCompletion("@clan_colors") - @Description("{@@command.description.color}") - public void color(Player player, Clan clan, @Name("color") String color) { - - Optional tagColor = resolveTagColor(color); - if (tagColor.isEmpty()) { - - ChatBlock.sendMessage(player, RED + lang("invalid.color", player)); - return; - - } - - String currentTag = ChatUtils.stripColors(clan.getColorTag()); - String tag = tagColor.get() + currentTag; - TagChangeEvent event = new TagChangeEvent(player, clan, tag); - plugin.getServer().getPluginManager().callEvent(event); - if (event.isCancelled()) { - - return; - - } - - tag = event.getNewTag(); - String cleanTag = ChatUtils.stripColors(tag); - - Optional validationError = plugin.getTagValidator().validate(player, tag, true); - if (validationError.isPresent()) { - - ChatBlock.sendMessage(player, validationError.get()); - return; - - } - - if (!cleanTag.equals(currentTag)) { - - ChatBlock.sendMessage(player, RED + lang("you.can.only.modify.the.color.of.the.tag", player)); - return; - - } - - clan.addBb(player.getName(), lang("tag.changed.to.0", ChatUtils.parseColors(tag))); - clan.changeClanTag(tag); - cm.updateDisplayName(player); - ChatBlock.sendMessage(player, AQUA + lang("clan.color.changed.to.0", player, ChatUtils.parseColors(tag))); - - } - - @Subcommand("%setbanner") - @CommandPermission("unionsog.leader.setbanner") - @Conditions("rank:name=SETBANNER") - @Description("{@@command.description.setbanner}") - public void setbanner(Player player, Clan clan) { - - @SuppressWarnings("deprecation") - ItemStack hand = player.getItemInHand(); - if (!hand.getType().toString().contains("BANNER")) { - - ChatBlock.sendMessageKey(player, "you.must.hold.a.banner"); - return; - - } - - clan.setBanner(hand); - storage.updateClan(clan); - ChatBlock.sendMessageKey(player, "you.changed.clan.banner"); - - } - - private Optional resolveTagColor(String input) { - - String normalized = input.toLowerCase(Locale.ROOT); - if (CLAN_COLORS.containsKey(normalized)) { - - return Optional.of(CLAN_COLORS.get(normalized)); - - } - - if (normalized.matches("#[0-9a-f]{6}")) { - - return Optional.of("&" + normalized); - - } - - if (normalized.matches("&#[0-9a-f]{6}")) { - - return Optional.of(normalized); - - } - - if (normalized.matches("&[0-9a-f]")) { - - return Optional.of(normalized); - - } - - if (normalized.matches("[0-9a-f]")) { - - return Optional.of("&" + normalized); - - } - - return Optional.empty(); - - } - - @Subcommand("%invite") - @CommandPermission("unionsog.leader.invite") - @CommandCompletion("@non_members:ignore_vanished") - @Conditions("rank:name=INVITE") - @Description("{@@command.description.invite}") - public void invite(Player sender, ClanPlayer cp, Clan clan, - @Conditions("not_banned|not_in_clan|online:ignore_vanished") @Name("player") ClanPlayerInput invited) - { - - if (!invited.getClanPlayer().isInviteEnabled()) { - - ChatBlock.sendMessage(sender, RED + lang("invitedplayer.invite.off", sender)); - return; - - } - - Player invitedPlayer = invited.getClanPlayer().toPlayer(); - if (invitedPlayer == null) - return; - if (!permissions.has(invitedPlayer, "unionsog.member.can-join")) { - - ChatBlock.sendMessage(sender, - RED + lang("the.player.doesn.t.not.have.the.permissions.to.join.clans", sender)); - return; - - } - - if (invitedPlayer.getUniqueId().equals(sender.getUniqueId())) { - - ChatBlock.sendMessage(sender, RED + lang("you.cannot.invite.yourself", sender)); - return; - - } - - long minutesBeforeRejoin = cm.getMinutesBeforeRejoin(invited.getClanPlayer(), clan); - if (minutesBeforeRejoin != 0) { - - ChatBlock.sendMessage(sender, - RED + lang("the.player.must.wait.0.before.joining.your.clan.again", sender, minutesBeforeRejoin)); - return; - - } - - if (clan.getSize() >= settings.getInt(CLAN_MAX_MEMBERS) && settings.getInt(CLAN_MAX_MEMBERS) > 0) { - - ChatBlock.sendMessage(sender, RED + lang("the.clan.members.reached.limit", sender)); - return; - - } - - if (!cm.purchaseInvite(sender)) { - - return; - - } - - requestManager.addInviteRequest(cp, invitedPlayer.getName(), clan); - ChatBlock.sendMessage(sender, - AQUA + lang("has.been.asked.to.join", sender, invitedPlayer.getName(), clan.getName())); - - } - - @Subcommand("%clanff %allow") - @CommandPermission("unionsog.leader.ff") - @Conditions("rank:name=FRIENDLYFIRE") - @Description("{@@command.description.clanff.allow}") - public void allowClanFf(Player player, Clan clan) { - - clan.addBb(player.getName(), lang("clan.wide.friendly.fire.is.allowed")); - clan.setFriendlyFire(true); - storage.updateClan(clan); - - } - - @Subcommand("%clanff %block") - @CommandPermission("unionsog.leader.ff") - @Description("{@@command.description.clanff.block}") - public void blockClanFf(Player player, Clan clan) { - - clan.addBb(player.getName(), lang("clan.wide.friendly.fire.blocked")); - clan.setFriendlyFire(false); - storage.updateClan(clan); - - } - - @Subcommand("%description") - @CommandPermission("unionsog.leader.description") - @Conditions("rank:name=DESCRIPTION") - @Description("{@@command.description.description}") - public void setDescription(Player player, Clan clan, @Name("description") String description) { - - if (description.length() < settings.getInt(CLAN_MIN_DESCRIPTION_LENGTH)) { - - ChatBlock.sendMessage(player, RED + lang("your.clan.description.must.be.longer.than", player, - settings.getInt(CLAN_MIN_DESCRIPTION_LENGTH))); - return; - - } - - if (description.length() > settings.getInt(CLAN_MAX_DESCRIPTION_LENGTH)) { - - ChatBlock.sendMessage(player, RED + lang("your.clan.description.cannot.be.longer.than", player, - settings.getInt(CLAN_MAX_DESCRIPTION_LENGTH))); - return; - - } - - clan.setDescription(description); - ChatBlock.sendMessage(player, AQUA + lang("description.changed", player)); - storage.updateClan(clan); - - } - - @Subcommand("%rival %add") - @CommandPermission("unionsog.leader.rival") - @Conditions("rivable|minimum_to_rival|rank:name=RIVAL_ADD") - @CommandCompletion("@clans:hide_own") - @Description("{@@command.description.rival.add}") - public void addRival(Player player, Clan issuerClan, @Conditions("different") @Name("clan") ClanInput rival) { - - Clan rivalInput = rival.getClan(); - if (settings.isUnrivable(rivalInput.getTag())) { - - ChatBlock.sendMessage(player, RED + lang("the.clan.cannot.be.rivaled", player)); - return; - - } - - if (!issuerClan.reachedRivalLimit()) { - - if (!issuerClan.isRival(rivalInput.getTag())) { - - issuerClan.addRival(rivalInput); - rivalInput.addBb(player.getName(), - lang("has.initiated.a.rivalry", issuerClan.getName(), rivalInput.getName()), false); - issuerClan.addBb(player.getName(), - lang("has.initiated.a.rivalry", player.getName(), rivalInput.getName())); - - } else { - - ChatBlock.sendMessage(player, RED + lang("your.clans.are.already.rivals", player)); - - } - - } else { - - ChatBlock.sendMessage(player, RED + lang("rival.limit.reached", player)); - - } - - } - - @Subcommand("%rival %remove") - @CommandPermission("unionsog.leader.rival") - @Conditions("rank:name=RIVAL_REMOVE") - @CommandCompletion("@rivals") - @Description("{@@command.description.rival.remove}") - public void removeRival(Player player, ClanPlayer cp, Clan issuerClan, - @Conditions("different") @Name("clan") ClanInput rival) - { - - Clan rivalInput = rival.getClan(); - if (issuerClan.isRival(rivalInput.getTag())) { - - requestManager.addRivalryBreakRequest(cp, rivalInput, issuerClan); - ChatBlock.sendMessage(player, AQUA + lang("leaders.asked.to.end.rivalry", player, rivalInput.getName())); - - } else { - - ChatBlock.sendMessage(player, RED + lang("your.clans.are.not.rivals", player)); - - } - - } - - @Subcommand("%ally %add") - @CommandPermission("unionsog.leader.ally") - @Conditions("rank:name=ALLY_ADD|minimum_to_ally") - @CommandCompletion("@clans:hide_own") - @Description("{@@command.description.ally.add}") - public void addAlly(Player player, ClanPlayer cp, Clan issuerClan, - @Conditions("different") @Name("clan") ClanInput other) - { - - Clan input = other.getClan(); - if (issuerClan.isAlly(input.getTag())) { - - ChatBlock.sendMessage(player, RED + lang("your.clans.are.already.allies", player)); - return; - - } - - int maxAlliances = settings.getInt(CLAN_MAX_ALLIANCES); - if (maxAlliances != -1) { - - if (issuerClan.getAllies().size() >= maxAlliances) { - - ChatBlock.sendMessage(player, lang("your.clan.reached.max.alliances", player)); - return; - - } - - if (input.getAllies().size() >= maxAlliances) { - - ChatBlock.sendMessage(player, lang("other.clan.reached.max.alliances", player)); - return; - - } - - } - - List onlineLeaders = Helper.stripOffLinePlayers(issuerClan.getLeaders()); - if (onlineLeaders.isEmpty()) { - - ChatBlock.sendMessage(player, RED + lang("at.least.one.leader.accept.the.alliance", player)); - return; - - } - - requestManager.addAllyRequest(cp, input, issuerClan); - ChatBlock.sendMessage(player, AQUA + lang("leaders.have.been.asked.for.an.alliance", player, input.getName())); - - } - - @Subcommand("%ally %remove") - @Conditions("rank:name=ALLY_REMOVE") - @CommandPermission("unionsog.leader.ally") - @Description("{@@command.description.ally.remove}") - @CommandCompletion("@allied_clans") - public void removeAlly(Player player, Clan issuerClan, - @Conditions("different|allied_clan") @Name("clan") ClanInput ally) - { - - Clan allyInput = ally.getClan(); - issuerClan.removeAlly(allyInput); - allyInput.addBb(player.getName(), lang("has.broken.the.alliance", issuerClan.getName(), allyInput.getName()), - false); - issuerClan.addBb(player.getName(), lang("has.broken.the.alliance", player.getName(), allyInput.getName())); - - } - - @Subcommand("%kick") - @CommandPermission("unionsog.leader.kick") - @CommandCompletion("@clan_members:hide_own") - @Conditions("rank:name=KICK") - @Description("{@@command.description.kick}") - public void kick(@Conditions("clan_member") Player sender, - @Conditions("same_clan") @Name("member") ClanPlayerInput other) - { - - ClanPlayer clanPlayer = other.getClanPlayer(); - if (sender.getUniqueId().equals(clanPlayer.getUniqueId())) { - - ChatBlock.sendMessage(sender, RED + lang("you.cannot.kick.yourself", sender)); - return; - - } - - Clan clan = cm.getClanByPlayerUniqueId(sender.getUniqueId()); - if (Objects.requireNonNull(clan).isLeader(clanPlayer.getUniqueId())) { - - ChatBlock.sendMessage(sender, RED + lang("you.cannot.kick.another.leader", sender)); - return; - - } - - clan.addBb(sender.getName(), lang("has.been.kicked.by", clanPlayer.getName(), sender.getName(), sender)); - clan.removePlayerFromClan(clanPlayer.getUniqueId()); - - } - - @Subcommand("%resign %confirm") - @CommandPermission("unionsog.member.resign") - @Description("{@@command.description.resign}") - @HelpSearchTags("leave") - public void resignConfirm(Player player, ClanPlayer cp, Clan clan) { - - if (clan.isPermanent() || !clan.isLeader(player) || clan.getLeaders().size() > 1) { - - clan.addBb(player.getName(), lang("0.has.resigned", player.getName())); - cp.addResignTime(clan.getTag()); - clan.removePlayerFromClan(player.getUniqueId()); - - ChatBlock.sendMessage(cp, AQUA + lang("resign.success", player)); - - } else if (clan.isLeader(player) && clan.getLeaders().size() == 1) { - - clan.disband(player, true, false); - ChatBlock.sendMessage(cp, RED + lang("clan.has.been.disbanded", player, clan.getName())); - - } else { - - ChatBlock.sendMessage(cp, RED - + lang("last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.clan", player)); - - } - - } - - @Subcommand("%resign") - @CommandPermission("unionsog.member.resign") - @Description("{@@command.description.resign}") - @HelpSearchTags("leave") - public void resign(@Conditions("clan_member") Player player) { - - new SCConversation(plugin, player, new ResignPrompt()).begin(); - - } - -} diff --git a/src/main/java/net/trueog/unionsog/commands/clan/LeaderCommands.java b/src/main/java/net/trueog/unionsog/commands/clan/LeaderCommands.java deleted file mode 100644 index f2d9bcd4..00000000 --- a/src/main/java/net/trueog/unionsog/commands/clan/LeaderCommands.java +++ /dev/null @@ -1,228 +0,0 @@ -package net.trueog.unionsog.commands.clan; - -import co.aikar.commands.BaseCommand; -import co.aikar.commands.annotation.*; -import net.trueog.unionsog.*; -import net.trueog.unionsog.commands.ClanPlayerInput; -import net.trueog.unionsog.conversation.DisbandPrompt; -import net.trueog.unionsog.conversation.SCConversation; -import net.trueog.unionsog.hooks.discord.DiscordHook; -import net.trueog.unionsog.hooks.discord.exceptions.DiscordHookException; -import net.trueog.unionsog.managers.*; -import net.trueog.unionsog.utils.ChatUtils; -import org.bukkit.entity.Player; - -import java.util.Objects; - -import static net.trueog.unionsog.UnionsOG.lang; -import static net.trueog.unionsog.managers.SettingsManager.ConfigField.*; -import static org.bukkit.ChatColor.AQUA; -import static org.bukkit.ChatColor.RED; - -@CommandAlias("%clan") -@Conditions("%basic_conditions|leader") -public class LeaderCommands extends BaseCommand { - - @Dependency - private UnionsOG plugin; - @Dependency - private StorageManager storage; - @Dependency - private PermissionsManager permissions; - @Dependency - private SettingsManager settings; - @Dependency - private RequestManager requestManager; - @Dependency - private ClanManager cm; - @Dependency - private ChatManager chatManager; - - @Subcommand("%demote") - @CommandCompletion("@clan_leaders") - @CommandPermission("unionsog.leader.demote") - @Description("{@@command.description.demote}") - public void demote(Player player, ClanPlayer cp, Clan clan, - @Conditions("same_clan") @Name("leader") ClanPlayerInput other) - { - - ClanPlayer otherCp = other.getClanPlayer(); - if (!clan.enoughLeadersOnlineToDemote(otherCp)) { - - ChatBlock.sendMessage(player, RED + lang("not.enough.leaders.online.to.vote.on.demotion", player)); - return; - - } - - if (!clan.isLeader(otherCp.getUniqueId())) { - - ChatBlock.sendMessage(player, RED + lang("player.is.not.a.leader.of.your.clan", player)); - return; - - } - - if (clan.getLeaders().size() > 2 && settings.is(CLAN_CONFIRMATION_FOR_DEMOTE)) { - - requestManager.addDemoteRequest(cp, otherCp.getName(), clan); - ChatBlock.sendMessage(player, AQUA + lang("demotion.vote.has.been.requested.from.all.leaders", player)); - return; - - } - - clan.addBb(player.getName(), lang("demoted.back.to.member", otherCp.getName())); - clan.demote(otherCp.getUniqueId()); - - } - - @Subcommand("%promote") - @CommandPermission("unionsog.leader.promote") - @CommandCompletion("@clan_non_leaders") - @Description("{@@command.description.promote}") - public void promote(Player player, Clan clan, ClanPlayer cp, - @Conditions("online|same_clan") @Name("member") ClanPlayerInput other) - { - - Player otherPl = Objects.requireNonNull(other.getClanPlayer().toPlayer()); - if (!permissions.has(otherPl, "unionsog.leader.promotable")) { - - ChatBlock.sendMessage(player, - RED + lang("the.player.does.not.have.the.permissions.to.lead.a.clan", player)); - return; - - } - - if (otherPl.getUniqueId().equals(player.getUniqueId())) { - - ChatBlock.sendMessage(player, RED + lang("you.cannot.promote.yourself", player)); - return; - - } - - if (clan.isLeader(otherPl.getUniqueId())) { - - ChatBlock.sendMessage(player, RED + lang("the.player.is.already.a.leader", player)); - return; - - } - - if (settings.is(CLAN_CONFIRMATION_FOR_PROMOTE) && clan.getLeaders().size() > 1) { - - requestManager.requestAllLeaders(cp, ClanRequest.PROMOTE, otherPl.getName(), "asking.for.the.promotion", - player.getName(), otherPl.getName()); - ChatBlock.sendMessage(player, AQUA + lang("promotion.vote.has.been.requested.from.all.leaders", player)); - return; - - } - - clan.addBb(player.getName(), lang("promoted.to.leader", otherPl.getName())); - clan.promote(otherPl.getUniqueId()); - - } - - @Subcommand("%disband") - @CommandPermission("unionsog.leader.disband") - @Description("{@@command.description.disband}") - public void disband(Player player, ClanPlayer cp, Clan clan) { - - if (clan.getLeaders().size() != 1) { - - requestManager.requestAllLeaders(cp, ClanRequest.DISBAND, clan.getTag(), "asking.to.disband", - player.getName()); - ChatBlock.sendMessage(player, AQUA + lang("clan.disband.vote.has.been.requested.from.all.leaders", player)); - return; - - } - - new SCConversation(plugin, player, new DisbandPrompt()).begin(); - - } - - @Subcommand("%rename") - @CommandPermission("unionsog.leader.rename") - @CommandCompletion("@nothing") - @Description("{@@command.description.rename}") - public void rename(Player player, ClanPlayer cp, Clan clan, @Name("name") String clanName) { - - if (clanName.contains("&")) { - - ChatBlock.sendMessageKey(cp, "your.clan.name.cannot.contain.color.codes"); - return; - - } - - if (ChatUtils.stripColors(clanName).trim().equalsIgnoreCase("None")) { - - ChatBlock.sendMessage(player, RED + "Your union cannot be named \"None\"."); - return; - - } - - boolean bypass = plugin.getPermissionsManager().has(player, "unionsog.mod.bypass"); - if (!bypass) { - - if (ChatUtils.stripColors(clanName).length() > plugin.getSettingsManager().getInt(CLAN_MAX_LENGTH)) { - - ChatBlock.sendMessage(player, RED + lang("your.clan.name.cannot.be.longer.than.characters", player, - plugin.getSettingsManager().getInt(CLAN_MAX_LENGTH))); - return; - - } - - if (ChatUtils.stripColors(clanName).length() <= plugin.getSettingsManager().getInt(CLAN_MIN_LENGTH)) { - - ChatBlock.sendMessage(player, RED + lang("your.clan.name.must.be.longer.than.characters", player, - plugin.getSettingsManager().getInt(CLAN_MIN_LENGTH))); - return; - - } - - } - - if (clan.getLeaders().size() != 1) { - - requestManager.requestAllLeaders(cp, ClanRequest.RENAME, clanName, "asking.to.rename", cp.getName(), - clanName); - ChatBlock.sendMessageKey(cp, "rename.vote.has.been.requested.from.all.leaders"); - return; - - } - - clan.setName(clanName); - storage.updateClan(clan); - - ChatBlock.sendMessageKey(cp, "you.have.successfully.renamed.your.clan", clanName); - - } - - @Subcommand("%discord %create") - @CommandPermission("unionsog.leader.discord.create") - @Description("{@@command.description.discord.create}") - public void discord(Player player, Clan clan) { - - DiscordHook discordHook = chatManager.getDiscordHook(); - if (discordHook == null) { - - ChatBlock.sendMessageKey(player, "discordhook.is.disabled"); - return; - - } - - try { - - discordHook.createChannel(clan.getTag()); - ChatBlock.sendMessageKey(player, "discord.created.successfully"); - - } catch (DiscordHookException ex) { - - String messageKey = ex.getMessageKey(); - if (messageKey != null) { - - ChatBlock.sendMessage(player, RED + lang(messageKey)); - - } - - } - - } - -} diff --git a/src/main/java/net/trueog/unionsog/commands/clan/RankCommand.java b/src/main/java/net/trueog/unionsog/commands/clan/RankCommand.java deleted file mode 100644 index 24aa5fb8..00000000 --- a/src/main/java/net/trueog/unionsog/commands/clan/RankCommand.java +++ /dev/null @@ -1,259 +0,0 @@ -package net.trueog.unionsog.commands.clan; - -import co.aikar.commands.BaseCommand; -import co.aikar.commands.annotation.*; -import net.trueog.unionsog.*; -import net.trueog.unionsog.commands.ClanPlayerInput; -import net.trueog.unionsog.conversation.CreateRankNamePrompt; -import net.trueog.unionsog.conversation.RequestCanceller; -import net.trueog.unionsog.conversation.SCConversation; -import net.trueog.unionsog.events.DeleteRankEvent; -import net.trueog.unionsog.events.PlayerRankUpdateEvent; -import net.trueog.unionsog.managers.PermissionsManager; -import net.trueog.unionsog.managers.StorageManager; -import net.trueog.unionsog.utils.ChatUtils; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.entity.Player; - -import java.util.Comparator; -import java.util.List; -import java.util.Set; - -import static net.trueog.unionsog.UnionsOG.lang; -import static org.bukkit.ChatColor.AQUA; -import static org.bukkit.ChatColor.RED; - -@CommandAlias("%clan") -@Subcommand("%rank") -@Conditions("%basic_conditions|leader") -public class RankCommand extends BaseCommand { - - @Dependency - private UnionsOG plugin; - @Dependency - private StorageManager storage; - @Dependency - private PermissionsManager permissions; - - @Subcommand("%assign") - @CommandPermission("unionsog.leader.rank.assign") - @CommandCompletion("@clan_members @ranks") - @Description("{@@command.description.rank.assign}") - public void assign(ClanPlayer player, Clan clan, @Name("member") @Conditions("same_clan") ClanPlayerInput member, - @Name("rank") Rank rank) - { - - ClanPlayer memberInput = member.getClanPlayer(); - - PlayerRankUpdateEvent event = new PlayerRankUpdateEvent(player, memberInput, clan, - clan.getRank(memberInput.getRankId()), rank); - Bukkit.getPluginManager().callEvent(event); - - if (event.isCancelled()) - return; - - if (memberInput.getRankId().equals(rank.getName())) { - - ChatBlock.sendMessage(player, lang("player.already.has.that.rank", player)); - return; - - } - - memberInput.setRank(rank.getName()); - storage.updateClanPlayer(memberInput); - ChatBlock.sendMessage(player, AQUA + lang("player.rank.changed", player)); - - } - - @Subcommand("%unassign") - @CommandPermission("unionsog.leader.rank.unassign") - @CommandCompletion("@clan_members") - @Description("{@@command.description.rank.unassign}") - public void unassign(ClanPlayer player, Clan clan, @Conditions("same_clan") @Name("member") ClanPlayerInput cp) { - - ClanPlayer memberInput = cp.getClanPlayer(); - - PlayerRankUpdateEvent event = new PlayerRankUpdateEvent(player, memberInput, clan, - clan.getRank(memberInput.getRankId()), null); - Bukkit.getPluginManager().callEvent(event); - - if (event.isCancelled()) - return; - - memberInput.setRank(null); - storage.updateClanPlayer(memberInput); - ChatBlock.sendMessage(player, AQUA + lang("player.unassigned.from.rank", player)); - - } - - @Subcommand("%create") - @CommandPermission("unionsog.leader.rank.create") - @Description("{@@command.description.rank.create}") - public void create(Player player, Clan clan) { - - SCConversation conversation = new SCConversation(plugin, player, new CreateRankNamePrompt(), 60); - conversation.addConversationCanceller( - new RequestCanceller(player, RED + lang("rank.create.request.cancelled", player))); - conversation.getContext().setSessionData("clan", clan); - conversation.begin(); - - } - - @Subcommand("%delete") - @CommandPermission("unionsog.leader.rank.delete") - @CommandCompletion("@ranks") - @Description("{@@command.description.rank.delete}") - public void delete(Player player, Clan clan, @Name("rank") Rank rank) { - - DeleteRankEvent event = new DeleteRankEvent(player, clan, rank); - Bukkit.getServer().getPluginManager().callEvent(event); - - if (!event.isCancelled()) { - - clan.deleteRank(rank.getName()); - storage.updateClan(clan, true); - ChatBlock.sendMessage(player, AQUA + lang("rank.0.deleted", player, rank.getDisplayName())); - - } - - } - - @Subcommand("%list") - @CommandPermission("unionsog.leader.rank.list") - @Description("{@@command.description.rank.list}") - public void list(Player player, Clan clan) { - - List ranks = clan.getRanks(); - - if (ranks.isEmpty()) { - - ChatBlock.sendMessage(player, RED + lang("no.ranks", player)); - return; - - } - - ranks.sort(Comparator.reverseOrder()); - ChatBlock.sendMessage(player, AQUA + lang("clans.ranks", player)); - int count = 1; - for (Rank rank : ranks) { - - ChatBlock.sendMessage(player, AQUA + lang("ranks.list.item", player, count, - ChatUtils.parseColors(rank.getDisplayName()) + AQUA, rank.getName())); - count++; - - } - - } - - @Subcommand("%setdisplayname") - @CommandPermission("unionsog.leader.rank.setdisplayname") - @CommandCompletion("@ranks @nothing") - @Description("{@@command.description.rank.setdisplayname}") - public void setDisplayName(Player player, Clan clan, @Name("rank") Rank rank, - @Name("displayname") String displayName) - { - - if (displayName.contains("&") && !permissions.has(player, "unionsog.leader.coloredrank")) { - - ChatBlock.sendMessage(player, RED + lang("you.cannot.set.colored.ranks", player)); - return; - - } - - rank.setDisplayName(displayName); - storage.updateClan(clan, true); - ChatBlock.sendMessage(player, ChatColor.AQUA + lang("rank.displayname.updated", player)); - - } - - @Subcommand("%setdefault") - @CommandPermission("unionsog.leader.rank.setdefault") - @CommandCompletion("@ranks") - @Description("{@@command.description.rank.setdefault}") - public void setDefault(Player player, Clan clan, @Name("rank") Rank rank) { - - clan.setDefaultRank(rank.getName()); - ChatBlock.sendMessage(player, AQUA + lang("rank.setdefault", player, rank.getDisplayName())); - - } - - @Subcommand("%removedefault") - @CommandPermission("unionsog.leader.rank.removedefault") - @Description("{@@command.description.rank.removedefault}") - public void removeDefault(Player player, Clan clan) { - - clan.setDefaultRank(null); - ChatBlock.sendMessage(player, AQUA + lang("rank.removedefault", player)); - - } - - @Subcommand("%permissions") - public class PermissionsCommand extends BaseCommand { - - private final String validPermissionsToMessage = String.join(",", Helper.fromPermissionArray()); - - @Default - @CommandPermission("unionsog.leader.rank.permissions.available") - @Description("{@@command.description.rank.permissions.available}") - public void availablePermissions(Player player) { - - ChatBlock.sendMessage(player, AQUA + lang("available.rank.permissions", player)); - ChatBlock.sendMessage(player, AQUA + validPermissionsToMessage); - - } - - @Default - @CommandPermission("unionsog.leader.rank.permissions.list") - @CommandCompletion("@ranks") - @Description("{@@command.description.rank.permissions.rank}") - public void list(Player player, @Name("rank") Rank rank) { - - Set permissions = rank.getPermissions(); - if (permissions.isEmpty()) { - - ChatBlock.sendMessage(player, RED + lang("rank.no.permissions", player)); - return; - - } - - ChatBlock.sendMessage(player, AQUA + lang("rank.0.permissions", player, rank.getDisplayName())); - ChatBlock.sendMessage(player, AQUA + String.join(",", permissions)); - - } - - @Subcommand("%add") - @CommandPermission("unionsog.leader.rank.permissions.add") - @CommandCompletion("@ranks @rank_permissions") - @Description("{@@command.description.rank.permissions.add}") - public void add(Player player, Clan clan, @Name("rank") Rank rank, - @Values("@rank_permissions") @Name("permission") String permission) - { - - Set permissions = rank.getPermissions(); - permissions.add(permission); - ChatBlock.sendMessage(player, - AQUA + lang("permission.0.added.to.rank.1", player, permission, rank.getDisplayName())); - storage.updateClan(clan, true); - - } - - @Subcommand("%remove") - @CommandCompletion("@ranks @rank_permissions") - @CommandPermission("unionsog.leader.rank.permissions.remove") - @Description("{@@command.description.rank.permissions.remove}") - public void remove(Player player, Clan clan, @Name("rank") Rank rank, - @Values("@rank_permissions") @Name("permission") String permission) - { - - Set permissions = rank.getPermissions(); - permissions.remove(permission); - ChatBlock.sendMessage(player, - AQUA + lang("permission.0.removed.from.rank.1", player, permission, rank.getDisplayName())); - storage.updateClan(clan, true); - - } - - } - -} diff --git a/src/main/java/net/trueog/unionsog/commands/completions/AbstractCompletion.java b/src/main/java/net/trueog/unionsog/commands/completions/AbstractCompletion.java index afedfa0d..44dd7c54 100644 --- a/src/main/java/net/trueog/unionsog/commands/completions/AbstractCompletion.java +++ b/src/main/java/net/trueog/unionsog/commands/completions/AbstractCompletion.java @@ -1,18 +1,18 @@ package net.trueog.unionsog.commands.completions; import net.trueog.unionsog.UnionsOG; -import net.trueog.unionsog.managers.ClanManager; +import net.trueog.unionsog.managers.UnionManager; import org.jetbrains.annotations.NotNull; public abstract class AbstractCompletion implements IdentifiableCompletion { protected final UnionsOG plugin; - protected final ClanManager clanManager; + protected final UnionManager unionManager; public AbstractCompletion(@NotNull UnionsOG plugin) { this.plugin = plugin; - this.clanManager = plugin.getClanManager(); + this.unionManager = plugin.getUnionManager(); } diff --git a/src/main/java/net/trueog/unionsog/commands/completions/AllLeadersCompletion.java b/src/main/java/net/trueog/unionsog/commands/completions/AllMembersCompletion.java similarity index 66% rename from src/main/java/net/trueog/unionsog/commands/completions/AllLeadersCompletion.java rename to src/main/java/net/trueog/unionsog/commands/completions/AllMembersCompletion.java index f653b249..aa0bd51f 100644 --- a/src/main/java/net/trueog/unionsog/commands/completions/AllLeadersCompletion.java +++ b/src/main/java/net/trueog/unionsog/commands/completions/AllMembersCompletion.java @@ -2,7 +2,7 @@ package net.trueog.unionsog.commands.completions; import co.aikar.commands.BukkitCommandCompletionContext; import co.aikar.commands.InvalidCommandArgument; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; import org.jetbrains.annotations.NotNull; @@ -10,9 +10,9 @@ import java.util.Collection; import java.util.stream.Collectors; @SuppressWarnings("unused") -public class AllLeadersCompletion extends AbstractSyncCompletion { +public class AllMembersCompletion extends AbstractSyncCompletion { - public AllLeadersCompletion(@NotNull UnionsOG plugin) { + public AllMembersCompletion(@NotNull UnionsOG plugin) { super(plugin); @@ -21,7 +21,7 @@ public class AllLeadersCompletion extends AbstractSyncCompletion { @Override public Collection getCompletions(BukkitCommandCompletionContext context) throws InvalidCommandArgument { - return clanManager.getAllClanPlayers().stream().filter(ClanPlayer::isLeader).map(ClanPlayer::getName) + return unionManager.getAllUnionPlayers().stream().filter(cp -> cp.getUnion() != null).map(UnionPlayer::getName) .collect(Collectors.toList()); } @@ -29,7 +29,7 @@ public class AllLeadersCompletion extends AbstractSyncCompletion { @Override public @NotNull String getId() { - return "all_leaders"; + return "all_members"; } diff --git a/src/main/java/net/trueog/unionsog/commands/completions/AllNonLeadersCompletion.java b/src/main/java/net/trueog/unionsog/commands/completions/AllNonLeadersCompletion.java deleted file mode 100644 index 486e550a..00000000 --- a/src/main/java/net/trueog/unionsog/commands/completions/AllNonLeadersCompletion.java +++ /dev/null @@ -1,36 +0,0 @@ -package net.trueog.unionsog.commands.completions; - -import co.aikar.commands.BukkitCommandCompletionContext; -import co.aikar.commands.InvalidCommandArgument; -import net.trueog.unionsog.ClanPlayer; -import net.trueog.unionsog.UnionsOG; -import org.jetbrains.annotations.NotNull; - -import java.util.Collection; -import java.util.stream.Collectors; - -@SuppressWarnings("unused") -public class AllNonLeadersCompletion extends AbstractSyncCompletion { - - public AllNonLeadersCompletion(@NotNull UnionsOG plugin) { - - super(plugin); - - } - - @Override - public Collection getCompletions(BukkitCommandCompletionContext context) throws InvalidCommandArgument { - - return clanManager.getAllClanPlayers().stream().filter(cp -> !cp.isLeader() && cp.getClan() != null) - .map(ClanPlayer::getName).collect(Collectors.toList()); - - } - - @Override - public @NotNull String getId() { - - return "all_non_leaders"; - - } - -} diff --git a/src/main/java/net/trueog/unionsog/commands/completions/AlliedClansCompletion.java b/src/main/java/net/trueog/unionsog/commands/completions/AlliedUnionsCompletion.java similarity index 67% rename from src/main/java/net/trueog/unionsog/commands/completions/AlliedClansCompletion.java rename to src/main/java/net/trueog/unionsog/commands/completions/AlliedUnionsCompletion.java index f819bb80..70b83b1b 100644 --- a/src/main/java/net/trueog/unionsog/commands/completions/AlliedClansCompletion.java +++ b/src/main/java/net/trueog/unionsog/commands/completions/AlliedUnionsCompletion.java @@ -2,7 +2,7 @@ package net.trueog.unionsog.commands.completions; import co.aikar.commands.BukkitCommandCompletionContext; import co.aikar.commands.InvalidCommandArgument; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import net.trueog.unionsog.UnionsOG; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; @@ -11,9 +11,9 @@ import java.util.Collection; import java.util.Collections; @SuppressWarnings("unused") -public class AlliedClansCompletion extends AbstractSyncCompletion { +public class AlliedUnionsCompletion extends AbstractSyncCompletion { - public AlliedClansCompletion(@NotNull UnionsOG plugin) { + public AlliedUnionsCompletion(@NotNull UnionsOG plugin) { super(plugin); @@ -25,10 +25,10 @@ public class AlliedClansCompletion extends AbstractSyncCompletion { Player player = context.getPlayer(); if (player != null) { - Clan clan = clanManager.getClanByPlayerUniqueId(player.getUniqueId()); - if (clan != null) { + Union union = unionManager.getUnionByPlayerUniqueId(player.getUniqueId()); + if (union != null) { - return clan.getAllies(); + return union.getAllies(); } @@ -41,7 +41,7 @@ public class AlliedClansCompletion extends AbstractSyncCompletion { @Override public @NotNull String getId() { - return "allied_clans"; + return "allied_unions"; } diff --git a/src/main/java/net/trueog/unionsog/commands/completions/ClanLeadersCompletion.java b/src/main/java/net/trueog/unionsog/commands/completions/ClanLeadersCompletion.java deleted file mode 100644 index d6098937..00000000 --- a/src/main/java/net/trueog/unionsog/commands/completions/ClanLeadersCompletion.java +++ /dev/null @@ -1,49 +0,0 @@ -package net.trueog.unionsog.commands.completions; - -import co.aikar.commands.BukkitCommandCompletionContext; -import co.aikar.commands.InvalidCommandArgument; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; -import net.trueog.unionsog.UnionsOG; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -import java.util.Collection; -import java.util.Collections; -import java.util.stream.Collectors; - -public class ClanLeadersCompletion extends AbstractSyncCompletion { - - public ClanLeadersCompletion(@NotNull UnionsOG plugin) { - - super(plugin); - - } - - @Override - public Collection getCompletions(BukkitCommandCompletionContext c) throws InvalidCommandArgument { - - Player player = c.getPlayer(); - if (player != null) { - - Clan clan = clanManager.getClanByPlayerUniqueId(player.getUniqueId()); - if (clan != null) { - - return clan.getLeaders().stream().map(ClanPlayer::getName).collect(Collectors.toList()); - - } - - } - - return Collections.emptyList(); - - } - - @Override - public @NotNull String getId() { - - return "clan_leaders"; - - } - -} diff --git a/src/main/java/net/trueog/unionsog/commands/completions/ClanNonLeadersCompletion.java b/src/main/java/net/trueog/unionsog/commands/completions/ClanNonLeadersCompletion.java deleted file mode 100644 index f7afc8f7..00000000 --- a/src/main/java/net/trueog/unionsog/commands/completions/ClanNonLeadersCompletion.java +++ /dev/null @@ -1,50 +0,0 @@ -package net.trueog.unionsog.commands.completions; - -import co.aikar.commands.BukkitCommandCompletionContext; -import co.aikar.commands.InvalidCommandArgument; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; -import net.trueog.unionsog.UnionsOG; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -import java.util.Collection; -import java.util.Collections; -import java.util.stream.Collectors; - -@SuppressWarnings("unused") -public class ClanNonLeadersCompletion extends AbstractSyncCompletion { - - public ClanNonLeadersCompletion(@NotNull UnionsOG plugin) { - - super(plugin); - - } - - @Override - public Collection getCompletions(BukkitCommandCompletionContext c) throws InvalidCommandArgument { - - Player player = c.getPlayer(); - if (player != null) { - - Clan clan = clanManager.getClanByPlayerUniqueId(player.getUniqueId()); - if (clan != null) { - - return clan.getNonLeaders().stream().map(ClanPlayer::getName).collect(Collectors.toList()); - - } - - } - - return Collections.emptyList(); - - } - - @Override - public @NotNull String getId() { - - return "clan_non_leaders"; - - } - -} diff --git a/src/main/java/net/trueog/unionsog/commands/completions/ListTypeCompletion.java b/src/main/java/net/trueog/unionsog/commands/completions/ListTypeCompletion.java index eea3dc08..60cefcd1 100644 --- a/src/main/java/net/trueog/unionsog/commands/completions/ListTypeCompletion.java +++ b/src/main/java/net/trueog/unionsog/commands/completions/ListTypeCompletion.java @@ -28,7 +28,7 @@ public class ListTypeCompletion extends AbstractStaticCompletion { @Override public @NotNull String getId() { - return "clan_list_type"; + return "union_list_type"; } diff --git a/src/main/java/net/trueog/unionsog/commands/completions/NonMembersCompletion.java b/src/main/java/net/trueog/unionsog/commands/completions/NonMembersCompletion.java index 953c2cc7..cd6a966e 100644 --- a/src/main/java/net/trueog/unionsog/commands/completions/NonMembersCompletion.java +++ b/src/main/java/net/trueog/unionsog/commands/completions/NonMembersCompletion.java @@ -35,7 +35,7 @@ public class NonMembersCompletion extends AbstractSyncCompletion { for (Player onlinePlayer : Bukkit.getOnlinePlayers()) { boolean vanished = VanishUtils.isVanished(c.getSender(), onlinePlayer); - if (clanManager.getClanByPlayerUniqueId(onlinePlayer.getUniqueId()) != null + if (unionManager.getUnionByPlayerUniqueId(onlinePlayer.getUniqueId()) != null || (c.hasConfig("ignore_vanished") && vanished)) { diff --git a/src/main/java/net/trueog/unionsog/commands/completions/RankPermissionsCompletion.java b/src/main/java/net/trueog/unionsog/commands/completions/RankPermissionsCompletion.java deleted file mode 100644 index 89675e52..00000000 --- a/src/main/java/net/trueog/unionsog/commands/completions/RankPermissionsCompletion.java +++ /dev/null @@ -1,33 +0,0 @@ -package net.trueog.unionsog.commands.completions; - -import net.trueog.unionsog.Helper; -import net.trueog.unionsog.UnionsOG; -import org.jetbrains.annotations.NotNull; - -import java.util.Arrays; -import java.util.Collection; - -@SuppressWarnings("unused") -public class RankPermissionsCompletion extends AbstractStaticCompletion { - - public RankPermissionsCompletion(@NotNull UnionsOG plugin) { - - super(plugin); - - } - - @Override - public @NotNull Collection getCompletions() { - - return Arrays.asList(Helper.fromPermissionArray()); - - } - - @Override - public @NotNull String getId() { - - return "rank_permissions"; - - } - -} diff --git a/src/main/java/net/trueog/unionsog/commands/completions/RanksCompletion.java b/src/main/java/net/trueog/unionsog/commands/completions/RanksCompletion.java deleted file mode 100644 index bd7ad3e9..00000000 --- a/src/main/java/net/trueog/unionsog/commands/completions/RanksCompletion.java +++ /dev/null @@ -1,49 +0,0 @@ -package net.trueog.unionsog.commands.completions; - -import co.aikar.commands.BukkitCommandCompletionContext; -import co.aikar.commands.InvalidCommandArgument; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.Rank; -import net.trueog.unionsog.UnionsOG; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -import java.util.Collection; -import java.util.Collections; -import java.util.stream.Collectors; - -public class RanksCompletion extends AbstractSyncCompletion { - - public RanksCompletion(@NotNull UnionsOG plugin) { - - super(plugin); - - } - - @Override - public Collection getCompletions(BukkitCommandCompletionContext context) throws InvalidCommandArgument { - - Player player = context.getPlayer(); - if (player != null) { - - Clan clan = clanManager.getClanByPlayerUniqueId(player.getUniqueId()); - if (clan != null) { - - return clan.getRanks().stream().map(Rank::getName).collect(Collectors.toList()); - - } - - } - - return Collections.emptyList(); - - } - - @Override - public @NotNull String getId() { - - return "ranks"; - - } - -} diff --git a/src/main/java/net/trueog/unionsog/commands/completions/RivalsCompletion.java b/src/main/java/net/trueog/unionsog/commands/completions/RivalsCompletion.java index 92099cbd..8c3ac8ac 100644 --- a/src/main/java/net/trueog/unionsog/commands/completions/RivalsCompletion.java +++ b/src/main/java/net/trueog/unionsog/commands/completions/RivalsCompletion.java @@ -2,7 +2,7 @@ package net.trueog.unionsog.commands.completions; import co.aikar.commands.BukkitCommandCompletionContext; import co.aikar.commands.InvalidCommandArgument; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import net.trueog.unionsog.UnionsOG; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; @@ -25,10 +25,10 @@ public class RivalsCompletion extends AbstractSyncCompletion { Player player = c.getPlayer(); if (player != null) { - Clan clan = clanManager.getClanByPlayerUniqueId(player.getUniqueId()); - if (clan != null) { + Union union = unionManager.getUnionByPlayerUniqueId(player.getUniqueId()); + if (union != null) { - return clan.getRivals(); + return union.getRivals(); } diff --git a/src/main/java/net/trueog/unionsog/commands/completions/ClanColorsCompletion.java b/src/main/java/net/trueog/unionsog/commands/completions/UnionColorsCompletion.java similarity index 78% rename from src/main/java/net/trueog/unionsog/commands/completions/ClanColorsCompletion.java rename to src/main/java/net/trueog/unionsog/commands/completions/UnionColorsCompletion.java index ca2bed68..ae726914 100644 --- a/src/main/java/net/trueog/unionsog/commands/completions/ClanColorsCompletion.java +++ b/src/main/java/net/trueog/unionsog/commands/completions/UnionColorsCompletion.java @@ -7,9 +7,9 @@ import java.util.Arrays; import java.util.Collection; @SuppressWarnings("unused") -public class ClanColorsCompletion extends AbstractStaticCompletion { +public class UnionColorsCompletion extends AbstractStaticCompletion { - public ClanColorsCompletion(@NotNull UnionsOG plugin) { + public UnionColorsCompletion(@NotNull UnionsOG plugin) { super(plugin); @@ -26,7 +26,7 @@ public class ClanColorsCompletion extends AbstractStaticCompletion { @Override public @NotNull String getId() { - return "clan_colors"; + return "union_colors"; } diff --git a/src/main/java/net/trueog/unionsog/commands/completions/ClanMembersCompletion.java b/src/main/java/net/trueog/unionsog/commands/completions/UnionMembersCompletion.java similarity index 66% rename from src/main/java/net/trueog/unionsog/commands/completions/ClanMembersCompletion.java rename to src/main/java/net/trueog/unionsog/commands/completions/UnionMembersCompletion.java index c8e7d040..259ea64a 100644 --- a/src/main/java/net/trueog/unionsog/commands/completions/ClanMembersCompletion.java +++ b/src/main/java/net/trueog/unionsog/commands/completions/UnionMembersCompletion.java @@ -2,8 +2,8 @@ package net.trueog.unionsog.commands.completions; import co.aikar.commands.BukkitCommandCompletionContext; import co.aikar.commands.InvalidCommandArgument; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; @@ -14,9 +14,9 @@ import java.util.List; import java.util.stream.Collectors; @SuppressWarnings("unused") -public class ClanMembersCompletion extends AbstractSyncCompletion { +public class UnionMembersCompletion extends AbstractSyncCompletion { - public ClanMembersCompletion(@NotNull UnionsOG plugin) { + public UnionMembersCompletion(@NotNull UnionsOG plugin) { super(plugin); @@ -28,10 +28,10 @@ public class ClanMembersCompletion extends AbstractSyncCompletion { Player player = c.getPlayer(); if (player != null) { - Clan clan = clanManager.getClanByPlayerUniqueId(player.getUniqueId()); - if (clan != null) { + Union union = unionManager.getUnionByPlayerUniqueId(player.getUniqueId()); + if (union != null) { - List list = clan.getMembers().stream().map(ClanPlayer::getName).collect(Collectors.toList()); + List list = union.getMembers().stream().map(UnionPlayer::getName).collect(Collectors.toList()); if (c.hasConfig("hide_own")) { list.remove(player.getName()); @@ -51,7 +51,7 @@ public class ClanMembersCompletion extends AbstractSyncCompletion { @Override public @NotNull String getId() { - return "clan_members"; + return "union_members"; } diff --git a/src/main/java/net/trueog/unionsog/commands/completions/ClansCompletion.java b/src/main/java/net/trueog/unionsog/commands/completions/UnionsCompletion.java similarity index 54% rename from src/main/java/net/trueog/unionsog/commands/completions/ClansCompletion.java rename to src/main/java/net/trueog/unionsog/commands/completions/UnionsCompletion.java index f7c413c5..dc1b2cfb 100644 --- a/src/main/java/net/trueog/unionsog/commands/completions/ClansCompletion.java +++ b/src/main/java/net/trueog/unionsog/commands/completions/UnionsCompletion.java @@ -3,7 +3,7 @@ package net.trueog.unionsog.commands.completions; import co.aikar.commands.BukkitCommandCompletionContext; import co.aikar.commands.CommandIssuer; import co.aikar.commands.InvalidCommandArgument; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import net.trueog.unionsog.UnionsOG; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -12,9 +12,9 @@ import java.util.Collection; import java.util.List; import java.util.stream.Collectors; -public class ClansCompletion extends AbstractSyncCompletion { +public class UnionsCompletion extends AbstractSyncCompletion { - public ClansCompletion(@NotNull UnionsOG plugin) { + public UnionsCompletion(@NotNull UnionsOG plugin) { super(plugin); @@ -23,38 +23,38 @@ public class ClansCompletion extends AbstractSyncCompletion { @Override public Collection getCompletions(BukkitCommandCompletionContext c) throws InvalidCommandArgument { - List clans = clanManager.getClans(); + List unions = unionManager.getUnions(); if (c.hasConfig("has_home")) { - clans.removeIf(clan -> clan.getHomeLocation() == null); + unions.removeIf(union -> union.getHomeLocation() == null); } if (c.hasConfig("hide_own")) { - Clan clan = getClan(c.getIssuer()); - if (clan != null) { + Union union = getUnion(c.getIssuer()); + if (union != null) { - clans.remove(clan); + unions.remove(union); } } - return clans.stream().map(Clan::getTag).collect(Collectors.toList()); + return unions.stream().map(Union::getTag).collect(Collectors.toList()); } @Override public @NotNull String getId() { - return "clans"; + return "unions"; } - private @Nullable Clan getClan(CommandIssuer issuer) { + private @Nullable Union getUnion(CommandIssuer issuer) { - return clanManager.getClanByPlayerUniqueId(issuer.getUniqueId()); + return unionManager.getUnionByPlayerUniqueId(issuer.getUniqueId()); } diff --git a/src/main/java/net/trueog/unionsog/commands/completions/WarringClansCompletion.java b/src/main/java/net/trueog/unionsog/commands/completions/WarringUnionsCompletion.java similarity index 64% rename from src/main/java/net/trueog/unionsog/commands/completions/WarringClansCompletion.java rename to src/main/java/net/trueog/unionsog/commands/completions/WarringUnionsCompletion.java index 4f19b901..b5fbf38c 100644 --- a/src/main/java/net/trueog/unionsog/commands/completions/WarringClansCompletion.java +++ b/src/main/java/net/trueog/unionsog/commands/completions/WarringUnionsCompletion.java @@ -2,7 +2,7 @@ package net.trueog.unionsog.commands.completions; import co.aikar.commands.BukkitCommandCompletionContext; import co.aikar.commands.InvalidCommandArgument; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import net.trueog.unionsog.UnionsOG; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; @@ -12,9 +12,9 @@ import java.util.Collections; import java.util.stream.Collectors; @SuppressWarnings("unused") -public class WarringClansCompletion extends AbstractSyncCompletion { +public class WarringUnionsCompletion extends AbstractSyncCompletion { - public WarringClansCompletion(@NotNull UnionsOG plugin) { + public WarringUnionsCompletion(@NotNull UnionsOG plugin) { super(plugin); @@ -26,10 +26,10 @@ public class WarringClansCompletion extends AbstractSyncCompletion { if (c.getIssuer().isPlayer()) { Player player = c.getPlayer(); - Clan clan = clanManager.getClanByPlayerUniqueId(player.getUniqueId()); - if (clan != null) { + Union union = unionManager.getUnionByPlayerUniqueId(player.getUniqueId()); + if (union != null) { - return clan.getWarringClans().stream().map(Clan::getTag).collect(Collectors.toList()); + return union.getWarringUnions().stream().map(Union::getTag).collect(Collectors.toList()); } @@ -42,7 +42,7 @@ public class WarringClansCompletion extends AbstractSyncCompletion { @Override public @NotNull String getId() { - return "warring_clans"; + return "warring_unions"; } diff --git a/src/main/java/net/trueog/unionsog/commands/conditions/AbstractCondition.java b/src/main/java/net/trueog/unionsog/commands/conditions/AbstractCondition.java index f46e8aed..faefcb53 100644 --- a/src/main/java/net/trueog/unionsog/commands/conditions/AbstractCondition.java +++ b/src/main/java/net/trueog/unionsog/commands/conditions/AbstractCondition.java @@ -8,7 +8,7 @@ public abstract class AbstractCondition implements IdentifiableCondition { protected final UnionsOG plugin; protected final PermissionsManager permissionsManager; - protected final ClanManager clanManager; + protected final UnionManager unionManager; protected final RequestManager requestManager; protected final SettingsManager settingsManager; protected final ProtectionManager protectionManager; @@ -17,7 +17,7 @@ public abstract class AbstractCondition implements IdentifiableCondition { this.plugin = plugin; permissionsManager = plugin.getPermissionsManager(); - clanManager = plugin.getClanManager(); + unionManager = plugin.getUnionManager(); requestManager = plugin.getRequestManager(); settingsManager = plugin.getSettingsManager(); protectionManager = plugin.getProtectionManager(); diff --git a/src/main/java/net/trueog/unionsog/commands/conditions/AlliedClanCondition.java b/src/main/java/net/trueog/unionsog/commands/conditions/AlliedUnionCondition.java similarity index 51% rename from src/main/java/net/trueog/unionsog/commands/conditions/AlliedClanCondition.java rename to src/main/java/net/trueog/unionsog/commands/conditions/AlliedUnionCondition.java index 4ea0a9b1..642b810e 100644 --- a/src/main/java/net/trueog/unionsog/commands/conditions/AlliedClanCondition.java +++ b/src/main/java/net/trueog/unionsog/commands/conditions/AlliedUnionCondition.java @@ -1,40 +1,40 @@ package net.trueog.unionsog.commands.conditions; import co.aikar.commands.*; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import net.trueog.unionsog.UnionsOG; -import net.trueog.unionsog.commands.ClanInput; +import net.trueog.unionsog.commands.UnionInput; import org.jetbrains.annotations.NotNull; import static net.trueog.unionsog.UnionsOG.lang; import static org.bukkit.ChatColor.RED; @SuppressWarnings("unused") -public class AlliedClanCondition extends AbstractParameterCondition { +public class AlliedUnionCondition extends AbstractParameterCondition { - public AlliedClanCondition(@NotNull UnionsOG plugin) { + public AlliedUnionCondition(@NotNull UnionsOG plugin) { super(plugin); } @Override - public Class getType() { + public Class getType() { - return ClanInput.class; + return UnionInput.class; } @Override public void validateCondition(ConditionContext context, - BukkitCommandExecutionContext execContext, ClanInput value) throws InvalidCommandArgument + BukkitCommandExecutionContext execContext, UnionInput value) throws InvalidCommandArgument { BukkitCommandIssuer issuer = context.getIssuer(); - Clan clan = Conditions.assertClanMember(clanManager, issuer); - if (!clan.isAlly(value.getClan().getTag())) { + Union union = Conditions.assertUnionMember(unionManager, issuer); + if (!union.isAlly(value.getUnion().getTag())) { - throw new ConditionFailedException(RED + lang("your.clans.are.not.allies", issuer)); + throw new ConditionFailedException(RED + lang("your.unions.are.not.allies", issuer)); } @@ -43,7 +43,7 @@ public class AlliedClanCondition extends AbstractParameterCondition { @Override public @NotNull String getId() { - return "allied_clan"; + return "allied_union"; } diff --git a/src/main/java/net/trueog/unionsog/commands/conditions/CanVoteCondition.java b/src/main/java/net/trueog/unionsog/commands/conditions/CanVoteCondition.java index 1ed0dc9b..06a04245 100644 --- a/src/main/java/net/trueog/unionsog/commands/conditions/CanVoteCondition.java +++ b/src/main/java/net/trueog/unionsog/commands/conditions/CanVoteCondition.java @@ -4,8 +4,8 @@ import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.ConditionContext; import co.aikar.commands.ConditionFailedException; import co.aikar.commands.InvalidCommandArgument; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; @@ -26,22 +26,16 @@ public class CanVoteCondition extends AbstractCommandCondition { public void validateCondition(ConditionContext context) throws InvalidCommandArgument { Player player = Conditions.assertPlayer(context.getIssuer()); - ClanPlayer cp = clanManager.getCreateClanPlayer(player.getUniqueId()); - Clan clan = cp.getClan(); - if (clan != null) { + UnionPlayer cp = unionManager.getCreateUnionPlayer(player.getUniqueId()); + Union union = cp.getUnion(); + if (union != null) { - if (!requestManager.hasRequest(clan.getTag())) { + if (!requestManager.hasRequest(union.getTag())) { throw new ConditionFailedException(lang("nothing.to.vote", player)); } - if (!clan.isLeader(player)) { - - throw new ConditionFailedException(RED + lang("no.leader.permissions", player)); - - } - if (cp.getVote() != null) { throw new ConditionFailedException(RED + lang("you.have.already.voted", player)); diff --git a/src/main/java/net/trueog/unionsog/commands/conditions/CanWarTargetCondition.java b/src/main/java/net/trueog/unionsog/commands/conditions/CanWarTargetCondition.java index f190bc51..b652cc11 100644 --- a/src/main/java/net/trueog/unionsog/commands/conditions/CanWarTargetCondition.java +++ b/src/main/java/net/trueog/unionsog/commands/conditions/CanWarTargetCondition.java @@ -1,16 +1,15 @@ package net.trueog.unionsog.commands.conditions; import co.aikar.commands.*; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import net.trueog.unionsog.UnionsOG; -import net.trueog.unionsog.commands.ClanInput; +import net.trueog.unionsog.commands.UnionInput; import org.jetbrains.annotations.NotNull; import static net.trueog.unionsog.UnionsOG.lang; import static net.trueog.unionsog.managers.SettingsManager.ConfigField.WAR_MAX_MEMBERS_DIFFERENCE; -import static net.trueog.unionsog.managers.SettingsManager.ConfigField.WAR_START_REQUEST_ENABLED; -public class CanWarTargetCondition extends AbstractParameterCondition { +public class CanWarTargetCondition extends AbstractParameterCondition { public CanWarTargetCondition(@NotNull UnionsOG plugin) { @@ -19,39 +18,39 @@ public class CanWarTargetCondition extends AbstractParameterCondition } @Override - public Class getType() { + public Class getType() { - return ClanInput.class; + return UnionInput.class; } @Override public void validateCondition(ConditionContext context, - BukkitCommandExecutionContext execContext, ClanInput target) throws InvalidCommandArgument + BukkitCommandExecutionContext execContext, UnionInput target) throws InvalidCommandArgument { BukkitCommandIssuer issuer = execContext.getIssuer(); - Clan issuerClan = Conditions.assertClanMember(clanManager, issuer); - Clan targetClan = target.getClan(); + Union issuerUnion = Conditions.assertUnionMember(unionManager, issuer); + Union targetUnion = target.getUnion(); - if (!issuerClan.isRival(targetClan.getTag())) { + if (!issuerUnion.isRival(targetUnion.getTag())) { throw new ConditionFailedException(lang("you.can.only.start.war.with.rivals", issuer)); } - if (issuerClan.isWarring(targetClan)) { + if (issuerUnion.isWarring(targetUnion)) { - throw new ConditionFailedException(lang("clans.already.at.war", issuer)); + throw new ConditionFailedException(lang("unions.already.at.war", issuer)); } - boolean isWarRequestEnabled = settingsManager.is(WAR_START_REQUEST_ENABLED); + // War no longer needs the target's consent, so the size guard always applies. int maxDifference = settingsManager.getInt(WAR_MAX_MEMBERS_DIFFERENCE); - if (!isWarRequestEnabled && maxDifference >= 0) { + if (maxDifference >= 0) { - int difference = Math.abs(issuerClan.getOnlineMembers().size() - targetClan.getOnlineMembers().size()); + int difference = Math.abs(issuerUnion.getOnlineMembers().size() - targetUnion.getOnlineMembers().size()); if (difference > maxDifference) throw new ConditionFailedException(lang("you.cant.start.war.online.members.difference", issuer)); diff --git a/src/main/java/net/trueog/unionsog/commands/conditions/Conditions.java b/src/main/java/net/trueog/unionsog/commands/conditions/Conditions.java index 6d800426..769f4c1c 100644 --- a/src/main/java/net/trueog/unionsog/commands/conditions/Conditions.java +++ b/src/main/java/net/trueog/unionsog/commands/conditions/Conditions.java @@ -3,8 +3,8 @@ package net.trueog.unionsog.commands.conditions; import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.ConditionFailedException; import co.aikar.commands.MessageKeys; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.managers.ClanManager; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.managers.UnionManager; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; @@ -17,17 +17,17 @@ public class Conditions { } @NotNull - public static Clan assertClanMember(@NotNull ClanManager clanManager, @NotNull BukkitCommandIssuer issuer) { + public static Union assertUnionMember(@NotNull UnionManager unionManager, @NotNull BukkitCommandIssuer issuer) { Conditions.assertPlayer(issuer); - Clan clan = clanManager.getClanByPlayerUniqueId(issuer.getUniqueId()); - if (clan == null) { + Union union = unionManager.getUnionByPlayerUniqueId(issuer.getUniqueId()); + if (union == null) { - throw new ConditionFailedException(lang("not.a.member.of.any.clan", issuer)); + throw new ConditionFailedException(lang("not.a.member.of.any.union", issuer)); } - return clan; + return union; } diff --git a/src/main/java/net/trueog/unionsog/commands/conditions/DifferentClanCondition.java b/src/main/java/net/trueog/unionsog/commands/conditions/DifferentUnionCondition.java similarity index 53% rename from src/main/java/net/trueog/unionsog/commands/conditions/DifferentClanCondition.java rename to src/main/java/net/trueog/unionsog/commands/conditions/DifferentUnionCondition.java index d1a50297..04fe23b1 100644 --- a/src/main/java/net/trueog/unionsog/commands/conditions/DifferentClanCondition.java +++ b/src/main/java/net/trueog/unionsog/commands/conditions/DifferentUnionCondition.java @@ -1,44 +1,44 @@ package net.trueog.unionsog.commands.conditions; import co.aikar.commands.*; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; -import net.trueog.unionsog.commands.ClanInput; +import net.trueog.unionsog.commands.UnionInput; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import static net.trueog.unionsog.UnionsOG.lang; @SuppressWarnings("unused") -public class DifferentClanCondition extends AbstractParameterCondition { +public class DifferentUnionCondition extends AbstractParameterCondition { - public DifferentClanCondition(@NotNull UnionsOG plugin) { + public DifferentUnionCondition(@NotNull UnionsOG plugin) { super(plugin); } @Override - public Class getType() { + public Class getType() { - return ClanInput.class; + return UnionInput.class; } @Override public void validateCondition(ConditionContext context, - BukkitCommandExecutionContext execContext, ClanInput value) throws InvalidCommandArgument + BukkitCommandExecutionContext execContext, UnionInput value) throws InvalidCommandArgument { if (execContext.getIssuer().isPlayer()) { Player player = execContext.getPlayer(); - ClanPlayer cp = clanManager.getAnyClanPlayer(player.getUniqueId()); - if (cp != null && cp.getClan() != null) { + UnionPlayer cp = unionManager.getAnyUnionPlayer(player.getUniqueId()); + if (cp != null && cp.getUnion() != null) { - if (value.getClan().equals(cp.getClan())) { + if (value.getUnion().equals(cp.getUnion())) { - throw new ConditionFailedException(lang("cannot.be.same.clan", player)); + throw new ConditionFailedException(lang("cannot.be.same.union", player)); } diff --git a/src/main/java/net/trueog/unionsog/commands/conditions/InputClanMemberCondition.java b/src/main/java/net/trueog/unionsog/commands/conditions/InputClanMemberCondition.java deleted file mode 100644 index b5d94866..00000000 --- a/src/main/java/net/trueog/unionsog/commands/conditions/InputClanMemberCondition.java +++ /dev/null @@ -1,46 +0,0 @@ -package net.trueog.unionsog.commands.conditions; - -import co.aikar.commands.*; -import net.trueog.unionsog.UnionsOG; -import net.trueog.unionsog.commands.ClanPlayerInput; -import org.jetbrains.annotations.NotNull; - -import static net.trueog.unionsog.UnionsOG.lang; -import static org.bukkit.ChatColor.RED; - -public class InputClanMemberCondition extends AbstractParameterCondition { - - public InputClanMemberCondition(@NotNull UnionsOG plugin) { - - super(plugin); - - } - - @Override - public Class getType() { - - return ClanPlayerInput.class; - - } - - @Override - public void validateCondition(ConditionContext context, - BukkitCommandExecutionContext execContext, ClanPlayerInput value) throws InvalidCommandArgument - { - - if (value.getClanPlayer().getClan() == null) { - - throw new ConditionFailedException(RED + lang("player.not.a.member.of.any.clan", execContext.getSender())); - - } - - } - - @Override - public @NotNull String getId() { - - return "clan_member"; - - } - -} diff --git a/src/main/java/net/trueog/unionsog/commands/conditions/InputUnionMemberCondition.java b/src/main/java/net/trueog/unionsog/commands/conditions/InputUnionMemberCondition.java new file mode 100644 index 00000000..0a74622a --- /dev/null +++ b/src/main/java/net/trueog/unionsog/commands/conditions/InputUnionMemberCondition.java @@ -0,0 +1,46 @@ +package net.trueog.unionsog.commands.conditions; + +import co.aikar.commands.*; +import net.trueog.unionsog.UnionsOG; +import net.trueog.unionsog.commands.UnionPlayerInput; +import org.jetbrains.annotations.NotNull; + +import static net.trueog.unionsog.UnionsOG.lang; +import static org.bukkit.ChatColor.RED; + +public class InputUnionMemberCondition extends AbstractParameterCondition { + + public InputUnionMemberCondition(@NotNull UnionsOG plugin) { + + super(plugin); + + } + + @Override + public Class getType() { + + return UnionPlayerInput.class; + + } + + @Override + public void validateCondition(ConditionContext context, + BukkitCommandExecutionContext execContext, UnionPlayerInput value) throws InvalidCommandArgument + { + + if (value.getUnionPlayer().getUnion() == null) { + + throw new ConditionFailedException(RED + lang("player.not.a.member.of.any.union", execContext.getSender())); + + } + + } + + @Override + public @NotNull String getId() { + + return "union_member"; + + } + +} diff --git a/src/main/java/net/trueog/unionsog/commands/conditions/LeaderCondition.java b/src/main/java/net/trueog/unionsog/commands/conditions/LeaderCondition.java deleted file mode 100644 index 45090989..00000000 --- a/src/main/java/net/trueog/unionsog/commands/conditions/LeaderCondition.java +++ /dev/null @@ -1,44 +0,0 @@ -package net.trueog.unionsog.commands.conditions; - -import co.aikar.commands.BukkitCommandIssuer; -import co.aikar.commands.ConditionContext; -import co.aikar.commands.ConditionFailedException; -import co.aikar.commands.InvalidCommandArgument; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.UnionsOG; -import org.bukkit.ChatColor; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -import static net.trueog.unionsog.UnionsOG.lang; - -@SuppressWarnings("unused") -public class LeaderCondition extends AbstractCommandCondition { - - public LeaderCondition(@NotNull UnionsOG plugin) { - - super(plugin); - - } - - @Override - public void validateCondition(ConditionContext context) throws InvalidCommandArgument { - - Player player = Conditions.assertPlayer(context.getIssuer()); - Clan clan = Conditions.assertClanMember(clanManager, context.getIssuer()); - if (!clan.isLeader(player)) { - - throw new ConditionFailedException(ChatColor.RED + lang("no.leader.permissions", player)); - - } - - } - - @Override - public @NotNull String getId() { - - return "leader"; - - } - -} diff --git a/src/main/java/net/trueog/unionsog/commands/conditions/MinimumToAllyCondition.java b/src/main/java/net/trueog/unionsog/commands/conditions/MinimumToAllyCondition.java index 66a23bde..47496ad3 100644 --- a/src/main/java/net/trueog/unionsog/commands/conditions/MinimumToAllyCondition.java +++ b/src/main/java/net/trueog/unionsog/commands/conditions/MinimumToAllyCondition.java @@ -4,12 +4,12 @@ import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.ConditionContext; import co.aikar.commands.ConditionFailedException; import co.aikar.commands.InvalidCommandArgument; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import net.trueog.unionsog.UnionsOG; import org.jetbrains.annotations.NotNull; import static net.trueog.unionsog.UnionsOG.lang; -import static net.trueog.unionsog.managers.SettingsManager.ConfigField.CLAN_MIN_SIZE_TO_SET_ALLY; +import static net.trueog.unionsog.managers.SettingsManager.ConfigField.UNION_MIN_SIZE_TO_SET_ALLY; import static org.bukkit.ChatColor.RED; @SuppressWarnings("unused") @@ -24,11 +24,11 @@ public class MinimumToAllyCondition extends AbstractCommandCondition { @Override public void validateCondition(ConditionContext context) throws InvalidCommandArgument { - Clan clan = Conditions.assertClanMember(clanManager, context.getIssuer()); - if (clan.getSize() < settingsManager.getInt(CLAN_MIN_SIZE_TO_SET_ALLY)) { + Union union = Conditions.assertUnionMember(unionManager, context.getIssuer()); + if (union.getSize() < settingsManager.getInt(UNION_MIN_SIZE_TO_SET_ALLY)) { throw new ConditionFailedException(RED + lang("minimum.to.make.alliance", context.getIssuer(), - settingsManager.getInt(CLAN_MIN_SIZE_TO_SET_ALLY))); + settingsManager.getInt(UNION_MIN_SIZE_TO_SET_ALLY))); } diff --git a/src/main/java/net/trueog/unionsog/commands/conditions/MinimumToRivalCondition.java b/src/main/java/net/trueog/unionsog/commands/conditions/MinimumToRivalCondition.java index 7601c072..7604945f 100644 --- a/src/main/java/net/trueog/unionsog/commands/conditions/MinimumToRivalCondition.java +++ b/src/main/java/net/trueog/unionsog/commands/conditions/MinimumToRivalCondition.java @@ -4,12 +4,12 @@ import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.ConditionContext; import co.aikar.commands.ConditionFailedException; import co.aikar.commands.InvalidCommandArgument; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import net.trueog.unionsog.UnionsOG; import org.jetbrains.annotations.NotNull; import static net.trueog.unionsog.UnionsOG.lang; -import static net.trueog.unionsog.managers.SettingsManager.ConfigField.CLAN_MIN_SIZE_TO_SET_RIVAL; +import static net.trueog.unionsog.managers.SettingsManager.ConfigField.UNION_MIN_SIZE_TO_SET_RIVAL; import static org.bukkit.ChatColor.RED; @SuppressWarnings("unused") @@ -25,11 +25,11 @@ public class MinimumToRivalCondition extends AbstractCommandCondition { public void validateCondition(ConditionContext context) throws InvalidCommandArgument { BukkitCommandIssuer issuer = context.getIssuer(); - Clan clan = Conditions.assertClanMember(clanManager, issuer); - if (clan.getSize() < settingsManager.getInt(CLAN_MIN_SIZE_TO_SET_RIVAL)) { + Union union = Conditions.assertUnionMember(unionManager, issuer); + if (union.getSize() < settingsManager.getInt(UNION_MIN_SIZE_TO_SET_RIVAL)) { throw new ConditionFailedException( - RED + lang("min.players.rivalries", issuer, settingsManager.getInt(CLAN_MIN_SIZE_TO_SET_RIVAL))); + RED + lang("min.players.rivalries", issuer, settingsManager.getInt(UNION_MIN_SIZE_TO_SET_RIVAL))); } diff --git a/src/main/java/net/trueog/unionsog/commands/conditions/NotBannedInputCondition.java b/src/main/java/net/trueog/unionsog/commands/conditions/NotBannedInputCondition.java index 3f19676a..1c65ce23 100644 --- a/src/main/java/net/trueog/unionsog/commands/conditions/NotBannedInputCondition.java +++ b/src/main/java/net/trueog/unionsog/commands/conditions/NotBannedInputCondition.java @@ -2,7 +2,7 @@ package net.trueog.unionsog.commands.conditions; import co.aikar.commands.*; import net.trueog.unionsog.UnionsOG; -import net.trueog.unionsog.commands.ClanPlayerInput; +import net.trueog.unionsog.commands.UnionPlayerInput; import org.jetbrains.annotations.NotNull; import java.util.UUID; @@ -11,7 +11,7 @@ import static net.trueog.unionsog.UnionsOG.lang; import static org.bukkit.ChatColor.RED; @SuppressWarnings("unused") -public class NotBannedInputCondition extends AbstractParameterCondition { +public class NotBannedInputCondition extends AbstractParameterCondition { public NotBannedInputCondition(@NotNull UnionsOG plugin) { @@ -20,22 +20,22 @@ public class NotBannedInputCondition extends AbstractParameterCondition getType() { + public Class getType() { - return ClanPlayerInput.class; + return UnionPlayerInput.class; } @Override public void validateCondition(ConditionContext context, - BukkitCommandExecutionContext execContext, ClanPlayerInput value) throws InvalidCommandArgument + BukkitCommandExecutionContext execContext, UnionPlayerInput value) throws InvalidCommandArgument { - UUID uniqueId = value.getClanPlayer().getUniqueId(); + UUID uniqueId = value.getUnionPlayer().getUniqueId(); if (settingsManager.isBanned(uniqueId)) { throw new ConditionFailedException( - RED + lang("this.player.is.banned.from.using.clan.commands", execContext.getSender())); + RED + lang("this.player.is.banned.from.using.union.commands", execContext.getSender())); } diff --git a/src/main/java/net/trueog/unionsog/commands/conditions/NotInClanCondition.java b/src/main/java/net/trueog/unionsog/commands/conditions/NotInClanCondition.java deleted file mode 100644 index 36291bff..00000000 --- a/src/main/java/net/trueog/unionsog/commands/conditions/NotInClanCondition.java +++ /dev/null @@ -1,52 +0,0 @@ -package net.trueog.unionsog.commands.conditions; - -import co.aikar.commands.*; -import net.trueog.unionsog.ClanPlayer; -import net.trueog.unionsog.UnionsOG; -import net.trueog.unionsog.commands.ClanPlayerInput; -import org.jetbrains.annotations.NotNull; - -import static net.trueog.unionsog.UnionsOG.debug; -import static net.trueog.unionsog.UnionsOG.lang; -import static org.bukkit.ChatColor.RED; - -@SuppressWarnings("unused") -public class NotInClanCondition extends AbstractParameterCondition { - - public NotInClanCondition(@NotNull UnionsOG plugin) { - - super(plugin); - - } - - @Override - public Class getType() { - - return ClanPlayerInput.class; - - } - - @Override - public void validateCondition(ConditionContext context, - BukkitCommandExecutionContext execContext, ClanPlayerInput value) throws InvalidCommandArgument - { - - ClanPlayer clanPlayer = value.getClanPlayer(); - debug(String.format("NotInClanCondition -> %s %s", clanPlayer.getName(), clanPlayer.getUniqueId())); - if (clanPlayer.getClan() != null) { - - throw new ConditionFailedException( - RED + lang("the.player.is.already.member.of.another.clan", execContext.getSender())); - - } - - } - - @Override - public @NotNull String getId() { - - return "not_in_clan"; - - } - -} diff --git a/src/main/java/net/trueog/unionsog/commands/conditions/NotInUnionCondition.java b/src/main/java/net/trueog/unionsog/commands/conditions/NotInUnionCondition.java new file mode 100644 index 00000000..bba3ade6 --- /dev/null +++ b/src/main/java/net/trueog/unionsog/commands/conditions/NotInUnionCondition.java @@ -0,0 +1,52 @@ +package net.trueog.unionsog.commands.conditions; + +import co.aikar.commands.*; +import net.trueog.unionsog.UnionPlayer; +import net.trueog.unionsog.UnionsOG; +import net.trueog.unionsog.commands.UnionPlayerInput; +import org.jetbrains.annotations.NotNull; + +import static net.trueog.unionsog.UnionsOG.debug; +import static net.trueog.unionsog.UnionsOG.lang; +import static org.bukkit.ChatColor.RED; + +@SuppressWarnings("unused") +public class NotInUnionCondition extends AbstractParameterCondition { + + public NotInUnionCondition(@NotNull UnionsOG plugin) { + + super(plugin); + + } + + @Override + public Class getType() { + + return UnionPlayerInput.class; + + } + + @Override + public void validateCondition(ConditionContext context, + BukkitCommandExecutionContext execContext, UnionPlayerInput value) throws InvalidCommandArgument + { + + UnionPlayer unionPlayer = value.getUnionPlayer(); + debug(String.format("NotInClanCondition -> %s %s", unionPlayer.getName(), unionPlayer.getUniqueId())); + if (unionPlayer.getUnion() != null) { + + throw new ConditionFailedException( + RED + lang("the.player.is.already.member.of.another.union", execContext.getSender())); + + } + + } + + @Override + public @NotNull String getId() { + + return "not_in_union"; + + } + +} diff --git a/src/main/java/net/trueog/unionsog/commands/conditions/OnlineCondition.java b/src/main/java/net/trueog/unionsog/commands/conditions/OnlineCondition.java index 82ce4248..97a1b779 100644 --- a/src/main/java/net/trueog/unionsog/commands/conditions/OnlineCondition.java +++ b/src/main/java/net/trueog/unionsog/commands/conditions/OnlineCondition.java @@ -1,9 +1,9 @@ package net.trueog.unionsog.commands.conditions; import co.aikar.commands.*; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; -import net.trueog.unionsog.commands.ClanPlayerInput; +import net.trueog.unionsog.commands.UnionPlayerInput; import net.trueog.unionsog.utils.VanishUtils; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; @@ -12,7 +12,7 @@ import static net.trueog.unionsog.UnionsOG.debug; import static net.trueog.unionsog.UnionsOG.lang; @SuppressWarnings("unused") -public class OnlineCondition extends AbstractParameterCondition { +public class OnlineCondition extends AbstractParameterCondition { public OnlineCondition(@NotNull UnionsOG plugin) { @@ -21,20 +21,20 @@ public class OnlineCondition extends AbstractParameterCondition } @Override - public Class getType() { + public Class getType() { - return ClanPlayerInput.class; + return UnionPlayerInput.class; } @Override public void validateCondition(ConditionContext context, - BukkitCommandExecutionContext execContext, ClanPlayerInput value) throws InvalidCommandArgument + BukkitCommandExecutionContext execContext, UnionPlayerInput value) throws InvalidCommandArgument { - ClanPlayer clanPlayer = value.getClanPlayer(); - debug(String.format("OnlineCondition -> %s %s", clanPlayer.getName(), clanPlayer.getUniqueId())); - Player player = clanPlayer.toPlayer(); + UnionPlayer unionPlayer = value.getUnionPlayer(); + debug(String.format("OnlineCondition -> %s %s", unionPlayer.getName(), unionPlayer.getUniqueId())); + Player player = unionPlayer.toPlayer(); if (player != null) { diff --git a/src/main/java/net/trueog/unionsog/commands/conditions/PlayerClanMemberCondition.java b/src/main/java/net/trueog/unionsog/commands/conditions/PlayerUnionMemberCondition.java similarity index 78% rename from src/main/java/net/trueog/unionsog/commands/conditions/PlayerClanMemberCondition.java rename to src/main/java/net/trueog/unionsog/commands/conditions/PlayerUnionMemberCondition.java index 6c84427b..9d0366c4 100644 --- a/src/main/java/net/trueog/unionsog/commands/conditions/PlayerClanMemberCondition.java +++ b/src/main/java/net/trueog/unionsog/commands/conditions/PlayerUnionMemberCondition.java @@ -11,9 +11,9 @@ import org.jetbrains.annotations.NotNull; import static net.trueog.unionsog.UnionsOG.debug; @SuppressWarnings("unused") -public class PlayerClanMemberCondition extends AbstractParameterCondition { +public class PlayerUnionMemberCondition extends AbstractParameterCondition { - public PlayerClanMemberCondition(@NotNull UnionsOG plugin) { + public PlayerUnionMemberCondition(@NotNull UnionsOG plugin) { super(plugin); @@ -32,14 +32,14 @@ public class PlayerClanMemberCondition extends AbstractParameterCondition %s %s", value.getName(), value.getUniqueId())); - Conditions.assertClanMember(clanManager, context.getIssuer()); + Conditions.assertUnionMember(unionManager, context.getIssuer()); } @Override public @NotNull String getId() { - return "clan_member"; + return "union_member"; } diff --git a/src/main/java/net/trueog/unionsog/commands/conditions/RankPermissionCondition.java b/src/main/java/net/trueog/unionsog/commands/conditions/RankPermissionCondition.java deleted file mode 100644 index e2472b1e..00000000 --- a/src/main/java/net/trueog/unionsog/commands/conditions/RankPermissionCondition.java +++ /dev/null @@ -1,49 +0,0 @@ -package net.trueog.unionsog.commands.conditions; - -import co.aikar.commands.BukkitCommandIssuer; -import co.aikar.commands.ConditionContext; -import co.aikar.commands.ConditionFailedException; -import co.aikar.commands.InvalidCommandArgument; -import net.trueog.unionsog.RankPermission; -import net.trueog.unionsog.UnionsOG; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -@SuppressWarnings("unused") -public class RankPermissionCondition extends AbstractCommandCondition { - - public RankPermissionCondition(@NotNull UnionsOG plugin) { - - super(plugin); - - } - - @Override - public void validateCondition(ConditionContext context) throws InvalidCommandArgument { - - String name = context.getConfigValue("name", (String) null); - Player player = context.getIssuer().getPlayer(); - if (player == null || name == null) { - - return; - - } - - RankPermission rankPermission = net.trueog.unionsog.RankPermission.valueOf(name); - - if (!permissionsManager.has(player, rankPermission, true)) { - - throw new ConditionFailedException(); - - } - - } - - @Override - public @NotNull String getId() { - - return "rank"; - - } - -} diff --git a/src/main/java/net/trueog/unionsog/commands/conditions/RivableCondition.java b/src/main/java/net/trueog/unionsog/commands/conditions/RivableCondition.java index 54a40400..4947edfd 100644 --- a/src/main/java/net/trueog/unionsog/commands/conditions/RivableCondition.java +++ b/src/main/java/net/trueog/unionsog/commands/conditions/RivableCondition.java @@ -4,7 +4,7 @@ import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.ConditionContext; import co.aikar.commands.ConditionFailedException; import co.aikar.commands.InvalidCommandArgument; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import net.trueog.unionsog.UnionsOG; import org.jetbrains.annotations.NotNull; @@ -23,10 +23,10 @@ public class RivableCondition extends AbstractCommandCondition { @Override public void validateCondition(ConditionContext context) throws InvalidCommandArgument { - Clan clan = Conditions.assertClanMember(clanManager, context.getIssuer()); - if (clan.isUnrivable()) { + Union union = Conditions.assertUnionMember(unionManager, context.getIssuer()); + if (union.isUnrivable()) { - throw new ConditionFailedException(RED + lang("your.clan.cannot.create.rivals", context.getIssuer())); + throw new ConditionFailedException(RED + lang("your.union.cannot.create.rivals", context.getIssuer())); } diff --git a/src/main/java/net/trueog/unionsog/commands/conditions/SameClanCondition.java b/src/main/java/net/trueog/unionsog/commands/conditions/SameClanCondition.java deleted file mode 100644 index 6f4cd216..00000000 --- a/src/main/java/net/trueog/unionsog/commands/conditions/SameClanCondition.java +++ /dev/null @@ -1,49 +0,0 @@ -package net.trueog.unionsog.commands.conditions; - -import co.aikar.commands.*; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.UnionsOG; -import net.trueog.unionsog.commands.ClanPlayerInput; -import org.jetbrains.annotations.NotNull; - -import static net.trueog.unionsog.UnionsOG.lang; - -@SuppressWarnings("unused") -public class SameClanCondition extends AbstractParameterCondition { - - public SameClanCondition(@NotNull UnionsOG plugin) { - - super(plugin); - - } - - @Override - public Class getType() { - - return ClanPlayerInput.class; - - } - - @Override - public void validateCondition(ConditionContext context, - BukkitCommandExecutionContext execContext, ClanPlayerInput value) throws InvalidCommandArgument - { - - BukkitCommandIssuer issuer = context.getIssuer(); - Clan clan = Conditions.assertClanMember(clanManager, issuer); - if (value == null || value.getClanPlayer().getClan() == null || !value.getClanPlayer().getClan().equals(clan)) { - - throw new ConditionFailedException(lang("the.player.is.not.a.member.of.your.clan", issuer)); - - } - - } - - @Override - public @NotNull String getId() { - - return "same_clan"; - - } - -} diff --git a/src/main/java/net/trueog/unionsog/commands/conditions/SameUnionCondition.java b/src/main/java/net/trueog/unionsog/commands/conditions/SameUnionCondition.java new file mode 100644 index 00000000..590bc5db --- /dev/null +++ b/src/main/java/net/trueog/unionsog/commands/conditions/SameUnionCondition.java @@ -0,0 +1,51 @@ +package net.trueog.unionsog.commands.conditions; + +import co.aikar.commands.*; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionsOG; +import net.trueog.unionsog.commands.UnionPlayerInput; +import org.jetbrains.annotations.NotNull; + +import static net.trueog.unionsog.UnionsOG.lang; + +@SuppressWarnings("unused") +public class SameUnionCondition extends AbstractParameterCondition { + + public SameUnionCondition(@NotNull UnionsOG plugin) { + + super(plugin); + + } + + @Override + public Class getType() { + + return UnionPlayerInput.class; + + } + + @Override + public void validateCondition(ConditionContext context, + BukkitCommandExecutionContext execContext, UnionPlayerInput value) throws InvalidCommandArgument + { + + BukkitCommandIssuer issuer = context.getIssuer(); + Union union = Conditions.assertUnionMember(unionManager, issuer); + if (value == null || value.getUnionPlayer().getUnion() == null + || !value.getUnionPlayer().getUnion().equals(union)) + { + + throw new ConditionFailedException(lang("the.player.is.not.a.member.of.your.union", issuer)); + + } + + } + + @Override + public @NotNull String getId() { + + return "same_union"; + + } + +} diff --git a/src/main/java/net/trueog/unionsog/commands/conditions/SenderClanMemberCondition.java b/src/main/java/net/trueog/unionsog/commands/conditions/SenderUnionMemberCondition.java similarity index 68% rename from src/main/java/net/trueog/unionsog/commands/conditions/SenderClanMemberCondition.java rename to src/main/java/net/trueog/unionsog/commands/conditions/SenderUnionMemberCondition.java index 4bd3eef7..567dbc0b 100644 --- a/src/main/java/net/trueog/unionsog/commands/conditions/SenderClanMemberCondition.java +++ b/src/main/java/net/trueog/unionsog/commands/conditions/SenderUnionMemberCondition.java @@ -7,9 +7,9 @@ import net.trueog.unionsog.UnionsOG; import org.jetbrains.annotations.NotNull; @SuppressWarnings("unused") -public class SenderClanMemberCondition extends AbstractCommandCondition { +public class SenderUnionMemberCondition extends AbstractCommandCondition { - public SenderClanMemberCondition(@NotNull UnionsOG plugin) { + public SenderUnionMemberCondition(@NotNull UnionsOG plugin) { super(plugin); @@ -18,14 +18,14 @@ public class SenderClanMemberCondition extends AbstractCommandCondition { @Override public void validateCondition(ConditionContext context) throws InvalidCommandArgument { - Conditions.assertClanMember(clanManager, context.getIssuer()); + Conditions.assertUnionMember(unionManager, context.getIssuer()); } @Override public @NotNull String getId() { - return "clan_member"; + return "union_member"; } diff --git a/src/main/java/net/trueog/unionsog/commands/conditions/TeleportCondition.java b/src/main/java/net/trueog/unionsog/commands/conditions/TeleportCondition.java index e40f3d3a..3a3e9e3e 100644 --- a/src/main/java/net/trueog/unionsog/commands/conditions/TeleportCondition.java +++ b/src/main/java/net/trueog/unionsog/commands/conditions/TeleportCondition.java @@ -1,7 +1,7 @@ package net.trueog.unionsog.commands.conditions; import co.aikar.commands.*; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import net.trueog.unionsog.Flags; import net.trueog.unionsog.UnionsOG; import org.bukkit.entity.Player; @@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull; import static net.trueog.unionsog.UnionsOG.lang; -public class TeleportCondition extends AbstractParameterCondition { +public class TeleportCondition extends AbstractParameterCondition { public TeleportCondition(@NotNull UnionsOG plugin) { @@ -18,15 +18,15 @@ public class TeleportCondition extends AbstractParameterCondition { } @Override - public Class getType() { + public Class getType() { - return Clan.class; + return Union.class; } @Override public void validateCondition(ConditionContext context, - BukkitCommandExecutionContext execContext, Clan value) throws InvalidCommandArgument + BukkitCommandExecutionContext execContext, Union value) throws InvalidCommandArgument { Player player = execContext.getPlayer(); diff --git a/src/main/java/net/trueog/unionsog/commands/conditions/TeleportInputCondition.java b/src/main/java/net/trueog/unionsog/commands/conditions/TeleportInputCondition.java index 104aea86..8afab373 100644 --- a/src/main/java/net/trueog/unionsog/commands/conditions/TeleportInputCondition.java +++ b/src/main/java/net/trueog/unionsog/commands/conditions/TeleportInputCondition.java @@ -5,10 +5,10 @@ import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.ConditionContext; import co.aikar.commands.InvalidCommandArgument; import net.trueog.unionsog.UnionsOG; -import net.trueog.unionsog.commands.ClanInput; +import net.trueog.unionsog.commands.UnionInput; import org.jetbrains.annotations.NotNull; -public class TeleportInputCondition extends AbstractParameterCondition { +public class TeleportInputCondition extends AbstractParameterCondition { public TeleportInputCondition(@NotNull UnionsOG plugin) { @@ -17,18 +17,18 @@ public class TeleportInputCondition extends AbstractParameterCondition getType() { + public Class getType() { - return ClanInput.class; + return UnionInput.class; } @Override public void validateCondition(ConditionContext context, - BukkitCommandExecutionContext execContext, ClanInput value) throws InvalidCommandArgument + BukkitCommandExecutionContext execContext, UnionInput value) throws InvalidCommandArgument { - new TeleportCondition(plugin).validateCondition(context, execContext, value.getClan()); + new TeleportCondition(plugin).validateCondition(context, execContext, value.getUnion()); } diff --git a/src/main/java/net/trueog/unionsog/commands/conditions/ClanMemberCondition.java b/src/main/java/net/trueog/unionsog/commands/conditions/UnionMemberCondition.java similarity index 55% rename from src/main/java/net/trueog/unionsog/commands/conditions/ClanMemberCondition.java rename to src/main/java/net/trueog/unionsog/commands/conditions/UnionMemberCondition.java index a273cdd2..20c62959 100644 --- a/src/main/java/net/trueog/unionsog/commands/conditions/ClanMemberCondition.java +++ b/src/main/java/net/trueog/unionsog/commands/conditions/UnionMemberCondition.java @@ -4,39 +4,39 @@ import co.aikar.commands.BukkitCommandExecutionContext; import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.ConditionContext; import co.aikar.commands.InvalidCommandArgument; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; import org.jetbrains.annotations.NotNull; @SuppressWarnings("unused") -public class ClanMemberCondition extends AbstractParameterCondition { +public class UnionMemberCondition extends AbstractParameterCondition { - public ClanMemberCondition(@NotNull UnionsOG plugin) { + public UnionMemberCondition(@NotNull UnionsOG plugin) { super(plugin); } @Override - public Class getType() { + public Class getType() { - return ClanPlayer.class; + return UnionPlayer.class; } @Override public void validateCondition(ConditionContext context, - BukkitCommandExecutionContext execContext, ClanPlayer value) throws InvalidCommandArgument + BukkitCommandExecutionContext execContext, UnionPlayer value) throws InvalidCommandArgument { - Conditions.assertClanMember(clanManager, context.getIssuer()); + Conditions.assertUnionMember(unionManager, context.getIssuer()); } @Override public @NotNull String getId() { - return "clan_member"; + return "union_member"; } diff --git a/src/main/java/net/trueog/unionsog/commands/contexts/AbstractContextResolver.java b/src/main/java/net/trueog/unionsog/commands/contexts/AbstractContextResolver.java index 57478d5c..a0986365 100644 --- a/src/main/java/net/trueog/unionsog/commands/contexts/AbstractContextResolver.java +++ b/src/main/java/net/trueog/unionsog/commands/contexts/AbstractContextResolver.java @@ -1,18 +1,18 @@ package net.trueog.unionsog.commands.contexts; import net.trueog.unionsog.UnionsOG; -import net.trueog.unionsog.managers.ClanManager; +import net.trueog.unionsog.managers.UnionManager; import org.jetbrains.annotations.NotNull; public abstract class AbstractContextResolver { protected final @NotNull UnionsOG plugin; - protected final @NotNull ClanManager clanManager; + protected final @NotNull UnionManager unionManager; public AbstractContextResolver(@NotNull UnionsOG plugin) { this.plugin = plugin; - clanManager = plugin.getClanManager(); + unionManager = plugin.getUnionManager(); } diff --git a/src/main/java/net/trueog/unionsog/commands/contexts/ClanContextResolver.java b/src/main/java/net/trueog/unionsog/commands/contexts/ClanContextResolver.java deleted file mode 100644 index 296ca8d4..00000000 --- a/src/main/java/net/trueog/unionsog/commands/contexts/ClanContextResolver.java +++ /dev/null @@ -1,32 +0,0 @@ -package net.trueog.unionsog.commands.contexts; - -import co.aikar.commands.BukkitCommandExecutionContext; -import co.aikar.commands.InvalidCommandArgument; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.UnionsOG; -import org.jetbrains.annotations.NotNull; - -@SuppressWarnings("unused") -public class ClanContextResolver extends AbstractIssuerOnlyContextResolver { - - public ClanContextResolver(@NotNull UnionsOG plugin) { - - super(plugin); - - } - - @Override - public Clan getContext(BukkitCommandExecutionContext c) throws InvalidCommandArgument { - - return Contexts.assertClanMember(clanManager, c.getIssuer()); - - } - - @Override - public Class getType() { - - return Clan.class; - - } - -} diff --git a/src/main/java/net/trueog/unionsog/commands/contexts/ClanInputContextResolver.java b/src/main/java/net/trueog/unionsog/commands/contexts/ClanInputContextResolver.java deleted file mode 100644 index 789cb877..00000000 --- a/src/main/java/net/trueog/unionsog/commands/contexts/ClanInputContextResolver.java +++ /dev/null @@ -1,44 +0,0 @@ -package net.trueog.unionsog.commands.contexts; - -import co.aikar.commands.BukkitCommandExecutionContext; -import co.aikar.commands.InvalidCommandArgument; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.UnionsOG; -import net.trueog.unionsog.commands.ClanInput; -import org.jetbrains.annotations.NotNull; - -import static net.trueog.unionsog.UnionsOG.lang; -import static org.bukkit.ChatColor.RED; - -@SuppressWarnings("unused") -public class ClanInputContextResolver extends AbstractInputOnlyContextResolver { - - public ClanInputContextResolver(@NotNull UnionsOG plugin) { - - super(plugin); - - } - - @Override - public ClanInput getContext(BukkitCommandExecutionContext context) throws InvalidCommandArgument { - - String arg = context.popFirstArg(); - Clan clan = clanManager.getClan(arg); - if (clan == null) { - - throw new InvalidCommandArgument(RED + lang("the.clan.does.not.exist", context.getSender()), false); - - } - - return new ClanInput(clan); - - } - - @Override - public Class getType() { - - return ClanInput.class; - - } - -} diff --git a/src/main/java/net/trueog/unionsog/commands/contexts/ClanPlayerContextResolver.java b/src/main/java/net/trueog/unionsog/commands/contexts/ClanPlayerContextResolver.java deleted file mode 100644 index ec0b1ea4..00000000 --- a/src/main/java/net/trueog/unionsog/commands/contexts/ClanPlayerContextResolver.java +++ /dev/null @@ -1,34 +0,0 @@ -package net.trueog.unionsog.commands.contexts; - -import co.aikar.commands.BukkitCommandExecutionContext; -import co.aikar.commands.InvalidCommandArgument; -import net.trueog.unionsog.ClanPlayer; -import net.trueog.unionsog.UnionsOG; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -@SuppressWarnings("unused") -public class ClanPlayerContextResolver extends AbstractIssuerOnlyContextResolver { - - public ClanPlayerContextResolver(@NotNull UnionsOG plugin) { - - super(plugin); - - } - - @Override - public ClanPlayer getContext(BukkitCommandExecutionContext context) throws InvalidCommandArgument { - - Player player = Contexts.assertPlayer(context.getIssuer()); - return clanManager.getCreateClanPlayer(player.getUniqueId()); - - } - - @Override - public Class getType() { - - return ClanPlayer.class; - - } - -} diff --git a/src/main/java/net/trueog/unionsog/commands/contexts/Contexts.java b/src/main/java/net/trueog/unionsog/commands/contexts/Contexts.java index 788aa101..3e7894a0 100644 --- a/src/main/java/net/trueog/unionsog/commands/contexts/Contexts.java +++ b/src/main/java/net/trueog/unionsog/commands/contexts/Contexts.java @@ -2,8 +2,8 @@ package net.trueog.unionsog.commands.contexts; import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.InvalidCommandArgument; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.managers.ClanManager; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.managers.UnionManager; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; @@ -17,17 +17,17 @@ public class Contexts { } @NotNull - public static Clan assertClanMember(@NotNull ClanManager clanManager, @NotNull BukkitCommandIssuer issuer) { + public static Union assertUnionMember(@NotNull UnionManager unionManager, @NotNull BukkitCommandIssuer issuer) { assertPlayer(issuer); - Clan clan = clanManager.getClanByPlayerUniqueId(issuer.getUniqueId()); - if (clan == null) { + Union union = unionManager.getUnionByPlayerUniqueId(issuer.getUniqueId()); + if (union == null) { - throw new InvalidCommandArgument(lang("not.a.member.of.any.clan", issuer), false); + throw new InvalidCommandArgument(lang("not.a.member.of.any.union", issuer), false); } - return clan; + return union; } diff --git a/src/main/java/net/trueog/unionsog/commands/contexts/RankContextResolver.java b/src/main/java/net/trueog/unionsog/commands/contexts/RankContextResolver.java deleted file mode 100644 index 65a7d9ee..00000000 --- a/src/main/java/net/trueog/unionsog/commands/contexts/RankContextResolver.java +++ /dev/null @@ -1,45 +0,0 @@ -package net.trueog.unionsog.commands.contexts; - -import co.aikar.commands.BukkitCommandExecutionContext; -import co.aikar.commands.InvalidCommandArgument; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.Rank; -import net.trueog.unionsog.UnionsOG; -import org.jetbrains.annotations.NotNull; - -import static net.trueog.unionsog.UnionsOG.lang; -import static org.bukkit.ChatColor.RED; - -@SuppressWarnings("unused") -public class RankContextResolver extends AbstractInputOnlyContextResolver { - - public RankContextResolver(@NotNull UnionsOG plugin) { - - super(plugin); - - } - - @Override - public Rank getContext(BukkitCommandExecutionContext context) throws InvalidCommandArgument { - - Clan clan = Contexts.assertClanMember(clanManager, context.getIssuer()); - String rankName = context.isLastArg() ? context.joinArgs() : context.popFirstArg(); - Rank rank = clan.getRank(rankName); - if (rank == null) { - - throw new InvalidCommandArgument(RED + lang("rank.0.does.not.exist", context.getIssuer(), rankName), false); - - } - - return rank; - - } - - @Override - public Class getType() { - - return Rank.class; - - } - -} diff --git a/src/main/java/net/trueog/unionsog/commands/contexts/UnionContextResolver.java b/src/main/java/net/trueog/unionsog/commands/contexts/UnionContextResolver.java new file mode 100644 index 00000000..ea5050ab --- /dev/null +++ b/src/main/java/net/trueog/unionsog/commands/contexts/UnionContextResolver.java @@ -0,0 +1,32 @@ +package net.trueog.unionsog.commands.contexts; + +import co.aikar.commands.BukkitCommandExecutionContext; +import co.aikar.commands.InvalidCommandArgument; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionsOG; +import org.jetbrains.annotations.NotNull; + +@SuppressWarnings("unused") +public class UnionContextResolver extends AbstractIssuerOnlyContextResolver { + + public UnionContextResolver(@NotNull UnionsOG plugin) { + + super(plugin); + + } + + @Override + public Union getContext(BukkitCommandExecutionContext c) throws InvalidCommandArgument { + + return Contexts.assertUnionMember(unionManager, c.getIssuer()); + + } + + @Override + public Class getType() { + + return Union.class; + + } + +} diff --git a/src/main/java/net/trueog/unionsog/commands/contexts/UnionInputContextResolver.java b/src/main/java/net/trueog/unionsog/commands/contexts/UnionInputContextResolver.java new file mode 100644 index 00000000..71e5cd4e --- /dev/null +++ b/src/main/java/net/trueog/unionsog/commands/contexts/UnionInputContextResolver.java @@ -0,0 +1,44 @@ +package net.trueog.unionsog.commands.contexts; + +import co.aikar.commands.BukkitCommandExecutionContext; +import co.aikar.commands.InvalidCommandArgument; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionsOG; +import net.trueog.unionsog.commands.UnionInput; +import org.jetbrains.annotations.NotNull; + +import static net.trueog.unionsog.UnionsOG.lang; +import static org.bukkit.ChatColor.RED; + +@SuppressWarnings("unused") +public class UnionInputContextResolver extends AbstractInputOnlyContextResolver { + + public UnionInputContextResolver(@NotNull UnionsOG plugin) { + + super(plugin); + + } + + @Override + public UnionInput getContext(BukkitCommandExecutionContext context) throws InvalidCommandArgument { + + String arg = context.popFirstArg(); + Union union = unionManager.getUnion(arg); + if (union == null) { + + throw new InvalidCommandArgument(RED + lang("the.union.does.not.exist", context.getSender()), false); + + } + + return new UnionInput(union); + + } + + @Override + public Class getType() { + + return UnionInput.class; + + } + +} diff --git a/src/main/java/net/trueog/unionsog/commands/contexts/UnionPlayerContextResolver.java b/src/main/java/net/trueog/unionsog/commands/contexts/UnionPlayerContextResolver.java new file mode 100644 index 00000000..84b6bc3e --- /dev/null +++ b/src/main/java/net/trueog/unionsog/commands/contexts/UnionPlayerContextResolver.java @@ -0,0 +1,34 @@ +package net.trueog.unionsog.commands.contexts; + +import co.aikar.commands.BukkitCommandExecutionContext; +import co.aikar.commands.InvalidCommandArgument; +import net.trueog.unionsog.UnionPlayer; +import net.trueog.unionsog.UnionsOG; +import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; + +@SuppressWarnings("unused") +public class UnionPlayerContextResolver extends AbstractIssuerOnlyContextResolver { + + public UnionPlayerContextResolver(@NotNull UnionsOG plugin) { + + super(plugin); + + } + + @Override + public UnionPlayer getContext(BukkitCommandExecutionContext context) throws InvalidCommandArgument { + + Player player = Contexts.assertPlayer(context.getIssuer()); + return unionManager.getCreateUnionPlayer(player.getUniqueId()); + + } + + @Override + public Class getType() { + + return UnionPlayer.class; + + } + +} diff --git a/src/main/java/net/trueog/unionsog/commands/contexts/ClanPlayerInputContextResolver.java b/src/main/java/net/trueog/unionsog/commands/contexts/UnionPlayerInputContextResolver.java similarity index 65% rename from src/main/java/net/trueog/unionsog/commands/contexts/ClanPlayerInputContextResolver.java rename to src/main/java/net/trueog/unionsog/commands/contexts/UnionPlayerInputContextResolver.java index ddf7d010..ffe033ff 100644 --- a/src/main/java/net/trueog/unionsog/commands/contexts/ClanPlayerInputContextResolver.java +++ b/src/main/java/net/trueog/unionsog/commands/contexts/UnionPlayerInputContextResolver.java @@ -3,9 +3,9 @@ package net.trueog.unionsog.commands.contexts; import co.aikar.commands.BukkitCommandExecutionContext; import co.aikar.commands.InvalidCommandArgument; import co.aikar.commands.MinecraftMessageKeys; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; -import net.trueog.unionsog.commands.ClanPlayerInput; +import net.trueog.unionsog.commands.UnionPlayerInput; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; @@ -16,11 +16,11 @@ import static net.trueog.unionsog.UnionsOG.lang; import static net.trueog.unionsog.managers.SettingsManager.ConfigField.USERNAME_REGEX; @SuppressWarnings("unused") -public class ClanPlayerInputContextResolver extends AbstractInputOnlyContextResolver { +public class UnionPlayerInputContextResolver extends AbstractInputOnlyContextResolver { private final Pattern validUsername; - public ClanPlayerInputContextResolver(@NotNull UnionsOG plugin) { + public UnionPlayerInputContextResolver(@NotNull UnionsOG plugin) { super(plugin); validUsername = Pattern.compile(plugin.getSettingsManager().getString(USERNAME_REGEX)); @@ -28,7 +28,7 @@ public class ClanPlayerInputContextResolver extends AbstractInputOnlyContextReso } @Override - public ClanPlayerInput getContext(BukkitCommandExecutionContext context) throws InvalidCommandArgument { + public UnionPlayerInput getContext(BukkitCommandExecutionContext context) throws InvalidCommandArgument { String arg = context.popFirstArg(); if (!validUsername.matcher(arg).matches()) { @@ -37,7 +37,7 @@ public class ClanPlayerInputContextResolver extends AbstractInputOnlyContextReso } - ClanPlayer cp = clanManager.getAnyClanPlayer(arg); + UnionPlayer cp = unionManager.getAnyUnionPlayer(arg); if (cp == null) { Player player = Bukkit.getPlayer(arg); @@ -47,18 +47,18 @@ public class ClanPlayerInputContextResolver extends AbstractInputOnlyContextReso } - cp = clanManager.getCreateClanPlayer(player.getUniqueId()); + cp = unionManager.getCreateUnionPlayer(player.getUniqueId()); } - return new ClanPlayerInput(cp); + return new UnionPlayerInput(cp); } @Override - public Class getType() { + public Class getType() { - return ClanPlayerInput.class; + return UnionPlayerInput.class; } diff --git a/src/main/java/net/trueog/unionsog/commands/data/Alliances.java b/src/main/java/net/trueog/unionsog/commands/data/Alliances.java index df41e3bb..5f071b73 100644 --- a/src/main/java/net/trueog/unionsog/commands/data/Alliances.java +++ b/src/main/java/net/trueog/unionsog/commands/data/Alliances.java @@ -1,7 +1,7 @@ package net.trueog.unionsog.commands.data; import net.trueog.unionsog.ChatBlock; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import net.trueog.unionsog.Helper; import net.trueog.unionsog.UnionsOG; import org.bukkit.command.CommandSender; @@ -26,13 +26,13 @@ public class Alliances extends Sendable { @Override public void send() { - List clans = cm.getClans(); - cm.sortClansByKDR(clans); + List unions = cm.getUnions(); + cm.sortUnionsByKDR(unions); sendHeader(); - for (Clan clan : clans) { + for (Union union : unions) { - chatBlock.addRow(" " + AQUA + clan.getName(), clan.getAllyString(DARK_GRAY + ", ", sender)); + chatBlock.addRow(" " + AQUA + union.getName(), union.getAllyString(DARK_GRAY + ", ", sender)); } @@ -48,7 +48,7 @@ public class Alliances extends Sendable { ChatBlock.sendBlank(sender); chatBlock.setAlignment("l", "l"); - chatBlock.addRow(" " + headColor + lang("clan", sender), lang("allies", sender)); + chatBlock.addRow(" " + headColor + lang("union", sender), lang("allies", sender)); } diff --git a/src/main/java/net/trueog/unionsog/commands/data/ClanProfile.java b/src/main/java/net/trueog/unionsog/commands/data/ClanProfile.java deleted file mode 100644 index 5263e84c..00000000 --- a/src/main/java/net/trueog/unionsog/commands/data/ClanProfile.java +++ /dev/null @@ -1,57 +0,0 @@ -package net.trueog.unionsog.commands.data; - -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.Helper; -import net.trueog.unionsog.UnionsOG; -import net.trueog.unionsog.utils.KDRFormat; -import net.trueog.unionsog.utils.VanishUtils; -import org.bukkit.command.CommandSender; -import org.jetbrains.annotations.NotNull; - -import static net.trueog.unionsog.UnionsOG.lang; -import static net.trueog.unionsog.managers.SettingsManager.ConfigField.PAGE_LEADER_COLOR; - -public class ClanProfile extends Sendable { - - private final Clan clan; - - public ClanProfile(@NotNull UnionsOG plugin, @NotNull CommandSender sender, @NotNull Clan clan) { - - super(plugin, sender); - this.clan = clan; - - } - - @Override - public void send() { - - String message = lang("clan.profile").replace("%clan_name%", clan.getName()) - .replace("%clan_color_tag%", clan.getColorTag()).replace("%clan_description%", getDescription()) - .replace("%clan_status%", Helper.getFormattedClanStatus(clan, sender)) - .replace("%clan_leaders%", clan.getLeadersString(sm.getColored(PAGE_LEADER_COLOR), subColor + ", ")) - .replace("%clan_online_count%", String.valueOf(VanishUtils.getNonVanished(sender, clan).size())) - .replace("%clan_size%", String.valueOf(clan.getSize())) - .replace("%clan_kdr%", KDRFormat.format(clan.getTotalKDR())) - .replace("%clan_rival_kills%", String.valueOf(clan.getTotalRival())) - .replace("%clan_neutral_kills%", String.valueOf(clan.getTotalNeutral())) - .replace("%clan_civilian_kills%", String.valueOf(clan.getTotalCivilian())) - .replace("%clan_ally_kills%", String.valueOf(clan.getTotalAlly())) - .replace("%clan_deaths%", String.valueOf(clan.getTotalDeaths())) - .replace("%clan_allies%", clan.getAllyString(subColor + ", ", sender)) - .replace("%clan_rivals%", clan.getRivalString(subColor + ", ", sender)) - .replace("%clan_founded%", clan.getFoundedString()) - .replace("%clan_inactive_days%", String.valueOf(clan.getInactiveDays())) - .replace("%clan_max_inactive_days%", Helper.formatMaxInactiveDays(clan.getMaxInactiveDays())); - sender.sendMessage(message); - - } - - @NotNull - private String getDescription() { - - return clan.getDescription() != null && !clan.getDescription().isEmpty() ? clan.getDescription() - : lang("no.description", sender); - - } - -} diff --git a/src/main/java/net/trueog/unionsog/commands/data/ClanRoster.java b/src/main/java/net/trueog/unionsog/commands/data/ClanRoster.java deleted file mode 100644 index cc956be8..00000000 --- a/src/main/java/net/trueog/unionsog/commands/data/ClanRoster.java +++ /dev/null @@ -1,88 +0,0 @@ -package net.trueog.unionsog.commands.data; - -import net.trueog.unionsog.*; -import net.trueog.unionsog.utils.ChatUtils; -import net.trueog.unionsog.utils.VanishUtils; -import org.bukkit.command.CommandSender; -import org.jetbrains.annotations.NotNull; - -import java.util.List; - -import static net.trueog.unionsog.UnionsOG.lang; -import static net.trueog.unionsog.managers.SettingsManager.ConfigField.*; -import static org.bukkit.ChatColor.*; - -public class ClanRoster extends Sendable { - - private final Clan clan; - - public ClanRoster(@NotNull UnionsOG plugin, @NotNull CommandSender sender, @NotNull Clan clan) { - - super(plugin, sender); - this.clan = clan; - - } - - @Override - public void send() { - - configureAndSendHeader(); - addLeaders(); - addMembers(); - - sendBlock(); - - } - - private void addMembers() { - - List members = clan.getNonLeaders(); - plugin.getClanManager().sortClanPlayersByLastSeen(members); - for (ClanPlayer cp : members) { - - String name = (cp.isTrusted() ? sm.getColored(PAGE_TRUSTED_COLOR) : sm.getColored(PAGE_UNTRUSTED_COLOR)) - + cp.getName(); - String lastSeen = VanishUtils.isVanished(sender, cp) ? WHITE + cp.getLastSeenDaysString(sender) - : GREEN + lang("online", sender); - - chatBlock.addRow(" " + name, YELLOW + ChatUtils.parseColors(cp.getRankDisplayName()) + RESET, lastSeen); - - } - - } - - private void addLeaders() { - - List leaders = clan.getLeaders(); - plugin.getClanManager().sortClanPlayersByLastSeen(leaders); - for (ClanPlayer cp : leaders) { - - String name = sm.getColored(PAGE_LEADER_COLOR) + cp.getName(); - String lastSeen = VanishUtils.isVanished(sender, cp) ? WHITE + cp.getLastSeenDaysString(sender) - : GREEN + lang("online", sender); - - chatBlock.addRow(" " + name, YELLOW + ChatUtils.parseColors(cp.getRankDisplayName()) + RESET, lastSeen); - - } - - } - - private void configureAndSendHeader() { - - ChatBlock.sendBlank(sender); - ChatBlock.saySingle(sender, - sm.getColored(PAGE_CLAN_NAME_COLOR) + clan.getName() + subColor + " " + lang("roster", sender) + " " - + headColor + Helper.generatePageSeparator(sm.getString(PAGE_SEPARATOR))); - ChatBlock.sendBlank(sender); - ChatBlock.sendMessage(sender, - headColor + lang("legend", sender) + " " + sm.getColored(PAGE_LEADER_COLOR) + lang("leader", sender) - + headColor + ", " + sm.getColored(PAGE_TRUSTED_COLOR) + lang("trusted", sender) + headColor - + ", " + sm.getColored(PAGE_UNTRUSTED_COLOR) + lang("untrusted", sender)); - ChatBlock.sendBlank(sender); - - chatBlock.setFlexibility(false, true, false, true); - chatBlock.addRow(" " + headColor + lang("player", sender), lang("rank", sender), lang("seen", sender)); - - } - -} diff --git a/src/main/java/net/trueog/unionsog/commands/data/Kills.java b/src/main/java/net/trueog/unionsog/commands/data/Kills.java index ca260329..1bd0084b 100644 --- a/src/main/java/net/trueog/unionsog/commands/data/Kills.java +++ b/src/main/java/net/trueog/unionsog/commands/data/Kills.java @@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull; import java.util.Map; import static net.trueog.unionsog.UnionsOG.lang; -import static net.trueog.unionsog.managers.SettingsManager.ConfigField.PAGE_CLAN_NAME_COLOR; +import static net.trueog.unionsog.managers.SettingsManager.ConfigField.PAGE_UNION_NAME_COLOR; import static net.trueog.unionsog.managers.SettingsManager.ConfigField.PAGE_SEPARATOR; public class Kills extends Sendable { @@ -71,7 +71,7 @@ public class Kills extends Sendable { chatBlock.setFlexibility(true, false); chatBlock.setAlignment("l", "c"); chatBlock.addRow(" " + headColor + lang("victim", player), lang("killcount", player)); - ChatBlock.saySingle(player, sm.getColored(PAGE_CLAN_NAME_COLOR) + polled + subColor + " " + ChatBlock.saySingle(player, sm.getColored(PAGE_UNION_NAME_COLOR) + polled + subColor + " " + lang("kills", player) + " " + headColor + Helper.generatePageSeparator(sm.getString(PAGE_SEPARATOR))); ChatBlock.sendBlank(player); diff --git a/src/main/java/net/trueog/unionsog/commands/data/Leaderboard.java b/src/main/java/net/trueog/unionsog/commands/data/Leaderboard.java index 248118ed..035d6a82 100644 --- a/src/main/java/net/trueog/unionsog/commands/data/Leaderboard.java +++ b/src/main/java/net/trueog/unionsog/commands/data/Leaderboard.java @@ -1,7 +1,7 @@ package net.trueog.unionsog.commands.data; import net.trueog.unionsog.ChatBlock; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.Helper; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.utils.KDRFormat; @@ -19,14 +19,14 @@ import static org.bukkit.ChatColor.*; public class Leaderboard extends Sendable { - private final RankingNumberResolver rankingResolver; - private final List clanPlayers; + private final RankingNumberResolver rankingResolver; + private final List unionPlayers; public Leaderboard(@NotNull UnionsOG plugin, @NotNull CommandSender sender) { super(plugin, sender); - clanPlayers = cm.getAllClanPlayers(); - rankingResolver = new RankingNumberResolver<>(clanPlayers, c -> KDRFormat.toBigDecimal(c.getKDR()), false, + unionPlayers = cm.getAllUnionPlayers(); + rankingResolver = new RankingNumberResolver<>(unionPlayers, c -> KDRFormat.toBigDecimal(c.getKDR()), false, sm.getRankingType()); } @@ -42,25 +42,24 @@ public class Leaderboard extends Sendable { private void addLines() { - for (ClanPlayer cp : clanPlayers) { + for (UnionPlayer cp : unionPlayers) { boolean online = !VanishUtils.isVanished(cp); - String name = (cp.isLeader() ? sm.getColored(PAGE_LEADER_COLOR) - : (cp.isTrusted() ? sm.getColored(PAGE_TRUSTED_COLOR) : sm.getColored(PAGE_UNTRUSTED_COLOR))) + String name = (cp.isTrusted() ? sm.getColored(PAGE_TRUSTED_COLOR) : sm.getColored(PAGE_UNTRUSTED_COLOR)) + cp.getName(); String lastSeen = online ? GREEN + lang("online", sender) : WHITE + cp.getLastSeenDaysString(sender); - String clanTag = WHITE + lang("free.agent", sender); + String unionTag = WHITE + lang("free.agent", sender); - if (cp.getClan() != null) { + if (cp.getUnion() != null) { - clanTag = cp.getClan().getColorTag(); + unionTag = cp.getUnion().getColorTag(); } chatBlock.addRow(" " + rankingResolver.getRankingNumber(cp), name, - YELLOW + "" + KDRFormat.format(cp.getKDR()), WHITE + clanTag, lastSeen); + YELLOW + "" + KDRFormat.format(cp.getKDR()), WHITE + unionTag, lastSeen); } @@ -72,12 +71,13 @@ public class Leaderboard extends Sendable { ChatBlock.saySingle(sender, sm.getColored(SERVER_NAME) + subColor + " " + lang("leaderboard.command", sender) + " " + headColor + Helper.generatePageSeparator(sm.getString(PAGE_SEPARATOR))); ChatBlock.sendBlank(sender); - ChatBlock.sendMessage(sender, headColor + lang("total.clan.players.0", sender, subColor + clanPlayers.size())); + ChatBlock.sendMessage(sender, + headColor + lang("total.union.players.0", sender, subColor + unionPlayers.size())); ChatBlock.sendBlank(sender); chatBlock.setAlignment("c", "l", "c", "c", "c", "c"); chatBlock.addRow(" " + headColor + lang("rank", sender), lang("player", sender), lang("kdr", sender), - lang("clan", sender), lang("seen", sender)); + lang("union", sender), lang("seen", sender)); } diff --git a/src/main/java/net/trueog/unionsog/commands/data/Lookup.java b/src/main/java/net/trueog/unionsog/commands/data/Lookup.java index c93a07ad..2dcc369b 100644 --- a/src/main/java/net/trueog/unionsog/commands/data/Lookup.java +++ b/src/main/java/net/trueog/unionsog/commands/data/Lookup.java @@ -1,7 +1,6 @@ package net.trueog.unionsog.commands.data; import net.trueog.unionsog.*; -import net.trueog.unionsog.utils.ChatUtils; import net.trueog.unionsog.utils.KDRFormat; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -19,20 +18,20 @@ public class Lookup extends Sendable { @NotNull private final UUID targetUuid; @Nullable - private final ClanPlayer target; + private final UnionPlayer target; @Nullable - private final Clan senderClan; + private final Union senderUnion; @Nullable - private final Clan targetClan; + private final Union targetUnion; public Lookup(@NotNull UnionsOG plugin, @NotNull CommandSender sender, @NotNull UUID targetUuid) { super(plugin, sender); this.targetUuid = targetUuid; - target = cm.getAnyClanPlayer(targetUuid); - ClanPlayer senderCp = !isPlayer() ? null : cm.getClanPlayer(getPlayer().getUniqueId()); - senderClan = senderCp == null ? null : senderCp.getClan(); - targetClan = target != null ? target.getClan() : null; + target = cm.getAnyUnionPlayer(targetUuid); + UnionPlayer senderCp = !isPlayer() ? null : cm.getUnionPlayer(getPlayer().getUniqueId()); + senderUnion = senderCp == null ? null : senderCp.getUnion(); + targetUnion = target != null ? target.getUnion() : null; } @@ -42,9 +41,7 @@ public class Lookup extends Sendable { if (target != null) { String lookup = lang("player.lookup", sender).replace("%player_name%", target.getName()) - .replace("%clan_name%", getClanName()) - .replace("%player_rank%", ChatUtils.parseColors(target.getRankDisplayName())) - .replace("%player_status%", getPlayerStatus()) + .replace("%union_name%", getUnionName()).replace("%player_status%", getPlayerStatus()) .replace("%player_kdr%", KDRFormat.format(target.getKDR())) .replace("%player_rival_kills%", String.valueOf(target.getRivalKills())) .replace("%player_neutral_kills%", String.valueOf(target.getNeutralKills())) @@ -53,7 +50,7 @@ public class Lookup extends Sendable { .replace("%player_deaths%", String.valueOf(target.getDeaths())) .replace("%player_join_date%", target.getJoinDateString()) .replace("%player_last_seen%", target.getLastSeenString(sender)) - .replace("%player_past_clans%", target.getPastClansString(headColor + ", ")) + .replace("%player_past_unions%", target.getPastUnionsString(headColor + ", ")) .replace("%player_inactive_days%", String.valueOf(target.getInactiveDays())) .replace("%player_max_inactive_days%", Helper.formatMaxInactiveDays(sm.getInt(PURGE_INACTIVE_PLAYER_DAYS))) @@ -64,7 +61,7 @@ public class Lookup extends Sendable { ChatBlock.sendMessage(sender, RED + lang("no.player.data.found", sender)); - if (isOtherPlayer() && senderClan != null) { + if (isOtherPlayer() && senderUnion != null) { ChatBlock.sendBlank(sender); ChatBlock.sendMessage(sender, lang("kill.type.civilian", sender, DARK_GRAY)); @@ -76,47 +73,35 @@ public class Lookup extends Sendable { } @NotNull - private String getClanName() { + private String getUnionName() { - String clanName = lang("none", sender); - if (targetClan != null) { + String unionName = lang("none", sender); + if (targetUnion != null) { - clanName = lang("player.lookup.clanname").replace("%clan_color_tag%", targetClan.getColorTag()) - .replace("%clan_name%", targetClan.getName()); + unionName = lang("player.lookup.unionname").replace("%union_color_tag%", targetUnion.getColorTag()) + .replace("%union_name%", targetUnion.getName()); } - return clanName; + return unionName; } @NotNull private String getPlayerStatus() { - if (target == null || targetClan == null) { + if (target == null || targetUnion == null) { return lang("free.agent", sender); } - if (target.isLeader()) { - - return sm.getColored(PAGE_LEADER_COLOR) + lang("leader", sender); - - } - if (target.isTrusted()) { return sm.getColored(PAGE_TRUSTED_COLOR) + lang("trusted", sender); } - if (!target.getRankId().isEmpty()) { - - return sm.getColored(PAGE_TRUSTED_COLOR) + lang("in.rank", sender); - - } - return sm.getColored(PAGE_UNTRUSTED_COLOR) + lang("untrusted", sender); } @@ -129,19 +114,19 @@ public class Lookup extends Sendable { String killType = GRAY + lang("neutral", sender); - if (targetClan == null) { + if (targetUnion == null) { killType = DARK_GRAY + lang("civilian", sender); - } else if (senderClan != null) { + } else if (senderUnion != null) { - if (senderClan.isRival(targetClan.getTag())) { + if (senderUnion.isRival(targetUnion.getTag())) { killType = WHITE + lang("rival", sender); } - if (senderClan.equals(targetClan) || senderClan.isAlly(targetClan.getTag())) { + if (senderUnion.equals(targetUnion) || senderUnion.isAlly(targetUnion.getTag())) { killType = RED + lang("ally", sender); diff --git a/src/main/java/net/trueog/unionsog/commands/data/Rivalries.java b/src/main/java/net/trueog/unionsog/commands/data/Rivalries.java index 8e965c87..372246e4 100644 --- a/src/main/java/net/trueog/unionsog/commands/data/Rivalries.java +++ b/src/main/java/net/trueog/unionsog/commands/data/Rivalries.java @@ -1,7 +1,7 @@ package net.trueog.unionsog.commands.data; import net.trueog.unionsog.ChatBlock; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import net.trueog.unionsog.Helper; import net.trueog.unionsog.UnionsOG; import org.bukkit.command.CommandSender; @@ -25,13 +25,13 @@ public class Rivalries extends Sendable { @Override public void send() { - List clans = cm.getClans(); - cm.sortClansByKDR(clans); + List unions = cm.getUnions(); + cm.sortUnionsByKDR(unions); sendHeader(); - for (Clan clan : clans) { + for (Union union : unions) { - chatBlock.addRow(" " + AQUA + clan.getName(), clan.getRivalString(DARK_GRAY + ", ", sender)); + chatBlock.addRow(" " + AQUA + union.getName(), union.getRivalString(DARK_GRAY + ", ", sender)); } @@ -49,7 +49,7 @@ public class Rivalries extends Sendable { ChatBlock.sendBlank(sender); chatBlock.setAlignment("l", "l"); - chatBlock.addRow(lang("clan", sender), lang("rivals", sender)); + chatBlock.addRow(lang("union", sender), lang("rivals", sender)); } diff --git a/src/main/java/net/trueog/unionsog/commands/data/Sendable.java b/src/main/java/net/trueog/unionsog/commands/data/Sendable.java index 53062332..e1f65d0c 100644 --- a/src/main/java/net/trueog/unionsog/commands/data/Sendable.java +++ b/src/main/java/net/trueog/unionsog/commands/data/Sendable.java @@ -2,7 +2,7 @@ package net.trueog.unionsog.commands.data; import net.trueog.unionsog.ChatBlock; import net.trueog.unionsog.UnionsOG; -import net.trueog.unionsog.managers.ClanManager; +import net.trueog.unionsog.managers.UnionManager; import net.trueog.unionsog.managers.SettingsManager; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; @@ -14,7 +14,7 @@ public abstract class Sendable { protected final UnionsOG plugin; protected final SettingsManager sm; - protected final ClanManager cm; + protected final UnionManager cm; protected final CommandSender sender; protected final ChatBlock chatBlock = new ChatBlock(); protected final String headColor; @@ -24,7 +24,7 @@ public abstract class Sendable { this.plugin = plugin; sm = plugin.getSettingsManager(); - cm = plugin.getClanManager(); + cm = plugin.getUnionManager(); this.sender = sender; headColor = sm.getColored(PAGE_HEADINGS_COLOR); subColor = sm.getColored(PAGE_SUBTITLE_COLOR); diff --git a/src/main/java/net/trueog/unionsog/commands/data/ClanCoords.java b/src/main/java/net/trueog/unionsog/commands/data/UnionCoords.java similarity index 78% rename from src/main/java/net/trueog/unionsog/commands/data/ClanCoords.java rename to src/main/java/net/trueog/unionsog/commands/data/UnionCoords.java index 4e85de6c..8efddce3 100644 --- a/src/main/java/net/trueog/unionsog/commands/data/ClanCoords.java +++ b/src/main/java/net/trueog/unionsog/commands/data/UnionCoords.java @@ -16,31 +16,30 @@ import static net.trueog.unionsog.managers.SettingsManager.ConfigField.*; import static org.bukkit.ChatColor.AQUA; import static org.bukkit.ChatColor.WHITE; -public class ClanCoords extends Sendable { +public class UnionCoords extends Sendable { private final Player player; - private final Clan clan; + private final Union union; - public ClanCoords(@NotNull UnionsOG plugin, @NotNull Player player, @NotNull Clan clan) { + public UnionCoords(@NotNull UnionsOG plugin, @NotNull Player player, @NotNull Union union) { super(plugin, player); this.player = player; - this.clan = clan; + this.union = union; } private void populateRows() { Map> rows = new TreeMap<>(); - for (ClanPlayer cpm : VanishUtils.getNonVanished(player, clan)) { + for (UnionPlayer cpm : VanishUtils.getNonVanished(player, union)) { Player p = cpm.toPlayer(); if (p != null) { - String name = (cpm.isLeader() ? sm.getColored(PAGE_LEADER_COLOR) - : (cpm.isTrusted() ? sm.getColored(PAGE_TRUSTED_COLOR) : sm.getColored(PAGE_UNTRUSTED_COLOR))) - + cpm.getName(); + String name = (cpm.isTrusted() ? sm.getColored(PAGE_TRUSTED_COLOR) + : sm.getColored(PAGE_UNTRUSTED_COLOR)) + cpm.getName(); Location loc = p.getLocation(); int distance = (int) Math.ceil(loc.toVector().distance(player.getLocation().toVector())); String coords = loc.getBlockX() + " " + loc.getBlockY() + " " + loc.getBlockZ(); @@ -72,7 +71,7 @@ public class ClanCoords extends Sendable { ChatBlock.sendBlank(player); ChatBlock.saySingle(player, - sm.getColored(PAGE_CLAN_NAME_COLOR) + clan.getName() + subColor + " " + lang("coords", player) + " " + sm.getColored(PAGE_UNION_NAME_COLOR) + union.getName() + subColor + " " + lang("coords", player) + " " + headColor + Helper.generatePageSeparator(sm.getString(PAGE_SEPARATOR))); ChatBlock.sendBlank(player); diff --git a/src/main/java/net/trueog/unionsog/commands/data/ClanList.java b/src/main/java/net/trueog/unionsog/commands/data/UnionList.java similarity index 70% rename from src/main/java/net/trueog/unionsog/commands/data/ClanList.java rename to src/main/java/net/trueog/unionsog/commands/data/UnionList.java index f87ba0d0..ece23dd6 100644 --- a/src/main/java/net/trueog/unionsog/commands/data/ClanList.java +++ b/src/main/java/net/trueog/unionsog/commands/data/UnionList.java @@ -5,7 +5,7 @@ import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.HoverEvent; import net.md_5.bungee.api.chat.TextComponent; import net.trueog.unionsog.ChatBlock; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import net.trueog.unionsog.Helper; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.utils.ChatUtils; @@ -23,15 +23,15 @@ import static net.trueog.unionsog.managers.SettingsManager.ConfigField.*; import static net.trueog.unionsog.utils.RankingNumberResolver.RankingType.ORDINAL; import static org.bukkit.ChatColor.*; -public class ClanList extends Sendable { +public class UnionList extends Sendable { - private static final int CLANS_PER_PAGE = 8; + private static final int UNIONS_PER_PAGE = 8; private final String type; private final String order; private final int page; - public ClanList(@NotNull UnionsOG plugin, @NotNull CommandSender sender, @Nullable String type, + public UnionList(@NotNull UnionsOG plugin, @NotNull CommandSender sender, @Nullable String type, @Nullable String order, @Nullable Integer page) { @@ -62,23 +62,23 @@ public class ClanList extends Sendable { @Override public void send() { - List clans = getListableClans(); - if (clans.isEmpty()) { + List unions = getListableUnions(); + if (unions.isEmpty()) { - ChatBlock.sendMessage(sender, RED + lang("no.clans.have.been.created", sender)); + ChatBlock.sendMessage(sender, RED + lang("no.unions.have.been.created", sender)); return; } - RankingNumberResolver> ranking = getRankingResolver(clans); - int totalPages = (clans.size() + CLANS_PER_PAGE - 1) / CLANS_PER_PAGE; + RankingNumberResolver> ranking = getRankingResolver(unions); + int totalPages = (unions.size() + UNIONS_PER_PAGE - 1) / UNIONS_PER_PAGE; int currentPage = Math.min(page, totalPages); - sendHeader(clans); - int start = (currentPage - 1) * CLANS_PER_PAGE; - for (Clan clan : clans.subList(start, Math.min(start + CLANS_PER_PAGE, clans.size()))) { + sendHeader(unions); + int start = (currentPage - 1) * UNIONS_PER_PAGE; + for (Union union : unions.subList(start, Math.min(start + UNIONS_PER_PAGE, unions.size()))) { - addLine(ranking, clan); + addLine(ranking, union); } @@ -101,52 +101,52 @@ public class ClanList extends Sendable { } - private RankingNumberResolver> getRankingResolver(List clans) { + private RankingNumberResolver> getRankingResolver(List unions) { boolean ascending = lang("list.order.asc").equalsIgnoreCase(order); if (type.equalsIgnoreCase(lang("list.type.active"))) { - return new RankingNumberResolver<>(clans, Clan::getLastUsed, ascending, ORDINAL); + return new RankingNumberResolver<>(unions, Union::getLastUsed, ascending, ORDINAL); } if (type.equalsIgnoreCase(lang("list.type.founded"))) { - return new RankingNumberResolver<>(clans, Clan::getFounded, ascending, ORDINAL); + return new RankingNumberResolver<>(unions, Union::getFounded, ascending, ORDINAL); } if (type.equalsIgnoreCase(lang("list.type.name"))) { - return new RankingNumberResolver<>(clans, Clan::getName, ascending, ORDINAL); + return new RankingNumberResolver<>(unions, Union::getName, ascending, ORDINAL); } if (type.equalsIgnoreCase(lang("list.type.kdr"))) { - return new RankingNumberResolver<>(clans, clan -> KDRFormat.toBigDecimal(clan.getTotalKDR()), ascending, + return new RankingNumberResolver<>(unions, union -> KDRFormat.toBigDecimal(union.getTotalKDR()), ascending, sm.getRankingType()); } - return new RankingNumberResolver<>(clans, Clan::getSize, ascending, ORDINAL); + return new RankingNumberResolver<>(unions, Union::getSize, ascending, ORDINAL); } @NotNull - private List getListableClans() { + private List getListableUnions() { - return plugin.getClanManager().getClans(); + return plugin.getUnionManager().getUnions(); } - private void sendHeader(List clans) { + private void sendHeader(List unions) { ChatBlock.sendBlank(sender); - ChatBlock.saySingle(sender, sm.getColored(SERVER_NAME) + subColor + " " + lang("clans.lower", sender) + " " + ChatBlock.saySingle(sender, sm.getColored(SERVER_NAME) + subColor + " " + lang("unions.lower", sender) + " " + headColor + Helper.generatePageSeparator(sm.getString(PAGE_SEPARATOR))); ChatBlock.sendBlank(sender); - ChatBlock.sendMessage(sender, headColor + lang("total.clans", sender) + " " + subColor + clans.size()); + ChatBlock.sendMessage(sender, headColor + lang("total.unions", sender) + " " + subColor + unions.size()); ChatBlock.sendBlank(sender); chatBlock.setAlignment("c", "l", "c", "c"); chatBlock.setFlexibility(false, true, false, false); @@ -155,29 +155,29 @@ public class ClanList extends Sendable { } - private void addLine(RankingNumberResolver> ranking, Clan clan) { + private void addLine(RankingNumberResolver> ranking, Union union) { - String name = coloredName(clan); - String size = WHITE + "" + clan.getSize(); - String kdr = YELLOW + "" + KDRFormat.format(clan.getTotalKDR()); + String name = coloredName(union); + String size = WHITE + "" + union.getSize(); + String kdr = YELLOW + "" + KDRFormat.format(union.getTotalKDR()); - chatBlock.addRow(" " + ranking.getRankingNumber(clan), name, kdr, size); + chatBlock.addRow(" " + ranking.getRankingNumber(union), name, kdr, size); } /** * Renders the union once: its name, in the union's own color. */ - private String coloredName(Clan clan) { + private String coloredName(Union union) { - String colors = leadingColors(ChatUtils.parseColors(clan.getColorTag())); + String colors = leadingColors(ChatUtils.parseColors(union.getColorTag())); if (colors.isEmpty()) { colors = DARK_GRAY.toString(); } - return colors + clan.getName(); + return colors + union.getName(); } @@ -242,7 +242,7 @@ public class ClanList extends Sendable { private String listCommand(int targetPage) { - return "/" + sm.getString(COMMANDS_CLAN) + " list " + type + " " + order + " " + targetPage; + return "/" + sm.getString(COMMANDS_UNION) + " list " + type + " " + order + " " + targetPage; } diff --git a/src/main/java/net/trueog/unionsog/commands/data/UnionProfile.java b/src/main/java/net/trueog/unionsog/commands/data/UnionProfile.java new file mode 100644 index 00000000..dd697765 --- /dev/null +++ b/src/main/java/net/trueog/unionsog/commands/data/UnionProfile.java @@ -0,0 +1,55 @@ +package net.trueog.unionsog.commands.data; + +import net.trueog.unionsog.Union; +import net.trueog.unionsog.Helper; +import net.trueog.unionsog.UnionsOG; +import net.trueog.unionsog.utils.KDRFormat; +import net.trueog.unionsog.utils.VanishUtils; +import org.bukkit.command.CommandSender; +import org.jetbrains.annotations.NotNull; + +import static net.trueog.unionsog.UnionsOG.lang; + +public class UnionProfile extends Sendable { + + private final Union union; + + public UnionProfile(@NotNull UnionsOG plugin, @NotNull CommandSender sender, @NotNull Union union) { + + super(plugin, sender); + this.union = union; + + } + + @Override + public void send() { + + String message = lang("union.profile").replace("%union_name%", union.getName()) + .replace("%union_color_tag%", union.getColorTag()).replace("%union_description%", getDescription()) + .replace("%union_status%", Helper.getFormattedUnionStatus(union, sender)) + .replace("%union_online_count%", String.valueOf(VanishUtils.getNonVanished(sender, union).size())) + .replace("%union_size%", String.valueOf(union.getSize())) + .replace("%union_kdr%", KDRFormat.format(union.getTotalKDR())) + .replace("%union_rival_kills%", String.valueOf(union.getTotalRival())) + .replace("%union_neutral_kills%", String.valueOf(union.getTotalNeutral())) + .replace("%union_civilian_kills%", String.valueOf(union.getTotalCivilian())) + .replace("%union_ally_kills%", String.valueOf(union.getTotalAlly())) + .replace("%union_deaths%", String.valueOf(union.getTotalDeaths())) + .replace("%union_allies%", union.getAllyString(subColor + ", ", sender)) + .replace("%union_rivals%", union.getRivalString(subColor + ", ", sender)) + .replace("%union_founded%", union.getFoundedString()) + .replace("%union_inactive_days%", String.valueOf(union.getInactiveDays())) + .replace("%union_max_inactive_days%", Helper.formatMaxInactiveDays(union.getMaxInactiveDays())); + sender.sendMessage(message); + + } + + @NotNull + private String getDescription() { + + return union.getDescription() != null && !union.getDescription().isEmpty() ? union.getDescription() + : lang("no.description", sender); + + } + +} diff --git a/src/main/java/net/trueog/unionsog/commands/data/UnionRoster.java b/src/main/java/net/trueog/unionsog/commands/data/UnionRoster.java new file mode 100644 index 00000000..4acd4bee --- /dev/null +++ b/src/main/java/net/trueog/unionsog/commands/data/UnionRoster.java @@ -0,0 +1,69 @@ +package net.trueog.unionsog.commands.data; + +import net.trueog.unionsog.*; +import net.trueog.unionsog.utils.VanishUtils; +import org.bukkit.command.CommandSender; +import org.jetbrains.annotations.NotNull; + +import java.util.List; + +import static net.trueog.unionsog.UnionsOG.lang; +import static net.trueog.unionsog.managers.SettingsManager.ConfigField.*; +import static org.bukkit.ChatColor.*; + +public class UnionRoster extends Sendable { + + private final Union union; + + public UnionRoster(@NotNull UnionsOG plugin, @NotNull CommandSender sender, @NotNull Union union) { + + super(plugin, sender); + this.union = union; + + } + + @Override + public void send() { + + configureAndSendHeader(); + addMembers(); + + sendBlock(); + + } + + private void addMembers() { + + List members = union.getMembers(); + plugin.getUnionManager().sortUnionPlayersByLastSeen(members); + for (UnionPlayer cp : members) { + + String name = (cp.isTrusted() ? sm.getColored(PAGE_TRUSTED_COLOR) : sm.getColored(PAGE_UNTRUSTED_COLOR)) + + cp.getName(); + String lastSeen = VanishUtils.isVanished(sender, cp) ? WHITE + cp.getLastSeenDaysString(sender) + : GREEN + lang("online", sender); + + chatBlock.addRow(" " + name, lastSeen); + + } + + } + + private void configureAndSendHeader() { + + ChatBlock.sendBlank(sender); + ChatBlock.saySingle(sender, + sm.getColored(PAGE_UNION_NAME_COLOR) + union.getName() + subColor + " " + lang("roster", sender) + " " + + headColor + Helper.generatePageSeparator(sm.getString(PAGE_SEPARATOR))); + ChatBlock.sendBlank(sender); + ChatBlock.sendMessage(sender, + headColor + lang("legend", sender) + " " + sm.getColored(PAGE_TRUSTED_COLOR) + lang("trusted", sender) + + headColor + ", " + sm.getColored(PAGE_UNTRUSTED_COLOR) + lang("untrusted", sender)); + ChatBlock.sendBlank(sender); + + chatBlock.setFlexibility(false, true); + chatBlock.addRow(" " + headColor + lang("player", sender), lang("seen", sender)); + + } + +} diff --git a/src/main/java/net/trueog/unionsog/commands/data/ClanStats.java b/src/main/java/net/trueog/unionsog/commands/data/UnionStats.java similarity index 77% rename from src/main/java/net/trueog/unionsog/commands/data/ClanStats.java rename to src/main/java/net/trueog/unionsog/commands/data/UnionStats.java index 6868b590..1249db75 100644 --- a/src/main/java/net/trueog/unionsog/commands/data/ClanStats.java +++ b/src/main/java/net/trueog/unionsog/commands/data/UnionStats.java @@ -12,14 +12,14 @@ import static net.trueog.unionsog.UnionsOG.lang; import static net.trueog.unionsog.managers.SettingsManager.ConfigField.*; import static org.bukkit.ChatColor.*; -public class ClanStats extends Sendable { +public class UnionStats extends Sendable { - private final Clan clan; + private final Union union; - public ClanStats(@NotNull UnionsOG plugin, @NotNull CommandSender sender, @NotNull Clan clan) { + public UnionStats(@NotNull UnionsOG plugin, @NotNull CommandSender sender, @NotNull Union union) { super(plugin, sender); - this.clan = clan; + this.union = union; } @@ -28,12 +28,8 @@ public class ClanStats extends Sendable { configureAndSendHeader(); - List leaders = clan.getLeaders(); - cm.sortClanPlayersByKDR(leaders); - addRows(leaders); - - List members = clan.getNonLeaders(); - cm.sortClanPlayersByKDR(members); + List members = union.getMembers(); + cm.sortUnionPlayersByKDR(members); addRows(members); sendBlock(); @@ -42,7 +38,7 @@ public class ClanStats extends Sendable { private void configureAndSendHeader() { - ChatBlock.saySingle(sender, sm.getColored(PAGE_CLAN_NAME_COLOR) + clan.getName() + subColor + " " + ChatBlock.saySingle(sender, sm.getColored(PAGE_UNION_NAME_COLOR) + union.getName() + subColor + " " + lang("stats", sender) + " " + headColor + Helper.generatePageSeparator(sm.getString(PAGE_SEPARATOR))); ChatBlock.sendBlank(sender); ChatBlock.sendMessage(sender, @@ -61,16 +57,12 @@ public class ClanStats extends Sendable { } - private void addRows(List clanPlayers) { + private void addRows(List unionPlayers) { - for (ClanPlayer cp : clanPlayers) { + for (UnionPlayer cp : unionPlayers) { String color; - if (cp.isLeader()) { - - color = sm.getColored(PAGE_LEADER_COLOR); - - } else if (cp.isTrusted()) { + if (cp.isTrusted()) { color = sm.getColored(PAGE_TRUSTED_COLOR); diff --git a/src/main/java/net/trueog/unionsog/commands/data/Vitals.java b/src/main/java/net/trueog/unionsog/commands/data/Vitals.java index d14df85d..06c5b321 100644 --- a/src/main/java/net/trueog/unionsog/commands/data/Vitals.java +++ b/src/main/java/net/trueog/unionsog/commands/data/Vitals.java @@ -6,7 +6,6 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import java.util.Collection; -import java.util.List; import static net.trueog.unionsog.UnionsOG.lang; import static net.trueog.unionsog.managers.SettingsManager.ConfigField.*; @@ -14,12 +13,12 @@ import static org.bukkit.ChatColor.*; public class Vitals extends Sendable { - private final Clan clan; + private final Union union; - public Vitals(@NotNull UnionsOG plugin, @NotNull CommandSender sender, @NotNull Clan clan) { + public Vitals(@NotNull UnionsOG plugin, @NotNull CommandSender sender, @NotNull Union union) { super(plugin, sender); - this.clan = clan; + this.union = union; } @@ -28,14 +27,11 @@ public class Vitals extends Sendable { configureAndSendHeader(); - List members = Helper.stripOffLinePlayers(clan.getLeaders()); - members.addAll(Helper.stripOffLinePlayers(clan.getNonLeaders())); - - addRows(members); + addRows(Helper.stripOffLinePlayers(union.getMembers())); chatBlock.addRow(" -- Allies -- ", "", "", "", "", ""); - addRows(clan.getAllAllyMembers()); + addRows(union.getAllAllyMembers()); sendBlock(); @@ -45,7 +41,7 @@ public class Vitals extends Sendable { ChatBlock.sendBlank(sender); ChatBlock.saySingle(sender, - sm.getColored(PAGE_CLAN_NAME_COLOR) + clan.getName() + subColor + " " + lang("vitals", sender) + " " + sm.getColored(PAGE_UNION_NAME_COLOR) + union.getName() + subColor + " " + lang("vitals", sender) + " " + headColor + Helper.generatePageSeparator(sm.getString(PAGE_SEPARATOR))); ChatBlock.sendBlank(sender); ChatBlock.sendMessage(sender, headColor + lang("weapons", sender) + ": " @@ -65,17 +61,16 @@ public class Vitals extends Sendable { } - private void addRows(Collection players) { + private void addRows(Collection players) { - for (ClanPlayer cpm : players) { + for (UnionPlayer cpm : players) { Player p = cpm.toPlayer(); if (p != null) { - String name = (cpm.isLeader() ? sm.getColored(PAGE_LEADER_COLOR) - : (cpm.isTrusted() ? sm.getColored(PAGE_TRUSTED_COLOR) : sm.getColored(PAGE_UNTRUSTED_COLOR))) - + cpm.getName(); + String name = (cpm.isTrusted() ? sm.getColored(PAGE_TRUSTED_COLOR) + : sm.getColored(PAGE_UNTRUSTED_COLOR)) + cpm.getName(); String health = cm.getBar(p.getHealth()); String hunger = cm.getBar(p.getFoodLevel()); String armor = cm.getArmorString(p.getInventory()); diff --git a/src/main/java/net/trueog/unionsog/commands/general/GeneralCommands.java b/src/main/java/net/trueog/unionsog/commands/general/GeneralCommands.java index 07436a15..b5233c8c 100644 --- a/src/main/java/net/trueog/unionsog/commands/general/GeneralCommands.java +++ b/src/main/java/net/trueog/unionsog/commands/general/GeneralCommands.java @@ -6,15 +6,15 @@ import co.aikar.commands.CommandParameter; import co.aikar.commands.HelpEntry; import co.aikar.commands.annotation.*; import net.trueog.unionsog.*; -import net.trueog.unionsog.commands.ClanInput; -import net.trueog.unionsog.commands.ClanPlayerInput; +import net.trueog.unionsog.commands.UnionInput; +import net.trueog.unionsog.commands.UnionPlayerInput; import net.trueog.unionsog.commands.data.*; -import net.trueog.unionsog.conversation.CreateClanTagPrompt; +import net.trueog.unionsog.conversation.CreateUnionTagPrompt; import net.trueog.unionsog.conversation.RequestCanceller; import net.trueog.unionsog.conversation.ResetKdrPrompt; import net.trueog.unionsog.conversation.SCConversation; import net.trueog.unionsog.events.PlayerResetKdrEvent; -import net.trueog.unionsog.managers.ClanManager; +import net.trueog.unionsog.managers.UnionManager; import net.trueog.unionsog.managers.RequestManager; import net.trueog.unionsog.managers.SettingsManager; import net.trueog.unionsog.managers.StorageManager; @@ -31,12 +31,12 @@ import java.util.HashMap; import java.util.List; import static net.trueog.unionsog.UnionsOG.lang; -import static net.trueog.unionsog.conversation.CreateClanNamePrompt.NAME_KEY; -import static net.trueog.unionsog.conversation.CreateClanTagPrompt.TAG_KEY; +import static net.trueog.unionsog.conversation.CreateUnionNamePrompt.NAME_KEY; +import static net.trueog.unionsog.conversation.CreateUnionTagPrompt.TAG_KEY; import static net.trueog.unionsog.managers.SettingsManager.ConfigField.*; import static org.bukkit.ChatColor.*; -@CommandAlias("%clan") +@CommandAlias("%union") @Conditions("%basic_conditions") public class GeneralCommands extends BaseCommand { @@ -48,7 +48,7 @@ public class GeneralCommands extends BaseCommand { @Dependency private UnionsOG plugin; @Dependency - private ClanManager cm; + private UnionManager cm; @Dependency private SettingsManager settings; @Dependency @@ -57,7 +57,7 @@ public class GeneralCommands extends BaseCommand { private RequestManager requestManager; @Default - @Description("{@@command.description.clan}") + @Description("{@@command.description.union}") @HelpSearchTags("menu gui interface ui") public void main(CommandSender sender) { @@ -78,7 +78,7 @@ public class GeneralCommands extends BaseCommand { @CommandPermission("unionsog.anyone.locale") @Description("{@@command.description.locale}") @CommandCompletion("@locales") - public void locale(ClanPlayer cp, @Values("@locales") @Name("locale") @Single String locale) { + public void locale(UnionPlayer cp, @Values("@locales") @Name("locale") @Single String locale) { if (!settings.is(LANGUAGE_SELECTOR)) { @@ -88,23 +88,23 @@ public class GeneralCommands extends BaseCommand { } cp.setLocale(Helper.forLanguageTag(locale.replace("_", "-"))); - plugin.getStorageManager().updateClanPlayer(cp); + plugin.getStorageManager().updateUnionPlayer(cp); ChatBlock.sendMessageKey(cp, "locale.has.been.changed"); } @Subcommand("%create") - @CommandPermission("unionsog.leader.create") + @CommandPermission("unionsog.member.create") @CommandCompletion("%compl:tag %compl:name") @Description("{@@command.description.create}") public void create(Player player, @Optional @Name("tag") String tag, @Optional @Name("name") String name) { - ClanPlayer cp = cm.getAnyClanPlayer(player.getUniqueId()); + UnionPlayer cp = cm.getAnyUnionPlayer(player.getUniqueId()); - if (cp != null && cp.getClan() != null) { + if (cp != null && cp.getUnion() != null) { - ChatBlock.sendMessage(player, RED + lang("you.must.first.resign", player, cp.getClan().getName())); + ChatBlock.sendMessage(player, RED + lang("you.must.first.resign", player, cp.getUnion().getName())); return; } @@ -112,9 +112,9 @@ public class GeneralCommands extends BaseCommand { HashMap initialData = new HashMap<>(); initialData.put(TAG_KEY, tag); initialData.put(NAME_KEY, name != null ? name : tag != null ? ChatUtils.stripColors(tag) : null); - SCConversation conversation = new SCConversation(plugin, player, new CreateClanTagPrompt(), initialData); + SCConversation conversation = new SCConversation(plugin, player, new CreateUnionTagPrompt(), initialData); conversation.addConversationCanceller( - new RequestCanceller(player, RED + lang("clan.create.request.cancelled", player))); + new RequestCanceller(player, RED + lang("union.create.request.cancelled", player))); conversation.begin(); } @@ -133,9 +133,9 @@ public class GeneralCommands extends BaseCommand { @CommandCompletion("@players") @CommandPermission("unionsog.anyone.lookup") @Description("{@@command.description.lookup.other}") - public void lookup(CommandSender sender, @Name("player") ClanPlayerInput player) { + public void lookup(CommandSender sender, @Name("player") UnionPlayerInput player) { - Lookup l = new Lookup(plugin, sender, player.getClanPlayer().getUniqueId()); + Lookup l = new Lookup(plugin, sender, player.getUnionPlayer().getUniqueId()); l.send(); } @@ -152,15 +152,15 @@ public class GeneralCommands extends BaseCommand { @Subcommand("%kills") @CommandPermission("unionsog.member.kills") - @Conditions("rank:name=KILLS") + @Conditions("union_member") @CommandCompletion("@players") @Description("{@@command.description.kills}") - public void kills(Player sender, @Optional @Name("player") ClanPlayerInput player) { + public void kills(Player sender, @Optional @Name("player") UnionPlayerInput player) { String name = sender.getName(); if (player != null) { - name = player.getClanPlayer().getName(); + name = player.getUnionPlayer().getName(); } @@ -171,22 +171,22 @@ public class GeneralCommands extends BaseCommand { @Subcommand("%profile") @CommandPermission("unionsog.anyone.profile") - @CommandCompletion("@clans:hide_own") + @CommandCompletion("@unions:hide_own") @Description("{@@command.description.profile.other}") - public void profile(CommandSender sender, @Name("clan") ClanInput clan) { + public void profile(CommandSender sender, @Name("union") UnionInput union) { - ClanProfile p = new ClanProfile(plugin, sender, clan.getClan()); + UnionProfile p = new UnionProfile(plugin, sender, union.getUnion()); p.send(); } @Subcommand("%roster") - @CommandCompletion("@clans:hide_own") + @CommandCompletion("@unions:hide_own") @CommandPermission("unionsog.anyone.roster") @Description("{@@command.description.roster.other}") - public void roster(CommandSender sender, @Name("clan") ClanInput clan) { + public void roster(CommandSender sender, @Name("union") UnionInput union) { - ClanRoster r = new ClanRoster(plugin, sender, clan.getClan()); + UnionRoster r = new UnionRoster(plugin, sender, union.getUnion()); r.send(); } @@ -194,10 +194,10 @@ public class GeneralCommands extends BaseCommand { @Subcommand("%ff %allow") @CommandPermission("unionsog.member.ff") @Description("{@@command.description.ff.allow}") - public void allowPersonalFf(Player player, ClanPlayer cp) { + public void allowPersonalFf(Player player, UnionPlayer cp) { cp.setFriendlyFire(true); - storage.updateClanPlayer(cp); + storage.updateUnionPlayer(cp); ChatBlock.sendMessage(player, AQUA + lang("personal.friendly.fire.is.set.to.allowed", player)); } @@ -205,18 +205,18 @@ public class GeneralCommands extends BaseCommand { @Subcommand("%ff %auto") @CommandPermission("unionsog.member.ff") @Description("{@@command.description.ff.auto}") - public void autoPersonalFf(Player player, ClanPlayer cp) { + public void autoPersonalFf(Player player, UnionPlayer cp) { cp.setFriendlyFire(false); - storage.updateClanPlayer(cp); - ChatBlock.sendMessage(player, AQUA + lang("friendy.fire.is.now.managed.by.your.clan", player)); + storage.updateUnionPlayer(cp); + ChatBlock.sendMessage(player, AQUA + lang("friendy.fire.is.now.managed.by.your.union", player)); } @Subcommand("%resetkdr %confirm") @CommandPermission("unionsog.vip.resetkdr") @Description("{@@command.description.resetkdr}") - public void resetKdrConfirm(Player player, ClanPlayer cp) { + public void resetKdrConfirm(Player player, UnionPlayer cp) { if (!settings.is(ALLOW_RESET_KDR)) { @@ -239,7 +239,7 @@ public class GeneralCommands extends BaseCommand { @Subcommand("%resetkdr") @CommandPermission("unionsog.vip.resetkdr") @Description("{@@command.description.resetkdr}") - public void resetKdr(Player player, ClanPlayer cp) { + public void resetKdr(Player player, UnionPlayer cp) { if (!settings.is(ALLOW_RESET_KDR)) { @@ -256,12 +256,12 @@ public class GeneralCommands extends BaseCommand { @CommandAlias("%accept") @Description("{@@command.description.accept}") @Conditions("can_vote") - public void accept(Player player, ClanPlayer cp) { + public void accept(Player player, UnionPlayer cp) { - Clan clan = cp.getClan(); - if (clan != null) { + Union union = cp.getUnion(); + if (union != null) { - clan.leaderAnnounce(GREEN + lang("voted.to.accept", player.getName())); + union.memberAnnounce(GREEN + lang("voted.to.accept", player.getName())); } @@ -272,12 +272,12 @@ public class GeneralCommands extends BaseCommand { @CommandAlias("%deny") @Description("{@@command.description.deny}") @Conditions("can_vote") - public void deny(Player player, ClanPlayer cp) { + public void deny(Player player, UnionPlayer cp) { - Clan clan = cp.getClan(); - if (clan != null) { + Union union = cp.getUnion(); + if (union != null) { - clan.leaderAnnounce(RED + lang("has.voted.to.deny", player.getName())); + union.memberAnnounce(RED + lang("has.voted.to.deny", player.getName())); } @@ -317,14 +317,14 @@ public class GeneralCommands extends BaseCommand { @Description("{@@command.description.help}") public void help(CommandSender sender, CommandHelp help) { - boolean inClan = sender instanceof Player - && cm.getClanByPlayerUniqueId(((Player) sender).getUniqueId()) != null; + boolean inUnion = sender instanceof Player + && cm.getUnionByPlayerUniqueId(((Player) sender).getUniqueId()) != null; for (HelpEntry helpEntry : help.getHelpEntries()) { for (@SuppressWarnings("rawtypes") CommandParameter parameter : helpEntry.getParameters()) { - if (parameter.getType().equals(Clan.class) && !inClan) { + if (parameter.getType().equals(Union.class) && !inUnion) { helpEntry.setSearchScore(0); @@ -340,7 +340,7 @@ public class GeneralCommands extends BaseCommand { @Subcommand("%mostkilled") @CommandPermission("unionsog.mod.mostkilled") - @Conditions("rank:name=MOSTKILLED") + @Conditions("union_member") @Description("{@@command.description.mostkilled}") public void mostKilled(Player player) { @@ -364,27 +364,27 @@ public class GeneralCommands extends BaseCommand { } // TODO: end - List clans = cm.getClans(); - if (clans.isEmpty()) { + List unions = cm.getUnions(); + if (unions.isEmpty()) { - sender.sendMessage(RED + lang("no.clans.have.been.created", sender)); + sender.sendMessage(RED + lang("no.unions.have.been.created", sender)); return; } - clans.sort(Comparator.comparingDouble(Clan::getBalance).reversed()); + unions.sort(Comparator.comparingDouble(Union::getBalance).reversed()); - sender.sendMessage(lang("clan.list.balance.header", sender, settings.getColored(SERVER_NAME), clans.size())); - String lineFormat = lang("clan.list.balance.line", sender); + sender.sendMessage(lang("union.list.balance.header", sender, settings.getColored(SERVER_NAME), unions.size())); + String lineFormat = lang("union.list.balance.line", sender); String leftBracket = settings.getColored(TAG_BRACKET_COLOR) + settings.getColored(TAG_BRACKET_LEFT); String rightBracket = settings.getColored(TAG_BRACKET_COLOR) + settings.getColored(TAG_BRACKET_RIGHT); - for (int i = 0; i < 10 && i < clans.size(); i++) { + for (int i = 0; i < 10 && i < unions.size(); i++) { - Clan clan = clans.get(i); - String name = " " + settings.getColored(PAGE_CLAN_NAME_COLOR) + clan.getName(); - String line = MessageFormat.format(lineFormat, i + 1, leftBracket, clan.getColorTag(), rightBracket, name, - clan.getBalanceFormatted()); + Union union = unions.get(i); + String name = " " + settings.getColored(PAGE_UNION_NAME_COLOR) + union.getName(); + String line = MessageFormat.format(lineFormat, i + 1, leftBracket, union.getColorTag(), rightBracket, name, + union.getBalanceFormatted()); sender.sendMessage(line); } @@ -394,12 +394,12 @@ public class GeneralCommands extends BaseCommand { @Subcommand("%list") @CommandPermission("unionsog.anyone.list") @Description("{@@command.description.list}") - @CommandCompletion("@clan_list_type @order") + @CommandCompletion("@union_list_type @order") public void list(CommandSender sender, @Optional String type, @Optional @Single String order, @Optional Integer page) { - ClanList list = new ClanList(plugin, sender, type, order, page); + UnionList list = new UnionList(plugin, sender, type, order, page); list.send(); } diff --git a/src/main/java/net/trueog/unionsog/commands/staff/BankCommand.java b/src/main/java/net/trueog/unionsog/commands/staff/BankCommand.java index a86ac628..0933d2ca 100644 --- a/src/main/java/net/trueog/unionsog/commands/staff/BankCommand.java +++ b/src/main/java/net/trueog/unionsog/commands/staff/BankCommand.java @@ -3,10 +3,10 @@ package net.trueog.unionsog.commands.staff; import co.aikar.commands.BaseCommand; import co.aikar.commands.annotation.*; import net.trueog.unionsog.ChatBlock; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import net.trueog.unionsog.EconomyResponse; -import net.trueog.unionsog.commands.ClanInput; -import net.trueog.unionsog.events.ClanBalanceUpdateEvent; +import net.trueog.unionsog.commands.UnionInput; +import net.trueog.unionsog.events.UnionBalanceUpdateEvent; import net.trueog.unionsog.loggers.BankLogger; import net.trueog.unionsog.loggers.BankOperator; import net.trueog.unionsog.managers.PermissionsManager; @@ -18,7 +18,7 @@ import static net.md_5.bungee.api.ChatColor.RED; import static net.trueog.unionsog.UnionsOG.lang; import static org.bukkit.ChatColor.AQUA; -@CommandAlias("%clan") +@CommandAlias("%union") @Conditions("%basic_conditions") @Subcommand("%admin %bank") public class BankCommand extends BaseCommand { @@ -28,23 +28,23 @@ public class BankCommand extends BaseCommand { @Subcommand("%status") @CommandPermission("unionsog.admin.bank.status") - @CommandCompletion("@clans") + @CommandCompletion("@unions") @Description("{@@command.description.bank.admin.status}") - public void status(CommandSender sender, @Name("clan") ClanInput clanInput) { + public void status(CommandSender sender, @Name("union") UnionInput unionInput) { - Clan clan = clanInput.getClan(); + Union union = unionInput.getUnion(); ChatBlock.sendMessage(sender, - AQUA + lang("clan.admin.balance", sender, clan.getName(), clan.getBalanceFormatted())); + AQUA + lang("union.admin.balance", sender, union.getName(), union.getBalanceFormatted())); } @Subcommand("%take") @CommandPermission("unionsog.admin.bank.take") - @CommandCompletion("@clans") + @CommandCompletion("@unions") @Description("{@@command.description.bank.admin.take}") - public void take(CommandSender sender, @Name("clan") ClanInput clanInput, @Name("amount") double amount) { + public void take(CommandSender sender, @Name("union") UnionInput unionInput, @Name("amount") double amount) { - Clan clan = clanInput.getClan(); + Union union = unionInput.getUnion(); long shards = permissions.diamondsToShards(Math.abs(amount)); if (shards < 0) { @@ -56,17 +56,17 @@ public class BankCommand extends BaseCommand { BankOperator operator = new BankOperator(sender, sender instanceof Player ? permissions.playerGetShards((Player) sender) : 0); - EconomyResponse economyResponse = clan.withdraw(operator, ClanBalanceUpdateEvent.Cause.COMMAND, shards); + EconomyResponse economyResponse = union.withdraw(operator, UnionBalanceUpdateEvent.Cause.COMMAND, shards); switch (economyResponse) { case SUCCESS: - ChatBlock.sendMessage(sender, AQUA - + lang("clan.admin.take", sender, CurrencyFormat.formatShards(shards, sender), clan.getName())); - clan.addBb(sender.getName(), - lang("bb.clan.take", sender, CurrencyFormat.formatShards(shards), sender.getName())); + ChatBlock.sendMessage(sender, AQUA + lang("union.admin.take", sender, + CurrencyFormat.formatShards(shards, sender), union.getName())); + union.addBb(sender.getName(), + lang("bb.union.take", sender, CurrencyFormat.formatShards(shards), sender.getName())); break; case NOT_ENOUGH_BALANCE: - sender.sendMessage(RED + lang("clan.admin.bank.not.enough.money", sender, clan.getName())); + sender.sendMessage(RED + lang("union.admin.bank.not.enough.money", sender, union.getName())); break; } @@ -75,11 +75,11 @@ public class BankCommand extends BaseCommand { @Subcommand("%give") @CommandPermission("unionsog.admin.bank.give") - @CommandCompletion("@clans") + @CommandCompletion("@unions") @Description("{@@command.description.bank.admin.give}") - public void give(CommandSender sender, @Name("clan") ClanInput clanInput, @Name("amount") double amount) { + public void give(CommandSender sender, @Name("union") UnionInput unionInput, @Name("amount") double amount) { - Clan clan = clanInput.getClan(); + Union union = unionInput.getUnion(); long shards = permissions.diamondsToShards(Math.abs(amount)); if (shards < 0) { @@ -91,13 +91,13 @@ public class BankCommand extends BaseCommand { BankOperator operator = new BankOperator(sender, sender instanceof Player ? permissions.playerGetShards((Player) sender) : 0); - EconomyResponse economyResponse = clan.deposit(operator, ClanBalanceUpdateEvent.Cause.COMMAND, shards); + EconomyResponse economyResponse = union.deposit(operator, UnionBalanceUpdateEvent.Cause.COMMAND, shards); if (economyResponse == EconomyResponse.SUCCESS) { ChatBlock.sendMessage(sender, AQUA - + lang("clan.admin.give", sender, CurrencyFormat.formatShards(shards, sender), clan.getName())); - clan.addBb(sender.getName(), - lang("bb.clan.give", sender, CurrencyFormat.formatShards(shards), sender.getName())); + + lang("union.admin.give", sender, CurrencyFormat.formatShards(shards, sender), union.getName())); + union.addBb(sender.getName(), + lang("bb.union.give", sender, CurrencyFormat.formatShards(shards), sender.getName())); } @@ -105,11 +105,11 @@ public class BankCommand extends BaseCommand { @Subcommand("%set") @CommandPermission("unionsog.admin.bank.set") - @CommandCompletion("@clans") + @CommandCompletion("@unions") @Description("{@@command.description.bank.admin.set}") - public void set(CommandSender sender, @Name("clan") ClanInput clanInput, @Name("amount") double amount) { + public void set(CommandSender sender, @Name("union") UnionInput unionInput, @Name("amount") double amount) { - Clan clan = clanInput.getClan(); + Union union = unionInput.getUnion(); long shards = permissions.diamondsToShards(Math.abs(amount)); if (shards < 0) { @@ -121,14 +121,14 @@ public class BankCommand extends BaseCommand { BankOperator operator = new BankOperator(sender, sender instanceof Player ? permissions.playerGetShards((Player) sender) : 0); - EconomyResponse response = clan.setBalance(operator, ClanBalanceUpdateEvent.Cause.COMMAND, + EconomyResponse response = union.setBalance(operator, UnionBalanceUpdateEvent.Cause.COMMAND, BankLogger.Operation.SET, shards); if (response == EconomyResponse.SUCCESS) { - ChatBlock.sendMessage(sender, - AQUA + lang("clan.admin.set", sender, clan.getName(), CurrencyFormat.formatShards(shards, sender))); - clan.addBb(sender.getName(), - lang("bb.clan.set", sender, CurrencyFormat.formatShards(shards), sender.getName())); + ChatBlock.sendMessage(sender, AQUA + + lang("union.admin.set", sender, union.getName(), CurrencyFormat.formatShards(shards, sender))); + union.addBb(sender.getName(), + lang("bb.union.set", sender, CurrencyFormat.formatShards(shards), sender.getName())); } diff --git a/src/main/java/net/trueog/unionsog/commands/staff/BbCommand.java b/src/main/java/net/trueog/unionsog/commands/staff/BbCommand.java index a9763e06..a47b05b3 100644 --- a/src/main/java/net/trueog/unionsog/commands/staff/BbCommand.java +++ b/src/main/java/net/trueog/unionsog/commands/staff/BbCommand.java @@ -3,9 +3,9 @@ package net.trueog.unionsog.commands.staff; import co.aikar.commands.BaseCommand; import co.aikar.commands.annotation.*; import net.trueog.unionsog.ChatBlock; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.commands.ClanInput; -import net.trueog.unionsog.managers.ClanManager; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.commands.UnionInput; +import net.trueog.unionsog.managers.UnionManager; import net.trueog.unionsog.managers.SettingsManager; import net.trueog.unionsog.managers.StorageManager; import org.bukkit.entity.Player; @@ -13,7 +13,7 @@ import org.bukkit.entity.Player; import static net.trueog.unionsog.UnionsOG.lang; import static org.bukkit.ChatColor.RED; -@CommandAlias("%clan") +@CommandAlias("%union") @Conditions("%basic_conditions") @Subcommand("%mod %bb") public class BbCommand extends BaseCommand { @@ -21,42 +21,42 @@ public class BbCommand extends BaseCommand { @Dependency private StorageManager storage; @Dependency - private ClanManager cm; + private UnionManager cm; @Dependency private SettingsManager settings; @Subcommand("%display") @CommandPermission("unionsog.mod.bb") - @CommandCompletion("@clans") + @CommandCompletion("@unions") @Description("{@@command.description.mod.bb.display}") - public void display(Player sender, @Name("clan") ClanInput input) { + public void display(Player sender, @Name("union") UnionInput input) { - input.getClan().displayBb(sender); + input.getUnion().displayBb(sender); } @Subcommand("%clear") @CommandPermission("unionsog.mod.bb-clear") - @CommandCompletion("@clans") + @CommandCompletion("@unions") @Description("{@@command.description.mod.bb.clear}") - public void clear(Player player, @Name("clan") ClanInput input) { + public void clear(Player player, @Name("union") UnionInput input) { - input.getClan().clearBb(); + input.getUnion().clearBb(); ChatBlock.sendMessage(player, RED + lang("cleared.bb", player)); } @Subcommand("%add") @CommandPermission("unionsog.mod.bb-add") - @CommandCompletion("@clans @nothing") + @CommandCompletion("@unions @nothing") @Description("{@@command.description.mod.bb.post}") - public void postMessage(Player player, @Name("clan") ClanInput input, @Name("message") String msg) { + public void postMessage(Player player, @Name("union") UnionInput input, @Name("message") String msg) { - Clan clan = input.getClan(); - clan.addBb(lang("bulletin.board.message", player.getName(), msg)); - clan.displayBb(player); - storage.updateClan(clan); + Union union = input.getUnion(); + union.addBb(lang("bulletin.board.message", player.getName(), msg)); + union.displayBb(player); + storage.updateUnion(union); } diff --git a/src/main/java/net/trueog/unionsog/commands/staff/StaffCommands.java b/src/main/java/net/trueog/unionsog/commands/staff/StaffCommands.java index 3a18301a..b60fc976 100644 --- a/src/main/java/net/trueog/unionsog/commands/staff/StaffCommands.java +++ b/src/main/java/net/trueog/unionsog/commands/staff/StaffCommands.java @@ -3,14 +3,14 @@ package net.trueog.unionsog.commands.staff; import co.aikar.commands.BaseCommand; import co.aikar.commands.annotation.*; import net.trueog.unionsog.*; -import net.trueog.unionsog.commands.ClanInput; -import net.trueog.unionsog.commands.ClanPlayerInput; +import net.trueog.unionsog.commands.UnionInput; +import net.trueog.unionsog.commands.UnionPlayerInput; import net.trueog.unionsog.events.PlayerHomeSetEvent; import net.trueog.unionsog.events.PlayerResetKdrEvent; import net.trueog.unionsog.events.ReloadEvent; import net.trueog.unionsog.events.TagChangeEvent; import net.trueog.unionsog.language.LanguageResource; -import net.trueog.unionsog.managers.ClanManager; +import net.trueog.unionsog.managers.UnionManager; import net.trueog.unionsog.managers.PermissionsManager; import net.trueog.unionsog.managers.SettingsManager; import net.trueog.unionsog.managers.StorageManager; @@ -31,14 +31,14 @@ import static net.trueog.unionsog.managers.SettingsManager.ConfigField.GLOBAL_FR import static org.bukkit.ChatColor.AQUA; import static org.bukkit.ChatColor.RED; -@CommandAlias("%clan") +@CommandAlias("%union") @Conditions("%basic_conditions") public class StaffCommands extends BaseCommand { @Dependency private UnionsOG plugin; @Dependency - private ClanManager cm; + private UnionManager cm; @Dependency private PermissionsManager permissions; @Dependency @@ -48,57 +48,57 @@ public class StaffCommands extends BaseCommand { @Subcommand("%mod %place") @CommandPermission("unionsog.mod.place") - @CommandCompletion("@players @clans") + @CommandCompletion("@players @unions") @HelpSearchTags("move put") @Description("{@@command.description.place}") - public void place(CommandSender sender, @Name("player") ClanPlayerInput cpInput, - @Name("clan") ClanInput clanInput) + public void place(CommandSender sender, @Name("player") UnionPlayerInput cpInput, + @Name("union") UnionInput unionInput) { - UUID uuid = cpInput.getClanPlayer().getUniqueId(); - ClanPlayer oldCp = cm.getClanPlayer(uuid); - Clan newClan = clanInput.getClan(); + UUID uuid = cpInput.getUnionPlayer().getUniqueId(); + UnionPlayer oldCp = cm.getUnionPlayer(uuid); + Union newUnion = unionInput.getUnion(); if (oldCp != null) { - Clan oldClan = Objects.requireNonNull(oldCp.getClan()); + Union oldUnion = Objects.requireNonNull(oldCp.getUnion()); - if (oldClan.equals(newClan)) { + if (oldUnion.equals(newUnion)) { - ChatBlock.sendMessage(sender, lang("player.already.in.this.clan", sender)); + ChatBlock.sendMessage(sender, lang("player.already.in.this.union", sender)); return; } - if (!oldClan.isPermanent() && oldClan.isLeader(uuid) && oldClan.getLeaders().size() <= 1) { + if (!oldUnion.isPermanent() && oldUnion.getSize() <= 1) { - ChatBlock.sendMessage(sender, RED + lang("you.cannot.move.the.last.leader", sender)); + ChatBlock.sendMessage(sender, RED + lang("you.cannot.move.the.last.member", sender)); return; } else { - oldClan.addBb(oldCp.getName(), lang("0.has.resigned", oldCp.getName())); - oldClan.removePlayerFromClan(uuid); + oldUnion.addBb(oldCp.getName(), lang("0.has.resigned", oldCp.getName())); + oldUnion.removePlayerFromUnion(uuid); } } - ClanPlayer cp = cm.getCreateClanPlayer(uuid); + UnionPlayer cp = cm.getCreateUnionPlayer(uuid); - newClan.addBb(lang("joined.the.clan", cp.getName())); - cm.serverAnnounce(lang("has.joined", cp.getName(), newClan.getName())); - newClan.addPlayerToClan(cp); + newUnion.addBb(lang("joined.the.union", cp.getName())); + cm.serverAnnounce(lang("has.joined", cp.getName(), newUnion.getName())); + newUnion.addPlayerToUnion(cp); } @Subcommand("%mod %modtag") @CommandPermission("unionsog.mod.modtag") @Description("{@@command.description.modtag.other}") - public void modtag(Player player, @Name("clan") ClanInput clanInput, @Single @Name("tag") String tag) { + public void modtag(Player player, @Name("union") UnionInput unionInput, @Single @Name("tag") String tag) { - Clan clan = clanInput.getClan(); - TagChangeEvent event = new TagChangeEvent(player, clan, tag); + Union union = unionInput.getUnion(); + TagChangeEvent event = new TagChangeEvent(player, union, tag); plugin.getServer().getPluginManager().callEvent(event); if (event.isCancelled()) { @@ -117,16 +117,16 @@ public class StaffCommands extends BaseCommand { } - if (!cleanTag.equals(clan.getTag())) { + if (!cleanTag.equals(union.getTag())) { ChatBlock.sendMessage(player, RED + lang("you.can.only.modify.the.color.and.case.of.the.tag", player)); return; } - clan.addBb(player.getName(), lang("tag.changed.to.0", ChatUtils.parseColors(tag))); - clan.changeClanTag(tag); - player.sendMessage(lang("0.tag.changed.to.1", player, clan.getTag(), tag)); + union.addBb(player.getName(), lang("tag.changed.to.0", ChatUtils.parseColors(tag))); + union.changeUnionTag(tag); + player.sendMessage(lang("0.tag.changed.to.1", player, union.getTag(), tag)); } @@ -142,9 +142,9 @@ public class StaffCommands extends BaseCommand { storage.importFromDatabase(); permissions.loadPermissions(); - for (Clan clan : cm.getClans()) { + for (Union union : cm.getUnions()) { - permissions.updateClanPermissions(clan); + permissions.updateUnionPermissions(union); } @@ -156,14 +156,14 @@ public class StaffCommands extends BaseCommand { @Subcommand("%mod %home %set") @CommandPermission("unionsog.mod.home") - @CommandCompletion("@clans") + @CommandCompletion("@unions") @Description("{@@command.description.mod.home.set}") - public void homeSet(Player player, ClanPlayer cp, @Name("clan") ClanInput clanInput) { + public void homeSet(Player player, UnionPlayer cp, @Name("union") UnionInput unionInput) { Location loc = player.getLocation(); - Clan clan = clanInput.getClan(); + Union union = unionInput.getUnion(); - PlayerHomeSetEvent event = new PlayerHomeSetEvent(clan, cp, loc); + PlayerHomeSetEvent event = new PlayerHomeSetEvent(union, cp, loc); Bukkit.getPluginManager().callEvent(event); if (event.isCancelled()) { @@ -171,19 +171,19 @@ public class StaffCommands extends BaseCommand { } - clan.setHomeLocation(loc); - ChatBlock.sendMessage(player, AQUA + lang("hombase.mod.set", player, clan.getName()) + " " + ChatColor.YELLOW + union.setHomeLocation(loc); + ChatBlock.sendMessage(player, AQUA + lang("hombase.mod.set", player, union.getName()) + " " + ChatColor.YELLOW + Helper.toLocationString(loc)); } @Subcommand("%mod %home %tp") - @CommandCompletion("@clans:has_home") + @CommandCompletion("@unions:has_home") @CommandPermission("unionsog.mod.hometp") @Description("{@@command.description.mod.home.tp}") - public void homeTp(Player player, @Name("clan") @Conditions("can_teleport") ClanInput clan) { + public void homeTp(Player player, @Name("union") @Conditions("can_teleport") UnionInput union) { - plugin.getTeleportManager().teleportToHome(player, clan.getClan()); + plugin.getTeleportManager().teleportToHome(player, union.getUnion()); } @@ -191,9 +191,9 @@ public class StaffCommands extends BaseCommand { @CommandPermission("unionsog.mod.ban") @CommandCompletion("@players") @Description("{@@command.description.ban}") - public void ban(CommandSender sender, @Name("player") ClanPlayerInput player) { + public void ban(CommandSender sender, @Name("player") UnionPlayerInput player) { - UUID uuid = player.getClanPlayer().getUniqueId(); + UUID uuid = player.getUnionPlayer().getUniqueId(); if (settings.isBanned(uuid)) { ChatBlock.sendMessage(sender, RED + lang("this.player.is.already.banned", sender)); @@ -217,9 +217,9 @@ public class StaffCommands extends BaseCommand { @CommandPermission("unionsog.mod.ban") @CommandCompletion("@players") @Description("{@@command.description.unban}") - public void unban(CommandSender sender, @Name("player") ClanPlayerInput player) { + public void unban(CommandSender sender, @Name("player") UnionPlayerInput player) { - UUID uuid = player.getClanPlayer().getUniqueId(); + UUID uuid = player.getUnionPlayer().getUniqueId(); if (!settings.isBanned(uuid)) { ChatBlock.sendMessage(sender, RED + lang("this.player.is.not.banned", sender)); @@ -230,7 +230,7 @@ public class StaffCommands extends BaseCommand { Player pl = Bukkit.getPlayer(uuid); if (pl != null) { - ChatBlock.sendMessage(pl, AQUA + lang("you.have.been.unbanned.from.clan.commands", sender)); + ChatBlock.sendMessage(pl, AQUA + lang("you.have.been.unbanned.from.union.commands", sender)); } @@ -265,12 +265,12 @@ public class StaffCommands extends BaseCommand { if (!settings.is(GLOBAL_FRIENDLY_FIRE)) { ChatBlock.sendMessage(sender, - AQUA + lang("global.friendy.fire.is.already.being.managed.by.each.clan", sender)); + AQUA + lang("global.friendy.fire.is.already.being.managed.by.each.union", sender)); } else { settings.set(GLOBAL_FRIENDLY_FIRE, false); - ChatBlock.sendMessage(sender, AQUA + lang("global.friendy.fire.is.now.managed.by.each.clan", sender)); + ChatBlock.sendMessage(sender, AQUA + lang("global.friendy.fire.is.now.managed.by.each.union", sender)); } @@ -280,23 +280,23 @@ public class StaffCommands extends BaseCommand { @CommandPermission("unionsog.admin.purge") @CommandCompletion("@players") @Description("{@@command.description.purge}") - public void purge(CommandSender sender, @Name("player") ClanPlayerInput player) { + public void purge(CommandSender sender, @Name("player") UnionPlayerInput player) { - Player onlinePlayer = player.getClanPlayer().toPlayer(); + Player onlinePlayer = player.getUnionPlayer().toPlayer(); if (onlinePlayer != null && InventoryController.isRegistered(onlinePlayer)) { onlinePlayer.closeInventory(); } - Clan clan = player.getClanPlayer().getClan(); - if (clan != null && clan.getMembers().size() == 1) { + Union union = player.getUnionPlayer().getUnion(); + if (union != null && union.getMembers().size() == 1) { - clan.disband(sender, false, false); + union.disband(sender, false, false); } - cm.deleteClanPlayer(player.getClanPlayer()); + cm.deleteUnionPlayer(player.getUnionPlayer()); ChatBlock.sendMessage(sender, AQUA + lang("player.purged", sender)); } @@ -304,91 +304,30 @@ public class StaffCommands extends BaseCommand { @Subcommand("%mod %kick") @Description("{@@command.description.mod.kick}") @CommandPermission("unionsog.mod.kick") - @CommandCompletion("@all_non_leaders|@all_leaders") - public void kick(CommandSender sender, @Conditions("clan_member") @Name("player") ClanPlayerInput cp) { + @CommandCompletion("@all_members") + public void kick(CommandSender sender, @Conditions("union_member") @Name("player") UnionPlayerInput cp) { - ClanPlayer clanPlayer = cp.getClanPlayer(); - Clan clan = Objects.requireNonNull(clanPlayer.getClan()); - if (clanPlayer.isLeader() && clan.getLeaders().size() == 1) { + UnionPlayer unionPlayer = cp.getUnionPlayer(); + Union union = Objects.requireNonNull(unionPlayer.getUnion()); + if (union.getSize() == 1) { - ChatBlock.sendMessageKey(sender, "cannot.kick.last.leader"); + ChatBlock.sendMessageKey(sender, "cannot.kick.last.member"); return; } - clan.addBb(sender.getName(), lang("has.been.kicked.by", clanPlayer.getName(), sender.getName(), sender)); - clan.removePlayerFromClan(clanPlayer.getUniqueId()); + union.addBb(sender.getName(), lang("has.been.kicked.by", unionPlayer.getName(), sender.getName(), sender)); + union.removePlayerFromUnion(unionPlayer.getUniqueId()); } @Subcommand("%mod %disband") - @CommandCompletion("@clans") + @CommandCompletion("@unions") @CommandPermission("unionsog.mod.disband") @Description("{@@command.description.mod.disband}") - public void disband(CommandSender sender, @Name("clan") ClanInput clan) { + public void disband(CommandSender sender, @Name("union") UnionInput union) { - clan.getClan().disband(sender, true, true); - - } - - @Subcommand("%admin %promote") - @CommandCompletion("@all_non_leaders") - @CommandPermission("unionsog.admin.promote") - @Description("{@@command.description.admin.promote}") - public void promote(CommandSender sender, - @Conditions("online|clan_member") @Name("player") ClanPlayerInput promote) - { - - ClanPlayer clanPlayer = promote.getClanPlayer(); - Player promotePl = Objects.requireNonNull(clanPlayer.toPlayer()); - if (!permissions.has(promotePl, "unionsog.leader.promotable")) { - - ChatBlock.sendMessage(sender, - RED + lang("the.player.does.not.have.the.permissions.to.lead.a.clan", sender)); - return; - - } - - Clan clan = Objects.requireNonNull(clanPlayer.getClan()); - if (clan.isLeader(promotePl)) { - - ChatBlock.sendMessage(sender, RED + lang("the.player.is.already.a.leader", sender)); - return; - - } - - clan.addBb(sender.getName(), lang("promoted.to.leader", promotePl.getName())); - clan.promote(promotePl.getUniqueId()); - ChatBlock.sendMessage(sender, AQUA + lang("player.successfully.promoted", sender)); - - } - - @Subcommand("%admin %demote") - @CommandCompletion("@all_leaders") - @CommandPermission("unionsog.admin.demote") - @Description("{@@command.description.admin.demote}") - public void demote(CommandSender sender, @Conditions("clan_member") @Name("leader") ClanPlayerInput other) { - - ClanPlayer otherCp = other.getClanPlayer(); - Clan clan = Objects.requireNonNull(otherCp.getClan()); - - if (!otherCp.isLeader()) { - - ChatBlock.sendMessage(sender, RED + lang("player.is.not.a.leader", sender)); - return; - - } - - if (clan.getLeaders().size() == 1 && !clan.isPermanent()) { - - ChatBlock.sendMessage(sender, RED + lang("you.cannot.demote.the.last.leader", sender)); - return; - - } - - clan.demote(otherCp.getUniqueId()); - clan.addBb(sender.getName(), lang("demoted.back.to.member", otherCp.getName())); - ChatBlock.sendMessage(sender, AQUA + lang("player.successfully.demoted", sender)); + union.getUnion().disband(sender, true, true); } @@ -397,7 +336,7 @@ public class StaffCommands extends BaseCommand { @Description("{@@command.description.resetkdr.everyone}") public void resetKdr(CommandSender sender) { - for (ClanPlayer cp : cm.getAllClanPlayers()) { + for (UnionPlayer cp : cm.getAllUnionPlayers()) { PlayerResetKdrEvent event = new PlayerResetKdrEvent(cp); Bukkit.getServer().getPluginManager().callEvent(event); @@ -417,9 +356,9 @@ public class StaffCommands extends BaseCommand { @CommandCompletion("@players") @CommandPermission("unionsog.admin.resetkdr") @Description("{@@command.description.resetkdr.player}") - public void resetKdr(CommandSender sender, @Name("player") ClanPlayerInput clanPlayer) { + public void resetKdr(CommandSender sender, @Name("player") UnionPlayerInput unionPlayer) { - ClanPlayer cp = clanPlayer.getClanPlayer(); + UnionPlayer cp = unionPlayer.getUnionPlayer(); PlayerResetKdrEvent event = new PlayerResetKdrEvent(cp); Bukkit.getServer().getPluginManager().callEvent(event); if (!event.isCancelled()) { @@ -432,38 +371,38 @@ public class StaffCommands extends BaseCommand { } @Subcommand("%admin %permanent") - @CommandCompletion("@clans") + @CommandCompletion("@unions") @CommandPermission("unionsog.admin.permanent") @Description("{@@command.description.admin.permanent}") - public void togglePermanent(CommandSender sender, @Name("clan") ClanInput clanInput) { + public void togglePermanent(CommandSender sender, @Name("union") UnionInput unionInput) { - Clan clan = clanInput.getClan(); - boolean permanent = !clan.isPermanent(); - clan.setPermanent(permanent); - clan.addBb(sender.getName(), + Union union = unionInput.getUnion(); + boolean permanent = !union.isPermanent(); + union.setPermanent(permanent); + union.addBb(sender.getName(), lang((permanent) ? "permanent.status.enabled" : "permanent.status.disabled", sender.getName())); - ChatBlock.sendMessage(sender, AQUA + lang("you.have.toggled.permanent.status", sender, clan.getName())); + ChatBlock.sendMessage(sender, AQUA + lang("you.have.toggled.permanent.status", sender, union.getName())); } @Subcommand("%mod %rename") - @CommandCompletion("@clans @nothing") + @CommandCompletion("@unions @nothing") @CommandPermission("unionsog.mod.rename") @Description("{@@command.description.mod.rename}") - public void rename(CommandSender sender, @Name("clan") ClanInput clanInput, @Name("name") String clanName) { + public void rename(CommandSender sender, @Name("union") UnionInput unionInput, @Name("name") String unionName) { - if (ChatUtils.stripColors(clanName).trim().equalsIgnoreCase("None")) { + if (ChatUtils.stripColors(unionName).trim().equalsIgnoreCase("None")) { ChatBlock.sendMessage(sender, RED + "Union cannot be named \"None\"."); return; } - Clan clan = clanInput.getClan(); - clan.setName(clanName); - storage.updateClan(clan); + Union union = unionInput.getUnion(); + union.setName(unionName); + storage.updateUnion(union); - ChatBlock.sendMessageKey(sender, "you.have.successfully.renamed.the.clan", clanName); + ChatBlock.sendMessageKey(sender, "you.have.successfully.renamed.the.union", unionName); } @@ -471,13 +410,13 @@ public class StaffCommands extends BaseCommand { @CommandPermission("unionsog.mod.locale") @Description("{@@command.description.mod.locale}") @CommandCompletion("@locales") - public void locale(CommandSender sender, @Name("player") ClanPlayerInput input, + public void locale(CommandSender sender, @Name("player") UnionPlayerInput input, @Values("@locales") @Name("locale") @Single String locale) { - ClanPlayer cp = input.getClanPlayer(); + UnionPlayer cp = input.getUnionPlayer(); cp.setLocale(Helper.forLanguageTag(locale.replace("_", "-"))); - plugin.getStorageManager().updateClanPlayer(cp); + plugin.getStorageManager().updateUnionPlayer(cp); ChatBlock.sendMessage(sender, lang("locale.has.been.changed")); diff --git a/src/main/java/net/trueog/unionsog/commands/union/AllyChatCommand.java b/src/main/java/net/trueog/unionsog/commands/union/AllyChatCommand.java new file mode 100644 index 00000000..90cf1123 --- /dev/null +++ b/src/main/java/net/trueog/unionsog/commands/union/AllyChatCommand.java @@ -0,0 +1,87 @@ +package net.trueog.unionsog.commands.union; + +import co.aikar.commands.BaseCommand; +import co.aikar.commands.annotation.*; +import net.trueog.unionsog.ChatBlock; +import net.trueog.unionsog.UnionPlayer; +import net.trueog.unionsog.managers.ChatManager; +import net.trueog.unionsog.managers.SettingsManager; +import net.trueog.unionsog.managers.StorageManager; + +import static net.trueog.unionsog.UnionPlayer.Channel.ALLY; +import static net.trueog.unionsog.UnionPlayer.Channel.NONE; +import static net.trueog.unionsog.UnionsOG.lang; +import static net.trueog.unionsog.chat.SCMessage.Source.SPIGOT; + +@CommandAlias("%ally_chat") +@Description("{@@command.description.ally}") +@CommandPermission("unionsog.member.ally") +@Conditions("%basic_conditions|union_member|can_chat:type=ALLY") +public class AllyChatCommand extends BaseCommand { + + @Dependency + private ChatManager chatManager; + @Dependency + private SettingsManager settingsManager; + @Dependency + private StorageManager storageManager; + + @Default + @HelpSearchTags("chat") + public void sendMessage(UnionPlayer cp, @Name("message") String message) { + + chatManager.processChat(SPIGOT, ALLY, cp, message); + + } + + @Subcommand("%join") + public void join(UnionPlayer unionPlayer) { + + if (unionPlayer.getChannel() == ALLY) { + + ChatBlock.sendMessage(unionPlayer, lang("already.joined.ally.chat")); + return; + + } + + unionPlayer.setChannel(ALLY); + storageManager.updateUnionPlayer(unionPlayer); + ChatBlock.sendMessage(unionPlayer, lang("joined.ally.chat")); + + } + + @Subcommand("%leave") + public void leave(UnionPlayer unionPlayer) { + + if (unionPlayer.getChannel() == ALLY) { + + unionPlayer.setChannel(NONE); + storageManager.updateUnionPlayer(unionPlayer); + ChatBlock.sendMessage(unionPlayer, lang("left.ally.chat", unionPlayer)); + + } else { + + ChatBlock.sendMessage(unionPlayer, lang("chat.didnt.join", unionPlayer)); + + } + + } + + @Subcommand("%mute") + public void mute(UnionPlayer unionPlayer) { + + if (!unionPlayer.isMutedAlly()) { + + unionPlayer.mute(ALLY, true); + ChatBlock.sendMessage(unionPlayer, lang("muted.ally.chat", unionPlayer)); + + } else { + + unionPlayer.mute(ALLY, false); + ChatBlock.sendMessage(unionPlayer, lang("unmuted.ally.chat", unionPlayer)); + + } + + } + +} diff --git a/src/main/java/net/trueog/unionsog/commands/clan/BankCommand.java b/src/main/java/net/trueog/unionsog/commands/union/BankCommand.java similarity index 63% rename from src/main/java/net/trueog/unionsog/commands/clan/BankCommand.java rename to src/main/java/net/trueog/unionsog/commands/union/BankCommand.java index 3547386f..cda1881e 100644 --- a/src/main/java/net/trueog/unionsog/commands/clan/BankCommand.java +++ b/src/main/java/net/trueog/unionsog/commands/union/BankCommand.java @@ -1,9 +1,9 @@ -package net.trueog.unionsog.commands.clan; +package net.trueog.unionsog.commands.union; import co.aikar.commands.BaseCommand; import co.aikar.commands.annotation.*; import net.trueog.unionsog.ChatBlock; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import net.trueog.unionsog.EconomyResponse; import net.trueog.unionsog.events.BankDepositEvent; import net.trueog.unionsog.events.BankWithdrawEvent; @@ -15,12 +15,12 @@ import org.bukkit.Bukkit; import org.bukkit.entity.Player; import static net.trueog.unionsog.UnionsOG.lang; -import static net.trueog.unionsog.events.ClanBalanceUpdateEvent.Cause.COMMAND; -import static net.trueog.unionsog.events.ClanBalanceUpdateEvent.Cause.REVERT; +import static net.trueog.unionsog.events.UnionBalanceUpdateEvent.Cause.COMMAND; +import static net.trueog.unionsog.events.UnionBalanceUpdateEvent.Cause.REVERT; import static org.bukkit.ChatColor.AQUA; import static org.bukkit.ChatColor.RED; -@CommandAlias("%clan") +@CommandAlias("%union") @Subcommand("%bank") @Conditions("%basic_conditions|economy") public class BankCommand extends BaseCommand { @@ -30,29 +30,29 @@ public class BankCommand extends BaseCommand { @Subcommand("%status") @CommandPermission("unionsog.member.bank") - @Conditions("rank:name=BANK_BALANCE") + @Conditions("union_member") @Description("{@@command.description.bank.status}") - public void bankStatus(Player player, Clan clan) { + public void bankStatus(Player player, Union union) { - player.sendMessage(AQUA + lang("clan.balance", player, clan.getBalanceFormatted())); + player.sendMessage(AQUA + lang("union.balance", player, union.getBalanceFormatted())); } @Subcommand("%withdraw %all") @CommandPermission("unionsog.member.bank") - @Conditions("rank:name=BANK_WITHDRAW") + @Conditions("union_member") @Description("{@@command.description.bank.withdraw.all}") - public void bankWithdraw(Player player, Clan clan) { + public void bankWithdraw(Player player, Union union) { - processWithdraw(player, clan, (long) clan.getBalance()); + processWithdraw(player, union, (long) union.getBalance()); } @Subcommand("%withdraw") @CommandPermission("unionsog.member.bank") - @Conditions("rank:name=BANK_WITHDRAW") + @Conditions("union_member") @Description("{@@command.description.bank.withdraw.amount}") - public void bankWithdraw(Player player, Clan clan, double amount) { + public void bankWithdraw(Player player, Union union, double amount) { long shards = permissions.diamondsToShards(Math.abs(amount)); if (shards < 0) { @@ -62,13 +62,13 @@ public class BankCommand extends BaseCommand { } - processWithdraw(player, clan, shards); + processWithdraw(player, union, shards); } - private void processWithdraw(Player player, Clan clan, long shards) { + private void processWithdraw(Player player, Union union, long shards) { - if (!clan.isAllowWithdraw()) { + if (!union.isAllowWithdraw()) { String message = getCurrentCommandManager().getCommandReplacements() .replace(lang("withdraw.not.allowed", player)); @@ -80,7 +80,7 @@ public class BankCommand extends BaseCommand { /* * TODO: Remove at UnionsOG 3.0 */ - BankWithdrawEvent event = new BankWithdrawEvent(player, clan, shards); + BankWithdrawEvent event = new BankWithdrawEvent(player, union, shards); Bukkit.getPluginManager().callEvent(event); if (event.isCancelled()) { @@ -92,24 +92,24 @@ public class BankCommand extends BaseCommand { * —————————————————————————————————— */ BankOperator operator = new BankOperator(player, permissions.playerGetShards(player)); - switch (clan.withdraw(operator, COMMAND, shards)) { + switch (union.withdraw(operator, COMMAND, shards)) { case SUCCESS: if (permissions.grantPlayerShards(player, shards, null)) { player.sendMessage( - AQUA + lang("player.clan.withdraw", player, CurrencyFormat.formatShards(shards, player))); - clan.addBb(player.getName(), - lang("bb.clan.withdraw", CurrencyFormat.formatShards(shards), player.getName())); + AQUA + lang("player.union.withdraw", player, CurrencyFormat.formatShards(shards, player))); + union.addBb(player.getName(), + lang("bb.union.withdraw", CurrencyFormat.formatShards(shards), player.getName())); } else { - clan.setBalance(operator, REVERT, BankLogger.Operation.WITHDRAW, clan.getBalance() + shards); + union.setBalance(operator, REVERT, BankLogger.Operation.WITHDRAW, union.getBalance() + shards); } break; case NOT_ENOUGH_BALANCE: - player.sendMessage(lang("clan.bank.not.enough.money", player)); + player.sendMessage(lang("union.bank.not.enough.money", player)); } @@ -117,19 +117,19 @@ public class BankCommand extends BaseCommand { @Subcommand("%deposit %all") @CommandPermission("unionsog.member.bank") - @Conditions("rank:name=BANK_DEPOSIT") + @Conditions("union_member") @Description("{@@command.description.bank.deposit.all}") - public void bankDeposit(Player player, Clan clan) { + public void bankDeposit(Player player, Union union) { - processDeposit(player, clan, permissions.playerGetShards(player)); + processDeposit(player, union, permissions.playerGetShards(player)); } @Subcommand("%deposit") @CommandPermission("unionsog.member.bank") - @Conditions("rank:name=BANK_DEPOSIT") + @Conditions("union_member") @Description("{@@command.description.bank.deposit.amount}") - public void bankDeposit(Player player, Clan clan, double amount) { + public void bankDeposit(Player player, Union union, double amount) { long shards = permissions.diamondsToShards(Math.abs(amount)); if (shards < 0) { @@ -139,13 +139,13 @@ public class BankCommand extends BaseCommand { } - processDeposit(player, clan, shards); + processDeposit(player, union, shards); } - private void processDeposit(Player player, Clan clan, long shards) { + private void processDeposit(Player player, Union union, long shards) { - if (!clan.isAllowDeposit()) { + if (!union.isAllowDeposit()) { String message = getCurrentCommandManager().getCommandReplacements() .replace(lang("deposit.not.allowed", player)); @@ -157,7 +157,7 @@ public class BankCommand extends BaseCommand { /* * TODO: Remove at UnionsOG 3.0 */ - BankDepositEvent event = new BankDepositEvent(player, clan, shards); + BankDepositEvent event = new BankDepositEvent(player, union, shards); Bukkit.getPluginManager().callEvent(event); if (event.isCancelled()) { @@ -177,20 +177,20 @@ public class BankCommand extends BaseCommand { } BankOperator operator = new BankOperator(player, permissions.playerGetShards(player)); - EconomyResponse response = clan.deposit(operator, COMMAND, shards); + EconomyResponse response = union.deposit(operator, COMMAND, shards); if (response == EconomyResponse.SUCCESS) { if (permissions.chargePlayerShards(player, shards, null)) { player.sendMessage( - AQUA + lang("player.clan.deposit", player, CurrencyFormat.formatShards(shards, player))); - clan.addBb(player.getName(), - lang("bb.clan.deposit", CurrencyFormat.formatShards(shards), player.getName())); + AQUA + lang("player.union.deposit", player, CurrencyFormat.formatShards(shards, player))); + union.addBb(player.getName(), + lang("bb.union.deposit", CurrencyFormat.formatShards(shards), player.getName())); } else { // Reverts the deposit if the DiamondBank-OG charge failed - clan.setBalance(operator, REVERT, BankLogger.Operation.DEPOSIT, clan.getBalance() - shards); + union.setBalance(operator, REVERT, BankLogger.Operation.DEPOSIT, union.getBalance() - shards); } diff --git a/src/main/java/net/trueog/unionsog/commands/clan/BbCommand.java b/src/main/java/net/trueog/unionsog/commands/union/BbCommand.java similarity index 59% rename from src/main/java/net/trueog/unionsog/commands/clan/BbCommand.java rename to src/main/java/net/trueog/unionsog/commands/union/BbCommand.java index 70ee4e81..e4fb0a50 100644 --- a/src/main/java/net/trueog/unionsog/commands/clan/BbCommand.java +++ b/src/main/java/net/trueog/unionsog/commands/union/BbCommand.java @@ -1,10 +1,10 @@ -package net.trueog.unionsog.commands.clan; +package net.trueog.unionsog.commands.union; import co.aikar.commands.BaseCommand; import co.aikar.commands.annotation.*; import net.trueog.unionsog.ChatBlock; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.managers.ClanManager; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.managers.UnionManager; import net.trueog.unionsog.managers.SettingsManager; import net.trueog.unionsog.managers.StorageManager; import org.bukkit.entity.Player; @@ -14,12 +14,12 @@ import java.util.Objects; import static net.trueog.unionsog.UnionsOG.lang; import static org.bukkit.ChatColor.RED; -@CommandAlias("%clan") +@CommandAlias("%union") @Conditions("%basic_conditions") public class BbCommand extends BaseCommand { @Dependency - private ClanManager cm; + private UnionManager cm; @Dependency private StorageManager storage; @Dependency @@ -30,33 +30,33 @@ public class BbCommand extends BaseCommand { @Description("{@@command.description.bb.display}") public void display(Player sender) { - Clan clan = Objects.requireNonNull(cm.getClanByPlayerUniqueId(sender.getUniqueId())); - clan.displayBb(sender); + Union union = Objects.requireNonNull(cm.getUnionByPlayerUniqueId(sender.getUniqueId())); + union.displayBb(sender); } @Subcommand("%bb %clear") - @CommandPermission("unionsog.leader.bb-clear") - @Conditions("rank:name=BB_CLEAR") + @CommandPermission("unionsog.member.bb-clear") + @Conditions("union_member") @Description("{@@command.description.bb.clear}") public void clear(Player player) { - Clan clan = Objects.requireNonNull(cm.getClanByPlayerUniqueId(player.getUniqueId())); - clan.clearBb(); + Union union = Objects.requireNonNull(cm.getUnionByPlayerUniqueId(player.getUniqueId())); + union.clearBb(); ChatBlock.sendMessage(player, RED + lang("cleared.bb", player)); } @Subcommand("%bb %add") @CommandPermission("unionsog.member.bb-add") - @Conditions("rank:name=BB_ADD") + @Conditions("union_member") @Description("{@@command.description.bb.post}") public void postMessage(Player player, @Name("message") String msg) { - Clan clan = Objects.requireNonNull(cm.getClanByPlayerUniqueId(player.getUniqueId())); - clan.addBb(lang("bulletin.board.message", player.getName(), msg)); - clan.displayBb(player); - storage.updateClan(clan); + Union union = Objects.requireNonNull(cm.getUnionByPlayerUniqueId(player.getUniqueId())); + union.addBb(lang("bulletin.board.message", player.getName(), msg)); + union.displayBb(player); + storage.updateUnion(union); } diff --git a/src/main/java/net/trueog/unionsog/commands/union/ChatCommand.java b/src/main/java/net/trueog/unionsog/commands/union/ChatCommand.java new file mode 100644 index 00000000..2463d00f --- /dev/null +++ b/src/main/java/net/trueog/unionsog/commands/union/ChatCommand.java @@ -0,0 +1,110 @@ +package net.trueog.unionsog.commands.union; + +import co.aikar.commands.BaseCommand; +import co.aikar.commands.annotation.*; +import net.trueog.unionsog.ChatBlock; +import net.trueog.unionsog.UnionPlayer; +import net.trueog.unionsog.managers.ChatManager; +import net.trueog.unionsog.managers.StorageManager; + +import static net.trueog.unionsog.UnionPlayer.Channel.UNION; +import static net.trueog.unionsog.UnionPlayer.Channel.NONE; +import static net.trueog.unionsog.UnionsOG.lang; +import static net.trueog.unionsog.chat.SCMessage.Source.SPIGOT; + +@CommandAlias("%union_chat") +@Conditions("%basic_conditions|union_member|can_chat:type=UNION") +@CommandPermission("unionsog.member.chat") +@Description("{@@command.description.chat}") +public class ChatCommand extends BaseCommand { + + @Dependency + private ChatManager chatManager; + @Dependency + private StorageManager storageManager; + + @Default + @HelpSearchTags("chat") + public void sendMessage(UnionPlayer cp, @Optional @Name("message") String message) { + + if (message == null || message.isBlank()) { + + toggle(cp); + return; + + } + + chatManager.processChat(SPIGOT, UNION, cp, message); + + } + + // Bare command flips the player in or out of the union chat channel. + private void toggle(UnionPlayer unionPlayer) { + + if (unionPlayer.getChannel() == UNION) { + + unionPlayer.setChannel(NONE); + storageManager.updateUnionPlayer(unionPlayer); + ChatBlock.sendMessage(unionPlayer, lang("left.union.chat", unionPlayer)); + + } else { + + unionPlayer.setChannel(UNION); + storageManager.updateUnionPlayer(unionPlayer); + ChatBlock.sendMessage(unionPlayer, lang("joined.union.chat")); + + } + + } + + @Subcommand("%join") + public void join(UnionPlayer unionPlayer) { + + if (unionPlayer.getChannel() == UNION) { + + ChatBlock.sendMessage(unionPlayer, lang("already.joined.union.chat")); + return; + + } + + unionPlayer.setChannel(UNION); + storageManager.updateUnionPlayer(unionPlayer); + ChatBlock.sendMessage(unionPlayer, lang("joined.union.chat")); + + } + + @Subcommand("%leave") + public void leave(UnionPlayer unionPlayer) { + + if (unionPlayer.getChannel() == UNION) { + + unionPlayer.setChannel(NONE); + storageManager.updateUnionPlayer(unionPlayer); + ChatBlock.sendMessage(unionPlayer, lang("left.union.chat", unionPlayer)); + + } else { + + ChatBlock.sendMessage(unionPlayer, lang("chat.didnt.join", unionPlayer)); + + } + + } + + @Subcommand("%mute") + public void mute(UnionPlayer unionPlayer) { + + if (!unionPlayer.isMuted()) { + + unionPlayer.mute(UNION, true); + ChatBlock.sendMessage(unionPlayer, lang("muted.union.chat", unionPlayer)); + + } else { + + unionPlayer.mute(UNION, false); + ChatBlock.sendMessage(unionPlayer, lang("unmuted.union.chat", unionPlayer)); + + } + + } + +} diff --git a/src/main/java/net/trueog/unionsog/commands/clan/DataCommands.java b/src/main/java/net/trueog/unionsog/commands/union/DataCommands.java similarity index 63% rename from src/main/java/net/trueog/unionsog/commands/clan/DataCommands.java rename to src/main/java/net/trueog/unionsog/commands/union/DataCommands.java index 81815eb3..024ff443 100644 --- a/src/main/java/net/trueog/unionsog/commands/clan/DataCommands.java +++ b/src/main/java/net/trueog/unionsog/commands/union/DataCommands.java @@ -1,9 +1,9 @@ -package net.trueog.unionsog.commands.clan; +package net.trueog.unionsog.commands.union; import co.aikar.commands.BaseCommand; import co.aikar.commands.annotation.*; import net.trueog.unionsog.ChatBlock; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.commands.data.*; import net.trueog.unionsog.utils.VanishUtils; @@ -13,7 +13,7 @@ import org.bukkit.entity.Player; import static net.trueog.unionsog.UnionsOG.lang; import static org.bukkit.ChatColor.RED; -@CommandAlias("%clan") +@CommandAlias("%union") @Conditions("%basic_conditions") public class DataCommands extends BaseCommand { @@ -22,22 +22,22 @@ public class DataCommands extends BaseCommand { @Subcommand("%vitals") @CommandPermission("unionsog.member.vitals") - @Conditions("rank:name=VITALS") + @Conditions("union_member") @Description("{@@command.description.vitals}") - public void vitals(CommandSender sender, Clan clan) { + public void vitals(CommandSender sender, Union union) { - Vitals vitals = new Vitals(plugin, sender, clan); + Vitals vitals = new Vitals(plugin, sender, union); vitals.send(); } @Subcommand("%stats") @CommandPermission("unionsog.member.stats") - @Conditions("rank:name=STATS") + @Conditions("union_member") @Description("{@@command.description.stats}") - public void stats(Player player, Clan clan) { + public void stats(Player player, Union union) { - ClanStats stats = new ClanStats(plugin, player, clan); + UnionStats stats = new UnionStats(plugin, player, union); stats.send(); } @@ -45,9 +45,9 @@ public class DataCommands extends BaseCommand { @Subcommand("%profile") @CommandPermission("unionsog.member.profile") @Description("{@@command.description.profile}") - public void profile(CommandSender sender, Clan clan) { + public void profile(CommandSender sender, Union union) { - ClanProfile p = new ClanProfile(plugin, sender, clan); + UnionProfile p = new UnionProfile(plugin, sender, union); p.send(); } @@ -55,28 +55,28 @@ public class DataCommands extends BaseCommand { @Subcommand("%roster") @CommandPermission("unionsog.member.roster") @Description("{@@command.description.roster}") - public void roster(Player player, Clan clan) { + public void roster(Player player, Union union) { - ClanRoster r = new ClanRoster(plugin, player, clan); + UnionRoster r = new UnionRoster(plugin, player, union); r.send(); } @Subcommand("%coords") @CommandPermission("unionsog.member.coords") - @Conditions("rank:name=COORDS") + @Conditions("union_member") @HelpSearchTags("local location") @Description("{@@command.description.coords}") - public void coords(Player player, Clan clan) { + public void coords(Player player, Union union) { - if (VanishUtils.getNonVanished(player, clan).size() == 1) { + if (VanishUtils.getNonVanished(player, union).size() == 1) { ChatBlock.sendMessage(player, RED + lang("you.are.the.only.member.online", player)); return; } - ClanCoords c = new ClanCoords(plugin, player, clan); + UnionCoords c = new UnionCoords(plugin, player, union); c.send(); } diff --git a/src/main/java/net/trueog/unionsog/commands/clan/HomeCommands.java b/src/main/java/net/trueog/unionsog/commands/union/HomeCommands.java similarity index 62% rename from src/main/java/net/trueog/unionsog/commands/clan/HomeCommands.java rename to src/main/java/net/trueog/unionsog/commands/union/HomeCommands.java index c005b28a..c1cf819f 100644 --- a/src/main/java/net/trueog/unionsog/commands/clan/HomeCommands.java +++ b/src/main/java/net/trueog/unionsog/commands/union/HomeCommands.java @@ -1,4 +1,4 @@ -package net.trueog.unionsog.commands.clan; +package net.trueog.unionsog.commands.union; import co.aikar.commands.BaseCommand; import co.aikar.commands.annotation.*; @@ -6,8 +6,9 @@ import net.trueog.unionsog.*; import net.trueog.unionsog.events.HomeRegroupEvent; import net.trueog.unionsog.events.PlayerHomeClearEvent; import net.trueog.unionsog.events.PlayerHomeSetEvent; -import net.trueog.unionsog.managers.ClanManager; +import net.trueog.unionsog.managers.UnionManager; import net.trueog.unionsog.managers.PermissionsManager; +import net.trueog.unionsog.managers.ProposalManager; import net.trueog.unionsog.managers.ProtectionManager; import net.trueog.unionsog.managers.SettingsManager; import net.trueog.unionsog.utils.VanishUtils; @@ -19,7 +20,7 @@ import static net.trueog.unionsog.UnionsOG.lang; import static net.trueog.unionsog.managers.SettingsManager.ConfigField.*; import static org.bukkit.ChatColor.*; -@CommandAlias("%clan") +@CommandAlias("%union") @Conditions("%basic_conditions") public class HomeCommands extends BaseCommand { @@ -32,13 +33,15 @@ public class HomeCommands extends BaseCommand { @Dependency private ProtectionManager protection; @Dependency - private ClanManager cm; + private ProposalManager proposalManager; + @Dependency + private UnionManager cm; @Subcommand("%regroup %me") - @CommandPermission("unionsog.leader.regroup.me") - @Conditions("rank:name=REGROUP_ME") + @CommandPermission("unionsog.member.regroup.me") + @Conditions("union_member") @Description("{@@command.description.regroup.me}") - public void regroupMe(Player player, ClanPlayer cp, Clan clan) { + public void regroupMe(Player player, UnionPlayer cp, Union union) { if (!settings.is(ALLOW_REGROUP)) { @@ -47,13 +50,13 @@ public class HomeCommands extends BaseCommand { } - processRegroup(player, cp, clan, player.getLocation()); + processRegroup(player, cp, union, player.getLocation()); } - private void processRegroup(Player player, ClanPlayer cp, Clan clan, Location location) { + private void processRegroup(Player player, UnionPlayer cp, Union union, Location location) { - HomeRegroupEvent homeRegroupEvent = new HomeRegroupEvent(clan, cp, VanishUtils.getNonVanished(player, clan), + HomeRegroupEvent homeRegroupEvent = new HomeRegroupEvent(union, cp, VanishUtils.getNonVanished(player, union), location); plugin.getServer().getPluginManager().callEvent(homeRegroupEvent); @@ -63,15 +66,15 @@ public class HomeCommands extends BaseCommand { } - plugin.getTeleportManager().teleport(player, clan, location); + plugin.getTeleportManager().teleport(player, union, location); } @Subcommand("%regroup %home") - @CommandPermission("unionsog.leader.regroup.home") - @Conditions("rank:name=REGROUP_HOME") + @CommandPermission("unionsog.member.regroup.home") + @Conditions("union_member") @Description("{@@command.description.regroup.home}") - public void regroupHome(Player player, ClanPlayer cp, @Conditions("can_teleport") Clan clan) { + public void regroupHome(Player player, UnionPlayer cp, @Conditions("can_teleport") Union union) { if (!settings.is(ALLOW_REGROUP)) { @@ -80,34 +83,34 @@ public class HomeCommands extends BaseCommand { } - Location location = clan.getHomeLocation(); - processRegroup(player, cp, clan, location); + Location location = union.getHomeLocation(); + processRegroup(player, cp, union, location); } @Subcommand("%home") @CommandPermission("unionsog.member.home") - @Conditions("rank:name=HOME_TP") + @Conditions("union_member") @Description("{@@command.description.home.tp}") - public void teleport(Player player, @Conditions("can_teleport") Clan clan, ClanPlayer cp) { + public void teleport(Player player, @Conditions("can_teleport") Union union, UnionPlayer cp) { - Location homeLocation = clan.getHomeLocation(); + Location homeLocation = union.getHomeLocation(); if (cm.purchaseHomeTeleport(player)) { - plugin.getTeleportManager().addPlayer(player, homeLocation, clan.getName()); + plugin.getTeleportManager().addPlayer(player, homeLocation, union.getName()); } } @Subcommand("%home %clear") - @CommandPermission("unionsog.leader.home-set") - @Conditions("rank:name=HOME_SET") + @CommandPermission("unionsog.member.home-set") + @Conditions("union_member") @Description("{@@command.description.home.clear}") - public void clear(Player player, ClanPlayer cp, Clan clan) { + public void clear(Player player, UnionPlayer cp, Union union) { - if (settings.is(CLAN_HOMEBASE_CAN_BE_SET_ONLY_ONCE) && clan.getHomeLocation() != null + if (settings.is(UNION_HOMEBASE_CAN_BE_SET_ONLY_ONCE) && union.getHomeLocation() != null && !permissions.has(player, "unionsog.mod.home")) { @@ -116,7 +119,7 @@ public class HomeCommands extends BaseCommand { } - PlayerHomeClearEvent event = new PlayerHomeClearEvent(clan, cp); + PlayerHomeClearEvent event = new PlayerHomeClearEvent(union, cp); Bukkit.getPluginManager().callEvent(event); if (event.isCancelled()) { @@ -124,18 +127,18 @@ public class HomeCommands extends BaseCommand { } - clan.setHomeLocation(null); + union.setHomeLocation(null); ChatBlock.sendMessage(player, AQUA + lang("hombase.cleared", player)); } @Subcommand("%home %set") - @Conditions("rank:name=HOME_SET") - @CommandPermission("unionsog.leader.home-set") + @Conditions("union_member") + @CommandPermission("unionsog.member.home-set") @Description("{@@command.description.home.set}") - public void set(Player player, ClanPlayer cp, Clan clan) { + public void set(Player player, UnionPlayer cp, Union union) { - if (settings.is(CLAN_HOMEBASE_CAN_BE_SET_ONLY_ONCE) && clan.getHomeLocation() != null + if (settings.is(UNION_HOMEBASE_CAN_BE_SET_ONLY_ONCE) && union.getHomeLocation() != null && !permissions.has(player, "unionsog.mod.home")) { @@ -155,18 +158,18 @@ public class HomeCommands extends BaseCommand { } - PlayerHomeSetEvent homeSetEvent = new PlayerHomeSetEvent(clan, cp, player.getLocation()); + PlayerHomeSetEvent homeSetEvent = new PlayerHomeSetEvent(union, cp, player.getLocation()); plugin.getServer().getPluginManager().callEvent(homeSetEvent); - if (homeSetEvent.isCancelled() || !cm.purchaseHomeTeleportSet(player)) { + if (homeSetEvent.isCancelled()) { return; } - clan.setHomeLocation(player.getLocation()); - ChatBlock.sendMessage(player, - AQUA + lang("hombase.set", player, YELLOW + Helper.toLocationString(player.getLocation()))); + // The home is only paid for and moved once the union votes it through. + proposalManager.propose(cp, union, ProposalType.SET_HOME, + ProposalManager.toLocationTarget(player.getLocation())); } diff --git a/src/main/java/net/trueog/unionsog/commands/clan/LandCommand.java b/src/main/java/net/trueog/unionsog/commands/union/LandCommand.java similarity index 79% rename from src/main/java/net/trueog/unionsog/commands/clan/LandCommand.java rename to src/main/java/net/trueog/unionsog/commands/union/LandCommand.java index 83da359d..5aa667e4 100644 --- a/src/main/java/net/trueog/unionsog/commands/clan/LandCommand.java +++ b/src/main/java/net/trueog/unionsog/commands/union/LandCommand.java @@ -1,9 +1,9 @@ -package net.trueog.unionsog.commands.clan; +package net.trueog.unionsog.commands.union; import co.aikar.commands.BaseCommand; import co.aikar.commands.annotation.*; import net.trueog.unionsog.ChatBlock; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.hooks.protection.Land; import net.trueog.unionsog.managers.ProtectionManager; import net.trueog.unionsog.managers.SettingsManager; @@ -16,9 +16,9 @@ import java.util.stream.Collectors; import static net.trueog.unionsog.managers.SettingsManager.ConfigField.LAND_EDIT_ALL_LANDS; -@CommandAlias("%clan") +@CommandAlias("%union") @Subcommand("%land") -@Conditions("%basic_conditions|clan_member|land_sharing|own_land") +@Conditions("%basic_conditions|union_member|land_sharing|own_land") @CommandPermission("unionsog.member.land") public class LandCommand extends BaseCommand { @@ -27,7 +27,7 @@ public class LandCommand extends BaseCommand { @Dependency private SettingsManager settings; - private Set getLands(ClanPlayer cp, Location location) { + private Set getLands(UnionPlayer cp, Location location) { Player player = Objects.requireNonNull(cp.toPlayer()); if (settings.is(LAND_EDIT_ALL_LANDS)) { @@ -46,13 +46,13 @@ public class LandCommand extends BaseCommand { @Subcommand("%allow") public class AllowCommand extends BaseCommand { - private void allow(ClanPlayer cp, ProtectionManager.Action action, Location location) { + private void allow(UnionPlayer cp, ProtectionManager.Action action, Location location) { allow(cp, action, location, true); } - private void allow(ClanPlayer cp, ProtectionManager.Action action, Location location, boolean notify) { + private void allow(UnionPlayer cp, ProtectionManager.Action action, Location location, boolean notify) { for (Land land : getLands(cp, location)) { @@ -71,7 +71,7 @@ public class LandCommand extends BaseCommand { @Subcommand("%container") @Description("{@@command.description.land.allow.container}") @CommandPermission("unionsog.member.land.allow.container") - public void container(Player player, ClanPlayer cp) { + public void container(Player player, UnionPlayer cp) { allow(cp, ProtectionManager.Action.CONTAINER, player.getLocation()); @@ -80,7 +80,7 @@ public class LandCommand extends BaseCommand { @Subcommand("%place") @Description("{@@command.description.land.allow.place}") @CommandPermission("unionsog.member.land.allow.place") - public void place(Player player, ClanPlayer cp) { + public void place(Player player, UnionPlayer cp) { allow(cp, ProtectionManager.Action.PLACE, player.getLocation()); @@ -89,7 +89,7 @@ public class LandCommand extends BaseCommand { @Subcommand("%damage") @Description("{@@command.description.land.allow.damage}") @CommandPermission("unionsog.member.land.allow.damage") - public void damage(Player player, ClanPlayer cp) { + public void damage(Player player, UnionPlayer cp) { allow(cp, ProtectionManager.Action.DAMAGE, player.getLocation()); @@ -98,7 +98,7 @@ public class LandCommand extends BaseCommand { @Subcommand("%interact_entity") @Description("{@@command.description.land.allow.interact_entity}") @CommandPermission("unionsog.member.land.allow.interact_entity") - public void interactEntity(Player player, ClanPlayer cp) { + public void interactEntity(Player player, UnionPlayer cp) { allow(cp, ProtectionManager.Action.INTERACT_ENTITY, player.getLocation()); @@ -107,7 +107,7 @@ public class LandCommand extends BaseCommand { @Subcommand("%interact") @Description("{@@command.description.land.allow.interact}") @CommandPermission("unionsog.member.land.allow.interact") - public void interact(Player player, ClanPlayer cp) { + public void interact(Player player, UnionPlayer cp) { allow(cp, ProtectionManager.Action.INTERACT, player.getLocation()); @@ -116,7 +116,7 @@ public class LandCommand extends BaseCommand { @Subcommand("%break") @Description("{@@command.description.land.allow.break}") @CommandPermission("unionsog.member.land.allow.break") - public void allowBreak(Player player, ClanPlayer cp) { + public void allowBreak(Player player, UnionPlayer cp) { allow(cp, ProtectionManager.Action.BREAK, player.getLocation()); @@ -125,7 +125,7 @@ public class LandCommand extends BaseCommand { @Subcommand("%all") @Description("{@@command.description.land.allow.all}") @CommandPermission("unionsog.member.land.allow.all") - public void all(Player player, ClanPlayer cp) { + public void all(Player player, UnionPlayer cp) { for (ProtectionManager.Action action : ProtectionManager.Action.values()) { @@ -142,13 +142,13 @@ public class LandCommand extends BaseCommand { @Subcommand("%block") public class BlockCommand extends BaseCommand { - private void block(ClanPlayer cp, ProtectionManager.Action action, Location location) { + private void block(UnionPlayer cp, ProtectionManager.Action action, Location location) { block(cp, action, location, true); } - private void block(ClanPlayer cp, ProtectionManager.Action action, Location location, boolean notify) { + private void block(UnionPlayer cp, ProtectionManager.Action action, Location location, boolean notify) { for (Land land : getLands(cp, location)) { @@ -167,7 +167,7 @@ public class LandCommand extends BaseCommand { @Subcommand("%container") @Description("{@@command.description.land.block.container}") @CommandPermission("unionsog.member.land.block.container") - public void container(Player player, ClanPlayer cp) { + public void container(Player player, UnionPlayer cp) { block(cp, ProtectionManager.Action.CONTAINER, player.getLocation()); @@ -176,7 +176,7 @@ public class LandCommand extends BaseCommand { @Subcommand("%place") @Description("{@@command.description.land.block.place}") @CommandPermission("unionsog.member.land.block.place") - public void place(Player player, ClanPlayer cp) { + public void place(Player player, UnionPlayer cp) { block(cp, ProtectionManager.Action.PLACE, player.getLocation()); @@ -185,7 +185,7 @@ public class LandCommand extends BaseCommand { @Subcommand("%damage") @Description("{@@command.description.land.block.damage}") @CommandPermission("unionsog.member.land.block.damage") - public void damage(Player player, ClanPlayer cp) { + public void damage(Player player, UnionPlayer cp) { block(cp, ProtectionManager.Action.DAMAGE, player.getLocation()); @@ -194,7 +194,7 @@ public class LandCommand extends BaseCommand { @Subcommand("%interact_entity") @Description("{@@command.description.land.block.interact_entity}") @CommandPermission("unionsog.member.land.block.interact_entity") - public void interactEntity(Player player, ClanPlayer cp) { + public void interactEntity(Player player, UnionPlayer cp) { block(cp, ProtectionManager.Action.INTERACT_ENTITY, player.getLocation()); @@ -203,7 +203,7 @@ public class LandCommand extends BaseCommand { @Subcommand("%interact") @Description("{@@command.description.land.block.interact}") @CommandPermission("unionsog.member.land.block.interact") - public void interact(Player player, ClanPlayer cp) { + public void interact(Player player, UnionPlayer cp) { block(cp, ProtectionManager.Action.INTERACT, player.getLocation()); @@ -212,7 +212,7 @@ public class LandCommand extends BaseCommand { @Subcommand("%break") @Description("{@@command.description.land.block.break}") @CommandPermission("unionsog.member.land.block.break") - public void blockBreak(Player player, ClanPlayer cp) { + public void blockBreak(Player player, UnionPlayer cp) { block(cp, ProtectionManager.Action.BREAK, player.getLocation()); @@ -221,7 +221,7 @@ public class LandCommand extends BaseCommand { @Subcommand("%all") @Description("{@@command.description.land.block.all}") @CommandPermission("unionsog.member.land.block.all") - public void all(Player player, ClanPlayer cp) { + public void all(Player player, UnionPlayer cp) { protection.getLandsAt(player.getLocation()); for (ProtectionManager.Action action : ProtectionManager.Action.values()) { diff --git a/src/main/java/net/trueog/unionsog/commands/clan/ToggleCommand.java b/src/main/java/net/trueog/unionsog/commands/union/ToggleCommand.java similarity index 71% rename from src/main/java/net/trueog/unionsog/commands/clan/ToggleCommand.java rename to src/main/java/net/trueog/unionsog/commands/union/ToggleCommand.java index 57ab2113..5bd79b9c 100644 --- a/src/main/java/net/trueog/unionsog/commands/clan/ToggleCommand.java +++ b/src/main/java/net/trueog/unionsog/commands/union/ToggleCommand.java @@ -1,9 +1,9 @@ -package net.trueog.unionsog.commands.clan; +package net.trueog.unionsog.commands.union; import co.aikar.commands.BaseCommand; import co.aikar.commands.annotation.*; import net.trueog.unionsog.ChatBlock; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.managers.StorageManager; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -13,7 +13,7 @@ import java.util.function.Consumer; import static net.trueog.unionsog.UnionsOG.lang; import static org.bukkit.ChatColor.AQUA; -@CommandAlias("%clan") +@CommandAlias("%union") @Subcommand("%toggle") @Conditions("%basic_conditions") public class ToggleCommand extends BaseCommand { @@ -24,7 +24,7 @@ public class ToggleCommand extends BaseCommand { @Subcommand("%bb") @CommandPermission("unionsog.member.bb-toggle") @Description("{@@command.description.toggle.bb}") - public void bb(Player player, ClanPlayer cp) { + public void bb(Player player, UnionPlayer cp) { toggle(player, "bbon", "bboff", cp.isBbEnabled(), cp::setBbEnabled); @@ -33,7 +33,7 @@ public class ToggleCommand extends BaseCommand { @Subcommand("%tag") @CommandPermission("unionsog.member.tag-toggle") @Description("{@@command.description.toggle.tag}") - public void tag(Player player, ClanPlayer cp) { + public void tag(Player player, UnionPlayer cp) { toggle(player, "tagon", "tagoff", cp.isTagEnabled(), cp::setTagEnabled); @@ -42,31 +42,31 @@ public class ToggleCommand extends BaseCommand { // TODO: start - restore these two subcommands with UnionBankZeroMigration once // union bank accounts exist. They only gate the union bank commands, which are // unregistered until then. Restoring them also needs the StorageManager - // dependency below and an import of net.trueog.unionsog.Clan. + // dependency below and an import of net.trueog.unionsog.Union. // // @Subcommand("%deposit") - // @CommandPermission("unionsog.leader.deposit-toggle") + // @CommandPermission("unionsog.member.deposit-toggle") // @Conditions("leader") // @Description("{@@command.description.toggle.deposit}") - // public void deposit(Player player, Clan clan) { + // public void deposit(Player player, Union union) { // - // toggle(player, "depositon", "depositoff", clan.isAllowDeposit(), - // clan::setAllowDeposit); + // toggle(player, "depositon", "depositoff", union.isAllowDeposit(), + // union::setAllowDeposit); // - // storage.updateClan(clan); + // storage.updateUnion(union); // // } // // @Subcommand("%withdraw") - // @CommandPermission("unionsog.leader.withdraw-toggle") + // @CommandPermission("unionsog.member.withdraw-toggle") // @Conditions("leader") // @Description("{@@command.description.toggle.withdraw}") - // public void withdraw(Player player, Clan clan) { + // public void withdraw(Player player, Union union) { // - // toggle(player, "withdrawon", "withdrawoff", clan.isAllowWithdraw(), - // clan::setAllowWithdraw); + // toggle(player, "withdrawon", "withdrawoff", union.isAllowWithdraw(), + // union::setAllowWithdraw); // - // storage.updateClan(clan); + // storage.updateUnion(union); // // } // TODO: end @@ -74,7 +74,7 @@ public class ToggleCommand extends BaseCommand { @Subcommand("%invite") @CommandPermission("unionsog.anyone.invite-toggle") @Description("{@@command.description.toggle.invite}") - public void invite(Player player, ClanPlayer cp) { + public void invite(Player player, UnionPlayer cp) { toggle(player, "inviteon", "inviteoff", cp.isInviteEnabled(), cp::setInviteEnabled); diff --git a/src/main/java/net/trueog/unionsog/commands/union/UnionCommands.java b/src/main/java/net/trueog/unionsog/commands/union/UnionCommands.java new file mode 100644 index 00000000..1ff3d710 --- /dev/null +++ b/src/main/java/net/trueog/unionsog/commands/union/UnionCommands.java @@ -0,0 +1,638 @@ +package net.trueog.unionsog.commands.union; + +import co.aikar.commands.BaseCommand; +import co.aikar.commands.annotation.*; +import net.trueog.unionsog.*; +import net.trueog.unionsog.commands.UnionInput; +import net.trueog.unionsog.commands.UnionPlayerInput; +import net.trueog.unionsog.conversation.DisbandPrompt; +import net.trueog.unionsog.conversation.ResignPrompt; +import net.trueog.unionsog.conversation.SCConversation; +import net.trueog.unionsog.hooks.discord.DiscordHook; +import net.trueog.unionsog.hooks.discord.exceptions.DiscordHookException; +import net.trueog.unionsog.events.TagChangeEvent; +import net.trueog.unionsog.managers.*; +import net.trueog.unionsog.utils.ChatUtils; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; + +import java.util.LinkedHashMap; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; + +import static net.trueog.unionsog.UnionsOG.lang; +import static net.trueog.unionsog.managers.SettingsManager.ConfigField.*; +import static org.bukkit.ChatColor.AQUA; +import static org.bukkit.ChatColor.RED; + +@CommandAlias("%union") +@Conditions("%basic_conditions") +public class UnionCommands extends BaseCommand { + + private static final Map UNION_COLORS = new LinkedHashMap<>(); + + static { + + UNION_COLORS.put("black", "&0"); + UNION_COLORS.put("dark_blue", "&1"); + UNION_COLORS.put("dark_green", "&2"); + UNION_COLORS.put("dark_aqua", "&3"); + UNION_COLORS.put("dark_red", "&4"); + UNION_COLORS.put("dark_purple", "&5"); + UNION_COLORS.put("gold", "&6"); + UNION_COLORS.put("gray", "&7"); + UNION_COLORS.put("dark_gray", "&8"); + UNION_COLORS.put("blue", "&9"); + UNION_COLORS.put("green", "&a"); + UNION_COLORS.put("aqua", "&b"); + UNION_COLORS.put("red", "&c"); + UNION_COLORS.put("light_purple", "&d"); + UNION_COLORS.put("yellow", "&e"); + UNION_COLORS.put("white", "&f"); + + } + + @Dependency + private UnionsOG plugin; + @Dependency + private SettingsManager settings; + @Dependency + private UnionManager cm; + @Dependency + private StorageManager storage; + @Dependency + private PermissionsManager permissions; + @Dependency + private RequestManager requestManager; + @Dependency + private ProposalManager proposalManager; + @Dependency + private ChatManager chatManager; + + @Subcommand("%disband") + @CommandPermission("unionsog.member.disband") + @Conditions("union_member") + @Description("{@@command.description.disband}") + public void disband(Player player) { + + new SCConversation(plugin, player, new DisbandPrompt()).begin(); + + } + + @Subcommand("%vote") + @CommandPermission("unionsog.member.vote") + @Conditions("union_member") + @Description("{@@command.description.vote}") + public void voteStatus(Player player, Union union) { + + Proposal proposal = proposalManager.getProposal(union); + if (proposal == null) { + + ChatBlock.sendMessage(player, RED + lang("proposal.none.open", player)); + return; + + } + + ChatBlock.sendMessage(player, AQUA + proposalManager.describe(proposal, union)); + ChatBlock.sendMessage(player, AQUA + lang("proposal.how.to.vote", player)); + + } + + @Subcommand("%vote %yes") + @CommandPermission("unionsog.member.vote") + @Conditions("union_member") + @Description("{@@command.description.vote.yes}") + public void voteYes(UnionPlayer cp, Union union) { + + proposalManager.vote(cp, union, true); + + } + + @Subcommand("%vote %no") + @CommandPermission("unionsog.member.vote") + @Conditions("union_member") + @Description("{@@command.description.vote.no}") + public void voteNo(UnionPlayer cp, Union union) { + + proposalManager.vote(cp, union, false); + + } + + @Subcommand("%discord %create") + @CommandPermission("unionsog.member.discord.create") + @Conditions("union_member") + @Description("{@@command.description.discord.create}") + public void discord(Player player, Union union) { + + DiscordHook discordHook = chatManager.getDiscordHook(); + if (discordHook == null) { + + ChatBlock.sendMessageKey(player, "discordhook.is.disabled"); + return; + + } + + try { + + discordHook.createChannel(union.getTag()); + ChatBlock.sendMessageKey(player, "discord.created.successfully"); + + } catch (DiscordHookException ex) { + + String messageKey = ex.getMessageKey(); + if (messageKey != null) { + + ChatBlock.sendMessage(player, RED + lang(messageKey)); + + } + + } + + } + + @Subcommand("%war %start") + @CommandPermission("unionsog.member.war") + @Conditions("union_member") + @Description("{@@command.description.war.start}") + @CommandCompletion("@rivals") + public void startWar(UnionPlayer requester, Union requestUnion, + @Conditions("can_war_target") @Name("union") UnionInput targetUnionInput) + { + + proposalManager.propose(requester, requestUnion, ProposalType.START_WAR, targetUnionInput.getUnion().getTag()); + + } + + @Subcommand("%war %end") + @CommandPermission("unionsog.member.war") + @Conditions("union_member") + @Description("{@@command.description.war.end}") + @CommandCompletion("@warring_unions") + public void endWar(UnionPlayer cp, Union issuerUnion, @Name("union") UnionInput other) { + + Union war = other.getUnion(); + if (issuerUnion.isWarring(war.getTag())) { + + requestManager.addWarEndRequest(cp, war, issuerUnion); + ChatBlock.sendMessage(cp, AQUA + lang("leaders.asked.to.end.rivalry", cp, war.getName())); + + } else { + + ChatBlock.sendMessage(cp, RED + lang("unions.not.at.war", cp)); + + } + + } + + @Subcommand("%color") + @CommandPermission("unionsog.member.color") + @Conditions("union_member") + @CommandCompletion("@union_colors") + @Description("{@@command.description.color}") + public void color(Player player, Union union, @Name("color") String color) { + + Optional tagColor = resolveTagColor(color); + if (tagColor.isEmpty()) { + + ChatBlock.sendMessage(player, RED + lang("invalid.color", player)); + return; + + } + + String currentTag = ChatUtils.stripColors(union.getColorTag()); + String tag = tagColor.get() + currentTag; + TagChangeEvent event = new TagChangeEvent(player, union, tag); + plugin.getServer().getPluginManager().callEvent(event); + if (event.isCancelled()) { + + return; + + } + + tag = event.getNewTag(); + String cleanTag = ChatUtils.stripColors(tag); + + Optional validationError = plugin.getTagValidator().validate(player, tag, true); + if (validationError.isPresent()) { + + ChatBlock.sendMessage(player, validationError.get()); + return; + + } + + if (!cleanTag.equals(currentTag)) { + + ChatBlock.sendMessage(player, RED + lang("you.can.only.modify.the.color.of.the.tag", player)); + return; + + } + + union.addBb(player.getName(), lang("tag.changed.to.0", ChatUtils.parseColors(tag))); + union.changeUnionTag(tag); + cm.updateDisplayName(player); + ChatBlock.sendMessage(player, AQUA + lang("union.color.changed.to.0", player, ChatUtils.parseColors(tag))); + + } + + @Subcommand("%setbanner") + @CommandPermission("unionsog.member.setbanner") + @Conditions("union_member") + @Description("{@@command.description.setbanner}") + public void setbanner(Player player, Union union) { + + @SuppressWarnings("deprecation") + ItemStack hand = player.getItemInHand(); + if (!hand.getType().toString().contains("BANNER")) { + + ChatBlock.sendMessageKey(player, "you.must.hold.a.banner"); + return; + + } + + union.setBanner(hand); + storage.updateUnion(union); + ChatBlock.sendMessageKey(player, "you.changed.union.banner"); + + } + + private Optional resolveTagColor(String input) { + + String normalized = input.toLowerCase(Locale.ROOT); + if (UNION_COLORS.containsKey(normalized)) { + + return Optional.of(UNION_COLORS.get(normalized)); + + } + + if (normalized.matches("#[0-9a-f]{6}")) { + + return Optional.of("&" + normalized); + + } + + if (normalized.matches("&#[0-9a-f]{6}")) { + + return Optional.of(normalized); + + } + + if (normalized.matches("&[0-9a-f]")) { + + return Optional.of(normalized); + + } + + if (normalized.matches("[0-9a-f]")) { + + return Optional.of("&" + normalized); + + } + + return Optional.empty(); + + } + + @Subcommand("%invite") + @CommandPermission("unionsog.member.invite") + @CommandCompletion("@non_members:ignore_vanished") + @Conditions("union_member") + @Description("{@@command.description.invite}") + public void invite(Player sender, UnionPlayer cp, Union union, + @Conditions("not_banned|not_in_union|online:ignore_vanished") @Name("player") UnionPlayerInput invited) + { + + if (!invited.getUnionPlayer().isInviteEnabled()) { + + ChatBlock.sendMessage(sender, RED + lang("invitedplayer.invite.off", sender)); + return; + + } + + Player invitedPlayer = invited.getUnionPlayer().toPlayer(); + if (invitedPlayer == null) + return; + if (!permissions.has(invitedPlayer, "unionsog.member.can-join")) { + + ChatBlock.sendMessage(sender, + RED + lang("the.player.doesn.t.not.have.the.permissions.to.join.unions", sender)); + return; + + } + + if (invitedPlayer.getUniqueId().equals(sender.getUniqueId())) { + + ChatBlock.sendMessage(sender, RED + lang("you.cannot.invite.yourself", sender)); + return; + + } + + long minutesBeforeRejoin = cm.getMinutesBeforeRejoin(invited.getUnionPlayer(), union); + if (minutesBeforeRejoin != 0) { + + ChatBlock.sendMessage(sender, + RED + lang("the.player.must.wait.0.before.joining.your.union.again", sender, minutesBeforeRejoin)); + return; + + } + + if (union.getSize() >= settings.getInt(UNION_MAX_MEMBERS) && settings.getInt(UNION_MAX_MEMBERS) > 0) { + + ChatBlock.sendMessage(sender, RED + lang("the.union.members.reached.limit", sender)); + return; + + } + + if (!cm.purchaseInvite(sender)) { + + return; + + } + + requestManager.addInviteRequest(cp, invitedPlayer.getName(), union); + ChatBlock.sendMessage(sender, + AQUA + lang("has.been.asked.to.join", sender, invitedPlayer.getName(), union.getName())); + + } + + @Subcommand("%unionff %allow") + @CommandPermission("unionsog.member.union-ff") + @Conditions("union_member") + @Description("{@@command.description.unionff.allow}") + public void allowUnionFf(Player player, Union union) { + + union.addBb(player.getName(), lang("union.wide.friendly.fire.is.allowed")); + union.setFriendlyFire(true); + storage.updateUnion(union); + + } + + @Subcommand("%unionff %block") + @CommandPermission("unionsog.member.union-ff") + @Conditions("union_member") + @Description("{@@command.description.unionff.block}") + public void blockUnionFf(Player player, Union union) { + + union.addBb(player.getName(), lang("union.wide.friendly.fire.blocked")); + union.setFriendlyFire(false); + storage.updateUnion(union); + + } + + @Subcommand("%description") + @CommandPermission("unionsog.member.description") + @Conditions("union_member") + @Description("{@@command.description.description}") + public void setDescription(Player player, Union union, @Name("description") String description) { + + if (description.length() < settings.getInt(UNION_MIN_DESCRIPTION_LENGTH)) { + + ChatBlock.sendMessage(player, RED + lang("your.union.description.must.be.longer.than", player, + settings.getInt(UNION_MIN_DESCRIPTION_LENGTH))); + return; + + } + + if (description.length() > settings.getInt(UNION_MAX_DESCRIPTION_LENGTH)) { + + ChatBlock.sendMessage(player, RED + lang("your.union.description.cannot.be.longer.than", player, + settings.getInt(UNION_MAX_DESCRIPTION_LENGTH))); + return; + + } + + union.setDescription(description); + ChatBlock.sendMessage(player, AQUA + lang("description.changed", player)); + storage.updateUnion(union); + + } + + @Subcommand("%rename") + @CommandPermission("unionsog.member.rename") + @Conditions("union_member") + @CommandCompletion("@nothing") + @Description("{@@command.description.rename}") + public void rename(Player player, Union union, @Name("name") String unionName) { + + if (unionName.contains("&")) { + + ChatBlock.sendMessageKey(player, "your.union.name.cannot.contain.color.codes"); + return; + + } + + if (ChatUtils.stripColors(unionName).trim().equalsIgnoreCase("None")) { + + ChatBlock.sendMessage(player, RED + "Your union cannot be named \"None\"."); + return; + + } + + boolean bypass = permissions.has(player, "unionsog.mod.bypass"); + if (!bypass) { + + if (ChatUtils.stripColors(unionName).length() > settings.getInt(UNION_MAX_LENGTH)) { + + ChatBlock.sendMessage(player, RED + lang("your.union.name.cannot.be.longer.than.characters", player, + settings.getInt(UNION_MAX_LENGTH))); + return; + + } + + if (ChatUtils.stripColors(unionName).length() <= settings.getInt(UNION_MIN_LENGTH)) { + + ChatBlock.sendMessage(player, RED + lang("your.union.name.must.be.longer.than.characters", player, + settings.getInt(UNION_MIN_LENGTH))); + return; + + } + + } + + union.addBb(player.getName(), lang("union.renamed.to.0", unionName)); + union.setName(unionName); + storage.updateUnion(union); + + ChatBlock.sendMessageKey(player, "you.have.successfully.renamed.your.union", unionName); + + } + + @Subcommand("%rival %add") + @CommandPermission("unionsog.member.rival") + @Conditions("rivable|minimum_to_rival") + @CommandCompletion("@unions:hide_own") + @Description("{@@command.description.rival.add}") + public void addRival(Player player, Union issuerUnion, @Conditions("different") @Name("union") UnionInput rival) { + + Union rivalInput = rival.getUnion(); + if (settings.isUnrivable(rivalInput.getTag())) { + + ChatBlock.sendMessage(player, RED + lang("the.union.cannot.be.rivaled", player)); + return; + + } + + if (!issuerUnion.reachedRivalLimit()) { + + if (!issuerUnion.isRival(rivalInput.getTag())) { + + issuerUnion.addRival(rivalInput); + rivalInput.addBb(player.getName(), + lang("has.initiated.a.rivalry", issuerUnion.getName(), rivalInput.getName()), false); + issuerUnion.addBb(player.getName(), + lang("has.initiated.a.rivalry", player.getName(), rivalInput.getName())); + + } else { + + ChatBlock.sendMessage(player, RED + lang("your.unions.are.already.rivals", player)); + + } + + } else { + + ChatBlock.sendMessage(player, RED + lang("rival.limit.reached", player)); + + } + + } + + @Subcommand("%rival %remove") + @CommandPermission("unionsog.member.rival") + @Conditions("union_member") + @CommandCompletion("@rivals") + @Description("{@@command.description.rival.remove}") + public void removeRival(Player player, UnionPlayer cp, Union issuerUnion, + @Conditions("different") @Name("union") UnionInput rival) + { + + Union rivalInput = rival.getUnion(); + if (issuerUnion.isRival(rivalInput.getTag())) { + + requestManager.addRivalryBreakRequest(cp, rivalInput, issuerUnion); + ChatBlock.sendMessage(player, AQUA + lang("leaders.asked.to.end.rivalry", player, rivalInput.getName())); + + } else { + + ChatBlock.sendMessage(player, RED + lang("your.unions.are.not.rivals", player)); + + } + + } + + @Subcommand("%ally %add") + @CommandPermission("unionsog.member.ally-set") + @Conditions("minimum_to_ally") + @CommandCompletion("@unions:hide_own") + @Description("{@@command.description.ally.add}") + public void addAlly(Player player, UnionPlayer cp, Union issuerUnion, + @Conditions("different") @Name("union") UnionInput other) + { + + Union input = other.getUnion(); + if (issuerUnion.isAlly(input.getTag())) { + + ChatBlock.sendMessage(player, RED + lang("your.unions.are.already.allies", player)); + return; + + } + + int maxAlliances = settings.getInt(UNION_MAX_ALLIANCES); + if (maxAlliances != -1) { + + if (issuerUnion.getAllies().size() >= maxAlliances) { + + ChatBlock.sendMessage(player, lang("your.union.reached.max.alliances", player)); + return; + + } + + if (input.getAllies().size() >= maxAlliances) { + + ChatBlock.sendMessage(player, lang("other.union.reached.max.alliances", player)); + return; + + } + + } + + requestManager.addAllyRequest(cp, input, issuerUnion); + ChatBlock.sendMessage(player, AQUA + lang("leaders.have.been.asked.for.an.alliance", player, input.getName())); + + } + + @Subcommand("%ally %remove") + @Conditions("union_member") + @CommandPermission("unionsog.member.ally-set") + @Description("{@@command.description.ally.remove}") + @CommandCompletion("@allied_unions") + public void removeAlly(Player player, Union issuerUnion, + @Conditions("different|allied_union") @Name("union") UnionInput ally) + { + + Union allyInput = ally.getUnion(); + issuerUnion.removeAlly(allyInput); + allyInput.addBb(player.getName(), lang("has.broken.the.alliance", issuerUnion.getName(), allyInput.getName()), + false); + issuerUnion.addBb(player.getName(), lang("has.broken.the.alliance", player.getName(), allyInput.getName())); + + } + + @Subcommand("%kick") + @CommandPermission("unionsog.member.kick") + @CommandCompletion("@union_members:hide_own") + @Conditions("union_member") + @Description("{@@command.description.kick}") + public void kick(@Conditions("union_member") Player sender, + @Conditions("same_union") @Name("member") UnionPlayerInput other) + { + + UnionPlayer unionPlayer = other.getUnionPlayer(); + if (sender.getUniqueId().equals(unionPlayer.getUniqueId())) { + + ChatBlock.sendMessage(sender, RED + lang("you.cannot.kick.yourself", sender)); + return; + + } + + Union union = Objects.requireNonNull(cm.getUnionByPlayerUniqueId(sender.getUniqueId())); + + union.addBb(sender.getName(), lang("has.been.kicked.by", unionPlayer.getName(), sender.getName(), sender)); + union.removePlayerFromUnion(unionPlayer.getUniqueId()); + + } + + @Subcommand("%resign %confirm") + @CommandPermission("unionsog.member.resign") + @Description("{@@command.description.resign}") + @HelpSearchTags("leave") + public void resignConfirm(Player player, UnionPlayer cp, Union union) { + + if (union.isPermanent() || union.getSize() > 1) { + + union.addBb(player.getName(), lang("0.has.resigned", player.getName())); + cp.addResignTime(union.getTag()); + union.removePlayerFromUnion(player.getUniqueId()); + + ChatBlock.sendMessage(cp, AQUA + lang("resign.success", player)); + + } else { + + union.disband(player, true, false); + ChatBlock.sendMessage(cp, RED + lang("union.has.been.disbanded", player, union.getName())); + + } + + } + + @Subcommand("%resign") + @CommandPermission("unionsog.member.resign") + @Description("{@@command.description.resign}") + @HelpSearchTags("leave") + public void resign(@Conditions("union_member") Player player) { + + new SCConversation(plugin, player, new ResignPrompt()).begin(); + + } + +} diff --git a/src/main/java/net/trueog/unionsog/conversation/ConfirmationPrompt.java b/src/main/java/net/trueog/unionsog/conversation/ConfirmationPrompt.java index 32927df6..ebe51a29 100644 --- a/src/main/java/net/trueog/unionsog/conversation/ConfirmationPrompt.java +++ b/src/main/java/net/trueog/unionsog/conversation/ConfirmationPrompt.java @@ -1,9 +1,9 @@ package net.trueog.unionsog.conversation; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; -import net.trueog.unionsog.managers.ClanManager; +import net.trueog.unionsog.managers.UnionManager; import org.bukkit.conversations.ConversationContext; import org.bukkit.conversations.Prompt; import org.bukkit.conversations.StringPrompt; @@ -20,9 +20,9 @@ import static org.bukkit.ChatColor.RED; abstract public class ConfirmationPrompt extends StringPrompt { - protected abstract Prompt confirm(ClanPlayer sender, Clan clan); + protected abstract Prompt confirm(UnionPlayer sender, Union union); - protected Prompt decline(ClanPlayer sender) { + protected Prompt decline(UnionPlayer sender) { return new MessagePromptImpl(RED + lang(getDeclineTextKey(), sender)); @@ -50,16 +50,16 @@ abstract public class ConfirmationPrompt extends StringPrompt { Player player = (Player) cc.getForWhom(); String yes = lang("yes", player); - ClanManager cm = Objects.requireNonNull(plugin).getClanManager(); - ClanPlayer cp = cm.getCreateClanPlayer(player.getUniqueId()); - Clan clan = cp.getClan(); - if (clan == null) { + UnionManager cm = Objects.requireNonNull(plugin).getUnionManager(); + UnionPlayer cp = cm.getCreateUnionPlayer(player.getUniqueId()); + Union union = cp.getUnion(); + if (union == null) { return END_OF_CONVERSATION; } - return yes.equalsIgnoreCase(input) ? confirm(cp, clan) : decline(cp); + return yes.equalsIgnoreCase(input) ? confirm(cp, union) : decline(cp); } diff --git a/src/main/java/net/trueog/unionsog/conversation/CreateRankNamePrompt.java b/src/main/java/net/trueog/unionsog/conversation/CreateRankNamePrompt.java deleted file mode 100644 index d711ad75..00000000 --- a/src/main/java/net/trueog/unionsog/conversation/CreateRankNamePrompt.java +++ /dev/null @@ -1,64 +0,0 @@ -package net.trueog.unionsog.conversation; - -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.UnionsOG; -import net.trueog.unionsog.events.CreateRankEvent; -import net.trueog.unionsog.events.PreCreateRankEvent; -import org.bukkit.Bukkit; -import org.bukkit.conversations.ConversationContext; -import org.bukkit.conversations.Prompt; -import org.bukkit.conversations.StringPrompt; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import static net.trueog.unionsog.UnionsOG.lang; -import static org.bukkit.ChatColor.AQUA; -import static org.bukkit.ChatColor.RED; - -public class CreateRankNamePrompt extends StringPrompt { - - @Override - public @NotNull String getPromptText(@NotNull ConversationContext context) { - - Player forWhom = (Player) context.getForWhom(); - return lang("insert.rank.name", forWhom, lang("cancel", forWhom)); - - } - - @Override - public @Nullable Prompt acceptInput(@NotNull ConversationContext context, @Nullable String input) { - - UnionsOG plugin = (UnionsOG) context.getPlugin(); - Player player = (Player) context.getForWhom(); - Clan clan = (Clan) context.getSessionData("clan"); - if (clan == null || plugin == null) - return END_OF_CONVERSATION; - if (input == null) - return this; - - String rank = input.toLowerCase().replace(" ", "_"); - PreCreateRankEvent event = new PreCreateRankEvent(player, clan, rank); - Bukkit.getServer().getPluginManager().callEvent(event); - rank = event.getRankName(); - - if (event.isCancelled()) { - - return null; - - } - - if (clan.hasRank(rank)) { - - return new MessagePromptImpl(RED + lang("rank.already.exists", player), this); - - } - - clan.createRank(rank); - Bukkit.getServer().getPluginManager().callEvent(new CreateRankEvent(player, clan, clan.getRank(rank))); - plugin.getStorageManager().updateClan(clan, true); - return new MessagePromptImpl(AQUA + lang("rank.created", player)); - - } - -} diff --git a/src/main/java/net/trueog/unionsog/conversation/CreateClanNamePrompt.java b/src/main/java/net/trueog/unionsog/conversation/CreateUnionNamePrompt.java similarity index 53% rename from src/main/java/net/trueog/unionsog/conversation/CreateClanNamePrompt.java rename to src/main/java/net/trueog/unionsog/conversation/CreateUnionNamePrompt.java index cea02f12..36de3ed1 100644 --- a/src/main/java/net/trueog/unionsog/conversation/CreateClanNamePrompt.java +++ b/src/main/java/net/trueog/unionsog/conversation/CreateUnionNamePrompt.java @@ -1,8 +1,8 @@ package net.trueog.unionsog.conversation; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import net.trueog.unionsog.UnionsOG; -import net.trueog.unionsog.events.PreCreateClanEvent; +import net.trueog.unionsog.events.PreCreateUnionEvent; import net.trueog.unionsog.utils.ChatUtils; import org.bukkit.Bukkit; import org.bukkit.conversations.ConversationContext; @@ -13,12 +13,11 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import static net.trueog.unionsog.UnionsOG.lang; -import static net.trueog.unionsog.conversation.CreateClanTagPrompt.TAG_KEY; +import static net.trueog.unionsog.conversation.CreateUnionTagPrompt.TAG_KEY; import static net.trueog.unionsog.managers.SettingsManager.ConfigField.*; -import static net.trueog.unionsog.managers.SettingsManager.ConfigField.CLAN_DEFAULT_RANK; import static org.bukkit.ChatColor.RED; -public class CreateClanNamePrompt extends StringPrompt { +public class CreateUnionNamePrompt extends StringPrompt { public static final String NAME_KEY = "name"; @@ -31,7 +30,7 @@ public class CreateClanNamePrompt extends StringPrompt { } - return lang("insert.clan.name", (Player) context.getForWhom()); + return lang("insert.union.name", (Player) context.getForWhom()); } @@ -43,29 +42,29 @@ public class CreateClanNamePrompt extends StringPrompt { } @Override - public @Nullable Prompt acceptInput(@NotNull ConversationContext context, @Nullable String clanName) { + public @Nullable Prompt acceptInput(@NotNull ConversationContext context, @Nullable String unionName) { UnionsOG plugin = (UnionsOG) context.getPlugin(); Player player = (Player) context.getForWhom(); - clanName = clanName != null ? clanName : (String) context.getSessionData(NAME_KEY); + unionName = unionName != null ? unionName : (String) context.getSessionData(NAME_KEY); context.setSessionData(NAME_KEY, null); - if (plugin == null || clanName == null) + if (plugin == null || unionName == null) return this; - Prompt errorPrompt = validateName(plugin, player, clanName); + Prompt errorPrompt = validateName(plugin, player, unionName); if (errorPrompt != null) return errorPrompt; - String finalClanName = clanName; + String finalUnionName = unionName; Bukkit.getScheduler().runTask(plugin, () -> { String tag = (String) context.getSessionData(TAG_KEY); // noinspection ConstantConditions - PreCreateClanEvent event = new PreCreateClanEvent(player, tag, finalClanName); + PreCreateUnionEvent event = new PreCreateUnionEvent(player, tag, finalUnionName); Bukkit.getServer().getPluginManager().callEvent(event); if (!event.isCancelled()) { - processClanCreation(plugin, player, tag, finalClanName); + processUnionCreation(plugin, player, tag, finalUnionName); } @@ -75,22 +74,17 @@ public class CreateClanNamePrompt extends StringPrompt { } - private void processClanCreation(@NotNull UnionsOG plugin, @NotNull Player player, @NotNull String tag, + private void processUnionCreation(@NotNull UnionsOG plugin, @NotNull Player player, @NotNull String tag, @NotNull String name) { - if (plugin.getClanManager().purchaseCreation(player)) { + if (plugin.getUnionManager().purchaseCreation(player)) { - plugin.getClanManager().createClan(player, tag, name); + plugin.getUnionManager().createUnion(player, tag, name); - Clan clan = plugin.getClanManager().getClan(tag); - clan.addBb(player.getName(), lang("clan.created", name)); - plugin.getStorageManager().updateClan(clan); - if (!plugin.getSettingsManager().getString(CLAN_DEFAULT_RANK).isEmpty()) { - - clan.setDefaultRank(plugin.getSettingsManager().getString(CLAN_DEFAULT_RANK)); - - } + Union union = plugin.getUnionManager().getUnion(tag); + union.addBb(player.getName(), lang("union.created", name)); + plugin.getStorageManager().updateUnion(union); } @@ -102,17 +96,17 @@ public class CreateClanNamePrompt extends StringPrompt { boolean bypass = plugin.getPermissionsManager().has(player, "unionsog.mod.bypass"); if (!bypass) { - if (ChatUtils.stripColors(input).length() > plugin.getSettingsManager().getInt(CLAN_MAX_LENGTH)) { + if (ChatUtils.stripColors(input).length() > plugin.getSettingsManager().getInt(UNION_MAX_LENGTH)) { - return new MessagePromptImpl(RED + lang("your.clan.name.cannot.be.longer.than.characters", player, - plugin.getSettingsManager().getInt(CLAN_MAX_LENGTH)), this); + return new MessagePromptImpl(RED + lang("your.union.name.cannot.be.longer.than.characters", player, + plugin.getSettingsManager().getInt(UNION_MAX_LENGTH)), this); } - if (ChatUtils.stripColors(input).length() <= plugin.getSettingsManager().getInt(CLAN_MIN_LENGTH)) { + if (ChatUtils.stripColors(input).length() <= plugin.getSettingsManager().getInt(UNION_MIN_LENGTH)) { - return new MessagePromptImpl(RED + lang("your.clan.name.must.be.longer.than.characters", player, - plugin.getSettingsManager().getInt(CLAN_MIN_LENGTH)), this); + return new MessagePromptImpl(RED + lang("your.union.name.must.be.longer.than.characters", player, + plugin.getSettingsManager().getInt(UNION_MIN_LENGTH)), this); } @@ -120,7 +114,7 @@ public class CreateClanNamePrompt extends StringPrompt { if (input.contains("&")) { - return new MessagePromptImpl(RED + lang("your.clan.name.cannot.contain.color.codes", player), this); + return new MessagePromptImpl(RED + lang("your.union.name.cannot.contain.color.codes", player), this); } diff --git a/src/main/java/net/trueog/unionsog/conversation/CreateClanTagPrompt.java b/src/main/java/net/trueog/unionsog/conversation/CreateUnionTagPrompt.java similarity index 80% rename from src/main/java/net/trueog/unionsog/conversation/CreateClanTagPrompt.java rename to src/main/java/net/trueog/unionsog/conversation/CreateUnionTagPrompt.java index 0a333411..8a5a4299 100644 --- a/src/main/java/net/trueog/unionsog/conversation/CreateClanTagPrompt.java +++ b/src/main/java/net/trueog/unionsog/conversation/CreateUnionTagPrompt.java @@ -14,7 +14,7 @@ import java.util.Optional; import static net.trueog.unionsog.UnionsOG.lang; -public class CreateClanTagPrompt extends StringPrompt { +public class CreateUnionTagPrompt extends StringPrompt { public static final String TAG_KEY = "tag"; @@ -28,7 +28,7 @@ public class CreateClanTagPrompt extends StringPrompt { } - return lang("insert.clan.tag", forWhom, lang("cancel", forWhom)); + return lang("insert.union.tag", forWhom, lang("cancel", forWhom)); } @@ -53,27 +53,27 @@ public class CreateClanTagPrompt extends StringPrompt { if (errorPrompt != null) return errorPrompt; context.setSessionData(TAG_KEY, input); - return new CreateClanNamePrompt(); + return new CreateUnionNamePrompt(); } @Nullable - private Prompt validateTag(UnionsOG plugin, Player player, @NotNull String clanTag) { + private Prompt validateTag(UnionsOG plugin, Player player, @NotNull String unionTag) { - String cleanTag = ChatUtils.stripColors(clanTag); + String cleanTag = ChatUtils.stripColors(unionTag); if (cleanTag.trim().equalsIgnoreCase("None")) { return new MessagePromptImpl(ChatColor.RED + "Your union cannot be named \"None\".", this); } - if (plugin.getClanManager().isClan(cleanTag)) { + if (plugin.getUnionManager().isUnion(cleanTag)) { - return new MessagePromptImpl(ChatColor.RED + lang("clan.with.this.tag.already.exists", player), this); + return new MessagePromptImpl(ChatColor.RED + lang("union.with.this.tag.already.exists", player), this); } - Optional validationError = plugin.getTagValidator().validate(player, clanTag, false); + Optional validationError = plugin.getTagValidator().validate(player, unionTag, false); return validationError.map(error -> new MessagePromptImpl(error, this)).orElse(null); } diff --git a/src/main/java/net/trueog/unionsog/conversation/DisbandPrompt.java b/src/main/java/net/trueog/unionsog/conversation/DisbandPrompt.java index 68702295..7c19dff3 100644 --- a/src/main/java/net/trueog/unionsog/conversation/DisbandPrompt.java +++ b/src/main/java/net/trueog/unionsog/conversation/DisbandPrompt.java @@ -1,25 +1,28 @@ package net.trueog.unionsog.conversation; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; +import net.trueog.unionsog.ProposalType; +import net.trueog.unionsog.UnionsOG; import org.bukkit.conversations.Prompt; import static net.trueog.unionsog.UnionsOG.lang; +import static org.bukkit.ChatColor.AQUA; import static org.bukkit.ChatColor.RED; public class DisbandPrompt extends ConfirmationPrompt { @Override - protected Prompt confirm(ClanPlayer sender, Clan clan) { + protected Prompt confirm(UnionPlayer sender, Union union) { - if (clan.isPermanent()) { + if (union.isPermanent()) { return new MessagePromptImpl(RED + lang("cannot.disband.permanent", sender)); } - clan.disband(sender.toPlayer(), true, false); - return new MessagePromptImpl(RED + lang("clan.has.been.disbanded", sender, clan.getName())); + UnionsOG.getInstance().getProposalManager().propose(sender, union, ProposalType.DISBAND, ""); + return new MessagePromptImpl(AQUA + lang("proposal.opened.confirmation", sender)); } diff --git a/src/main/java/net/trueog/unionsog/conversation/ResetKdrPrompt.java b/src/main/java/net/trueog/unionsog/conversation/ResetKdrPrompt.java index fe887cc5..c6994688 100644 --- a/src/main/java/net/trueog/unionsog/conversation/ResetKdrPrompt.java +++ b/src/main/java/net/trueog/unionsog/conversation/ResetKdrPrompt.java @@ -1,9 +1,9 @@ package net.trueog.unionsog.conversation; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.events.PlayerResetKdrEvent; -import net.trueog.unionsog.managers.ClanManager; +import net.trueog.unionsog.managers.UnionManager; import org.bukkit.Bukkit; import org.bukkit.conversations.Prompt; @@ -12,16 +12,16 @@ import static org.bukkit.ChatColor.RED; public class ResetKdrPrompt extends ConfirmationPrompt { - private final ClanManager cm; + private final UnionManager cm; - public ResetKdrPrompt(ClanManager cm) { + public ResetKdrPrompt(UnionManager cm) { this.cm = cm; } @Override - protected Prompt confirm(ClanPlayer sender, Clan clan) { + protected Prompt confirm(UnionPlayer sender, Union union) { PlayerResetKdrEvent event = new PlayerResetKdrEvent(sender); Bukkit.getPluginManager().callEvent(event); diff --git a/src/main/java/net/trueog/unionsog/conversation/ResignPrompt.java b/src/main/java/net/trueog/unionsog/conversation/ResignPrompt.java index 44708811..5f777ada 100644 --- a/src/main/java/net/trueog/unionsog/conversation/ResignPrompt.java +++ b/src/main/java/net/trueog/unionsog/conversation/ResignPrompt.java @@ -1,7 +1,7 @@ package net.trueog.unionsog.conversation; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import org.bukkit.conversations.Prompt; import static net.trueog.unionsog.UnionsOG.lang; @@ -14,28 +14,21 @@ import static org.bukkit.ChatColor.RED; public class ResignPrompt extends ConfirmationPrompt { @Override - protected Prompt confirm(ClanPlayer sender, Clan clan) { + protected Prompt confirm(UnionPlayer sender, Union union) { - if (clan.isPermanent() || !sender.isLeader() || clan.getLeaders().size() > 1) { + if (union.isPermanent() || union.getSize() > 1) { - clan.addBb(sender.getName(), lang("0.has.resigned", sender.getName())); - sender.addResignTime(clan.getTag()); - clan.removePlayerFromClan(sender.getUniqueId()); + union.addBb(sender.getName(), lang("0.has.resigned", sender.getName())); + sender.addResignTime(union.getTag()); + union.removePlayerFromUnion(sender.getUniqueId()); return new MessagePromptImpl(AQUA + lang("resign.success", sender)); - } else if (sender.isLeader() && clan.getLeaders().size() == 1) { - - clan.disband(sender.toPlayer(), true, false); - return new MessagePromptImpl(RED + lang("clan.has.been.disbanded", sender, clan.getName())); - - } else { - - return new MessagePromptImpl(RED - + lang("last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.clan", sender)); - } + union.disband(sender.toPlayer(), true, false); + return new MessagePromptImpl(RED + lang("union.has.been.disbanded", sender, union.getName())); + } @Override diff --git a/src/main/java/net/trueog/unionsog/events/AddKillEvent.java b/src/main/java/net/trueog/unionsog/events/AddKillEvent.java index 760c98e7..54acc7d2 100644 --- a/src/main/java/net/trueog/unionsog/events/AddKillEvent.java +++ b/src/main/java/net/trueog/unionsog/events/AddKillEvent.java @@ -1,6 +1,6 @@ package net.trueog.unionsog.events; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; @@ -10,10 +10,10 @@ public class AddKillEvent extends Event implements Cancellable { private static final HandlerList handlers = new HandlerList(); private boolean cancelled = false; - private final ClanPlayer victim; - private final ClanPlayer attacker; + private final UnionPlayer victim; + private final UnionPlayer attacker; - public AddKillEvent(@NotNull ClanPlayer attacker, @NotNull ClanPlayer victim) { + public AddKillEvent(@NotNull UnionPlayer attacker, @NotNull UnionPlayer victim) { this.attacker = attacker; this.victim = victim; @@ -27,13 +27,13 @@ public class AddKillEvent extends Event implements Cancellable { } - public ClanPlayer getAttacker() { + public UnionPlayer getAttacker() { return attacker; } - public ClanPlayer getVictim() { + public UnionPlayer getVictim() { return victim; diff --git a/src/main/java/net/trueog/unionsog/events/AllyClanAddEvent.java b/src/main/java/net/trueog/unionsog/events/AllyClanAddEvent.java deleted file mode 100644 index a206120f..00000000 --- a/src/main/java/net/trueog/unionsog/events/AllyClanAddEvent.java +++ /dev/null @@ -1,49 +0,0 @@ -package net.trueog.unionsog.events; - -import net.trueog.unionsog.Clan; -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; - -/** - * - * @author NeT32 - */ -public class AllyClanAddEvent extends Event { - - private static final HandlerList handlers = new HandlerList(); - private final Clan clanFirst; - private final Clan clanSecond; - - public AllyClanAddEvent(Clan clanFirst, Clan clanSecond) { - - this.clanFirst = clanFirst; - this.clanSecond = clanSecond; - - } - - public Clan getClanFirst() { - - return this.clanFirst; - - } - - public Clan getClanSecond() { - - return this.clanSecond; - - } - - @Override - public HandlerList getHandlers() { - - return handlers; - - } - - public static HandlerList getHandlerList() { - - return handlers; - - } - -} diff --git a/src/main/java/net/trueog/unionsog/events/AllyClanRemoveEvent.java b/src/main/java/net/trueog/unionsog/events/AllyClanRemoveEvent.java deleted file mode 100644 index 30a53a05..00000000 --- a/src/main/java/net/trueog/unionsog/events/AllyClanRemoveEvent.java +++ /dev/null @@ -1,49 +0,0 @@ -package net.trueog.unionsog.events; - -import net.trueog.unionsog.Clan; -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; - -/** - * - * @author NeT32 - */ -public class AllyClanRemoveEvent extends Event { - - private static final HandlerList handlers = new HandlerList(); - private final Clan clanFirst; - private final Clan clanSecond; - - public AllyClanRemoveEvent(Clan clanFirst, Clan clanSecond) { - - this.clanFirst = clanFirst; - this.clanSecond = clanSecond; - - } - - public Clan getClanFirst() { - - return this.clanFirst; - - } - - public Clan getClanSecond() { - - return this.clanSecond; - - } - - @Override - public HandlerList getHandlers() { - - return handlers; - - } - - public static HandlerList getHandlerList() { - - return handlers; - - } - -} diff --git a/src/main/java/net/trueog/unionsog/events/AllyUnionAddEvent.java b/src/main/java/net/trueog/unionsog/events/AllyUnionAddEvent.java new file mode 100644 index 00000000..e05aa47e --- /dev/null +++ b/src/main/java/net/trueog/unionsog/events/AllyUnionAddEvent.java @@ -0,0 +1,49 @@ +package net.trueog.unionsog.events; + +import net.trueog.unionsog.Union; +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; + +/** + * + * @author NeT32 + */ +public class AllyUnionAddEvent extends Event { + + private static final HandlerList handlers = new HandlerList(); + private final Union unionFirst; + private final Union unionSecond; + + public AllyUnionAddEvent(Union unionFirst, Union unionSecond) { + + this.unionFirst = unionFirst; + this.unionSecond = unionSecond; + + } + + public Union getUnionFirst() { + + return this.unionFirst; + + } + + public Union getUnionSecond() { + + return this.unionSecond; + + } + + @Override + public HandlerList getHandlers() { + + return handlers; + + } + + public static HandlerList getHandlerList() { + + return handlers; + + } + +} diff --git a/src/main/java/net/trueog/unionsog/events/AllyUnionRemoveEvent.java b/src/main/java/net/trueog/unionsog/events/AllyUnionRemoveEvent.java new file mode 100644 index 00000000..339720d7 --- /dev/null +++ b/src/main/java/net/trueog/unionsog/events/AllyUnionRemoveEvent.java @@ -0,0 +1,49 @@ +package net.trueog.unionsog.events; + +import net.trueog.unionsog.Union; +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; + +/** + * + * @author NeT32 + */ +public class AllyUnionRemoveEvent extends Event { + + private static final HandlerList handlers = new HandlerList(); + private final Union unionFirst; + private final Union unionSecond; + + public AllyUnionRemoveEvent(Union unionFirst, Union unionSecond) { + + this.unionFirst = unionFirst; + this.unionSecond = unionSecond; + + } + + public Union getUnionFirst() { + + return this.unionFirst; + + } + + public Union getUnionSecond() { + + return this.unionSecond; + + } + + @Override + public HandlerList getHandlers() { + + return handlers; + + } + + public static HandlerList getHandlerList() { + + return handlers; + + } + +} diff --git a/src/main/java/net/trueog/unionsog/events/BankDepositEvent.java b/src/main/java/net/trueog/unionsog/events/BankDepositEvent.java index dea635a2..bdca9356 100644 --- a/src/main/java/net/trueog/unionsog/events/BankDepositEvent.java +++ b/src/main/java/net/trueog/unionsog/events/BankDepositEvent.java @@ -1,6 +1,6 @@ package net.trueog.unionsog.events; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; @@ -8,20 +8,20 @@ import org.bukkit.event.player.PlayerEvent; import org.jetbrains.annotations.NotNull; /** - * @deprecated use {@link ClanBalanceUpdateEvent} + * @deprecated use {@link UnionBalanceUpdateEvent} */ @Deprecated public class BankDepositEvent extends PlayerEvent implements Cancellable { private static final HandlerList HANDLER_LIST = new HandlerList(); - private final Clan clan; + private final Union union; private double amount; private boolean cancelled; - public BankDepositEvent(@NotNull Player who, @NotNull Clan clan, double amount) { + public BankDepositEvent(@NotNull Player who, @NotNull Union union, double amount) { super(who); - this.clan = clan; + this.union = union; this.amount = amount; } @@ -39,15 +39,15 @@ public class BankDepositEvent extends PlayerEvent implements Cancellable { } - public @NotNull Clan getClan() { + public @NotNull Union getUnion() { - return clan; + return union; } public double getOldBalance() { - return clan.getBalance(); + return union.getBalance(); } diff --git a/src/main/java/net/trueog/unionsog/events/BankWithdrawEvent.java b/src/main/java/net/trueog/unionsog/events/BankWithdrawEvent.java index c9e5b376..2676fe31 100644 --- a/src/main/java/net/trueog/unionsog/events/BankWithdrawEvent.java +++ b/src/main/java/net/trueog/unionsog/events/BankWithdrawEvent.java @@ -1,6 +1,6 @@ package net.trueog.unionsog.events; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; @@ -8,33 +8,33 @@ import org.bukkit.event.player.PlayerEvent; import org.jetbrains.annotations.NotNull; /** - * @deprecated use {@link ClanBalanceUpdateEvent} + * @deprecated use {@link UnionBalanceUpdateEvent} */ @Deprecated public class BankWithdrawEvent extends PlayerEvent implements Cancellable { - private final Clan clan; + private final Union union; private double amount; private boolean cancelled; private static final HandlerList HANDLER_LIST = new HandlerList(); - public BankWithdrawEvent(@NotNull Player who, @NotNull Clan clan, double amount) { + public BankWithdrawEvent(@NotNull Player who, @NotNull Union union, double amount) { super(who); - this.clan = clan; + this.union = union; this.amount = amount; } - public @NotNull Clan getClan() { + public @NotNull Union getUnion() { - return clan; + return union; } public double getOldBalance() { - return clan.getBalance(); + return union.getBalance(); } diff --git a/src/main/java/net/trueog/unionsog/events/ChatEvent.java b/src/main/java/net/trueog/unionsog/events/ChatEvent.java index 1cf4f1ea..bfa8074e 100644 --- a/src/main/java/net/trueog/unionsog/events/ChatEvent.java +++ b/src/main/java/net/trueog/unionsog/events/ChatEvent.java @@ -1,6 +1,6 @@ package net.trueog.unionsog.events; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; @@ -22,13 +22,13 @@ public class ChatEvent extends Event implements Cancellable { private static final HandlerList HANDLER_LIST = new HandlerList(); private String message; - private final ClanPlayer sender; - private final List receivers; + private final UnionPlayer sender; + private final List receivers; private final Map placeholders = new HashMap<>(); private final Type type; private boolean cancelled; - public ChatEvent(String message, ClanPlayer sender, List receivers, Type type) { + public ChatEvent(String message, UnionPlayer sender, List receivers, Type type) { if (message == null || sender == null || receivers == null || type == null) { @@ -58,7 +58,7 @@ public class ChatEvent extends Event implements Cancellable { } public enum Type { - ALLY, CLAN + ALLY, UNION } /** @@ -90,7 +90,7 @@ public class ChatEvent extends Event implements Cancellable { * @param value the String to be replaced * @throws IllegalArgumentException if one of the args are null; if one of the * args are empty; if the placeholder name - * equals "clan", "nick-color", "player", + * equals "union", "nick-color", "player", * "rank" or "message" */ public void addPlaceholder(String placeholderName, String value) { @@ -107,11 +107,12 @@ public class ChatEvent extends Event implements Cancellable { } - if (placeholderName.equalsIgnoreCase("clan") || placeholderName.equalsIgnoreCase("player") + if (placeholderName.equalsIgnoreCase("union") || placeholderName.equalsIgnoreCase("player") || placeholderName.equalsIgnoreCase("rank") || placeholderName.equalsIgnoreCase("message")) { - throw new IllegalArgumentException("placeholderName must not be [clan, nick-color, player, rank, message]"); + throw new IllegalArgumentException( + "placeholderName must not be [union, nick-color, player, rank, message]"); } @@ -135,7 +136,7 @@ public class ChatEvent extends Event implements Cancellable { * * @return the receivers */ - public List getReceivers() { + public List getReceivers() { return receivers; @@ -174,7 +175,7 @@ public class ChatEvent extends Event implements Cancellable { * * @return the sender */ - public ClanPlayer getSender() { + public UnionPlayer getSender() { return sender; diff --git a/src/main/java/net/trueog/unionsog/events/CreateRankEvent.java b/src/main/java/net/trueog/unionsog/events/CreateRankEvent.java deleted file mode 100644 index e6560d43..00000000 --- a/src/main/java/net/trueog/unionsog/events/CreateRankEvent.java +++ /dev/null @@ -1,54 +0,0 @@ -package net.trueog.unionsog.events; - -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.Rank; -import org.bukkit.entity.Player; -import org.bukkit.event.HandlerList; -import org.bukkit.event.player.PlayerEvent; -import org.jetbrains.annotations.NotNull; - -/** - * @author Minat0_ - */ -public class CreateRankEvent extends PlayerEvent { - - private static final HandlerList HANDLER_LIST = new HandlerList(); - private final Rank rank; - private final Clan clan; - - public CreateRankEvent(Player who, Clan clan, Rank rank) { - - super(who); - this.clan = clan; - this.rank = rank; - - } - - @NotNull - public Rank getRank() { - - return rank; - - } - - @NotNull - public Clan getClan() { - - return clan; - - } - - @Override - public @NotNull HandlerList getHandlers() { - - return HANDLER_LIST; - - } - - public static HandlerList getHandlerList() { - - return HANDLER_LIST; - - } - -} diff --git a/src/main/java/net/trueog/unionsog/events/CreateClanEvent.java b/src/main/java/net/trueog/unionsog/events/CreateUnionEvent.java similarity index 62% rename from src/main/java/net/trueog/unionsog/events/CreateClanEvent.java rename to src/main/java/net/trueog/unionsog/events/CreateUnionEvent.java index af521648..b8b5be9a 100644 --- a/src/main/java/net/trueog/unionsog/events/CreateClanEvent.java +++ b/src/main/java/net/trueog/unionsog/events/CreateUnionEvent.java @@ -1,6 +1,6 @@ package net.trueog.unionsog.events; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; @@ -8,20 +8,20 @@ import org.bukkit.event.HandlerList; * * @author NeT32 */ -public class CreateClanEvent extends Event { +public class CreateUnionEvent extends Event { private static final HandlerList handlers = new HandlerList(); - private final Clan clan; + private final Union union; - public CreateClanEvent(Clan clan) { + public CreateUnionEvent(Union union) { - this.clan = clan; + this.union = union; } - public Clan getClan() { + public Union getUnion() { - return this.clan; + return this.union; } diff --git a/src/main/java/net/trueog/unionsog/events/DeleteRankEvent.java b/src/main/java/net/trueog/unionsog/events/DeleteRankEvent.java deleted file mode 100644 index 8aa41cf2..00000000 --- a/src/main/java/net/trueog/unionsog/events/DeleteRankEvent.java +++ /dev/null @@ -1,68 +0,0 @@ -package net.trueog.unionsog.events; - -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.Rank; -import org.bukkit.entity.Player; -import org.bukkit.event.Cancellable; -import org.bukkit.event.HandlerList; -import org.bukkit.event.player.PlayerEvent; -import org.jetbrains.annotations.NotNull; - -/** - * @author Minat0_ - */ -public class DeleteRankEvent extends PlayerEvent implements Cancellable { - - private static final HandlerList HANDLER_LIST = new HandlerList(); - private final Rank rank; - private final Clan clan; - private boolean cancelled; - - public DeleteRankEvent(Player who, Clan clan, Rank rank) { - - super(who); - this.rank = rank; - this.clan = clan; - - } - - public Rank getRank() { - - return rank; - - } - - public Clan getClan() { - - return clan; - - } - - @Override - public @NotNull HandlerList getHandlers() { - - return HANDLER_LIST; - - } - - public static HandlerList getHandlerList() { - - return HANDLER_LIST; - - } - - @Override - public boolean isCancelled() { - - return cancelled; - - } - - @Override - public void setCancelled(boolean cancelled) { - - this.cancelled = cancelled; - - } - -} diff --git a/src/main/java/net/trueog/unionsog/events/DisbandClanEvent.java b/src/main/java/net/trueog/unionsog/events/DisbandUnionEvent.java similarity index 72% rename from src/main/java/net/trueog/unionsog/events/DisbandClanEvent.java rename to src/main/java/net/trueog/unionsog/events/DisbandUnionEvent.java index f7897be1..347b4641 100644 --- a/src/main/java/net/trueog/unionsog/events/DisbandClanEvent.java +++ b/src/main/java/net/trueog/unionsog/events/DisbandUnionEvent.java @@ -1,6 +1,6 @@ package net.trueog.unionsog.events; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.event.Event; @@ -10,13 +10,13 @@ import org.bukkit.event.HandlerList; * * @author NeT32 */ -public class DisbandClanEvent extends Event { +public class DisbandUnionEvent extends Event { private static final HandlerList handlers = new HandlerList(); private final CommandSender sender; - private final Clan clan; + private final Union union; - public DisbandClanEvent(CommandSender sender, Clan clan) { + public DisbandUnionEvent(CommandSender sender, Union union) { if (sender == null) { @@ -25,13 +25,13 @@ public class DisbandClanEvent extends Event { } this.sender = sender; - this.clan = clan; + this.union = union; } - public Clan getClan() { + public Union getUnion() { - return this.clan; + return this.union; } diff --git a/src/main/java/net/trueog/unionsog/events/EconomyTransactionEvent.java b/src/main/java/net/trueog/unionsog/events/EconomyTransactionEvent.java index d7ac2b02..7054d90a 100644 --- a/src/main/java/net/trueog/unionsog/events/EconomyTransactionEvent.java +++ b/src/main/java/net/trueog/unionsog/events/EconomyTransactionEvent.java @@ -98,7 +98,7 @@ public class EconomyTransactionEvent extends Event implements Cancellable { } public enum Cause { - CLAN_CREATION, CLAN_INVITATION, CLAN_REGROUP, CLAN_HOME_TELEPORT, CLAN_HOME_TELEPORT_SET + UNION_CREATION, UNION_INVITATION, UNION_REGROUP, UNION_HOME_TELEPORT, UNION_HOME_TELEPORT_SET } public enum TransactionType { diff --git a/src/main/java/net/trueog/unionsog/events/HomeRegroupEvent.java b/src/main/java/net/trueog/unionsog/events/HomeRegroupEvent.java index df246bed..637d8e5f 100644 --- a/src/main/java/net/trueog/unionsog/events/HomeRegroupEvent.java +++ b/src/main/java/net/trueog/unionsog/events/HomeRegroupEvent.java @@ -5,8 +5,8 @@ */ package net.trueog.unionsog.events; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import org.bukkit.Location; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; @@ -23,33 +23,33 @@ public class HomeRegroupEvent extends Event implements Cancellable { private static final HandlerList handlers = new HandlerList(); private boolean cancelled; - private final Clan clan; - private final ClanPlayer cp; - private final List cps; + private final Union union; + private final UnionPlayer cp; + private final List cps; private final Location loc; - public HomeRegroupEvent(Clan clan, ClanPlayer cp, List cps, Location loc) { + public HomeRegroupEvent(Union union, UnionPlayer cp, List cps, Location loc) { - this.clan = clan; + this.union = union; this.cp = cp; this.cps = cps; this.loc = loc; } - public Clan getClan() { + public Union getUnion() { - return clan; + return union; } - public ClanPlayer getIssuer() { + public UnionPlayer getIssuer() { return cp; } - public List getPlayers() { + public List getPlayers() { return Collections.unmodifiableList(cps); diff --git a/src/main/java/net/trueog/unionsog/events/PlayerHomeClearEvent.java b/src/main/java/net/trueog/unionsog/events/PlayerHomeClearEvent.java index 8afe97b7..a79018b1 100644 --- a/src/main/java/net/trueog/unionsog/events/PlayerHomeClearEvent.java +++ b/src/main/java/net/trueog/unionsog/events/PlayerHomeClearEvent.java @@ -1,7 +1,7 @@ package net.trueog.unionsog.events; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; @@ -11,24 +11,24 @@ public class PlayerHomeClearEvent extends Event implements Cancellable { private static final HandlerList HANDLER_LIST = new HandlerList(); - private final Clan clan; - private final ClanPlayer cp; + private final Union union; + private final UnionPlayer cp; private boolean cancelled; - public PlayerHomeClearEvent(Clan clan, ClanPlayer cp) { + public PlayerHomeClearEvent(Union union, UnionPlayer cp) { - this.clan = clan; + this.union = union; this.cp = cp; } - public Clan getClan() { + public Union getUnion() { - return clan; + return union; } - public ClanPlayer getCp() { + public UnionPlayer getCp() { return cp; diff --git a/src/main/java/net/trueog/unionsog/events/PlayerHomeSetEvent.java b/src/main/java/net/trueog/unionsog/events/PlayerHomeSetEvent.java index ca7c919d..c8f49be8 100644 --- a/src/main/java/net/trueog/unionsog/events/PlayerHomeSetEvent.java +++ b/src/main/java/net/trueog/unionsog/events/PlayerHomeSetEvent.java @@ -1,7 +1,7 @@ package net.trueog.unionsog.events; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import org.bukkit.Location; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; @@ -15,13 +15,13 @@ public class PlayerHomeSetEvent extends Event implements Cancellable { private static final HandlerList handlers = new HandlerList(); private boolean cancelled; - private final Clan clan; - private final ClanPlayer cp; + private final Union union; + private final UnionPlayer cp; private final Location loc; - public PlayerHomeSetEvent(Clan clan, ClanPlayer cp, Location loc) { + public PlayerHomeSetEvent(Union union, UnionPlayer cp, Location loc) { - this.clan = clan; + this.union = union; this.cp = cp; this.loc = loc; @@ -41,13 +41,13 @@ public class PlayerHomeSetEvent extends Event implements Cancellable { } - public Clan getClan() { + public Union getUnion() { - return this.clan; + return this.union; } - public ClanPlayer getClanPlayer() { + public UnionPlayer getUnionPlayer() { return this.cp; diff --git a/src/main/java/net/trueog/unionsog/events/PlayerDemoteEvent.java b/src/main/java/net/trueog/unionsog/events/PlayerJoinedUnionEvent.java similarity index 54% rename from src/main/java/net/trueog/unionsog/events/PlayerDemoteEvent.java rename to src/main/java/net/trueog/unionsog/events/PlayerJoinedUnionEvent.java index 95930df5..8299dffc 100644 --- a/src/main/java/net/trueog/unionsog/events/PlayerDemoteEvent.java +++ b/src/main/java/net/trueog/unionsog/events/PlayerJoinedUnionEvent.java @@ -1,7 +1,7 @@ package net.trueog.unionsog.events; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; @@ -9,26 +9,26 @@ import org.bukkit.event.HandlerList; * * @author NeT32 */ -public class PlayerDemoteEvent extends Event { +public class PlayerJoinedUnionEvent extends Event { private static final HandlerList handlers = new HandlerList(); - private final Clan clan; - private final ClanPlayer target; + private final Union union; + private final UnionPlayer target; - public PlayerDemoteEvent(Clan clan, ClanPlayer target) { + public PlayerJoinedUnionEvent(Union union, UnionPlayer target) { - this.clan = clan; + this.union = union; this.target = target; } - public Clan getClan() { + public Union getUnion() { - return this.clan; + return this.union; } - public ClanPlayer getClanPlayer() { + public UnionPlayer getUnionPlayer() { return this.target; diff --git a/src/main/java/net/trueog/unionsog/events/PlayerKickedClanEvent.java b/src/main/java/net/trueog/unionsog/events/PlayerKickedClanEvent.java deleted file mode 100644 index b9a087d4..00000000 --- a/src/main/java/net/trueog/unionsog/events/PlayerKickedClanEvent.java +++ /dev/null @@ -1,50 +0,0 @@ -package net.trueog.unionsog.events; - -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; - -/** - * - * @author NeT32 - */ -public class PlayerKickedClanEvent extends Event { - - private static final HandlerList handlers = new HandlerList(); - private final Clan clan; - private final ClanPlayer target; - - public PlayerKickedClanEvent(Clan clan, ClanPlayer target) { - - this.clan = clan; - this.target = target; - - } - - public Clan getClan() { - - return this.clan; - - } - - public ClanPlayer getClanPlayer() { - - return this.target; - - } - - @Override - public HandlerList getHandlers() { - - return handlers; - - } - - public static HandlerList getHandlerList() { - - return handlers; - - } - -} diff --git a/src/main/java/net/trueog/unionsog/events/PlayerJoinedClanEvent.java b/src/main/java/net/trueog/unionsog/events/PlayerKickedUnionEvent.java similarity index 54% rename from src/main/java/net/trueog/unionsog/events/PlayerJoinedClanEvent.java rename to src/main/java/net/trueog/unionsog/events/PlayerKickedUnionEvent.java index 5906e906..776b7176 100644 --- a/src/main/java/net/trueog/unionsog/events/PlayerJoinedClanEvent.java +++ b/src/main/java/net/trueog/unionsog/events/PlayerKickedUnionEvent.java @@ -1,7 +1,7 @@ package net.trueog.unionsog.events; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; @@ -9,26 +9,26 @@ import org.bukkit.event.HandlerList; * * @author NeT32 */ -public class PlayerJoinedClanEvent extends Event { +public class PlayerKickedUnionEvent extends Event { private static final HandlerList handlers = new HandlerList(); - private final Clan clan; - private final ClanPlayer target; + private final Union union; + private final UnionPlayer target; - public PlayerJoinedClanEvent(Clan clan, ClanPlayer target) { + public PlayerKickedUnionEvent(Union union, UnionPlayer target) { - this.clan = clan; + this.union = union; this.target = target; } - public Clan getClan() { + public Union getUnion() { - return this.clan; + return this.union; } - public ClanPlayer getClanPlayer() { + public UnionPlayer getUnionPlayer() { return this.target; diff --git a/src/main/java/net/trueog/unionsog/events/PlayerRankUpdateEvent.java b/src/main/java/net/trueog/unionsog/events/PlayerRankUpdateEvent.java deleted file mode 100644 index 08f6ba2f..00000000 --- a/src/main/java/net/trueog/unionsog/events/PlayerRankUpdateEvent.java +++ /dev/null @@ -1,100 +0,0 @@ -package net.trueog.unionsog.events; - -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; -import net.trueog.unionsog.Rank; -import org.bukkit.event.Cancellable; -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -/** - * @author Minat0_ - */ -public class PlayerRankUpdateEvent extends Event implements Cancellable { - - private static final HandlerList HANDLER_LIST = new HandlerList(); - private final ClanPlayer target; - private final ClanPlayer issuer; - - private final Rank oldRank; - private final Rank newRank; - private final Clan clan; - private boolean cancelled; - - public PlayerRankUpdateEvent(@NotNull ClanPlayer issuer, @NotNull ClanPlayer target, @NotNull Clan clan, - @Nullable Rank oldRank, @Nullable Rank newRank) - { - - this.target = target; - this.issuer = issuer; - this.oldRank = oldRank; - this.clan = clan; - this.newRank = newRank; - - } - - @Nullable - public Rank getOldRank() { - - return oldRank; - - } - - @NotNull - public Clan getClan() { - - return clan; - - } - - @Nullable - public Rank getNewRank() { - - return newRank; - - } - - @NotNull - public ClanPlayer getIssuer() { - - return issuer; - - } - - @NotNull - public ClanPlayer getTarget() { - - return target; - - } - - @Override - public @NotNull HandlerList getHandlers() { - - return HANDLER_LIST; - - } - - public static HandlerList getHandlerList() { - - return HANDLER_LIST; - - } - - @Override - public boolean isCancelled() { - - return cancelled; - - } - - @Override - public void setCancelled(boolean isCancelled) { - - this.cancelled = isCancelled; - - } - -} diff --git a/src/main/java/net/trueog/unionsog/events/PlayerResetKdrEvent.java b/src/main/java/net/trueog/unionsog/events/PlayerResetKdrEvent.java index 27076ae2..8b7bfc77 100644 --- a/src/main/java/net/trueog/unionsog/events/PlayerResetKdrEvent.java +++ b/src/main/java/net/trueog/unionsog/events/PlayerResetKdrEvent.java @@ -1,6 +1,6 @@ package net.trueog.unionsog.events; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; @@ -12,17 +12,17 @@ import org.jetbrains.annotations.NotNull; public class PlayerResetKdrEvent extends Event implements Cancellable { private static final HandlerList handlers = new HandlerList(); - private final ClanPlayer clanPlayer; + private final UnionPlayer unionPlayer; private boolean cancelled; /** * Event called before a player's kill death rate is reset * - * @param clanPlayer The ClanPlayer whose kill death rate going to be reset + * @param unionPlayer The UnionPlayer whose kill death rate going to be reset */ - public PlayerResetKdrEvent(@NotNull ClanPlayer clanPlayer) { + public PlayerResetKdrEvent(@NotNull UnionPlayer unionPlayer) { - this.clanPlayer = clanPlayer; + this.unionPlayer = unionPlayer; } @@ -32,9 +32,9 @@ public class PlayerResetKdrEvent extends Event implements Cancellable { * @return The player whose kill death rate going to be reset */ @NotNull - public ClanPlayer getClanPlayer() { + public UnionPlayer getUnionPlayer() { - return clanPlayer; + return unionPlayer; } diff --git a/src/main/java/net/trueog/unionsog/events/PreCreateRankEvent.java b/src/main/java/net/trueog/unionsog/events/PreCreateRankEvent.java deleted file mode 100644 index 90788f40..00000000 --- a/src/main/java/net/trueog/unionsog/events/PreCreateRankEvent.java +++ /dev/null @@ -1,75 +0,0 @@ -package net.trueog.unionsog.events; - -import net.trueog.unionsog.Clan; -import org.bukkit.entity.Player; -import org.bukkit.event.Cancellable; -import org.bukkit.event.HandlerList; -import org.bukkit.event.player.PlayerEvent; -import org.jetbrains.annotations.NotNull; - -/** - * @author Minat0_ - */ -public class PreCreateRankEvent extends PlayerEvent implements Cancellable { - - private static final HandlerList HANDLER_LIST = new HandlerList(); - private String rankName; - private final Clan clan; - private boolean cancelled; - - public PreCreateRankEvent(Player who, Clan clan, String rankName) { - - super(who); - this.clan = clan; - this.rankName = rankName; - - } - - @NotNull - public Clan getClan() { - - return clan; - - } - - @NotNull - public String getRankName() { - - return rankName; - - } - - public void setRankName(@NotNull String rankName) { - - this.rankName = rankName; - - } - - @Override - public @NotNull HandlerList getHandlers() { - - return HANDLER_LIST; - - } - - public static HandlerList getHandlerList() { - - return HANDLER_LIST; - - } - - @Override - public boolean isCancelled() { - - return cancelled; - - } - - @Override - public void setCancelled(boolean isCancelled) { - - this.cancelled = isCancelled; - - } - -} diff --git a/src/main/java/net/trueog/unionsog/events/PreCreateClanEvent.java b/src/main/java/net/trueog/unionsog/events/PreCreateUnionEvent.java similarity index 84% rename from src/main/java/net/trueog/unionsog/events/PreCreateClanEvent.java rename to src/main/java/net/trueog/unionsog/events/PreCreateUnionEvent.java index 3a070e32..62f97020 100644 --- a/src/main/java/net/trueog/unionsog/events/PreCreateClanEvent.java +++ b/src/main/java/net/trueog/unionsog/events/PreCreateUnionEvent.java @@ -6,14 +6,14 @@ import org.bukkit.event.HandlerList; import org.bukkit.event.player.PlayerEvent; import org.jetbrains.annotations.NotNull; -public class PreCreateClanEvent extends PlayerEvent implements Cancellable { +public class PreCreateUnionEvent extends PlayerEvent implements Cancellable { private static final HandlerList HANDLER_LIST = new HandlerList(); private boolean cancelled; private final String tag; private final String name; - public PreCreateClanEvent(@NotNull Player who, @NotNull String tag, @NotNull String name) { + public PreCreateUnionEvent(@NotNull Player who, @NotNull String tag, @NotNull String name) { super(who); this.tag = tag; diff --git a/src/main/java/net/trueog/unionsog/events/RivalClanAddEvent.java b/src/main/java/net/trueog/unionsog/events/RivalClanAddEvent.java deleted file mode 100644 index 675e4f61..00000000 --- a/src/main/java/net/trueog/unionsog/events/RivalClanAddEvent.java +++ /dev/null @@ -1,49 +0,0 @@ -package net.trueog.unionsog.events; - -import net.trueog.unionsog.Clan; -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; - -/** - * - * @author NeT32 - */ -public class RivalClanAddEvent extends Event { - - private static final HandlerList handlers = new HandlerList(); - private final Clan clanFirst; - private final Clan clanSecond; - - public RivalClanAddEvent(Clan clanFirst, Clan clanSecond) { - - this.clanFirst = clanFirst; - this.clanSecond = clanSecond; - - } - - public Clan getClanFirst() { - - return this.clanFirst; - - } - - public Clan getClanSecond() { - - return this.clanSecond; - - } - - @Override - public HandlerList getHandlers() { - - return handlers; - - } - - public static HandlerList getHandlerList() { - - return handlers; - - } - -} diff --git a/src/main/java/net/trueog/unionsog/events/PlayerPromoteEvent.java b/src/main/java/net/trueog/unionsog/events/RivalUnionAddEvent.java similarity index 51% rename from src/main/java/net/trueog/unionsog/events/PlayerPromoteEvent.java rename to src/main/java/net/trueog/unionsog/events/RivalUnionAddEvent.java index 3108de9d..97a9999e 100644 --- a/src/main/java/net/trueog/unionsog/events/PlayerPromoteEvent.java +++ b/src/main/java/net/trueog/unionsog/events/RivalUnionAddEvent.java @@ -1,7 +1,6 @@ package net.trueog.unionsog.events; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.Union; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; @@ -9,28 +8,28 @@ import org.bukkit.event.HandlerList; * * @author NeT32 */ -public class PlayerPromoteEvent extends Event { +public class RivalUnionAddEvent extends Event { private static final HandlerList handlers = new HandlerList(); - private final Clan clan; - private final ClanPlayer target; + private final Union unionFirst; + private final Union unionSecond; - public PlayerPromoteEvent(Clan clan, ClanPlayer target) { + public RivalUnionAddEvent(Union unionFirst, Union unionSecond) { - this.clan = clan; - this.target = target; + this.unionFirst = unionFirst; + this.unionSecond = unionSecond; } - public Clan getClan() { + public Union getUnionFirst() { - return this.clan; + return this.unionFirst; } - public ClanPlayer getClanPlayer() { + public Union getUnionSecond() { - return this.target; + return this.unionSecond; } diff --git a/src/main/java/net/trueog/unionsog/events/RivalClanRemoveEvent.java b/src/main/java/net/trueog/unionsog/events/RivalUnionRemoveEvent.java similarity index 50% rename from src/main/java/net/trueog/unionsog/events/RivalClanRemoveEvent.java rename to src/main/java/net/trueog/unionsog/events/RivalUnionRemoveEvent.java index bab211b7..2109ce21 100644 --- a/src/main/java/net/trueog/unionsog/events/RivalClanRemoveEvent.java +++ b/src/main/java/net/trueog/unionsog/events/RivalUnionRemoveEvent.java @@ -1,6 +1,6 @@ package net.trueog.unionsog.events; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; @@ -9,28 +9,28 @@ import org.jetbrains.annotations.NotNull; * * @author NeT32 */ -public class RivalClanRemoveEvent extends Event { +public class RivalUnionRemoveEvent extends Event { private static final HandlerList handlers = new HandlerList(); - private final Clan clanFirst; - private final Clan clanSecond; + private final Union unionFirst; + private final Union unionSecond; - public RivalClanRemoveEvent(Clan clanFirst, Clan clanSecond) { + public RivalUnionRemoveEvent(Union unionFirst, Union unionSecond) { - this.clanFirst = clanFirst; - this.clanSecond = clanSecond; + this.unionFirst = unionFirst; + this.unionSecond = unionSecond; } - public Clan getClanFirst() { + public Union getUnionFirst() { - return this.clanFirst; + return this.unionFirst; } - public Clan getClanSecond() { + public Union getUnionSecond() { - return this.clanSecond; + return this.unionSecond; } diff --git a/src/main/java/net/trueog/unionsog/events/TagChangeEvent.java b/src/main/java/net/trueog/unionsog/events/TagChangeEvent.java index f3a0e88b..4c7dc711 100644 --- a/src/main/java/net/trueog/unionsog/events/TagChangeEvent.java +++ b/src/main/java/net/trueog/unionsog/events/TagChangeEvent.java @@ -1,6 +1,6 @@ package net.trueog.unionsog.events; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; @@ -10,21 +10,21 @@ import org.jetbrains.annotations.NotNull; public class TagChangeEvent extends PlayerEvent implements Cancellable { private static final HandlerList HANDLER_LIST = new HandlerList(); - private final @NotNull Clan clan; + private final @NotNull Union union; private @NotNull String newTag; private boolean cancelled; - public TagChangeEvent(@NotNull Player player, @NotNull Clan clan, @NotNull String newTag) { + public TagChangeEvent(@NotNull Player player, @NotNull Union union, @NotNull String newTag) { super(player); - this.clan = clan; + this.union = union; this.newTag = newTag; } - public @NotNull Clan getClan() { + public @NotNull Union getUnion() { - return clan; + return union; } diff --git a/src/main/java/net/trueog/unionsog/events/ClanBalanceUpdateEvent.java b/src/main/java/net/trueog/unionsog/events/UnionBalanceUpdateEvent.java similarity index 78% rename from src/main/java/net/trueog/unionsog/events/ClanBalanceUpdateEvent.java rename to src/main/java/net/trueog/unionsog/events/UnionBalanceUpdateEvent.java index 8dd7d5ac..208c31ac 100644 --- a/src/main/java/net/trueog/unionsog/events/ClanBalanceUpdateEvent.java +++ b/src/main/java/net/trueog/unionsog/events/UnionBalanceUpdateEvent.java @@ -1,31 +1,31 @@ package net.trueog.unionsog.events; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import net.trueog.unionsog.loggers.BankOperator; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; -public class ClanBalanceUpdateEvent extends Event implements Cancellable { +public class UnionBalanceUpdateEvent extends Event implements Cancellable { private static final HandlerList HANDLER_LIST = new HandlerList(); private final BankOperator updater; - private final Clan clan; + private final Union union; private final Cause cause; private final double balance; private double newBalance; private boolean cancelled; - public ClanBalanceUpdateEvent(@NotNull BankOperator updater, @NotNull Clan clan, double balance, double newBalance, - @NotNull Cause cause) + public UnionBalanceUpdateEvent(@NotNull BankOperator updater, @NotNull Union union, double balance, + double newBalance, @NotNull Cause cause) { this.updater = updater; this.balance = balance; this.newBalance = newBalance; - this.clan = clan; + this.union = union; this.cause = cause; } @@ -40,16 +40,16 @@ public class ClanBalanceUpdateEvent extends Event implements Cancellable { } /** - * @return the Clan involved + * @return the Union involved */ - public @NotNull Clan getClan() { + public @NotNull Union getUnion() { - return clan; + return union; } /** - * @return the Clan's current balance + * @return the Union's current balance */ public double getBalance() { @@ -58,7 +58,7 @@ public class ClanBalanceUpdateEvent extends Event implements Cancellable { } /** - * @return the Clan's new balance + * @return the Union's new balance */ public double getNewBalance() { @@ -67,7 +67,7 @@ public class ClanBalanceUpdateEvent extends Event implements Cancellable { } /** - * Sets the Clan's new balance + * Sets the Union's new balance * * @param newBalance the new balance * @throws IllegalArgumentException if newBalance is negative @@ -132,7 +132,7 @@ public class ClanBalanceUpdateEvent extends Event implements Cancellable { public enum Cause { /** - * When a command such as /clan bank deposit causes the update + * When a command such as /union bank deposit causes the update */ COMMAND, /** @@ -144,7 +144,7 @@ public class ClanBalanceUpdateEvent extends Event implements Cancellable { */ INTERNAL, /** - * When the clan data is being loaded and the balance is set, usually on server + * When the union data is being loaded and the balance is set, usually on server * start up or plugin reload */ LOADING, diff --git a/src/main/java/net/trueog/unionsog/events/ClanPlayerTeleportEvent.java b/src/main/java/net/trueog/unionsog/events/UnionPlayerTeleportEvent.java similarity index 78% rename from src/main/java/net/trueog/unionsog/events/ClanPlayerTeleportEvent.java rename to src/main/java/net/trueog/unionsog/events/UnionPlayerTeleportEvent.java index 334a440f..f7549b02 100644 --- a/src/main/java/net/trueog/unionsog/events/ClanPlayerTeleportEvent.java +++ b/src/main/java/net/trueog/unionsog/events/UnionPlayerTeleportEvent.java @@ -1,21 +1,21 @@ package net.trueog.unionsog.events; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import org.bukkit.Location; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; -public class ClanPlayerTeleportEvent extends Event implements Cancellable { +public class UnionPlayerTeleportEvent extends Event implements Cancellable { private static final HandlerList HANDLER_LIST = new HandlerList(); private boolean cancelled; - private final ClanPlayer player; + private final UnionPlayer player; private final Location origin; private final Location destination; - public ClanPlayerTeleportEvent(ClanPlayer player, Location origin, Location destination) { + public UnionPlayerTeleportEvent(UnionPlayer player, Location origin, Location destination) { this.player = player; this.origin = origin; @@ -50,7 +50,7 @@ public class ClanPlayerTeleportEvent extends Event implements Cancellable { } - public ClanPlayer getClanPlayer() { + public UnionPlayer getUnionPlayer() { return player; diff --git a/src/main/java/net/trueog/unionsog/hooks/discord/DiscordHook.java b/src/main/java/net/trueog/unionsog/hooks/discord/DiscordHook.java index 26c23880..fb360b04 100644 --- a/src/main/java/net/trueog/unionsog/hooks/discord/DiscordHook.java +++ b/src/main/java/net/trueog/unionsog/hooks/discord/DiscordHook.java @@ -16,13 +16,13 @@ import github.scarsz.discordsrv.dependencies.kyori.adventure.text.Component; import github.scarsz.discordsrv.objects.managers.AccountLinkManager; import github.scarsz.discordsrv.util.DiscordUtil; import github.scarsz.discordsrv.util.MessageUtil; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.events.*; import net.trueog.unionsog.hooks.discord.exceptions.*; import net.trueog.unionsog.managers.ChatManager; -import net.trueog.unionsog.managers.ClanManager; +import net.trueog.unionsog.managers.UnionManager; import net.trueog.unionsog.managers.SettingsManager; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -38,7 +38,7 @@ import java.util.stream.Collectors; import static github.scarsz.discordsrv.dependencies.jda.api.Permission.MANAGE_CHANNEL; import static github.scarsz.discordsrv.dependencies.jda.api.Permission.VIEW_CHANNEL; -import static net.trueog.unionsog.ClanPlayer.Channel.CLAN; +import static net.trueog.unionsog.UnionPlayer.Channel.UNION; import static net.trueog.unionsog.UnionsOG.lang; import static net.trueog.unionsog.chat.SCMessage.Source.DISCORD; import static net.trueog.unionsog.hooks.discord.DiscordHook.DiscordAction.ADD; @@ -58,13 +58,13 @@ import static net.trueog.unionsog.managers.SettingsManager.ConfigField.*; * Manages events: *

*
    - *
  • Clan creation/deletion
    • - *
  • ClanPlayer joining/resigning
    • + *
  • Union creation/deletion
    • + *
  • UnionPlayer joining/resigning
    • *
  • Player linking/unlinking
    • - *
  • ClanPlayer promoting/demoting
    • + *
  • UnionPlayer promoting/demoting
    • *
*

- * Currently, works with clan chat only. + * Currently, works with union chat only. */ public class DiscordHook implements Listener { @@ -73,10 +73,10 @@ public class DiscordHook implements Listener { private final UnionsOG plugin; private final SettingsManager settingsManager; private final ChatManager chatManager; - private final ClanManager clanManager; + private final UnionManager unionManager; private final AccountLinkManager accountManager = DiscordSRV.getPlugin().getAccountLinkManager(); private final List textCategories; - private final List clanTags; + private final List unionTags; private final List whitelist; public DiscordHook(UnionsOG plugin) { @@ -84,13 +84,13 @@ public class DiscordHook implements Listener { this.plugin = plugin; settingsManager = plugin.getSettingsManager(); chatManager = plugin.getChatManager(); - clanManager = plugin.getClanManager(); + unionManager = plugin.getUnionManager(); textCategories = settingsManager.getStringList(DISCORDCHAT_TEXT_CATEGORY_IDS).stream() .filter(this::categoryExists).collect(Collectors.toList()); whitelist = settingsManager.getStringList(DISCORDCHAT_TEXT_WHITELIST); - clanTags = clanManager.getClans().stream().map(Clan::getTag).collect(Collectors.toList()); + unionTags = unionManager.getUnions().stream().map(Union::getTag).collect(Collectors.toList()); setupDiscord(); @@ -115,25 +115,25 @@ public class DiscordHook implements Listener { } - ClanPlayer clanPlayer = clanManager.getClanPlayer(uuid); - if (clanPlayer == null) { + UnionPlayer unionPlayer = unionManager.getUnionPlayer(uuid); + if (unionPlayer == null) { return; } - Clan clan = clanPlayer.getClan(); - if (clan == null) { + Union union = unionPlayer.getUnion(); + if (union == null) { return; } - if (!Objects.equals(textChannel.getName(), clan.getTag())) { + if (!Objects.equals(textChannel.getName(), union.getTag())) { String channelLink = "<#" + textChannel.getId() + ">"; sendPrivateMessage(textChannel, eventMessage, - lang("cannot.send.discord.message", clanPlayer, channelLink)); + lang("cannot.send.discord.message", unionPlayer, channelLink)); return; } @@ -168,33 +168,33 @@ public class DiscordHook implements Listener { } // DiscordSRV end - chatManager.processChat(DISCORD, CLAN, clanPlayer, message); + chatManager.processChat(DISCORD, UNION, unionPlayer, message); } } @EventHandler - public void onClanDisband(DisbandClanEvent event) { + public void onUnionDisband(DisbandUnionEvent event) { - deleteChannel(event.getClan().getTag()); + deleteChannel(event.getUnion().getTag()); } @EventHandler - public void onClanCreate(CreateClanEvent event) { + public void onUnionCreate(CreateUnionEvent event) { try { if (settingsManager.is(DISCORDCHAT_AUTO_CREATION)) { - createChannel(event.getClan().getTag()); + createChannel(event.getUnion().getTag()); } } catch (DiscordHookException ex) { - // Clan is not following the conditions, categories are fulled or discord + // Union is not following the conditions, categories are fulled or discord // reaches the limit, nothing to do here. UnionsOG.debug(ex.getMessage()); @@ -203,116 +203,83 @@ public class DiscordHook implements Listener { } @EventHandler - public void onPlayerClanLeave(PlayerKickedClanEvent event) { + public void onPlayerUnionLeave(PlayerKickedUnionEvent event) { - ClanPlayer clanPlayer = event.getClanPlayer(); - Clan clan = event.getClan(); - Member member = getMember(clanPlayer); - if (member == null || clan == null) { + UnionPlayer unionPlayer = event.getUnionPlayer(); + Union union = event.getUnion(); + Member member = getMember(unionPlayer); + if (member == null || union == null) { return; } - updateViewPermission(member, clan, REMOVE); - updateLeaderRole(member, clanPlayer, REMOVE); + updateViewPermission(member, union, REMOVE); } @EventHandler - public void onPlayerClanJoin(PlayerJoinedClanEvent event) { + public void onPlayerUnionJoin(PlayerJoinedUnionEvent event) { - ClanPlayer clanPlayer = event.getClanPlayer(); - Clan clan = event.getClan(); - Member member = getMember(clanPlayer); - if (member == null || clan == null) { + UnionPlayer unionPlayer = event.getUnionPlayer(); + Union union = event.getUnion(); + Member member = getMember(unionPlayer); + if (member == null || union == null) { return; } - if (!createChannelSilently(clanPlayer)) { + if (!createChannelSilently(unionPlayer)) { return; } - updateViewPermission(member, clan, ADD); - - } - - @EventHandler - public void onPlayerPromote(PlayerPromoteEvent event) { - - ClanPlayer clanPlayer = event.getClanPlayer(); - Member member = getMember(clanPlayer); - if (member == null) { - - return; - - } - - updateLeaderRole(member, clanPlayer, ADD); - - } - - @EventHandler - public void onPlayerDemote(PlayerDemoteEvent event) { - - ClanPlayer clanPlayer = event.getClanPlayer(); - Member member = getMember(clanPlayer); - if (member == null) { - - return; - - } - - updateLeaderRole(member, clanPlayer, REMOVE); + updateViewPermission(member, union, ADD); } @Subscribe public void onPlayerLinking(AccountLinkedEvent event) { - ClanPlayer clanPlayer = clanManager.getClanPlayer(event.getPlayer()); + UnionPlayer unionPlayer = unionManager.getUnionPlayer(event.getPlayer()); Member member = getGuild().getMember(event.getUser()); - if (clanPlayer == null || member == null) { + if (unionPlayer == null || member == null) { return; } - Clan clan = clanPlayer.getClan(); - if (clan == null) { + Union union = unionPlayer.getUnion(); + if (union == null) { return; } - if (!createChannelSilently(clanPlayer)) { + if (!createChannelSilently(unionPlayer)) { return; } - updateViewPermission(member, clan, ADD); - updateLeaderRole(member, clanPlayer, ADD); + updateViewPermission(member, union, ADD); } @Subscribe public void onPlayerUnlinking(AccountUnlinkedEvent event) { - ClanPlayer clanPlayer = clanManager.getClanPlayer(event.getPlayer()); + UnionPlayer unionPlayer = unionManager.getUnionPlayer(event.getPlayer()); Member member = getGuild().getMember(event.getDiscordUser()); - if (clanPlayer == null || clanPlayer.getClan() == null || member == null) { + if (unionPlayer == null || unionPlayer.getUnion() == null || member == null) { return; } - updateViewPermission(member, clanPlayer.getClan(), REMOVE); - updateLeaderRole(member, clanPlayer, REMOVE); + updateViewPermission(member, unionPlayer.getUnion(), REMOVE); } @@ -327,9 +294,9 @@ public class DiscordHook implements Listener { resetPermissions(discordTagChannels); - UnionsOG.debug("ClanTags before creating: " + String.join(",", clanTags)); + UnionsOG.debug("ClanTags before creating: " + String.join(",", unionTags)); createChannels(discordTagChannels); - UnionsOG.debug("ClanTags after creating: " + String.join(",", clanTags)); + UnionsOG.debug("ClanTags after creating: " + String.join(",", unionTags)); } @@ -340,52 +307,6 @@ public class DiscordHook implements Listener { } - /** - * @return A leader role from guild, otherwise creates one. - */ - @NotNull - public Role getLeaderRole() { - - Role role = getGuild().getRoleById(settingsManager.getString(DISCORDCHAT_LEADER_ID)); - - if (role == null || !role.getName().equals(settingsManager.getString(DISCORDCHAT_LEADER_ROLE))) { - - role = getGuild().createRole().setName(settingsManager.getString(DISCORDCHAT_LEADER_ROLE)) - .setColor(getLeaderColor()).setMentionable(true).complete(); - - settingsManager.set(DISCORDCHAT_LEADER_ID, role.getId()); - settingsManager.save(); - - } - - return role; - - } - - /** - * @return A leader color from configuration - */ - public Color getLeaderColor() { - - String[] colors = settingsManager.getString(DISCORDCHAT_LEADER_COLOR).replaceAll("\\s", "").split(","); - try { - - int red = Integer.parseInt(colors[0]); - int green = Integer.parseInt(colors[1]); - int blue = Integer.parseInt(colors[2]); - int alpha = Integer.parseInt(colors[3]); - - return new Color(red, green, blue, alpha); - - } catch (IllegalArgumentException ex) { - - plugin.getLogger().warning("Color is invalid, using default color: " + ex.getMessage()); - return Color.RED; - - } - - } - /** * Creates a new UnionsOG {@link Category} * @@ -431,23 +352,23 @@ public class DiscordHook implements Listener { * otherwise creates one. * *

- * Sets positive {@link Permission#VIEW_CHANNEL} permission to all linked clan + * Sets positive {@link Permission#VIEW_CHANNEL} permission to all linked union * members. *

* - * @param clanTag the clan tag - * @throws InvalidChannelException no one member is linked or clan is not in + * @param unionTag the union tag + * @throws InvalidChannelException no one member is linked or union is not in * the whitelist. * @throws ChannelExistsException if channel is already exist * @throws CategoriesLimitException if categories reached the limit. * @throws ChannelsLimitException if discord reached the channels limit. */ - public void createChannel(@NotNull String clanTag) + public void createChannel(@NotNull String unionTag) throws InvalidChannelException, CategoriesLimitException, ChannelsLimitException, ChannelExistsException { - validateChannel(clanTag); - Map discordClanPlayers = getDiscordPlayers(clanManager.getClan(clanTag)); + validateChannel(unionTag); + Map discordUnionPlayers = getDiscordPlayers(unionManager.getUnion(unionTag)); if (getChannels().size() >= settingsManager.getInt(DISCORDCHAT_TEXT_LIMIT)) { @@ -468,25 +389,24 @@ public class DiscordHook implements Listener { try { - availableCategory.createTextChannel(clanTag).complete(); + availableCategory.createTextChannel(unionTag).complete(); UnionsOG.debug(String.format("[%s] Creating a discord text channel for %s clan", - Thread.currentThread().getId(), clanTag)); + Thread.currentThread().getId(), unionTag)); } catch (ErrorResponseException ex) { Response response = ex.getResponse(); - plugin.getLogger().warning(String.format("Could not create a channel for clan %s, error %d - %s", clanTag, + plugin.getLogger().warning(String.format("Could not create a channel for clan %s, error %d - %s", unionTag, response.code, response.message)); return; } - for (Map.Entry entry : discordClanPlayers.entrySet()) { + for (Map.Entry entry : discordUnionPlayers.entrySet()) { - // The map is formed from clan#getMembers (so the clan exists) + // The map is formed from union#getMembers (so the union exists) // noinspection ConstantConditions - updateViewPermission(entry.getValue(), entry.getKey().getClan(), ADD); - updateLeaderRole(entry.getValue(), entry.getKey(), ADD); + updateViewPermission(entry.getValue(), entry.getKey().getUnion(), ADD); } @@ -520,13 +440,13 @@ public class DiscordHook implements Listener { } /** - * Checks if a channel with the specified clan tag exists + * Checks if a channel with the specified union tag exists * * @see #categoryExists(String) */ - public boolean channelExists(String clanTag) { + public boolean channelExists(String unionTag) { - return getChannel(clanTag).isPresent(); + return getChannel(unionTag).isPresent(); } @@ -638,9 +558,9 @@ public class DiscordHook implements Listener { } @Nullable - public Member getMember(@NotNull ClanPlayer clanPlayer) { + public Member getMember(@NotNull UnionPlayer unionPlayer) { - String discordId = accountManager.getDiscordId(clanPlayer.getUniqueId()); + String discordId = accountManager.getDiscordId(unionPlayer.getUniqueId()); return DiscordUtil.getMemberById(discordId); } @@ -648,12 +568,12 @@ public class DiscordHook implements Listener { private void clearChannels(Map discordTagChannels) { // Removes abandoned channels - ArrayList clansToDelete = new ArrayList<>(discordTagChannels.keySet()); - clansToDelete.removeAll(clanTags); - clansToDelete.forEach(clanChannel -> { + ArrayList unionsToDelete = new ArrayList<>(discordTagChannels.keySet()); + unionsToDelete.removeAll(unionTags); + unionsToDelete.forEach(unionChannel -> { - deleteChannel(clanChannel); - discordTagChannels.remove(clanChannel); + deleteChannel(unionChannel); + discordTagChannels.remove(unionChannel); }); @@ -661,15 +581,15 @@ public class DiscordHook implements Listener { Iterator iterator = discordTagChannels.keySet().iterator(); while (iterator.hasNext()) { - String clanChannel = iterator.next(); + String unionChannel = iterator.next(); try { - validateChannel(clanChannel); + validateChannel(unionChannel); } catch (InvalidChannelException ex) { UnionsOG.debug(ex.getMessage()); - deleteChannel(clanChannel); + deleteChannel(unionChannel); iterator.remove(); } catch (ChannelExistsException | ChannelsLimitException ex) { @@ -682,13 +602,13 @@ public class DiscordHook implements Listener { } - private void resetPermissions(Map discordClanChannels) { + private void resetPermissions(Map discordUnionChannels) { - for (Map.Entry channelEntry : discordClanChannels.entrySet()) { + for (Map.Entry channelEntry : discordUnionChannels.entrySet()) { TextChannel channel = channelEntry.getValue(); - Clan clan = clanManager.getClan(channelEntry.getKey()); - Map discordPlayers = getDiscordPlayers(clan); + Union union = unionManager.getUnion(channelEntry.getKey()); + Map discordPlayers = getDiscordPlayers(union); for (Member member : discordPlayers.values()) { @@ -705,7 +625,7 @@ public class DiscordHook implements Listener { } - private void createChannels(Map discordClanChannels) { + private void createChannels(Map discordUnionChannels) { if (!settingsManager.is(DISCORDCHAT_AUTO_CREATION)) { @@ -714,13 +634,13 @@ public class DiscordHook implements Listener { } // Removes already used discord channels from creation - clanTags.removeAll(discordClanChannels.keySet()); + unionTags.removeAll(discordUnionChannels.keySet()); - for (String clan : clanTags) { + for (String union : unionTags) { try { - createChannel(clan); + createChannel(union); } catch (CategoriesLimitException | ChannelsLimitException ex) { @@ -745,82 +665,64 @@ public class DiscordHook implements Listener { } - private void validateChannel(@NotNull String clanTag) + private void validateChannel(@NotNull String unionTag) throws InvalidChannelException, ChannelExistsException, ChannelsLimitException { - Clan clan = clanManager.getClan(clanTag); - if (clan == null) { + Union union = unionManager.getUnion(unionTag); + if (union == null) { - throw new InvalidChannelException(String.format("Clan %s is null", clanTag)); + throw new InvalidChannelException(String.format("Clan %s is null", unionTag)); } - Map discordClanPlayers = getDiscordPlayers(clan); - if (discordClanPlayers.isEmpty()) { + Map discordUnionPlayers = getDiscordPlayers(union); + if (discordUnionPlayers.isEmpty()) { - throw new InvalidChannelException(String.format("Clan %s doesn't have any linked players", clanTag), - "your.clan.doesnt.have.any.linked.player"); + throw new InvalidChannelException(String.format("Clan %s doesn't have any linked players", unionTag), + "your.union.doesnt.have.any.linked.player"); } - if (discordClanPlayers.size() < settingsManager.getInt(DISCORDCHAT_MINIMUM_LINKED_PLAYERS)) { + if (discordUnionPlayers.size() < settingsManager.getInt(DISCORDCHAT_MINIMUM_LINKED_PLAYERS)) { - throw new InvalidChannelException(String.format("Clan %s doesn't have minimum linked players", clanTag), - "your.clan.doesnt.have.minimum.linked.player"); + throw new InvalidChannelException(String.format("Clan %s doesn't have minimum linked players", unionTag), + "your.union.doesnt.have.minimum.linked.player"); } - if (!whitelist.isEmpty() && !whitelist.contains(clan.getTag())) { + if (!whitelist.isEmpty() && !whitelist.contains(union.getTag())) { - throw new InvalidChannelException(String.format("Clan %s is not listed on the whitelist", clanTag), - "your.clan.is.not.on.the.whitelist"); + throw new InvalidChannelException(String.format("Clan %s is not listed on the whitelist", unionTag), + "your.union.is.not.on.the.whitelist"); } - if (channelExists(clanTag)) { + if (channelExists(unionTag)) { - throw new ChannelExistsException(String.format("Channel %s is already exist", clanTag), - "your.clan.already.has.channel"); + throw new ChannelExistsException(String.format("Channel %s is already exist", unionTag), + "your.union.already.has.channel"); } } @NotNull - private Map getDiscordPlayers(@NotNull Clan clan) { + private Map getDiscordPlayers(@NotNull Union union) { - Map discordClanPlayers = new HashMap<>(); - for (ClanPlayer cp : clan.getMembers()) { + Map discordUnionPlayers = new HashMap<>(); + for (UnionPlayer cp : union.getMembers()) { Member member = getMember(cp); if (member != null) { - discordClanPlayers.put(cp, member); + discordUnionPlayers.put(cp, member); } } - return discordClanPlayers; - - } - - private void updateLeaderRole(@NotNull Member member, @NotNull ClanPlayer clanPlayer, DiscordAction action) { - - if (action == ADD && clanPlayer.isLeader()) { - - getGuild().addRoleToMember(member, getLeaderRole()).queue(); - UnionsOG.debug( - String.format("Added leader role to %s (%s) discord member", member.getNickname(), member.getId())); - - } else { - - getGuild().removeRoleFromMember(member, getLeaderRole()).queue(); - UnionsOG.debug(String.format("Revoked leader role from %s (%s) discord member", member.getNickname(), - member.getId())); - - } + return discordUnionPlayers; } @@ -851,9 +753,9 @@ public class DiscordHook implements Listener { } - private void updateViewPermission(@NotNull Member member, @NotNull Clan clan, DiscordAction action) { + private void updateViewPermission(@NotNull Member member, @NotNull Union union, DiscordAction action) { - String tag = clan.getTag(); + String tag = union.getTag(); Optional channel = getChannel(tag); if (channel.isPresent()) { @@ -865,10 +767,10 @@ public class DiscordHook implements Listener { } @SuppressWarnings("BooleanMethodIsAlwaysInverted") - private boolean createChannelSilently(ClanPlayer clanPlayer) { + private boolean createChannelSilently(UnionPlayer unionPlayer) { - Clan clan = clanPlayer.getClan(); - if (clan == null || !settingsManager.is(DISCORDCHAT_AUTO_CREATION)) { + Union union = unionPlayer.getUnion(); + if (union == null || !settingsManager.is(DISCORDCHAT_AUTO_CREATION)) { return false; @@ -876,11 +778,11 @@ public class DiscordHook implements Listener { try { - createChannel(clan.getTag()); + createChannel(union.getTag()); } catch (DiscordHookException ex) { - // Clan is not following the conditions, categories are fulled or discord + // Union is not following the conditions, categories are fulled or discord // reaches the limit, nothing to do here. UnionsOG.debug(ex.getMessage()); diff --git a/src/main/java/net/trueog/unionsog/hooks/papi/PlaceholderResolver.java b/src/main/java/net/trueog/unionsog/hooks/papi/PlaceholderResolver.java index 5060da8a..7125e8c1 100644 --- a/src/main/java/net/trueog/unionsog/hooks/papi/PlaceholderResolver.java +++ b/src/main/java/net/trueog/unionsog/hooks/papi/PlaceholderResolver.java @@ -1,7 +1,7 @@ package net.trueog.unionsog.hooks.papi; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; import org.bukkit.OfflinePlayer; import org.jetbrains.annotations.NotNull; @@ -29,8 +29,8 @@ public abstract class PlaceholderResolver { * Resolves the placeholder and returns its value * * @param player the player involved in the placeholder request - * @param object the subject of the Placeholder, usually a {@link Clan} or - * a {@link ClanPlayer} + * @param object the subject of the Placeholder, usually a {@link Union} or + * a {@link UnionPlayer} * @param method the annotated method * @param placeholder the placeholder to resolve * @param config configuration for the resolver diff --git a/src/main/java/net/trueog/unionsog/hooks/papi/UnionsOGMiniPlaceholders.java b/src/main/java/net/trueog/unionsog/hooks/papi/UnionsOGMiniPlaceholders.java index 27842be9..39ee8d79 100644 --- a/src/main/java/net/trueog/unionsog/hooks/papi/UnionsOGMiniPlaceholders.java +++ b/src/main/java/net/trueog/unionsog/hooks/papi/UnionsOGMiniPlaceholders.java @@ -11,7 +11,7 @@ import java.util.List; public class UnionsOGMiniPlaceholders { private static final List IDENTIFIERS = Arrays.asList("simpleclans", "simpleunions"); - private static final String SAME_CLAN_COLOR = "&a"; + private static final String SAME_UNION_COLOR = "&a"; private static final String RIVAL_COLOR = "&c"; private static final String ALLY_COLOR = "&b"; @@ -29,9 +29,9 @@ public class UnionsOGMiniPlaceholders { registerRelationalColor(identifier); registerPlayerPlaceholders(identifier); - registerClanPlaceholders(identifier); + registerUnionPlaceholders(identifier); registerTopPlayerPlaceholders(identifier); - registerTopClanPlaceholders(identifier); + registerTopUnionPlaceholders(identifier); } @@ -40,7 +40,7 @@ public class UnionsOGMiniPlaceholders { private void registerRelationalColor(@NotNull String identifier) { UtilitiesOG.registerRelationalPlaceholder(identifier + "_color", (player, target) -> nullToEmpty( - placeholders.resolveRelational(player, target, "color", SAME_CLAN_COLOR, RIVAL_COLOR, ALLY_COLOR))); + placeholders.resolveRelational(player, target, "color", SAME_UNION_COLOR, RIVAL_COLOR, ALLY_COLOR))); } @@ -54,15 +54,15 @@ public class UnionsOGMiniPlaceholders { } - private void registerClanPlaceholders(@NotNull String identifier) { + private void registerUnionPlaceholders(@NotNull String identifier) { - for (String placeholder : placeholders.getClanPlaceholders()) { + for (String placeholder : placeholders.getUnionPlaceholders()) { registerAudiencePlaceholder(identifier + "_clan_" + placeholder, "clan_" + placeholder); } - for (String placeholder : placeholders.getUnionPlaceholders()) { + for (String placeholder : placeholders.getUnionPlaceholdersAndAliases()) { registerAudiencePlaceholder(identifier + "_union_" + placeholder, "union_" + placeholder); @@ -81,16 +81,16 @@ public class UnionsOGMiniPlaceholders { } - private void registerTopClanPlaceholders(@NotNull String identifier) { + private void registerTopUnionPlaceholders(@NotNull String identifier) { - for (String placeholder : placeholders.getClanPlaceholders()) { + for (String placeholder : placeholders.getUnionPlaceholders()) { registerPositionedAudiencePlaceholder(identifier + "_topclans_clan_" + placeholder, (player, position) -> placeholders.resolve(player, "topclans_" + position + "_clan_" + placeholder)); } - for (String placeholder : placeholders.getUnionPlaceholders()) { + for (String placeholder : placeholders.getUnionPlaceholdersAndAliases()) { registerPositionedAudiencePlaceholder(identifier + "_topunions_union_" + placeholder, (player, position) -> placeholders.resolve(player, "topunions_" + position + "_union_" + placeholder)); diff --git a/src/main/java/net/trueog/unionsog/hooks/papi/UnionsOGPlaceholderEngine.java b/src/main/java/net/trueog/unionsog/hooks/papi/UnionsOGPlaceholderEngine.java index bdeae489..fc9242d1 100644 --- a/src/main/java/net/trueog/unionsog/hooks/papi/UnionsOGPlaceholderEngine.java +++ b/src/main/java/net/trueog/unionsog/hooks/papi/UnionsOGPlaceholderEngine.java @@ -1,10 +1,10 @@ package net.trueog.unionsog.hooks.papi; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.Helper; import net.trueog.unionsog.UnionsOG; -import net.trueog.unionsog.managers.ClanManager; +import net.trueog.unionsog.managers.UnionManager; import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; @@ -20,19 +20,19 @@ import java.util.regex.Pattern; public class UnionsOGPlaceholderEngine { - private static final Pattern TOP_CLANS_PATTERN = Pattern.compile("(?^topclans_(?\\d+)_)clan_"); + private static final Pattern TOP_UNIONS_PATTERN = Pattern.compile("(?^topclans_(?\\d+)_)clan_"); private static final Pattern TOP_PLAYERS_PATTERN = Pattern.compile("(?^topplayers_(?\\d+)_)"); - private static final String CLAN_COLOR_TAG_PLACEHOLDER = "clan_color_tag"; - private static final String NO_CLAN_COLOR_TAG = "&8None"; + private static final String UNION_COLOR_TAG_PLACEHOLDER = "clan_color_tag"; + private static final String NO_UNION_COLOR_TAG = "&8None"; private final UnionsOG plugin; - private final ClanManager clanManager; + private final UnionManager unionManager; private final Map resolvers = new HashMap<>(); public UnionsOGPlaceholderEngine(@NotNull UnionsOG plugin) { this.plugin = plugin; - clanManager = plugin.getClanManager(); + unionManager = plugin.getUnionManager(); registerResolvers(); } @@ -43,8 +43,8 @@ public class UnionsOGPlaceholderEngine { LinkedHashSet allPlaceholders = new LinkedHashSet<>(); addLegacyPlaceholders(identifier + "_", getPlayerPlaceholders(), allPlaceholders); addLegacyPlaceholders(identifier + "_", getPlayerAliases(), allPlaceholders); - addLegacyPlaceholders(identifier + "_clan_", getClanPlaceholders(), allPlaceholders); - addLegacyPlaceholders(identifier + "_union_", getUnionPlaceholders(), allPlaceholders); + addLegacyPlaceholders(identifier + "_clan_", getUnionPlaceholders(), allPlaceholders); + addLegacyPlaceholders(identifier + "_union_", getUnionPlaceholdersAndAliases(), allPlaceholders); return new ArrayList<>(allPlaceholders); } @@ -52,14 +52,14 @@ public class UnionsOGPlaceholderEngine { @NotNull public List getPlayerPlaceholders() { - return getPlaceholderNames(ClanPlayer.class); + return getPlaceholderNames(UnionPlayer.class); } @NotNull public List getPlayerAliases() { - return getAliases(ClanPlayer.class); + return getAliases(UnionPlayer.class); } @@ -71,22 +71,22 @@ public class UnionsOGPlaceholderEngine { } @NotNull - public List getClanPlaceholders() { + public List getUnionPlaceholders() { - return getPlaceholderNames(Clan.class); + return getPlaceholderNames(Union.class); } @NotNull - public List getUnionPlaceholders() { + public List getUnionPlaceholdersAndAliases() { - return combine(getClanPlaceholders(), getAliases(Clan.class)); + return combine(getUnionPlaceholders(), getAliases(Union.class)); } @Nullable public String resolveRelational(@Nullable Player player1, @Nullable Player player2, @NotNull String params, - @NotNull String sameClanColor, @NotNull String rivalColor, @NotNull String allyColor) + @NotNull String sameUnionColor, @NotNull String rivalColor, @NotNull String allyColor) { if (player1 == null || player2 == null) { @@ -97,17 +97,18 @@ public class UnionsOGPlaceholderEngine { if (params.equalsIgnoreCase("color")) { - ClanPlayer cp1 = clanManager.getClanPlayer(player1); + UnionPlayer cp1 = unionManager.getUnionPlayer(player1); if (cp1 == null) { return ""; } - // noinspection ConstantConditions -- getClanPlayer != null == getClan() != null - if (cp1.getClan().isMember(player2)) { + // noinspection ConstantConditions -- getUnionPlayer != null == getUnion() != + // null + if (cp1.getUnion().isMember(player2)) { - return sameClanColor; + return sameUnionColor; } @@ -136,22 +137,22 @@ public class UnionsOGPlaceholderEngine { params = normalizePlaceholder(params); - ClanPlayer cp = null; + UnionPlayer cp = null; if (player != null) { - cp = clanManager.getAnyClanPlayer(player.getUniqueId()); + cp = unionManager.getAnyUnionPlayer(player.getUniqueId()); } - Clan clan = cp != null ? cp.getClan() : null; + Union union = cp != null ? cp.getUnion() : null; - Matcher matcher = TOP_CLANS_PATTERN.matcher(params); + Matcher matcher = TOP_UNIONS_PATTERN.matcher(params); if (matcher.find()) { int position = Integer.parseInt(matcher.group("position")); - clan = getFromPosition(clanManager.getClans(), position, clanManager::sortClansByKDR); + union = getFromPosition(unionManager.getUnions(), position, unionManager::sortUnionsByKDR); params = params.replace(matcher.group("strip"), ""); - return getValue(player, null, clan, params); + return getValue(player, null, union, params); } @@ -159,33 +160,33 @@ public class UnionsOGPlaceholderEngine { if (matcher.find()) { int position = Integer.parseInt(matcher.group("position")); - cp = getFromPosition(clanManager.getAllClanPlayers(), position, clanManager::sortClanPlayersByKDR); - clan = cp != null ? cp.getClan() : null; + cp = getFromPosition(unionManager.getAllUnionPlayers(), position, unionManager::sortUnionPlayersByKDR); + union = cp != null ? cp.getUnion() : null; params = params.replace(matcher.group("strip"), ""); - return getValue(player, cp, clan, params); + return getValue(player, cp, union, params); } if (cp == null) { - return getNoClanValue(params); + return getNoUnionValue(params); } - if (clan == null && CLAN_COLOR_TAG_PLACEHOLDER.equals(params)) { + if (union == null && UNION_COLOR_TAG_PLACEHOLDER.equals(params)) { - return NO_CLAN_COLOR_TAG; + return NO_UNION_COLOR_TAG; } - return getValue(player, cp, clan, params); + return getValue(player, cp, union, params); } @NotNull - private String getNoClanValue(@NotNull String placeholder) { + private String getNoUnionValue(@NotNull String placeholder) { - return CLAN_COLOR_TAG_PLACEHOLDER.equals(placeholder) ? NO_CLAN_COLOR_TAG : ""; + return UNION_COLOR_TAG_PLACEHOLDER.equals(placeholder) ? NO_UNION_COLOR_TAG : ""; } @@ -210,13 +211,13 @@ public class UnionsOGPlaceholderEngine { } @NotNull - private String getValue(@Nullable OfflinePlayer player, @Nullable ClanPlayer cp, @Nullable Clan clan, + private String getValue(@Nullable OfflinePlayer player, @Nullable UnionPlayer cp, @Nullable Union union, @NotNull String placeholder) { if (placeholder.startsWith("clan_")) { - return getValue(player, clan, placeholder.substring("clan_".length())); + return getValue(player, union, placeholder.substring("clan_".length())); } diff --git a/src/main/java/net/trueog/unionsog/hooks/papi/resolvers/ListSizeResolver.java b/src/main/java/net/trueog/unionsog/hooks/papi/resolvers/ListSizeResolver.java index 6e3b64a0..e3fda3e5 100644 --- a/src/main/java/net/trueog/unionsog/hooks/papi/resolvers/ListSizeResolver.java +++ b/src/main/java/net/trueog/unionsog/hooks/papi/resolvers/ListSizeResolver.java @@ -1,6 +1,6 @@ package net.trueog.unionsog.hooks.papi.resolvers; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.hooks.papi.PlaceholderResolver; import net.trueog.unionsog.utils.VanishUtils; @@ -42,7 +42,7 @@ public class ListSizeResolver extends PlaceholderResolver { if (config.containsKey("filter_vanished")) { size = String.valueOf(VanishUtils - .getNonVanished(player != null ? player.getPlayer() : null, (List) result).size()); + .getNonVanished(player != null ? player.getPlayer() : null, (List) result).size()); } diff --git a/src/main/java/net/trueog/unionsog/hooks/papi/resolvers/MemberStatusResolver.java b/src/main/java/net/trueog/unionsog/hooks/papi/resolvers/MemberStatusResolver.java index f2e34b45..fdcc52f1 100644 --- a/src/main/java/net/trueog/unionsog/hooks/papi/resolvers/MemberStatusResolver.java +++ b/src/main/java/net/trueog/unionsog/hooks/papi/resolvers/MemberStatusResolver.java @@ -1,6 +1,6 @@ package net.trueog.unionsog.hooks.papi.resolvers; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.hooks.papi.PlaceholderBooleanFormatter; import net.trueog.unionsog.hooks.papi.PlaceholderResolver; @@ -33,18 +33,18 @@ public class MemberStatusResolver extends PlaceholderResolver { { boolean result = false; - if (object instanceof ClanPlayer) { + if (object instanceof UnionPlayer) { - ClanPlayer cp = (ClanPlayer) object; + UnionPlayer cp = (UnionPlayer) object; if (placeholder.equals("is_member")) { - result = cp.getClan() != null && !cp.isTrusted(); + result = cp.getUnion() != null && !cp.isTrusted(); } if (placeholder.equals("is_trusted")) { - result = cp.getClan() != null && !cp.isLeader() && cp.isTrusted(); + result = cp.getUnion() != null && cp.isTrusted(); } diff --git a/src/main/java/net/trueog/unionsog/hooks/papi/resolvers/PlayerColorResolver.java b/src/main/java/net/trueog/unionsog/hooks/papi/resolvers/PlayerColorResolver.java index 898223bc..a2b1b6bc 100644 --- a/src/main/java/net/trueog/unionsog/hooks/papi/resolvers/PlayerColorResolver.java +++ b/src/main/java/net/trueog/unionsog/hooks/papi/resolvers/PlayerColorResolver.java @@ -1,6 +1,6 @@ package net.trueog.unionsog.hooks.papi.resolvers; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.hooks.papi.PlaceholderResolver; import net.trueog.unionsog.managers.SettingsManager; @@ -37,14 +37,14 @@ public class PlayerColorResolver extends PlaceholderResolver { @NotNull String placeholder, @NotNull Map config) { - ClanPlayer cp = object instanceof ClanPlayer ? ((ClanPlayer) object) : null; + UnionPlayer cp = object instanceof UnionPlayer ? ((UnionPlayer) object) : null; if (cp == null) return ""; switch (placeholder) { case "clanchat_player_color": { - return getClanChatColor(cp); + return getUnionChatColor(cp); } case "allychat_player_color": { @@ -59,23 +59,17 @@ public class PlayerColorResolver extends PlaceholderResolver { } - private String getClanChatColor(ClanPlayer player) { - - if (player.isLeader()) { - - return settings.getColored(CLANCHAT_LEADER_COLOR); - - } + private String getUnionChatColor(UnionPlayer player) { if (player.isTrusted()) { - return settings.getColored(CLANCHAT_TRUSTED_COLOR); + return settings.getColored(UNIONCHAT_TRUSTED_COLOR); } - if (player.getClan() != null) { + if (player.getUnion() != null) { - return settings.getColored(CLANCHAT_MEMBER_COLOR); + return settings.getColored(UNIONCHAT_MEMBER_COLOR); } @@ -83,13 +77,7 @@ public class PlayerColorResolver extends PlaceholderResolver { } - private String getAllyChatColor(ClanPlayer player) { - - if (player.isLeader()) { - - return settings.getColored(ALLYCHAT_LEADER_COLOR); - - } + private String getAllyChatColor(UnionPlayer player) { if (player.isTrusted()) { @@ -97,7 +85,7 @@ public class PlayerColorResolver extends PlaceholderResolver { } - if (player.getClan() != null) { + if (player.getUnion() != null) { return settings.getColored(ALLYCHAT_MEMBER_COLOR); diff --git a/src/main/java/net/trueog/unionsog/hooks/papi/resolvers/RankingPositionResolver.java b/src/main/java/net/trueog/unionsog/hooks/papi/resolvers/RankingPositionResolver.java index b6d019e9..c71a6462 100644 --- a/src/main/java/net/trueog/unionsog/hooks/papi/resolvers/RankingPositionResolver.java +++ b/src/main/java/net/trueog/unionsog/hooks/papi/resolvers/RankingPositionResolver.java @@ -1,7 +1,7 @@ package net.trueog.unionsog.hooks.papi.resolvers; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.hooks.papi.PlaceholderResolver; import org.bukkit.OfflinePlayer; @@ -32,21 +32,21 @@ public class RankingPositionResolver extends PlaceholderResolver { @NotNull String placeholder, @NotNull Map config) { - if (object instanceof Clan) { + if (object instanceof Union) { - List clans = plugin.getClanManager().getClans(); - plugin.getClanManager().sortClansByKDR(clans); + List unions = plugin.getUnionManager().getUnions(); + plugin.getUnionManager().sortUnionsByKDR(unions); - return String.valueOf(clans.indexOf(object) + 1); + return String.valueOf(unions.indexOf(object) + 1); } - if (object instanceof ClanPlayer) { + if (object instanceof UnionPlayer) { - List clanPlayers = plugin.getClanManager().getAllClanPlayers(); - plugin.getClanManager().sortClanPlayersByKDR(clanPlayers); + List unionPlayers = plugin.getUnionManager().getAllUnionPlayers(); + plugin.getUnionManager().sortUnionPlayersByKDR(unionPlayers); - return String.valueOf(clanPlayers.indexOf(object) + 1); + return String.valueOf(unionPlayers.indexOf(object) + 1); } diff --git a/src/main/java/net/trueog/unionsog/hooks/protection/providers/GriefPreventionProvider.java b/src/main/java/net/trueog/unionsog/hooks/protection/providers/GriefPreventionProvider.java index 7dee660c..a42b7689 100644 --- a/src/main/java/net/trueog/unionsog/hooks/protection/providers/GriefPreventionProvider.java +++ b/src/main/java/net/trueog/unionsog/hooks/protection/providers/GriefPreventionProvider.java @@ -5,12 +5,12 @@ import me.ryanhamshire.GriefPrevention.DataStore; import me.ryanhamshire.GriefPrevention.GriefPrevention; import me.ryanhamshire.GriefPrevention.events.ClaimCreatedEvent; import me.ryanhamshire.GriefPrevention.events.ClaimResizeEvent; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.hooks.protection.Coordinate; import net.trueog.unionsog.hooks.protection.Land; import net.trueog.unionsog.hooks.protection.ProtectionProvider; -import net.trueog.unionsog.managers.ClanManager; +import net.trueog.unionsog.managers.UnionManager; import net.trueog.unionsog.managers.ProtectionManager; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -164,7 +164,7 @@ public class GriefPreventionProvider implements ProtectionProvider, Listener { @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR) private void onResize(ClaimResizeEvent event) { - ClanManager clanManager = UnionsOG.getInstance().getClanManager(); + UnionManager unionManager = UnionsOG.getInstance().getUnionManager(); Land originalLand = getLand(event.getFrom()); Land newLand = getLand(event.getTo()); @@ -176,7 +176,7 @@ public class GriefPreventionProvider implements ProtectionProvider, Listener { for (UUID owner : originalLand.getOwners()) { - ClanPlayer cp = clanManager.getAnyClanPlayer(owner); + UnionPlayer cp = unionManager.getAnyUnionPlayer(owner); if (cp == null) continue; for (ProtectionManager.Action action : ProtectionManager.Action.values()) { diff --git a/src/main/java/net/trueog/unionsog/listeners/FriendlyFire.java b/src/main/java/net/trueog/unionsog/listeners/FriendlyFire.java index 24d4ea0b..f7eb8768 100644 --- a/src/main/java/net/trueog/unionsog/listeners/FriendlyFire.java +++ b/src/main/java/net/trueog/unionsog/listeners/FriendlyFire.java @@ -1,8 +1,8 @@ package net.trueog.unionsog.listeners; import net.trueog.unionsog.ChatBlock; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -47,20 +47,20 @@ public class FriendlyFire extends SCListener { } - ClanPlayer vcp = plugin.getClanManager().getClanPlayer(victim); + UnionPlayer vcp = plugin.getUnionManager().getUnionPlayer(victim); - Clan victimClan = vcp == null ? null : vcp.getClan(); - Clan attackerClan = plugin.getClanManager().getClanByPlayerUniqueId(attacker.getUniqueId()); + Union victimUnion = vcp == null ? null : vcp.getUnion(); + Union attackerUnion = plugin.getUnionManager().getUnionByPlayerUniqueId(attacker.getUniqueId()); - process(event, attacker, vcp, victimClan, attackerClan); + process(event, attacker, vcp, victimUnion, attackerUnion); } - private void process(EntityDamageEvent event, Player attacker, @Nullable ClanPlayer vcp, @Nullable Clan victimClan, - @Nullable Clan attackerClan) + private void process(EntityDamageEvent event, Player attacker, @Nullable UnionPlayer vcp, + @Nullable Union victimUnion, @Nullable Union attackerUnion) { - if (vcp == null || victimClan == null || attackerClan == null) { + if (vcp == null || victimUnion == null || attackerUnion == null) { if (plugin.getSettingsManager().is(SAFE_CIVILIANS)) { @@ -73,7 +73,7 @@ public class FriendlyFire extends SCListener { } - if (vcp.isFriendlyFire() || victimClan.isFriendlyFire() + if (vcp.isFriendlyFire() || victimUnion.isFriendlyFire() || plugin.getSettingsManager().is(GLOBAL_FRIENDLY_FIRE)) { @@ -81,15 +81,15 @@ public class FriendlyFire extends SCListener { } - if (victimClan.equals(attackerClan)) { + if (victimUnion.equals(attackerUnion)) { - warn(attacker, "cannot.attack.clan.member"); + warn(attacker, "cannot.attack.union.member"); event.setCancelled(true); return; } - if (victimClan.isAlly(attackerClan.getTag())) { + if (victimUnion.isAlly(attackerUnion.getTag())) { warn(attacker, "cannot.attack.ally"); event.setCancelled(true); diff --git a/src/main/java/net/trueog/unionsog/listeners/LandProtection.java b/src/main/java/net/trueog/unionsog/listeners/LandProtection.java index ecc746b3..29d53e17 100644 --- a/src/main/java/net/trueog/unionsog/listeners/LandProtection.java +++ b/src/main/java/net/trueog/unionsog/listeners/LandProtection.java @@ -1,12 +1,12 @@ package net.trueog.unionsog.listeners; import net.trueog.unionsog.ChatBlock; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.hooks.protection.Land; import net.trueog.unionsog.hooks.protection.ProtectionProvider; -import net.trueog.unionsog.managers.ClanManager; +import net.trueog.unionsog.managers.UnionManager; import net.trueog.unionsog.managers.ProtectionManager; import net.trueog.unionsog.managers.SettingsManager; import org.bukkit.Bukkit; @@ -48,7 +48,7 @@ public class LandProtection implements Listener { private final UnionsOG plugin; private final ProtectionManager protectionManager; - private final ClanManager clanManager; + private final UnionManager unionManager; private final SettingsManager settingsManager; private final EventPriority priority; @@ -56,7 +56,7 @@ public class LandProtection implements Listener { this.plugin = plugin; protectionManager = plugin.getProtectionManager(); - clanManager = plugin.getClanManager(); + unionManager = plugin.getUnionManager(); settingsManager = plugin.getSettingsManager(); priority = EventPriority.valueOf(settingsManager.getString(WAR_LISTENERS_PRIORITY)); @@ -344,30 +344,23 @@ public class LandProtection implements Listener { Player player = provider.getPlayer(event); if (player == null) return; - Clan clan = clanManager.getClanByPlayerUniqueId(player.getUniqueId()); - if ((clan == null || !clan.isLeader(player)) && settingsManager.is(LAND_CREATION_ONLY_LEADERS)) { + Union union = unionManager.getUnionByPlayerUniqueId(player.getUniqueId()); + if (settingsManager.is(LAND_CREATION_ONLY_ONE_PER_UNION)) { - cancelWithMessage(player, event, "only.leaders.can.create.lands"); - return; + if (union == null) { - } - - if (settingsManager.is(LAND_CREATION_ONLY_ONE_PER_CLAN)) { - - if (clan == null) { - - cancelWithMessage(player, event, "only.clan.members.can.create.lands"); + cancelWithMessage(player, event, "only.union.members.can.create.lands"); return; } - for (ClanPlayer member : clan.getMembers()) { + for (UnionPlayer member : union.getMembers()) { Set lands = protectionManager.getLandsOf(Bukkit.getOfflinePlayer(member.getUniqueId()), player.getWorld()); if (lands.size() > 0) { - cancelWithMessage(player, event, "only.one.land.per.clan"); + cancelWithMessage(player, event, "only.one.land.per.union"); return; } diff --git a/src/main/java/net/trueog/unionsog/listeners/PlayerDeath.java b/src/main/java/net/trueog/unionsog/listeners/PlayerDeath.java index 3dcb2a27..2534a2e4 100644 --- a/src/main/java/net/trueog/unionsog/listeners/PlayerDeath.java +++ b/src/main/java/net/trueog/unionsog/listeners/PlayerDeath.java @@ -43,15 +43,15 @@ public class PlayerDeath extends SCListener { if (isInvalidKill(victim, attacker)) return; - ClanPlayer victimCp = plugin.getClanManager().getCreateClanPlayer(victim.getUniqueId()); - ClanPlayer attackerCp = plugin.getClanManager().getCreateClanPlayer(attacker.getUniqueId()); + UnionPlayer victimCp = plugin.getUnionManager().getCreateUnionPlayer(victim.getUniqueId()); + UnionPlayer attackerCp = plugin.getUnionManager().getCreateUnionPlayer(attacker.getUniqueId()); classifyKill(victimCp, attackerCp); // record death for victim victimCp.addDeath(); - plugin.getStorageManager().updateClanPlayer(victimCp); - plugin.getStorageManager().updateClanPlayer(attackerCp); + plugin.getStorageManager().updateUnionPlayer(victimCp); + plugin.getStorageManager().updateUnionPlayer(attackerCp); } @@ -66,32 +66,32 @@ public class PlayerDeath extends SCListener { } - Clan victimClan = plugin.getClanManager().getClanByPlayerUniqueId(player.getUniqueId()); - Clan killerClan = plugin.getClanManager().getClanByPlayerUniqueId(killer.getUniqueId()); - War war = plugin.getProtectionManager().getWar(victimClan, killerClan); - if (war == null || victimClan == null) { + Union victimUnion = plugin.getUnionManager().getUnionByPlayerUniqueId(player.getUniqueId()); + Union killerUnion = plugin.getUnionManager().getUnionByPlayerUniqueId(killer.getUniqueId()); + War war = plugin.getProtectionManager().getWar(victimUnion, killerUnion); + if (war == null || victimUnion == null) { return; } - war.increaseCasualties(victimClan); + war.increaseCasualties(victimUnion); } - private void classifyKill(@NotNull ClanPlayer victim, @NotNull ClanPlayer attacker) { + private void classifyKill(@NotNull UnionPlayer victim, @NotNull UnionPlayer attacker) { - Clan victimClan = victim.getClan(); - Clan attackerClan = attacker.getClan(); - if (victimClan == null || attackerClan == null) { + Union victimUnion = victim.getUnion(); + Union attackerUnion = attacker.getUnion(); + if (victimUnion == null || attackerUnion == null) { addKill(Kill.Type.CIVILIAN, attacker, victim); - } else if (attackerClan.isRival(victim.getTag())) { + } else if (attackerUnion.isRival(victim.getTag())) { addKill(Kill.Type.RIVAL, attacker, victim); - } else if (attackerClan.isAlly(victimClan.getTag()) || attackerClan.equals(victimClan)) { + } else if (attackerUnion.isAlly(victimUnion.getTag()) || attackerUnion.equals(victimUnion)) { addKill(Kill.Type.ALLY, attacker, victim); @@ -133,8 +133,8 @@ public class PlayerDeath extends SCListener { } AddKillEvent addKillEvent = new AddKillEvent( - plugin.getClanManager().getCreateClanPlayer(attacker.getUniqueId()), - plugin.getClanManager().getCreateClanPlayer(victim.getUniqueId())); + plugin.getUnionManager().getCreateUnionPlayer(attacker.getUniqueId()), + plugin.getUnionManager().getCreateUnionPlayer(victim.getUniqueId())); Bukkit.getServer().getPluginManager().callEvent(addKillEvent); if (addKillEvent.isCancelled()) { @@ -148,7 +148,7 @@ public class PlayerDeath extends SCListener { } - private void addKill(Kill.Type type, ClanPlayer attacker, ClanPlayer victim) { + private void addKill(Kill.Type type, UnionPlayer attacker, UnionPlayer victim) { if (type == null || attacker == null || victim == null) { @@ -157,7 +157,7 @@ public class PlayerDeath extends SCListener { } final Kill kill = new Kill(attacker, victim, LocalDateTime.now()); - if (plugin.getSettingsManager().is(KDR_ENABLE_KILL_DELAY) && plugin.getClanManager().isKillBeforeDelay(kill)) { + if (plugin.getSettingsManager().is(KDR_ENABLE_KILL_DELAY) && plugin.getUnionManager().isKillBeforeDelay(kill)) { return; @@ -194,9 +194,9 @@ public class PlayerDeath extends SCListener { private void saveKill(Kill kill, Kill.Type type) { - plugin.getClanManager().addKill(kill); - ClanPlayer killer = kill.getKiller(); - ClanPlayer victim = kill.getVictim(); + plugin.getUnionManager().addKill(kill); + UnionPlayer killer = kill.getKiller(); + UnionPlayer victim = kill.getVictim(); killer.addKill(type); plugin.getStorageManager().insertKill(killer, victim, type.getShortname(), kill.getTime()); diff --git a/src/main/java/net/trueog/unionsog/listeners/PvPOnlyInWar.java b/src/main/java/net/trueog/unionsog/listeners/PvPOnlyInWar.java index 38b6938b..cb1bcd0f 100644 --- a/src/main/java/net/trueog/unionsog/listeners/PvPOnlyInWar.java +++ b/src/main/java/net/trueog/unionsog/listeners/PvPOnlyInWar.java @@ -1,7 +1,7 @@ package net.trueog.unionsog.listeners; import net.trueog.unionsog.ChatBlock; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import net.trueog.unionsog.UnionsOG; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -37,24 +37,24 @@ public class PvPOnlyInWar extends SCListener { } - Clan attackerClan = plugin.getClanManager().getClanByPlayerUniqueId(attacker.getUniqueId()); - Clan victimClan = plugin.getClanManager().getClanByPlayerUniqueId(victim.getUniqueId()); + Union attackerUnion = plugin.getUnionManager().getUnionByPlayerUniqueId(attacker.getUniqueId()); + Union victimUnion = plugin.getUnionManager().getUnionByPlayerUniqueId(victim.getUniqueId()); if (plugin.getSettingsManager().is(PVP_ONLY_WHILE_IN_WAR)) { - process(event, attacker, victim, attackerClan, victimClan); + process(event, attacker, victim, attackerUnion, victimUnion); } } - private void process(EntityDamageEvent event, Player attacker, Player victim, @Nullable Clan attackerClan, - @Nullable Clan victimClan) + private void process(EntityDamageEvent event, Player attacker, Player victim, @Nullable Union attackerUnion, + @Nullable Union victimUnion) { - if (attackerClan == null || victimClan == null) { + if (attackerUnion == null || victimUnion == null) { - ChatBlock.sendMessageKey(attacker, "must.be.in.clan.to.pvp", victim.getName()); + ChatBlock.sendMessageKey(attacker, "must.be.in.union.to.pvp", victim.getName()); event.setCancelled(true); return; @@ -67,9 +67,9 @@ public class PvPOnlyInWar extends SCListener { } - if (!attackerClan.isWarring(victimClan)) { + if (!attackerUnion.isWarring(victimUnion)) { - ChatBlock.sendMessageKey(attacker, "clans.not.at.war.pvp.denied", victimClan.getName()); + ChatBlock.sendMessageKey(attacker, "unions.not.at.war.pvp.denied", victimUnion.getName()); event.setCancelled(true); } diff --git a/src/main/java/net/trueog/unionsog/listeners/SCPlayerListener.java b/src/main/java/net/trueog/unionsog/listeners/SCPlayerListener.java index 0a97c2c3..c6c6c0ec 100644 --- a/src/main/java/net/trueog/unionsog/listeners/SCPlayerListener.java +++ b/src/main/java/net/trueog/unionsog/listeners/SCPlayerListener.java @@ -1,7 +1,7 @@ package net.trueog.unionsog.listeners; import net.trueog.unionsog.*; -import net.trueog.unionsog.ClanPlayer.Channel; +import net.trueog.unionsog.UnionPlayer.Channel; import net.trueog.unionsog.managers.PermissionsManager; import net.trueog.unionsog.managers.SettingsManager; import org.bukkit.Bukkit; @@ -15,8 +15,8 @@ import org.jetbrains.annotations.NotNull; import java.util.Objects; -import static net.trueog.unionsog.ClanPlayer.Channel.CLAN; -import static net.trueog.unionsog.ClanPlayer.Channel.NONE; +import static net.trueog.unionsog.UnionPlayer.Channel.UNION; +import static net.trueog.unionsog.UnionPlayer.Channel.NONE; import static net.trueog.unionsog.UnionsOG.lang; import static net.trueog.unionsog.chat.SCMessage.Source.SPIGOT; import static net.trueog.unionsog.managers.SettingsManager.ConfigField.*; @@ -42,16 +42,16 @@ public class SCPlayerListener extends SCListener { String[] split = event.getMessage().substring(1).split(" "); String command = split[0]; - if (settingsManager.is(CLANCHAT_TAG_BASED)) { + if (settingsManager.is(UNIONCHAT_TAG_BASED)) { - Clan clan = plugin.getClanManager().getClan(command); - if (clan == null || !clan.isMember(event.getPlayer())) { + Union union = plugin.getUnionManager().getUnion(command); + if (union == null || !union.isMember(event.getPlayer())) { return; } - String replaced = event.getMessage().replaceFirst(command, settingsManager.getString(COMMANDS_CLAN_CHAT)); + String replaced = event.getMessage().replaceFirst(command, settingsManager.getString(COMMANDS_UNION_CHAT)); event.setMessage(replaced); } @@ -68,19 +68,20 @@ public class SCPlayerListener extends SCListener { } - ClanPlayer cp = plugin.getClanManager().getAnyClanPlayer(player.getUniqueId()); + UnionPlayer cp = plugin.getUnionManager().getAnyUnionPlayer(player.getUniqueId()); String tagLabel = cp != null && cp.isTagEnabled() ? cp.getTagLabel() : null; if (settingsManager.is(CHAT_COMPATIBILITY_MODE) && settingsManager.is(DISPLAY_CHAT_TAGS)) { if (tagLabel != null) { - if (player.getDisplayName().contains("{clan}")) { + if (player.getDisplayName().contains("{union}") || player.getDisplayName().contains("{clan}")) { - player.setDisplayName(player.getDisplayName().replace("{clan}", tagLabel)); + player.setDisplayName( + player.getDisplayName().replace("{union}", tagLabel).replace("{clan}", tagLabel)); - } else if (event.getFormat().contains("{clan}")) { + } else if (event.getFormat().contains("{union}") || event.getFormat().contains("{clan}")) { - event.setFormat(event.getFormat().replace("{clan}", tagLabel)); + event.setFormat(event.getFormat().replace("{union}", tagLabel).replace("{clan}", tagLabel)); } else { @@ -91,14 +92,14 @@ public class SCPlayerListener extends SCListener { } else { - event.setFormat(event.getFormat().replace("{clan}", "")); + event.setFormat(event.getFormat().replace("{union}", "").replace("{clan}", "")); event.setFormat(event.getFormat().replace("tagLabel", "")); } } else { - plugin.getClanManager().updateDisplayName(player); + plugin.getUnionManager().updateDisplayName(player); } @@ -114,21 +115,23 @@ public class SCPlayerListener extends SCListener { } - ClanPlayer cp = plugin.getClanManager().getCreateClanPlayer(player.getUniqueId()); + UnionPlayer cp = plugin.getUnionManager().getCreateUnionPlayer(player.getUniqueId()); updatePlayerName(player); - plugin.getClanManager().updateLastSeen(player); - plugin.getClanManager().updateDisplayName(player); + plugin.getUnionManager().updateLastSeen(player); + plugin.getUnionManager().updateDisplayName(player); plugin.getPermissionsManager().addPlayerPermissions(cp); - if (settingsManager.is(BB_SHOW_ON_LOGIN) && cp.isBbEnabled() && cp.getClan() != null) { + if (settingsManager.is(BB_SHOW_ON_LOGIN) && cp.isBbEnabled() && cp.getUnion() != null) { - cp.getClan().displayBb(player, settingsManager.getInt(BB_LOGIN_SIZE)); + cp.getUnion().displayBb(player, settingsManager.getInt(BB_LOGIN_SIZE)); } - plugin.getPermissionsManager().addClanPermissions(cp); + plugin.getPermissionsManager().addUnionPermissions(cp); + + plugin.getProposalManager().remind(player); } @@ -142,11 +145,11 @@ public class SCPlayerListener extends SCListener { } - Clan clan = plugin.getClanManager().getClanByPlayerUniqueId(player.getUniqueId()); + Union union = plugin.getUnionManager().getUnionByPlayerUniqueId(player.getUniqueId()); Location home; - if (clan != null && (home = clan.getHomeLocation()) != null) { + if (union != null && (home = union.getHomeLocation()) != null) { - String homeServer = new Flags(clan.getFlags()).getString("homeServer", ""); + String homeServer = new Flags(union.getFlags()).getString("homeServer", ""); if (homeServer.isEmpty() || plugin.getProxyManager().getServerName().equals(homeServer)) { event.setRespawnLocation(plugin.getTeleportManager().getSafe(home)); @@ -160,15 +163,15 @@ public class SCPlayerListener extends SCListener { @EventHandler public void onPlayerQuit(PlayerQuitEvent event) { - ClanPlayer cp = plugin.getClanManager().getClanPlayer(event.getPlayer()); + UnionPlayer cp = plugin.getUnionManager().getUnionPlayer(event.getPlayer()); if (cp != null) { - Clan clan = Objects.requireNonNull(cp.getClan()); + Union union = Objects.requireNonNull(cp.getUnion()); Bukkit.getScheduler().runTask(plugin, () -> { - if (clan.getOnlineMembers().isEmpty()) { + if (union.getOnlineMembers().isEmpty()) { - plugin.getProtectionManager().setWarExpirationTime(cp.getClan(), + plugin.getProtectionManager().setWarExpirationTime(cp.getUnion(), settingsManager.getMinutes(WAR_DISCONNECT_EXPIRATION_TIME)); } @@ -183,8 +186,8 @@ public class SCPlayerListener extends SCListener { } - plugin.getPermissionsManager().removeClanPlayerPermissions(cp); - plugin.getClanManager().updateLastSeen(event.getPlayer()); + plugin.getPermissionsManager().removeUnionPlayerPermissions(cp); + plugin.getUnionManager().updateLastSeen(event.getPlayer()); plugin.getRequestManager().endPendingRequest(event.getPlayer().getName()); } @@ -198,13 +201,13 @@ public class SCPlayerListener extends SCListener { } - plugin.getClanManager().updateLastSeen(event.getPlayer()); + plugin.getUnionManager().updateLastSeen(event.getPlayer()); } private void registerChatListener() { - EventPriority priority = EventPriority.valueOf(settingsManager.getString(CLANCHAT_LISTENER_PRIORITY)); + EventPriority priority = EventPriority.valueOf(settingsManager.getString(UNIONCHAT_LISTENER_PRIORITY)); plugin.getServer().getPluginManager().registerEvent(AsyncPlayerChatEvent.class, this, priority, (l, e) -> { if (!(e instanceof AsyncPlayerChatEvent)) { @@ -215,7 +218,7 @@ public class SCPlayerListener extends SCListener { AsyncPlayerChatEvent event = (AsyncPlayerChatEvent) e; Player player = event.getPlayer(); - ClanPlayer cp = plugin.getClanManager().getClanPlayer(player.getUniqueId()); + UnionPlayer cp = plugin.getUnionManager().getUnionPlayer(player.getUniqueId()); if (cp == null || isBlacklistedWorld(player)) { return; @@ -227,7 +230,7 @@ public class SCPlayerListener extends SCListener { PermissionsManager pm = plugin.getPermissionsManager(); if ((channel == Channel.ALLY && !pm.has(player, "unionsog.member.ally")) - || (channel == CLAN && !pm.has(player, "unionsog.member.chat"))) + || (channel == UNION && !pm.has(player, "unionsog.member.chat"))) { ChatBlock.sendMessage(player, ChatColor.RED + lang("insufficient.permissions", player)); @@ -246,10 +249,10 @@ public class SCPlayerListener extends SCListener { private void updatePlayerName(@NotNull final Player player) { - final ClanPlayer cp = plugin.getClanManager().getAnyClanPlayer(player.getUniqueId()); + final UnionPlayer cp = plugin.getUnionManager().getAnyUnionPlayer(player.getUniqueId()); - ClanPlayer duplicate = null; - for (ClanPlayer other : plugin.getClanManager().getAllClanPlayers()) { + UnionPlayer duplicate = null; + for (UnionPlayer other : plugin.getUnionManager().getAllUnionPlayers()) { if (other.getName().equals(player.getName()) && !other.getUniqueId().equals(player.getUniqueId())) { diff --git a/src/main/java/net/trueog/unionsog/listeners/TamableMobsSharing.java b/src/main/java/net/trueog/unionsog/listeners/TamableMobsSharing.java index f29846e3..e449c8f9 100644 --- a/src/main/java/net/trueog/unionsog/listeners/TamableMobsSharing.java +++ b/src/main/java/net/trueog/unionsog/listeners/TamableMobsSharing.java @@ -1,8 +1,8 @@ package net.trueog.unionsog.listeners; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; -import net.trueog.unionsog.managers.ClanManager; +import net.trueog.unionsog.managers.UnionManager; import net.trueog.unionsog.managers.SettingsManager; import org.bukkit.entity.AnimalTamer; import org.bukkit.entity.Player; @@ -21,12 +21,12 @@ import static net.trueog.unionsog.managers.SettingsManager.ConfigField.TAMABLE_M public class TamableMobsSharing implements Listener { private final SettingsManager settings; - private final ClanManager clanManager; + private final UnionManager unionManager; public TamableMobsSharing(@NotNull UnionsOG plugin) { settings = plugin.getSettingsManager(); - clanManager = plugin.getClanManager(); + unionManager = plugin.getUnionManager(); } @@ -37,8 +37,8 @@ public class TamableMobsSharing implements Listener { if (event.getEntity() instanceof Wolf && event.getDamager() instanceof Player) { - ClanPlayer cp = clanManager.getAnyClanPlayer(event.getDamager().getUniqueId()); - if (cp == null || cp.getClan() == null) { + UnionPlayer cp = unionManager.getAnyUnionPlayer(event.getDamager().getUniqueId()); + if (cp == null || cp.getUnion() == null) { return; @@ -46,9 +46,9 @@ public class TamableMobsSharing implements Listener { Wolf wolf = (Wolf) event.getEntity(); AnimalTamer owner = wolf.getOwner(); - if (owner != null && cp.getClan().isMember(owner.getUniqueId())) { + if (owner != null && cp.getUnion().isMember(owner.getUniqueId())) { - // Sets the wolf to friendly if the attacker is one out of his clan + // Sets the wolf to friendly if the attacker is one out of his union wolf.setAngry(false); } @@ -66,8 +66,8 @@ public class TamableMobsSharing implements Listener { if (event.getEntity() instanceof Tameable && event.getTarget() instanceof Player) { - ClanPlayer cp = clanManager.getAnyClanPlayer(event.getTarget().getUniqueId()); - if (cp == null || cp.getClan() == null) { + UnionPlayer cp = unionManager.getAnyUnionPlayer(event.getTarget().getUniqueId()); + if (cp == null || cp.getUnion() == null) { return; @@ -81,9 +81,9 @@ public class TamableMobsSharing implements Listener { } - if (cp.getClan().isMember(owner.getUniqueId())) { + if (cp.getUnion().isMember(owner.getUniqueId())) { - // cancels the event if the attacker is one out of his clan + // cancels the event if the attacker is one out of his union event.setCancelled(true); } @@ -100,8 +100,8 @@ public class TamableMobsSharing implements Listener { if (settings.is(TAMABLE_MOBS_SHARING) && event.getRightClicked() instanceof Tameable) { Player player = event.getPlayer(); - ClanPlayer cp = clanManager.getAnyClanPlayer(player.getUniqueId()); - if (cp == null || cp.getClan() == null) { + UnionPlayer cp = unionManager.getAnyUnionPlayer(player.getUniqueId()); + if (cp == null || cp.getUnion() == null) { return; @@ -117,7 +117,7 @@ public class TamableMobsSharing implements Listener { } - if (cp.getClan().isMember(tamed.getOwner().getUniqueId())) { + if (cp.getUnion().isMember(tamed.getOwner().getUniqueId())) { tamed.setOwner(player); diff --git a/src/main/java/net/trueog/unionsog/loggers/BankLog.java b/src/main/java/net/trueog/unionsog/loggers/BankLog.java index 79896dc9..27c0c26d 100644 --- a/src/main/java/net/trueog/unionsog/loggers/BankLog.java +++ b/src/main/java/net/trueog/unionsog/loggers/BankLog.java @@ -1,8 +1,8 @@ package net.trueog.unionsog.loggers; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import net.trueog.unionsog.EconomyResponse; -import net.trueog.unionsog.events.ClanBalanceUpdateEvent; +import net.trueog.unionsog.events.UnionBalanceUpdateEvent; import org.jetbrains.annotations.NotNull; import java.text.DecimalFormat; @@ -23,18 +23,18 @@ public class BankLog { private final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd - HH:mm"); private final BankOperator operator; - private final Clan clan; + private final Union union; private final EconomyResponse economyResponse; private final BankLogger.Operation operation; - private final ClanBalanceUpdateEvent.Cause cause; + private final UnionBalanceUpdateEvent.Cause cause; private final double amount; - public BankLog(@NotNull BankOperator operator, @NotNull Clan clan, @NotNull EconomyResponse economyResponse, - @NotNull BankLogger.Operation operation, ClanBalanceUpdateEvent.Cause cause, double amount) + public BankLog(@NotNull BankOperator operator, @NotNull Union union, @NotNull EconomyResponse economyResponse, + @NotNull BankLogger.Operation operation, UnionBalanceUpdateEvent.Cause cause, double amount) { this.operator = operator; - this.clan = clan; + this.union = union; this.economyResponse = economyResponse; this.operation = operation; this.cause = cause; @@ -54,13 +54,13 @@ public class BankLog { List values = new ArrayList<>(); values.add(dateFormat.format(new Date())); values.add(operator.getName()); - values.add(clan.getName()); + values.add(union.getName()); values.add(economyResponse.name()); values.add(operation.name()); values.add(cause.name()); values.add(decimalFormat.format(operator.getBalance())); values.add(decimalFormat.format(amount)); - values.add(decimalFormat.format(clan.getBalance())); + values.add(decimalFormat.format(union.getBalance())); return values; @@ -72,9 +72,9 @@ public class BankLog { } - public Clan getClan() { + public Union getUnion() { - return clan; + return union; } @@ -90,7 +90,7 @@ public class BankLog { } - public ClanBalanceUpdateEvent.Cause getCause() { + public UnionBalanceUpdateEvent.Cause getCause() { return cause; diff --git a/src/main/java/net/trueog/unionsog/loggers/BankOperator.java b/src/main/java/net/trueog/unionsog/loggers/BankOperator.java index d65ba4b4..9f5fecbb 100644 --- a/src/main/java/net/trueog/unionsog/loggers/BankOperator.java +++ b/src/main/java/net/trueog/unionsog/loggers/BankOperator.java @@ -1,6 +1,6 @@ package net.trueog.unionsog.loggers; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; @@ -17,7 +17,7 @@ public class BankOperator { } - public BankOperator(@NotNull ClanPlayer sender, double balance) { + public BankOperator(@NotNull UnionPlayer sender, double balance) { this(sender.getName(), balance); diff --git a/src/main/java/net/trueog/unionsog/loggers/CSVBankLogger.java b/src/main/java/net/trueog/unionsog/loggers/CSVBankLogger.java index c25e3223..228cc252 100644 --- a/src/main/java/net/trueog/unionsog/loggers/CSVBankLogger.java +++ b/src/main/java/net/trueog/unionsog/loggers/CSVBankLogger.java @@ -24,7 +24,7 @@ import static net.trueog.unionsog.managers.SettingsManager.ConfigField.ECONOMY_B * * 
{@code
  * CSVBankLogger bankLogger = new CSVBankLogger(plugin);
- * bankLogger.log(new BankLog(sender, clan, economyResponse, operation, cause, amount));
+ * bankLogger.log(new BankLog(sender, union, economyResponse, operation, cause, amount));
  * }
* * @since 2.15.3 diff --git a/src/main/java/net/trueog/unionsog/managers/ChatManager.java b/src/main/java/net/trueog/unionsog/managers/ChatManager.java index d6edf5e0..08e91dd3 100644 --- a/src/main/java/net/trueog/unionsog/managers/ChatManager.java +++ b/src/main/java/net/trueog/unionsog/managers/ChatManager.java @@ -5,8 +5,8 @@ import github.scarsz.discordsrv.api.Subscribe; import github.scarsz.discordsrv.api.events.DiscordReadyEvent; import github.scarsz.discordsrv.dependencies.jda.api.JDA; import me.clip.placeholderapi.PlaceholderAPI; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.Helper; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.chat.ChatHandler; @@ -23,9 +23,8 @@ import java.util.*; import java.util.logging.Level; import java.util.stream.Collectors; -import static net.trueog.unionsog.ClanPlayer.Channel; +import static net.trueog.unionsog.UnionPlayer.Channel; import static net.trueog.unionsog.chat.SCMessage.Source; -import static net.trueog.unionsog.chat.SCMessage.Source.DISCORD; import static net.trueog.unionsog.managers.SettingsManager.ConfigField; import static net.trueog.unionsog.managers.SettingsManager.ConfigField.*; import static org.bukkit.Bukkit.getPluginManager; @@ -77,9 +76,9 @@ public final class ChatManager { public void processChat(@NotNull SCMessage message) { - Clan clan = Objects.requireNonNull(message.getSender().getClan(), "Clan cannot be null"); + Union union = Objects.requireNonNull(message.getSender().getUnion(), "Clan cannot be null"); - List receivers = new ArrayList<>(); + List receivers = new ArrayList<>(); switch (message.getChannel()) { case ALLY: @@ -89,19 +88,19 @@ public final class ChatManager { } - receivers.addAll(getOnlineAllyMembers(clan).stream().filter(allyMember -> !allyMember.isMutedAlly()) + receivers.addAll(getOnlineAllyMembers(union).stream().filter(allyMember -> !allyMember.isMutedAlly()) .collect(Collectors.toList())); - receivers.addAll(clan.getOnlineMembers().stream().filter(onlineMember -> !onlineMember.isMutedAlly()) + receivers.addAll(union.getOnlineMembers().stream().filter(onlineMember -> !onlineMember.isMutedAlly()) .collect(Collectors.toList())); break; - case CLAN: - if (!plugin.getSettingsManager().is(CLANCHAT_ENABLE)) { + case UNION: + if (!plugin.getSettingsManager().is(UNIONCHAT_ENABLE)) { return; } - receivers.addAll(clan.getOnlineMembers().stream().filter(member -> !member.isMuted()) + receivers.addAll(union.getOnlineMembers().stream().filter(member -> !member.isMuted()) .collect(Collectors.toList())); } @@ -120,12 +119,12 @@ public final class ChatManager { } - public void processChat(@NotNull Source source, @NotNull Channel channel, @NotNull ClanPlayer clanPlayer, + public void processChat(@NotNull Source source, @NotNull Channel channel, @NotNull UnionPlayer unionPlayer, String message) { - Objects.requireNonNull(clanPlayer.getClan(), "Clan cannot be null"); - processChat(new SCMessage(source, channel, clanPlayer, message)); + Objects.requireNonNull(unionPlayer.getUnion(), "Clan cannot be null"); + processChat(new SCMessage(source, channel, unionPlayer, message)); } @@ -138,17 +137,11 @@ public final class ChatManager { public String parseChatFormat(String format, SCMessage message, Map placeholders) { SettingsManager sm = plugin.getSettingsManager(); - ClanPlayer sender = message.getSender(); + UnionPlayer sender = message.getSender(); - String leaderColor = sm.getColored(ConfigField.valueOf(message.getChannel() + "CHAT_LEADER_COLOR")); String memberColor = sm.getColored(ConfigField.valueOf(message.getChannel() + "CHAT_MEMBER_COLOR")); String trustedColor = sm.getColored(ConfigField.valueOf(message.getChannel() + "CHAT_TRUSTED_COLOR")); - String rank = sender.getRankId().isEmpty() ? null : ChatUtils.parseColors(sender.getRankDisplayName()); - ConfigField configField = ConfigField.valueOf( - String.format("%sCHAT_RANK", message.getSource() == DISCORD ? "DISCORD" : message.getChannel())); - String rankFormat = (rank != null) ? sm.getColored(configField).replace("%rank%", rank) : ""; - if (placeholders != null) { for (Map.Entry e : placeholders.entrySet()) { @@ -160,11 +153,10 @@ public final class ChatManager { } String parsedFormat = ChatUtils.parseColors(format) - .replace("%clan%", Objects.requireNonNull(sender.getClan()).getColorTag()) - .replace("%clean-tag%", sender.getClan().getTag()) - .replace("%nick-color%", - (sender.isLeader() ? leaderColor : sender.isTrusted() ? trustedColor : memberColor)) - .replace("%player%", sender.getName()).replace("%rank%", rankFormat); + .replace("%union%", Objects.requireNonNull(sender.getUnion()).getColorTag()) + .replace("%clean-tag%", sender.getUnion().getTag()) + .replace("%nick-color%", (sender.isTrusted() ? trustedColor : memberColor)) + .replace("%player%", sender.getName()); parsedFormat = parseWithPapi(message.getSender(), parsedFormat).replace("%message%", message.getContent()); return parsedFormat; @@ -177,7 +169,7 @@ public final class ChatManager { } - private String parseWithPapi(ClanPlayer cp, String message) { + private String parseWithPapi(UnionPlayer cp, String message) { if (getPluginManager().getPlugin("PlaceholderAPI") == null) { @@ -225,9 +217,9 @@ public final class ChatManager { } - private List getOnlineAllyMembers(Clan clan) { + private List getOnlineAllyMembers(Union union) { - return clan.getAllAllyMembers().stream().filter(allyPlayer -> allyPlayer.toPlayer() != null) + return union.getAllAllyMembers().stream().filter(allyPlayer -> allyPlayer.toPlayer() != null) .collect(Collectors.toList()); } diff --git a/src/main/java/net/trueog/unionsog/managers/PermissionsManager.java b/src/main/java/net/trueog/unionsog/managers/PermissionsManager.java index 00a784b6..69691878 100644 --- a/src/main/java/net/trueog/unionsog/managers/PermissionsManager.java +++ b/src/main/java/net/trueog/unionsog/managers/PermissionsManager.java @@ -9,18 +9,16 @@ import net.trueog.unionsog.events.EconomyTransactionEvent; import net.trueog.unionsog.events.EconomyTransactionEvent.Cause; import net.trueog.diamondbankog.api.DiamondBankAPIJava; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.entity.Player; import org.bukkit.permissions.PermissionAttachment; import org.bukkit.plugin.RegisteredServiceProvider; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.text.MessageFormat; import java.util.HashMap; import java.util.List; +import java.util.UUID; -import static net.trueog.unionsog.UnionsOG.lang; import static net.trueog.unionsog.managers.SettingsManager.ConfigField.ENABLE_AUTO_GROUPS; import static net.trueog.unionsog.managers.SettingsManager.ConfigField.PERMISSIONS_AUTO_GROUP_GROUPNAME; import static org.bukkit.Bukkit.getPluginManager; @@ -86,31 +84,31 @@ public final class PermissionsManager { } /** - * Loads the permissions for each clan from the config + * Loads the permissions for each union from the config */ public void loadPermissions() { permissions.clear(); - for (Clan clan : plugin.getClanManager().getClans()) { + for (Union union : plugin.getUnionManager().getUnions()) { - permissions.put(clan.getTag(), UnionsOG.getInstance().getSettingsManager().getConfig() - .getStringList("permissions." + clan.getTag())); + permissions.put(union.getTag(), UnionsOG.getInstance().getSettingsManager().getConfig() + .getStringList("permissions." + union.getTag())); } } /** - * Saves the permissions for each clan from the config + * Saves the permissions for each union from the config */ public void savePermissions() { - for (Clan clan : plugin.getClanManager().getClans()) { + for (Union union : plugin.getUnionManager().getUnions()) { - if (permissions.containsKey(clan.getTag())) { + if (permissions.containsKey(union.getTag())) { - UnionsOG.getInstance().getSettingsManager().getConfig().set("permissions." + clan.getTag(), - getPermissions(clan)); + UnionsOG.getInstance().getSettingsManager().getConfig().set("permissions." + union.getTag(), + getPermissions(union)); } @@ -119,11 +117,11 @@ public final class PermissionsManager { } /** - * Adds all permissions for a clan + * Adds all permissions for a union */ - public void updateClanPermissions(Clan clan) { + public void updateUnionPermissions(Union union) { - for (ClanPlayer cp : clan.getMembers()) { + for (UnionPlayer cp : union.getMembers()) { addPlayerPermissions(cp); @@ -134,7 +132,7 @@ public final class PermissionsManager { /** * Adds permissions for a player */ - public void addPlayerPermissions(@Nullable ClanPlayer cp) { + public void addPlayerPermissions(@Nullable UnionPlayer cp) { if (cp == null) { @@ -142,8 +140,8 @@ public final class PermissionsManager { } - Clan clan = cp.getClan(); - if (clan == null) { + Union union = cp.getUnion(); + if (union == null) { return; @@ -152,7 +150,7 @@ public final class PermissionsManager { Player player = cp.toPlayer(); if (player != null) { - if (permissions.containsKey(clan.getTag())) { + if (permissions.containsKey(union.getTag())) { if (!permAttaches.containsKey(player)) { @@ -160,8 +158,8 @@ public final class PermissionsManager { } - // Adds all permissions from his clan - for (String perm : getPermissions(clan)) { + // Adds all permissions from his union + for (String perm : getPermissions(union)) { permAttaches.get(player).setPermission(perm, true); @@ -169,7 +167,7 @@ public final class PermissionsManager { if (plugin.getSettingsManager().is(PERMISSIONS_AUTO_GROUP_GROUPNAME)) { - permAttaches.get(player).setPermission("group." + clan.getTag(), true); + permAttaches.get(player).setPermission("group." + union.getTag(), true); } @@ -182,14 +180,14 @@ public final class PermissionsManager { } /** - * Removes permissions for a clan (when it gets disbanded for example) + * Removes permissions for a union (when it gets disbanded for example) */ - public void removeClanPermissions(Clan clan) { + public void removeUnionPermissions(Union union) { - for (ClanPlayer cp : clan.getMembers()) { + for (UnionPlayer cp : union.getMembers()) { - removeClanPlayerPermissions(cp); - removeClanPermissions(cp); + removeUnionPlayerPermissions(cp); + removeUnionPermissions(cp); } @@ -198,12 +196,12 @@ public final class PermissionsManager { /** * Removes permissions for a player (when he gets kicked for example) */ - public void removeClanPlayerPermissions(@Nullable ClanPlayer cp) { + public void removeUnionPlayerPermissions(@Nullable UnionPlayer cp) { - if (cp != null && cp.getClan() != null && cp.toPlayer() != null) { + if (cp != null && cp.getUnion() != null && cp.toPlayer() != null) { Player player = cp.toPlayer(); - if (player != null && permissions.containsKey(cp.getClan().getTag()) && permAttaches.containsKey(player)) { + if (player != null && permissions.containsKey(cp.getUnion().getTag()) && permAttaches.containsKey(player)) { permAttaches.get(player).remove(); permAttaches.remove(player); @@ -215,9 +213,9 @@ public final class PermissionsManager { } /** - * Removes permissions linked to a clan from the player + * Removes permissions linked to a union from the player */ - public void removeClanPermissions(ClanPlayer cp) { + public void removeUnionPermissions(UnionPlayer cp) { if (!plugin.getSettingsManager().is(ENABLE_AUTO_GROUPS)) { @@ -232,7 +230,6 @@ public final class PermissionsManager { user.data().remove(InheritanceNode.builder("clan_" + cp.getTag()).build()); user.data().remove(InheritanceNode.builder("sc_untrusted").build()); user.data().remove(InheritanceNode.builder("sc_trusted").build()); - user.data().remove(InheritanceNode.builder("sc_leader").build()); luckPerms.getUserManager().saveUser(user); } @@ -240,11 +237,11 @@ public final class PermissionsManager { } /** - * @return the permissions for a clan + * @return the permissions for a union */ - public List getPermissions(Clan clan) { + public List getPermissions(Union union) { - return permissions.get(clan.getTag()); + return permissions.get(union.getTag()); } @@ -432,6 +429,38 @@ public final class PermissionsManager { * @return {@code true} if the grant was successful, {@code false} otherwise. * @see EconomyTransactionEvent */ + /** + * Grants the Shards to a player's DiamondBank-OG bank whether or not they are + * online. No {@link EconomyTransactionEvent} is fired, since the transaction + * does not need the player present. + * + * @param uuid the player receiving the Shards + * @param shards the amount of Shards to grant + * @param reason what the payout is for, recorded by DiamondBank-OG + * @return {@code true} if the grant was successful, {@code false} otherwise + */ + public boolean grantPlayerShards(@NotNull UUID uuid, long shards, @NotNull String reason) { + + if (economy == null) { + + return false; + + } + + try { + + economy.addToPlayerBankShards(uuid, shards, "Unions-OG: " + reason, null); + return true; + + } catch (Exception e) { + + plugin.getLogger().severe("Failed to grant " + shards + " Shards to " + uuid + ": " + e.getMessage()); + return false; + + } + + } + public boolean grantPlayerShards(@NotNull Player player, long shards, @Nullable Cause cause) { if (economy == null) { @@ -583,174 +612,9 @@ public final class PermissionsManager { } /** - * Checks if the player has the rank permission or the permission level, and the - * equivalent Bukkit permission - * - * @param player the player - * @param permission the rank permission - * @param notify notify the player if they don't have permission - * @deprecated use - * {@link PermissionsManager#has(Player, RankPermission, boolean)} - * or {@link PermissionsManager#has(Player, String)} + * Gives the player permissions linked to a union */ - @Deprecated - public boolean has(Player player, RankPermission permission, PermissionLevel level, boolean notify) { - - if (player == null || permission == null) { - - return false; - - } - - ClanPlayer clanPlayer = plugin.getClanManager().getClanPlayer(player); - if (clanPlayer == null) { - - return false; - - } - - boolean hasBukkitPermission = has(player, permission.getBukkitPermission()); - if (!hasBukkitPermission) { - - return false; - - } - - boolean hasLevel = hasLevel(clanPlayer, level); - - boolean hasRankPermission = false; - String rankName = clanPlayer.getRankId(); - Clan clan = clanPlayer.getClan(); - // noinspection ConstantConditions - if (clan.hasRank(rankName)) { - - // noinspection ConstantConditions - hasRankPermission = clan.getRank(rankName).getPermissions().contains(permission.toString()); - - } else if (!rankName.isEmpty()) { - - clanPlayer.setRank(null); - - } - - if (notify && !hasLevel && !hasRankPermission) { - - ChatBlock.sendMessage(player, - ChatColor.RED - + MessageFormat.format(lang("you.must.be.0.or.have.the.permission.1.to.use.this", player), - level == PermissionLevel.LEADER ? lang("leader", player) : lang("trusted", player), - permission.toString())); - - } - - return hasLevel || hasRankPermission; - - } - - /** - * Checks if the player has the rank permission or the permission level, and the - * equivalent Bukkit permission - * - * @param player the player - * @param permission the rank permission - * @param notify notify the player if they don't have permission - */ - public boolean has(Player player, RankPermission permission, boolean notify) { - - if (player == null || permission == null) { - - return false; - - } - - ClanPlayer clanPlayer = plugin.getClanManager().getClanPlayer(player); - if (clanPlayer == null) { - - if (notify) { - - player.sendMessage(ChatColor.RED + lang("not.a.member.of.any.clan", player)); - - } - - return false; - - } - - boolean hasBukkitPermission = has(player, permission.getBukkitPermission()); - if (!hasBukkitPermission) { - - if (notify) { - - ChatBlock.sendMessage(player, ChatColor.RED + lang("insufficient.permissions", player)); - - } - - return false; - - } - - boolean hasLevel = hasLevel(clanPlayer, permission.getPermissionLevel()); - boolean hasRankPermission = false; - String rankName = clanPlayer.getRankId(); - Clan clan = clanPlayer.getClan(); - if (clan != null) { - - Rank rank = clan.getRank(rankName); - if (rank != null) { - - hasRankPermission = rank.getPermissions().contains(permission.toString()); - if (!hasRankPermission && permission == RankPermission.COLOR) { - - hasRankPermission = rank.getPermissions().contains("modtag"); - - } - - } - - } else if (!rankName.isEmpty()) { - - clanPlayer.setRank(null); - - } - - if (notify && !hasLevel && !hasRankPermission) { - - ChatBlock.sendMessage(player, - ChatColor.RED - + MessageFormat.format(lang("you.must.be.0.or.have.the.permission.1.to.use.this", player), - permission.getPermissionLevel() == PermissionLevel.LEADER ? lang("leader", player) - : lang("trusted", player), - permission.toString())); - - } - - return hasLevel || hasRankPermission; - - } - - private boolean hasLevel(@NotNull ClanPlayer cp, @Nullable PermissionLevel level) { - - if (level != null) { - - switch (level) { - - case LEADER: - return cp.isLeader(); - case TRUSTED: - return cp.isTrusted(); - - } - - } - - return false; - - } - - /** - * Gives the player permissions linked to a clan - */ - public void addClanPermissions(ClanPlayer cp) { + public void addUnionPermissions(UnionPlayer cp) { if (!plugin.getSettingsManager().is(ENABLE_AUTO_GROUPS) || cp == null || luckPerms == null) { @@ -766,18 +630,13 @@ public final class PermissionsManager { } User user = luckPerms.getPlayerAdapter(Player.class).getUser(player); - user.data().remove(InheritanceNode.builder("sc_leader").build()); user.data().remove(InheritanceNode.builder("sc_trusted").build()); user.data().remove(InheritanceNode.builder("sc_untrusted").build()); - if (cp.getClan() != null) { + if (cp.getUnion() != null) { user.data().add(InheritanceNode.builder("clan_" + cp.getTag()).build()); - if (cp.isLeader()) { - - user.data().add(InheritanceNode.builder("sc_leader").build()); - - } else if (cp.isTrusted()) { + if (cp.isTrusted()) { user.data().add(InheritanceNode.builder("sc_trusted").build()); diff --git a/src/main/java/net/trueog/unionsog/managers/ProposalManager.java b/src/main/java/net/trueog/unionsog/managers/ProposalManager.java new file mode 100644 index 00000000..2f2b0b2f --- /dev/null +++ b/src/main/java/net/trueog/unionsog/managers/ProposalManager.java @@ -0,0 +1,374 @@ +package net.trueog.unionsog.managers; + +import net.trueog.unionsog.*; +import net.trueog.unionsog.ui.frames.ProposalFrame; +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.World; +import org.bukkit.entity.Player; +import org.bukkit.scheduler.BukkitRunnable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.TimeUnit; + +import static net.trueog.unionsog.UnionsOG.lang; +import static net.trueog.unionsog.managers.SettingsManager.ConfigField.ENABLE_GUI; +import static org.bukkit.ChatColor.AQUA; +import static org.bukkit.ChatColor.RED; + +/** + * Handles the decisions a union's own members vote on. + *

+ * A union can only have one proposal open at a time. It passes as soon as half + * of the union's members are in favour and is rejected as soon as half can no + * longer be reached. Votes are stored in the database, so a member who is + * offline when a proposal opens can still vote the next time they log in. + *

+ */ +public final class ProposalManager { + + /** + * How long a proposal stays open before it is dropped + */ + public static final long LIFETIME_MILLIS = TimeUnit.DAYS.toMillis(7); + + private static final long CHECK_INTERVAL_TICKS = 20L * 60L * 5L; + private static final long JOIN_PROMPT_DELAY_TICKS = 20L; + + private final UnionsOG plugin; + private final Map proposals = new HashMap<>(); + /** Members already shown a given proposal, so it is only presented once. */ + private final Set presented = new HashSet<>(); + + public ProposalManager() { + + plugin = UnionsOG.getInstance(); + proposals.putAll(plugin.getStorageManager().retrieveProposals()); + expiryTask(); + + } + + public @Nullable Proposal getProposal(@Nullable Union union) { + + return union == null ? null : proposals.get(union.getTag()); + + } + + /** + * Opens a proposal and casts the proposer's vote in favour. + * + * @param proposer the member opening the proposal + * @param union the union voting on it + * @param type what is being proposed + * @param target the proposal's payload, empty when it does not need one + * @return whether the proposal was opened + */ + public boolean propose(@NotNull UnionPlayer proposer, @NotNull Union union, @NotNull ProposalType type, + @NotNull String target) + { + + if (proposals.containsKey(union.getTag())) { + + ChatBlock.sendMessage(proposer, RED + lang("proposal.already.open", proposer)); + return false; + + } + + Proposal proposal = new Proposal(type, union.getTag(), proposer.getUniqueId(), target, + System.currentTimeMillis()); + proposal.putVote(proposer.getUniqueId(), true); + proposals.put(union.getTag(), proposal); + + union.memberAnnounce(AQUA + lang("proposal.opened", proposer.getName(), describe(proposal, union))); + union.memberAnnounce(AQUA + lang("proposal.how.to.vote")); + + return tally(union, proposal); + + } + + /** + * Records a member's vote on their union's open proposal. + * + * @param voter the voting member + * @param union their union + * @param inFavour whether they are in favour + */ + public void vote(@NotNull UnionPlayer voter, @NotNull Union union, boolean inFavour) { + + Proposal proposal = proposals.get(union.getTag()); + if (proposal == null) { + + ChatBlock.sendMessage(voter, RED + lang("proposal.none.open", voter)); + return; + + } + + proposal.putVote(voter.getUniqueId(), inFavour); + ChatBlock.sendMessage(voter, AQUA + lang(inFavour ? "proposal.voted.yes" : "proposal.voted.no", voter)); + + tally(union, proposal); + + } + + /** + * Tells a member about the proposal their union has open, if any. + * + * @param player the member logging in + */ + public void remind(@NotNull Player player) { + + UnionPlayer cp = plugin.getUnionManager().getUnionPlayer(player); + Union union = cp != null ? cp.getUnion() : null; + Proposal proposal = getProposal(union); + if (cp == null || union == null || proposal == null || proposal.hasVoted(cp.getUniqueId())) { + + return; + + } + + if (!presented.add(key(union.getTag(), cp.getUniqueId()))) { + + return; + + } + + ChatBlock.sendMessage(player, AQUA + lang("proposal.pending", player, describe(proposal, union))); + + if (!plugin.getSettingsManager().is(ENABLE_GUI)) { + + ChatBlock.sendMessage(player, AQUA + lang("proposal.how.to.vote", player)); + return; + + } + + // The inventory cannot be opened while the join is still being handled. + Bukkit.getScheduler().runTaskLater(plugin, () -> { + + if (player.isOnline() && !ProposalFrame.openIfPending(player)) { + + ChatBlock.sendMessage(player, AQUA + lang("proposal.how.to.vote", player)); + + } + + }, JOIN_PROMPT_DELAY_TICKS); + + } + + private static String key(@NotNull String unionTag, @NotNull UUID member) { + + return unionTag + "/" + member; + + } + + /** + * @return a human readable summary of the proposal and the votes so far + */ + public String describe(@NotNull Proposal proposal, @NotNull Union union) { + + String subject; + switch (proposal.getType()) { + + case SET_HOME: + subject = lang("proposal.description.set.home"); + break; + case START_WAR: + Union target = plugin.getUnionManager().getUnion(proposal.getTarget()); + subject = lang("proposal.description.start.war", + target != null ? target.getName() : proposal.getTarget()); + break; + case DISBAND: + default: + subject = lang("proposal.description.disband"); + + } + + return lang("proposal.summary", subject, proposal.countVotes(true), Proposal.votesNeeded(union.getSize()), + proposal.countVotes(false)); + + } + + /** + * Counts the votes and applies, rejects or keeps the proposal open. + * + * @return whether the proposal is still open + */ + private boolean tally(@NotNull Union union, @NotNull Proposal proposal) { + + proposal.retainVoters(union.getMembers()); + int members = union.getSize(); + + if (proposal.isPassed(members)) { + + close(union, proposal); + apply(union, proposal); + return false; + + } + + if (proposal.isRejected(members)) { + + close(union, proposal); + union.memberAnnounce(RED + lang("proposal.rejected", describe(proposal, union))); + return false; + + } + + plugin.getStorageManager().saveProposal(proposal); + return true; + + } + + private void close(@NotNull Union union, @NotNull Proposal proposal) { + + proposals.remove(union.getTag()); + presented.removeIf(k -> k.startsWith(proposal.getUnionTag() + "/")); + plugin.getStorageManager().deleteProposal(proposal.getUnionTag()); + + } + + /** + * Drops a union's open proposal without resolving it, used when the union + * itself goes away. + */ + public void remove(@NotNull String unionTag) { + + if (proposals.remove(unionTag) != null) { + + presented.removeIf(k -> k.startsWith(unionTag + "/")); + plugin.getStorageManager().deleteProposal(unionTag); + + } + + } + + private void apply(@NotNull Union union, @NotNull Proposal proposal) { + + UnionPlayer proposer = plugin.getUnionManager().getAnyUnionPlayer(proposal.getProposer()); + + switch (proposal.getType()) { + + case SET_HOME: { + + Location home = parseLocation(proposal.getTarget()); + if (home == null) { + + union.memberAnnounce(RED + lang("proposal.home.world.missing")); + return; + + } + + Player proposerPlayer = proposer != null ? proposer.toPlayer() : null; + if (proposerPlayer != null && !plugin.getUnionManager().purchaseHomeTeleportSet(proposerPlayer)) { + + return; + + } + + union.setHomeLocation(home); + union.addBb(lang("union.home.moved", Helper.toLocationString(home))); + break; + + } + case START_WAR: { + + Union target = plugin.getUnionManager().getUnion(proposal.getTarget()); + if (target == null || proposer == null) { + + union.memberAnnounce(RED + lang("proposal.war.target.missing")); + return; + + } + + plugin.getProtectionManager().addWar(proposer, union, target); + break; + + } + case DISBAND: + default: + union.disband(proposer != null ? proposer.toPlayer() : null, true, false); + + } + + } + + private void expiryTask() { + + new BukkitRunnable() { + + @Override + public void run() { + + long now = System.currentTimeMillis(); + for (Proposal proposal : new ArrayList<>(proposals.values())) { + + if (!proposal.isExpired(now, LIFETIME_MILLIS)) { + + continue; + + } + + Union union = plugin.getUnionManager().getUnion(proposal.getUnionTag()); + remove(proposal.getUnionTag()); + if (union != null) { + + union.memberAnnounce(RED + lang("proposal.expired", describe(proposal, union))); + + } + + } + + } + + }.runTaskTimer(plugin, CHECK_INTERVAL_TICKS, CHECK_INTERVAL_TICKS); + + } + + /** + * Serializes a location so it can survive in the database until the vote + * finishes. + */ + public static String toLocationTarget(@NotNull Location location) { + + World world = location.getWorld(); + return (world != null ? world.getName() : "") + ";" + location.getX() + ";" + location.getY() + ";" + + location.getZ() + ";" + location.getYaw() + ";" + location.getPitch(); + + } + + private static @Nullable Location parseLocation(@NotNull String target) { + + String[] parts = target.split(";"); + if (parts.length != 6) { + + return null; + + } + + World world = Bukkit.getWorld(parts[0]); + if (world == null) { + + return null; + + } + + try { + + return new Location(world, Double.parseDouble(parts[1]), Double.parseDouble(parts[2]), + Double.parseDouble(parts[3]), Float.parseFloat(parts[4]), Float.parseFloat(parts[5])); + + } catch (NumberFormatException ex) { + + return null; + + } + + } + +} diff --git a/src/main/java/net/trueog/unionsog/managers/ProtectionManager.java b/src/main/java/net/trueog/unionsog/managers/ProtectionManager.java index 7d41cbc6..2ed2863b 100644 --- a/src/main/java/net/trueog/unionsog/managers/ProtectionManager.java +++ b/src/main/java/net/trueog/unionsog/managers/ProtectionManager.java @@ -1,7 +1,7 @@ package net.trueog.unionsog.managers; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.War; import net.trueog.unionsog.events.WarEndEvent; @@ -30,7 +30,7 @@ import static net.trueog.unionsog.managers.SettingsManager.ConfigField.*; public class ProtectionManager { private final SettingsManager settingsManager; - private final ClanManager clanManager; + private final UnionManager unionManager; private final Logger logger; private final Map wars = new HashMap<>(); private final List providers = new ArrayList<>(); @@ -41,7 +41,7 @@ public class ProtectionManager { plugin = UnionsOG.getInstance(); settingsManager = plugin.getSettingsManager(); - clanManager = plugin.getClanManager(); + unionManager = plugin.getUnionManager(); logger = plugin.getLogger(); if (!settingsManager.is(ENABLE_WAR) && !settingsManager.is(LAND_SHARING)) { @@ -168,7 +168,7 @@ public class ProtectionManager { } if (isWarringAndAllowed(action, owner, involved) - || isSameClanAndAllowed(action, owner, involved, land.getId())) + || isSameUnionAndAllowed(action, owner, involved, land.getId())) { return true; @@ -184,9 +184,9 @@ public class ProtectionManager { } @SuppressWarnings("UnusedReturnValue") - public boolean addWar(@NotNull ClanPlayer requester, Clan requestClan, Clan targetClan) { + public boolean addWar(@NotNull UnionPlayer requester, Union requestUnion, Union targetUnion) { - War war = new War(requestClan, targetClan); + War war = new War(requestUnion, targetUnion); if (wars.containsKey(war)) { @@ -202,8 +202,8 @@ public class ProtectionManager { } - requestClan.addWarringClan(requester, targetClan); - targetClan.addWarringClan(requester, requestClan); + requestUnion.addWarringUnion(requester, targetUnion); + targetUnion.addWarringUnion(requester, requestUnion); wars.put(war, scheduleTask(war, settingsManager.getMinutes(WAR_NORMAL_EXPIRATION_TIME))); return true; @@ -224,7 +224,7 @@ public class ProtectionManager { } - public void setWarExpirationTime(@NotNull Clan clan, int expirationTime) { + public void setWarExpirationTime(@NotNull Union union, int expirationTime) { if (expirationTime < 1) { @@ -235,7 +235,7 @@ public class ProtectionManager { for (Map.Entry entry : wars.entrySet()) { War war = entry.getKey(); - if (!war.getClans().contains(clan)) { + if (!war.getUnions().contains(union)) { continue; @@ -263,19 +263,19 @@ public class ProtectionManager { } wars.remove(war); - Clan clan1 = war.getClans().get(0); - Clan clan2 = war.getClans().get(1); - clan1.removeWarringClan(clan2); - clan2.removeWarringClan(clan1); + Union union1 = war.getUnions().get(0); + Union union2 = war.getUnions().get(1); + union1.removeWarringUnion(union2); + union2.removeWarringUnion(union1); WarEndEvent event = new WarEndEvent(war, reason); Bukkit.getPluginManager().callEvent(event); } - public @Nullable War getWar(@Nullable Clan clan1, @Nullable Clan clan2) { + public @Nullable War getWar(@Nullable Union union1, @Nullable Union union2) { - if (clan1 == null || clan2 == null) { + if (union1 == null || union2 == null) { return null; @@ -283,8 +283,8 @@ public class ProtectionManager { for (War war : wars.keySet()) { - List clans = war.getClans(); - if (clans.contains(clan1) && clans.contains(clan2)) { + List unions = war.getUnions(); + if (unions.contains(union1) && unions.contains(union2)) { return war; @@ -304,11 +304,11 @@ public class ProtectionManager { } - for (Clan clan : clanManager.getClans()) { + for (Union union : unionManager.getUnions()) { - for (Clan warringClan : clan.getWarringClans()) { + for (Union warringUnion : union.getWarringUnions()) { - clan.removeWarringClan(warringClan); + union.removeWarringUnion(warringUnion); } @@ -316,7 +316,7 @@ public class ProtectionManager { } - private boolean isSameClanAndAllowed(Action action, UUID owner, Player involved, String landId) { + private boolean isSameUnionAndAllowed(Action action, UUID owner, Player involved, String landId) { if (!settingsManager.is(LAND_SHARING)) { @@ -324,9 +324,9 @@ public class ProtectionManager { } - ClanPlayer cp = clanManager.getCreateClanPlayer(owner); - Clan involvedClan = clanManager.getClanByPlayerUniqueId(involved.getUniqueId()); - if (cp.getClan() == null || !cp.getClan().equals(involvedClan)) { + UnionPlayer cp = unionManager.getCreateUnionPlayer(owner); + Union involvedUnion = unionManager.getUnionByPlayerUniqueId(involved.getUniqueId()); + if (cp.getUnion() == null || !cp.getUnion().equals(involvedUnion)) { return false; @@ -344,15 +344,15 @@ public class ProtectionManager { } - Clan ownerClan = clanManager.getClanByPlayerUniqueId(owner); - Clan involvedClan = clanManager.getClanByPlayerUniqueId(involved.getUniqueId()); - if (ownerClan == null || involvedClan == null) { + Union ownerUnion = unionManager.getUnionByPlayerUniqueId(owner); + Union involvedUnion = unionManager.getUnionByPlayerUniqueId(involved.getUniqueId()); + if (ownerUnion == null || involvedUnion == null) { return false; } - return ownerClan.isWarring(involvedClan); + return ownerUnion.isWarring(involvedUnion); } @@ -467,10 +467,10 @@ public class ProtectionManager { public void run() { removeWar(war, WarEndEvent.Reason.EXPIRATION); - Clan clan1 = war.getClans().get(0); - Clan clan2 = war.getClans().get(1); - clan1.addBb(clan1.getColorTag(), lang("war.expired", clan2.getTag())); - clan2.addBb(clan2.getColorTag(), lang("war.expired", clan1.getTag())); + Union union1 = war.getUnions().get(0); + Union union2 = war.getUnions().get(1); + union1.addBb(union1.getColorTag(), lang("war.expired", union2.getTag())); + union2.addBb(union2.getColorTag(), lang("war.expired", union1.getTag())); } diff --git a/src/main/java/net/trueog/unionsog/managers/RequestManager.java b/src/main/java/net/trueog/unionsog/managers/RequestManager.java index 1ac9b7bc..3c4227f1 100644 --- a/src/main/java/net/trueog/unionsog/managers/RequestManager.java +++ b/src/main/java/net/trueog/unionsog/managers/RequestManager.java @@ -19,6 +19,15 @@ import static net.trueog.unionsog.managers.SettingsManager.ConfigField.*; import static org.bukkit.ChatColor.RED; /** + * Handles the requests a union sends to another union, plus membership + * invitations. The first member of the asked union to answer decides the + * outcome. + *

+ * Decisions that only concern a union's own members go through the + * {@link ProposalManager} instead, where they need a consensus of that union's + * members. + *

+ * * @author phaed */ public final class RequestManager { @@ -43,93 +52,14 @@ public final class RequestManager { } - public void addDemoteRequest(ClanPlayer requester, String demotedName, Clan clan) { - - if (requests.containsKey(clan.getTag())) { - - return; - - } - - String msg = MessageFormat.format(lang("asking.for.the.demotion"), requester.getName(), demotedName); - - ClanPlayer demotedTp = plugin.getClanManager().getAnyClanPlayer(demotedName); - - List acceptors = Helper.stripOffLinePlayers(clan.getLeaders()); - acceptors.remove(demotedTp); - - Request req = new Request(ClanRequest.DEMOTE, acceptors, requester, demotedName, clan, msg); - req.vote(requester.getName(), VoteResult.ACCEPT); - requests.put(req.getClan().getTag(), req); - ask(req); - - } - - /** - * This method asks all leaders about some action inside their - * clan. - *

- * Example of possible requests: - *

- *
    - *
  • Disband request can be asked from all leaders
    • - *
  • Rename request can be asked from all leaders
    • - *
  • Promote request can be asked from all leaders
    • - *
- * - *

- * Examples of incompatible requests: - *

- *
    - *
  • Demote request can be asked from all leaders, except the demoted - * one.
    • - *
  • Invite request has to ask someone outside of leaders clan
    • - *
- * - * @param requester the clan player, who sent the request - * @param request the type of request, see: {@link ClanRequest} - * @param target the target which will be used in request processing - * @param key the language key that would be translated and send the - * message to all leaders - * @param args the language objects, requires in some language strings. - * @throws IllegalArgumentException if passed incompatible request - */ - public void requestAllLeaders(@NotNull ClanPlayer requester, @NotNull ClanRequest request, @NotNull String target, - @NotNull String key, @Nullable Object... args) - { - - if (request.equals(ClanRequest.INVITE) || request.equals(ClanRequest.DEMOTE)) { - - throw new IllegalArgumentException("Unsupported request: " + request.name()); - - } - - Clan clan = requester.getClan(); - if (clan == null || requests.containsKey(clan.getTag())) { - - return; - - } - - String msg = lang(key, args); - List acceptors = Helper.stripOffLinePlayers(clan.getLeaders()); - - Request req = new Request(request, acceptors, requester, target, clan, msg); - requests.put(clan.getTag(), req); - req.vote(requester.getName(), VoteResult.ACCEPT); - - ask(req); - - } - /** * Add a member invite request * * @param requester the requester * @param invitedName the invited Player - * @param clan the Clan + * @param union the Union */ - public void addInviteRequest(ClanPlayer requester, String invitedName, Clan clan) { + public void addInviteRequest(UnionPlayer requester, String invitedName, Union union) { if (requests.containsKey(invitedName.toLowerCase())) { @@ -144,96 +74,76 @@ public final class RequestManager { } - String msg = lang("inviting.you.to.join", player, requester.getName(), clan.getName()); - Request req = new Request(ClanRequest.INVITE, null, requester, invitedName, clan, msg); + String msg = lang("inviting.you.to.join", player, requester.getName(), union.getName()); + Request req = new Request(UnionRequest.INVITE, null, requester, invitedName, union, msg); requests.put(invitedName.toLowerCase(), req); ask(req); } - public void addWarStartRequest(ClanPlayer requester, Clan warClan, Clan requestingClan) { + public void addWarEndRequest(UnionPlayer requester, Union warUnion, Union requestingUnion) { - if (requests.containsKey(warClan.getTag())) { + if (requests.containsKey(warUnion.getTag())) { return; } - String msg = MessageFormat.format(lang("proposing.war"), requestingClan.getName(), - ChatUtils.stripColors(warClan.getColorTag())); + String msg = MessageFormat.format(lang("proposing.to.end.the.war"), requestingUnion.getName(), + ChatUtils.stripColors(warUnion.getColorTag())); - List acceptors = Helper.stripOffLinePlayers(warClan.getLeaders()); + List acceptors = Helper.stripOffLinePlayers(warUnion.getMembers()); acceptors.remove(requester); - Request req = new Request(ClanRequest.START_WAR, acceptors, requester, warClan.getTag(), requestingClan, msg); + Request req = new Request(UnionRequest.END_WAR, acceptors, requester, warUnion.getTag(), requestingUnion, msg); requests.put(req.getTarget(), req); ask(req); } - public void addWarEndRequest(ClanPlayer requester, Clan warClan, Clan requestingClan) { + public void addAllyRequest(UnionPlayer requester, Union allyUnion, Union requestingUnion) { - if (requests.containsKey(warClan.getTag())) { + if (requests.containsKey(allyUnion.getTag())) { return; } - String msg = MessageFormat.format(lang("proposing.to.end.the.war"), requestingClan.getName(), - ChatUtils.stripColors(warClan.getColorTag())); + String msg = MessageFormat.format(lang("proposing.an.alliance"), requestingUnion.getName(), + ChatUtils.stripColors(allyUnion.getColorTag())); - List acceptors = Helper.stripOffLinePlayers(warClan.getLeaders()); + List acceptors = Helper.stripOffLinePlayers(allyUnion.getMembers()); acceptors.remove(requester); - Request req = new Request(ClanRequest.END_WAR, acceptors, requester, warClan.getTag(), requestingClan, msg); - requests.put(req.getTarget(), req); - ask(req); - - } - - public void addAllyRequest(ClanPlayer requester, Clan allyClan, Clan requestingClan) { - - if (requests.containsKey(allyClan.getTag())) { - - return; - - } - - String msg = MessageFormat.format(lang("proposing.an.alliance"), requestingClan.getName(), - ChatUtils.stripColors(allyClan.getColorTag())); - - List acceptors = Helper.stripOffLinePlayers(allyClan.getLeaders()); - acceptors.remove(requester); - - Request req = new Request(ClanRequest.CREATE_ALLY, acceptors, requester, allyClan.getTag(), requestingClan, + Request req = new Request(UnionRequest.CREATE_ALLY, acceptors, requester, allyUnion.getTag(), requestingUnion, msg); requests.put(req.getTarget(), req); ask(req); } - public void addRivalryBreakRequest(ClanPlayer requester, Clan rivalClan, Clan requestingClan) { + public void addRivalryBreakRequest(UnionPlayer requester, Union rivalUnion, Union requestingUnion) { - if (requests.containsKey(rivalClan.getTag())) { + if (requests.containsKey(rivalUnion.getTag())) { return; } - String msg = MessageFormat.format(lang("proposing.to.end.the.rivalry"), requestingClan.getName(), - ChatUtils.stripColors(rivalClan.getColorTag())); + String msg = MessageFormat.format(lang("proposing.to.end.the.rivalry"), requestingUnion.getName(), + ChatUtils.stripColors(rivalUnion.getColorTag())); - List acceptors = Helper.stripOffLinePlayers(rivalClan.getLeaders()); + List acceptors = Helper.stripOffLinePlayers(rivalUnion.getMembers()); acceptors.remove(requester); - Request req = new Request(ClanRequest.BREAK_RIVALRY, acceptors, requester, rivalClan.getTag(), requestingClan, - msg); + Request req = new Request(UnionRequest.BREAK_RIVALRY, acceptors, requester, rivalUnion.getTag(), + requestingUnion, msg); requests.put(req.getTarget(), req); ask(req); } - public void accept(ClanPlayer cp) { + public void accept(UnionPlayer cp) { Request req = requests.get(cp.getTag()); @@ -256,7 +166,7 @@ public final class RequestManager { } - public void deny(ClanPlayer cp) { + public void deny(UnionPlayer cp) { Request req = requests.get(cp.getTag()); @@ -283,7 +193,7 @@ public final class RequestManager { requests.remove(req.getTarget().toLowerCase()); - Clan clan = req.getClan(); + Union union = req.getUnion(); Player invited = Bukkit.getPlayerExact(req.getTarget()); if (invited == null) { @@ -293,26 +203,26 @@ public final class RequestManager { if (vote.equals(VoteResult.ACCEPT)) { - ClanPlayer cp = plugin.getClanManager().getCreateClanPlayer(invited.getUniqueId()); - int maxMembers = plugin.getSettingsManager().getInt(CLAN_MAX_MEMBERS); + UnionPlayer cp = plugin.getUnionManager().getCreateUnionPlayer(invited.getUniqueId()); + int maxMembers = plugin.getSettingsManager().getInt(UNION_MAX_MEMBERS); - if (maxMembers > 0 && maxMembers > clan.getSize()) { + if (maxMembers > 0 && maxMembers > union.getSize()) { - ChatBlock.sendMessageKey(invited, "accepted.invitation", clan.getName()); - clan.addBb(lang("joined.the.clan", invited.getName())); - plugin.getClanManager().serverAnnounce(lang("has.joined", invited.getName(), clan.getName())); - clan.addPlayerToClan(cp); + ChatBlock.sendMessageKey(invited, "accepted.invitation", union.getName()); + union.addBb(lang("joined.the.union", invited.getName())); + plugin.getUnionManager().serverAnnounce(lang("has.joined", invited.getName(), union.getName())); + union.addPlayerToUnion(cp); } else { - ChatBlock.sendMessageKey(invited, "this.clan.has.reached.the.member.limit"); + ChatBlock.sendMessageKey(invited, "this.union.has.reached.the.member.limit"); } } else { - ChatBlock.sendMessageKey(invited, "denied.invitation", clan.getName()); - clan.leaderAnnounce(RED + lang("membership.invitation", invited.getName())); + ChatBlock.sendMessageKey(invited, "denied.invitation", union.getName()); + union.memberAnnounce(RED + lang("membership.invitation", invited.getName())); } @@ -320,71 +230,27 @@ public final class RequestManager { public void processResults(Request req) { - Clan requestClan = req.getClan(); - ClanPlayer requester = req.getRequester(); + Union requestUnion = req.getUnion(); + UnionPlayer requester = req.getRequester(); String target = req.getTarget(); @Nullable - Clan targetClan = plugin.getClanManager().getClan(target); - - ClanPlayer targetCp = plugin.getClanManager().getAnyClanPlayer(target); - @Nullable - UUID targetUuid = targetCp != null ? targetCp.getUniqueId() : null; + Union targetUnion = plugin.getUnionManager().getUnion(target); List accepts = req.getAccepts(); List denies = req.getDenies(); switch (req.getType()) { - case START_WAR: - processStartWar(requester, requestClan, targetClan, accepts, denies); - break; case END_WAR: - processEndWar(requester, requestClan, targetClan, accepts, denies); + processEndWar(requester, requestUnion, targetUnion, accepts, denies); break; case CREATE_ALLY: - processCreateAlly(requester, requestClan, targetClan, accepts, denies); + processCreateAlly(requester, requestUnion, targetUnion, accepts, denies); break; case BREAK_RIVALRY: - processBreakRivalry(requester, requestClan, targetClan, accepts, denies); - break; - case DEMOTE: - case PROMOTE: - if (!req.votingFinished() || targetUuid == null) { - - return; - - } - target = requestClan.getTag(); - - if (req.getType() == ClanRequest.DEMOTE) { - - processDemote(req, requestClan, targetUuid, denies); - - } - if (req.getType() == ClanRequest.PROMOTE) { - - processPromote(req, requestClan, targetUuid, denies); - - } - break; - case DISBAND: - if (!req.votingFinished()) { - - return; - - } - processDisband(requester, requestClan, denies); - break; - case RENAME: - if (!req.votingFinished()) { - - return; - - } - - processRename(req); + processBreakRivalry(requester, requestUnion, targetUnion, accepts, denies); break; default: return; @@ -397,89 +263,25 @@ public final class RequestManager { } - private void processRename(Request request) { - - if (request.getDenies().isEmpty()) { - - request.getClan().setName(request.getTarget()); - - } else { - - String deniers = String.join(", ", request.getDenies()); - request.getClan().leaderAnnounce(RED + lang("rename.refused", deniers)); - - } - - } - - private void processDisband(ClanPlayer requester, Clan requestClan, List denies) { - - if (denies.isEmpty()) { - - requestClan.disband(requester.toPlayer(), true, false); - - } else { - - String deniers = String.join(", ", denies); - requestClan.leaderAnnounce(RED + lang("clan.deletion", deniers)); - - } - - } - - private void processPromote(Request req, Clan requestClan, UUID targetPlayer, List denies) { - - String promotedName = req.getTarget(); - if (denies.isEmpty()) { - - requestClan.addBb(lang("leaders"), lang("promoted.to.leader", promotedName)); - requestClan.promote(targetPlayer); - - } else { - - String deniers = String.join(", ", denies); - requestClan.leaderAnnounce(RED + lang("denied.the.promotion", deniers, promotedName)); - - } - - } - - private void processDemote(Request req, Clan requestClan, UUID targetPlayer, List denies) { - - String demotedName = req.getTarget(); - if (denies.isEmpty()) { - - requestClan.addBb(lang("leaders"), lang("demoted.back.to.member", demotedName)); - requestClan.demote(targetPlayer); - - } else { - - String deniers = String.join(", ", denies); - requestClan.leaderAnnounce(RED + lang("denied.demotion", deniers, demotedName)); - - } - - } - - private void processBreakRivalry(ClanPlayer requester, Clan requestClan, @Nullable Clan targetClan, + private void processBreakRivalry(UnionPlayer requester, Union requestUnion, @Nullable Union targetUnion, List accepts, List denies) { - if (targetClan != null && requestClan != null) { + if (targetUnion != null && requestUnion != null) { if (!accepts.isEmpty()) { - requestClan.removeRival(targetClan); - targetClan.addBb(requester.getName(), - lang("broken.the.rivalry", accepts.get(0), requestClan.getName())); - requestClan.addBb(requester.getName(), - lang("broken.the.rivalry.with", requester.getName(), targetClan.getName())); + requestUnion.removeRival(targetUnion); + targetUnion.addBb(requester.getName(), + lang("broken.the.rivalry", accepts.get(0), requestUnion.getName())); + requestUnion.addBb(requester.getName(), + lang("broken.the.rivalry.with", requester.getName(), targetUnion.getName())); } else { - targetClan.addBb(requester.getName(), - lang("denied.to.make.peace", denies.get(0), requestClan.getName())); - requestClan.addBb(requester.getName(), lang("peace.agreement.denied", targetClan.getName())); + targetUnion.addBb(requester.getName(), + lang("denied.to.make.peace", denies.get(0), requestUnion.getName())); + requestUnion.addBb(requester.getName(), lang("peace.agreement.denied", targetUnion.getName())); } @@ -487,25 +289,26 @@ public final class RequestManager { } - private void processCreateAlly(ClanPlayer requester, Clan requestClan, @Nullable Clan targetClan, + private void processCreateAlly(UnionPlayer requester, Union requestUnion, @Nullable Union targetUnion, List accepts, List denies) { - if (targetClan != null && requestClan != null) { + if (targetUnion != null && requestUnion != null) { if (!accepts.isEmpty()) { - requestClan.addAlly(targetClan); + requestUnion.addAlly(targetUnion); - targetClan.addBb(requester.getName(), - lang("accepted.an.alliance", accepts.get(0), requestClan.getName())); - requestClan.addBb(requester.getName(), - lang("created.an.alliance", requester.getName(), targetClan.getName())); + targetUnion.addBb(requester.getName(), + lang("accepted.an.alliance", accepts.get(0), requestUnion.getName())); + requestUnion.addBb(requester.getName(), + lang("created.an.alliance", requester.getName(), targetUnion.getName())); } else { - targetClan.addBb(requester.getName(), lang("denied.an.alliance", denies.get(0), requestClan.getName())); - requestClan.addBb(requester.getName(), lang("the.alliance.was.denied", targetClan.getName())); + targetUnion.addBb(requester.getName(), + lang("denied.an.alliance", denies.get(0), requestUnion.getName())); + requestUnion.addBb(requester.getName(), lang("the.alliance.was.denied", targetUnion.getName())); } @@ -513,49 +316,28 @@ public final class RequestManager { } - private void processEndWar(ClanPlayer requester, Clan requestClan, @Nullable Clan targetClan, List accepts, - List denies) + private void processEndWar(UnionPlayer requester, Union requestUnion, @Nullable Union targetUnion, + List accepts, List denies) { - if (requestClan != null && targetClan != null) { + if (requestUnion != null && targetUnion != null) { if (!accepts.isEmpty()) { - War war = plugin.getProtectionManager().getWar(requestClan, targetClan); + War war = plugin.getProtectionManager().getWar(requestUnion, targetUnion); plugin.getProtectionManager().removeWar(war, WarEndEvent.Reason.REQUEST); - requestClan.removeWarringClan(targetClan); - targetClan.removeWarringClan(requestClan); + requestUnion.removeWarringUnion(targetUnion); + targetUnion.removeWarringUnion(requestUnion); - targetClan.addBb(requester.getName(), - lang("you.are.no.longer.at.war", accepts.get(0), requestClan.getColorTag())); - requestClan.addBb(requester.getName(), - lang("you.are.no.longer.at.war", requestClan.getName(), targetClan.getColorTag())); + targetUnion.addBb(requester.getName(), + lang("you.are.no.longer.at.war", accepts.get(0), requestUnion.getColorTag())); + requestUnion.addBb(requester.getName(), + lang("you.are.no.longer.at.war", requestUnion.getName(), targetUnion.getColorTag())); } else { - targetClan.addBb(requester.getName(), lang("denied.war.end", denies.get(0), requestClan.getName())); - requestClan.addBb(requester.getName(), lang("end.war.denied", targetClan.getName())); - - } - - } - - } - - private void processStartWar(ClanPlayer requester, Clan requestClan, @Nullable Clan targetClan, - List accepts, List denies) - { - - if (requestClan != null && targetClan != null) { - - if (!accepts.isEmpty()) { - - plugin.getProtectionManager().addWar(requester, requestClan, targetClan); - - } else { - - targetClan.addBb(requester.getName(), lang("denied.war.req", denies.get(0), requestClan.getName())); - requestClan.addBb(requester.getName(), lang("end.war.denied", targetClan.getName())); + targetUnion.addBb(requester.getName(), lang("denied.war.end", denies.get(0), requestUnion.getName())); + requestUnion.addBb(requester.getName(), lang("end.war.denied", targetUnion.getName())); } @@ -572,12 +354,13 @@ public final class RequestManager { for (Request req : new LinkedList<>(requests.values())) { - for (ClanPlayer cp : req.getAcceptors()) { + for (UnionPlayer cp : req.getAcceptors()) { if (cp.getName().equalsIgnoreCase(playerName)) { - req.getClan().leaderAnnounce(lang("signed.off.request.cancelled", RED + playerName, req.getType())); - requests.remove(req.getClan().getTag()); + req.getUnion() + .memberAnnounce(lang("signed.off.request.cancelled", RED + playerName, req.getType())); + requests.remove(req.getUnion().getTag()); break; } @@ -651,15 +434,15 @@ public final class RequestManager { */ public void ask(final Request req) { - String message = lang("request.message", req.getClan().getColorTag(), req.getMsg()); + String message = lang("request.message", req.getUnion().getColorTag(), req.getMsg()); ArrayList recipients = new ArrayList<>(); - if (req.getType() == ClanRequest.INVITE) { + if (req.getType() == UnionRequest.INVITE) { recipients.add(Bukkit.getPlayerExact(req.getTarget())); } else { - for (ClanPlayer cp : req.getAcceptors()) { + for (UnionPlayer cp : req.getAcceptors()) { if (cp.getVote() == null) { diff --git a/src/main/java/net/trueog/unionsog/managers/SettingsManager.java b/src/main/java/net/trueog/unionsog/managers/SettingsManager.java index 941e1422..648dcef6 100644 --- a/src/main/java/net/trueog/unionsog/managers/SettingsManager.java +++ b/src/main/java/net/trueog/unionsog/managers/SettingsManager.java @@ -1,7 +1,6 @@ package net.trueog.unionsog.managers; import com.cryptomorin.xseries.XMaterial; -import net.trueog.unionsog.Rank; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.utils.ChatUtils; import org.bukkit.Material; @@ -209,7 +208,7 @@ public final class SettingsManager { */ public boolean isDisallowedWord(String word) { - if (matchesAnyIgnoreCase(word, getString(COMMANDS_CLAN), "union", "unions", "clan", "clans")) { + if (matchesAnyIgnoreCase(word, getString(COMMANDS_UNION), "union", "unions", "clan", "clans")) { return true; @@ -270,14 +269,14 @@ public final class SettingsManager { } /** - * Check whether a clan is unrivable + * Check whether a union is unrivable * * @param tag the tag - * @return whether the clan is unrivable + * @return whether the union is unrivable */ public boolean isUnrivable(String tag) { - return getStringList(UNRIVABLE_CLANS).stream().map(String::toLowerCase) + return getStringList(UNRIVABLE_UNIONS).stream().map(String::toLowerCase) .anyMatch(unrivable -> unrivable.equals(tag.toLowerCase())); } @@ -355,29 +354,6 @@ public final class SettingsManager { } - @SuppressWarnings("unchecked") - public @NotNull Collection getStarterRanks() { - - List ranks = new ArrayList<>(); - List> mapList = config.getMapList("clan.starter-ranks"); - for (Map rankMap : mapList) { - - Set names = (Set) rankMap.keySet(); - for (String name : names) { - - Map rank = (Map) rankMap.get(name); - String displayName = (String) rank.get("display-name"); - List permissions = (List) rank.get("permissions"); - ranks.add(new Rank(name, displayName, new HashSet<>(permissions))); - - } - - } - - return ranks; - - } - public FileConfiguration getConfig() { return config; @@ -394,14 +370,14 @@ public final class SettingsManager { TAMABLE_MOBS_SHARING("settings.tameable-mobs-sharing", false), TELEPORT_BLOCKS("settings.teleport-blocks", false), TELEPORT_HOME_ON_SPAWN("settings.teleport-home-on-spawn", false), - DROP_ITEMS_ON_CLAN_HOME("settings.drop-items-on-clan-home", false), - KEEP_ITEMS_ON_CLAN_HOME("settings.keep-items-on-clan-home", false), ITEM_LIST("settings.item-list"), + DROP_ITEMS_ON_UNION_HOME("settings.drop-items-on-union-home", false), + KEEP_ITEMS_ON_UNION_HOME("settings.keep-items-on-union-home", false), ITEM_LIST("settings.item-list"), DEBUG("settings.show-debug-info", false), ENABLE_AUTO_GROUPS("settings.enable-auto-groups", false), CHAT_COMPATIBILITY_MODE("settings.chat-compatibility-mode", true), RIVAL_LIMIT_PERCENT("settings.rival-limit-percent", 50), COLOR_CODE_FROM_PREFIX_FOR_NAME("settings.use-colorcode-from-prefix-for-name", true), DISPLAY_CHAT_TAGS("settings.display-chat-tags", true), - GLOBAL_FRIENDLY_FIRE("settings.global-friendly-fire", false), UNRIVABLE_CLANS("settings.unrivable-clans"), + GLOBAL_FRIENDLY_FIRE("settings.global-friendly-fire", false), UNRIVABLE_UNIONS("settings.unrivable-unions"), BLACKLISTED_WORLDS("settings.blacklisted-worlds"), BANNED_PLAYERS("settings.banned-players"), DISALLOWED_TAGS("settings.disallowed-tags"), LANGUAGE("settings.language", "en"), LANGUAGE_SELECTOR("settings.user-language-selector", true), @@ -411,7 +387,7 @@ public final class SettingsManager { ENABLE_REJOIN_COOLDOWN("settings.rejoin-cooldown-enabled", false), RANKING_TYPE("settings.ranking-type", "DENSE"), LIST_DEFAULT_ORDER_BY("settings.list-default-order-by", "size"), LORE_LENGTH("settings.lore-length", 36), PVP_ONLY_WHILE_IN_WAR("settings.pvp-only-while-at-war", false), - PAST_CLANS_LIMIT("settings.past-clans-limit", 10), + PAST_UNIONS_LIMIT("settings.past-unions-limit", 10), USERNAME_REGEX("settings.username-regex", "^\\**[a-zA-Z0-9_$]{1,16}$"), TAG_REGEX("settings.tag-regex", ""), ACCEPT_OTHER_ALPHABETS_LETTERS("settings.accept-other-alphabets-letters-on-tag", false), DATE_TIME_PATTERN("settings.date-time-pattern", "HH:mm - dd/MM/yyyy"), @@ -421,11 +397,9 @@ public final class SettingsManager { * */ TAG_DEFAULT_COLOR("tag.default-color", "8"), TAG_BRACKET_COLOR("tag.bracket.color", "8"), - TAG_BRACKET_LEADER_COLOR("tag.bracket.leader-color", "4"), TAG_BRACKET_LEFT("tag.bracket.left", ""), - TAG_MAX_LENGTH("tag.max-length", 5), TAG_MIN_LENGTH("tag.min-length", 2), - TAG_BRACKET_RIGHT("tag.bracket.right", ""), TAG_SEPARATOR_COLOR("tag.separator.color", "8"), - TAG_SEPARATOR_LEADER_COLOR("tag.separator.leader-color", "4"), TAG_SEPARATOR_CHAR("tag.separator.char", " ."), - @Deprecated + TAG_BRACKET_LEFT("tag.bracket.left", ""), TAG_MAX_LENGTH("tag.max-length", 5), + TAG_MIN_LENGTH("tag.min-length", 2), TAG_BRACKET_RIGHT("tag.bracket.right", ""), + TAG_SEPARATOR_COLOR("tag.separator.color", "8"), TAG_SEPARATOR_CHAR("tag.separator.char", " ."), @Deprecated TAG_SEPARATOR_char("tag.separator.char", " ."), /* * ================ > War and Protection Settings ================ @@ -440,15 +414,13 @@ public final class SettingsManager { WAR_NORMAL_EXPIRATION_TIME("war-and-protection.war-normal-expiration-time", 0), WAR_DISCONNECT_EXPIRATION_TIME("war-and-protection.war-disconnect-expiration-time", 0), LAND_EDIT_ALL_LANDS("war-and-protection.edit-all-lands", false), - LAND_CREATION_ONLY_LEADERS("war-and-protection.land-creation.only-leaders", false), - LAND_CREATION_ONLY_ONE_PER_CLAN("war-and-protection.land-creation.only-one-per-clan", false), + LAND_CREATION_ONLY_ONE_PER_UNION("war-and-protection.land-creation.only-one-per-union", false), WAR_ACTIONS_CONTAINER("war-and-protection.war-actions.CONTAINER", true), WAR_ACTIONS_INTERACT("war-and-protection.war-actions.INTERACT", true), WAR_ACTIONS_BREAK("war-and-protection.war-actions.BREAK", true), WAR_ACTIONS_PLACE("war-and-protection.war-actions.PLACE", true), WAR_ACTIONS_DAMAGE("war-and-protection.war-actions.DAMAGE", true), WAR_ACTIONS_INTERACT_ENTITY("war-and-protection.war-actions.INTERACT_ENTITY", true), - WAR_START_REQUEST_ENABLED("war-and-protection.war-start.request-enabled", true), WAR_MAX_MEMBERS_DIFFERENCE("war-and-protection.war-start.members-online-max-difference", 5), /* * ================ > KDR Grinding Prevention Settings ================ @@ -463,17 +435,17 @@ public final class SettingsManager { * */ COMMANDS_MORE("commands.more", "more"), COMMANDS_ALLY("commands.ally", "ally"), - COMMANDS_CLAN("commands.clan", "clan"), COMMANDS_ACCEPT("commands.accept", "accept"), + COMMANDS_UNION("commands.union", "union"), COMMANDS_ACCEPT("commands.accept", "accept"), COMMANDS_DENY("commands.deny", "deny"), COMMANDS_GLOBAL("commands.global", "global"), - COMMANDS_CLAN_CHAT("commands.clan_chat", "u"), COMMANDS_FORCE_PRIORITY("commands.force-priority", true), + COMMANDS_UNION_CHAT("commands.union_chat", "u"), COMMANDS_FORCE_PRIORITY("commands.force-priority", true), /* * ================ > Economy Settings ================ * */ ECONOMY_CREATION_PRICE("economy.creation-price", 100.0), - ECONOMY_PURCHASE_CLAN_CREATE("economy.purchase-clan-create", false), + ECONOMY_PURCHASE_UNION_CREATE("economy.purchase-union-create", false), ECONOMY_INVITE_PRICE("economy.invite-price", 20), - ECONOMY_PURCHASE_CLAN_INVITE("economy.purchase-clan-invite", false), + ECONOMY_PURCHASE_UNION_INVITE("economy.purchase-union-invite", false), ECONOMY_HOME_TELEPORT_PRICE("economy.home-teleport-price", 5.0), ECONOMY_PURCHASE_HOME_TELEPORT("economy.purchase-home-teleport", false), ECONOMY_HOME_TELEPORT_SET_PRICE("economy.home-teleport-set-price", 5.0), @@ -491,46 +463,42 @@ public final class SettingsManager { KILL_WEIGHTS_NEUTRAL("kill-weights.neutral", 1.0), KILL_WEIGHTS_ALLY("kill-weights.ally", -1.0), KILL_WEIGHTS_DENY_SAME_IP_KILLS("kill-weights.deny-same-ip-kills", false), /* - * ================ > Clan Settings ================ + * ================ > Union Settings ================ * */ - CLAN_TELEPORT_DELAY("clan.homebase-teleport-wait-secs", 10), - CLAN_HOMEBASE_CAN_BE_SET_ONLY_ONCE("clan.homebase-can-be-set-only-once", true), - CLAN_MIN_SIZE_TO_SET_RIVAL("clan.min-size-to-set-rival", 3), - CLAN_MIN_SIZE_TO_SET_ALLY("clan.min-size-to-set-ally", 3), CLAN_MAX_LENGTH("clan.max-length", 25), - CLAN_MIN_LENGTH("clan.min-length", 2), CLAN_MAX_DESCRIPTION_LENGTH("clan.max-description-length", 120), - CLAN_MIN_DESCRIPTION_LENGTH("clan.min-description-length", 10), CLAN_MAX_MEMBERS("clan.max-members", 25), - CLAN_MAX_ALLIANCES("clan.max-alliances", -1), - CLAN_CONFIRMATION_FOR_PROMOTE("clan.confirmation-for-promote", false), - CLAN_TRUST_MEMBERS_BY_DEFAULT("clan.trust-members-by-default", true), - CLAN_CONFIRMATION_FOR_DEMOTE("clan.confirmation-for-demote", false), - CLAN_PERCENTAGE_ONLINE_TO_DEMOTE("clan.percentage-online-to-demote", 100.0), - CLAN_FF_ON_BY_DEFAULT("clan.ff-on-by-default", false), CLAN_DEFAULT_RANK("clan.default-rank", "recruit"), + UNION_TELEPORT_DELAY("union.homebase-teleport-wait-secs", 10), + UNION_HOMEBASE_CAN_BE_SET_ONLY_ONCE("union.homebase-can-be-set-only-once", true), + UNION_MIN_SIZE_TO_SET_RIVAL("union.min-size-to-set-rival", 3), + UNION_MIN_SIZE_TO_SET_ALLY("union.min-size-to-set-ally", 3), UNION_MAX_LENGTH("union.max-length", 25), + UNION_MIN_LENGTH("union.min-length", 2), UNION_MAX_DESCRIPTION_LENGTH("union.max-description-length", 120), + UNION_MIN_DESCRIPTION_LENGTH("union.min-description-length", 10), UNION_MAX_MEMBERS("union.max-members", 25), + UNION_MAX_ALLIANCES("union.max-alliances", -1), + UNION_TRUST_MEMBERS_BY_DEFAULT("union.trust-members-by-default", true), + UNION_FF_ON_BY_DEFAULT("union.ff-on-by-default", false), /* * ================ > Page Settings ================ */ - PAGE_LEADER_COLOR("page.leader-color", "4"), PAGE_UNTRUSTED_COLOR("page.untrusted-color", "8"), - PAGE_TRUSTED_COLOR("page.trusted-color", "f"), PAGE_CLAN_NAME_COLOR("page.clan-name-color", "b"), - PAGE_SUBTITLE_COLOR("page.subtitle-color", "7"), PAGE_HEADINGS_COLOR("page.headings-color", "8"), - PAGE_SEPARATOR("page.separator", "-"), PAGE_SIZE("page.size", 100), HELP_SIZE("page.help-size", 10), + PAGE_UNTRUSTED_COLOR("page.untrusted-color", "8"), PAGE_TRUSTED_COLOR("page.trusted-color", "f"), + PAGE_UNION_NAME_COLOR("page.union-name-color", "b"), PAGE_SUBTITLE_COLOR("page.subtitle-color", "7"), + PAGE_HEADINGS_COLOR("page.headings-color", "8"), PAGE_SEPARATOR("page.separator", "-"), + PAGE_SIZE("page.size", 100), HELP_SIZE("page.help-size", 10), /* - * ================ > Clan Chat Settings ================ + * ================ > Union Chat Settings ================ * */ - CLANCHAT_ENABLE("clanchat.enable", true), CLANCHAT_TAG_BASED("clanchat.tag-based-clan-chat", false), - CLANCHAT_ANNOUNCEMENT_COLOR("clanchat.announcement-color", "e"), - CLANCHAT_FORMAT("clanchat.format", "&b[%clan%&b] &4<%nick-color%%player%&4> %rank%: &b%message%"), - CLANCHAT_SPYFORMAT("clanchat.spy-format", - "&8[Spy] [&bC&8] <%clan%&8> <%nick-color%*&8%player%>&8 %rank%: %message%"), - CLANCHAT_RANK("clanchat.rank", "&f[%rank%&f]"), CLANCHAT_LEADER_COLOR("clanchat.leader-color", "4"), - CLANCHAT_TRUSTED_COLOR("clanchat.trusted-color", "f"), CLANCHAT_MEMBER_COLOR("clanchat.member-color", "7"), - CLANCHAT_BRACKET_COLOR("clanchat.tag-bracket.color", "e"), - CLANCHAT_BRACKET_LEFT("clanchat.tag-bracket.left", ""), - CLANCHAT_BRACKET_RIGHT("clanchat.tag-bracket.right", ""), CLANCHAT_NAME_COLOR("clanchat.name-color", "e"), - CLANCHAT_PLAYER_BRACKET_LEFT("clanchat.player-bracket.left", ""), - CLANCHAT_PLAYER_BRACKET_RIGHT("clanchat.player-bracket.right", ""), - CLANCHAT_MESSAGE_COLOR("clanchat.message-color", "b"), - CLANCHAT_LISTENER_PRIORITY("clanchat.listener-priority", "LOW"), + UNIONCHAT_ENABLE("unionchat.enable", true), UNIONCHAT_TAG_BASED("unionchat.tag-based-union-chat", false), + UNIONCHAT_ANNOUNCEMENT_COLOR("unionchat.announcement-color", "e"), + UNIONCHAT_FORMAT("unionchat.format", "&b[%union%&b] &4<%nick-color%%player%&4>: &b%message%"), + UNIONCHAT_SPYFORMAT("unionchat.spy-format", + "&8[Spy] [&bC&8] <%union%&8> <%nick-color%*&8%player%>&8: %message%"), + UNIONCHAT_TRUSTED_COLOR("unionchat.trusted-color", "f"), UNIONCHAT_MEMBER_COLOR("unionchat.member-color", "7"), + UNIONCHAT_BRACKET_COLOR("unionchat.tag-bracket.color", "e"), + UNIONCHAT_BRACKET_LEFT("unionchat.tag-bracket.left", ""), + UNIONCHAT_BRACKET_RIGHT("unionchat.tag-bracket.right", ""), UNIONCHAT_NAME_COLOR("unionchat.name-color", "e"), + UNIONCHAT_PLAYER_BRACKET_LEFT("unionchat.player-bracket.left", ""), + UNIONCHAT_PLAYER_BRACKET_RIGHT("unionchat.player-bracket.right", ""), + UNIONCHAT_MESSAGE_COLOR("unionchat.message-color", "b"), + UNIONCHAT_LISTENER_PRIORITY("unionchat.listener-priority", "LOW"), /* * ================ > Request Settings ================ * @@ -546,10 +514,8 @@ public final class SettingsManager { * ================ > Ally Chat Settings ================ */ ALLYCHAT_ENABLE("allychat.enable", true), - ALLYCHAT_FORMAT("allychat.format", "&b[Ally Chat] &4<%clan%&4> <%nick-color%%player%&4> %rank%: &b%message%"), - ALLYCHAT_SPYFORMAT("allychat.spy-format", - "&8[Spy] [&cA&8] <%clan%&8> <%nick-color%*&8%player%>&8 %rank%: %message%"), - ALLYCHAT_RANK("allychat.rank", "&f[%rank%&f]"), ALLYCHAT_LEADER_COLOR("allychat.leader-color", "4"), + ALLYCHAT_FORMAT("allychat.format", "&b[Ally Chat] &4<%union%&4> <%nick-color%%player%&4>: &b%message%"), + ALLYCHAT_SPYFORMAT("allychat.spy-format", "&8[Spy] [&cA&8] <%union%&8> <%nick-color%*&8%player%>&8: %message%"), ALLYCHAT_TRUSTED_COLOR("allychat.trusted-color", "f"), ALLYCHAT_MEMBER_COLOR("allychat.member-color", "7"), ALLYCHAT_BRACKET_COLOR("allychat.tag-bracket.color", "8"), ALLYCHAT_BRACKET_lEFT("allychat.tag-bracket.left", ""), @@ -562,23 +528,19 @@ public final class SettingsManager { */ DISCORDCHAT_ENABLE("discordchat.enable", false), DISCORDCHAT_AUTO_CREATION("discordchat.auto-creation", true), DISCORDCHAT_FORMAT_TO("discordchat.discord-format", "%player% » %message%"), - DISCORDCHAT_FORMAT("discordchat.format", - "&b[&9D&b] &b[%clan%&b] &4<%nick-color%%player%&4> %rank%: &b%message%"), + DISCORDCHAT_FORMAT("discordchat.format", "&b[&9D&b] &b[%union%&b] &4<%nick-color%%player%&4>: &b%message%"), DISCORDCHAT_SPYFORMAT("discordchat.spy-format", - "&8[Spy] [&9D&8] <%clan%&8> <%nick-color%*&8%player%>&8 %rank%: %message%"), - DISCORDCHAT_RANK("discordchat.rank", "[%rank%]"), DISCORDCHAT_LEADER_ROLE("discordchat.leader-role", "Leader"), - DISCORDCHAT_LEADER_ID("discordchat.leader-id", "0"), - DISCORDCHAT_LEADER_COLOR("discordchat.leader-color", "231, 76, 60, 100"), + "&8[Spy] [&9D&8] <%union%&8> <%nick-color%*&8%player%>&8: %message%"), DISCORDCHAT_TEXT_CATEGORY_FORMAT("discordchat.text.category-format", "SC - TextChannels"), DISCORDCHAT_TEXT_CATEGORY_IDS("discordchat.text.category-ids"), DISCORDCHAT_TEXT_WHITELIST("discordchat.text.whitelist"), - DISCORDCHAT_TEXT_LIMIT("discordchat.text.clans-limit", 100), + DISCORDCHAT_TEXT_LIMIT("discordchat.text.unions-limit", 100), DISCORDCHAT_MINIMUM_LINKED_PLAYERS("discordchat.min-linked-players-to-create", 3), /* * ================ > Purge Settings ================ */ PURGE_INACTIVE_PLAYER_DAYS("purge.inactive-player-data-days", 30), - PURGE_INACTIVE_CLAN_DAYS("purge.inactive-clan-days", 7), + PURGE_INACTIVE_UNION_DAYS("purge.inactive-union-days", 7), /* * ================ > MySQL Settings ================ */ diff --git a/src/main/java/net/trueog/unionsog/managers/StorageManager.java b/src/main/java/net/trueog/unionsog/managers/StorageManager.java index 16d37b70..d01c7408 100644 --- a/src/main/java/net/trueog/unionsog/managers/StorageManager.java +++ b/src/main/java/net/trueog/unionsog/managers/StorageManager.java @@ -1,7 +1,7 @@ package net.trueog.unionsog.managers; import net.trueog.unionsog.*; -import net.trueog.unionsog.events.ClanBalanceUpdateEvent; +import net.trueog.unionsog.events.UnionBalanceUpdateEvent; import net.trueog.unionsog.loggers.BankLogger; import net.trueog.unionsog.loggers.BankOperator; import net.trueog.unionsog.migrations.legacy.LegacyUnionsDatabaseMigrationRunner; @@ -42,8 +42,8 @@ public final class StorageManager { private final UnionsOG plugin; private DBCore core; private final HashMap chatBlocks = new HashMap<>(); - private final Set modifiedClans = new HashSet<>(); - private final Set modifiedClanPlayers = new HashSet<>(); + private final Set modifiedUnions = new HashSet<>(); + private final Set modifiedUnionPlayers = new HashSet<>(); /** * @@ -157,6 +157,18 @@ public final class StorageManager { } + if (!core.existsTable(getPrefixedTable("proposals"))) { + + plugin.getLogger().info("Creating table: " + getPrefixedTable("proposals")); + + String query = "CREATE TABLE IF NOT EXISTS `" + getPrefixedTable("proposals") + "` (" + + " `tag` varchar(25) NOT NULL," + " `type` varchar(32) NOT NULL," + + " `target` varchar(255) NOT NULL," + " `proposer` varchar(255) NOT NULL," + + " `created_at` bigint NOT NULL," + " `votes` text NOT NULL," + " PRIMARY KEY (`tag`));"; + core.execute(query); + + } + } else { plugin.getServer().getConsoleSender() @@ -222,6 +234,18 @@ public final class StorageManager { } + if (!core.existsTable(getPrefixedTable("proposals"))) { + + plugin.getLogger().info("Creating table: " + getPrefixedTable("proposals")); + + String query = "CREATE TABLE IF NOT EXISTS `" + getPrefixedTable("proposals") + "` (" + + " `tag` varchar(25) NOT NULL," + " `type` varchar(32) NOT NULL," + + " `target` varchar(255) NOT NULL," + " `proposer` varchar(255) NOT NULL," + + " `created_at` bigint NOT NULL," + " `votes` text NOT NULL," + " PRIMARY KEY (`tag`));"; + core.execute(query); + + } + } else { plugin.getServer().getConsoleSender() @@ -247,35 +271,35 @@ public final class StorageManager { */ public void importFromDatabase() { - plugin.getClanManager().cleanData(); + plugin.getUnionManager().cleanData(); - List clans = retrieveClans(); - purgeClans(clans); + List unions = retrieveUnions(); + purgeUnions(unions); - for (Clan clan : clans) { + for (Union union : unions) { - plugin.getClanManager().importClan(clan); + plugin.getUnionManager().importUnion(union); } - for (Clan clan : clans) { + for (Union union : unions) { - clan.validateWarring(); + union.validateWarring(); } - if (!clans.isEmpty()) { + if (!unions.isEmpty()) { - plugin.getLogger().info(MessageFormat.format(lang("clans"), clans.size())); + plugin.getLogger().info(MessageFormat.format(lang("unions"), unions.size())); } - List cps = retrieveClanPlayers(); - purgeClanPlayers(cps); + List cps = retrieveUnionPlayers(); + purgeUnionPlayers(cps); - for (ClanPlayer cp : cps) { + for (UnionPlayer cp : cps) { - Clan tm = cp.getClan(); + Union tm = cp.getUnion(); if (tm != null) { @@ -283,33 +307,33 @@ public final class StorageManager { } - plugin.getClanManager().importClanPlayer(cp); + plugin.getUnionManager().importUnionPlayer(cp); } if (!cps.isEmpty()) { - plugin.getLogger().info(MessageFormat.format(lang("clan.players"), cps.size())); + plugin.getLogger().info(MessageFormat.format(lang("union.players"), cps.size())); } } /** - * Import one ClanPlayer data from database to memory Used for BungeeCord Reload - * ClanPlayer and your Clan + * Import one UnionPlayer data from database to memory Used for BungeeCord + * Reload UnionPlayer and your Union * */ @Deprecated public void importFromDatabaseOnePlayer(Player player) { - plugin.getClanManager().deleteClanPlayerFromMemory(player.getUniqueId()); + plugin.getUnionManager().deleteUnionPlayerFromMemory(player.getUniqueId()); - ClanPlayer cp = retrieveOneClanPlayer(player.getUniqueId()); + UnionPlayer cp = retrieveOneUnionPlayer(player.getUniqueId()); if (cp != null) { - Clan tm = cp.getClan(); + Union tm = cp.getUnion(); if (tm != null) { @@ -317,7 +341,7 @@ public final class StorageManager { } - plugin.getClanManager().importClanPlayer(cp); + plugin.getUnionManager().importUnionPlayer(cp); plugin.getLogger().info("ClanPlayer Reloaded: " + player.getName() + ", UUID: " + player.getUniqueId()); @@ -325,44 +349,44 @@ public final class StorageManager { } - private void purgeClans(List clans) { + private void purgeUnions(List unions) { - List purge = new ArrayList<>(); + List purge = new ArrayList<>(); - for (Clan clan : clans) { + for (Union union : unions) { - if (clan.isPermanent()) { + if (union.isPermanent()) { continue; } - int purgeClan = plugin.getSettingsManager().getInt(PURGE_INACTIVE_CLAN_DAYS); - if (clan.getInactiveDays() > purgeClan && purgeClan > 0) { + int purgeUnion = plugin.getSettingsManager().getInt(PURGE_INACTIVE_UNION_DAYS); + if (union.getInactiveDays() > purgeUnion && purgeUnion > 0) { - purge.add(clan); + purge.add(union); } } - for (Clan clan : purge) { + for (Union union : purge) { - plugin.getLogger().info(lang("purging.clan", clan.getName())); - for (ClanPlayer member : clan.getMembers()) { + plugin.getLogger().info(lang("purging.union", union.getName())); + for (UnionPlayer member : union.getMembers()) { - clan.removePlayerFromClan(member.getUniqueId()); + union.removePlayerFromUnion(member.getUniqueId()); } - deleteClan(clan); - clans.remove(clan); + deleteUnion(union); + unions.remove(union); } } - private void purgeClanPlayers(List cps) { + private void purgeUnionPlayers(List cps) { int purgePlayers = plugin.getSettingsManager().getInt(PURGE_INACTIVE_PLAYER_DAYS); if (purgePlayers < 1) { @@ -371,12 +395,12 @@ public final class StorageManager { } - List purge = new ArrayList<>(); + List purge = new ArrayList<>(); - for (ClanPlayer cp : cps) { + for (UnionPlayer cp : cps) { - // let the clan be purged first - if (cp.isLeader() && cp.getClan() != null) { + // let the union be purged first + if (cp.getUnion() != null) { continue; @@ -390,10 +414,10 @@ public final class StorageManager { } - for (ClanPlayer cp : purge) { + for (UnionPlayer cp : purge) { plugin.getLogger().info(lang("purging.player.data", cp.getName())); - deleteClanPlayer(cp); + deleteUnionPlayer(cp); cps.remove(cp); } @@ -401,12 +425,12 @@ public final class StorageManager { } /** - * Retrieves all simple clans from the database + * Retrieves all unions from the database * */ - public List retrieveClans() { + public List retrieveUnions() { - List out = new ArrayList<>(); + List out = new ArrayList<>(); String query = "SELECT * FROM `" + getPrefixedTable("clans") + "`;"; ResultSet res = core.select(query); @@ -428,7 +452,6 @@ public final class StorageManager { String packed_rivals = res.getString("packed_rivals"); String packed_bb = res.getString("packed_bb"); String flags = res.getString("flags"); - String ranksJson = res.getString("ranks"); long founded = res.getLong("founded"); long last_used = res.getLong("last_used"); double balance = res.getDouble("balance"); @@ -448,27 +471,25 @@ public final class StorageManager { } - Clan clan = new Clan(); - clan.setFlags(flags); - clan.setFriendlyFire(friendly_fire); - clan.setTag(tag); - clan.setColorTag(color_tag); - clan.setName(name); - clan.setDescription(description); - clan.setPackedAllies(packed_allies); - clan.setPackedRivals(packed_rivals); - clan.setPackedBb(packed_bb); - clan.setFounded(founded); - clan.setLastUsed(last_used); - clan.setBalance(BankOperator.INTERNAL, ClanBalanceUpdateEvent.Cause.LOADING, + Union union = new Union(); + union.setFlags(flags); + union.setFriendlyFire(friendly_fire); + union.setTag(tag); + union.setColorTag(color_tag); + union.setName(name); + union.setDescription(description); + union.setPackedAllies(packed_allies); + union.setPackedRivals(packed_rivals); + union.setPackedBb(packed_bb); + union.setFounded(founded); + union.setLastUsed(last_used); + union.setBalance(BankOperator.INTERNAL, UnionBalanceUpdateEvent.Cause.LOADING, BankLogger.Operation.SET, balance); - clan.setMemberFee(feeValue); - clan.setMemberFeeEnabled(feeEnabled); - clan.setRanks(Helper.ranksFromJson(ranksJson)); - clan.setDefaultRank(Helper.defaultRankFromJson(ranksJson)); - clan.setBanner(banner); + union.setMemberFee(feeValue); + union.setMemberFeeEnabled(feeEnabled); + union.setBanner(banner); - out.add(clan); + out.add(union); } catch (Exception ex) { @@ -492,14 +513,14 @@ public final class StorageManager { } /** - * Retrieves one Clan from the database Used for BungeeCord Reload ClanPlayer - * and your Clan + * Retrieves one Union from the database Used for BungeeCord Reload UnionPlayer + * and your Union */ - public @Nullable Clan retrieveOneClan(String tagClan) { + public @Nullable Union retrieveOneUnion(String tagUnion) { - Clan out = null; + Union out = null; - String query = "SELECT * FROM `" + getPrefixedTable("clans") + "` WHERE `tag` = '" + tagClan + "';"; + String query = "SELECT * FROM `" + getPrefixedTable("clans") + "` WHERE `tag` = '" + tagUnion + "';"; ResultSet res = core.select(query); if (res != null) { @@ -519,7 +540,6 @@ public final class StorageManager { String packed_rivals = res.getString("packed_rivals"); String packed_bb = res.getString("packed_bb"); String flags = res.getString("flags"); - String ranksJson = res.getString("ranks"); long founded = res.getLong("founded"); long last_used = res.getLong("last_used"); double balance = res.getDouble("balance"); @@ -539,27 +559,25 @@ public final class StorageManager { } - Clan clan = new Clan(); - clan.setFlags(flags); - clan.setFriendlyFire(friendly_fire); - clan.setTag(tag); - clan.setColorTag(color_tag); - clan.setName(name); - clan.setDescription(description); - clan.setPackedAllies(packed_allies); - clan.setPackedRivals(packed_rivals); - clan.setPackedBb(packed_bb); - clan.setFounded(founded); - clan.setLastUsed(last_used); - clan.setBalance(BankOperator.INTERNAL, ClanBalanceUpdateEvent.Cause.LOADING, + Union union = new Union(); + union.setFlags(flags); + union.setFriendlyFire(friendly_fire); + union.setTag(tag); + union.setColorTag(color_tag); + union.setName(name); + union.setDescription(description); + union.setPackedAllies(packed_allies); + union.setPackedRivals(packed_rivals); + union.setPackedBb(packed_bb); + union.setFounded(founded); + union.setLastUsed(last_used); + union.setBalance(BankOperator.INTERNAL, UnionBalanceUpdateEvent.Cause.LOADING, BankLogger.Operation.SET, balance); - clan.setMemberFee(feeValue); - clan.setMemberFeeEnabled(feeEnabled); - clan.setRanks(Helper.ranksFromJson(ranksJson)); - clan.setDefaultRank(Helper.defaultRankFromJson(ranksJson)); - clan.setBanner(banner); + union.setMemberFee(feeValue); + union.setMemberFeeEnabled(feeEnabled); + union.setBanner(banner); - out = clan; + out = union; } catch (Exception ex) { @@ -583,12 +601,12 @@ public final class StorageManager { } /** - * Retrieves all clan players from the database + * Retrieves all union players from the database * */ - public List retrieveClanPlayers() { + public List retrieveUnionPlayers() { - List out = new ArrayList<>(); + List out = new ArrayList<>(); String query = "SELECT * FROM `" + getPrefixedTable("players") + "`;"; ResultSet res = core.select(query); @@ -604,7 +622,6 @@ public final class StorageManager { String uuid = res.getString("uuid"); String name = res.getString("name"); String tag = res.getString("tag"); - boolean leader = res.getBoolean("leader"); boolean friendly_fire = res.getBoolean("friendly_fire"); boolean trusted = res.getBoolean("trusted"); int neutral_kills = res.getInt("neutral_kills"); @@ -615,7 +632,7 @@ public final class StorageManager { long last_seen = res.getLong("last_seen"); long join_date = res.getLong("join_date"); String flags = res.getString("flags"); - String packed_past_clans = ChatUtils.parseColors(res.getString("packed_past_clans")); + String packed_past_unions = ChatUtils.parseColors(res.getString("packed_past_clans")); String resign_times = res.getString("resign_times"); Locale locale = Helper.forLanguageTag(res.getString("locale")); @@ -625,7 +642,7 @@ public final class StorageManager { } - ClanPlayer cp = new ClanPlayer(); + UnionPlayer cp = new UnionPlayer(); if (uuid != null) { cp.setUniqueId(UUID.fromString(uuid)); @@ -634,7 +651,6 @@ public final class StorageManager { cp.setFlags(flags); cp.setName(name); - cp.setLeader(leader); cp.setFriendlyFire(friendly_fire); cp.setNeutralKills(neutral_kills); cp.setRivalKills(rival_kills); @@ -643,18 +659,18 @@ public final class StorageManager { cp.setDeaths(deaths); cp.setLastSeen(last_seen); cp.setJoinDate(join_date); - cp.setPackedPastClans(packed_past_clans); - cp.setTrusted(leader || trusted); + cp.setPackedPastUnions(packed_past_unions); + cp.setTrusted(trusted); cp.setResignTimes(Helper.resignTimesFromJson(resign_times)); cp.setLocale(locale); if (!tag.isEmpty()) { - Clan clan = plugin.getClanManager().getClan(tag); + Union union = plugin.getUnionManager().getUnion(tag); - if (clan != null) { + if (union != null) { - cp.setClan(clan); + cp.setUnion(union); } @@ -684,12 +700,12 @@ public final class StorageManager { } /** - * Retrieves one clan player from the database Used for BungeeCord Reload - * ClanPlayer and your Clan + * Retrieves one union player from the database Used for BungeeCord Reload + * UnionPlayer and your Union */ - public @Nullable ClanPlayer retrieveOneClanPlayer(UUID playerUniqueId) { + public @Nullable UnionPlayer retrieveOneUnionPlayer(UUID playerUniqueId) { - ClanPlayer out = null; + UnionPlayer out = null; String query = "SELECT * FROM `" + getPrefixedTable("players") + "` WHERE `uuid` = '" + playerUniqueId.toString() + "';"; @@ -706,7 +722,6 @@ public final class StorageManager { String uuid = res.getString("uuid"); String name = res.getString("name"); String tag = res.getString("tag"); - boolean leader = res.getBoolean("leader"); boolean friendly_fire = res.getBoolean("friendly_fire"); boolean trusted = res.getBoolean("trusted"); int neutral_kills = res.getInt("neutral_kills"); @@ -717,7 +732,7 @@ public final class StorageManager { long last_seen = res.getLong("last_seen"); long join_date = res.getLong("join_date"); String flags = res.getString("flags"); - String packed_past_clans = ChatUtils.parseColors(res.getString("packed_past_clans")); + String packed_past_unions = ChatUtils.parseColors(res.getString("packed_past_clans")); String resign_times = res.getString("resign_times"); Locale locale = Helper.forLanguageTag(res.getString("locale")); @@ -727,7 +742,7 @@ public final class StorageManager { } - ClanPlayer cp = new ClanPlayer(); + UnionPlayer cp = new UnionPlayer(); if (uuid != null) { cp.setUniqueId(UUID.fromString(uuid)); @@ -736,7 +751,6 @@ public final class StorageManager { cp.setFlags(flags); cp.setName(name); - cp.setLeader(leader); cp.setFriendlyFire(friendly_fire); cp.setNeutralKills(neutral_kills); cp.setRivalKills(rival_kills); @@ -745,39 +759,39 @@ public final class StorageManager { cp.setDeaths(deaths); cp.setLastSeen(last_seen); cp.setJoinDate(join_date); - cp.setPackedPastClans(packed_past_clans); - cp.setTrusted(leader || trusted); + cp.setPackedPastUnions(packed_past_unions); + cp.setTrusted(trusted); cp.setResignTimes(Helper.resignTimesFromJson(resign_times)); cp.setLocale(locale); if (!tag.isEmpty()) { - Clan clanDB = retrieveOneClan(tag); - Clan clan = plugin.getClanManager().getClan(tag); + Union unionDB = retrieveOneUnion(tag); + Union union = plugin.getUnionManager().getUnion(tag); - if (clan != null && clanDB != null) { + if (union != null && unionDB != null) { - Clan clanReSync = UnionsOG.getInstance().getClanManager().getClan(tag); - clanReSync.setFlags(clanDB.getFlags()); - clanReSync.setFriendlyFire(clanDB.isFriendlyFire()); - clanReSync.setTag(clanDB.getTag()); - clanReSync.setColorTag(clanDB.getColorTag()); - clanReSync.setName(clanDB.getName()); - clanReSync.setPackedAllies(clanDB.getPackedAllies()); - clanReSync.setPackedRivals(clanDB.getPackedRivals()); - clanReSync.setPackedBb(clanDB.getPackedBb()); - clanReSync.setFounded(clanDB.getFounded()); - clanReSync.setLastUsed(clanDB.getLastUsed()); - clanReSync.setBalance(BankOperator.INTERNAL, ClanBalanceUpdateEvent.Cause.LOADING, - BankLogger.Operation.SET, clanDB.getBalance()); - cp.setClan(clanReSync); + Union unionReSync = UnionsOG.getInstance().getUnionManager().getUnion(tag); + unionReSync.setFlags(unionDB.getFlags()); + unionReSync.setFriendlyFire(unionDB.isFriendlyFire()); + unionReSync.setTag(unionDB.getTag()); + unionReSync.setColorTag(unionDB.getColorTag()); + unionReSync.setName(unionDB.getName()); + unionReSync.setPackedAllies(unionDB.getPackedAllies()); + unionReSync.setPackedRivals(unionDB.getPackedRivals()); + unionReSync.setPackedBb(unionDB.getPackedBb()); + unionReSync.setFounded(unionDB.getFounded()); + unionReSync.setLastUsed(unionDB.getLastUsed()); + unionReSync.setBalance(BankOperator.INTERNAL, UnionBalanceUpdateEvent.Cause.LOADING, + BankLogger.Operation.SET, unionDB.getBalance()); + cp.setUnion(unionReSync); } else { - plugin.getClanManager().importClan(clanDB); - clanDB.validateWarring(); - Clan newClan = plugin.getClanManager().getClan(clanDB.getTag()); - cp.setClan(newClan); + plugin.getUnionManager().importUnion(unionDB); + unionDB.validateWarring(); + Union newUnion = plugin.getUnionManager().getUnion(unionDB.getTag()); + cp.setUnion(newUnion); } @@ -807,44 +821,44 @@ public final class StorageManager { } /** - * Insert a clan into the database + * Insert a union into the database * */ - public void insertClan(Clan clan) { + public void insertUnion(Union union) { - plugin.getProxyManager().sendUpdate(clan); + plugin.getProxyManager().sendUpdate(union); String query = "INSERT INTO `" + getPrefixedTable("clans") + "` (`banner`, `ranks`, `description`, `fee_enabled`, `fee_value`, `verified`, `tag`," + " `color_tag`, `name`, `friendly_fire`, `founded`, `last_used`, `packed_allies`, `packed_rivals`, " + "`packed_bb`, `cape_url`, `flags`, `balance`) "; - String values = "VALUES ( '" + Helper.escapeQuotes(YAMLSerializer.serialize(clan.getBanner())) + "','" - + Helper.escapeQuotes(Helper.ranksToJson(clan.getRanks(), clan.getDefaultRank())) + "','" - + Helper.escapeQuotes(clan.getDescription()) + "'," + (clan.isMemberFeeEnabled() ? 1 : 0) + "," - + Helper.escapeQuotes(String.valueOf(clan.getMemberFee())) + ",1,'" + Helper.escapeQuotes(clan.getTag()) - + "','" + Helper.escapeQuotes(clan.getColorTag()) + "','" + Helper.escapeQuotes(clan.getName()) + "'," - + (clan.isFriendlyFire() ? 1 : 0) + ",'" + clan.getFounded() + "','" + clan.getLastUsed() + "','" - + Helper.escapeQuotes(clan.getPackedAllies()) + "','" + Helper.escapeQuotes(clan.getPackedRivals()) - + "','" + Helper.escapeQuotes(clan.getPackedBb()) + "','" + Helper.escapeQuotes(clan.getCapeUrl()) - + "','" + Helper.escapeQuotes(clan.getFlags()) + "','" - + Helper.escapeQuotes(String.valueOf(clan.getBalance())) + "');"; + String values = "VALUES ( '" + Helper.escapeQuotes(YAMLSerializer.serialize(union.getBanner())) + "','','" + + Helper.escapeQuotes(union.getDescription()) + "'," + (union.isMemberFeeEnabled() ? 1 : 0) + "," + + Helper.escapeQuotes(String.valueOf(union.getMemberFee())) + ",1,'" + + Helper.escapeQuotes(union.getTag()) + "','" + Helper.escapeQuotes(union.getColorTag()) + "','" + + Helper.escapeQuotes(union.getName()) + "'," + (union.isFriendlyFire() ? 1 : 0) + ",'" + + union.getFounded() + "','" + union.getLastUsed() + "','" + + Helper.escapeQuotes(union.getPackedAllies()) + "','" + Helper.escapeQuotes(union.getPackedRivals()) + + "','" + Helper.escapeQuotes(union.getPackedBb()) + "','" + Helper.escapeQuotes(union.getCapeUrl()) + + "','" + Helper.escapeQuotes(union.getFlags()) + "','" + + Helper.escapeQuotes(String.valueOf(union.getBalance())) + "');"; core.executeUpdate(query + values); } /** - * Update a clan to the database asynchronously + * Update a union to the database asynchronously * */ @Deprecated - public void updateClanAsync(final Clan clan) { + public void updateUnionAsync(final Union union) { new BukkitRunnable() { @Override public void run() { - updateClan(clan); + updateUnion(union); } @@ -857,7 +871,7 @@ public final class StorageManager { * * @param cp to update */ - public void updatePlayerNameAsync(final @NotNull ClanPlayer cp) { + public void updatePlayerNameAsync(final @NotNull UnionPlayer cp) { new BukkitRunnable() { @@ -877,7 +891,7 @@ public final class StorageManager { * * @param cp to update */ - public void updatePlayerName(final @NotNull ClanPlayer cp) { + public void updatePlayerName(final @NotNull UnionPlayer cp) { String query = "UPDATE `" + getPrefixedTable("players") + "` SET `name` = '" + cp.getName() + "' WHERE uuid = '" + cp.getUniqueId() + "';"; @@ -886,52 +900,52 @@ public final class StorageManager { } /** - * Update a clan to the database + * Update a union to the database * */ - public void updateClan(Clan clan) { + public void updateUnion(Union union) { - updateClan(clan, true); + updateUnion(union, true); } /** - * Update a clan to the database + * Update a union to the database * - * @param clan clan to update + * @param union union to update * - * @param updateLastUsed should the clan's last used time be updated as well? + * @param updateLastUsed should the union's last used time be updated as well? */ - public void updateClan(Clan clan, boolean updateLastUsed) { + public void updateUnion(Union union, boolean updateLastUsed) { if (updateLastUsed) { - clan.updateLastUsed(); + union.updateLastUsed(); } - plugin.getProxyManager().sendUpdate(clan); + plugin.getProxyManager().sendUpdate(union); if (plugin.getSettingsManager().is(PERFORMANCE_SAVE_PERIODICALLY)) { - modifiedClans.add(clan); + modifiedUnions.add(union); return; } - try (PreparedStatement st = prepareUpdateClanStatement(core.getConnection())) { + try (PreparedStatement st = prepareUpdateUnionStatement(core.getConnection())) { - setValues(st, clan); + setValues(st, union); st.executeUpdate(); } catch (SQLException ex) { - plugin.getLogger().log(Level.SEVERE, String.format("Error updating Clan %s", clan.getTag()), ex); + plugin.getLogger().log(Level.SEVERE, String.format("Error updating Clan %s", union.getTag()), ex); } } - private PreparedStatement prepareUpdateClanStatement(Connection connection) throws SQLException { + private PreparedStatement prepareUpdateUnionStatement(Connection connection) throws SQLException { String sql = "UPDATE `" + getPrefixedTable("clans") + "` SET ranks = ?, banner = ?, description = ?, fee_enabled = ?, fee_value = ?, " @@ -941,74 +955,214 @@ public final class StorageManager { } - private void setValues(PreparedStatement statement, Clan clan) throws SQLException { + private void setValues(PreparedStatement statement, Union union) throws SQLException { - statement.setString(1, Helper.ranksToJson(clan.getRanks(), clan.getDefaultRank())); - statement.setString(2, YAMLSerializer.serialize(clan.getBanner())); - statement.setString(3, clan.getDescription()); - statement.setInt(4, clan.isMemberFeeEnabled() ? 1 : 0); - statement.setDouble(5, clan.getMemberFee()); + statement.setString(1, ""); + statement.setString(2, YAMLSerializer.serialize(union.getBanner())); + statement.setString(3, union.getDescription()); + statement.setInt(4, union.isMemberFeeEnabled() ? 1 : 0); + statement.setDouble(5, union.getMemberFee()); statement.setInt(6, 1); - statement.setString(7, clan.getTag()); - statement.setString(8, clan.getColorTag()); - statement.setString(9, clan.getName()); - statement.setInt(10, clan.isFriendlyFire() ? 1 : 0); - statement.setLong(11, clan.getFounded()); - statement.setLong(12, clan.getLastUsed()); - statement.setString(13, clan.getPackedAllies()); - statement.setString(14, clan.getPackedRivals()); - statement.setString(15, clan.getPackedBb()); - statement.setDouble(16, clan.getBalance()); - statement.setString(17, clan.getFlags()); - statement.setString(18, clan.getTag()); + statement.setString(7, union.getTag()); + statement.setString(8, union.getColorTag()); + statement.setString(9, union.getName()); + statement.setInt(10, union.isFriendlyFire() ? 1 : 0); + statement.setLong(11, union.getFounded()); + statement.setLong(12, union.getLastUsed()); + statement.setString(13, union.getPackedAllies()); + statement.setString(14, union.getPackedRivals()); + statement.setString(15, union.getPackedBb()); + statement.setDouble(16, union.getBalance()); + statement.setString(17, union.getFlags()); + statement.setString(18, union.getTag()); } /** - * Delete a clan from the database + * Delete a union from the database */ - public void deleteClan(Clan clan) { + /** + * Retrieves all open proposals from the database + * + * @return the proposals, keyed by union tag + */ + public Map retrieveProposals() { - plugin.getProxyManager().sendDelete(clan); - String query = "DELETE FROM `" + getPrefixedTable("clans") + "` WHERE tag = '" + clan.getTag() + "';"; + Map out = new HashMap<>(); + String query = "SELECT * FROM `" + getPrefixedTable("proposals") + "`;"; + + try (ResultSet res = core.select(query)) { + + if (res == null) { + + return out; + + } + + while (res.next()) { + + String tag = res.getString("tag"); + ProposalType type = ProposalType.fromName(res.getString("type")); + UUID proposer = parseUuid(res.getString("proposer")); + if (type == null || proposer == null) { + + continue; + + } + + Proposal proposal = new Proposal(type, tag, proposer, res.getString("target"), + res.getLong("created_at")); + proposal.putVotes(votesFromString(res.getString("votes"))); + out.put(tag, proposal); + + } + + } catch (SQLException ex) { + + plugin.getLogger().log(Level.SEVERE, "Error retrieving proposals", ex); + + } + + return out; + + } + + /** + * Inserts or updates a proposal. A union can only have one open proposal, so + * the union's tag identifies the row. + */ + public void saveProposal(Proposal proposal) { + + deleteProposal(proposal.getUnionTag()); + + String query = "INSERT INTO `" + getPrefixedTable("proposals") + + "` (`tag`, `type`, `target`, `proposer`, `created_at`, `votes`) VALUES ('" + + Helper.escapeQuotes(proposal.getUnionTag()) + "','" + proposal.getType().name() + "','" + + Helper.escapeQuotes(proposal.getTarget()) + "','" + proposal.getProposer() + "','" + + proposal.getCreatedAt() + "','" + votesToString(proposal.getVotes()) + "');"; + core.executeUpdate(query); + + } + + public void deleteProposal(String unionTag) { + + String query = "DELETE FROM `" + getPrefixedTable("proposals") + "` WHERE tag = '" + + Helper.escapeQuotes(unionTag) + "';"; + core.executeUpdate(query); + + } + + private @Nullable UUID parseUuid(@Nullable String uuid) { + + if (uuid == null) { + + return null; + + } + + try { + + return UUID.fromString(uuid); + + } catch (IllegalArgumentException ex) { + + return null; + + } + + } + + private String votesToString(Map votes) { + + StringBuilder sb = new StringBuilder(); + for (Map.Entry vote : votes.entrySet()) { + + if (sb.length() > 0) { + + sb.append(','); + + } + + sb.append(vote.getKey()).append('=').append(vote.getValue() ? '1' : '0'); + + } + + return sb.toString(); + + } + + private Map votesFromString(@Nullable String votes) { + + Map out = new LinkedHashMap<>(); + if (votes == null || votes.isEmpty()) { + + return out; + + } + + for (String vote : votes.split(",")) { + + String[] parts = vote.split("="); + if (parts.length != 2) { + + continue; + + } + + UUID voter = parseUuid(parts[0]); + if (voter != null) { + + out.put(voter, "1".equals(parts[1])); + + } + + } + + return out; + + } + + public void deleteUnion(Union union) { + + plugin.getProxyManager().sendDelete(union); + String query = "DELETE FROM `" + getPrefixedTable("clans") + "` WHERE tag = '" + union.getTag() + "';"; core.executeUpdate(query); } /** - * Insert a clan player into the database + * Insert a union player into the database * */ - public void insertClanPlayer(ClanPlayer cp) { + public void insertUnionPlayer(UnionPlayer cp) { plugin.getProxyManager().sendUpdate(cp); String query = "INSERT INTO `" + getPrefixedTable("players") + "` (`uuid`, `name`, `leader`, `tag`, `friendly_fire`, `neutral_kills`, " + "`rival_kills`, `civilian_kills`, `deaths`, `last_seen`, `join_date`, `packed_past_clans`, `flags`) "; - String values = "VALUES ('" + cp.getUniqueId().toString() + "', '" + cp.getName() + "'," - + (cp.isLeader() ? 1 : 0) + ",'" + Helper.escapeQuotes(cp.getTag()) + "'," - + (cp.isFriendlyFire() ? 1 : 0) + "," + cp.getNeutralKills() + "," + cp.getRivalKills() + "," - + cp.getCivilianKills() + "," + cp.getDeaths() + ",'" + cp.getLastSeen() + "',' " + cp.getJoinDate() - + "','" + Helper.escapeQuotes(cp.getPackedPastClans()) + "','" + Helper.escapeQuotes(cp.getFlags()) - + "');"; + String values = "VALUES ('" + cp.getUniqueId().toString() + "', '" + cp.getName() + "'," + 0 + ",'" + + Helper.escapeQuotes(cp.getTag()) + "'," + (cp.isFriendlyFire() ? 1 : 0) + "," + cp.getNeutralKills() + + "," + cp.getRivalKills() + "," + cp.getCivilianKills() + "," + cp.getDeaths() + ",'" + + cp.getLastSeen() + "',' " + cp.getJoinDate() + "','" + Helper.escapeQuotes(cp.getPackedPastUnions()) + + "','" + Helper.escapeQuotes(cp.getFlags()) + "');"; core.executeUpdate(query + values); } /** - * Update a clan player to the database asynchronously + * Update a union player to the database asynchronously * */ @Deprecated - public void updateClanPlayerAsync(final ClanPlayer cp) { + public void updateUnionPlayerAsync(final UnionPlayer cp) { new BukkitRunnable() { @Override public void run() { - updateClanPlayer(cp); + updateUnionPlayer(cp); } @@ -1017,21 +1171,21 @@ public final class StorageManager { } /** - * Update a clan player to the database + * Update a union player to the database * */ - public void updateClanPlayer(ClanPlayer cp) { + public void updateUnionPlayer(UnionPlayer cp) { cp.updateLastSeen(); plugin.getProxyManager().sendUpdate(cp); if (plugin.getSettingsManager().is(PERFORMANCE_SAVE_PERIODICALLY)) { - modifiedClanPlayers.add(cp); + modifiedUnionPlayers.add(cp); return; } - try (PreparedStatement st = prepareUpdateClanPlayerStatement(core.getConnection())) { + try (PreparedStatement st = prepareUpdateUnionPlayerStatement(core.getConnection())) { setValues(st, cp); st.executeUpdate(); @@ -1044,7 +1198,7 @@ public final class StorageManager { } - private PreparedStatement prepareUpdateClanPlayerStatement(Connection connection) throws SQLException { + private PreparedStatement prepareUpdateUnionPlayerStatement(Connection connection) throws SQLException { String sql = "UPDATE `" + getPrefixedTable("players") + "` SET locale = ?, resign_times = ?, leader = ?, tag = ?, friendly_fire = ?," @@ -1054,11 +1208,11 @@ public final class StorageManager { } - private void setValues(PreparedStatement statement, ClanPlayer cp) throws SQLException { + private void setValues(PreparedStatement statement, UnionPlayer cp) throws SQLException { statement.setString(1, Helper.toLanguageTag(cp.getLocale())); statement.setString(2, Helper.resignTimesToJson(cp.getResignTimes())); - statement.setInt(3, cp.isLeader() ? 1 : 0); + statement.setInt(3, 0); statement.setString(4, cp.getTag()); statement.setInt(5, cp.isFriendlyFire() ? 1 : 0); statement.setInt(6, cp.getNeutralKills()); @@ -1067,7 +1221,7 @@ public final class StorageManager { statement.setInt(9, cp.getCivilianKills()); statement.setInt(10, cp.getDeaths()); statement.setLong(11, cp.getLastSeen()); - statement.setString(12, cp.getPackedPastClans()); + statement.setString(12, cp.getPackedPastUnions()); statement.setInt(13, cp.isTrusted() ? 1 : 0); statement.setString(14, cp.getFlags()); statement.setString(15, cp.getName()); @@ -1076,15 +1230,15 @@ public final class StorageManager { } /** - * Delete a clan player from the database + * Delete a union player from the database */ - public void deleteClanPlayer(ClanPlayer cp) { + public void deleteUnionPlayer(UnionPlayer cp) { - final Clan clan = cp.getClan(); - if (clan != null) { + final Union union = cp.getUnion(); + if (union != null) { - clan.addBbWithoutSaving(MessageFormat.format(lang("has.been.purged"), cp.getName())); - updateClan(clan, false); + union.addBbWithoutSaving(MessageFormat.format(lang("has.been.purged"), cp.getName())); + updateUnion(union, false); } @@ -1117,7 +1271,7 @@ public final class StorageManager { * @param victim the victim * @param type the kill type */ - public void insertKill(@NotNull ClanPlayer attacker, @NotNull ClanPlayer victim, @NotNull String type, + public void insertKill(@NotNull UnionPlayer attacker, @NotNull UnionPlayer victim, @NotNull String type, @NotNull LocalDateTime time) { @@ -1474,13 +1628,13 @@ public final class StorageManager { logMigrationStart(); - List cps = retrieveClanPlayers(); + List cps = retrieveUnionPlayers(); Map uuidMap = fetchUUIDs(cps); int totalPlayers = cps.size(); for (int i = 0; i < totalPlayers; i++) { - ClanPlayer cp = cps.get(i); + UnionPlayer cp = cps.get(i); try { UUID uuid = uuidMap.get(cp.getName()); @@ -1519,7 +1673,7 @@ public final class StorageManager { } - private Map fetchUUIDs(List clanPlayers) { + private Map fetchUUIDs(List unionPlayers) { Map uuidMap = new HashMap<>(); @@ -1527,11 +1681,11 @@ public final class StorageManager { if (UnionsOG.getInstance().getServer().getOnlineMode()) { - uuidMap = UUIDFetcher.fetchUUIDsForClanPlayers(clanPlayers); + uuidMap = UUIDFetcher.fetchUUIDsForUnionPlayers(unionPlayers); } else { - uuidMap = clanPlayers.stream().collect(Collectors.toMap(ClanPlayer::getName, player -> UUID + uuidMap = unionPlayers.stream().collect(Collectors.toMap(UnionPlayer::getName, player -> UUID .nameUUIDFromBytes(("OfflinePlayer:" + player.getName()).getBytes(StandardCharsets.UTF_8)))); } @@ -1576,7 +1730,7 @@ public final class StorageManager { if (totalPlayers > 0) { - plugin.getLogger().info(MessageFormat.format(lang("clan.players"), totalPlayers)); + plugin.getLogger().info(MessageFormat.format(lang("union.players"), totalPlayers)); } @@ -1589,7 +1743,7 @@ public final class StorageManager { } /** - * Saves modified Clans and ClanPlayers to the database + * Saves modified Unions and UnionPlayers to the database * * @since 2.10.2 * @@ -1599,11 +1753,11 @@ public final class StorageManager { */ public void saveModified() { - try (PreparedStatement pst = prepareUpdateClanPlayerStatement(core.getConnection())) { + try (PreparedStatement pst = prepareUpdateUnionPlayerStatement(core.getConnection())) { // removing purged players - modifiedClanPlayers.retainAll(plugin.getClanManager().getAllClanPlayers()); - for (ClanPlayer cp : modifiedClanPlayers) { + modifiedUnionPlayers.retainAll(plugin.getUnionManager().getAllUnionPlayers()); + for (UnionPlayer cp : modifiedUnionPlayers) { setValues(pst, cp); pst.addBatch(); @@ -1612,7 +1766,7 @@ public final class StorageManager { pst.executeBatch(); - modifiedClanPlayers.clear(); + modifiedUnionPlayers.clear(); } catch (SQLException ex) { @@ -1620,20 +1774,20 @@ public final class StorageManager { } - try (PreparedStatement pst = prepareUpdateClanStatement(core.getConnection())) { + try (PreparedStatement pst = prepareUpdateUnionStatement(core.getConnection())) { - // removing disbanded clans - modifiedClans.retainAll(plugin.getClanManager().getClans()); - for (Clan clan : modifiedClans) { + // removing disbanded unions + modifiedUnions.retainAll(plugin.getUnionManager().getUnions()); + for (Union union : modifiedUnions) { - setValues(pst, clan); + setValues(pst, union); pst.addBatch(); } pst.executeBatch(); - modifiedClans.clear(); + modifiedUnions.clear(); } catch (SQLException ex) { diff --git a/src/main/java/net/trueog/unionsog/managers/TeleportManager.java b/src/main/java/net/trueog/unionsog/managers/TeleportManager.java index a3dd847a..b903c5cf 100644 --- a/src/main/java/net/trueog/unionsog/managers/TeleportManager.java +++ b/src/main/java/net/trueog/unionsog/managers/TeleportManager.java @@ -2,7 +2,7 @@ package net.trueog.unionsog.managers; import io.papermc.lib.PaperLib; import net.trueog.unionsog.*; -import net.trueog.unionsog.events.ClanPlayerTeleportEvent; +import net.trueog.unionsog.events.UnionPlayerTeleportEvent; import net.trueog.unionsog.utils.VanishUtils; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -45,20 +45,20 @@ public final class TeleportManager { * * @param player the Player * @param destination the destination - * @param clanName the Clan name + * @param unionName the Union name */ - public void addPlayer(Player player, Location destination, String clanName) { + public void addPlayer(Player player, Location destination, String unionName) { PermissionsManager pm = plugin.getPermissionsManager(); - int secs = UnionsOG.getInstance().getSettingsManager().getInt(CLAN_TELEPORT_DELAY); + int secs = UnionsOG.getInstance().getSettingsManager().getInt(UNION_TELEPORT_DELAY); if (pm.has(player, "unionsog.mod.bypass") || pm.has(player, "unionsog.vip.teleport-delay")) { secs = 0; } - waitingPlayers.put(player.getUniqueId().toString(), new TeleportState(player, destination, clanName, secs)); + waitingPlayers.put(player.getUniqueId().toString(), new TeleportState(player, destination, unionName, secs)); if (secs > 0) { @@ -69,33 +69,33 @@ public final class TeleportManager { } /** - * Teleports all online and non-vanished members of this {@link Clan} to the + * Teleports all online and non-vanished members of this {@link Union} to the * specified {@link Location} * * @param requester the Player requesting the teleport - * @param clan the Clan + * @param union the Union * @param location the Location */ - public void teleport(@NotNull Player requester, @NotNull Clan clan, @NotNull Location location) { + public void teleport(@NotNull Player requester, @NotNull Union union, @NotNull Location location) { - teleport(clan, location, VanishUtils.getNonVanished(requester, clan)); + teleport(union, location, VanishUtils.getNonVanished(requester, union)); } /** - * Teleports all online and non-vanished members of this {@link Clan} to the + * Teleports all online and non-vanished members of this {@link Union} to the * specified {@link Location} * - * @param clan the Clan + * @param union the Union * @param location the Location */ - public void teleport(Clan clan, Location location) { + public void teleport(Union union, Location location) { - teleport(clan, location, VanishUtils.getNonVanished(null, clan)); + teleport(union, location, VanishUtils.getNonVanished(null, union)); } - public void teleportToHome(@NotNull Player player, @NotNull Location destination, @NotNull String clanName) { + public void teleportToHome(@NotNull Player player, @NotNull Location destination, @NotNull String unionName) { PaperLib.teleportAsync(player, getSafe(destination), PlayerTeleportEvent.TeleportCause.COMMAND) .thenAccept(result -> @@ -103,7 +103,7 @@ public final class TeleportManager { if (result) { - ChatBlock.sendMessage(player, AQUA + lang("now.at.homebase", player, clanName)); + ChatBlock.sendMessage(player, AQUA + lang("now.at.homebase", player, unionName)); } else { @@ -115,15 +115,15 @@ public final class TeleportManager { } - public void teleportToHome(@NotNull Player player, @NotNull Clan clan) { + public void teleportToHome(@NotNull Player player, @NotNull Union union) { - if (clan.getHomeLocation() == null) { + if (union.getHomeLocation() == null) { return; } - teleportToHome(player, clan.getHomeLocation(), clan.getName()); + teleportToHome(player, union.getHomeLocation(), union.getName()); } @@ -183,8 +183,8 @@ public final class TeleportManager { List itemsList = plugin.getSettingsManager().getItemList(); PlayerInventory inv = player.getInventory(); - boolean dropOnHome = plugin.getSettingsManager().is(DROP_ITEMS_ON_CLAN_HOME); - boolean keepOnHome = plugin.getSettingsManager().is(KEEP_ITEMS_ON_CLAN_HOME); + boolean dropOnHome = plugin.getSettingsManager().is(DROP_ITEMS_ON_UNION_HOME); + boolean keepOnHome = plugin.getSettingsManager().is(KEEP_ITEMS_ON_UNION_HOME); ItemStack[] contents = inv.getContents(); for (ItemStack item : contents) { @@ -260,8 +260,8 @@ public final class TeleportManager { } - ClanPlayer cp = plugin.getClanManager().getCreateClanPlayer(player.getUniqueId()); - ClanPlayerTeleportEvent event = new ClanPlayerTeleportEvent(cp, state.getLocation(), state.getDestination()); + UnionPlayer cp = plugin.getUnionManager().getCreateUnionPlayer(player.getUniqueId()); + UnionPlayerTeleportEvent event = new UnionPlayerTeleportEvent(cp, state.getLocation(), state.getDestination()); Bukkit.getPluginManager().callEvent(event); if (event.isCancelled()) { @@ -273,7 +273,7 @@ public final class TeleportManager { sendTeleportBlocks(player, loc); dropItems(player); loc.clone().add(.5, .5, .5); - teleportToHome(player, loc, state.getClanName()); + teleportToHome(player, loc, state.getUnionName()); } @@ -298,9 +298,9 @@ public final class TeleportManager { } - private void teleport(Clan clan, Location location, List members) { + private void teleport(Union union, Location location, List members) { - for (ClanPlayer cp : members) { + for (UnionPlayer cp : members) { Player player = cp.toPlayer(); if (player == null) { @@ -326,7 +326,7 @@ public final class TeleportManager { z = z + zz; plugin.getTeleportManager().addPlayer(player, new Location(location.getWorld(), x + .5, - location.getBlockY(), z + .5, location.getYaw(), location.getPitch()), clan.getName()); + location.getBlockY(), z + .5, location.getYaw(), location.getPitch()), union.getName()); } diff --git a/src/main/java/net/trueog/unionsog/managers/ClanManager.java b/src/main/java/net/trueog/unionsog/managers/UnionManager.java similarity index 74% rename from src/main/java/net/trueog/unionsog/managers/ClanManager.java rename to src/main/java/net/trueog/unionsog/managers/UnionManager.java index 5fc7aaf3..8f2a373a 100644 --- a/src/main/java/net/trueog/unionsog/managers/ClanManager.java +++ b/src/main/java/net/trueog/unionsog/managers/UnionManager.java @@ -2,8 +2,8 @@ package net.trueog.unionsog.managers; import com.cryptomorin.xseries.XMaterial; import net.trueog.unionsog.*; -import net.trueog.unionsog.events.ClanBalanceUpdateEvent; -import net.trueog.unionsog.events.CreateClanEvent; +import net.trueog.unionsog.events.UnionBalanceUpdateEvent; +import net.trueog.unionsog.events.CreateUnionEvent; import net.trueog.unionsog.events.EconomyTransactionEvent.Cause; import net.trueog.unionsog.loggers.BankLogger; import net.trueog.unionsog.loggers.BankOperator; @@ -38,29 +38,29 @@ import static org.bukkit.ChatColor.RED; /** * @author phaed */ -public final class ClanManager { +public final class UnionManager { private final UnionsOG plugin; - private final ConcurrentHashMap clans = new ConcurrentHashMap<>(); - private final ConcurrentHashMap clanPlayers = new ConcurrentHashMap<>(); - private final HashMap> kills = new HashMap<>(); + private final ConcurrentHashMap unions = new ConcurrentHashMap<>(); + private final ConcurrentHashMap unionPlayers = new ConcurrentHashMap<>(); + private final HashMap> kills = new HashMap<>(); /** * */ - public ClanManager() { + public UnionManager() { plugin = UnionsOG.getInstance(); } /** - * Deletes all clans and clan players in memory + * Deletes all unions and union players in memory */ public void cleanData() { - clans.clear(); - clanPlayers.clear(); + unions.clear(); + unionPlayers.clear(); kills.clear(); } @@ -143,137 +143,135 @@ public final class ClanManager { } /** - * Import a clan into the in-memory store + * Import a union into the in-memory store */ - public void importClan(Clan clan) { + public void importUnion(Union union) { - this.clans.put(clan.getTag(), clan); + this.unions.put(union.getTag(), union); } /** - * Import a clan player into the in-memory store + * Import a union player into the in-memory store */ - public void importClanPlayer(ClanPlayer cp) { + public void importUnionPlayer(UnionPlayer cp) { if (cp.getUniqueId() != null) { - this.clanPlayers.put(cp.getUniqueId(), cp); + this.unionPlayers.put(cp.getUniqueId(), cp); } } /** - * Create a new clan + * Create a new union */ - public void createClan(Player player, String colorTag, String name) { + public void createUnion(Player player, String colorTag, String name) { - ClanPlayer cp = getCreateClanPlayer(player.getUniqueId()); + UnionPlayer cp = getCreateUnionPlayer(player.getUniqueId()); - Clan clan = new Clan(colorTag, name); - clan.addPlayerToClan(cp); - cp.setLeader(true); - clan.getRanks().addAll(plugin.getSettingsManager().getStarterRanks()); + Union union = new Union(colorTag, name); + union.addPlayerToUnion(cp); - plugin.getStorageManager().insertClan(clan); - importClan(clan); - plugin.getStorageManager().updateClanPlayer(cp); + plugin.getStorageManager().insertUnion(union); + importUnion(union); + plugin.getStorageManager().updateUnionPlayer(cp); plugin.getRequestManager().deny(cp); // denies any previous invitation - UnionsOG.getInstance().getPermissionsManager().updateClanPermissions(clan); - UnionsOG.getInstance().getServer().getPluginManager().callEvent(new CreateClanEvent(clan)); + UnionsOG.getInstance().getPermissionsManager().updateUnionPermissions(union); + UnionsOG.getInstance().getServer().getPluginManager().callEvent(new CreateUnionEvent(union)); } /** * Reset a player's KDR */ - public void resetKdr(ClanPlayer cp) { + public void resetKdr(UnionPlayer cp) { cp.setCivilianKills(0); cp.setNeutralKills(0); cp.setRivalKills(0); cp.setAllyKills(0); cp.setDeaths(0); - plugin.getStorageManager().updateClanPlayer(cp); + plugin.getStorageManager().updateUnionPlayer(cp); } /** * Delete a players data file */ - public void deleteClanPlayer(ClanPlayer cp) { + public void deleteUnionPlayer(UnionPlayer cp) { - Clan clan = cp.getClan(); - if (clan != null) { + Union union = cp.getUnion(); + if (union != null) { - clan.removePlayerFromClan(cp.getUniqueId()); + union.removePlayerFromUnion(cp.getUniqueId()); } - clanPlayers.remove(cp.getUniqueId()); - plugin.getStorageManager().deleteClanPlayer(cp); + unionPlayers.remove(cp.getUniqueId()); + plugin.getStorageManager().deleteUnionPlayer(cp); } /** * Delete a player data from memory */ - public void deleteClanPlayerFromMemory(UUID playerUniqueId) { + public void deleteUnionPlayerFromMemory(UUID playerUniqueId) { - clanPlayers.remove(playerUniqueId); + unionPlayers.remove(playerUniqueId); } /** - * Remove a clan from memory + * Remove a union from memory */ - public void removeClan(String tag) { + public void removeUnion(String tag) { - clans.remove(tag); + unions.remove(tag); } /** - * Whether the tag belongs to a clan + * Whether the tag belongs to a union */ - public boolean isClan(String tag) { + public boolean isUnion(String tag) { - return clans.containsKey(Helper.cleanTag(tag)); + return unions.containsKey(Helper.cleanTag(tag)); } /** - * Returns the clan the tag belongs to + * Returns the union the tag belongs to */ - public Clan getClan(String tag) { + public Union getUnion(String tag) { - return clans.get(Helper.cleanTag(tag)); + return unions.get(Helper.cleanTag(tag)); } @SuppressWarnings("deprecation") @Nullable - public Clan getClanByPlayerName(String playerName) { + public Union getUnionByPlayerName(String playerName) { - return getClanByPlayerUniqueId(Bukkit.getOfflinePlayer(playerName).getUniqueId()); + return getUnionByPlayerUniqueId(Bukkit.getOfflinePlayer(playerName).getUniqueId()); } /** - * Get a player's clan + * Get a player's union * - * @return null if not in a clan + * @return null if not in a union */ @Nullable - public Clan getClanByPlayerUniqueId(UUID playerUniqueId) { + public Union getUnionByPlayerUniqueId(UUID playerUniqueId) { - ClanPlayer cp = getClanPlayer(playerUniqueId); + UnionPlayer cp = getUnionPlayer(playerUniqueId); if (cp != null) { - return cp.getClan(); + return cp.getUnion(); } @@ -282,62 +280,62 @@ public final class ClanManager { } /** - * @return the clans + * @return the unions */ - public List getClans() { + public List getUnions() { - return new ArrayList<>(clans.values()); + return new ArrayList<>(unions.values()); } /** - * Returns the collection of all clan players, including the disabled ones + * Returns the collection of all union players, including the disabled ones */ - public List getAllClanPlayers() { + public List getAllUnionPlayers() { - return new ArrayList<>(clanPlayers.values()); + return new ArrayList<>(unionPlayers.values()); } /** - * Gets the ClanPlayer data object if a player is currently in a clan, null if - * he's not in a clan Used for BungeeCord Reload ClanPlayer and your Clan + * Gets the UnionPlayer data object if a player is currently in a union, null if + * he's not in a union Used for BungeeCord Reload UnionPlayer and your Union */ @Deprecated - public @Nullable ClanPlayer getClanPlayerJoinEvent(Player player) { + public @Nullable UnionPlayer getUnionPlayerJoinEvent(Player player) { UnionsOG.getInstance().getStorageManager().importFromDatabaseOnePlayer(player); - return getClanPlayer(player.getUniqueId()); + return getUnionPlayer(player.getUniqueId()); } /** - * Gets the ClanPlayer data object if a player is currently in a clan, null if - * he's not in a clan + * Gets the UnionPlayer data object if a player is currently in a union, null if + * he's not in a union */ - public @Nullable ClanPlayer getClanPlayer(@NotNull OfflinePlayer player) { + public @Nullable UnionPlayer getUnionPlayer(@NotNull OfflinePlayer player) { - return getClanPlayer(player.getUniqueId()); + return getUnionPlayer(player.getUniqueId()); } /** - * Gets the ClanPlayer data object if a player is currently in a clan, null if - * he's not in a clan + * Gets the UnionPlayer data object if a player is currently in a union, null if + * he's not in a union */ - public @Nullable ClanPlayer getClanPlayer(@NotNull Player player) { + public @Nullable UnionPlayer getUnionPlayer(@NotNull Player player) { - return getClanPlayer((OfflinePlayer) player); + return getUnionPlayer((OfflinePlayer) player); } /** - * Gets the ClanPlayer data object if a player is currently in a clan, null if - * he's not in a clan + * Gets the UnionPlayer data object if a player is currently in a union, null if + * he's not in a union */ - public @Nullable ClanPlayer getClanPlayer(UUID playerUniqueId) { + public @Nullable UnionPlayer getUnionPlayer(UUID playerUniqueId) { - ClanPlayer cp = clanPlayers.get(playerUniqueId); + UnionPlayer cp = unionPlayers.get(playerUniqueId); if (cp == null) { @@ -345,7 +343,7 @@ public final class ClanManager { } - if (cp.getClan() == null) { + if (cp.getUnion() == null) { return null; @@ -357,18 +355,18 @@ public final class ClanManager { @SuppressWarnings("deprecation") @Nullable - public ClanPlayer getClanPlayer(String playerName) { + public UnionPlayer getUnionPlayer(String playerName) { - return getClanPlayer(Bukkit.getOfflinePlayer(playerName).getUniqueId()); + return getUnionPlayer(Bukkit.getOfflinePlayer(playerName).getUniqueId()); } /** - * Gets the ClanPlayer data object if a player is currently in a clan, null if - * he's not in a clan + * Gets the UnionPlayer data object if a player is currently in a union, null if + * he's not in a union */ @Deprecated - public @Nullable ClanPlayer getClanPlayerName(String playerName) { + public @Nullable UnionPlayer getUnionPlayerName(String playerName) { UUID uuid = UUIDMigration.getForcedPlayerUUID(playerName); @@ -378,7 +376,7 @@ public final class ClanManager { } - ClanPlayer cp = clanPlayers.get(uuid); + UnionPlayer cp = unionPlayers.get(uuid); if (cp == null) { @@ -386,7 +384,7 @@ public final class ClanManager { } - if (cp.getClan() == null) { + if (cp.getUnion() == null) { return null; @@ -397,24 +395,24 @@ public final class ClanManager { } /** - * Gets the ClanPlayer data object for the player, will retrieve disabled clan - * players as well, these are players who used to be in a clan but are not - * currently in one, their data file persists and can be accessed. their clan + * Gets the UnionPlayer data object for the player, will retrieve disabled union + * players as well, these are players who used to be in a union but are not + * currently in one, their data file persists and can be accessed. their union * will be null though. */ @Nullable - public ClanPlayer getAnyClanPlayer(UUID uuid) { + public UnionPlayer getAnyUnionPlayer(UUID uuid) { - return clanPlayers.get(uuid); + return unionPlayers.get(uuid); } @SuppressWarnings("deprecation") @Nullable - public ClanPlayer getAnyClanPlayer(String playerName) { + public UnionPlayer getAnyUnionPlayer(String playerName) { - for (ClanPlayer cp : getAllClanPlayers()) { + for (UnionPlayer cp : getAllUnionPlayers()) { if (cp.getName().equalsIgnoreCase(playerName)) { @@ -429,15 +427,15 @@ public final class ClanManager { } /** - * Gets the ClanPlayer object for the player, creates one if not found + * Gets the UnionPlayer object for the player, creates one if not found */ @Deprecated - public @Nullable ClanPlayer getCreateClanPlayerUUID(String playerName) { + public @Nullable UnionPlayer getCreateUnionPlayerUUID(String playerName) { UUID playerUniqueId = UUIDMigration.getForcedPlayerUUID(playerName); if (playerUniqueId != null) { - return getCreateClanPlayer(playerUniqueId); + return getCreateUnionPlayer(playerUniqueId); } else { @@ -448,21 +446,21 @@ public final class ClanManager { } /** - * Gets the ClanPlayer object for the player, creates one if not found + * Gets the UnionPlayer object for the player, creates one if not found */ - public ClanPlayer getCreateClanPlayer(UUID uuid) { + public UnionPlayer getCreateUnionPlayer(UUID uuid) { Objects.requireNonNull(uuid, "UUID must not be null"); - if (clanPlayers.containsKey(uuid)) { + if (unionPlayers.containsKey(uuid)) { - return clanPlayers.get(uuid); + return unionPlayers.get(uuid); } - ClanPlayer cp = new ClanPlayer(uuid); + UnionPlayer cp = new UnionPlayer(uuid); boolean save = true; - for (ClanPlayer other : getAllClanPlayers()) { + for (UnionPlayer other : getAllUnionPlayers()) { if (other.getName().equals(cp.getName())) { @@ -475,8 +473,8 @@ public final class ClanManager { if (save) { - plugin.getStorageManager().insertClanPlayer(cp); - importClanPlayer(cp); + plugin.getStorageManager().insertUnionPlayer(cp); + importUnionPlayer(cp); } else if (plugin.getSettingsManager().is(DEBUG)) { @@ -491,9 +489,9 @@ public final class ClanManager { @SuppressWarnings("deprecation") @NotNull - public ClanPlayer getCreateClanPlayer(String playerName) { + public UnionPlayer getCreateUnionPlayer(String playerName) { - return getCreateClanPlayer(Bukkit.getOfflinePlayer(playerName).getUniqueId()); + return getCreateUnionPlayer(Bukkit.getOfflinePlayer(playerName).getUniqueId()); } @@ -516,7 +514,7 @@ public final class ClanManager { } /** - * Update the players display name with his clan's tag + * Update the players display name with his union's tag */ public void updateDisplayName(@Nullable Player player) { // do not update displayname if in compat mode @@ -542,7 +540,7 @@ public final class ClanManager { : ChatColor.WHITE + ""; String fullName = player.getName(); - ClanPlayer cp = plugin.getClanManager().getAnyClanPlayer(player.getUniqueId()); + UnionPlayer cp = plugin.getUnionManager().getAnyUnionPlayer(player.getUniqueId()); if (cp == null) { @@ -552,11 +550,11 @@ public final class ClanManager { if (cp.isTagEnabled()) { - Clan clan = cp.getClan(); + Union union = cp.getUnion(); - if (clan != null) { + if (union != null) { - fullName = clan.getTagLabel(cp.isLeader()) + lastColor + fullName + ChatColor.WHITE; + fullName = union.getTagLabel() + lastColor + fullName + ChatColor.WHITE; } @@ -573,23 +571,23 @@ public final class ClanManager { } /** - * Process a player and his clan's last seen date + * Process a player and his union's last seen date */ public void updateLastSeen(Player player) { - ClanPlayer cp = getAnyClanPlayer(player.getUniqueId()); + UnionPlayer cp = getAnyUnionPlayer(player.getUniqueId()); if (cp != null) { cp.updateLastSeen(); - plugin.getStorageManager().updateClanPlayer(cp); + plugin.getStorageManager().updateUnionPlayer(cp); - Clan clan = cp.getClan(); + Union union = cp.getUnion(); - if (clan != null) { + if (union != null) { - clan.updateLastUsed(); - plugin.getStorageManager().updateClan(clan); + union.updateLastUsed(); + plugin.getStorageManager().updateUnion(union); } @@ -605,36 +603,35 @@ public final class ClanManager { } /** - * Bans a player from clan commands + * Bans a player from union commands * * @param uuid the player's uuid */ public void ban(UUID uuid) { - ClanPlayer cp = getClanPlayer(uuid); - Clan clan = null; + UnionPlayer cp = getUnionPlayer(uuid); + Union union = null; if (cp != null) { - clan = cp.getClan(); + union = cp.getUnion(); } - if (clan != null) { + if (union != null) { - if (clan.getSize() == 1) { + if (union.getSize() == 1) { - clan.disband(null, false, false); + union.disband(null, false, false); } else { - cp.setClan(null); - cp.addPastClan(clan.getColorTag() + (cp.isLeader() ? ChatColor.DARK_RED + "*" : "")); - cp.setLeader(false); + cp.setUnion(null); + cp.addPastUnion(union.getColorTag()); cp.setJoinDate(0); - clan.removeMember(uuid); + union.removeMember(uuid); - plugin.getStorageManager().updateClanPlayer(cp); - plugin.getStorageManager().updateClan(clan); + plugin.getStorageManager().updateUnionPlayer(cp); + plugin.getStorageManager().updateUnion(union); } @@ -645,23 +642,23 @@ public final class ClanManager { } /** - * Get a count of rivable clans + * Get a count of rivable unions */ - public int getRivableClanCount() { + public int getRivableUnionCount() { - int clanCount = 0; + int unionCount = 0; - for (Clan tm : clans.values()) { + for (Union tm : unions.values()) { if (!UnionsOG.getInstance().getSettingsManager().isUnrivable(tm.getTag())) { - clanCount++; + unionCount++; } } - return clanCount; + return unionCount; } @@ -1067,11 +1064,11 @@ public final class ClanManager { } /** - * Sort clans by active + * Sort unions by active */ - public void sortClansByActive(List clans, boolean asc) { + public void sortUnionsByActive(List unions, boolean asc) { - clans.sort((c1, c2) -> { + unions.sort((c1, c2) -> { int o = 1; if (!asc) { @@ -1087,11 +1084,11 @@ public final class ClanManager { } /** - * Sort clans by founded date + * Sort unions by founded date */ - public void sortClansByFounded(List clans, boolean asc) { + public void sortUnionsByFounded(List unions, boolean asc) { - clans.sort((c1, c2) -> { + unions.sort((c1, c2) -> { int o = 1; if (!asc) { @@ -1107,11 +1104,11 @@ public final class ClanManager { } /** - * Sort clans by kdr + * Sort unions by kdr */ - public void sortClansByKDR(List clans, boolean asc) { + public void sortUnionsByKDR(List unions, boolean asc) { - clans.sort((c1, c2) -> { + unions.sort((c1, c2) -> { int o = 1; if (!asc) { @@ -1127,11 +1124,11 @@ public final class ClanManager { } /** - * Sort clans by size + * Sort unions by size */ - public void sortClansBySize(List clans, boolean asc) { + public void sortUnionsBySize(List unions, boolean asc) { - clans.sort((c1, c2) -> { + unions.sort((c1, c2) -> { int o = 1; if (!asc) { @@ -1147,11 +1144,11 @@ public final class ClanManager { } /** - * Sort clans by name + * Sort unions by name */ - public void sortClansByName(List clans, boolean asc) { + public void sortUnionsByName(List unions, boolean asc) { - clans.sort((c1, c2) -> { + unions.sort((c1, c2) -> { int o = 1; if (!asc) { @@ -1167,11 +1164,11 @@ public final class ClanManager { } /** - * Sort clans by KDR + * Sort unions by KDR */ - public void sortClansByKDR(List clans) { + public void sortUnionsByKDR(List unions) { - clans.sort((c1, c2) -> { + unions.sort((c1, c2) -> { Float o1 = c1.getTotalKDR(); Float o2 = c2.getTotalKDR(); @@ -1183,11 +1180,11 @@ public final class ClanManager { } /** - * Sort clans by KDR + * Sort unions by KDR */ - public void sortClansBySize(List clans) { + public void sortUnionsBySize(List unions) { - clans.sort((c1, c2) -> { + unions.sort((c1, c2) -> { Integer o1 = c1.getMembers().size(); Integer o2 = c2.getMembers().size(); @@ -1199,9 +1196,9 @@ public final class ClanManager { } /** - * Sort clan players by KDR + * Sort union players by KDR */ - public void sortClanPlayersByKDR(List cps) { + public void sortUnionPlayersByKDR(List cps) { cps.sort((c1, c2) -> { @@ -1215,9 +1212,9 @@ public final class ClanManager { } /** - * Sort clan players by last seen days + * Sort union players by last seen days */ - public void sortClanPlayersByLastSeen(List cps) { + public void sortUnionPlayersByLastSeen(List cps) { cps.sort((c1, c2) -> { @@ -1230,12 +1227,12 @@ public final class ClanManager { } - public long getMinutesBeforeRejoin(@NotNull ClanPlayer cp, @NotNull Clan clan) { + public long getMinutesBeforeRejoin(@NotNull UnionPlayer cp, @NotNull Union union) { SettingsManager settings = plugin.getSettingsManager(); if (settings.is(ENABLE_REJOIN_COOLDOWN)) { - Long resign = cp.getResignTime(clan.getTag()); + Long resign = cp.getResignTime(union.getTag()); if (resign != null) { long timePassed = Instant.ofEpochMilli(resign).until(Instant.now(), ChronoUnit.MINUTES); @@ -1255,11 +1252,11 @@ public final class ClanManager { } /** - * Purchase clan creation + * Purchase union creation */ public boolean purchaseCreation(Player player) { - if (!plugin.getSettingsManager().is(ECONOMY_PURCHASE_CLAN_CREATE)) { + if (!plugin.getSettingsManager().is(ECONOMY_PURCHASE_UNION_CREATE)) { return true; @@ -1269,7 +1266,7 @@ public final class ClanManager { if (plugin.getPermissionsManager().hasEconomy()) { - if (plugin.getPermissionsManager().chargePlayer(player, price, Cause.CLAN_CREATION)) { + if (plugin.getPermissionsManager().chargePlayer(player, price, Cause.UNION_CREATION)) { player.sendMessage(RED + MessageFormat.format(lang("account.has.been.debited", player), CurrencyFormat.format(price, player))); @@ -1292,7 +1289,7 @@ public final class ClanManager { */ public boolean purchaseInvite(Player player) { - if (!plugin.getSettingsManager().is(ECONOMY_PURCHASE_CLAN_INVITE)) { + if (!plugin.getSettingsManager().is(ECONOMY_PURCHASE_UNION_INVITE)) { return true; @@ -1302,7 +1299,7 @@ public final class ClanManager { if (plugin.getPermissionsManager().hasEconomy()) { - if (plugin.getPermissionsManager().chargePlayer(player, price, Cause.CLAN_INVITATION)) { + if (plugin.getPermissionsManager().chargePlayer(player, price, Cause.UNION_INVITATION)) { player.sendMessage(RED + MessageFormat.format(lang("account.has.been.debited", player), CurrencyFormat.format(price, player))); @@ -1335,7 +1332,7 @@ public final class ClanManager { if (plugin.getPermissionsManager().hasEconomy()) { - if (plugin.getPermissionsManager().chargePlayer(player, price, Cause.CLAN_HOME_TELEPORT)) { + if (plugin.getPermissionsManager().chargePlayer(player, price, Cause.UNION_HOME_TELEPORT)) { player.sendMessage(RED + MessageFormat.format(lang("account.has.been.debited", player), CurrencyFormat.format(price, player))); @@ -1368,7 +1365,7 @@ public final class ClanManager { if (plugin.getPermissionsManager().hasEconomy()) { - if (plugin.getPermissionsManager().chargePlayer(player, price, Cause.CLAN_HOME_TELEPORT_SET)) { + if (plugin.getPermissionsManager().chargePlayer(player, price, Cause.UNION_HOME_TELEPORT_SET)) { player.sendMessage(RED + MessageFormat.format(lang("account.has.been.debited", player), CurrencyFormat.format(price, player))); @@ -1391,7 +1388,7 @@ public final class ClanManager { */ public boolean purchaseHomeRegroup(Player player) { - ClanPlayer cp = plugin.getClanManager().getClanPlayer(player); + UnionPlayer cp = plugin.getUnionManager().getUnionPlayer(player); if (cp == null) { return false; @@ -1405,7 +1402,7 @@ public final class ClanManager { } double price = plugin.getSettingsManager().getDouble(ECONOMY_REGROUP_PRICE); - Clan clan = Objects.requireNonNull(cp.getClan(), "Clan cannot be null"); + Union union = Objects.requireNonNull(cp.getUnion(), "Clan cannot be null"); long shards = plugin.getPermissionsManager().diamondsToShards(price); if (shards < 0) { @@ -1415,7 +1412,7 @@ public final class ClanManager { if (!plugin.getSettingsManager().is(ECONOMY_UNIQUE_TAX_ON_REGROUP)) { - shards = shards * VanishUtils.getNonVanished(player, clan).size(); + shards = shards * VanishUtils.getNonVanished(player, union).size(); } @@ -1423,7 +1420,7 @@ public final class ClanManager { && plugin.getPermissionsManager().hasEconomy()) { - if (plugin.getPermissionsManager().chargePlayerShards(player, shards, Cause.CLAN_REGROUP)) { + if (plugin.getPermissionsManager().chargePlayerShards(player, shards, Cause.UNION_REGROUP)) { player.sendMessage(RED + MessageFormat.format(lang("account.has.been.debited", player), CurrencyFormat.formatShards(shards, player))); @@ -1439,23 +1436,23 @@ public final class ClanManager { } else { BankOperator operator = new BankOperator(player, plugin.getPermissionsManager().playerGetShards(player)); - switch (clan.withdraw(operator, ClanBalanceUpdateEvent.Cause.COMMAND, shards)) { + switch (union.withdraw(operator, UnionBalanceUpdateEvent.Cause.COMMAND, shards)) { case SUCCESS: if (plugin.getPermissionsManager().grantPlayerShards(player, shards, null)) { player.sendMessage(AQUA - + lang("player.clan.withdraw", player, CurrencyFormat.formatShards(shards, player))); - clan.addBb(player.getName(), lang("bb.clan.withdraw", CurrencyFormat.formatShards(shards))); + + lang("player.union.withdraw", player, CurrencyFormat.formatShards(shards, player))); + union.addBb(player.getName(), lang("bb.union.withdraw", CurrencyFormat.formatShards(shards))); return true; } - clan.setBalance(operator, ClanBalanceUpdateEvent.Cause.REVERT, BankLogger.Operation.WITHDRAW, - clan.getBalance() + shards); + union.setBalance(operator, UnionBalanceUpdateEvent.Cause.REVERT, BankLogger.Operation.WITHDRAW, + union.getBalance() + shards); return false; case NOT_ENOUGH_BALANCE: - player.sendMessage(lang("clan.bank.not.enough.money", player)); + player.sendMessage(lang("union.bank.not.enough.money", player)); } @@ -1471,7 +1468,7 @@ public final class ClanManager { @Deprecated public boolean processGlobalChat(Player player, String msg) { - ClanPlayer cp = plugin.getClanManager().getClanPlayer(player.getUniqueId()); + UnionPlayer cp = plugin.getUnionManager().getUnionPlayer(player.getUniqueId()); if (cp == null) { @@ -1492,13 +1489,13 @@ public final class ClanManager { if (command.equals(lang("on", player))) { cp.setGlobalChat(true); - plugin.getStorageManager().updateClanPlayer(cp); + plugin.getStorageManager().updateUnionPlayer(cp); ChatBlock.sendMessage(player, AQUA + "You have enabled global chat"); } else if (command.equals(lang("off", player))) { cp.setGlobalChat(false); - plugin.getStorageManager().updateClanPlayer(cp); + plugin.getStorageManager().updateUnionPlayer(cp); ChatBlock.sendMessage(player, AQUA + "You have disabled global chat"); } else { diff --git a/src/main/java/net/trueog/unionsog/migrations/ChatFormatMigration.java b/src/main/java/net/trueog/unionsog/migrations/ChatFormatMigration.java index 732cd517..01e6626c 100644 --- a/src/main/java/net/trueog/unionsog/migrations/ChatFormatMigration.java +++ b/src/main/java/net/trueog/unionsog/migrations/ChatFormatMigration.java @@ -15,7 +15,7 @@ public class ChatFormatMigration extends ConfigMigration { } - public void migrateClanChat() { + public void migrateUnionChat() { if (config.getString("clanchat.name-color") == null) { @@ -26,28 +26,28 @@ public class ChatFormatMigration extends ConfigMigration { StringBuilder sb = new StringBuilder(); sb.append('&'); - sb.append(settings.getColored(CLANCHAT_BRACKET_COLOR)); - sb.append(settings.getString(CLANCHAT_BRACKET_LEFT)); - sb.append("%clan%"); + sb.append(settings.getColored(UNIONCHAT_BRACKET_COLOR)); + sb.append(settings.getString(UNIONCHAT_BRACKET_LEFT)); + sb.append("%union%"); sb.append("&"); - sb.append(settings.getColored(CLANCHAT_BRACKET_COLOR)); - sb.append(settings.getString(CLANCHAT_BRACKET_RIGHT)); + sb.append(settings.getColored(UNIONCHAT_BRACKET_COLOR)); + sb.append(settings.getString(UNIONCHAT_BRACKET_RIGHT)); sb.append(" "); sb.append('&'); - sb.append(settings.getColored(CLANCHAT_NAME_COLOR)); - sb.append(settings.getString(CLANCHAT_PLAYER_BRACKET_LEFT)); + sb.append(settings.getColored(UNIONCHAT_NAME_COLOR)); + sb.append(settings.getString(UNIONCHAT_PLAYER_BRACKET_LEFT)); sb.append("%nick-color%"); sb.append("%player%"); sb.append('&'); - sb.append(settings.getColored(CLANCHAT_NAME_COLOR)); - sb.append(settings.getString(CLANCHAT_PLAYER_BRACKET_RIGHT)); - sb.append(" %rank%: "); + sb.append(settings.getColored(UNIONCHAT_NAME_COLOR)); + sb.append(settings.getString(UNIONCHAT_PLAYER_BRACKET_RIGHT)); + sb.append(": "); sb.append('&'); - sb.append(settings.getColored(CLANCHAT_MESSAGE_COLOR)); + sb.append(settings.getColored(UNIONCHAT_MESSAGE_COLOR)); sb.append("%message%"); config.set("clanchat.format", sb.toString()); - config.set("clanchat.rank", "&f[%rank%&f]"); + config.set("clanchat.rank", "&f[&f]"); config.set("clanchat.rank.color", null); config.set("clanchat.name-color", null); config.set("clanchat.player-bracket", null); @@ -76,7 +76,7 @@ public class ChatFormatMigration extends ConfigMigration { sb.append(settings.getColored(ALLYCHAT_BRACKET_COLOR)); sb.append(settings.getString(ALLYCHAT_BRACKET_RIGHT)); sb.append(" "); - sb.append("&4<%clan%&4> "); + sb.append("&4<%union%&4> "); sb.append('&'); sb.append(settings.getColored(ALLYCHAT_BRACKET_COLOR)); sb.append(settings.getString(ALLYCHAT_PLAYER_BRACKET_LEFT)); @@ -85,13 +85,13 @@ public class ChatFormatMigration extends ConfigMigration { sb.append('&'); sb.append(settings.getColored(ALLYCHAT_BRACKET_COLOR)); sb.append(settings.getString(ALLYCHAT_PLAYER_BRACKET_RIGHT)); - sb.append(" %rank%: "); + sb.append(": "); sb.append('&'); sb.append(settings.getColored(ALLYCHAT_MESSAGE_COLOR)); sb.append("%message%"); config.set("allychat.format", sb.toString()); - config.set("allychat.rank", "&f[%rank%&f]"); + config.set("allychat.rank", "&f[&f]"); config.set("allychat.tag-color", null); config.set("allychat.name-color", null); config.set("allychat.player-bracket", null); @@ -103,7 +103,7 @@ public class ChatFormatMigration extends ConfigMigration { @Override public void migrate() { - migrateClanChat(); + migrateUnionChat(); migrateAllyChat(); } diff --git a/src/main/java/net/trueog/unionsog/migrations/UnionBankZeroMigration.java b/src/main/java/net/trueog/unionsog/migrations/UnionBankZeroMigration.java index d3dafc81..473e6a69 100644 --- a/src/main/java/net/trueog/unionsog/migrations/UnionBankZeroMigration.java +++ b/src/main/java/net/trueog/unionsog/migrations/UnionBankZeroMigration.java @@ -1,12 +1,12 @@ // TODO: start - delete this class, its call in UnionsOG#onEnable, the union bank // command exclusion in SCCommandManager#registerCommands, and the bank entries in -// the union and staff ClanDetailsFrame once DiamondBank-OG supports union bank +// the union and staff UnionDetailsFrame once DiamondBank-OG supports union bank // accounts. Union banks are disabled until then. package net.trueog.unionsog.migrations; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import net.trueog.unionsog.UnionsOG; -import net.trueog.unionsog.events.ClanBalanceUpdateEvent; +import net.trueog.unionsog.events.UnionBalanceUpdateEvent; import net.trueog.unionsog.loggers.BankLogger; import net.trueog.unionsog.loggers.BankOperator; import net.trueog.unionsog.managers.SettingsManager; @@ -43,12 +43,12 @@ public class UnionBankZeroMigration implements Migration { } int zeroed = 0; - for (Clan clan : plugin.getClanManager().getClans()) { + for (Union union : plugin.getUnionManager().getUnions()) { - if (clan.getBalance() != 0) { + if (union.getBalance() != 0) { - clan.setBalance(BankOperator.INTERNAL, ClanBalanceUpdateEvent.Cause.INTERNAL, BankLogger.Operation.SET, - 0); + union.setBalance(BankOperator.INTERNAL, UnionBalanceUpdateEvent.Cause.INTERNAL, + BankLogger.Operation.SET, 0); zeroed++; } diff --git a/src/main/java/net/trueog/unionsog/migrations/legacy/LegacyUnionsDatabaseMigration.java b/src/main/java/net/trueog/unionsog/migrations/legacy/LegacyUnionsDatabaseMigration.java index a24b9a81..a14e60c8 100644 --- a/src/main/java/net/trueog/unionsog/migrations/legacy/LegacyUnionsDatabaseMigration.java +++ b/src/main/java/net/trueog/unionsog/migrations/legacy/LegacyUnionsDatabaseMigration.java @@ -46,8 +46,8 @@ public final class LegacyUnionsDatabaseMigration { private static final Pattern HEX_COLOR_CODE = Pattern .compile("(?i)(?:[&\u00a7]#[0-9A-F]{6}|[&\u00a7]x(?:[&\u00a7][0-9A-F]){6})"); - private static final Set SOURCE_UNION_COLUMNS = Set.of("id", "name", "tag", "leader", "description", "motd", - "color", "home"); + private static final Set SOURCE_UNION_COLUMNS = Set.of("id", "name", "tag", "description", "motd", "color", + "home"); private static final Set SOURCE_PLAYER_COLUMNS = Set.of("uuid", "party"); private final Connection connection; @@ -55,17 +55,15 @@ public final class LegacyUnionsDatabaseMigration { private final String targetPlayersTable; private final String targetKillsTable; private final String historyTable; - private final String ranksJson; private final Function playerNameResolver; private final long migrationTime; - public LegacyUnionsDatabaseMigration(Connection connection, String targetTablePrefix, String ranksJson, + public LegacyUnionsDatabaseMigration(Connection connection, String targetTablePrefix, Function playerNameResolver) { this.connection = Objects.requireNonNull(connection, "connection"); Objects.requireNonNull(targetTablePrefix, "targetTablePrefix"); - this.ranksJson = Objects.requireNonNull(ranksJson, "ranksJson"); this.playerNameResolver = Objects.requireNonNull(playerNameResolver, "playerNameResolver"); validateTargetTablePrefix(targetTablePrefix); targetUnionsTable = validateIdentifier(targetTablePrefix + "clans"); @@ -105,9 +103,9 @@ public final class LegacyUnionsDatabaseMigration { "packed_allies", "packed_rivals", "packed_bb", "cape_url", "flags", "balance", "fee_enabled", "fee_value", "ranks", "banner")); validateColumns(targetPlayersTable, - Set.of("uuid", "name", "leader", "tag", "friendly_fire", "neutral_kills", "rival_kills", - "civilian_kills", "ally_kills", "deaths", "last_seen", "join_date", "trusted", "flags", - "packed_past_clans", "resign_times", "locale")); + Set.of("uuid", "name", "tag", "friendly_fire", "neutral_kills", "rival_kills", "civilian_kills", + "ally_kills", "deaths", "last_seen", "join_date", "trusted", "flags", "packed_past_clans", + "resign_times", "locale")); validateColumns(targetKillsTable, Set.of("kill_id")); createHistoryTable(); @@ -140,8 +138,7 @@ public final class LegacyUnionsDatabaseMigration { connection.commit(); return new Result(false, legacyUnions.size(), legacyPlayers.size(), nameAssignment.placeholderCount(), - tagAssignment.adjustedCount(), playerCounts.orphanedMemberships(), - playerCounts.unionsWithoutLeaders()); + tagAssignment.adjustedCount(), playerCounts.orphanedMemberships()); } catch (SQLException | RuntimeException ex) { @@ -269,7 +266,7 @@ public final class LegacyUnionsDatabaseMigration { private List readLegacyUnions() throws SQLException { - final String sql = "SELECT `id`, `name`, `tag`, `leader`, `description`, `motd`, `color`, `home` FROM " + final String sql = "SELECT `id`, `name`, `tag`, `description`, `motd`, `color`, `home` FROM " + quote(SOURCE_UNIONS_TABLE) + " ORDER BY `id`;"; final List unions = new ArrayList<>(); try (Statement statement = connection.createStatement(); ResultSet result = statement.executeQuery(sql)) { @@ -277,8 +274,7 @@ public final class LegacyUnionsDatabaseMigration { while (result.next()) { final UUID id = requiredUuid(result.getString("id"), SOURCE_UNIONS_TABLE + ".id"); - final UUID leader = optionalUuid(result.getString("leader"), SOURCE_UNIONS_TABLE + ".leader"); - unions.add(new LegacyUnion(id, result.getString("name"), result.getString("tag"), leader, + unions.add(new LegacyUnion(id, result.getString("name"), result.getString("tag"), result.getString("description"), result.getString("motd"), result.getString("color"), result.getString("home"))); @@ -338,7 +334,7 @@ public final class LegacyUnionsDatabaseMigration { statement.setDouble(14, 0); statement.setInt(15, 0); statement.setDouble(16, 0); - statement.setString(17, ranksJson); + statement.setString(17, ""); statement.setNull(18, Types.LONGVARCHAR); statement.addBatch(); @@ -361,13 +357,12 @@ public final class LegacyUnionsDatabaseMigration { } - final Set unionsWithLeaders = new HashSet<>(); int orphanedMemberships = 0; final String sql = "INSERT INTO " + quote(targetPlayersTable) - + " (`uuid`, `name`, `leader`, `tag`, `friendly_fire`, `neutral_kills`, `rival_kills`," + + " (`uuid`, `name`, `tag`, `friendly_fire`, `neutral_kills`, `rival_kills`," + " `civilian_kills`, `ally_kills`, `deaths`, `last_seen`, `join_date`, `trusted`, `flags`," + " `packed_past_clans`, `resign_times`, `locale`) VALUES" - + " (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);"; + + " (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);"; try (PreparedStatement statement = connection.prepareStatement(sql)) { for (LegacyPlayer player : players) { @@ -380,32 +375,24 @@ public final class LegacyUnionsDatabaseMigration { } - final boolean leader = union != null && player.uuid().equals(union.leader()); - if (leader) { - - unionsWithLeaders.add(union.id()); - - } - final String tag = union != null ? tags.get(union.id()).toLowerCase(Locale.ROOT) : ""; statement.setString(1, player.uuid().toString()); statement.setString(2, names.get(player.uuid())); - statement.setInt(3, leader ? 1 : 0); - statement.setString(4, tag); + statement.setString(3, tag); + statement.setInt(4, 0); statement.setInt(5, 0); statement.setInt(6, 0); statement.setInt(7, 0); statement.setInt(8, 0); statement.setInt(9, 0); - statement.setInt(10, 0); + statement.setLong(10, migrationTime); statement.setLong(11, migrationTime); - statement.setLong(12, migrationTime); - statement.setInt(13, leader ? 1 : 0); - statement.setString(14, "{}"); - statement.setString(15, ""); - statement.setString(16, "{}"); - statement.setNull(17, Types.VARCHAR); + statement.setInt(12, 1); + statement.setString(13, "{}"); + statement.setString(14, ""); + statement.setString(15, "{}"); + statement.setNull(16, Types.VARCHAR); statement.addBatch(); } @@ -414,7 +401,7 @@ public final class LegacyUnionsDatabaseMigration { } - return new PlayerImportCounts(orphanedMemberships, unions.size() - unionsWithLeaders.size()); + return new PlayerImportCounts(orphanedMemberships); } @@ -825,19 +812,19 @@ public final class LegacyUnionsDatabaseMigration { } public record Result(boolean alreadyApplied, int unions, int players, int placeholderNames, int adjustedTags, - int orphanedMemberships, int unionsWithoutLeaders) + int orphanedMemberships) { private static Result previouslyApplied() { - return new Result(true, 0, 0, 0, 0, 0, 0); + return new Result(true, 0, 0, 0, 0, 0); } } - private record LegacyUnion(UUID id, @Nullable String name, @Nullable String tag, @Nullable UUID leader, - @Nullable String description, @Nullable String motd, @Nullable String color, @Nullable String home) + private record LegacyUnion(UUID id, @Nullable String name, @Nullable String tag, @Nullable String description, + @Nullable String motd, @Nullable String color, @Nullable String home) { } @@ -854,7 +841,7 @@ public final class LegacyUnionsDatabaseMigration { } - private record PlayerImportCounts(int orphanedMemberships, int unionsWithoutLeaders) { + private record PlayerImportCounts(int orphanedMemberships) { } diff --git a/src/main/java/net/trueog/unionsog/migrations/legacy/LegacyUnionsDatabaseMigrationRunner.java b/src/main/java/net/trueog/unionsog/migrations/legacy/LegacyUnionsDatabaseMigrationRunner.java index fd6c81b9..d5c8b665 100644 --- a/src/main/java/net/trueog/unionsog/migrations/legacy/LegacyUnionsDatabaseMigrationRunner.java +++ b/src/main/java/net/trueog/unionsog/migrations/legacy/LegacyUnionsDatabaseMigrationRunner.java @@ -1,18 +1,13 @@ package net.trueog.unionsog.migrations.legacy; -import net.trueog.unionsog.Helper; -import net.trueog.unionsog.Rank; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.managers.SettingsManager; import java.sql.Connection; import java.sql.SQLException; -import java.util.ArrayList; -import java.util.List; import java.util.UUID; import java.util.function.Function; -import static net.trueog.unionsog.managers.SettingsManager.ConfigField.CLAN_DEFAULT_RANK; import static net.trueog.unionsog.managers.SettingsManager.ConfigField.MYSQL_ENABLE; import static net.trueog.unionsog.managers.SettingsManager.ConfigField.MYSQL_MIGRATE_LEGACY_UNIONS_DATABASE; import static net.trueog.unionsog.managers.SettingsManager.ConfigField.MYSQL_TABLE_PREFIX; @@ -77,15 +72,8 @@ public final class LegacyUnionsDatabaseMigrationRunner { plugin.getLogger().info("Legacy unions database migration starting."); - final List starterRanks = new ArrayList<>(settings.getStarterRanks()); - final String configuredDefaultRank = settings.getString(CLAN_DEFAULT_RANK); - final String defaultRank = starterRanks.stream().anyMatch(rank -> rank.getName().equals(configuredDefaultRank)) - ? configuredDefaultRank - : null; - final LegacyUnionsDatabaseMigration.Result result = migrateOrThrow(connection, - settings.getString(MYSQL_TABLE_PREFIX), Helper.ranksToJson(starterRanks, defaultRank), - uuid -> plugin.getServer().getOfflinePlayer(uuid).getName()); + settings.getString(MYSQL_TABLE_PREFIX), uuid -> plugin.getServer().getOfflinePlayer(uuid).getName()); logResult(plugin, result); settings.set(MYSQL_MIGRATE_LEGACY_UNIONS_DATABASE, false); settings.save(); @@ -93,13 +81,12 @@ public final class LegacyUnionsDatabaseMigrationRunner { } static LegacyUnionsDatabaseMigration.Result migrateOrThrow(Connection connection, String targetTablePrefix, - String ranksJson, Function playerNameResolver) + Function playerNameResolver) { try { - return new LegacyUnionsDatabaseMigration(connection, targetTablePrefix, ranksJson, playerNameResolver) - .migrate(); + return new LegacyUnionsDatabaseMigration(connection, targetTablePrefix, playerNameResolver).migrate(); } catch (SQLException | RuntimeException ex) { @@ -143,13 +130,6 @@ public final class LegacyUnionsDatabaseMigrationRunner { } - if (result.unionsWithoutLeaders() > 0) { - - plugin.getLogger().warning(String.format("%d imported union(s) did not have a matching leader row.", - result.unionsWithoutLeaders())); - - } - } public static final class MigrationStartupException extends IllegalStateException { diff --git a/src/main/java/net/trueog/unionsog/proxy/BungeeManager.java b/src/main/java/net/trueog/unionsog/proxy/BungeeManager.java index bf1944b5..6a70e8eb 100644 --- a/src/main/java/net/trueog/unionsog/proxy/BungeeManager.java +++ b/src/main/java/net/trueog/unionsog/proxy/BungeeManager.java @@ -5,13 +5,13 @@ import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.chat.SCMessage; import net.trueog.unionsog.managers.SettingsManager.ConfigField; -import net.trueog.unionsog.proxy.adapters.ClanPlayerListAdapter; -import net.trueog.unionsog.proxy.adapters.ClanPlayerTypeAdapterFactory; +import net.trueog.unionsog.proxy.adapters.UnionPlayerListAdapter; +import net.trueog.unionsog.proxy.adapters.UnionPlayerTypeAdapterFactory; import net.trueog.unionsog.proxy.adapters.ConfigurationSerializableAdapter; import net.trueog.unionsog.proxy.adapters.SCMessageAdapter; import net.trueog.unionsog.proxy.listeners.MessageListener; @@ -30,10 +30,10 @@ import java.util.regex.Pattern; public final class BungeeManager implements ProxyManager, PluginMessageListener { - private static final String UPDATE_CLAN_CHANNEL = "UpdateClan"; - private static final String UPDATE_CLANPLAYER_CHANNEL = "UpdateClanPlayer"; - private static final String DELETE_CLAN_CHANNEL = "DeleteClan"; - private static final String DELETE_CLANPLAYER_CHANNEL = "DeleteClanPlayer"; + private static final String UPDATE_UNION_CHANNEL = "UpdateClan"; + private static final String UPDATE_UNIONPLAYER_CHANNEL = "UpdateClanPlayer"; + private static final String DELETE_UNION_CHANNEL = "DeleteClan"; + private static final String DELETE_UNIONPLAYER_CHANNEL = "DeleteClanPlayer"; private static final String CHAT_CHANNEL = "Chat"; private static final String BROADCAST = "Broadcast"; private static final String MESSAGE = "Message"; @@ -50,9 +50,9 @@ public final class BungeeManager implements ProxyManager, PluginMessageListener public BungeeManager(UnionsOG plugin) { this.plugin = plugin; - gson = new GsonBuilder().registerTypeAdapterFactory(new ClanPlayerTypeAdapterFactory(plugin)) + gson = new GsonBuilder().registerTypeAdapterFactory(new UnionPlayerTypeAdapterFactory(plugin)) .registerTypeAdapterFactory(new ConfigurationSerializableAdapter()) - .registerTypeAdapter(ClanPlayerListAdapter.getType(), new ClanPlayerListAdapter(plugin)) + .registerTypeAdapter(UnionPlayerListAdapter.getType(), new UnionPlayerListAdapter(plugin)) .registerTypeAdapter(SCMessage.class, new SCMessageAdapter(plugin)).setExclusionStrategies().create(); if (!plugin.getSettingsManager().is(ConfigField.PERFORMANCE_USE_BUNGEECORD)) { @@ -226,30 +226,30 @@ public final class BungeeManager implements ProxyManager, PluginMessageListener } @Override - public void sendDelete(Clan clan) { + public void sendDelete(Union union) { - forwardToAllServers(DELETE_CLAN_CHANNEL, clan.getTag()); + forwardToAllServers(DELETE_UNION_CHANNEL, union.getTag()); } @Override - public void sendDelete(ClanPlayer cp) { + public void sendDelete(UnionPlayer cp) { - forwardToAllServers(DELETE_CLANPLAYER_CHANNEL, cp.getUniqueId().toString()); + forwardToAllServers(DELETE_UNIONPLAYER_CHANNEL, cp.getUniqueId().toString()); } @Override - public void sendUpdate(Clan clan) { + public void sendUpdate(Union union) { - forwardToAllServers(UPDATE_CLAN_CHANNEL, gson.toJson(clan)); + forwardToAllServers(UPDATE_UNION_CHANNEL, gson.toJson(union)); } @Override - public void sendUpdate(ClanPlayer cp) { + public void sendUpdate(UnionPlayer cp) { - forwardToAllServers(UPDATE_CLANPLAYER_CHANNEL, gson.toJson(cp)); + forwardToAllServers(UPDATE_UNIONPLAYER_CHANNEL, gson.toJson(cp)); } diff --git a/src/main/java/net/trueog/unionsog/proxy/ProxyManager.java b/src/main/java/net/trueog/unionsog/proxy/ProxyManager.java index 5021cb9b..abd64219 100644 --- a/src/main/java/net/trueog/unionsog/proxy/ProxyManager.java +++ b/src/main/java/net/trueog/unionsog/proxy/ProxyManager.java @@ -1,7 +1,7 @@ package net.trueog.unionsog.proxy; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.chat.SCMessage; public interface ProxyManager { @@ -14,12 +14,12 @@ public interface ProxyManager { void sendMessage(String target, String message); - void sendUpdate(Clan clan); + void sendUpdate(Union union); - void sendUpdate(ClanPlayer cp); + void sendUpdate(UnionPlayer cp); - void sendDelete(Clan clan); + void sendDelete(Union union); - void sendDelete(ClanPlayer cp); + void sendDelete(UnionPlayer cp); } diff --git a/src/main/java/net/trueog/unionsog/proxy/adapters/SCMessageAdapter.java b/src/main/java/net/trueog/unionsog/proxy/adapters/SCMessageAdapter.java index 8b5b99e3..113c4594 100644 --- a/src/main/java/net/trueog/unionsog/proxy/adapters/SCMessageAdapter.java +++ b/src/main/java/net/trueog/unionsog/proxy/adapters/SCMessageAdapter.java @@ -3,7 +3,7 @@ package net.trueog.unionsog.proxy.adapters; import com.google.gson.TypeAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.chat.SCMessage; import net.trueog.unionsog.chat.SCMessage.Source; @@ -41,10 +41,10 @@ public class SCMessageAdapter extends TypeAdapter { in.beginObject(); in.nextName(); - ClanPlayer.Channel channel = ClanPlayer.Channel.valueOf(in.nextString()); + UnionPlayer.Channel channel = UnionPlayer.Channel.valueOf(in.nextString()); in.nextName(); UUID uuid = UUID.fromString(in.nextString()); - ClanPlayer sender = plugin.getClanManager().getAnyClanPlayer(uuid); + UnionPlayer sender = plugin.getUnionManager().getAnyUnionPlayer(uuid); in.nextName(); String content = in.nextString(); in.endObject(); diff --git a/src/main/java/net/trueog/unionsog/proxy/adapters/ClanPlayerListAdapter.java b/src/main/java/net/trueog/unionsog/proxy/adapters/UnionPlayerListAdapter.java similarity index 62% rename from src/main/java/net/trueog/unionsog/proxy/adapters/ClanPlayerListAdapter.java rename to src/main/java/net/trueog/unionsog/proxy/adapters/UnionPlayerListAdapter.java index 3946d652..1fad33cd 100644 --- a/src/main/java/net/trueog/unionsog/proxy/adapters/ClanPlayerListAdapter.java +++ b/src/main/java/net/trueog/unionsog/proxy/adapters/UnionPlayerListAdapter.java @@ -5,7 +5,7 @@ import com.google.gson.reflect.TypeToken; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonToken; import com.google.gson.stream.JsonWriter; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; import java.io.IOException; @@ -14,25 +14,25 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; -public class ClanPlayerListAdapter extends TypeAdapter> { +public class UnionPlayerListAdapter extends TypeAdapter> { private final UnionsOG plugin; - public ClanPlayerListAdapter(UnionsOG plugin) { + public UnionPlayerListAdapter(UnionsOG plugin) { this.plugin = plugin; } @Override - public void write(JsonWriter out, List value) throws IOException { + public void write(JsonWriter out, List value) throws IOException { out.beginArray(); - for (ClanPlayer clanPlayer : value) { + for (UnionPlayer unionPlayer : value) { out.beginObject(); out.name("uuid"); - out.value(clanPlayer.getUniqueId().toString()); + out.value(unionPlayer.getUniqueId().toString()); out.endObject(); } @@ -42,16 +42,16 @@ public class ClanPlayerListAdapter extends TypeAdapter> { } @Override - public List read(JsonReader in) throws IOException { + public List read(JsonReader in) throws IOException { - List list = new ArrayList<>(); + List list = new ArrayList<>(); in.beginArray(); while (in.peek() == JsonToken.BEGIN_OBJECT) { in.beginObject(); in.nextName(); UUID uuid = UUID.fromString(in.nextString()); - ClanPlayer cp = plugin.getClanManager().getAnyClanPlayer(uuid); + UnionPlayer cp = plugin.getUnionManager().getAnyUnionPlayer(uuid); in.endObject(); if (cp != null) { @@ -68,7 +68,7 @@ public class ClanPlayerListAdapter extends TypeAdapter> { public static Type getType() { - return TypeToken.getParameterized(List.class, ClanPlayer.class).getType(); + return TypeToken.getParameterized(List.class, UnionPlayer.class).getType(); } diff --git a/src/main/java/net/trueog/unionsog/proxy/adapters/ClanPlayerTypeAdapterFactory.java b/src/main/java/net/trueog/unionsog/proxy/adapters/UnionPlayerTypeAdapterFactory.java similarity index 51% rename from src/main/java/net/trueog/unionsog/proxy/adapters/ClanPlayerTypeAdapterFactory.java rename to src/main/java/net/trueog/unionsog/proxy/adapters/UnionPlayerTypeAdapterFactory.java index 274ddc3e..c723a029 100644 --- a/src/main/java/net/trueog/unionsog/proxy/adapters/ClanPlayerTypeAdapterFactory.java +++ b/src/main/java/net/trueog/unionsog/proxy/adapters/UnionPlayerTypeAdapterFactory.java @@ -7,16 +7,16 @@ import com.google.gson.TypeAdapterFactory; import com.google.gson.reflect.TypeToken; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; import org.jetbrains.annotations.Nullable; -public class ClanPlayerTypeAdapterFactory implements TypeAdapterFactory { +public class UnionPlayerTypeAdapterFactory implements TypeAdapterFactory { private final UnionsOG plugin; - public ClanPlayerTypeAdapterFactory(UnionsOG plugin) { + public UnionPlayerTypeAdapterFactory(UnionsOG plugin) { this.plugin = plugin; @@ -26,35 +26,35 @@ public class ClanPlayerTypeAdapterFactory implements TypeAdapterFactory { @Override public @Nullable TypeAdapter create(Gson gson, TypeToken type) { - if (type.getType() != ClanPlayer.class) { + if (type.getType() != UnionPlayer.class) { return null; } - final TypeAdapter delegate = (TypeAdapter) gson.getDelegateAdapter(this, type); + final TypeAdapter delegate = (TypeAdapter) gson.getDelegateAdapter(this, type); - return (TypeAdapter) new TypeAdapter() { + return (TypeAdapter) new TypeAdapter() { @Override - public void write(JsonWriter out, ClanPlayer value) { + public void write(JsonWriter out, UnionPlayer value) { JsonObject object = delegate.toJsonTree(value).getAsJsonObject(); - object.addProperty("clan", value.getTag()); + object.addProperty("union", value.getTag()); gson.toJson(object, out); } @Override - public ClanPlayer read(JsonReader in) { + public UnionPlayer read(JsonReader in) { JsonObject object = gson.fromJson(in, JsonObject.class); - String tag = object.get("clan").getAsString(); - Clan clan = plugin.getClanManager().getClan(tag); - object.add("clan", null); + String tag = object.get("union").getAsString(); + Union union = plugin.getUnionManager().getUnion(tag); + object.add("union", null); - ClanPlayer cp = delegate.fromJsonTree(object); - cp.setClan(clan); + UnionPlayer cp = delegate.fromJsonTree(object); + cp.setUnion(union); return cp; } diff --git a/src/main/java/net/trueog/unionsog/proxy/listeners/Chat.java b/src/main/java/net/trueog/unionsog/proxy/listeners/Chat.java index ccff2127..f35c2157 100644 --- a/src/main/java/net/trueog/unionsog/proxy/listeners/Chat.java +++ b/src/main/java/net/trueog/unionsog/proxy/listeners/Chat.java @@ -16,7 +16,7 @@ public class Chat extends MessageListener { public void accept(ByteArrayDataInput data) { SCMessage message = getGson().fromJson(data.readUTF(), SCMessage.class); - if (message.getSender().getClan() == null) { + if (message.getSender().getUnion() == null) { return; diff --git a/src/main/java/net/trueog/unionsog/proxy/listeners/DeleteClan.java b/src/main/java/net/trueog/unionsog/proxy/listeners/DeleteUnion.java similarity index 62% rename from src/main/java/net/trueog/unionsog/proxy/listeners/DeleteClan.java rename to src/main/java/net/trueog/unionsog/proxy/listeners/DeleteUnion.java index 6f35082b..91e3e4e6 100644 --- a/src/main/java/net/trueog/unionsog/proxy/listeners/DeleteClan.java +++ b/src/main/java/net/trueog/unionsog/proxy/listeners/DeleteUnion.java @@ -1,14 +1,14 @@ package net.trueog.unionsog.proxy.listeners; import com.google.common.io.ByteArrayDataInput; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.proxy.BungeeManager; import static net.trueog.unionsog.UnionsOG.debug; -public class DeleteClan extends MessageListener { +public class DeleteUnion extends MessageListener { - public DeleteClan(BungeeManager bungee) { + public DeleteUnion(BungeeManager bungee) { super(bungee); @@ -18,15 +18,13 @@ public class DeleteClan extends MessageListener { public void accept(ByteArrayDataInput data) { String tag = data.readUTF(); - getClanManager().removeClan(tag); - for (ClanPlayer cp : getClanManager().getAllClanPlayers()) { + getUnionManager().removeUnion(tag); + for (UnionPlayer cp : getUnionManager().getAllUnionPlayers()) { if (tag.equals(cp.getTag())) { - cp.setClan(null); + cp.setUnion(null); cp.setJoinDate(0); - cp.setRank(null); - cp.setLeader(false); } diff --git a/src/main/java/net/trueog/unionsog/proxy/listeners/DeleteClanPlayer.java b/src/main/java/net/trueog/unionsog/proxy/listeners/DeleteUnionPlayer.java similarity index 75% rename from src/main/java/net/trueog/unionsog/proxy/listeners/DeleteClanPlayer.java rename to src/main/java/net/trueog/unionsog/proxy/listeners/DeleteUnionPlayer.java index f8d7cc40..14236a51 100644 --- a/src/main/java/net/trueog/unionsog/proxy/listeners/DeleteClanPlayer.java +++ b/src/main/java/net/trueog/unionsog/proxy/listeners/DeleteUnionPlayer.java @@ -7,9 +7,9 @@ import java.util.UUID; import static net.trueog.unionsog.UnionsOG.debug; -public class DeleteClanPlayer extends MessageListener { +public class DeleteUnionPlayer extends MessageListener { - public DeleteClanPlayer(BungeeManager bungee) { + public DeleteUnionPlayer(BungeeManager bungee) { super(bungee); @@ -19,7 +19,7 @@ public class DeleteClanPlayer extends MessageListener { public void accept(ByteArrayDataInput data) { UUID uuid = UUID.fromString(data.readUTF()); - getClanManager().deleteClanPlayerFromMemory(uuid); + getUnionManager().deleteUnionPlayerFromMemory(uuid); debug(String.format("Deleted cp %s", uuid)); } diff --git a/src/main/java/net/trueog/unionsog/proxy/listeners/MessageListener.java b/src/main/java/net/trueog/unionsog/proxy/listeners/MessageListener.java index cc5b17ba..42b02aae 100644 --- a/src/main/java/net/trueog/unionsog/proxy/listeners/MessageListener.java +++ b/src/main/java/net/trueog/unionsog/proxy/listeners/MessageListener.java @@ -2,7 +2,7 @@ package net.trueog.unionsog.proxy.listeners; import com.google.common.io.ByteArrayDataInput; import com.google.gson.Gson; -import net.trueog.unionsog.managers.ClanManager; +import net.trueog.unionsog.managers.UnionManager; import net.trueog.unionsog.proxy.BungeeManager; public abstract class MessageListener { @@ -19,9 +19,9 @@ public abstract class MessageListener { public abstract boolean isBungeeSubchannel(); - protected ClanManager getClanManager() { + protected UnionManager getUnionManager() { - return bungee.getPlugin().getClanManager(); + return bungee.getPlugin().getUnionManager(); } diff --git a/src/main/java/net/trueog/unionsog/proxy/listeners/UpdateClan.java b/src/main/java/net/trueog/unionsog/proxy/listeners/UpdateClan.java deleted file mode 100644 index 33d082fa..00000000 --- a/src/main/java/net/trueog/unionsog/proxy/listeners/UpdateClan.java +++ /dev/null @@ -1,43 +0,0 @@ -package net.trueog.unionsog.proxy.listeners; - -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.proxy.BungeeManager; -import org.jetbrains.annotations.Nullable; - -public class UpdateClan extends Update { - - public UpdateClan(BungeeManager bungee) { - - super(bungee); - - } - - @Override - public boolean isBungeeSubchannel() { - - return false; - - } - - @Override - protected Class getType() { - - return Clan.class; - - } - - @Override - protected @Nullable Clan getCurrent(Clan clan) { - - return getClanManager().getClan(clan.getTag()); - - } - - @Override - protected void insert(Clan clan) { - - getClanManager().importClan(clan); - - } - -} diff --git a/src/main/java/net/trueog/unionsog/proxy/listeners/UpdateClanPlayer.java b/src/main/java/net/trueog/unionsog/proxy/listeners/UpdateClanPlayer.java deleted file mode 100644 index df60dea8..00000000 --- a/src/main/java/net/trueog/unionsog/proxy/listeners/UpdateClanPlayer.java +++ /dev/null @@ -1,43 +0,0 @@ -package net.trueog.unionsog.proxy.listeners; - -import net.trueog.unionsog.ClanPlayer; -import net.trueog.unionsog.proxy.BungeeManager; -import org.jetbrains.annotations.Nullable; - -public class UpdateClanPlayer extends Update { - - public UpdateClanPlayer(BungeeManager bungee) { - - super(bungee); - - } - - @Override - public boolean isBungeeSubchannel() { - - return false; - - } - - @Override - protected Class getType() { - - return ClanPlayer.class; - - } - - @Override - protected @Nullable ClanPlayer getCurrent(ClanPlayer clanPlayer) { - - return getClanManager().getAnyClanPlayer(clanPlayer.getUniqueId()); - - } - - @Override - protected void insert(ClanPlayer clanPlayer) { - - getClanManager().importClanPlayer(clanPlayer); - - } - -} diff --git a/src/main/java/net/trueog/unionsog/proxy/listeners/UpdateUnion.java b/src/main/java/net/trueog/unionsog/proxy/listeners/UpdateUnion.java new file mode 100644 index 00000000..0f7500a3 --- /dev/null +++ b/src/main/java/net/trueog/unionsog/proxy/listeners/UpdateUnion.java @@ -0,0 +1,43 @@ +package net.trueog.unionsog.proxy.listeners; + +import net.trueog.unionsog.Union; +import net.trueog.unionsog.proxy.BungeeManager; +import org.jetbrains.annotations.Nullable; + +public class UpdateUnion extends Update { + + public UpdateUnion(BungeeManager bungee) { + + super(bungee); + + } + + @Override + public boolean isBungeeSubchannel() { + + return false; + + } + + @Override + protected Class getType() { + + return Union.class; + + } + + @Override + protected @Nullable Union getCurrent(Union union) { + + return getUnionManager().getUnion(union.getTag()); + + } + + @Override + protected void insert(Union union) { + + getUnionManager().importUnion(union); + + } + +} diff --git a/src/main/java/net/trueog/unionsog/proxy/listeners/UpdateUnionPlayer.java b/src/main/java/net/trueog/unionsog/proxy/listeners/UpdateUnionPlayer.java new file mode 100644 index 00000000..1a1620a2 --- /dev/null +++ b/src/main/java/net/trueog/unionsog/proxy/listeners/UpdateUnionPlayer.java @@ -0,0 +1,43 @@ +package net.trueog.unionsog.proxy.listeners; + +import net.trueog.unionsog.UnionPlayer; +import net.trueog.unionsog.proxy.BungeeManager; +import org.jetbrains.annotations.Nullable; + +public class UpdateUnionPlayer extends Update { + + public UpdateUnionPlayer(BungeeManager bungee) { + + super(bungee); + + } + + @Override + public boolean isBungeeSubchannel() { + + return false; + + } + + @Override + protected Class getType() { + + return UnionPlayer.class; + + } + + @Override + protected @Nullable UnionPlayer getCurrent(UnionPlayer unionPlayer) { + + return getUnionManager().getAnyUnionPlayer(unionPlayer.getUniqueId()); + + } + + @Override + protected void insert(UnionPlayer unionPlayer) { + + getUnionManager().importUnionPlayer(unionPlayer); + + } + +} diff --git a/src/main/java/net/trueog/unionsog/tasks/PlayerHeadCacheTask.java b/src/main/java/net/trueog/unionsog/tasks/PlayerHeadCacheTask.java index 715eddf9..65f37b5b 100644 --- a/src/main/java/net/trueog/unionsog/tasks/PlayerHeadCacheTask.java +++ b/src/main/java/net/trueog/unionsog/tasks/PlayerHeadCacheTask.java @@ -1,7 +1,7 @@ package net.trueog.unionsog.tasks; import com.cryptomorin.xseries.XMaterial; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; import org.bukkit.Bukkit; import org.bukkit.inventory.Inventory; @@ -40,10 +40,10 @@ public class PlayerHeadCacheTask extends BukkitRunnable { plugin.getLogger().info("Caching player heads..."); long begin = System.currentTimeMillis(); Inventory inventory = Bukkit.createInventory(null, 9); - List players = plugin.getClanManager().getAllClanPlayers(); - players.sort(Comparator.comparing(ClanPlayer::getName)); + List players = plugin.getUnionManager().getAllUnionPlayers(); + players.sort(Comparator.comparing(UnionPlayer::getName)); - for (ClanPlayer player : players) { + for (UnionPlayer player : players) { if (isCancelled()) { diff --git a/src/main/java/net/trueog/unionsog/ui/InventoryController.java b/src/main/java/net/trueog/unionsog/ui/InventoryController.java index 4278f5d9..9ae57f8a 100644 --- a/src/main/java/net/trueog/unionsog/ui/InventoryController.java +++ b/src/main/java/net/trueog/unionsog/ui/InventoryController.java @@ -1,7 +1,5 @@ package net.trueog.unionsog.ui; -import net.trueog.unionsog.ClanPlayer; -import net.trueog.unionsog.RankPermission; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.events.ComponentClickEvent; import net.trueog.unionsog.managers.PermissionsManager; @@ -24,7 +22,7 @@ import org.jetbrains.annotations.NotNull; import java.util.*; import static net.trueog.unionsog.UnionsOG.lang; -import static net.trueog.unionsog.managers.SettingsManager.ConfigField.COMMANDS_CLAN; +import static net.trueog.unionsog.managers.SettingsManager.ConfigField.COMMANDS_UNION; /** * @@ -89,7 +87,7 @@ public class InventoryController implements Listener { } - Object permission = component.getPermission(click); + String permission = component.getPermission(click); if (permission != null) { if (!hasPermission((Player) entity, permission)) { @@ -142,21 +140,11 @@ public class InventoryController implements Listener { * * @author RoinujNosde */ - private boolean hasPermission(@NotNull Player player, @NotNull Object permission) { + private boolean hasPermission(@NotNull Player player, @NotNull String permission) { - UnionsOG plugin = UnionsOG.getInstance(); - PermissionsManager pm = plugin.getPermissionsManager(); - if (permission instanceof String) { + PermissionsManager pm = UnionsOG.getInstance().getPermissionsManager(); - String perms = (String) permission; - boolean leaderPerm = perms.contains("unionsog.leader") && !perms.equalsIgnoreCase("unionsog.leader.create"); - ClanPlayer cp = plugin.getClanManager().getAnyClanPlayer(player.getUniqueId()); - - return pm.has(player, perms) && (!leaderPerm || (cp != null && cp.isLeader())); - - } - - return pm.has(player, (RankPermission) permission, false); + return pm.has(player, permission); } @@ -200,7 +188,7 @@ public class InventoryController implements Listener { { UnionsOG plugin = UnionsOG.getInstance(); - String baseCommand = plugin.getSettingsManager().getString(COMMANDS_CLAN); + String baseCommand = plugin.getSettingsManager().getString(COMMANDS_UNION); String finalCommand = String.format("%s %s ", baseCommand, subcommand) + String.join(" ", args); new BukkitRunnable() { diff --git a/src/main/java/net/trueog/unionsog/ui/InventoryDrawer.java b/src/main/java/net/trueog/unionsog/ui/InventoryDrawer.java index 89fbafdf..26127618 100644 --- a/src/main/java/net/trueog/unionsog/ui/InventoryDrawer.java +++ b/src/main/java/net/trueog/unionsog/ui/InventoryDrawer.java @@ -1,6 +1,5 @@ package net.trueog.unionsog.ui; -import net.trueog.unionsog.RankPermission; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.events.FrameOpenEvent; import net.trueog.unionsog.managers.SettingsManager; @@ -178,8 +177,8 @@ public class InventoryDrawer { () -> plugin.getServer().getConsoleSender().sendMessage(lang("gui.not.supported"))); SettingsManager settingsManager = plugin.getSettingsManager(); settingsManager.set(ENABLE_GUI, false); - String commandClan = settingsManager.getString(COMMANDS_CLAN); - player.performCommand(commandClan); + String commandUnion = settingsManager.getString(COMMANDS_UNION); + player.performCommand(commandUnion); } @@ -191,7 +190,7 @@ public class InventoryDrawer { List lore = itemMeta.getLore(); if (lore != null) { - Object permission = component.getLorePermission(); + String permission = component.getLorePermission(); if (permission != null) { if (!hasPermission(frame.getViewer(), permission)) { @@ -211,15 +210,9 @@ public class InventoryDrawer { } - private static boolean hasPermission(@NotNull Player viewer, @NotNull Object permission) { + private static boolean hasPermission(@NotNull Player viewer, @NotNull String permission) { - if (permission instanceof String) { - - return plugin.getPermissionsManager().has(viewer, (String) permission); - - } - - return plugin.getPermissionsManager().has(viewer, (RankPermission) permission, false); + return plugin.getPermissionsManager().has(viewer, permission); } diff --git a/src/main/java/net/trueog/unionsog/ui/SCComponent.java b/src/main/java/net/trueog/unionsog/ui/SCComponent.java index d6a7f3cb..23eaf4e9 100644 --- a/src/main/java/net/trueog/unionsog/ui/SCComponent.java +++ b/src/main/java/net/trueog/unionsog/ui/SCComponent.java @@ -1,6 +1,5 @@ package net.trueog.unionsog.ui; -import net.trueog.unionsog.RankPermission; import org.bukkit.event.inventory.ClickType; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; @@ -20,9 +19,9 @@ import java.util.Set; public abstract class SCComponent { private final HashMap listeners = new HashMap<>(); - private final HashMap permissions = new HashMap<>(); + private final HashMap permissions = new HashMap<>(); private final Set confirmationRequired = new HashSet<>(); - private @Nullable Object lorePermission; + private @Nullable String lorePermission; @NotNull public abstract ItemStack getItem(); @@ -42,12 +41,6 @@ public abstract class SCComponent { } - public void setLorePermission(@Nullable RankPermission permission) { - - lorePermission = permission; - - } - public void setLorePermission(@Nullable String permission) { lorePermission = permission; @@ -55,18 +48,12 @@ public abstract class SCComponent { } @Nullable - public Object getLorePermission() { + public String getLorePermission() { return lorePermission; } - public void setPermission(@NotNull ClickType click, @Nullable RankPermission permission) { - - permissions.put(click, permission); - - } - public void setPermission(@NotNull ClickType click, @Nullable String permission) { permissions.put(click, permission); @@ -74,7 +61,7 @@ public abstract class SCComponent { } @Nullable - public Object getPermission(@NotNull ClickType click) { + public String getPermission(@NotNull ClickType click) { return permissions.get(click); diff --git a/src/main/java/net/trueog/unionsog/ui/frames/AddAllyFrame.java b/src/main/java/net/trueog/unionsog/ui/frames/AddAllyFrame.java index 743ce92d..65891221 100644 --- a/src/main/java/net/trueog/unionsog/ui/frames/AddAllyFrame.java +++ b/src/main/java/net/trueog/unionsog/ui/frames/AddAllyFrame.java @@ -1,8 +1,7 @@ package net.trueog.unionsog.ui.frames; import com.cryptomorin.xseries.XMaterial; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.RankPermission; +import net.trueog.unionsog.Union; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.ui.*; import net.trueog.unionsog.utils.Paginator; @@ -18,14 +17,14 @@ import static net.trueog.unionsog.UnionsOG.lang; public class AddAllyFrame extends SCFrame { - private final List notAllies; + private final List notAllies; private final Paginator paginator; - public AddAllyFrame(SCFrame parent, Player viewer, Clan subject) { + public AddAllyFrame(SCFrame parent, Player viewer, Union subject) { super(parent, viewer); UnionsOG plugin = UnionsOG.getInstance(); - notAllies = plugin.getClanManager().getClans().stream() + notAllies = plugin.getUnionManager().getUnions().stream() .filter(c -> !c.equals(subject) && !c.isRival(subject.getTag()) && !c.isAlly(subject.getTag())) .collect(Collectors.toList()); paginator = new Paginator(getSize() - 9, notAllies); @@ -51,15 +50,15 @@ public class AddAllyFrame extends SCFrame { int slot = 9; for (int i = paginator.getMinIndex(); paginator.isValidIndex(i); i++) { - Clan notRival = notAllies.get(i); + Union notRival = notAllies.get(i); SCComponent c = new SCComponentImpl( - lang("gui.clanlist.clan.title", getViewer(), notRival.getColorTag(), notRival.getName()), - Collections.singletonList(lang("gui.add.ally.clan.lore", getViewer())), XMaterial.CYAN_BANNER, + lang("gui.unionlist.union.title", getViewer(), notRival.getColorTag(), notRival.getName()), + Collections.singletonList(lang("gui.add.ally.union.lore", getViewer())), XMaterial.CYAN_BANNER, slot); c.setListener(ClickType.LEFT, () -> InventoryController.runSubcommand(getViewer(), "ally add", false, notRival.getTag())); - c.setPermission(ClickType.LEFT, RankPermission.ALLY_ADD); + c.setPermission(ClickType.LEFT, "unionsog.member.ally-set"); add(c); slot++; diff --git a/src/main/java/net/trueog/unionsog/ui/frames/AddPermissionFrame.java b/src/main/java/net/trueog/unionsog/ui/frames/AddPermissionFrame.java deleted file mode 100644 index 0a7f6a72..00000000 --- a/src/main/java/net/trueog/unionsog/ui/frames/AddPermissionFrame.java +++ /dev/null @@ -1,109 +0,0 @@ -package net.trueog.unionsog.ui.frames; - -import com.cryptomorin.xseries.XMaterial; -import net.trueog.unionsog.Helper; -import net.trueog.unionsog.Rank; -import net.trueog.unionsog.ui.*; -import net.trueog.unionsog.utils.Paginator; -import org.bukkit.entity.Player; -import org.bukkit.event.inventory.ClickType; -import org.jetbrains.annotations.NotNull; - -import java.util.Arrays; -import java.util.Collections; -import java.util.Set; - -import static net.trueog.unionsog.UnionsOG.lang; - -public class AddPermissionFrame extends SCFrame { - - private final String[] availablePermissions; - private final Paginator paginator; - private final Rank rank; - - public AddPermissionFrame(SCFrame parent, Player viewer, Rank rank) { - - super(parent, viewer); - this.rank = rank; - Set rankPerms = rank.getPermissions(); - availablePermissions = Arrays.stream(Helper.fromPermissionArray()).filter(p -> !rankPerms.contains(p)) - .toArray(String[]::new); - paginator = new Paginator(getSize() - 9, availablePermissions.length); - - } - - @Override - public void createComponents() { - - for (int slot = 0; slot < 9; slot++) { - - if (slot == 2 || slot == 6 || slot == 7) - continue; - add(Components.getPanelComponent(slot)); - - } - - add(Components.getBackComponent(getParent(), 2, getViewer())); - - add(Components.getPreviousPageComponent(6, this::previousPage, paginator, getViewer())); - add(Components.getNextPageComponent(7, this::nextPage, paginator, getViewer())); - - int slot = 9; - for (int i = paginator.getMinIndex(); paginator.isValidIndex(i); i++) { - - String permission = availablePermissions[i]; - - SCComponent c = new SCComponentImpl(lang("gui.add.permission.permission.title", getViewer(), permission), - Collections.singletonList(lang("gui.add.permission.permission.lore", getViewer())), XMaterial.PAPER, - slot); - c.setListener(ClickType.LEFT, () -> InventoryController.runSubcommand(getViewer(), "rank permissions add", - true, rank.getName(), permission)); - c.setPermission(ClickType.LEFT, "unionsog.leader.rank.permissions.add"); - add(c); - slot++; - - } - - } - - private void previousPage() { - - if (paginator.previousPage()) { - - updateFrame(); - - } - - } - - private void nextPage() { - - if (paginator.nextPage()) { - - updateFrame(); - - } - - } - - private void updateFrame() { - - InventoryDrawer.open(this); - - } - - @Override - public @NotNull String getTitle() { - - return lang("gui.add.permission.title", getViewer()); - - } - - @Override - public int getSize() { - - return 3 * 9; - - } - -} diff --git a/src/main/java/net/trueog/unionsog/ui/frames/AddRivalFrame.java b/src/main/java/net/trueog/unionsog/ui/frames/AddRivalFrame.java index de9be38c..0243005b 100644 --- a/src/main/java/net/trueog/unionsog/ui/frames/AddRivalFrame.java +++ b/src/main/java/net/trueog/unionsog/ui/frames/AddRivalFrame.java @@ -1,8 +1,7 @@ package net.trueog.unionsog.ui.frames; import com.cryptomorin.xseries.XMaterial; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.RankPermission; +import net.trueog.unionsog.Union; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.ui.*; import net.trueog.unionsog.utils.Paginator; @@ -18,14 +17,14 @@ import static net.trueog.unionsog.UnionsOG.lang; public class AddRivalFrame extends SCFrame { - private final List notRivals; + private final List notRivals; private final Paginator paginator; - public AddRivalFrame(SCFrame parent, Player viewer, Clan subject) { + public AddRivalFrame(SCFrame parent, Player viewer, Union subject) { super(parent, viewer); UnionsOG plugin = UnionsOG.getInstance(); - notRivals = plugin.getClanManager().getClans().stream() + notRivals = plugin.getUnionManager().getUnions().stream() .filter(c -> !c.equals(subject) && !c.isRival(subject.getTag()) && !c.isAlly(subject.getTag())) .collect(Collectors.toList()); paginator = new Paginator(getSize() - 9, notRivals.size()); @@ -51,16 +50,16 @@ public class AddRivalFrame extends SCFrame { int slot = 9; for (int i = paginator.getMinIndex(); paginator.isValidIndex(i); i++) { - Clan notRival = notRivals.get(i); + Union notRival = notRivals.get(i); SCComponent c = new SCComponentImpl( - lang("gui.clanlist.clan.title", getViewer(), notRival.getColorTag(), notRival.getName()), - Collections.singletonList(lang("gui.add.rival.clan.lore", getViewer())), XMaterial.RED_BANNER, + lang("gui.unionlist.union.title", getViewer(), notRival.getColorTag(), notRival.getName()), + Collections.singletonList(lang("gui.add.rival.union.lore", getViewer())), XMaterial.RED_BANNER, slot); c.setListener(ClickType.LEFT, () -> InventoryController.runSubcommand(getViewer(), "rival add", false, notRival.getTag())); c.setConfirmationRequired(ClickType.LEFT); - c.setPermission(ClickType.LEFT, RankPermission.RIVAL_ADD); + c.setPermission(ClickType.LEFT, "unionsog.member.rival"); add(c); slot++; diff --git a/src/main/java/net/trueog/unionsog/ui/frames/AlliesFrame.java b/src/main/java/net/trueog/unionsog/ui/frames/AlliesFrame.java index b1b94ee7..50909bf9 100644 --- a/src/main/java/net/trueog/unionsog/ui/frames/AlliesFrame.java +++ b/src/main/java/net/trueog/unionsog/ui/frames/AlliesFrame.java @@ -1,8 +1,7 @@ package net.trueog.unionsog.ui.frames; import com.cryptomorin.xseries.XMaterial; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.RankPermission; +import net.trueog.unionsog.Union; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.ui.*; import net.trueog.unionsog.utils.Paginator; @@ -20,9 +19,9 @@ public class AlliesFrame extends SCFrame { private final UnionsOG plugin = UnionsOG.getInstance(); private final Paginator paginator; private final List allies; - private final Clan subject; + private final Union subject; - public AlliesFrame(Player viewer, SCFrame parent, Clan subject) { + public AlliesFrame(Player viewer, SCFrame parent, Union subject) { super(parent, viewer); this.subject = subject; @@ -46,7 +45,7 @@ public class AlliesFrame extends SCFrame { SCComponent add = new SCComponentImpl(lang("gui.allies.add.title", getViewer()), null, XMaterial.CYAN_WOOL, 4); add.setListener(ClickType.LEFT, () -> InventoryDrawer.open(new AddAllyFrame(this, getViewer(), subject))); - add.setPermission(ClickType.LEFT, RankPermission.ALLY_ADD); + add.setPermission(ClickType.LEFT, "unionsog.member.ally-set"); add(add); add(Components.getPreviousPageComponent(6, this::previousPage, paginator, getViewer())); @@ -55,15 +54,15 @@ public class AlliesFrame extends SCFrame { int slot = 9; for (int i = paginator.getMinIndex(); paginator.isValidIndex(i); i++) { - Clan clan = plugin.getClanManager().getClan(allies.get(i)); - if (clan == null) + Union union = plugin.getUnionManager().getUnion(allies.get(i)); + if (union == null) continue; SCComponent c = new SCComponentImpl( - lang("gui.clanlist.clan.title", getViewer(), clan.getColorTag(), clan.getName()), - Collections.singletonList(lang("gui.allies.clan.lore", getViewer())), XMaterial.CYAN_BANNER, slot); + lang("gui.unionlist.union.title", getViewer(), union.getColorTag(), union.getName()), + Collections.singletonList(lang("gui.allies.union.lore", getViewer())), XMaterial.CYAN_BANNER, slot); c.setListener(ClickType.RIGHT, - () -> InventoryController.runSubcommand(getViewer(), "ally remove", false, clan.getTag())); - c.setPermission(ClickType.RIGHT, RankPermission.ALLY_REMOVE); + () -> InventoryController.runSubcommand(getViewer(), "ally remove", false, union.getTag())); + c.setPermission(ClickType.RIGHT, "unionsog.member.ally-set"); add(c); slot++; diff --git a/src/main/java/net/trueog/unionsog/ui/frames/Components.java b/src/main/java/net/trueog/unionsog/ui/frames/Components.java index b94dabdc..755e60a1 100644 --- a/src/main/java/net/trueog/unionsog/ui/frames/Components.java +++ b/src/main/java/net/trueog/unionsog/ui/frames/Components.java @@ -1,8 +1,8 @@ package net.trueog.unionsog.ui.frames; import com.cryptomorin.xseries.XMaterial; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.Helper; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.ui.*; @@ -34,23 +34,22 @@ public class Components { boolean openDetails) { - ClanPlayer cp = UnionsOG.getInstance().getClanManager().getCreateClanPlayer(subject.getUniqueId()); + UnionPlayer cp = UnionsOG.getInstance().getUnionManager().getCreateUnionPlayer(subject.getUniqueId()); return getPlayerComponent(frame, viewer, cp, slot, openDetails); } - public static SCComponent getPlayerComponent(SCFrame frame, Player viewer, ClanPlayer cp, int slot, + public static SCComponent getPlayerComponent(SCFrame frame, Player viewer, UnionPlayer cp, int slot, boolean openDetails) { UnionsOG pl = UnionsOG.getInstance(); String status = getPlayerStatus(viewer, cp); SCComponent c = new SCComponentImpl(lang("gui.playerdetails.player.title", viewer, cp.getName()), Arrays.asList( - cp.getClan() == null ? lang("gui.playerdetails.player.lore.noclan", viewer) - : lang("gui.playerdetails.player.lore.clan", viewer, cp.getClan().getColorTag(), - cp.getClan().getName()), - lang("gui.playerdetails.player.lore.rank", viewer, ChatUtils.parseColors(cp.getRankDisplayName())), + cp.getUnion() == null ? lang("gui.playerdetails.player.lore.nounion", viewer) + : lang("gui.playerdetails.player.lore.union", viewer, cp.getUnion().getColorTag(), + cp.getUnion().getName()), lang("gui.playerdetails.player.lore.status", viewer, status), lang("gui.playerdetails.player.lore.kdr", viewer, new DecimalFormat("#.#").format(cp.getKDR())), lang("gui.playerdetails.player.lore.kill.totals", viewer, cp.getRivalKills(), cp.getNeutralKills(), @@ -58,8 +57,8 @@ public class Components { lang("gui.playerdetails.player.lore.deaths", viewer, cp.getDeaths()), lang("gui.playerdetails.player.lore.join.date", viewer, cp.getJoinDateString()), lang("gui.playerdetails.player.lore.last.seen", viewer, cp.getLastSeenString(viewer)), - lang("gui.playerdetails.player.lore.past.clans", viewer, - cp.getPastClansString(lang("gui.playerdetails.player.lore.past.clans.separator", viewer))), + lang("gui.playerdetails.player.lore.past.unions", viewer, + cp.getPastUnionsString(lang("gui.playerdetails.player.lore.past.unions.separator", viewer))), lang("gui.playerdetails.player.lore.inactive", viewer, cp.getInactiveDays(), pl.getSettingsManager().getInt(PURGE_INACTIVE_PLAYER_DAYS))), XMaterial.PLAYER_HEAD, slot); @@ -87,92 +86,79 @@ public class Components { } @NotNull - private static String getPlayerStatus(Player viewer, ClanPlayer cp) { + private static String getPlayerStatus(Player viewer, UnionPlayer cp) { - if (cp.getClan() == null) { + if (cp.getUnion() == null) { return lang("free.agent", viewer); } - if (cp.isLeader()) { - - return lang("leader", viewer); - - } - if (cp.isTrusted()) { return lang("trusted", viewer); } - if (!cp.getRankId().isEmpty()) { - - return lang("in.rank", viewer); - - } - return lang("untrusted", viewer); } - public static SCComponent getClanComponent(@NotNull SCFrame frame, @NotNull Player viewer, @Nullable Clan clan, + public static SCComponent getUnionComponent(@NotNull SCFrame frame, @NotNull Player viewer, @Nullable Union union, int slot, boolean openDetails) { UnionsOG pl = UnionsOG.getInstance(); String name; List lore; - if (clan != null) { + if (union != null) { - name = lang("gui.clandetails.clan.title", viewer, clan.getColorTag(), clan.getName()); + name = lang("gui.uniondetails.union.title", viewer, union.getColorTag(), union.getName()); lore = Arrays.asList( - lang("gui.clandetails.clan.lore.description", viewer, - clan.getDescription() != null && !clan.getDescription().isEmpty() ? clan.getDescription() + lang("gui.uniondetails.union.lore.description", viewer, + union.getDescription() != null && !union.getDescription().isEmpty() ? union.getDescription() : lang("no.description", viewer)), - lang("gui.clandetails.clan.lore.status", viewer, Helper.getFormattedClanStatus(clan, viewer)), - lang("gui.clandetails.clan.lore.leaders", viewer, clan.getLeadersString("", ", ")), - lang("gui.clandetails.clan.lore.online.members", viewer, - VanishUtils.getNonVanished(viewer, clan).size(), clan.getMembers().size()), - lang("gui.clandetails.clan.lore.kdr", viewer, KDRFormat.format(clan.getTotalKDR())), - lang("gui.clandetails.clan.lore.kill.totals", viewer, clan.getTotalRival(), clan.getTotalNeutral(), - clan.getTotalCivilian()), - lang("gui.clandetails.clan.lore.deaths", viewer, clan.getTotalDeaths()), - lang("gui.clandetails.clan.lore.allies", viewer, - clan.getAllies().isEmpty() ? lang("none", viewer) - : clan.getAllyString(lang("gui.clandetails.clan.lore.allies.separator", viewer), + lang("gui.uniondetails.union.lore.status", viewer, Helper.getFormattedUnionStatus(union, viewer)), + lang("gui.uniondetails.union.lore.online.members", viewer, + VanishUtils.getNonVanished(viewer, union).size(), union.getMembers().size()), + lang("gui.uniondetails.union.lore.kdr", viewer, KDRFormat.format(union.getTotalKDR())), + lang("gui.uniondetails.union.lore.kill.totals", viewer, union.getTotalRival(), + union.getTotalNeutral(), union.getTotalCivilian()), + lang("gui.uniondetails.union.lore.deaths", viewer, union.getTotalDeaths()), + lang("gui.uniondetails.union.lore.allies", viewer, + union.getAllies().isEmpty() ? lang("none", viewer) + : union.getAllyString(lang("gui.uniondetails.union.lore.allies.separator", viewer), viewer)), - lang("gui.clandetails.clan.lore.rivals", viewer, - clan.getRivals().isEmpty() ? lang("none", viewer) - : clan.getRivalString(lang("gui.clandetails.clan.lore.rivals.separator", viewer), + lang("gui.uniondetails.union.lore.rivals", viewer, + union.getRivals().isEmpty() ? lang("none", viewer) + : union.getRivalString(lang("gui.uniondetails.union.lore.rivals.separator", viewer), viewer)), - lang("gui.clandetails.clan.lore.founded", viewer, clan.getFoundedString()), - lang("gui.clandetails.clan.lore.inactive", viewer, clan.getInactiveDays(), - Helper.formatMaxInactiveDays(clan.getMaxInactiveDays()))); + lang("gui.uniondetails.union.lore.founded", viewer, union.getFoundedString()), + lang("gui.uniondetails.union.lore.inactive", viewer, union.getInactiveDays(), + Helper.formatMaxInactiveDays(union.getMaxInactiveDays()))); } else { - name = lang("gui.clandetails.free.agent.title", viewer); - double price = pl.getSettingsManager().is(ECONOMY_PURCHASE_CLAN_CREATE) + name = lang("gui.uniondetails.free.agent.title", viewer); + double price = pl.getSettingsManager().is(ECONOMY_PURCHASE_UNION_CREATE) ? pl.getSettingsManager().getDouble(ECONOMY_CREATION_PRICE) : 0; lore = new ArrayList<>(); if (price != 0) { - lore.add(lang("gui.clandetails.free.agent.create.clan.price.lore", frame.getViewer(), + lore.add(lang("gui.uniondetails.free.agent.create.union.price.lore", frame.getViewer(), CurrencyFormat.format(price, viewer))); } - lore.add(lang("gui.clandetails.free.agent.create.clan.lore", frame.getViewer())); + lore.add(lang("gui.uniondetails.free.agent.create.union.lore", frame.getViewer())); } ItemStack item; - if (clan != null && clan.getBanner() != null) { + if (union != null && union.getBanner() != null) { - item = clan.getBanner(); + item = union.getBanner(); } else { @@ -181,20 +167,20 @@ public class Components { } SCComponent c = new SCComponentImpl.Builder(item).withLore(lore).withDisplayName(name).withSlot(slot).build(); - if (openDetails && clan != null) { + if (openDetails && union != null) { - c.setListener(ClickType.LEFT, () -> InventoryDrawer.open(new ClanDetailsFrame(frame, viewer, clan))); + c.setListener(ClickType.LEFT, () -> InventoryDrawer.open(new UnionDetailsFrame(frame, viewer, union))); } - if (clan == null) { + if (union == null) { - c.setPermission(ClickType.LEFT, "unionsog.leader.create"); + c.setPermission(ClickType.LEFT, "unionsog.member.create"); c.setListener(ClickType.LEFT, () -> InventoryController.runSubcommand(viewer, "create", false)); } - if (clan != null && clan.isMember(viewer)) { + if (union != null && union.isMember(viewer)) { c.setLorePermission("unionsog.member.profile"); diff --git a/src/main/java/net/trueog/unionsog/ui/frames/CoordsFrame.java b/src/main/java/net/trueog/unionsog/ui/frames/CoordsFrame.java index c7e25d8a..2d993218 100644 --- a/src/main/java/net/trueog/unionsog/ui/frames/CoordsFrame.java +++ b/src/main/java/net/trueog/unionsog/ui/frames/CoordsFrame.java @@ -1,9 +1,8 @@ package net.trueog.unionsog.ui.frames; import com.cryptomorin.xseries.XMaterial; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; -import net.trueog.unionsog.RankPermission; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.ui.InventoryDrawer; import net.trueog.unionsog.ui.SCComponent; import net.trueog.unionsog.ui.SCComponentImpl; @@ -25,14 +24,13 @@ import static net.trueog.unionsog.UnionsOG.lang; public class CoordsFrame extends SCFrame { - private final List allMembers; + private final List allMembers; private final Paginator paginator; - public CoordsFrame(Player viewer, SCFrame parent, Clan subject) { + public CoordsFrame(Player viewer, SCFrame parent, Union subject) { super(parent, viewer); allMembers = VanishUtils.getNonVanished(getViewer(), subject); - allMembers.sort((cp1, cp2) -> Boolean.compare(cp1.isLeader(), cp2.isLeader())); paginator = new Paginator(getSize() - 9, allMembers); @@ -56,7 +54,7 @@ public class CoordsFrame extends SCFrame { int slot = 9; for (int i = paginator.getMinIndex(); paginator.isValidIndex(i); i++) { - ClanPlayer cp = allMembers.get(i); + UnionPlayer cp = allMembers.get(i); Location cpLoc = Objects.requireNonNull(cp.toPlayer()).getLocation(); int distance = (int) Math.ceil(cpLoc.toVector().distance(getViewer().getLocation().toVector())); @@ -71,7 +69,7 @@ public class CoordsFrame extends SCFrame { Components.setOwningPlayer(c.getItem(), offlinePlayer); c.setListener(ClickType.LEFT, () -> InventoryDrawer.open(new PlayerDetailsFrame(getViewer(), this, offlinePlayer))); - c.setLorePermission(RankPermission.COORDS); + c.setLorePermission("unionsog.member.coords"); add(c); slot++; diff --git a/src/main/java/net/trueog/unionsog/ui/frames/InviteFrame.java b/src/main/java/net/trueog/unionsog/ui/frames/InviteFrame.java index b9afb95d..5f08bbd8 100644 --- a/src/main/java/net/trueog/unionsog/ui/frames/InviteFrame.java +++ b/src/main/java/net/trueog/unionsog/ui/frames/InviteFrame.java @@ -1,9 +1,8 @@ package net.trueog.unionsog.ui.frames; import com.cryptomorin.xseries.XMaterial; -import net.trueog.unionsog.RankPermission; import net.trueog.unionsog.UnionsOG; -import net.trueog.unionsog.managers.ClanManager; +import net.trueog.unionsog.managers.UnionManager; import net.trueog.unionsog.ui.*; import net.trueog.unionsog.utils.CurrencyFormat; import net.trueog.unionsog.utils.Paginator; @@ -19,7 +18,7 @@ import java.util.stream.Collectors; import static net.trueog.unionsog.UnionsOG.lang; import static net.trueog.unionsog.managers.SettingsManager.ConfigField.ECONOMY_INVITE_PRICE; -import static net.trueog.unionsog.managers.SettingsManager.ConfigField.ECONOMY_PURCHASE_CLAN_INVITE; +import static net.trueog.unionsog.managers.SettingsManager.ConfigField.ECONOMY_PURCHASE_UNION_INVITE; public class InviteFrame extends SCFrame { @@ -31,8 +30,8 @@ public class InviteFrame extends SCFrame { super(parent, viewer); this.plugin = UnionsOG.getInstance(); - ClanManager cm = plugin.getClanManager(); - players = plugin.getServer().getOnlinePlayers().stream().filter(p -> cm.getClanPlayer(p) == null) + UnionManager cm = plugin.getUnionManager(); + players = plugin.getServer().getOnlinePlayers().stream().filter(p -> cm.getUnionPlayer(p) == null) .collect(Collectors.toList()); paginator = new Paginator(getSize() - 9, players.size()); @@ -58,7 +57,7 @@ public class InviteFrame extends SCFrame { @NotNull private SCComponent createPlayerComponent(@NotNull Player player, int slot) { - double price = plugin.getSettingsManager().is(ECONOMY_PURCHASE_CLAN_INVITE) + double price = plugin.getSettingsManager().is(ECONOMY_PURCHASE_UNION_INVITE) ? plugin.getSettingsManager().getDouble(ECONOMY_INVITE_PRICE) : 0; List lore = new ArrayList<>(); @@ -72,7 +71,7 @@ public class InviteFrame extends SCFrame { Components.setOwningPlayer(c.getItem(), offlinePlayer); c.setListener(ClickType.LEFT, () -> InventoryController.runSubcommand(getViewer(), "invite", false, player.getName())); - c.setPermission(ClickType.LEFT, RankPermission.INVITE); + c.setPermission(ClickType.LEFT, "unionsog.member.invite"); return c; } diff --git a/src/main/java/net/trueog/unionsog/ui/frames/LanguageSelectorFrame.java b/src/main/java/net/trueog/unionsog/ui/frames/LanguageSelectorFrame.java index b326e617..1dd588d4 100644 --- a/src/main/java/net/trueog/unionsog/ui/frames/LanguageSelectorFrame.java +++ b/src/main/java/net/trueog/unionsog/ui/frames/LanguageSelectorFrame.java @@ -1,7 +1,7 @@ package net.trueog.unionsog.ui.frames; import com.cryptomorin.xseries.XMaterial; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.language.LanguageResource; import net.trueog.unionsog.ui.InventoryDrawer; @@ -22,7 +22,7 @@ import static net.trueog.unionsog.UnionsOG.lang; public class LanguageSelectorFrame extends SCFrame { - private final ClanPlayer clanPlayer; + private final UnionPlayer unionPlayer; private final UnionsOG plugin; private final Paginator paginator; private final List languages; @@ -31,7 +31,7 @@ public class LanguageSelectorFrame extends SCFrame { super(parent, viewer); plugin = UnionsOG.getInstance(); - clanPlayer = plugin.getClanManager().getCreateClanPlayer(viewer.getUniqueId()); + unionPlayer = plugin.getUnionManager().getCreateUnionPlayer(viewer.getUniqueId()); languages = LanguageResource.getAvailableLocales(); paginator = new Paginator(getSize() - 9, languages); @@ -40,7 +40,7 @@ public class LanguageSelectorFrame extends SCFrame { @Override public @NotNull String getTitle() { - Locale locale = clanPlayer.getLocale(); + Locale locale = unionPlayer.getLocale(); if (locale == null) { locale = plugin.getSettingsManager().getLanguage(); @@ -81,53 +81,19 @@ public class LanguageSelectorFrame extends SCFrame { .withSlot(slot) .withLore(Arrays.asList(lang("gui.languageselector.language.lore.left.click", getViewer()), lang("gui.languageselector.language.lore.translation.status", getViewer(), - LanguageResource.getTranslationStatus(locale)), - !locale.equals(Locale.ENGLISH) - ? lang("gui.languageselector.language.lore.right.click", getViewer()) - : "")) + LanguageResource.getTranslationStatus(locale)))) .build(); c.setListener(ClickType.LEFT, () -> { - clanPlayer.setLocale(locale); - plugin.getStorageManager().updateClanPlayer(clanPlayer); + unionPlayer.setLocale(locale); + plugin.getStorageManager().updateUnionPlayer(unionPlayer); InventoryDrawer.open(this); }); - if (!locale.equals(Locale.ENGLISH)) { - - c.setListener(ClickType.RIGHT, () -> { - - getViewer().sendMessage(lang("click.to.help.translating", getViewer(), getCrowdinLink(locale))); - getViewer().closeInventory(); - - }); - - } - add(c); } - private String getCrowdinLink(@NotNull Locale locale) { - - String base = "https://crowdin.com/project/simpleclans/"; - // only known exception - if (locale.equals(new Locale("uk", "UA"))) { - - return base + "uk"; - - } - - if (locale.getLanguage().equalsIgnoreCase(locale.getCountry())) { - - return base + locale.getLanguage(); - - } - - return base + locale.toLanguageTag(); - - } - public void addHeader() { for (int slot = 0; slot < 9; slot++) { diff --git a/src/main/java/net/trueog/unionsog/ui/frames/LeaderboardFrame.java b/src/main/java/net/trueog/unionsog/ui/frames/LeaderboardFrame.java index d344489a..bc89c68b 100644 --- a/src/main/java/net/trueog/unionsog/ui/frames/LeaderboardFrame.java +++ b/src/main/java/net/trueog/unionsog/ui/frames/LeaderboardFrame.java @@ -1,7 +1,7 @@ package net.trueog.unionsog.ui.frames; import com.cryptomorin.xseries.XMaterial; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.ui.InventoryDrawer; import net.trueog.unionsog.ui.SCComponent; @@ -25,19 +25,19 @@ import static net.trueog.unionsog.UnionsOG.lang; public class LeaderboardFrame extends SCFrame { private final Paginator paginator; - private final List clanPlayers; - private final RankingNumberResolver rankingResolver; + private final List unionPlayers; + private final RankingNumberResolver rankingResolver; public LeaderboardFrame(Player viewer, SCFrame parent) { super(parent, viewer); UnionsOG plugin = UnionsOG.getInstance(); - clanPlayers = plugin.getClanManager().getAllClanPlayers(); + unionPlayers = plugin.getUnionManager().getAllUnionPlayers(); - rankingResolver = new RankingNumberResolver<>(clanPlayers, c -> KDRFormat.toBigDecimal(c.getKDR()), false, + rankingResolver = new RankingNumberResolver<>(unionPlayers, c -> KDRFormat.toBigDecimal(c.getKDR()), false, plugin.getSettingsManager().getRankingType()); - paginator = new Paginator(getSize() - 9, this.clanPlayers); + paginator = new Paginator(getSize() - 9, this.unionPlayers); } @@ -60,14 +60,14 @@ public class LeaderboardFrame extends SCFrame { int slot = 9; for (int i = paginator.getMinIndex(); paginator.isValidIndex(i); i++) { - ClanPlayer cp = clanPlayers.get(i); + UnionPlayer cp = unionPlayers.get(i); SCComponent c = new SCComponentImpl( lang("gui.leaderboard.player.title", getViewer(), rankingResolver.getRankingNumber(cp), cp.getName()), Arrays.asList( - cp.getClan() == null ? lang("gui.playerdetails.player.lore.noclan", getViewer()) - : lang("gui.playerdetails.player.lore.clan", getViewer(), - cp.getClan().getColorTag(), cp.getClan().getName()), + cp.getUnion() == null ? lang("gui.playerdetails.player.lore.nounion", getViewer()) + : lang("gui.playerdetails.player.lore.union", getViewer(), + cp.getUnion().getColorTag(), cp.getUnion().getName()), lang("gui.playerdetails.player.lore.kdr", getViewer(), KDRFormat.format(cp.getKDR())), lang("gui.playerdetails.player.lore.last.seen", getViewer(), cp.getLastSeenString(getViewer()))), @@ -113,7 +113,7 @@ public class LeaderboardFrame extends SCFrame { @Override public @NotNull String getTitle() { - return lang("gui.leaderboard.title", getViewer(), clanPlayers.size()); + return lang("gui.leaderboard.title", getViewer(), unionPlayers.size()); } diff --git a/src/main/java/net/trueog/unionsog/ui/frames/MainFrame.java b/src/main/java/net/trueog/unionsog/ui/frames/MainFrame.java index 9291ea4a..cd41476f 100644 --- a/src/main/java/net/trueog/unionsog/ui/frames/MainFrame.java +++ b/src/main/java/net/trueog/unionsog/ui/frames/MainFrame.java @@ -1,6 +1,9 @@ package net.trueog.unionsog.ui.frames; import com.cryptomorin.xseries.XMaterial; +import net.trueog.unionsog.Proposal; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.ui.*; import net.trueog.unionsog.ui.frames.staff.StaffFrame; @@ -32,10 +35,11 @@ public class MainFrame extends SCFrame { nextSlot = 0; add(Components.getPlayerComponent(this, getViewer(), getViewer(), nextSlot++, false)); - add(Components.getClanComponent(this, getViewer(), - plugin.getClanManager().getCreateClanPlayer(getViewer().getUniqueId()).getClan(), nextSlot++, true)); + add(Components.getUnionComponent(this, getViewer(), + plugin.getUnionManager().getCreateUnionPlayer(getViewer().getUniqueId()).getUnion(), nextSlot++, true)); + addProposal(); addUnionBanking(); - addClanList(); + addUnionList(); addLeaderboard(); addResetKdr(); addStaff(); @@ -44,6 +48,27 @@ public class MainFrame extends SCFrame { } + private void addProposal() { + + UnionPlayer cp = plugin.getUnionManager().getUnionPlayer(getViewer()); + Union union = cp != null ? cp.getUnion() : null; + Proposal proposal = plugin.getProposalManager().getProposal(union); + if (union == null || proposal == null) { + + return; + + } + + String state = proposal.hasVoted(getViewer().getUniqueId()) ? lang("gui.main.proposal.lore.voted", getViewer()) + : lang("gui.main.proposal.lore.not.voted", getViewer()); + SCComponent vote = new SCComponentImpl(lang("gui.main.proposal.title", getViewer()), + Arrays.asList(plugin.getProposalManager().describe(proposal, union), state), XMaterial.WRITABLE_BOOK, + nextSlot++); + vote.setListener(ClickType.LEFT, () -> InventoryDrawer.open(new ProposalFrame(this, getViewer(), union))); + add(vote); + + } + private void addUnionBanking() { SCComponent unionBanking = new SCComponentImpl(ChatUtils.parseColors("&6Union Banking"), @@ -92,14 +117,14 @@ public class MainFrame extends SCFrame { } - private void addClanList() { + private void addUnionList() { - SCComponent clanList = new SCComponentImpl(lang("gui.main.clan.list.title", getViewer()), - Collections.singletonList(lang("gui.main.clan.list.lore", getViewer())), XMaterial.PURPLE_BANNER, + SCComponent unionList = new SCComponentImpl(lang("gui.main.union.list.title", getViewer()), + Collections.singletonList(lang("gui.main.union.list.lore", getViewer())), XMaterial.PURPLE_BANNER, nextSlot++); - clanList.setListener(ClickType.LEFT, () -> InventoryDrawer.open(new ClanListFrame(this, getViewer()))); - clanList.setPermission(ClickType.LEFT, "unionsog.anyone.list"); - add(clanList); + unionList.setListener(ClickType.LEFT, () -> InventoryDrawer.open(new UnionListFrame(this, getViewer()))); + unionList.setPermission(ClickType.LEFT, "unionsog.anyone.list"); + add(unionList); } @@ -109,18 +134,10 @@ public class MainFrame extends SCFrame { SCComponent language = new SCComponentImpl.Builder(XMaterial.MAP) .withDisplayName(lang("gui.main.languageselector.title", getViewer())).withSlot(nextSlot++) - .withLore(Arrays.asList(lang("gui.main.languageselector.lore.left.click", getViewer()), - lang("gui.main.languageselector.lore.right.click", getViewer()))) + .withLore(Collections.singletonList(lang("gui.main.languageselector.lore.left.click", getViewer()))) .build(); language.setListener(ClickType.LEFT, () -> InventoryDrawer.open(new LanguageSelectorFrame(this, getViewer()))); - language.setListener(ClickType.RIGHT, () -> { - - getViewer().sendMessage( - lang("click.to.help.translating", getViewer(), "https://crowdin.com/project/simpleclans")); - getViewer().closeInventory(); - - }); add(language); } @@ -150,7 +167,7 @@ public class MainFrame extends SCFrame { @Override public @NotNull String getTitle() { - return lang("gui.main.title", getViewer(), plugin.getSettingsManager().getColored(SERVER_NAME)); + return lang("gui.main.title", getViewer()); } diff --git a/src/main/java/net/trueog/unionsog/ui/frames/PermissionsFrame.java b/src/main/java/net/trueog/unionsog/ui/frames/PermissionsFrame.java deleted file mode 100644 index 503913f4..00000000 --- a/src/main/java/net/trueog/unionsog/ui/frames/PermissionsFrame.java +++ /dev/null @@ -1,110 +0,0 @@ -package net.trueog.unionsog.ui.frames; - -import com.cryptomorin.xseries.XMaterial; -import net.trueog.unionsog.Rank; -import net.trueog.unionsog.ui.*; -import net.trueog.unionsog.utils.Paginator; -import org.bukkit.entity.Player; -import org.bukkit.event.inventory.ClickType; -import org.jetbrains.annotations.NotNull; - -import java.util.Collections; - -import static net.trueog.unionsog.UnionsOG.lang; - -public class PermissionsFrame extends SCFrame { - - private final Rank rank; - private final Paginator paginator; - private final String[] permissions; - - public PermissionsFrame(SCFrame parent, Player viewer, Rank rank) { - - super(parent, viewer); - this.rank = rank; - permissions = rank.getPermissions().toArray(new String[0]); - paginator = new Paginator(getSize() - 9, permissions.length); - - } - - @Override - public void createComponents() { - - for (int slot = 0; slot < 9; slot++) { - - if (slot == 2 || slot == 4 || slot == 6 || slot == 7) - continue; - add(Components.getPanelComponent(slot)); - - } - - add(Components.getBackComponent(getParent(), 2, getViewer())); - - SCComponent add = new SCComponentImpl(lang("gui.permissions.add.title", getViewer()), null, - XMaterial.WHITE_WOOL, 4); - add.setListener(ClickType.LEFT, () -> InventoryDrawer.open(new AddPermissionFrame(this, getViewer(), rank))); - add.setPermission(ClickType.LEFT, "unionsog.leader.rank.permissions.add"); - add(add); - - add(Components.getPreviousPageComponent(6, this::previousPage, paginator, getViewer())); - add(Components.getNextPageComponent(7, this::nextPage, paginator, getViewer())); - - int slot = 9; - for (int i = paginator.getMinIndex(); paginator.isValidIndex(i); i++) { - - String permission = permissions[i]; - - SCComponent c = new SCComponentImpl(lang("gui.permissions.permission.title", getViewer(), permission), - Collections.singletonList(lang("gui.permissions.permission.lore", getViewer())), XMaterial.PAPER, - slot); - c.setListener(ClickType.RIGHT, () -> InventoryController.runSubcommand(getViewer(), - "rank permissions remove", true, rank.getName(), permission)); - c.setPermission(ClickType.RIGHT, "unionsog.leader.rank.permissions.remove"); - add(c); - slot++; - - } - - } - - private void previousPage() { - - if (paginator.previousPage()) { - - updateFrame(); - - } - - } - - private void nextPage() { - - if (paginator.nextPage()) { - - updateFrame(); - - } - - } - - private void updateFrame() { - - InventoryDrawer.open(this); - - } - - @Override - public @NotNull String getTitle() { - - return lang("gui.permissions.title", getViewer(), rank.getName()); - - } - - @Override - public int getSize() { - - return 3 * 9; - - } - -} diff --git a/src/main/java/net/trueog/unionsog/ui/frames/PlayerDetailsFrame.java b/src/main/java/net/trueog/unionsog/ui/frames/PlayerDetailsFrame.java index ed2ee432..f8d5e71f 100644 --- a/src/main/java/net/trueog/unionsog/ui/frames/PlayerDetailsFrame.java +++ b/src/main/java/net/trueog/unionsog/ui/frames/PlayerDetailsFrame.java @@ -1,37 +1,31 @@ package net.trueog.unionsog.ui.frames; import com.cryptomorin.xseries.XMaterial; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; -import net.trueog.unionsog.RankPermission; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; -import net.trueog.unionsog.managers.SettingsManager; import net.trueog.unionsog.ui.*; import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.jetbrains.annotations.NotNull; -import java.util.Arrays; - import static net.trueog.unionsog.UnionsOG.lang; -import static net.trueog.unionsog.managers.SettingsManager.ConfigField.CLAN_CONFIRMATION_FOR_DEMOTE; -import static net.trueog.unionsog.managers.SettingsManager.ConfigField.CLAN_CONFIRMATION_FOR_PROMOTE; public class PlayerDetailsFrame extends SCFrame { private final UnionsOG plugin = UnionsOG.getInstance(); private final OfflinePlayer subject; private final String subjectName; - private final Clan clan; + private final Union union; public PlayerDetailsFrame(Player viewer, SCFrame parent, OfflinePlayer subject) { super(parent, viewer); this.subject = subject; - ClanPlayer cp = plugin.getClanManager().getCreateClanPlayer(subject.getUniqueId()); + UnionPlayer cp = plugin.getUnionManager().getCreateUnionPlayer(subject.getUniqueId()); subjectName = cp.getName(); - clan = cp.getClan(); + union = cp.getUnion(); } @@ -49,16 +43,13 @@ public class PlayerDetailsFrame extends SCFrame { add(Components.getBackComponent(getParent(), 4, getViewer())); add(Components.getPlayerComponent(this, getViewer(), subject, 13, false)); - if (!isSameClan()) { + if (!isSameUnion()) { return; } addKick(); - addPromoteDemote(); - addAssignUnassign(); - addTrustUntrust(); } @@ -69,66 +60,11 @@ public class PlayerDetailsFrame extends SCFrame { kick.setListener(ClickType.LEFT, () -> InventoryController.runSubcommand(getViewer(), "kick", true, subjectName)); kick.setConfirmationRequired(ClickType.LEFT); - kick.setPermission(ClickType.LEFT, RankPermission.KICK); + kick.setPermission(ClickType.LEFT, "unionsog.member.kick"); add(kick); } - private void addPromoteDemote() { - - SettingsManager settings = plugin.getSettingsManager(); - SCComponent promoteDemote = new SCComponentImpl(lang("gui.playerdetails.promote.demote.title", getViewer()), - Arrays.asList(lang("gui.playerdetails.promote.lore.left.click", getViewer()), - lang("gui.playerdetails.demote.lore.right.click", getViewer())), - XMaterial.GUNPOWDER, 30); - promoteDemote.setConfirmationRequired(ClickType.LEFT); - promoteDemote.setListener(ClickType.LEFT, () -> InventoryController.runSubcommand(getViewer(), "promote", - !settings.is(CLAN_CONFIRMATION_FOR_PROMOTE), subjectName)); - promoteDemote.setPermission(ClickType.LEFT, "unionsog.leader.promote"); - promoteDemote.setListener(ClickType.RIGHT, () -> InventoryController.runSubcommand(getViewer(), "demote", - !settings.is(CLAN_CONFIRMATION_FOR_DEMOTE), subjectName)); - promoteDemote.setConfirmationRequired(ClickType.RIGHT); - add(promoteDemote); - promoteDemote.setPermission(ClickType.RIGHT, "unionsog.leader.demote"); - - } - - private void addAssignUnassign() { - - SCComponentImpl assignUnassign = new SCComponentImpl( - lang("gui.playerdetails.assign.unassign.title", getViewer()), - Arrays.asList(lang("gui.playerdetails.assign.lore.left.click", getViewer()), - lang("gui.playerdetails.unassign.lore.right.click", getViewer())), - XMaterial.FEATHER, 32); - assignUnassign.setConfirmationRequired(ClickType.RIGHT); - assignUnassign.setListener(ClickType.RIGHT, - () -> InventoryController.runSubcommand(getViewer(), "rank unassign", true, subjectName)); - assignUnassign.setPermission(ClickType.RIGHT, "unionsog.leader.rank.unassign"); - assignUnassign.setListener(ClickType.LEFT, - () -> InventoryDrawer.open(new RanksFrame(this, getViewer(), clan, subject))); - add(assignUnassign); - assignUnassign.setPermission(ClickType.LEFT, "unionsog.leader.rank.assign"); - - } - - private void addTrustUntrust() { - - SCComponent trustUntrust = new SCComponentImpl(lang("gui.playerdetails.trust.untrust.title", getViewer()), - Arrays.asList(lang("gui.playerdetails.trust.lore.left.click", getViewer()), - lang("gui.playerdetails.untrust.lore.right.click", getViewer())), - XMaterial.CYAN_DYE, 34); - trustUntrust.setConfirmationRequired(ClickType.LEFT); - trustUntrust.setListener(ClickType.LEFT, - () -> InventoryController.runSubcommand(getViewer(), "trust", true, subjectName)); - trustUntrust.setPermission(ClickType.LEFT, "unionsog.leader.settrust"); - trustUntrust.setListener(ClickType.RIGHT, - () -> InventoryController.runSubcommand(getViewer(), "untrust", true, subjectName)); - trustUntrust.setPermission(ClickType.RIGHT, "unionsog.leader.settrust"); - trustUntrust.setConfirmationRequired(ClickType.RIGHT); - add(trustUntrust); - - } - @Override public @NotNull String getTitle() { @@ -140,7 +76,7 @@ public class PlayerDetailsFrame extends SCFrame { public int getSize() { int size = 3; - if (isSameClan()) { + if (isSameUnion()) { size = 6; @@ -150,9 +86,9 @@ public class PlayerDetailsFrame extends SCFrame { } - private boolean isSameClan() { + private boolean isSameUnion() { - return clan != null && clan.isMember(subject.getUniqueId()); + return union != null && union.isMember(subject.getUniqueId()); } diff --git a/src/main/java/net/trueog/unionsog/ui/frames/ProposalFrame.java b/src/main/java/net/trueog/unionsog/ui/frames/ProposalFrame.java new file mode 100644 index 00000000..35978227 --- /dev/null +++ b/src/main/java/net/trueog/unionsog/ui/frames/ProposalFrame.java @@ -0,0 +1,123 @@ +package net.trueog.unionsog.ui.frames; + +import com.cryptomorin.xseries.XMaterial; +import net.trueog.unionsog.Proposal; +import net.trueog.unionsog.UnionPlayer; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionsOG; +import net.trueog.unionsog.ui.InventoryController; +import net.trueog.unionsog.ui.InventoryDrawer; +import net.trueog.unionsog.ui.SCComponent; +import net.trueog.unionsog.ui.SCComponentImpl; +import net.trueog.unionsog.ui.SCFrame; +import org.bukkit.entity.Player; +import org.bukkit.event.inventory.ClickType; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.Arrays; +import java.util.Collections; + +import static net.trueog.unionsog.UnionsOG.lang; + +/** + * Lets a member cast their vote on their union's open proposal. + */ +public class ProposalFrame extends SCFrame { + + private final UnionsOG plugin = UnionsOG.getInstance(); + private final Union union; + + public ProposalFrame(@Nullable SCFrame parent, @NotNull Player viewer, @NotNull Union union) { + + super(parent, viewer); + this.union = union; + + } + + @Override + public @NotNull String getTitle() { + + return lang("gui.proposal.title", getViewer()); + + } + + @Override + public int getSize() { + + return 3 * 9; + + } + + @Override + public void createComponents() { + + if (getParent() != null) { + + add(Components.getBackComponent(getParent(), 0, getViewer())); + + } + + Proposal proposal = plugin.getProposalManager().getProposal(union); + if (proposal == null) { + + add(new SCComponentImpl.Builder(XMaterial.BARRIER.parseItem()) + .withDisplayName(lang("gui.proposal.none.title", getViewer())).withSlot(13).build()); + return; + + } + + add(new SCComponentImpl.Builder(XMaterial.PAPER.parseItem()) + .withDisplayName(lang("gui.proposal.subject.title", getViewer())) + .withLore(Collections.singletonList(plugin.getProposalManager().describe(proposal, union))).withSlot(13) + .build()); + + SCComponent yes = new SCComponentImpl.Builder(XMaterial.LIME_WOOL.parseItem()) + .withDisplayName(lang("gui.proposal.yes.title", getViewer())) + .withLore(Arrays.asList(lang("gui.proposal.yes.lore", getViewer()))).withSlot(11).build(); + yes.setListener(ClickType.LEFT, () -> vote("yes")); + add(yes); + + SCComponent no = new SCComponentImpl.Builder(XMaterial.RED_WOOL.parseItem()) + .withDisplayName(lang("gui.proposal.no.title", getViewer())) + .withLore(Arrays.asList(lang("gui.proposal.no.lore", getViewer()))).withSlot(15).build(); + no.setListener(ClickType.LEFT, () -> vote("no")); + add(no); + + } + + private void vote(@NotNull String choice) { + + // Goes through the command so the vote takes the same permission and + // membership checks as /union vote. + InventoryController.runSubcommand(getViewer(), "vote " + choice, false); + getViewer().closeInventory(); + + } + + /** + * Opens the frame for a member who has not voted on their union's open proposal + * yet. + * + * @param player the member + * @return whether the frame was opened + */ + public static boolean openIfPending(@NotNull Player player) { + + UnionsOG plugin = UnionsOG.getInstance(); + UnionPlayer cp = plugin.getUnionManager().getUnionPlayer(player); + Union union = cp != null ? cp.getUnion() : null; + Proposal proposal = plugin.getProposalManager().getProposal(union); + + if (union == null || proposal == null || proposal.hasVoted(player.getUniqueId())) { + + return false; + + } + + InventoryDrawer.open(new ProposalFrame(null, player, union)); + return true; + + } + +} diff --git a/src/main/java/net/trueog/unionsog/ui/frames/RanksFrame.java b/src/main/java/net/trueog/unionsog/ui/frames/RanksFrame.java deleted file mode 100644 index 403d06b3..00000000 --- a/src/main/java/net/trueog/unionsog/ui/frames/RanksFrame.java +++ /dev/null @@ -1,159 +0,0 @@ -package net.trueog.unionsog.ui.frames; - -import com.cryptomorin.xseries.XMaterial; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.Rank; -import net.trueog.unionsog.UnionsOG; -import net.trueog.unionsog.managers.ClanManager; -import net.trueog.unionsog.ui.*; -import net.trueog.unionsog.utils.ChatUtils; -import net.trueog.unionsog.utils.Paginator; -import org.bukkit.OfflinePlayer; -import org.bukkit.entity.Player; -import org.bukkit.event.inventory.ClickType; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import static net.trueog.unionsog.UnionsOG.lang; - -public class RanksFrame extends SCFrame { - - private final Paginator paginator; - private final OfflinePlayer toEdit; - private final List ranks; - - public RanksFrame(SCFrame parent, Player viewer, Clan subject, @Nullable OfflinePlayer toEdit) { - - super(parent, viewer); - this.toEdit = toEdit; - ranks = subject != null ? subject.getRanks() : new ArrayList<>(); - paginator = new Paginator(getSize() - 9, ranks); - - } - - @Override - public void createComponents() { - - for (int slot = 0; slot < 9; slot++) { - - if (slot == 2 || slot == 4 || slot == 6 || slot == 7) - continue; - add(Components.getPanelComponent(slot)); - - } - - add(Components.getBackComponent(getParent(), 2, getViewer())); - - SCComponent create = new SCComponentImpl(lang("gui.ranks.create.title", getViewer()), - Collections.singletonList(lang("gui.ranks.create.lore", getViewer())), XMaterial.WHITE_WOOL, 4); - create.setListener(ClickType.LEFT, () -> InventoryController.runSubcommand(getViewer(), "rank create", false)); - create.setPermission(ClickType.LEFT, "unionsog.leader.rank.create"); - add(create); - - add(Components.getPreviousPageComponent(6, this::previousPage, paginator, getViewer())); - add(Components.getNextPageComponent(7, this::nextPage, paginator, getViewer())); - - int slot = 9; - for (int i = paginator.getMinIndex(); paginator.isValidIndex(i); i++) { - - Rank rank = ranks.get(i); - List lore; - if (toEdit == null) { - - lore = Arrays.asList( - lang("gui.ranks.rank.displayname.lore", getViewer(), - ChatUtils.parseColors(rank.getDisplayName())), - lang("gui.ranks.rank.edit.permissions.lore", getViewer()), - lang("gui.ranks.rank.remove.lore", getViewer())); - - } else { - - lore = Arrays.asList( - lang("gui.ranks.rank.displayname.lore", getViewer(), - ChatUtils.parseColors(rank.getDisplayName())), - lang("gui.ranks.rank.assign.lore", getViewer(), toEdit.getName())); - - } - - SCComponent c = new SCComponentImpl(lang("gui.ranks.rank.title", getViewer(), rank.getName()), lore, - XMaterial.FILLED_MAP, slot); - if (toEdit != null) { - - c.setListener(ClickType.LEFT, () -> InventoryController.runSubcommand(getViewer(), "rank assign", true, - toEdit.getName(), rank.getName())); - c.setConfirmationRequired(ClickType.LEFT); - c.setPermission(ClickType.LEFT, "unionsog.leader.rank.assign"); - - } else { - - c.setListener(ClickType.LEFT, - () -> InventoryDrawer.open(new PermissionsFrame(this, getViewer(), rank))); - c.setPermission(ClickType.LEFT, "unionsog.leader.rank.permissions.list"); - c.setListener(ClickType.RIGHT, - () -> InventoryController.runSubcommand(getViewer(), "rank delete", true, rank.getName())); - c.setConfirmationRequired(ClickType.RIGHT); - c.setPermission(ClickType.RIGHT, "unionsog.leader.rank.delete"); - - } - - add(c); - slot++; - - } - - } - - private void previousPage() { - - if (paginator.previousPage()) { - - updateFrame(); - - } - - } - - private void nextPage() { - - if (paginator.nextPage()) { - - updateFrame(); - - } - - } - - private void updateFrame() { - - InventoryDrawer.open(this); - - } - - @Override - public @NotNull String getTitle() { - - if (toEdit != null) { - - ClanManager clanManager = UnionsOG.getInstance().getClanManager(); - String rank = clanManager.getCreateClanPlayer(toEdit.getUniqueId()).getRankId(); - return lang("gui.ranks.title.set.rank", getViewer(), rank); - - } - - return lang("gui.ranks.title", getViewer()); - - } - - @Override - public int getSize() { - - return 3 * 9; - - } - -} diff --git a/src/main/java/net/trueog/unionsog/ui/frames/RivalsFrame.java b/src/main/java/net/trueog/unionsog/ui/frames/RivalsFrame.java index 98c67501..7a6753e5 100644 --- a/src/main/java/net/trueog/unionsog/ui/frames/RivalsFrame.java +++ b/src/main/java/net/trueog/unionsog/ui/frames/RivalsFrame.java @@ -1,8 +1,7 @@ package net.trueog.unionsog.ui.frames; import com.cryptomorin.xseries.XMaterial; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.RankPermission; +import net.trueog.unionsog.Union; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.ui.*; import net.trueog.unionsog.utils.Paginator; @@ -19,10 +18,10 @@ public class RivalsFrame extends SCFrame { private final UnionsOG plugin = UnionsOG.getInstance(); private final Paginator paginator; - private final Clan subject; + private final Union subject; private final List rivals; - public RivalsFrame(Player viewer, SCFrame parent, Clan subject) { + public RivalsFrame(Player viewer, SCFrame parent, Union subject) { super(parent, viewer); this.subject = subject; @@ -46,7 +45,7 @@ public class RivalsFrame extends SCFrame { SCComponent add = new SCComponentImpl(lang("gui.rivals.add.title", getViewer()), null, XMaterial.RED_WOOL, 4); add.setListener(ClickType.LEFT, () -> InventoryDrawer.open(new AddRivalFrame(this, getViewer(), subject))); - add.setPermission(ClickType.LEFT, RankPermission.RIVAL_ADD); + add.setPermission(ClickType.LEFT, "unionsog.member.rival"); add(add); add(Components.getPreviousPageComponent(6, this::previousPage, paginator, getViewer())); @@ -55,15 +54,15 @@ public class RivalsFrame extends SCFrame { int slot = 9; for (int i = paginator.getMinIndex(); paginator.isValidIndex(i); i++) { - Clan clan = plugin.getClanManager().getClan(rivals.get(i)); - if (clan == null) + Union union = plugin.getUnionManager().getUnion(rivals.get(i)); + if (union == null) continue; SCComponent c = new SCComponentImpl( - lang("gui.clanlist.clan.title", getViewer(), clan.getColorTag(), clan.getName()), - Collections.singletonList(lang("gui.rivals.clan.lore", getViewer())), XMaterial.RED_BANNER, slot); + lang("gui.unionlist.union.title", getViewer(), union.getColorTag(), union.getName()), + Collections.singletonList(lang("gui.rivals.union.lore", getViewer())), XMaterial.RED_BANNER, slot); c.setListener(ClickType.RIGHT, - () -> InventoryController.runSubcommand(getViewer(), "rival remove", false, clan.getTag())); - c.setPermission(ClickType.RIGHT, RankPermission.RIVAL_REMOVE); + () -> InventoryController.runSubcommand(getViewer(), "rival remove", false, union.getTag())); + c.setPermission(ClickType.RIGHT, "unionsog.member.rival"); add(c); slot++; diff --git a/src/main/java/net/trueog/unionsog/ui/frames/RosterFrame.java b/src/main/java/net/trueog/unionsog/ui/frames/RosterFrame.java index a9397161..0ffdf03d 100644 --- a/src/main/java/net/trueog/unionsog/ui/frames/RosterFrame.java +++ b/src/main/java/net/trueog/unionsog/ui/frames/RosterFrame.java @@ -1,9 +1,8 @@ package net.trueog.unionsog.ui.frames; import com.cryptomorin.xseries.XMaterial; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; -import net.trueog.unionsog.RankPermission; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.ui.InventoryDrawer; import net.trueog.unionsog.ui.SCComponent; import net.trueog.unionsog.ui.SCComponentImpl; @@ -23,25 +22,24 @@ import static net.trueog.unionsog.UnionsOG.lang; public class RosterFrame extends SCFrame { - private final Clan subject; + private final Union subject; private final boolean staff; - private final List allMembers; + private final List allMembers; private final Paginator paginator; - public RosterFrame(Player viewer, SCFrame parent, Clan subject) { + public RosterFrame(Player viewer, SCFrame parent, Union subject) { this(viewer, parent, subject, false); } - public RosterFrame(Player viewer, SCFrame parent, Clan subject, boolean staff) { + public RosterFrame(Player viewer, SCFrame parent, Union subject, boolean staff) { super(parent, viewer); this.subject = subject; this.staff = staff; - allMembers = subject.getLeaders(); - allMembers.addAll(subject.getNonLeaders()); + allMembers = subject.getMembers(); paginator = new Paginator(getSize() - 9, allMembers.size()); } @@ -64,7 +62,7 @@ public class RosterFrame extends SCFrame { SCComponent invite = new SCComponentImpl(lang("gui.roster.invite.title", getViewer()), Collections.singletonList(lang("gui.roster.invite.lore", getViewer())), XMaterial.LIME_WOOL, 4); invite.setListener(ClickType.LEFT, () -> InventoryDrawer.open(new InviteFrame(this, getViewer()))); - invite.setPermission(ClickType.LEFT, RankPermission.INVITE); + invite.setPermission(ClickType.LEFT, "unionsog.member.invite"); add(invite); } else { @@ -79,7 +77,7 @@ public class RosterFrame extends SCFrame { int slot = 9; for (int i = paginator.getMinIndex(); paginator.isValidIndex(i); i++) { - ClanPlayer cp = allMembers.get(i); + UnionPlayer cp = allMembers.get(i); SCComponent playerComponent = Components.getPlayerComponent(this, getViewer(), cp, slot, true); if (staff) { diff --git a/src/main/java/net/trueog/unionsog/ui/frames/ClanDetailsFrame.java b/src/main/java/net/trueog/unionsog/ui/frames/UnionDetailsFrame.java similarity index 51% rename from src/main/java/net/trueog/unionsog/ui/frames/ClanDetailsFrame.java rename to src/main/java/net/trueog/unionsog/ui/frames/UnionDetailsFrame.java index f886fe45..a7acd2ed 100644 --- a/src/main/java/net/trueog/unionsog/ui/frames/ClanDetailsFrame.java +++ b/src/main/java/net/trueog/unionsog/ui/frames/UnionDetailsFrame.java @@ -1,10 +1,9 @@ package net.trueog.unionsog.ui.frames; import com.cryptomorin.xseries.XMaterial; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; -import net.trueog.unionsog.ClanPlayer.Channel; -import net.trueog.unionsog.RankPermission; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; +import net.trueog.unionsog.UnionPlayer.Channel; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.managers.SettingsManager; import net.trueog.unionsog.ui.*; @@ -23,20 +22,20 @@ import java.util.*; import static net.trueog.unionsog.UnionsOG.lang; import static net.trueog.unionsog.managers.SettingsManager.ConfigField.*; -public class ClanDetailsFrame extends SCFrame { +public class UnionDetailsFrame extends SCFrame { - private final Clan clan; - private final ClanPlayer cp; + private final Union union; + private final UnionPlayer cp; private final UnionsOG plugin; private final SettingsManager settings; - public ClanDetailsFrame(@Nullable SCFrame parent, @NotNull Player viewer, @NotNull Clan clan) { + public UnionDetailsFrame(@Nullable SCFrame parent, @NotNull Player viewer, @NotNull Union union) { super(parent, viewer); - this.clan = clan; + this.union = union; plugin = UnionsOG.getInstance(); settings = plugin.getSettingsManager(); - cp = plugin.getClanManager().getClanPlayer(getViewer()); + cp = plugin.getUnionManager().getUnionPlayer(getViewer()); } @@ -52,7 +51,7 @@ public class ClanDetailsFrame extends SCFrame { } add(Components.getBackComponent(getParent(), 4, getViewer())); - add(Components.getClanComponent(this, getViewer(), clan, 13, false)); + add(Components.getUnionComponent(this, getViewer(), union, 13, false)); addRoster(); addCoords(); @@ -65,7 +64,6 @@ public class ClanDetailsFrame extends SCFrame { // accounts exist; the bank commands it links to are unregistered until then. // addBank(); // TODO: end - addRank(); addResign(); addDisband(); addChat(); @@ -75,19 +73,19 @@ public class ClanDetailsFrame extends SCFrame { private void addChat() { Channel cpChannel = cp.getChannel(); - boolean clanEnabled = Channel.CLAN.equals(cpChannel); + boolean unionEnabled = Channel.UNION.equals(cpChannel); boolean allyEnabled = Channel.ALLY.equals(cpChannel); - SCComponent chat = createChatComponent(clanEnabled, allyEnabled); + SCComponent chat = createChatComponent(unionEnabled, allyEnabled); chat.setListener(ClickType.LEFT, () -> { - if (clanEnabled) { + if (unionEnabled) { cp.setChannel(Channel.NONE); } else { - cp.setChannel(Channel.CLAN); + cp.setChannel(Channel.UNION); } @@ -110,53 +108,45 @@ public class ClanDetailsFrame extends SCFrame { updateFrame(); }); - chat.setPermission(ClickType.RIGHT, RankPermission.ALLY_CHAT); + chat.setPermission(ClickType.RIGHT, "unionsog.member.ally"); add(chat); } @NotNull - private SCComponent createChatComponent(boolean clanEnabled, boolean allyEnabled) { + private SCComponent createChatComponent(boolean unionEnabled, boolean allyEnabled) { String joined = lang("chat.joined", getViewer()); String notJoined = lang("chat.not.joined", getViewer()); - String clanStatus = clanEnabled ? joined : notJoined; + String unionStatus = unionEnabled ? joined : notJoined; String allyStatus = allyEnabled ? joined : notJoined; - String chatCommand = settings.is(CLANCHAT_TAG_BASED) ? clan.getTag() : settings.getString(COMMANDS_CLAN_CHAT); + String chatCommand = settings.is(UNIONCHAT_TAG_BASED) ? union.getTag() + : settings.getString(COMMANDS_UNION_CHAT); String joinArg = lang("join", getViewer()); String leaveArg = lang("leave", getViewer()); - return new SCComponentImpl(lang("gui.clandetails.chat.title", getViewer()), - Arrays.asList(lang("gui.clandetails.chat.clan.chat.lore", getViewer(), chatCommand), - lang("gui.clandetails.chat.clan.join.leave.lore", getViewer(), chatCommand, joinArg, leaveArg), - lang("gui.clandetails.chat.ally.chat.lore", getViewer(), settings.getString(COMMANDS_ALLY)), - lang("gui.clandetails.chat.ally.join.leave.lore", getViewer(), + return new SCComponentImpl(lang("gui.uniondetails.chat.title", getViewer()), + Arrays.asList(lang("gui.uniondetails.chat.union.chat.lore", getViewer(), chatCommand), + lang("gui.uniondetails.chat.union.join.leave.lore", getViewer(), chatCommand, joinArg, + leaveArg), + lang("gui.uniondetails.chat.ally.chat.lore", getViewer(), settings.getString(COMMANDS_ALLY)), + lang("gui.uniondetails.chat.ally.join.leave.lore", getViewer(), settings.getString(COMMANDS_ALLY), joinArg, leaveArg), - lang("gui.clandetails.chat.clan.status.lore", getViewer(), clanStatus), - lang("gui.clandetails.chat.ally.status.lore", getViewer(), allyStatus), - lang("gui.clandetails.chat.clan.toggle.lore", getViewer()), - lang("gui.clandetails.chat.ally.toggle.lore", getViewer())), + lang("gui.uniondetails.chat.union.status.lore", getViewer(), unionStatus), + lang("gui.uniondetails.chat.ally.status.lore", getViewer(), allyStatus), + lang("gui.uniondetails.chat.union.toggle.lore", getViewer()), + lang("gui.uniondetails.chat.ally.toggle.lore", getViewer())), XMaterial.KNOWLEDGE_BOOK, 43); } - private void addRank() { - - SCComponent rank = new SCComponentImpl(lang("gui.clandetails.rank.title", getViewer()), - Collections.singletonList(lang("gui.clandetails.rank.lore", getViewer())), XMaterial.IRON_HELMET, 37); - rank.setListener(ClickType.LEFT, () -> InventoryDrawer.open(new RanksFrame(this, getViewer(), clan, null))); - rank.setPermission(ClickType.LEFT, "unionsog.leader.rank.list"); - add(rank); - - } - private void addDisband() { - SCComponent disband = new SCComponentImpl(lang("gui.clandetails.disband.title", getViewer()), - Collections.singletonList(lang("gui.clandetails.disband.lore", getViewer())), XMaterial.BARRIER, 50); + SCComponent disband = new SCComponentImpl(lang("gui.uniondetails.disband.title", getViewer()), + Collections.singletonList(lang("gui.uniondetails.disband.lore", getViewer())), XMaterial.BARRIER, 50); disband.setListener(ClickType.DROP, () -> InventoryController.runSubcommand(getViewer(), "disband", false)); - disband.setPermission(ClickType.DROP, "unionsog.leader.disband"); + disband.setPermission(ClickType.DROP, "unionsog.member.disband"); disband.setConfirmationRequired(ClickType.LEFT); add(disband); @@ -164,8 +154,8 @@ public class ClanDetailsFrame extends SCFrame { private void addResign() { - SCComponent resign = new SCComponentImpl(lang("gui.clandetails.resign.title", getViewer()), - Collections.singletonList(lang("gui.clandetails.resign.lore", getViewer())), XMaterial.IRON_DOOR, 48); + SCComponent resign = new SCComponentImpl(lang("gui.uniondetails.resign.title", getViewer()), + Collections.singletonList(lang("gui.uniondetails.resign.lore", getViewer())), XMaterial.IRON_DOOR, 48); resign.setListener(ClickType.LEFT, () -> InventoryController.runSubcommand(getViewer(), "resign", false)); resign.setConfirmationRequired(ClickType.LEFT); resign.setPermission(ClickType.LEFT, "unionsog.member.resign"); @@ -175,21 +165,21 @@ public class ClanDetailsFrame extends SCFrame { private void addBank() { - String withdrawStatus = clan.isAllowWithdraw() ? lang("allowed", getViewer()) : lang("blocked", getViewer()); - String depositStatus = clan.isAllowDeposit() ? lang("allowed", getViewer()) : lang("blocked", getViewer()); - SCComponent bank = new SCComponentImpl(lang("gui.clandetails.bank.title", getViewer()), - Arrays.asList(lang("gui.clandetails.bank.balance.lore", getViewer(), clan.getBalanceFormatted()), - lang("gui.clandetails.bank.withdraw.status.lore", getViewer(), withdrawStatus), - lang("gui.clandetails.bank.deposit.status.lore", getViewer(), depositStatus), - lang("gui.clandetails.bank.withdraw.toggle.lore", getViewer()), - lang("gui.clandetails.bank.deposit.toggle.lore", getViewer())), + String withdrawStatus = union.isAllowWithdraw() ? lang("allowed", getViewer()) : lang("blocked", getViewer()); + String depositStatus = union.isAllowDeposit() ? lang("allowed", getViewer()) : lang("blocked", getViewer()); + SCComponent bank = new SCComponentImpl(lang("gui.uniondetails.bank.title", getViewer()), + Arrays.asList(lang("gui.uniondetails.bank.balance.lore", getViewer(), union.getBalanceFormatted()), + lang("gui.uniondetails.bank.withdraw.status.lore", getViewer(), withdrawStatus), + lang("gui.uniondetails.bank.deposit.status.lore", getViewer(), depositStatus), + lang("gui.uniondetails.bank.withdraw.toggle.lore", getViewer()), + lang("gui.uniondetails.bank.deposit.toggle.lore", getViewer())), XMaterial.GOLD_INGOT, 34); - bank.setLorePermission(RankPermission.BANK_BALANCE); + bank.setLorePermission("unionsog.member.bank"); bank.setListener(ClickType.DROP, () -> InventoryController.runSubcommand(getViewer(), "toggle withdraw", true)); bank.setConfirmationRequired(ClickType.DROP); - bank.setPermission(ClickType.DROP, "unionsog.leader.withdraw-toggle"); + bank.setPermission(ClickType.DROP, "unionsog.member.withdraw-toggle"); bank.setListener(ClickType.RIGHT, () -> InventoryController.runSubcommand(getViewer(), "toggle deposit", true)); - bank.setPermission(ClickType.RIGHT, "unionsog.leader.deposit-toggle"); + bank.setPermission(ClickType.RIGHT, "unionsog.member.deposit-toggle"); add(bank); @@ -198,26 +188,26 @@ public class ClanDetailsFrame extends SCFrame { private void addFf() { String personalFf = cp.isFriendlyFire() ? lang("allowed", getViewer()) : lang("auto", getViewer()); - String clanFf = clan.isFriendlyFire() ? lang("allowed", getViewer()) : lang("blocked", getViewer()); - SCComponent ff = new SCComponentImpl(lang("gui.clandetails.ff.title", getViewer()), - Arrays.asList(lang("gui.clandetails.ff.personal.lore", getViewer(), personalFf), - lang("gui.clandetails.ff.clan.lore", getViewer(), clanFf), - lang("gui.clandetails.ff.personal.toggle.lore", getViewer()), - lang("gui.clandetails.ff.clan.toggle.lore", getViewer())), + String unionFf = union.isFriendlyFire() ? lang("allowed", getViewer()) : lang("blocked", getViewer()); + SCComponent ff = new SCComponentImpl(lang("gui.uniondetails.ff.title", getViewer()), + Arrays.asList(lang("gui.uniondetails.ff.personal.lore", getViewer(), personalFf), + lang("gui.uniondetails.ff.union.lore", getViewer(), unionFf), + lang("gui.uniondetails.ff.personal.toggle.lore", getViewer()), + lang("gui.uniondetails.ff.union.toggle.lore", getViewer())), XMaterial.GOLDEN_SWORD, 32); ff.setListener(ClickType.LEFT, this::togglePersonalFf); ff.setPermission(ClickType.LEFT, "unionsog.member.ff"); - ff.setListener(ClickType.RIGHT, this::toggleClanFf); - ff.setPermission(ClickType.RIGHT, RankPermission.FRIENDLYFIRE); + ff.setListener(ClickType.RIGHT, this::toggleUnionFf); + ff.setPermission(ClickType.RIGHT, "unionsog.member.union-ff"); add(ff); } - private void toggleClanFf() { + private void toggleUnionFf() { String arg; - if (clan.isFriendlyFire()) { + if (union.isFriendlyFire()) { arg = "block"; @@ -227,7 +217,7 @@ public class ClanDetailsFrame extends SCFrame { } - InventoryController.runSubcommand(getViewer(), "clanff", true, arg); + InventoryController.runSubcommand(getViewer(), "unionff", true, arg); } @@ -256,7 +246,7 @@ public class ClanDetailsFrame extends SCFrame { price = settings.getDouble(ECONOMY_REGROUP_PRICE); if (!settings.is(ECONOMY_UNIQUE_TAX_ON_REGROUP)) { - price = price * VanishUtils.getNonVanished(getViewer(), clan).size(); + price = price * VanishUtils.getNonVanished(getViewer(), union).size(); } @@ -264,20 +254,20 @@ public class ClanDetailsFrame extends SCFrame { List lore = new ArrayList<>(); if (price != 0) - lore.add( - lang("gui.clandetails.regroup.lore.price", getViewer(), CurrencyFormat.format(price, getViewer()))); - lore.add(lang("gui.clandetails.regroup.lore.home", getViewer())); - lore.add(lang("gui.clandetails.regroup.lore.me", getViewer())); + lore.add(lang("gui.uniondetails.regroup.lore.price", getViewer(), + CurrencyFormat.format(price, getViewer()))); + lore.add(lang("gui.uniondetails.regroup.lore.home", getViewer())); + lore.add(lang("gui.uniondetails.regroup.lore.me", getViewer())); - SCComponent regroup = new SCComponentImpl(lang("gui.clandetails.regroup.title", getViewer()), lore, + SCComponent regroup = new SCComponentImpl(lang("gui.uniondetails.regroup.title", getViewer()), lore, XMaterial.BEACON, 30); regroup.setListener(ClickType.LEFT, () -> InventoryController.runSubcommand(getViewer(), "regroup home", false)); regroup.setConfirmationRequired(ClickType.LEFT); - regroup.setPermission(ClickType.LEFT, RankPermission.REGROUP_HOME); + regroup.setPermission(ClickType.LEFT, "unionsog.member.regroup.home"); regroup.setListener(ClickType.RIGHT, () -> InventoryController.runSubcommand(getViewer(), "regroup me", false)); regroup.setConfirmationRequired(ClickType.RIGHT); - regroup.setPermission(ClickType.RIGHT, RankPermission.REGROUP_ME); + regroup.setPermission(ClickType.RIGHT, "unionsog.member.regroup.me"); add(regroup); } @@ -292,24 +282,24 @@ public class ClanDetailsFrame extends SCFrame { List lore = new ArrayList<>(); if (homePrice != 0) - lore.add(lang("gui.clandetails.home.lore.teleport.price", getViewer(), + lore.add(lang("gui.uniondetails.home.lore.teleport.price", getViewer(), CurrencyFormat.format(homePrice, getViewer()))); - lore.add(lang("gui.clandetails.home.lore.teleport", getViewer())); + lore.add(lang("gui.uniondetails.home.lore.teleport", getViewer())); if (setPrice != 0) - lore.add(lang("gui.clandetails.home.lore.set.price", getViewer(), + lore.add(lang("gui.uniondetails.home.lore.set.price", getViewer(), CurrencyFormat.format(setPrice, getViewer()))); - lore.add(lang("gui.clandetails.home.lore.set", getViewer())); - lore.add(lang("gui.clandetails.home.lore.clear", getViewer())); + lore.add(lang("gui.uniondetails.home.lore.set", getViewer())); + lore.add(lang("gui.uniondetails.home.lore.clear", getViewer())); - SCComponent home = new SCComponentImpl(lang("gui.clandetails.home.title", getViewer()), lore, + SCComponent home = new SCComponentImpl(lang("gui.uniondetails.home.title", getViewer()), lore, Objects.requireNonNull(XMaterial.MAGENTA_BED.parseMaterial()), 28); home.setListener(ClickType.LEFT, () -> InventoryController.runSubcommand(getViewer(), "home", false)); - home.setPermission(ClickType.LEFT, RankPermission.HOME_TP); + home.setPermission(ClickType.LEFT, "unionsog.member.home"); home.setListener(ClickType.RIGHT, () -> InventoryController.runSubcommand(getViewer(), "home set", false)); - home.setPermission(ClickType.RIGHT, RankPermission.HOME_SET); + home.setPermission(ClickType.RIGHT, "unionsog.member.home-set"); home.setConfirmationRequired(ClickType.RIGHT); home.setListener(ClickType.DROP, () -> InventoryController.runSubcommand(getViewer(), "home clear", false)); - home.setPermission(ClickType.DROP, RankPermission.HOME_SET); + home.setPermission(ClickType.DROP, "unionsog.member.home-set"); home.setConfirmationRequired(ClickType.DROP); add(home); @@ -317,9 +307,10 @@ public class ClanDetailsFrame extends SCFrame { private void addRoster() { - SCComponent roster = new SCComponentImpl(lang("gui.clandetails.roster.title", getViewer()), - Collections.singletonList(lang("gui.clandetails.roster.lore", getViewer())), XMaterial.PLAYER_HEAD, 19); - List members = clan.getMembers(); + SCComponent roster = new SCComponentImpl(lang("gui.uniondetails.roster.title", getViewer()), + Collections.singletonList(lang("gui.uniondetails.roster.lore", getViewer())), XMaterial.PLAYER_HEAD, + 19); + List members = union.getMembers(); if (members.size() != 0) { OfflinePlayer offlinePlayer = Bukkit @@ -328,7 +319,7 @@ public class ClanDetailsFrame extends SCFrame { } - roster.setListener(ClickType.LEFT, () -> InventoryDrawer.open(new RosterFrame(getViewer(), this, clan))); + roster.setListener(ClickType.LEFT, () -> InventoryDrawer.open(new RosterFrame(getViewer(), this, union))); roster.setPermission(ClickType.LEFT, "unionsog.member.roster"); add(roster); @@ -336,19 +327,20 @@ public class ClanDetailsFrame extends SCFrame { private void addCoords() { - SCComponent coords = new SCComponentImpl(lang("gui.clandetails.coords.title", getViewer()), - Collections.singletonList(lang("gui.clandetails.coords.lore", getViewer())), XMaterial.COMPASS, 21); - coords.setListener(ClickType.LEFT, () -> InventoryDrawer.open(new CoordsFrame(getViewer(), this, clan))); - coords.setPermission(ClickType.LEFT, RankPermission.COORDS); + SCComponent coords = new SCComponentImpl(lang("gui.uniondetails.coords.title", getViewer()), + Collections.singletonList(lang("gui.uniondetails.coords.lore", getViewer())), XMaterial.COMPASS, 21); + coords.setListener(ClickType.LEFT, () -> InventoryDrawer.open(new CoordsFrame(getViewer(), this, union))); + coords.setPermission(ClickType.LEFT, "unionsog.member.coords"); add(coords); } private void addAllies() { - SCComponent allies = new SCComponentImpl(lang("gui.clandetails.allies.title", getViewer()), - Collections.singletonList(lang("gui.clandetails.allies.lore", getViewer())), XMaterial.CYAN_BANNER, 23); - allies.setListener(ClickType.LEFT, () -> InventoryDrawer.open(new AlliesFrame(getViewer(), this, clan))); + SCComponent allies = new SCComponentImpl(lang("gui.uniondetails.allies.title", getViewer()), + Collections.singletonList(lang("gui.uniondetails.allies.lore", getViewer())), XMaterial.CYAN_BANNER, + 23); + allies.setListener(ClickType.LEFT, () -> InventoryDrawer.open(new AlliesFrame(getViewer(), this, union))); allies.setPermission(ClickType.LEFT, "unionsog.anyone.alliances"); add(allies); @@ -356,9 +348,9 @@ public class ClanDetailsFrame extends SCFrame { private void addRivals() { - SCComponent rivals = new SCComponentImpl(lang("gui.clandetails.rivals.title", getViewer()), - Collections.singletonList(lang("gui.clandetails.rivals.lore", getViewer())), XMaterial.RED_BANNER, 25); - rivals.setListener(ClickType.LEFT, () -> InventoryDrawer.open(new RivalsFrame(getViewer(), this, clan))); + SCComponent rivals = new SCComponentImpl(lang("gui.uniondetails.rivals.title", getViewer()), + Collections.singletonList(lang("gui.uniondetails.rivals.lore", getViewer())), XMaterial.RED_BANNER, 25); + rivals.setListener(ClickType.LEFT, () -> InventoryDrawer.open(new RivalsFrame(getViewer(), this, union))); rivals.setPermission(ClickType.LEFT, "unionsog.anyone.rivalries"); add(rivals); @@ -373,7 +365,7 @@ public class ClanDetailsFrame extends SCFrame { @Override public @NotNull String getTitle() { - return lang("gui.clandetails.title", getViewer(), ChatUtils.stripColors(clan.getColorTag()), clan.getName()); + return lang("gui.uniondetails.title", getViewer(), ChatUtils.stripColors(union.getColorTag()), union.getName()); } diff --git a/src/main/java/net/trueog/unionsog/ui/frames/ClanListFrame.java b/src/main/java/net/trueog/unionsog/ui/frames/UnionListFrame.java similarity index 65% rename from src/main/java/net/trueog/unionsog/ui/frames/ClanListFrame.java rename to src/main/java/net/trueog/unionsog/ui/frames/UnionListFrame.java index 1edf4a0a..71113f21 100644 --- a/src/main/java/net/trueog/unionsog/ui/frames/ClanListFrame.java +++ b/src/main/java/net/trueog/unionsog/ui/frames/UnionListFrame.java @@ -1,7 +1,7 @@ package net.trueog.unionsog.ui.frames; import com.cryptomorin.xseries.XMaterial; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.managers.SettingsManager; import net.trueog.unionsog.ui.InventoryDrawer; @@ -21,22 +21,22 @@ import java.util.List; import static net.trueog.unionsog.UnionsOG.lang; -public class ClanListFrame extends SCFrame { +public class UnionListFrame extends SCFrame { - private final List clans; + private final List unions; private final Paginator paginator; - private final RankingNumberResolver rankingResolver; + private final RankingNumberResolver rankingResolver; - public ClanListFrame(SCFrame parent, Player viewer) { + public UnionListFrame(SCFrame parent, Player viewer) { super(parent, viewer); UnionsOG plugin = UnionsOG.getInstance(); SettingsManager sm = plugin.getSettingsManager(); - clans = plugin.getClanManager().getClans(); - paginator = new Paginator(getSize() - 9, clans); - plugin.getClanManager().sortClansByKDR(clans); + unions = plugin.getUnionManager().getUnions(); + paginator = new Paginator(getSize() - 9, unions); + plugin.getUnionManager().sortUnionsByKDR(unions); - rankingResolver = new RankingNumberResolver<>(clans, c -> KDRFormat.toBigDecimal(c.getTotalKDR()), false, + rankingResolver = new RankingNumberResolver<>(unions, c -> KDRFormat.toBigDecimal(c.getTotalKDR()), false, sm.getRankingType()); } @@ -60,15 +60,15 @@ public class ClanListFrame extends SCFrame { int slot = 9; for (int i = paginator.getMinIndex(); paginator.isValidIndex(i); i++) { - Clan clan = clans.get(i); - ItemStack banner = clan.getBanner() != null ? clan.getBanner() : XMaterial.BLACK_BANNER.parseItem(); + Union union = unions.get(i); + ItemStack banner = union.getBanner() != null ? union.getBanner() : XMaterial.BLACK_BANNER.parseItem(); SCComponent c = new SCComponentImpl( - lang("gui.clanlist.clan.title", getViewer(), clan.getColorTag(), clan.getName()), + lang("gui.unionlist.union.title", getViewer(), union.getColorTag(), union.getName()), Arrays.asList( - lang("gui.clanlist.clan.lore.position", getViewer(), - rankingResolver.getRankingNumber(clan)), - lang("gui.clanlist.clan.lore.kdr", getViewer(), KDRFormat.format(clan.getTotalKDR())), - lang("gui.clanlist.clan.lore.members", getViewer(), clan.getMembers().size())), + lang("gui.unionlist.union.lore.position", getViewer(), + rankingResolver.getRankingNumber(union)), + lang("gui.unionlist.union.lore.kdr", getViewer(), KDRFormat.format(union.getTotalKDR())), + lang("gui.unionlist.union.lore.members", getViewer(), union.getMembers().size())), banner, slot); c.setLorePermission("unionsog.anyone.list"); add(c); @@ -107,7 +107,7 @@ public class ClanListFrame extends SCFrame { @Override public @NotNull String getTitle() { - return lang("gui.clanlist.title", getViewer(), clans.size()); + return lang("gui.unionlist.title", getViewer(), unions.size()); } diff --git a/src/main/java/net/trueog/unionsog/ui/frames/WarningFrame.java b/src/main/java/net/trueog/unionsog/ui/frames/WarningFrame.java index f45e59ca..eb11bb50 100644 --- a/src/main/java/net/trueog/unionsog/ui/frames/WarningFrame.java +++ b/src/main/java/net/trueog/unionsog/ui/frames/WarningFrame.java @@ -1,10 +1,6 @@ package net.trueog.unionsog.ui.frames; import com.cryptomorin.xseries.XMaterial; -import net.trueog.unionsog.ClanPlayer; -import net.trueog.unionsog.PermissionLevel; -import net.trueog.unionsog.RankPermission; -import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.ui.SCComponent; import net.trueog.unionsog.ui.SCComponentImpl; import net.trueog.unionsog.ui.SCFrame; @@ -18,10 +14,9 @@ import static net.trueog.unionsog.UnionsOG.lang; public class WarningFrame extends SCFrame { - private final UnionsOG plugin = UnionsOG.getInstance(); - private final Object permission; + private final String permission; - public WarningFrame(@NotNull SCFrame parent, @NotNull Player viewer, @NotNull Object permission) { + public WarningFrame(@NotNull SCFrame parent, @NotNull Player viewer, @NotNull String permission) { super(parent, viewer); this.permission = permission; @@ -45,28 +40,10 @@ public class WarningFrame extends SCFrame { } - private void addNoPermissionComponent(Object permission, int slot) { + private void addNoPermissionComponent(String permission, int slot) { - List lore; - if (permission instanceof String) { - - lore = Collections.singletonList(lang("gui.warning.no.permission.plugin.lore", getViewer())); - ClanPlayer cp = plugin.getClanManager().getAnyClanPlayer(getViewer().getUniqueId()); - if (((String) permission).contains("unionsog.leader") && !cp.isLeader()) { - - lore = Collections.singletonList(lang("gui.warning.no.permission.leader.lore", getViewer())); - - } - - } else { - - RankPermission p = (RankPermission) permission; - String level = p.getPermissionLevel() == PermissionLevel.LEADER ? lang("leader", getViewer()) - : lang("trusted", getViewer()); - lore = Collections - .singletonList(lang("gui.warning.no.permission.rank.lore", getViewer(), level, p.toString())); - - } + List lore = Collections + .singletonList(lang("gui.warning.no.permission.plugin.lore", getViewer(), permission)); SCComponent perm = new SCComponentImpl(lang("gui.warning.no.permission.title", getViewer()), lore, XMaterial.BARRIER, slot); diff --git a/src/main/java/net/trueog/unionsog/ui/frames/staff/PlayerDetailsFrame.java b/src/main/java/net/trueog/unionsog/ui/frames/staff/PlayerDetailsFrame.java index f07000b5..8ee38418 100644 --- a/src/main/java/net/trueog/unionsog/ui/frames/staff/PlayerDetailsFrame.java +++ b/src/main/java/net/trueog/unionsog/ui/frames/staff/PlayerDetailsFrame.java @@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull; import java.util.Arrays; import static net.trueog.unionsog.UnionsOG.lang; -import static net.trueog.unionsog.ui.frames.staff.ClanListFrame.Type; +import static net.trueog.unionsog.ui.frames.staff.UnionListFrame.Type; public class PlayerDetailsFrame extends SCFrame { @@ -23,7 +23,7 @@ public class PlayerDetailsFrame extends SCFrame { super(parent, viewer); this.subject = subject; - subjectName = UnionsOG.getInstance().getClanManager().getCreateClanPlayer(subject.getUniqueId()).getName(); + subjectName = UnionsOG.getInstance().getUnionManager().getCreateUnionPlayer(subject.getUniqueId()).getName(); } @@ -45,25 +45,6 @@ public class PlayerDetailsFrame extends SCFrame { addPlace(); addResetKDR(); addPurge(); - addPromoteDemote(); - - } - - private void addPromoteDemote() { - - SCComponent promoteDemote = new SCComponentImpl(lang("gui.playerdetails.promote.demote.title", getViewer()), - Arrays.asList(lang("gui.playerdetails.promote.lore.left.click", getViewer()), - lang("gui.playerdetails.demote.lore.right.click", getViewer())), - XMaterial.GUNPOWDER, 28); - promoteDemote.setConfirmationRequired(ClickType.LEFT); - promoteDemote.setListener(ClickType.LEFT, - () -> InventoryController.runSubcommand(getViewer(), "admin promote", true, subjectName)); - promoteDemote.setPermission(ClickType.LEFT, "unionsog.admin.promote"); - promoteDemote.setListener(ClickType.RIGHT, - () -> InventoryController.runSubcommand(getViewer(), "admin demote", true, subjectName)); - promoteDemote.setConfirmationRequired(ClickType.RIGHT); - add(promoteDemote); - promoteDemote.setPermission(ClickType.RIGHT, "unionsog.admin.demote"); } @@ -100,7 +81,7 @@ public class PlayerDetailsFrame extends SCFrame { .withLoreLine(lang("gui.playerdetails.place.lore", getViewer())).build(); place.setPermission(ClickType.LEFT, "unionsog.mod.place"); place.setListener(ClickType.LEFT, - () -> InventoryDrawer.open(new ClanListFrame(this, getViewer(), Type.PLACE, subject))); + () -> InventoryDrawer.open(new UnionListFrame(this, getViewer(), Type.PLACE, subject))); add(place); } diff --git a/src/main/java/net/trueog/unionsog/ui/frames/staff/PlayerListFrame.java b/src/main/java/net/trueog/unionsog/ui/frames/staff/PlayerListFrame.java index 6283a388..e49f4f4a 100644 --- a/src/main/java/net/trueog/unionsog/ui/frames/staff/PlayerListFrame.java +++ b/src/main/java/net/trueog/unionsog/ui/frames/staff/PlayerListFrame.java @@ -75,7 +75,7 @@ public class PlayerListFrame extends SCFrame { } else { players = Stream - .concat(UnionsOG.getInstance().getClanManager().getAllClanPlayers().stream() + .concat(UnionsOG.getInstance().getUnionManager().getAllUnionPlayers().stream() .map(cp -> Bukkit.getOfflinePlayer(cp.getUniqueId())), Bukkit.getOnlinePlayers().stream()) .distinct().collect(Collectors.toList()); diff --git a/src/main/java/net/trueog/unionsog/ui/frames/staff/StaffFrame.java b/src/main/java/net/trueog/unionsog/ui/frames/staff/StaffFrame.java index c8ce3ae1..ed631c41 100644 --- a/src/main/java/net/trueog/unionsog/ui/frames/staff/StaffFrame.java +++ b/src/main/java/net/trueog/unionsog/ui/frames/staff/StaffFrame.java @@ -12,7 +12,7 @@ import org.jetbrains.annotations.Nullable; import static net.trueog.unionsog.UnionsOG.lang; import static net.trueog.unionsog.managers.SettingsManager.ConfigField.GLOBAL_FRIENDLY_FIRE; -import static net.trueog.unionsog.ui.frames.staff.ClanListFrame.Type; +import static net.trueog.unionsog.ui.frames.staff.UnionListFrame.Type; public class StaffFrame extends SCFrame { @@ -48,21 +48,21 @@ public class StaffFrame extends SCFrame { } add(Components.getBackComponent(getParent(), 4, getViewer())); - addClans(); + addUnions(); addPlayers(); addGlobalFf(); addReload(); } - private void addClans() { + private void addUnions() { - SCComponent clanList = new SCComponentImpl.Builder(XMaterial.PURPLE_BANNER) - .withDisplayName(lang("gui.main.clan.list.title", getViewer())).withSlot(9) - .withLoreLine(lang("gui.staff.clan.list.lore.left.click", getViewer())).build(); - clanList.setListener(ClickType.LEFT, - () -> InventoryDrawer.open(new ClanListFrame(this, getViewer(), Type.ALL, null))); - add(clanList); + SCComponent unionList = new SCComponentImpl.Builder(XMaterial.PURPLE_BANNER) + .withDisplayName(lang("gui.main.union.list.title", getViewer())).withSlot(9) + .withLoreLine(lang("gui.staff.union.list.lore.left.click", getViewer())).build(); + unionList.setListener(ClickType.LEFT, + () -> InventoryDrawer.open(new UnionListFrame(this, getViewer(), Type.ALL, null))); + add(unionList); } diff --git a/src/main/java/net/trueog/unionsog/ui/frames/staff/ClanDetailsFrame.java b/src/main/java/net/trueog/unionsog/ui/frames/staff/UnionDetailsFrame.java similarity index 62% rename from src/main/java/net/trueog/unionsog/ui/frames/staff/ClanDetailsFrame.java rename to src/main/java/net/trueog/unionsog/ui/frames/staff/UnionDetailsFrame.java index d2c8330d..7bb59507 100644 --- a/src/main/java/net/trueog/unionsog/ui/frames/staff/ClanDetailsFrame.java +++ b/src/main/java/net/trueog/unionsog/ui/frames/staff/UnionDetailsFrame.java @@ -1,8 +1,8 @@ package net.trueog.unionsog.ui.frames.staff; import com.cryptomorin.xseries.XMaterial; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.ui.*; import net.trueog.unionsog.ui.frames.Components; import net.trueog.unionsog.ui.frames.RosterFrame; @@ -21,14 +21,14 @@ import java.util.Objects; import static net.trueog.unionsog.UnionsOG.lang; -public class ClanDetailsFrame extends SCFrame { +public class UnionDetailsFrame extends SCFrame { - private final Clan clan; + private final Union union; - public ClanDetailsFrame(@Nullable SCFrame parent, @NotNull Player viewer, @NotNull Clan clan) { + public UnionDetailsFrame(@Nullable SCFrame parent, @NotNull Player viewer, @NotNull Union union) { super(parent, viewer); - this.clan = clan; + this.union = union; } @@ -44,7 +44,7 @@ public class ClanDetailsFrame extends SCFrame { } add(Components.getBackComponent(getParent(), 4, getViewer())); - add(Components.getClanComponent(this, getViewer(), clan, 13, false)); + add(Components.getUnionComponent(this, getViewer(), union, 13, false)); addRoster(); addHome(); @@ -58,11 +58,11 @@ public class ClanDetailsFrame extends SCFrame { private void addDisband() { - SCComponent disband = new SCComponentImpl(lang("gui.clandetails.disband.title", getViewer()), - Collections.singletonList(lang("gui.staffclandetails.disband.lore", getViewer())), XMaterial.BARRIER, + SCComponent disband = new SCComponentImpl(lang("gui.uniondetails.disband.title", getViewer()), + Collections.singletonList(lang("gui.staffuniondetails.disband.lore", getViewer())), XMaterial.BARRIER, 34); disband.setListener(ClickType.LEFT, - () -> InventoryController.runSubcommand(getViewer(), "mod disband", false, clan.getTag())); + () -> InventoryController.runSubcommand(getViewer(), "mod disband", false, union.getTag())); disband.setConfirmationRequired(ClickType.LEFT); disband.setPermission(ClickType.LEFT, "unionsog.mod.disband"); add(disband); @@ -72,16 +72,16 @@ public class ClanDetailsFrame extends SCFrame { private void addHome() { List lore = new ArrayList<>(); - lore.add(lang("gui.staffclandetails.home.lore.teleport", getViewer())); - lore.add(lang("gui.staffclandetails.home.lore.set", getViewer())); + lore.add(lang("gui.staffuniondetails.home.lore.teleport", getViewer())); + lore.add(lang("gui.staffuniondetails.home.lore.set", getViewer())); - SCComponent home = new SCComponentImpl(lang("gui.clandetails.home.title", getViewer()), lore, + SCComponent home = new SCComponentImpl(lang("gui.uniondetails.home.title", getViewer()), lore, Objects.requireNonNull(XMaterial.MAGENTA_BED.parseMaterial()), 30); home.setListener(ClickType.LEFT, - () -> InventoryController.runSubcommand(getViewer(), "mod home tp", false, clan.getTag())); + () -> InventoryController.runSubcommand(getViewer(), "mod home tp", false, union.getTag())); home.setPermission(ClickType.LEFT, "unionsog.mod.hometp"); home.setListener(ClickType.RIGHT, - () -> InventoryController.runSubcommand(getViewer(), "mod home set", false, clan.getTag())); + () -> InventoryController.runSubcommand(getViewer(), "mod home set", false, union.getTag())); home.setPermission(ClickType.RIGHT, "unionsog.mod.home"); home.setConfirmationRequired(ClickType.RIGHT); add(home); @@ -90,11 +90,11 @@ public class ClanDetailsFrame extends SCFrame { private void addRoster() { - SCComponent roster = new SCComponentImpl(lang("gui.clandetails.roster.title", getViewer()), - Collections.singletonList(lang("gui.staffclandetails.roster.lore", getViewer())), XMaterial.PLAYER_HEAD, - 28); + SCComponent roster = new SCComponentImpl(lang("gui.uniondetails.roster.title", getViewer()), + Collections.singletonList(lang("gui.staffuniondetails.roster.lore", getViewer())), + XMaterial.PLAYER_HEAD, 28); - List members = clan.getMembers(); + List members = union.getMembers(); if (members.size() != 0) { OfflinePlayer offlinePlayer = Bukkit @@ -103,7 +103,7 @@ public class ClanDetailsFrame extends SCFrame { } - roster.setListener(ClickType.LEFT, () -> InventoryDrawer.open(new RosterFrame(getViewer(), this, clan, true))); + roster.setListener(ClickType.LEFT, () -> InventoryDrawer.open(new RosterFrame(getViewer(), this, union, true))); add(roster); } @@ -111,9 +111,9 @@ public class ClanDetailsFrame extends SCFrame { private void addBank() { List lore = Collections - .singletonList(lang("gui.clandetails.bank.balance.lore", getViewer(), clan.getBalanceFormatted())); + .singletonList(lang("gui.uniondetails.bank.balance.lore", getViewer(), union.getBalanceFormatted())); - SCComponent bank = new SCComponentImpl(lang("gui.clandetails.bank.title", getViewer()), lore, + SCComponent bank = new SCComponentImpl(lang("gui.uniondetails.bank.title", getViewer()), lore, XMaterial.GOLD_INGOT, 40); add(bank); @@ -122,7 +122,7 @@ public class ClanDetailsFrame extends SCFrame { @Override public @NotNull String getTitle() { - return lang("gui.clandetails.title", getViewer(), ChatUtils.stripColors(clan.getColorTag()), clan.getName()); + return lang("gui.uniondetails.title", getViewer(), ChatUtils.stripColors(union.getColorTag()), union.getName()); } diff --git a/src/main/java/net/trueog/unionsog/ui/frames/staff/ClanListFrame.java b/src/main/java/net/trueog/unionsog/ui/frames/staff/UnionListFrame.java similarity index 75% rename from src/main/java/net/trueog/unionsog/ui/frames/staff/ClanListFrame.java rename to src/main/java/net/trueog/unionsog/ui/frames/staff/UnionListFrame.java index 5926033f..2c201eb3 100644 --- a/src/main/java/net/trueog/unionsog/ui/frames/staff/ClanListFrame.java +++ b/src/main/java/net/trueog/unionsog/ui/frames/staff/UnionListFrame.java @@ -1,6 +1,6 @@ package net.trueog.unionsog.ui.frames.staff; -import net.trueog.unionsog.Clan; +import net.trueog.unionsog.Union; import net.trueog.unionsog.UnionsOG; import net.trueog.unionsog.ui.InventoryController; import net.trueog.unionsog.ui.InventoryDrawer; @@ -18,14 +18,14 @@ import java.util.List; import static net.trueog.unionsog.UnionsOG.lang; -public class ClanListFrame extends SCFrame { +public class UnionListFrame extends SCFrame { private final Type type; private final @Nullable OfflinePlayer toPlace; - private List clans; + private List unions; private final Paginator paginator; - public ClanListFrame(@Nullable SCFrame parent, @NotNull Player viewer, @NotNull Type type, + public UnionListFrame(@Nullable SCFrame parent, @NotNull Player viewer, @NotNull Type type, @Nullable OfflinePlayer toPlace) { @@ -33,9 +33,9 @@ public class ClanListFrame extends SCFrame { this.type = type; this.toPlace = toPlace; UnionsOG plugin = UnionsOG.getInstance(); - clans = plugin.getClanManager().getClans(); - paginator = new Paginator(getSize() - 9, clans); - plugin.getClanManager().sortClansByName(clans, true); + unions = plugin.getUnionManager().getUnions(); + paginator = new Paginator(getSize() - 9, unions); + plugin.getUnionManager().sortUnionsByName(unions, true); } @@ -58,19 +58,19 @@ public class ClanListFrame extends SCFrame { int slot = 9; for (int i = paginator.getMinIndex(); paginator.isValidIndex(i); i++) { - Clan clan = clans.get(i); - SCComponent c = Components.getClanComponent(this, getViewer(), clan, slot, false); + Union union = unions.get(i); + SCComponent c = Components.getUnionComponent(this, getViewer(), union, slot, false); if (type != Type.PLACE) { c.setListener(ClickType.LEFT, - () -> InventoryDrawer.open(new ClanDetailsFrame(this, getViewer(), clan))); + () -> InventoryDrawer.open(new UnionDetailsFrame(this, getViewer(), union))); } else { if (toPlace != null) { c.setListener(ClickType.LEFT, () -> InventoryController.runSubcommand(getViewer(), "mod place", - false, toPlace.getName(), clan.getTag())); + false, toPlace.getName(), union.getTag())); c.setConfirmationRequired(ClickType.LEFT); c.setPermission(ClickType.LEFT, "unionsog.mod.place"); @@ -116,11 +116,11 @@ public class ClanListFrame extends SCFrame { if (type == Type.PLACE && toPlace != null) { - return lang("gui.staff.clanlist.toplace.title", getViewer(), toPlace.getName()); + return lang("gui.staff.unionlist.toplace.title", getViewer(), toPlace.getName()); } - return lang("gui.clanlist.title", getViewer(), clans.size()); + return lang("gui.unionlist.title", getViewer(), unions.size()); } diff --git a/src/main/java/net/trueog/unionsog/utils/TagValidator.java b/src/main/java/net/trueog/unionsog/utils/TagValidator.java index 24bc2d54..1530fa5e 100644 --- a/src/main/java/net/trueog/unionsog/utils/TagValidator.java +++ b/src/main/java/net/trueog/unionsog/utils/TagValidator.java @@ -37,10 +37,10 @@ public class TagValidator { } /** - * Validates a clan tag + * Validates a union tag * - * @param player player who tried to create a clan - * @param tag clan tag + * @param player player who tried to create a union + * @param tag union tag * @return error message if any */ public Optional validate(@NotNull Player player, @NotNull String tag) { @@ -50,10 +50,10 @@ public class TagValidator { } /** - * Validates a clan tag + * Validates a union tag * - * @param player player who tried to create or modify a clan tag - * @param tag clan tag + * @param player player who tried to create or modify a union tag + * @param tag union tag * @param allowColors whether the tag may contain color codes * @return error message if any */ @@ -63,7 +63,7 @@ public class TagValidator { String cleanTag = Helper.cleanTag(tag); if (tag.length() > 255 && settings.is(MYSQL_ENABLE)) { - return Optional.of(lang("your.clan.color.tag.cannot.be.longer.than.characters", player, 255)); + return Optional.of(lang("your.union.color.tag.cannot.be.longer.than.characters", player, 255)); } @@ -84,14 +84,14 @@ public class TagValidator { int minLength = settings.getInt(TAG_MIN_LENGTH); if (cleanTag.length() < minLength) { - error = lang("your.clan.tag.must.be.longer.than.characters", player, minLength); + error = lang("your.union.tag.must.be.longer.than.characters", player, minLength); } int maxLength = settings.getInt(TAG_MAX_LENGTH); if (cleanTag.length() > maxLength) { - error = lang("your.clan.tag.cannot.be.longer.than.characters", player, maxLength); + error = lang("your.union.tag.cannot.be.longer.than.characters", player, maxLength); } @@ -120,7 +120,7 @@ public class TagValidator { private void checkAlphabet(@NotNull Player player, @NotNull String cleanTag) { - String alphabetError = lang("your.clan.tag.can.only.contain.letters.numbers.and.color.codes", player); + String alphabetError = lang("your.union.tag.can.only.contain.letters.numbers.and.color.codes", player); if (settings.is(ACCEPT_OTHER_ALPHABETS_LETTERS)) { for (char c : cleanTag.toCharArray()) { diff --git a/src/main/java/net/trueog/unionsog/utils/VanishUtils.java b/src/main/java/net/trueog/unionsog/utils/VanishUtils.java index 7f13e7b9..938b5d05 100644 --- a/src/main/java/net/trueog/unionsog/utils/VanishUtils.java +++ b/src/main/java/net/trueog/unionsog/utils/VanishUtils.java @@ -1,7 +1,7 @@ package net.trueog.unionsog.utils; -import net.trueog.unionsog.Clan; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.Union; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -17,18 +17,18 @@ public class VanishUtils { } - public static @NotNull List getNonVanished(@Nullable CommandSender viewer, @NotNull Clan clan) { + public static @NotNull List getNonVanished(@Nullable CommandSender viewer, @NotNull Union union) { - return getNonVanished(viewer, clan.getMembers()); + return getNonVanished(viewer, union.getMembers()); } - public static @NotNull List getNonVanished(@Nullable CommandSender viewer, - @NotNull List clanPlayers) + public static @NotNull List getNonVanished(@Nullable CommandSender viewer, + @NotNull List unionPlayers) { - ArrayList nonVanished = new ArrayList<>(); - for (ClanPlayer cp : clanPlayers) { + ArrayList nonVanished = new ArrayList<>(); + for (UnionPlayer cp : unionPlayers) { if (!isVanished(viewer, cp)) { @@ -42,7 +42,7 @@ public class VanishUtils { } - public static boolean isVanished(@Nullable CommandSender viewer, @NotNull ClanPlayer cp) { + public static boolean isVanished(@Nullable CommandSender viewer, @NotNull UnionPlayer cp) { if (isVanished(cp)) { @@ -73,7 +73,7 @@ public class VanishUtils { } - public static boolean isVanished(@NotNull ClanPlayer cp) { + public static boolean isVanished(@NotNull UnionPlayer cp) { if (!isOnline(cp)) { @@ -98,7 +98,7 @@ public class VanishUtils { } - public static boolean isOnline(@NotNull ClanPlayer player) { + public static boolean isOnline(@NotNull UnionPlayer player) { return UnionsOG.getInstance().getProxyManager().isOnline(player.getName()); diff --git a/src/main/java/net/trueog/unionsog/uuid/UUIDFetcher.java b/src/main/java/net/trueog/unionsog/uuid/UUIDFetcher.java index 4fe384e6..9f4c6e2e 100644 --- a/src/main/java/net/trueog/unionsog/uuid/UUIDFetcher.java +++ b/src/main/java/net/trueog/unionsog/uuid/UUIDFetcher.java @@ -3,7 +3,7 @@ package net.trueog.unionsog.uuid; import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -41,20 +41,20 @@ public final class UUIDFetcher { } /** - * Fetches UUIDs for a list of ClanPlayer objects. This method extracts the - * names from the ClanPlayer objects and fetches their corresponding UUIDs. + * Fetches UUIDs for a list of UnionPlayer objects. This method extracts the + * names from the UnionPlayer objects and fetches their corresponding UUIDs. * - * @param clanPlayers A list of ClanPlayer objects for which to fetch UUIDs + * @param unionPlayers A list of UnionPlayer objects for which to fetch UUIDs * @return A Map where the keys are player names and the values are their * corresponding UUIDs * @throws InterruptedException If the operation is interrupted while waiting * @throws ExecutionException If the computation threw an exception */ - public static Map fetchUUIDsForClanPlayers(List clanPlayers) + public static Map fetchUUIDsForUnionPlayers(List unionPlayers) throws InterruptedException, ExecutionException { - List names = clanPlayers.stream().map(ClanPlayer::getName).collect(Collectors.toList()); + List names = unionPlayers.stream().map(UnionPlayer::getName).collect(Collectors.toList()); return fetchUUIDsConcurrently(names); } diff --git a/src/main/java/net/trueog/unionsog/uuid/UUIDMigration.java b/src/main/java/net/trueog/unionsog/uuid/UUIDMigration.java index be4a3bcd..122db8e6 100644 --- a/src/main/java/net/trueog/unionsog/uuid/UUIDMigration.java +++ b/src/main/java/net/trueog/unionsog/uuid/UUIDMigration.java @@ -1,6 +1,6 @@ package net.trueog.unionsog.uuid; -import net.trueog.unionsog.ClanPlayer; +import net.trueog.unionsog.UnionPlayer; import net.trueog.unionsog.UnionsOG; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; @@ -44,7 +44,7 @@ public class UUIDMigration { } else { - for (ClanPlayer cp : UnionsOG.getInstance().getClanManager().getAllClanPlayers()) { + for (UnionPlayer cp : UnionsOG.getInstance().getUnionManager().getAllUnionPlayers()) { if (cp.getName().equalsIgnoreCase(playerName)) { diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index b504a248..715e0d42 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -5,12 +5,10 @@ tag: min-length: 2 bracket: color: '8' - leader-color: '4' left: '' right: '' separator: color: '8' - leader-color: '4' char: ' .' settings: enable-gui: true @@ -18,8 +16,8 @@ settings: tameable-mobs-sharing: false teleport-blocks: false teleport-home-on-spawn: false - drop-items-on-clan-home: false - keep-items-on-clan-home: false + drop-items-on-union-home: false + keep-items-on-union-home: false item-list: [] show-debug-info: false enable-auto-groups: false @@ -29,7 +27,7 @@ settings: accept-other-alphabets-letters-on-tag: false display-chat-tags: true global-friendly-fire: false - unrivable-clans: + unrivable-unions: - admin - staff - mod @@ -51,7 +49,7 @@ settings: ranking-type: "DENSE" list-default-order-by: size lore-length: 36 - past-clans-limit: 10 + past-unions-limit: 10 username-regex: '(\.|\*){0,1}[a-zA-Z0-9_$]{1,16}' tag-regex: '' date-time-pattern: 'HH:mm - dd/MM/yyyy' @@ -74,8 +72,7 @@ war-and-protection: war-disconnect-expiration-time: 0 edit-all-lands: false land-creation: - only-leaders: false - only-one-per-clan: false + only-one-per-union: false war-actions: CONTAINER: true INTERACT: true @@ -84,7 +81,6 @@ war-and-protection: DAMAGE: true INTERACT_ENTITY: true war-start: - request-enabled: true members-online-max-difference: 5 kdr-grinding-prevention: enable-max-kills: false @@ -94,17 +90,17 @@ kdr-grinding-prevention: commands: more: more ally: ally - clan: union + union: union accept: accept deny: deny global: global - clan_chat: u + union_chat: u force-priority: true economy: creation-price: 100.0 - purchase-clan-create: false + purchase-union-create: false invite-price: 20.0 - purchase-clan-invite: false + purchase-union-invite: false home-teleport-price: 5.0 purchase-home-teleport: false home-teleport-set-price: 5.0 @@ -121,7 +117,7 @@ kill-weights: neutral: 1.0 ally: -1.0 deny-same-ip-kills: false -clan: +union: homebase-teleport-wait-secs: 5 homebase-can-be-set-only-once: true min-size-to-set-rival: 3 @@ -129,44 +125,27 @@ clan: max-description-length: 120 min-description-length: 10 max-members: 25 - confirmation-for-promote: false trust-members-by-default: true - confirmation-for-demote: false - percentage-online-to-demote: 100.0 ff-on-by-default: false min-length: 2 max-alliances: -1 min-size-to-set-ally: 3 - starter-ranks: - - recruit: - display-name: "&7Recruit" - permissions: [ stats, kills, mostkilled, rank.list ] - - ambassador: - display-name: "&bAmbassador" - permissions: [ ally.chat, ally.add, ally.remove, rival.add, rival.remove, war.end, war.start ] - - treasurer: - display-name: "&6Treasurer" - permissions: [ bank.balance, bank.deposit, bank.withdraw ] - default-rank: "recruit" page: untrusted-color: '8' - clan-name-color: b + union-name-color: b subtitle-color: '7' headings-color: '8' trusted-color: f - leader-color: '4' separator: '-' size: 100 help-size: 10 -clanchat: +unionchat: enable: true - tag-based-clan-chat: false + tag-based-union-chat: false announcement-color: e - format: "&b[%clan%&b] &4<%nick-color%%player%&4> %rank%: &b%message%" - spy-format: "&8[Spy] [&bC&8] <%clean-tag%&8> <%nick-color%*&8%player%>&8 %rank%&8: %message%" - rank: "&f[%rank%&f]" - leader-color: '4' + format: "&b[%union%&b] &4<%nick-color%%player%&4>: &b%message%" + spy-format: "&8[Spy] [&bC&8] <%clean-tag%&8> <%nick-color%*&8%player%>&8: %message%" trusted-color: 'f' member-color: '7' listener-priority: LOW @@ -181,31 +160,25 @@ bb: login-size: 6 allychat: enable: true - format: "&b[Ally Chat] &4<%clan%&4> <%nick-color%%player%&4> %rank%: &b%message%" - spy-format: "&8[Spy] [&cA&8] <%clean-tag%&8> <%nick-color%*&8%player%>&8 %rank%&8: %message%" - rank: "&f[%rank%&f]" - leader-color: '4' + format: "&b[Ally Chat] &4<%union%&4> <%nick-color%%player%&4>: &b%message%" + spy-format: "&8[Spy] [&cA&8] <%clean-tag%&8> <%nick-color%*&8%player%>&8: %message%" trusted-color: 'f' member-color: '7' discordchat: enable: false auto-creation: true discord-format: "%player% » %message%" - format: "&b[&9D&b] &b[%clan%&b] &4<%nick-color%%player%&4> %rank%: &b%message%" - spy-format: "&8[Spy] [&9D&8] <%clean-tag%&8> <%nick-color%*&8%player%>&8 %rank%&8: %message%" - rank: "[%rank%]" - leader-role: "Leader" - leader-color: 231, 76, 60, 100 - leader-id: 0 + format: "&b[&9D&b] &b[%union%&b] &4<%nick-color%%player%&4>: &b%message%" + spy-format: "&8[Spy] [&9D&8] <%clean-tag%&8> <%nick-color%*&8%player%>&8: %message%" min-linked-players-to-create: 3 text: category-format: "SC - TextChannels" category-ids: [] whitelist: [] - clans-limit: 100 + unions-limit: 100 purge: inactive-player-data-days: 30 - inactive-clan-days: 7 + inactive-union-days: 7 mysql: username: '^{MARIADB_USER}' host: localhost diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties index 58a185b5..3c02c00b 100644 --- a/src/main/resources/messages.properties +++ b/src/main/resources/messages.properties @@ -71,10 +71,13 @@ admin.command=admin mod.command=mod promote.command=promote demote.command=demote -clanff.command=clanff +unionff.command=unionff ff.command=ff resign.command=resign disband.command=disband +vote.command=vote +yes.command=yes +no.command=no verify.command=verify ban.command=ban unban.command=unban @@ -111,7 +114,7 @@ acf-core.parameter.tag=tag acf-core.parameter.name=name acf-core.parameter.description=description acf-core.parameter.player=player -acf-core.parameter.clan=union +acf-core.parameter.union=union acf-core.parameter.type=type acf-core.parameter.order=order acf-core.parameter.help=page or keywords @@ -154,8 +157,8 @@ command.description.ff.allow=Sets your personal friendly fire to allowed command.description.ff.auto=Sets your personal friendly fire to auto command.description.globalff.allow=Sets global friendly fire to allowed command.description.globalff.auto=Sets global friendly fire to auto -command.description.clanff.allow=Sets your union''s friendly fire to allowed -command.description.clanff.block=Sets your union''s friendly fire to blocked +command.description.unionff.allow=Sets your union''s friendly fire to allowed +command.description.unionff.block=Sets your union''s friendly fire to blocked command.description.description=Sets your union''s description command.description.ban=Bans a player from union commands command.description.unban=Unbans a player from union commands @@ -183,8 +186,11 @@ command.description.untrust=Untrusts a member command.description.resign=Resigns from your union command.description.help=Shows this help or searches in the help command.description.ally.add=Adds an ally -command.description.clan=Opens the union GUI -command.description.disband=Disbands your union +command.description.union=Opens the union GUI +command.description.disband=Proposes disbanding your union +command.description.vote=Shows your union''s open proposal +command.description.vote.yes=Votes in favour of your union''s open proposal +command.description.vote.no=Votes against your union''s open proposal command.description.mod.disband=Disbands a union command.description.mod.kick=Kicks a player from a union command.description.modtag.other=Modifies a union''s tag @@ -240,7 +246,7 @@ command.description.mod.locale=Sets player language home-menu=/{0} home{1} - Teleport to union home-base home-set-menu=/{0} home set{1} - Set the union''s home base home-clear-menu=/{0} home clear{1} - Clear the union''s home base -clan=Union +union=Union allies=Allies alliances=alliances coords=coords @@ -250,7 +256,7 @@ coords.upper=Coords world=World kdr=KDR members=Members -clans.lower=unions +unions.lower=unions rival=Rival civilian=Civilian neutral=Neutral @@ -294,9 +300,9 @@ nokillsfound=No Kills Found promoted.to.leader={0} has been promoted to leader denied.demotion={0} denied the demotion of {1}. Consensus failed. membership.invitation={0} has denied the membership invitation -joined.the.clan={0} has joined the union +joined.the.union={0} has joined the union signed.off.request.cancelled={0} has signed off. {1} request cancelled. -clan.deletion={0} denied the union deletion. Consensus failed. +union.deletion={0} denied the union deletion. Consensus failed. rename.refused={0} denied the union rename. Consensus failed. has.been.disbanded=Union {0} has been disbanded denied.the.promotion={0} denied the promotion of {1}. Consensus failed. @@ -332,9 +338,9 @@ mysql.connection.failed=MySQL Connection failed sqlite.connection.successful=SQLite Connection successful sqlite.connection.failed= SQLite Connection failed purging.player.data=purging player''s data: {0} -purging.clan=Purging union: {0} -clan.players=Union players: {0} -clans=Unions: {0} +purging.union=Purging union: {0} +union.players=Union players: {0} +unions=Unions: {0} banned=You are banned from using union commands nothing.more.to.see=Nothing more to see nothing.to.vote=&cNothing to accept or deny @@ -347,85 +353,86 @@ bulletin.board.header=&8* &e{0} &fbulletin board bulletin.board.message={0}: &f{1} has.been.disbanded.rivalry.ended={0} has been disbanded. Rivalry has ended. has.been.disbanded.alliance.ended={0} has been disbanded. Alliance has ended. -clan.disbanded=Union Disbanded +union.disbanded=Union Disbanded 1.color.day=1 {0}day many.color.days={0}{1} days insufficient.permissions=Insufficient permissions -clan.is.not.verified=Union is not verified -player.not.a.member.of.any.clan=&cThe player is not a member of any union -not.a.member.of.any.clan=You are not a member of any union +union.is.not.verified=Union is not verified +player.not.a.member.of.any.union=&cThe player is not a member of any union +not.a.member.of.any.union=You are not a member of any union minimum.to.make.alliance=Your union must have at least {0} players in order to make alliances -cannot.be.same.clan=&cYou must insert a union different from yours! -other.clan.not.verified=&cThe other union is not verified! -your.clans.are.not.allies=Your unions are not allies +cannot.be.same.union=&cYou must insert a union different from yours! +other.union.not.verified=&cThe other union is not verified! +your.unions.are.not.allies=Your unions are not allies has.broken.the.alliance={0} has broken the alliance with {1} at.least.one.leader.accept.the.alliance=At least one leader of the allied must be online to accept the alliance -leaders.have.been.asked.for.an.alliance={0} leaders have been asked for an alliance -your.clans.are.already.allies=Your unions are already allies -your.clan.cannot.create.rivals=Your union cannot create rivals +leaders.have.been.asked.for.an.alliance={0} has been asked for an alliance +your.unions.are.already.allies=Your unions are already allies +your.union.cannot.create.rivals=Your union cannot create rivals min.players.rivalries=Your union must have at least {0} players in order to make rivalries this.player.is.already.banned=This player is already banned player.added.to.banned.list=Player added to banned list you.banned=You have been banned from union commands -clan.wide.friendly.fire.blocked=Union-wide friendly-fire blocked -clan.wide.friendly.fire.is.allowed=Union-wide friendly-fire is allowed +union.wide.friendly.fire.blocked=Union-wide friendly-fire blocked +union.wide.friendly.fire.is.allowed=Union-wide friendly-fire is allowed you.are.the.only.member.online=You are the only member online -your.clan.color.tag.cannot.be.longer.than.characters=&cYour union''s colored tag cannot be longer than {0} characters -your.clan.tag.cannot.be.longer.than.characters=&cYour union''s tag cannot be longer than {0} characters -your.clan.tag.must.be.longer.than.characters=&cYour union''s tag must be longer than {0} characters +your.union.color.tag.cannot.be.longer.than.characters=&cYour union''s colored tag cannot be longer than {0} characters +your.union.tag.cannot.be.longer.than.characters=&cYour union''s tag cannot be longer than {0} characters +your.union.tag.must.be.longer.than.characters=&cYour union''s tag must be longer than {0} characters your.tag.cannot.contain.the.following.colors=&cYour tag cannot contain the following colors: {0} your.tag.doesnt.meet.the.requirements=&cYour tag doesn''t meet the requirements. your.tag.cannot.contain.color.codes=&cYour tag cannot contain color codes -your.clan.tag.can.only.contain.letters.numbers.and.color.codes=&cYour union''s tag can only contain letters, numbers, and color codes +your.union.tag.can.only.contain.letters.numbers.and.color.codes=&cYour union''s tag can only contain letters, numbers, and color codes you.cannot.set.colored.ranks=You cannot set colored ranks -your.clan.name.cannot.be.longer.than.characters=Your union''s name cannot be longer than {0} characters -your.clan.name.must.be.longer.than.characters=Your union''s name must be longer than {0} characters -your.clan.name.cannot.contain.color.codes=Your union''s name cannot contain color codes +your.union.name.cannot.be.longer.than.characters=Your union''s name cannot be longer than {0} characters +your.union.name.must.be.longer.than.characters=Your union''s name must be longer than {0} characters +your.union.name.cannot.contain.color.codes=Your union''s name cannot contain color codes that.tag.name.is.disallowed=&cThat tag name is disallowed you.must.first.resign=You must first resign from {0} -clan.with.this.tag.already.exists=A union with this tag already exists -get.your.clan.verified.to.access.advanced.features=Get your union verified to access advanced features -clan.created=Union {0} created +union.with.this.tag.already.exists=A union with this tag already exists +get.your.union.verified.to.access.advanced.features=Get your union verified to access advanced features +union.created=Union {0} created not.enough.leaders.online.to.vote.on.demotion=There aren''t enough leaders online to vote on this demotion demotion.vote.has.been.requested.from.all.leaders=Demotion vote has been requested from all leaders -player.is.not.a.leader.of.your.clan=The player is not a leader of your union +player.is.not.a.leader.of.your.union=The player is not a leader of your union player.is.not.a.leader=The player is not a leader -clan.has.been.disbanded=Union {0} has been disbanded -clan.disband.vote.has.been.requested.from.all.leaders=Union disband vote has been requested from all leaders -friendy.fire.is.now.managed.by.your.clan=Friendy-fire is now managed by your union +union.has.been.disbanded=Union {0} has been disbanded +union.disband.vote.has.been.requested.from.all.leaders=Union disband vote has been requested from all leaders +friendy.fire.is.now.managed.by.your.union=Friendy-fire is now managed by your union personal.friendly.fire.is.set.to.allowed=Personal friendly-fire is set to allowed -global.friendy.fire.is.now.managed.by.each.clan=Global friendy-fire is now managed by each union -global.friendy.fire.is.already.being.managed.by.each.clan=Global friendy-fire is already being managed by each union +global.friendy.fire.is.now.managed.by.each.union=Global friendy-fire is now managed by each union +global.friendy.fire.is.already.being.managed.by.each.union=Global friendy-fire is already being managed by each union global.friendly.fire.is.set.to.allowed=Global friendly-fire is set to allowed global.friendly.fire.is.already.being.allowed=Global friendly-fire is already being allowed -the.player.doesn.t.not.have.the.permissions.to.join.clans=The player doesn''t have the permissions to join unions +the.player.doesn.t.not.have.the.permissions.to.join.unions=The player doesn''t have the permissions to join unions you.cannot.invite.yourself=You cannot invite yourself you.did.not.answer.in.time=You didn''t answer in time, canceling... -this.player.is.banned.from.using.clan.commands=This player is banned from using union commands -the.player.is.already.member.of.another.clan=The player is already member of another union +this.player.is.banned.from.using.union.commands=This player is banned from using union commands +the.player.is.already.member.of.another.union=The player is already member of another union has.been.asked.to.join={0} has been asked to join {1} you.cannot.kick.yourself=You cannot kick yourself -the.player.is.not.a.member.of.your.clan=The player is not a member of your union +the.player.is.not.a.member.of.your.union=The player is not a member of your union you.cannot.kick.another.leader=You cannot kick another leader has.been.kicked.by={0} has been kicked by {1} -no.clans.have.been.created=No unions have been created -total.clans=Total unions: +no.unions.have.been.created=No unions have been created +total.unions=Total unions: legend=Legend: kill.type.civilian=Kill Type: {0}Civilian no.player.data.found=No player data found -clan.0=Union: {0} +union.0=Union: {0} status.0=Status: {0} rank.0=Rank: {0} kdr.0=KDR: {0} inactive.0=Inactive: {0} -clan.commands=union commands +union.commands=union commands you.can.only.modify.the.color.and.case.of.the.tag=You can only modify the color and case of the tag you.can.only.modify.the.color.of.the.tag=You can only modify the color of the tag locale.has.been.changed=&cYour language has been changed locale.is.prohibited=&cLanguage selection on the server is prohibited. tag.changed.to.0=Tag changed to {0} +union.renamed.to.0=Union renamed to {0} 0.tag.changed.to.1=&bSuccessfully changed {0}''s tag to {1} -clan.color.changed.to.0=&bSuccessfully changed your union''s color to {0} +union.color.changed.to.0=&bSuccessfully changed your union''s color to {0} invalid.color=&cInvalid color. Use a named color like red or gold, a legacy code like &c, or a hex color like #ff8800 name.0=Name: {0} description.0=Description: {0} @@ -433,11 +440,11 @@ leaders.0=Leaders: {0} allies.0=Allies: {0} rivals.0=Rivals: {0} other.player.must.be.online=&cThe player must be online! -the.player.does.not.have.the.permissions.to.lead.a.clan=The player does not have the permissions to lead a union +the.player.does.not.have.the.permissions.to.lead.a.union=The player does not have the permissions to lead a union you.cannot.promote.yourself=You cannot promote yourself the.player.is.already.a.leader=The player is already a leader configuration.reloaded=Configuration reloaded -last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.clan=Last leader cannot resign. You must appoint another leader or disband the union +last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.union=Last leader cannot resign. You must appoint another leader or disband the union 0.has.resigned={0} has resigned you.cannot.trust.yourself=You cannot trust yourself leaders.are.already.trusted=Leaders are already trusted @@ -445,23 +452,23 @@ this.player.is.already.trusted=This player is already trusted has.been.given.trusted.status.by={0} has been given trusted status by {1} this.player.is.not.banned=This player is not banned player.removed.from.the.banned.list=Player removed from the banned list -you.have.been.unbanned.from.clan.commands=You have been unbanned from union commands +you.have.been.unbanned.from.union.commands=You have been unbanned from union commands you.cannot.untrust.yourself=You cannot untrust yourself leaders.cannot.be.untrusted=Leaders cannot be untrusted this.player.is.already.untrusted=This player is already untrusted has.been.given.untrusted.status.by={0} has been given untrusted status by {1} -the.clan.does.not.exist=The union does not exist -the.clan.is.already.verified=The union is already verified -the.clan.has.been.verified=The union has been verified -clan.0.has.been.verified=Union {0} has been verified! -total.clan.players.0=Total union players: {0} +the.union.does.not.exist=The union does not exist +the.union.is.already.verified=The union is already verified +the.union.has.been.verified=The union has been verified +union.0.has.been.verified=Union {0} has been verified! +total.union.players.0=Total union players: {0} proposing.war={0} is proposing to start a war with {1} you.can.only.start.war.with.rivals=You can only start war with rivals leaders.have.been.asked.to.accept.the.war.request={0} leaders have been asked to accept the war request -leaders.asked.to.end.rivalry={0} leaders have been asked to end the war +leaders.asked.to.end.rivalry={0} has been asked to end the war proposing.to.end.the.war={0} is proposing to end the war with {1} -clans.already.at.war=Your unions are already in war -clans.not.at.war=Your unions are not at war +unions.already.at.war=Your unions are already in war +unions.not.at.war=Your unions are not at war you.are.at.war={0} is now at war with {1} denied.war.req={0} denied the war request sent by {1} you.are.no.longer.at.war={0} is no longer at war with {1} @@ -489,12 +496,12 @@ diamond=diamond gold=gold wood=wood server.announce=Server Announce -clan.announce=Union Announce +union.announce=Union Announce leader.announce=Leader Announce hunger=Hunger stone=stone iron=iron -the.clan.cannot.be.rivaled=The union cannot be rivaled +the.union.cannot.be.rivaled=The union cannot be rivaled bboff=BB toggled off bbon=BB toggled on inviteon=Invite toggled on @@ -518,30 +525,30 @@ waiting.for.teleport.stand.still.for.0.seconds=Waiting for teleport, stand still on=on off=off player.rank.changed=Rank has been set -your.clans.are.already.rivals=Your unions are already rivals +your.unions.are.already.rivals=Your unions are already rivals cleared.bb=Cleared the bulletin board -clan.balance=Union-Balance: {0} -clan.admin.balance={0}''s balance: {1} -bb.clan.deposit={0} were deposited by {1} -player.clan.deposit=You deposited {0} -bb.clan.withdraw={0} were withdrawn by {1} -bb.clan.take={0} were taken by {1} -bb.clan.give={0} were given by {1} -bb.clan.set={0} were set by {1} -player.clan.withdraw=You withdraw {0} -clan.admin.take=You took {0} from {1}''s bank -clan.admin.give=You gave {0} to {1}''s bank -clan.admin.set=You set {0}''s bank balance to {1} -clan.admin.bank.not.enough.money={0}''s bank has not enough money! -clan.bank.not.enough.money=Your unions bank has not enough money -your.clans.are.not.rivals=Your unions are not rivals -the.clan.members.reached.limit=Your union has reached the member limit -this.clan.has.reached.the.member.limit=&bThis union has reached the member limit +union.balance=Union-Balance: {0} +union.admin.balance={0}''s balance: {1} +bb.union.deposit={0} were deposited by {1} +player.union.deposit=You deposited {0} +bb.union.withdraw={0} were withdrawn by {1} +bb.union.take={0} were taken by {1} +bb.union.give={0} were given by {1} +bb.union.set={0} were set by {1} +player.union.withdraw=You withdraw {0} +union.admin.take=You took {0} from {1}''s bank +union.admin.give=You gave {0} to {1}''s bank +union.admin.set=You set {0}''s bank balance to {1} +union.admin.bank.not.enough.money={0}''s bank has not enough money! +union.bank.not.enough.money=Your unions bank has not enough money +your.unions.are.not.rivals=Your unions are not rivals +the.union.members.reached.limit=Your union has reached the member limit +this.union.has.reached.the.member.limit=&bThis union has reached the member limit you.have.reseted.your.kdr=You have reseted your KDR you.have.reseted.0.kdr=You have reseted {0}''s KDR you.have.reseted.kdr.of.all.players=You have reseted the KDR of all players -you.have.successfully.renamed.your.clan=&bYou have successfully renamed your union to {0} -you.have.successfully.renamed.the.clan=&bYou have successfully renamed the union to {0} +you.have.successfully.renamed.your.union=&bYou have successfully renamed your union to {0} +you.have.successfully.renamed.the.union=&bYou have successfully renamed the union to {0} you.have.toggled.permanent.status=You have toggled permanent status for {0} permanent.status.enabled=Your union''s permanent status has been enabled by {0} permanent.status.disabled=Your union''s permanent status has been disabled by {0} @@ -552,7 +559,7 @@ disband.confirmation=Are you sure you want to disband your union? {0} resetkdr.confirmation=Are you sure you want to reset your KDR? {0} resign.success=You have successfully resigned from your union you.cannot.demote.the.last.leader=You cannot demote the last leader -you.cannot.move.the.last.leader=You cannot move the last leader +you.cannot.move.the.last.member=You cannot move the last member player.successfully.demoted=The player was successfully demoted player.successfully.promoted=The player was successfully promoted bb.ago= \ ago @@ -565,11 +572,11 @@ bb.one.hour=1 hour bb.days= \ days bb.one.day=1 day player.purged=The player was successfully purged -your.clan.description.must.be.longer.than=Your union description must be longer than {0} characters -your.clan.description.cannot.be.longer.than=Your union description cannot be longer than {0} characters +your.union.description.must.be.longer.than=Your union description must be longer than {0} characters +your.union.description.cannot.be.longer.than=Your union description cannot be longer than {0} characters description.changed=You have successfully changed your union''s description no.description=No description -the.player.must.wait.0.before.joining.your.clan.again=This player must wait {0} minute(s) before joining your union again +the.player.must.wait.0.before.joining.your.union.again=This player must wait {0} minute(s) before joining your union again disabled.command=Disabled command rank.displayname.updated=The rank''s display name was updated! rank.setdefault=The union''s default rank has now been set to {0} @@ -582,18 +589,18 @@ rank.created=Rank created permission.0.added.to.rank.1=Permission {0} added to rank {1} permission.0.removed.from.rank.1=Permission {0} removed from rank {1} rank.0.deleted=Rank {0} deleted -clans.ranks=Union''s ranks: +unions.ranks=Union''s ranks: ranks.list.item={0}# {1} ({2}) no.ranks=No ranks were created rank.no.permissions=This rank doesn''t have any permission player.unassigned.from.rank=Player unassigned from rank you.must.be.0.or.have.the.permission.1.to.use.this=You must be {0} or your leader must give your rank the permission {1} to use this -deposit.not.allowed=Deposit is not allowed, use /%clan %toggle %deposit to allow it -withdraw.not.allowed=Withdraw is not allowed, use /%clan %toggle %withdraw to allow it +deposit.not.allowed=Deposit is not allowed, use /%union %toggle %deposit to allow it +withdraw.not.allowed=Withdraw is not allowed, use /%union %toggle %withdraw to allow it resign.request.cancelled=Resign request cancelled disband.request.cancelled=Disband request cancelled resetkdr.request.cancelled=KDR reset request cancelled -clan.create.request.cancelled=Union create request cancelled +union.create.request.cancelled=Union create request cancelled rank.create.request.cancelled=Rank create request cancelled promotion.vote.has.been.requested.from.all.leaders=Promotion vote has been requested from all leaders rename.vote.has.been.requested.from.all.leaders=&bRename vote has been requested from all leaders @@ -607,14 +614,13 @@ gui.back.title=&fBack gui.previous.page.title=&fPrevious Page gui.next.page.title=&fNext Page gui.lore.no.permission=&cYou don''t have permission to see this! -gui.main.title={0} - Union Menu +gui.main.title=Union Management gui.main.languageselector.title=&fSelect your language gui.main.languageselector.lore.left.click=&7Left-click to select your language -gui.main.languageselector.lore.right.click=&7Right-click to help translating gui.main.other.commands.title=&fOther commands gui.main.other.commands.lore=&7Left-click to see all union commands -gui.main.clan.list.title=&fUnion List -gui.main.clan.list.lore=&7Left-click to see the union list +gui.main.union.list.title=&fUnion List +gui.main.union.list.lore=&7Left-click to see the union list gui.main.reset.kdr.title=&fReset KDR gui.main.reset.kdr.lore=&7Left-click to reset your KDR gui.main.leaderboard.title=&fLeaderboard @@ -622,8 +628,8 @@ gui.main.leaderboard.lore=&7Left-click to see the leaderboard gui.main.staff.title=&fStaff gui.main.staff.lore=&7Left-click to open staff menu gui.staff.title=Staff -gui.staff.clan.list.lore.left.click=&7Left-click to see all unions -gui.staff.clan.list.lore.right.click=&7Right-click to see all unverified unions +gui.staff.union.list.lore.left.click=&7Left-click to see all unions +gui.staff.union.list.lore.right.click=&7Right-click to see all unverified unions gui.player.list.title=Player List gui.staff.player.list.title=&fPlayer List gui.staff.player.list.lore.left.click=&7Left-click to see all players @@ -633,8 +639,8 @@ gui.staff.global.ff.lore.status=&7Status: &b{0} gui.staff.global.ff.lore.toggle=&7Left-click to toggle the friendly fire status gui.staff.reload.title=&fReload gui.staff.reload.lore=&7Left-click to reload the plugin -gui.staff.clanlist.unverified.title=Unverified Unions - Total: {0} -gui.staff.clanlist.toplace.title=Select {0}''s new union +gui.staff.unionlist.unverified.title=Unverified Unions - Total: {0} +gui.staff.unionlist.toplace.title=Select {0}''s new union gui.warning.title=Warning gui.warning.no.permission.title=&fNo permission gui.warning.no.permission.plugin.lore=&7You don''t have permission to do this! @@ -643,20 +649,20 @@ gui.warning.no.permission.rank.lore=&7You must be {0} or your leader must give y gui.warning.not.verified.title=&fNot verified gui.warning.not.verified.lore=&7Your union must be verified! gui.allies.title=Allies -gui.allies.clan.lore=&7Right-click to remove this ally +gui.allies.union.lore=&7Right-click to remove this ally gui.allies.add.title=&fAdd an ally gui.add.ally.title=Add an ally -gui.add.ally.clan.lore=&7Left-click to ally this union +gui.add.ally.union.lore=&7Left-click to ally this union gui.rivals.title=Rivals -gui.rivals.clan.lore=&7Right-click to remove this rival +gui.rivals.union.lore=&7Right-click to remove this rival gui.rivals.add.title=&fAdd a rival gui.add.rival.title=Add a rival -gui.add.rival.clan.lore=&7Left-click to rival this union -gui.clanlist.title=Unions - Total: {0} -gui.clanlist.clan.title=&fUnion: [{0}&f] {1} -gui.clanlist.clan.lore.position=&b#{0} -gui.clanlist.clan.lore.kdr=&7KDR: &b{0} -gui.clanlist.clan.lore.members=&7Members: &b{0} +gui.add.rival.union.lore=&7Left-click to rival this union +gui.unionlist.title=Unions - Total: {0} +gui.unionlist.union.title=&fUnion: [{0}&f] {1} +gui.unionlist.union.lore.position=&b#{0} +gui.unionlist.union.lore.kdr=&7KDR: &b{0} +gui.unionlist.union.lore.members=&7Members: &b{0} gui.coords.title=Coordinates gui.coords.player.lore.distance=&7Distance: &b{0} gui.coords.player.lore.coords=&7Coordinates: &b{0} {1} {2} @@ -686,83 +692,83 @@ gui.permissions.permission.lore=&7Right-click to remove this permission from the gui.add.permission.title=Add a permission gui.add.permission.permission.title=&f{0} gui.add.permission.permission.lore=&7Left-click to add this permission to the rank -gui.clandetails.title=[{0}] {1} -gui.clandetails.free.agent.title=&fFree Agent -gui.clandetails.free.agent.create.clan.price.lore=&7Price: &b{0} -gui.clandetails.free.agent.create.clan.lore=&7Left-click to create a union -gui.clandetails.clan.title=&f[{0}&f] {1} -gui.clandetails.clan.lore.description=&7Description: &b{0} -gui.clandetails.clan.lore.status=&7Status: &b{0} -gui.clandetails.clan.lore.leaders=&7Leaders: &b{0} -gui.clandetails.clan.lore.online.members=&7Online Members: &b{0}/{1} -gui.clandetails.clan.lore.kdr=&7KDR: &b{0} -gui.clandetails.clan.lore.kill.totals=&7Kill Totals: &b[Rival:{0} Neutral:{1} Civilian:{2}] -gui.clandetails.clan.lore.deaths=&7Deaths: &b{0} +gui.uniondetails.title=[{0}] {1} +gui.uniondetails.free.agent.title=&fFree Agent +gui.uniondetails.free.agent.create.union.price.lore=&7Price: &b{0} +gui.uniondetails.free.agent.create.union.lore=&7Left-click to create a union +gui.uniondetails.union.title=&f[{0}&f] {1} +gui.uniondetails.union.lore.description=&7Description: &b{0} +gui.uniondetails.union.lore.status=&7Status: &b{0} +gui.uniondetails.union.lore.leaders=&7Leaders: &b{0} +gui.uniondetails.union.lore.online.members=&7Online Members: &b{0}/{1} +gui.uniondetails.union.lore.kdr=&7KDR: &b{0} +gui.uniondetails.union.lore.kill.totals=&7Kill Totals: &b[Rival:{0} Neutral:{1} Civilian:{2}] +gui.uniondetails.union.lore.deaths=&7Deaths: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.allies.separator=&b, +gui.uniondetails.union.lore.allies.separator=&b, # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.rivals.separator=&b, -gui.clandetails.clan.lore.allies=&7Allies: &b{0} -gui.clandetails.clan.lore.rivals=&7Rivals: &b{0} -gui.clandetails.clan.lore.founded=&7Founded: &b{0} -gui.clandetails.clan.lore.inactive=&7Inactive: &b{0}/{1} days -gui.clandetails.allies.title=&fAllies -gui.clandetails.allies.lore=&7Left-click to see your allies or add more -gui.clandetails.rivals.title=&fRivals -gui.clandetails.rivals.lore=&7Left-click to see your rivals or add more -gui.clandetails.roster.title=&fRoster -gui.clandetails.roster.lore=&7Left-click to see your union''s members or invite more -gui.staffclandetails.roster.lore=&7Left-click to see the union''s members -gui.clandetails.coords.title=&fCoordinates -gui.clandetails.coords.lore=&7Left-click to see the coordinates of your union''s members -gui.clandetails.home.title=&fHome -gui.clandetails.home.lore.teleport.price=&7Teleport price: &b{0} -gui.clandetails.home.lore.teleport=&7Left-click to teleport to your union''s home -gui.staffclandetails.home.lore.teleport=&7Left-click to teleport to this union''s home -gui.clandetails.home.lore.clear=&7Drop the item to clear your union''s home -gui.clandetails.home.lore.set.price=&7Set price: &b{0} -gui.clandetails.home.lore.set=&7Right-click to set your union''s home -gui.staffclandetails.home.lore.set=&7Right-click to set this union''s home -gui.clandetails.regroup.title=&fRegroup -gui.clandetails.regroup.lore.price=&7Price: &b{0} -gui.clandetails.regroup.lore.home=&7Left-click to regroup your union''s members at the union home -gui.clandetails.regroup.lore.me=&7Right-click to regroup your union''s members at your location -gui.clandetails.ff.title=&fFriendly Fire -gui.clandetails.ff.personal.lore=&7Personal: &b{0} -gui.clandetails.ff.clan.lore=&7Union: &b{0} -gui.clandetails.ff.personal.toggle.lore=&7Left-click to toggle your friendly-fire -gui.clandetails.ff.clan.toggle.lore=&7Right-click to toggle your union''s friendly-fire -gui.clandetails.bank.title=&fBank -gui.clandetails.bank.balance.lore=&7Balance: &b{0} -gui.clandetails.bank.withdraw.status.lore=&7Withdraw: &b{0} -gui.clandetails.bank.deposit.status.lore=&7Deposit: &b{0} -gui.clandetails.bank.withdraw.toggle.lore=&7Drop the item to toggle the status of withdraw -gui.clandetails.bank.deposit.toggle.lore=&7Right-click to toggle the status of deposit -gui.clandetails.rank.title=&fRank -gui.clandetails.rank.lore=&7Left-click to see the union''s ranks and edit them -gui.clandetails.verified.title=&fVerified -gui.clandetails.not.verified.title=&fNot verified -gui.clandetails.verify.price.lore=&7Price: &b{0} -gui.clandetails.not.verified.lore=&7Left-click to verify your union -gui.staffclandetails.not.verified.lore=&7Left-click to verify this union -gui.clandetails.resign.title=&fResign -gui.clandetails.resign.lore=&7Left-click to resign your union -gui.clandetails.disband.title=&fDisband -gui.clandetails.disband.lore=&7Drop the item to disband your union -gui.staffclandetails.disband.lore=&7Left-click to disband this union -gui.clandetails.chat.title=&fChat -gui.clandetails.chat.clan.chat.lore=&7/{0} [message] - &bSends a message to the union chat -gui.clandetails.chat.clan.join.leave.lore=&7/{0} {1}/{2} - &bJoins/leaves the union chat -gui.clandetails.chat.ally.chat.lore=&7/{0} [message] - &bSends a message to the ally chat -gui.clandetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bJoins/leaves the ally chat -gui.clandetails.chat.clan.status.lore=&7Union: &b{0} -gui.clandetails.chat.ally.status.lore=&7Ally: &b{0} -gui.clandetails.chat.clan.toggle.lore=&7Left-click to toggle the union chat status -gui.clandetails.chat.ally.toggle.lore=&7Right-click to toggle the ally chat status +gui.uniondetails.union.lore.rivals.separator=&b, +gui.uniondetails.union.lore.allies=&7Allies: &b{0} +gui.uniondetails.union.lore.rivals=&7Rivals: &b{0} +gui.uniondetails.union.lore.founded=&7Founded: &b{0} +gui.uniondetails.union.lore.inactive=&7Inactive: &b{0}/{1} days +gui.uniondetails.allies.title=&fAllies +gui.uniondetails.allies.lore=&7Left-click to see your allies or add more +gui.uniondetails.rivals.title=&fRivals +gui.uniondetails.rivals.lore=&7Left-click to see your rivals or add more +gui.uniondetails.roster.title=&fRoster +gui.uniondetails.roster.lore=&7Left-click to see your union''s members or invite more +gui.staffuniondetails.roster.lore=&7Left-click to see the union''s members +gui.uniondetails.coords.title=&fCoordinates +gui.uniondetails.coords.lore=&7Left-click to see the coordinates of your union''s members +gui.uniondetails.home.title=&fHome +gui.uniondetails.home.lore.teleport.price=&7Teleport price: &b{0} +gui.uniondetails.home.lore.teleport=&7Left-click to teleport to your union''s home +gui.staffuniondetails.home.lore.teleport=&7Left-click to teleport to this union''s home +gui.uniondetails.home.lore.clear=&7Drop the item to clear your union''s home +gui.uniondetails.home.lore.set.price=&7Set price: &b{0} +gui.uniondetails.home.lore.set=&7Right-click to set your union''s home +gui.staffuniondetails.home.lore.set=&7Right-click to set this union''s home +gui.uniondetails.regroup.title=&fRegroup +gui.uniondetails.regroup.lore.price=&7Price: &b{0} +gui.uniondetails.regroup.lore.home=&7Left-click to regroup your union''s members at the union home +gui.uniondetails.regroup.lore.me=&7Right-click to regroup your union''s members at your location +gui.uniondetails.ff.title=&fFriendly Fire +gui.uniondetails.ff.personal.lore=&7Personal: &b{0} +gui.uniondetails.ff.union.lore=&7Union: &b{0} +gui.uniondetails.ff.personal.toggle.lore=&7Left-click to toggle your friendly-fire +gui.uniondetails.ff.union.toggle.lore=&7Right-click to toggle your union''s friendly-fire +gui.uniondetails.bank.title=&fBank +gui.uniondetails.bank.balance.lore=&7Balance: &b{0} +gui.uniondetails.bank.withdraw.status.lore=&7Withdraw: &b{0} +gui.uniondetails.bank.deposit.status.lore=&7Deposit: &b{0} +gui.uniondetails.bank.withdraw.toggle.lore=&7Drop the item to toggle the status of withdraw +gui.uniondetails.bank.deposit.toggle.lore=&7Right-click to toggle the status of deposit +gui.uniondetails.rank.title=&fRank +gui.uniondetails.rank.lore=&7Left-click to see the union''s ranks and edit them +gui.uniondetails.verified.title=&fVerified +gui.uniondetails.not.verified.title=&fNot verified +gui.uniondetails.verify.price.lore=&7Price: &b{0} +gui.uniondetails.not.verified.lore=&7Left-click to verify your union +gui.staffuniondetails.not.verified.lore=&7Left-click to verify this union +gui.uniondetails.resign.title=&fResign +gui.uniondetails.resign.lore=&7Left-click to resign your union +gui.uniondetails.disband.title=&fDisband +gui.uniondetails.disband.lore=&7Drop the item to disband your union +gui.staffuniondetails.disband.lore=&7Left-click to disband this union +gui.uniondetails.chat.title=&fChat +gui.uniondetails.chat.union.chat.lore=&7/{0} [message] - &bSends a message to the union chat +gui.uniondetails.chat.union.join.leave.lore=&7/{0} {1}/{2} - &bJoins/leaves the union chat +gui.uniondetails.chat.ally.chat.lore=&7/{0} [message] - &bSends a message to the ally chat +gui.uniondetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bJoins/leaves the ally chat +gui.uniondetails.chat.union.status.lore=&7Union: &b{0} +gui.uniondetails.chat.ally.status.lore=&7Ally: &b{0} +gui.uniondetails.chat.union.toggle.lore=&7Left-click to toggle the union chat status +gui.uniondetails.chat.ally.toggle.lore=&7Right-click to toggle the ally chat status gui.playerdetails.title={0} gui.playerdetails.player.title=&f{0} -gui.playerdetails.player.lore.noclan=&7Union: &bNone -gui.playerdetails.player.lore.clan=&7Union: &b[{0}&b] {1} +gui.playerdetails.player.lore.nounion=&7Union: &bNone +gui.playerdetails.player.lore.union=&7Union: &b[{0}&b] {1} gui.playerdetails.player.lore.rank=&7Rank: &b{0} gui.playerdetails.player.lore.status=&7Status: &b{0} gui.playerdetails.player.lore.kdr=&7KDR: &b{0} @@ -771,8 +777,8 @@ gui.playerdetails.player.lore.deaths=&7Deaths: &b{0} gui.playerdetails.player.lore.join.date=&7Join date: &b{0} gui.playerdetails.player.lore.last.seen=&7Last seen: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.playerdetails.player.lore.past.clans.separator=&b, -gui.playerdetails.player.lore.past.clans=&7Past unions: &b{0} +gui.playerdetails.player.lore.past.unions.separator=&b, +gui.playerdetails.player.lore.past.unions=&7Past unions: &b{0} gui.playerdetails.player.lore.inactive=&7Inactive: &b{0}/{1} days gui.playerdetails.kick.title=&fKick gui.playerdetails.promote.demote.title=&fPromote/Demote @@ -796,77 +802,108 @@ gui.languageselector.title=Languages - Current: {0} gui.languageselector.language.title=&f{0} gui.languageselector.language.lore.left.click=&7Left-click to set this as your language gui.languageselector.language.lore.translation.status=&7Translation status: &b{0}% -gui.languageselector.language.lore.right.click=&7Right-click to help translating gui.confirmation.title=Confirmation gui.confirmation.confirm=&7Click here to confirm gui.confirmation.return=&7Click here to return gui.not.supported=&cAn error occurred while opening the GUI! Disabling it... Did you download the correct version? -staff.member.verify.clan=&cA staff member must verify your union! +staff.member.verify.union=&cA staff member must verify your union! player.already.has.that.rank=&cThe player already has that rank! -joined.clan.chat=&bYou have joined union chat -already.joined.clan.chat=&bYou''re already joined to union chat -left.clan.chat=&bYou have left union chat -muted.clan.chat=&bYou have muted union chat -unmuted.clan.chat=&bYou have unmuted union chat +joined.union.chat=&bYou have joined union chat +already.joined.union.chat=&bYou''re already joined to union chat +left.union.chat=&bYou have left union chat +muted.union.chat=&bYou have muted union chat +unmuted.union.chat=&bYou have unmuted union chat joined.ally.chat=&bYou have joined ally chat left.ally.chat=&bYou have left ally chat muted.ally.chat=&bYou have muted ally chat unmuted.ally.chat=&bYou have unmuted ally chat already.joined.ally.chat=&bYou''re already joined to ally chat -player.already.in.this.clan=&cThe player is already in this union -your.clan.reached.max.alliances=&cYour union has reached the max number of alliances -other.clan.reached.max.alliances=&cThe other union has reached the max number of alliances -insert.clan.tag=&bInsert the union tag (or "{0}"): -insert.clan.name=&bInsert the union name: +player.already.in.this.union=&cThe player is already in this union +your.union.reached.max.alliances=&cYour union has reached the max number of alliances +other.union.reached.max.alliances=&cThe other union has reached the max number of alliances +insert.union.tag=&bInsert the union tag (or "{0}"): +insert.union.name=&bInsert the union name: insert.rank.name=&bInsert the rank name (or "{0}"): -click.to.help.translating=&bClick on this link to help translating:\n&r{0} -your.clan.must.have.members.to.verify=&cYour union must have at least {0} members to get verified! +your.union.must.have.members.to.verify=&cYour union must have at least {0} members to get verified! you.must.hold.a.banner=&cYou must have a banner in your hand! -you.changed.clan.banner=&bYou changed your union''s banner! -your.clan.already.verified=&cYour union is already verified! +you.changed.union.banner=&bYou changed your union''s banner! +your.union.already.verified=&cYour union is already verified! # suppress inspection "TrailingSpacesInProperty" -clan.profile=\n&b%clan_name% &7union profile &8-------------------------------------------\n \n &7Name\: &e[&8%clan_color_tag%&e] &b%clan_name%\n &7Description\: &f%clan_description%\n &7Status\: &f%clan_status%\n &7Leaders\: %clan_leaders%\n &7Members Online\: &f%clan_online_count%&7/&f%clan_size%\n &7KDR\: &e%clan_kdr%\n &7Kill Totals\: &8[Rival\:&f%clan_rival_kills% &8Ally\:&f%clan_ally_kills% &8Neutral\:&f%clan_neutral_kills% &8Civilian\:&f%clan_civilian_kills%&8]\n &7Deaths\: &f%clan_deaths%\n &7Allies\: &f%clan_allies%\n &7Rivals\: &f%clan_rivals%\n &7Founded\: &f%clan_founded%\n &7Inactive\: &f%clan_inactive_days%&7/&f%clan_max_inactive_days% days\n -player.lookup.clanname=&e[&8%clan_color_tag%&e] &b%clan_name% +union.profile=\n&b%union_name% &7union profile &8-------------------------------------------\n \n &7Name\: &e[&8%union_color_tag%&e] &b%union_name%\n &7Description\: &f%union_description%\n &7Status\: &f%union_status%\n &7Members Online\: &f%union_online_count%&7/&f%union_size%\n &7KDR\: &e%union_kdr%\n &7Kill Totals\: &8[Rival\:&f%union_rival_kills% &8Ally\:&f%union_ally_kills% &8Neutral\:&f%union_neutral_kills% &8Civilian\:&f%union_civilian_kills%&8]\n &7Deaths\: &f%union_deaths%\n &7Allies\: &f%union_allies%\n &7Rivals\: &f%union_rivals%\n &7Founded\: &f%union_founded%\n &7Inactive\: &f%union_inactive_days%&7/&f%union_max_inactive_days% days\n +player.lookup.unionname=&e[&8%union_color_tag%&e] &b%union_name% # suppress inspection "TrailingSpacesInProperty" player.lookup.killtype=&7Kill Type: %player_kill_type%\n -player.lookup=\n&b%player_name%&7''s player info &8-------------------------------------------\n \n &7Union\: &f%clan_name%\n &7Rank\: &f%player_rank%\n &7Status\: &f%player_status%\n &7KDR\: &e%player_kdr%\n &7Kill Totals\: &8[Rival\:&f%player_rival_kills% &8Ally\:&7%player_ally_kills% &8Neutral\:&f%player_neutral_kills% &8Civilian\:&f%player_civilian_kills%&8]\n &7Deaths\: &f%player_deaths%\n &7Join Date\: &f%player_join_date%\n &7Last Seen\: &f%player_last_seen%\n &7Past Unions\: &f%player_past_clans%\n &7Inactive\: &f%player_inactive_days%&7/&f%player_max_inactive_days% days\n %kill_type_line% +player.lookup=\n&b%player_name%&7''s player info &8-------------------------------------------\n \n &7Union\: &f%union_name%\n &7Status\: &f%player_status%\n &7KDR\: &e%player_kdr%\n &7Kill Totals\: &8[Rival\:&f%player_rival_kills% &8Ally\:&7%player_ally_kills% &8Neutral\:&f%player_neutral_kills% &8Civilian\:&f%player_civilian_kills%&8]\n &7Deaths\: &f%player_deaths%\n &7Join Date\: &f%player_join_date%\n &7Last Seen\: &f%player_last_seen%\n &7Past Unions\: &f%player_past_unions%\n &7Inactive\: &f%player_inactive_days%&7/&f%player_max_inactive_days% days\n %kill_type_line% economy.disabled=&cEconomy disabled! has.been.purged={0}''s data has been purged accepted.invitation=&bYou have accepted {0}''s invitation denied.invitation=&cYou have denied {0}''s invitation -must.be.in.clan.to.pvp=&cYou and {0} must be union members to PvP! -clans.not.at.war.pvp.denied=&cYour union is not at war with {0}! +must.be.in.union.to.pvp=&cYou and {0} must be union members to PvP! +unions.not.at.war.pvp.denied=&cYour union is not at war with {0}! cannot.attack.civilians=&cYou cannot attack civilians! -cannot.attack.clan.member=&cYou cannot attack another union member! +cannot.attack.union.member=&cYou cannot attack another union member! cannot.attack.ally=&cYou cannot attack an ally! cannot.send.discord.message=You cannot send messages to {0}. You''re not a member of that union! discordhook.is.disabled=&cDiscord integration is disabled or unavailable! -your.clan.doesnt.have.any.linked.player=Your union doesn''t have any linked players -your.clan.doesnt.have.minimum.linked.player=Your union doesn''t have minimum linked players -your.clan.is.not.on.the.whitelist=Your union is not whitelisted -your.clan.already.has.channel=Your union already has a discord channel +your.union.doesnt.have.any.linked.player=Your union doesn''t have any linked players +your.union.doesnt.have.minimum.linked.player=Your union doesn''t have minimum linked players +your.union.is.not.on.the.whitelist=Your union is not whitelisted +your.union.already.has.channel=Your union already has a discord channel discord.reached.category.limit=Discord reached the categories limit! discord.reached.channels.limit=Discord reached the channels limit! discord.created.successfully=&bDiscord channel created successfully! you.did.not.link.your.account=You did not link your account! # suppress inspection "TrailingSpacesInProperty" -cannot.kick.last.leader=&cYou cannot kick the last leader! +cannot.kick.last.member=&cYou cannot kick the last member! cannot.disband.permanent=&cYou cannot disband this union. It has permanent status. you.can.only.set.base.in.your.land=&cYou can only set home in your land! only.leaders.can.create.lands=&cOnly leaders can create lands! -only.one.land.per.clan=&cYour union already has a land! -only.clan.members.can.create.lands=&cOnly union members can create lands! +only.one.land.per.union=&cYour union already has a land! +only.union.members.can.create.lands=&cOnly union members can create lands! land.allowed.all.actions=&bAll actions are now allowed! land.blocked.all.actions=&bAll actions are now blocked! land.allowed.action=&bAllowed action! land.blocked.action=&bBlocked action! you.do.not.own.lands=&cYou do not own a land! land.sharing.disabled=&cLand sharing is disabled! -clan.chat.disabled=&cUnion chat is disabled! +union.chat.disabled=&cUnion chat is disabled! ally.chat.disabled=&cAlly chat is disabled! war.expired=The war with {0} has expired! you.cant.start.war.online.members.difference=You can''t start the war. One union has more members online than the other. invitedplayer.invite.off=This player has disabled union invites user.hasnt.played.before=&cThis user has not played before -clan.list.balance.header=\n{0} &7top balance &8-----------------------\n \n&8Total unions: &7{1}\n \n&8#&7. &8Union &7- &8Balance -clan.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} +union.list.balance.header=\n{0} &7top balance &8-----------------------\n \n&8Total unions: &7{1}\n \n&8#&7. &8Union &7- &8Balance +union.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} + +# Union proposals +proposal.opened=&b{0} proposed: {1} +proposal.opened.confirmation=&bProposal opened. Your union''s members have been asked to vote. +proposal.how.to.vote=&bUse &f/union vote yes&b or &f/union vote no&b to vote, &f/union vote&b to see the proposal. +proposal.already.open=&cYour union already has a proposal open. It has to finish first. +proposal.none.open=&cYour union has no proposal open. +proposal.pending=&bYour union is voting on: {0} +proposal.voted.yes=&bYou voted in favour. +proposal.voted.no=&bYou voted against. +proposal.rejected=&cProposal rejected: {0} +proposal.expired=&cProposal expired without a consensus: {0} +proposal.summary={0} &b({1}/{2} in favour, {3} against) +proposal.description.disband=disband the union +proposal.description.set.home=move the union home +proposal.description.start.war=declare war on {0} +proposal.home.world.missing=&cThe proposed home is in a world that is no longer loaded. +proposal.war.target.missing=&cThe union you voted to declare war on no longer exists. +union.home.moved=Union home moved to {0} +union.disbanded.payout=&bYou received {0} from the union bank. + +# Union proposal GUI +gui.proposal.title=Union Vote +gui.proposal.subject.title=&fOpen proposal +gui.proposal.none.title=&cYour union has no proposal open +gui.proposal.yes.title=&aVote in favour +gui.proposal.yes.lore=&7Left-click to vote yes +gui.proposal.no.title=&cVote against +gui.proposal.no.lore=&7Left-click to vote no +gui.main.proposal.title=&fUnion vote +gui.main.proposal.lore.voted=&7You have already voted +gui.main.proposal.lore.not.voted=&eLeft-click to cast your vote +use.union.instead=&7[&a&lTrue&c&lOG &e&lNetwork&7] &6Use &e/{0}&6 instead of &e/{1}&6! diff --git a/src/main/resources/messages_ar_SA.properties b/src/main/resources/messages_ar_SA.properties index 15658ffa..4ac21722 100644 --- a/src/main/resources/messages_ar_SA.properties +++ b/src/main/resources/messages_ar_SA.properties @@ -92,7 +92,7 @@ acf-core.parameter.tag=العلامة acf-core.parameter.name=الإسم acf-core.parameter.description=الوصف acf-core.parameter.player=لاعب -acf-core.parameter.clan=اتحاد +acf-core.parameter.union=اتحاد acf-core.parameter.type=النوع alliances=إتحاد coords=الأحداثيات diff --git a/src/main/resources/messages_be_BY.properties b/src/main/resources/messages_be_BY.properties index b0b424cd..f32db72c 100644 --- a/src/main/resources/messages_be_BY.properties +++ b/src/main/resources/messages_be_BY.properties @@ -55,7 +55,7 @@ admin.command=адмін mod.command=мадэратар promote.command=павысіць demote.command=панізіць -clanff.command=clanff +unionff.command=unionff ff.command=агонь_па_сваім me.command=я tp.command=тэлепорт @@ -74,7 +74,7 @@ acf-core.parameter.tag=тэг acf-core.parameter.name=імя acf-core.parameter.description=апісанне acf-core.parameter.player=гулец -acf-core.parameter.clan=саюз +acf-core.parameter.union=саюз acf-core.parameter.type=тып acf-core.parameter.order=парадак acf-core.parameter.help=старонка або ключавыя словы @@ -117,8 +117,8 @@ command.description.ff.allow=Асабіста дазваляе "агонь па command.description.ff.auto=Усталёўвае статус асабістага "агню па сваім" на аўта command.description.globalff.allow=Дазваляе "агонь па сваім" глабальна command.description.globalff.auto=Усталёўвае статус глабальнага "агню па сваім" на аўта -command.description.clanff.allow=Дазваляе "агонь па сваім" у вашым саюзе -command.description.clanff.block=Забараняе "агонь па сваім" у вашым саюзе +command.description.unionff.allow=Дазваляе "агонь па сваім" у вашым саюзе +command.description.unionff.block=Забараняе "агонь па сваім" у вашым саюзе command.description.description=Задае апісанне вашага саюза command.description.ban=Забараняе гульцу карыстацца саюзавымі камандамі command.description.unban=Дазваляе гульцу карыстацца саюзавымі камандамі @@ -146,7 +146,7 @@ command.description.untrust=Забірае ў гульца давер і дад command.description.resign=Выйсці з вашага саюзу command.description.help=Паказвае гэтую даведку або шукае ў даведцы command.description.ally.add=Дадае саюзніцкі саюз -command.description.clan=Адкрывае інтэрфейс плагіна +command.description.union=Адкрывае інтэрфейс плагіна command.description.disband=Распускае ваш саюз command.description.mod.disband=Распускае саюз command.description.bank.status=Паказвае баланс на рахунку вашага саюза @@ -168,7 +168,7 @@ command.description.rank.permissions.add=Дае вызначанае права command.description.rank.permissions.remove=Забірае вызначанае права ў дадзенага рангу home-set-menu=/{0} home set{1} - Усталяваць точку базы саюза home-clear-menu=/{0} home set{1} - Прыбраць точку базы саюза -clan=Саюз +union=Саюз allies=Саюзнікі alliances=саюзы coords=каардынаты @@ -178,7 +178,7 @@ coords.upper=Каардынаты world=Свет kdr=КДР members=Удзельнікі -clans.lower=саюзы +unions.lower=саюзы rival=Супернік civilian=Мірны neutral=Нейтральны @@ -220,9 +220,9 @@ nokillsfound=Забойстваў не знойдзена promoted.to.leader={0} быў павышаны да лідара denied.demotion={0} адмовіў паніжэнне {1}. Рашэнне не было прынята. membership.invitation={0} адмовіў запрашэнне ў саюз -joined.the.clan={0} далучыўся да саюза +joined.the.union={0} далучыўся да саюза signed.off.request.cancelled={0} выйшаў з сеткі. Запыт на {1} быў адмоўлены. -clan.deletion={0} адмовіў выдаленне саюза. Рашэнне не было прынята. +union.deletion={0} адмовіў выдаленне саюза. Рашэнне не было прынята. has.been.disbanded=Саюз {0} быў распушчаны denied.the.promotion={0} адмовіў павышэнне {1}. Рашэнне не было прынята. demoted.back.to.member={0} быў паніжаны назад да ўдзельніка @@ -235,26 +235,26 @@ denied.an.alliance={0} адмовіў у саюзе з саюзам {1} accepted.an.alliance={0} прыняў саюз з {1} created.an.alliance={0} заключыў саюз з {1} # suppress inspection "TrailingSpacesInProperty" -player.not.a.member.of.any.clan=&cГулец не з''яўляецца ўдзельнікам ніякага саюза -not.a.member.of.any.clan=Вы не з''яўляецеся ўдзельнікам ніякага саюза +player.not.a.member.of.any.union=&cГулец не з''яўляецца ўдзельнікам ніякага саюза +not.a.member.of.any.union=Вы не з''яўляецеся ўдзельнікам ніякага саюза minimum.to.make.alliance=У вашаму саюзе павінна быць больш за {0} удзельнікі/аў, каб ствараць саюзы з іншымі саюзамі -cannot.be.same.clan=&cВы павінны ўвесці іншы саюз\! -other.clan.not.verified=&cІншы саюз не з''яўляецца пацверджаным\! -your.clans.are.not.allies=Вашыя саюзы не з''яўляюцца саюзнікамі +cannot.be.same.union=&cВы павінны ўвесці іншы саюз\! +other.union.not.verified=&cІншы саюз не з''яўляецца пацверджаным\! +your.unions.are.not.allies=Вашыя саюзы не з''яўляюцца саюзнікамі has.broken.the.alliance={0} разарваў саюз з саюзам "{1}" at.least.one.leader.accept.the.alliance=Прынамсі адзін лідар саюзнага саюза павінны быць у сетцы, каб прыняць запыт на саюз leaders.have.been.asked.for.an.alliance=Запыт аб саюзе быў дасланы лідарам саюзу "{0}" -your.clans.are.already.allies=Вашыя саюзы ўжо з''яўляюцца саюзнікамі -your.clan.cannot.create.rivals=Ваш саюз ня можа мець супернікаў +your.unions.are.already.allies=Вашыя саюзы ўжо з''яўляюцца саюзнікамі +your.union.cannot.create.rivals=Ваш саюз ня можа мець супернікаў min.players.rivalries=У вашаму саюзе павінна быць больш за {0} удзельнікі/аў, каб абвяшчаць суперніцтва з іншымі саюзамі this.player.is.already.banned=Гэты гулец ужо ў чорным спісе player.added.to.banned.list=Гулец даданы ў чорны спіс you.banned=Вам забаранілі карыстацца саюзавымі камандамі -clan.wide.friendly.fire.blocked=Саюзавы "агонь па сваім" забаронены -clan.wide.friendly.fire.is.allowed=Саюзавы "агонь па сваім" дазволены +union.wide.friendly.fire.blocked=Саюзавы "агонь па сваім" забаронены +union.wide.friendly.fire.is.allowed=Саюзавы "агонь па сваім" дазволены you.are.the.only.member.online=Вы зараз адзіны ўдзельнік у сетцы -your.clan.color.tag.cannot.be.longer.than.characters=&cКаляровы тэг вашага саюза ня можа быць быць даўжэй за {0} сімвалы/аў -clan.has.been.disbanded=Саюз {0} быў распушчаны +your.union.color.tag.cannot.be.longer.than.characters=&cКаляровы тэг вашага саюза ня можа быць быць даўжэй за {0} сімвалы/аў +union.has.been.disbanded=Саюз {0} быў распушчаны add=дадаць remove=прыбраць allow=дазволіць diff --git a/src/main/resources/messages_cs_CZ.properties b/src/main/resources/messages_cs_CZ.properties index 4188c94f..200ac4bf 100644 --- a/src/main/resources/messages_cs_CZ.properties +++ b/src/main/resources/messages_cs_CZ.properties @@ -64,7 +64,7 @@ admin.command=správce mod.command=mod promote.command=povýšit demote.command=degradovat -clanff.command=clanff +unionff.command=unionff ff.command=ff resign.command=odstoupit disband.command=rozpustit @@ -102,7 +102,7 @@ acf-core.parameter.tag=označit acf-core.parameter.name=jmeno acf-core.parameter.description=popis acf-core.parameter.player=hráč -acf-core.parameter.clan=svaz +acf-core.parameter.union=svaz acf-core.parameter.type=typ acf-core.parameter.order=pořadí acf-core.parameter.help=stránka nebo klíčová slova @@ -145,8 +145,8 @@ command.description.ff.allow=Nastaví váš osobní friendly fire aby byl povole command.description.ff.auto=Nastaví váš osobní friendly fire aby byl automatický command.description.globalff.allow=Nastaví celkový friendly fire aby byl povolen command.description.globalff.auto=Nastaví celkový friendly fire aby byl automatický -command.description.clanff.allow=Nastaví svazový friendly fire aby byl povolen -command.description.clanff.block=Nastaví svazový friendly fire aby byl zakázán +command.description.unionff.allow=Nastaví svazový friendly fire aby byl povolen +command.description.unionff.block=Nastaví svazový friendly fire aby byl zakázán command.description.description=Nastav popis svazu command.description.ban=Zakáže hráči přístup k příkazům svazu command.description.unban=Odbanuje hráče přístup k příkazům svazu @@ -174,7 +174,7 @@ command.description.untrust=Přestat důvěřovat členovy command.description.resign=Odstupuje od tvého svazu command.description.help=Zobrazí tuto nápovědu nebo vyhledá nápovědu command.description.ally.add=Přidá spojence -command.description.clan=Otevře GUI +command.description.union=Otevře GUI command.description.disband=Rozpustí tvůj svaz command.description.mod.disband=Rozpustí svaz command.description.mod.kick=Vyhodí hráče z svazu @@ -226,7 +226,7 @@ command.description.rank.permissions.remove=Odstraní oprávnění z hodnosti home-menu=/{0} home{1} - Teleport do svazové základny home-set-menu=/{0} home set{1} - Nastavte základnu svazu home-clear-menu=/{0} home clear{1} - Vyčistit základnu svazu -clan=Svaz +union=Svaz allies=Spojenci alliances=aliance coords=Souřadníce @@ -236,7 +236,7 @@ coords.upper=Souřadnice world=Svět kdr=KDR members=Členové -clans.lower=svazy +unions.lower=svazy rival=Soupeř civilian=Civilista neutral=Neutrální @@ -280,9 +280,9 @@ nokillsfound=Nebyly nalezeny žádné zabití promoted.to.leader={0} byl povýšen na vůdce denied.demotion={0} odmítl degradaci {1}. Konsensus selhal. membership.invitation={0} odmítl pozvání k členství -joined.the.clan={0} se připojil do svazu +joined.the.union={0} se připojil do svazu signed.off.request.cancelled={0} se odhlásil. {1} žádost byla zrušena. -clan.deletion={0} odmítl degradaci. Konsensus selhal. +union.deletion={0} odmítl degradaci. Konsensus selhal. has.been.disbanded=Svaz {0} byl rozpuštěn denied.the.promotion={0} odmítl degradaci {1}. Konsensus selhal. demoted.back.to.member={0} byl degradován zpět na člena @@ -315,9 +315,9 @@ mysql.connection.failed=Připojení MySQL se nezdařilo sqlite.connection.successful=SQLite připojení bylo úspěšné sqlite.connection.failed= Připojení SQLite se nezdařilo purging.player.data=vymazání dat hráče\: {0} -purging.clan=Vyčistit svaz\: {0} -clan.players=Hráči svazu\: {0} -clans=Svazy\: {0} +purging.union=Vyčistit svaz\: {0} +union.players=Hráči svazu\: {0} +unions=Svazy\: {0} banned=Máš zakázáno používat příkazy svazu nothing.more.to.see=Nic víc pro zobrazení nothing.to.vote=&cNic k přijetí nebo zamítnutí @@ -328,53 +328,53 @@ view.next.page=Zadejte /{0} pro zobrazení další stránky. voted.to.accept={0} hlasoval pro přijetí has.been.disbanded.rivalry.ended={0} byl rozpuštěn. Rivalie skončila. has.been.disbanded.alliance.ended={0} byl rozpuštěn. Aliance skončila. -clan.disbanded=Svaz byl rozpuštěn +union.disbanded=Svaz byl rozpuštěn 1.color.day=1 {0}den many.color.days={0}{1} dní insufficient.permissions=Nedostatečné oprávnění -clan.is.not.verified=Svaz není ověřen -player.not.a.member.of.any.clan=&cHráč není členem žádného svazu -not.a.member.of.any.clan=Nejsi členem žádného svazu +union.is.not.verified=Svaz není ověřen +player.not.a.member.of.any.union=&cHráč není členem žádného svazu +not.a.member.of.any.union=Nejsi členem žádného svazu minimum.to.make.alliance=Váš svaz musí mít alespoň {0} hráčů, aby mohl tvořit aliance -cannot.be.same.clan=&cMusíte vložit svaz jiný než tvůj\! -other.clan.not.verified=&cDalší svaz není ověřen\! -your.clans.are.not.allies=Tvoje svazy nejsou spojenci +cannot.be.same.union=&cMusíte vložit svaz jiný než tvůj\! +other.union.not.verified=&cDalší svaz není ověřen\! +your.unions.are.not.allies=Tvoje svazy nejsou spojenci has.broken.the.alliance={0} porušil alianci s {1} at.least.one.leader.accept.the.alliance=Alespoň jeden vůdce spojenectví musí být online, aby přijal alianci leaders.have.been.asked.for.an.alliance={0} vůdců bylo požádáno o spojenectví -your.clans.are.already.allies=Vaše svazy jsou již spojenci -your.clan.cannot.create.rivals=Tvůj svaz nemůže vytvářet rivaly +your.unions.are.already.allies=Vaše svazy jsou již spojenci +your.union.cannot.create.rivals=Tvůj svaz nemůže vytvářet rivaly min.players.rivalries=Tvůj svaz musí mít alespoň {0} hráčů, aby jsi mohl dělat rivality this.player.is.already.banned=Tento hráč je již zabanován player.added.to.banned.list=Hráč byl přidán do seznamu zabanovaných you.banned=Byl jsi zabanován v příkazech svazu -clan.wide.friendly.fire.blocked=V celém svazu byl zakázán friendly-fire -clan.wide.friendly.fire.is.allowed=V celém svazu byl povolen friendly-fire +union.wide.friendly.fire.blocked=V celém svazu byl zakázán friendly-fire +union.wide.friendly.fire.is.allowed=V celém svazu byl povolen friendly-fire you.are.the.only.member.online=Jste jediný člen online -your.clan.color.tag.cannot.be.longer.than.characters=&cBarevný tag tvého svazu nemůže být delší než {0} znaků +your.union.color.tag.cannot.be.longer.than.characters=&cBarevný tag tvého svazu nemůže být delší než {0} znaků you.cannot.set.colored.ranks=Nemůžeš nastavit barevné hodnosti -your.clan.name.cannot.be.longer.than.characters=Název tvého svazu nemůže být delší než {0} znaků -your.clan.name.must.be.longer.than.characters=Název tvého svazu musí být delší než {0} znaků -your.clan.name.cannot.contain.color.codes=Název vašeho svazu nemůže obsahovat barevné kódy +your.union.name.cannot.be.longer.than.characters=Název tvého svazu nemůže být delší než {0} znaků +your.union.name.must.be.longer.than.characters=Název tvého svazu musí být delší než {0} znaků +your.union.name.cannot.contain.color.codes=Název vašeho svazu nemůže obsahovat barevné kódy you.must.first.resign=Nejdříve musíte odstoupit od {0} -clan.with.this.tag.already.exists=Svaz s tímto názvem již existuje -get.your.clan.verified.to.access.advanced.features=Pro přístup k pokročilým funkcím ověřte váš svaz -clan.created=Svaz {0} vytvořen +union.with.this.tag.already.exists=Svaz s tímto názvem již existuje +get.your.union.verified.to.access.advanced.features=Pro přístup k pokročilým funkcím ověřte váš svaz +union.created=Svaz {0} vytvořen not.enough.leaders.online.to.vote.on.demotion=Není k dispozici dostatek vedoucích představitelů online aby mohli hlasovat o tomto snížení -player.is.not.a.leader.of.your.clan=CHráč není členem žádného svazu -clan.has.been.disbanded=Svaz {0} byl rozpuštěn -the.player.is.already.member.of.another.clan=§4Tento hrac uz je vudce jineho svazu. +player.is.not.a.leader.of.your.union=CHráč není členem žádného svazu +union.has.been.disbanded=Svaz {0} byl rozpuštěn +the.player.is.already.member.of.another.union=§4Tento hrac uz je vudce jineho svazu. has.been.asked.to.join={0} byl nastaven na\: {1} you.cannot.kick.yourself=Nemůžete vyhodit sami sebe -total.clans=Celkem svazů\: +total.unions=Celkem svazů\: legend=Legendární\: kill.type.civilian=Způsob zabití\: {0}Civilista -clan.0=Svaz\: {0} +union.0=Svaz\: {0} status.0=Status\: {0} rank.0=Hodnost\: {0} kdr.0=KDR\: {0} inactive.0=Neaktivní\: {0} -clan.commands=svaz příkazy +union.commands=svaz příkazy you.can.only.modify.the.color.and.case.of.the.tag=Můžete změnit pouze barvu a písmena tagu tag.changed.to.0=Tag změněn na {0} 0.tag.changed.to.1=&bÚspěšně změněn tag {0} na {1} @@ -384,7 +384,7 @@ leaders.0=Vůdce\: {0} allies.0=Spojenci\: {0} rivals.0=Rivaly\: {0} other.player.must.be.online=&cHráč musí být online\! -the.player.does.not.have.the.permissions.to.lead.a.clan=Hráč nemá oprávnění vést svaz +the.player.does.not.have.the.permissions.to.lead.a.union=Hráč nemá oprávnění vést svaz start=start end=konec add=přidat @@ -405,12 +405,12 @@ diamond=diamant gold=zlato wood=dřevo server.announce=Oznámení serveru -clan.announce=Oznámení svazu +union.announce=Oznámení svazu leader.announce=Oznámení vůdce hunger=Hlad stone=kámen iron=železo -the.clan.cannot.be.rivaled=Svaz nemůže být soupeřem +the.union.cannot.be.rivaled=Svaz nemůže být soupeřem bboff=BB vypnuto bbon=BB zapnuto gui.allies.title=Spojenci diff --git a/src/main/resources/messages_de_DE.properties b/src/main/resources/messages_de_DE.properties index 55aec2cb..e8135ce9 100644 --- a/src/main/resources/messages_de_DE.properties +++ b/src/main/resources/messages_de_DE.properties @@ -66,7 +66,7 @@ admin.command=admin mod.command=mod promote.command=befördern demote.command=herunterstufen -clanff.command=clanff +unionff.command=unionff ff.command=ff resign.command=zurücktreten disband.command=auflösen @@ -106,7 +106,7 @@ acf-core.parameter.tag=markierung acf-core.parameter.name=Name acf-core.parameter.description=beschreibung acf-core.parameter.player=spieler -acf-core.parameter.clan=union +acf-core.parameter.union=union acf-core.parameter.type=typ acf-core.parameter.order=bestellung acf-core.parameter.help=seite oder schlüsselwörter @@ -149,8 +149,8 @@ command.description.ff.allow=Setzt dein persönliches Freundliches Feuer auf erl command.description.ff.auto=Setzt dein persönliches Freundliches Feuer auf automatisch command.description.globalff.allow=Setzt das globale Freundliche Feuer auf erlaubt command.description.globalff.auto=Setzt das globale Freundliche Feuer auf auto -command.description.clanff.allow=Setzt das Freundliche Feuer des Unionen auf erlaubt -command.description.clanff.block=Setzt das Freundliche Feuer des Unionen auf auto +command.description.unionff.allow=Setzt das Freundliche Feuer des Unionen auf erlaubt +command.description.unionff.block=Setzt das Freundliche Feuer des Unionen auf auto command.description.description=Unionbeschreibung festlegen command.description.ban=Bannt einen Spieler von Union-Befehlen command.description.unban=Entbannt einen Spieler von Union-Befehlen @@ -178,7 +178,7 @@ command.description.untrust=Vertrauen eines Union-Mitgliedes zurückziehen command.description.resign=Verlasse deinen Union command.description.help=Zeige die Hilfe an oder suche in ihr command.description.ally.add=Eine Allianz hinzufügen -command.description.clan=Öffnet die GUI +command.description.union=Öffnet die GUI command.description.disband=Löse deinen Union auf command.description.mod.disband=Löst einen Union auf command.description.mod.kick=Verbanne ein Mitglied aus deinem Union @@ -234,7 +234,7 @@ command.description.mod.locale=Stellt die Sprache der Spieler ein home-menu=/{0} Home{1} - Teleportiert dich in die Union Basis home-set-menu=/{0} Home set{1} - Setzt die Union Basis home-clear-menu=/{0} Home clear{1} - Entfernt die Union Basis -clan=Union +union=Union allies=Alliierte alliances=allianzen coords=koordinaten @@ -244,7 +244,7 @@ coords.upper=Koordinaten world=Welt kdr=KDR members=Mitglieder -clans.lower=unionen +unions.lower=unionen rival=Rivale civilian=Zivilist neutral=Neutral @@ -288,9 +288,9 @@ nokillsfound=Keine Kills gefunden promoted.to.leader={0} wurde zum Anführer befördert. denied.demotion={0} hat die Abwertung von {1} abgelehnt. Konsens fehlgeschlagen. membership.invitation={0} hat die Einladung zur Mitgliedschaft abgelehnt -joined.the.clan={0} ist dem Union beigetreten +joined.the.union={0} ist dem Union beigetreten signed.off.request.cancelled={0} hat sich abgemeldet. {1} Anfrage abgebrochen. -clan.deletion={0} hat die Löschung des Unionen abgelehnt. Konsens fehlgeschlagen. +union.deletion={0} hat die Löschung des Unionen abgelehnt. Konsens fehlgeschlagen. rename.refused={0} hat die Union-Umbenennung abgelehnt. Einverständnis verweigert. has.been.disbanded=Union {0} wurde aufgelöst denied.the.promotion={0} hat die Beförderung von {1}abgelehnt. Konsens fehlgeschlagen. @@ -326,9 +326,9 @@ mysql.connection.failed=Verbindung fehlgeschlagen sqlite.connection.successful=Verbindung erfolgreich sqlite.connection.failed= Verbindung fehlgeschlagen purging.player.data=säubere Spielerdaten\: {0} -purging.clan=Säubere Union\: {0} -clan.players=Union Spieler\: {0} -clans=Unionen\: {0} +purging.union=Säubere Union\: {0} +union.players=Union Spieler\: {0} +unions=Unionen\: {0} banned=Dir wurde verboten Union-Commands zu benutzen nothing.more.to.see=Nichts mehr zu sehen nothing.to.vote=&cNichts zum Akzeptieren oder Ablehnen @@ -341,78 +341,78 @@ bulletin.board.header=&8* &e{0} &fBekanntmachungsbrett bulletin.board.message={0}\: &f{1} has.been.disbanded.rivalry.ended={0} wurde aufgelöst. Rivalität beendet. has.been.disbanded.alliance.ended={0} wurde aufgelöst. Allianz beendet. -clan.disbanded=Union aufgelöst +union.disbanded=Union aufgelöst 1.color.day=1 {0}Tag many.color.days={0}{1} Tage insufficient.permissions=Unzureichende Berechtigungen -clan.is.not.verified=Union ist nicht verifiziert -player.not.a.member.of.any.clan=&cDer Spieler ist kein Mitglied eines Unionen -not.a.member.of.any.clan=Du bist kein Mitglied in einem Union +union.is.not.verified=Union ist nicht verifiziert +player.not.a.member.of.any.union=&cDer Spieler ist kein Mitglied eines Unionen +not.a.member.of.any.union=Du bist kein Mitglied in einem Union minimum.to.make.alliance=Dein Union muss mindestens {0} Spieler haben um Allianzen zu bilden -cannot.be.same.clan=&cDu musst einen anderen Union als deinen einfügen\! -other.clan.not.verified=&cDer andere Union wurde nicht verifiziert\! -your.clans.are.not.allies=Deine Unionen sind keine Verbündeten +cannot.be.same.union=&cDu musst einen anderen Union als deinen einfügen\! +other.union.not.verified=&cDer andere Union wurde nicht verifiziert\! +your.unions.are.not.allies=Deine Unionen sind keine Verbündeten has.broken.the.alliance={0} hat die Allianz mit {1} aufgelöst at.least.one.leader.accept.the.alliance=Mindestens ein Anführer des Unionen muss online sein um die Allianz zu akzeptieren leaders.have.been.asked.for.an.alliance={0} Anführer wurden nach einer Allianz gefragt -your.clans.are.already.allies=Eure Unionen sind bereits verbündet -your.clan.cannot.create.rivals=Dein Union kann keine Rivalen haben +your.unions.are.already.allies=Eure Unionen sind bereits verbündet +your.union.cannot.create.rivals=Dein Union kann keine Rivalen haben min.players.rivalries=Dein Union muss mindestens {0} Spieler haben um Rivalitäten einzugehen this.player.is.already.banned=Dieser Spieler ist bereits gebannt player.added.to.banned.list=Spieler zur Bannliste hinzugefügt you.banned=Dir würde verboten Union Commands einzusetzen -clan.wide.friendly.fire.blocked=Unionweiter Teambeschuss blockiert -clan.wide.friendly.fire.is.allowed=Unionweiter Teambeschuss ist erlaubt +union.wide.friendly.fire.blocked=Unionweiter Teambeschuss blockiert +union.wide.friendly.fire.is.allowed=Unionweiter Teambeschuss ist erlaubt you.are.the.only.member.online=Du bist das einzige Mitglied, dass online ist -your.clan.color.tag.cannot.be.longer.than.characters=&cDer farbige Tag deines Unionen darf nicht länger als {0} Zeichen sein -your.clan.tag.cannot.be.longer.than.characters=&cDer Tag deines Unionen kann nicht länger als {0} Buchstaben bzw. Zeichen lang sein -your.clan.tag.must.be.longer.than.characters=&cDer Tag deines Unionen muss länger als {0} Buchstaben bzw. Zeichen sein +your.union.color.tag.cannot.be.longer.than.characters=&cDer farbige Tag deines Unionen darf nicht länger als {0} Zeichen sein +your.union.tag.cannot.be.longer.than.characters=&cDer Tag deines Unionen kann nicht länger als {0} Buchstaben bzw. Zeichen lang sein +your.union.tag.must.be.longer.than.characters=&cDer Tag deines Unionen muss länger als {0} Buchstaben bzw. Zeichen sein your.tag.cannot.contain.the.following.colors=&cDer Tag deines Unionen kann die Farbe "{0}" nicht enthalten your.tag.doesnt.meet.the.requirements=&cDer Tag deines Unionen erfüllt nicht die Anforderungen. your.tag.cannot.contain.color.codes=&cDer Tag deines Unionen darf keine Farbcodes enthalten -your.clan.tag.can.only.contain.letters.numbers.and.color.codes=&cDer Tag deines Unionen darf nur Buchstaben, Nummern und Farbcodes enthalten +your.union.tag.can.only.contain.letters.numbers.and.color.codes=&cDer Tag deines Unionen darf nur Buchstaben, Nummern und Farbcodes enthalten you.cannot.set.colored.ranks=Du kannst keine farbigen Ränge setzen -your.clan.name.cannot.be.longer.than.characters=Dein Union-Name darf nicht länger als {0} Zeichen sein -your.clan.name.must.be.longer.than.characters=Der Name deines Unionen muss länger als {0} Zeichen sein -your.clan.name.cannot.contain.color.codes=Der Name deines Unionen darf keine Farbcodes enthalten +your.union.name.cannot.be.longer.than.characters=Dein Union-Name darf nicht länger als {0} Zeichen sein +your.union.name.must.be.longer.than.characters=Der Name deines Unionen muss länger als {0} Zeichen sein +your.union.name.cannot.contain.color.codes=Der Name deines Unionen darf keine Farbcodes enthalten that.tag.name.is.disallowed=&cDieser Union Tag ist verboten you.must.first.resign=Du musst zuerst aus {0} zurücktreten -clan.with.this.tag.already.exists=Ein Union mit diesem Tag ist bereits vorhanden -get.your.clan.verified.to.access.advanced.features=Lass deinen Union verifizieren, um auf erweiterte Funktionen zuzugreifen -clan.created=Union {0} erstellt +union.with.this.tag.already.exists=Ein Union mit diesem Tag ist bereits vorhanden +get.your.union.verified.to.access.advanced.features=Lass deinen Union verifizieren, um auf erweiterte Funktionen zuzugreifen +union.created=Union {0} erstellt not.enough.leaders.online.to.vote.on.demotion=Es sind nicht genügend Anführer online um über diese Degradierung abzustimmen demotion.vote.has.been.requested.from.all.leaders=Abstimmung über die Degradierung wurde von allen Führern beantragt -player.is.not.a.leader.of.your.clan=Der Spieler ist kein Anführer deines Unionen +player.is.not.a.leader.of.your.union=Der Spieler ist kein Anführer deines Unionen player.is.not.a.leader=Der Spieler ist kein Anführer -clan.has.been.disbanded=Union {0} wurde aufgelöst -clan.disband.vote.has.been.requested.from.all.leaders=Gildenauflösung wurde von allen Führern beantragt -friendy.fire.is.now.managed.by.your.clan=Friendy-fire wird jetzt von deinem Union verwaltet +union.has.been.disbanded=Union {0} wurde aufgelöst +union.disband.vote.has.been.requested.from.all.leaders=Gildenauflösung wurde von allen Führern beantragt +friendy.fire.is.now.managed.by.your.union=Friendy-fire wird jetzt von deinem Union verwaltet personal.friendly.fire.is.set.to.allowed=Persönliches Friendy-fire ist erlaubt -global.friendy.fire.is.now.managed.by.each.clan=Globales Friendy-fire wird nun von jedem Union verwaltet -global.friendy.fire.is.already.being.managed.by.each.clan=Globales Friendy-fire wird bereits von jedem Union verwaltet +global.friendy.fire.is.now.managed.by.each.union=Globales Friendy-fire wird nun von jedem Union verwaltet +global.friendy.fire.is.already.being.managed.by.each.union=Globales Friendy-fire wird bereits von jedem Union verwaltet global.friendly.fire.is.set.to.allowed=Globales Friendy-fire ist erlaubt global.friendly.fire.is.already.being.allowed=Globales Friendy-fire ist bereits erlaubt -the.player.doesn.t.not.have.the.permissions.to.join.clans=Der Spieler hat nicht die Berechtigungen, Unionen beizutreten +the.player.doesn.t.not.have.the.permissions.to.join.unions=Der Spieler hat nicht die Berechtigungen, Unionen beizutreten you.cannot.invite.yourself=Du kannst dich nicht einladen you.did.not.answer.in.time=Du hast nicht rechtzeitig geantwortet, abgebrochen... -this.player.is.banned.from.using.clan.commands=Dieser Spieler ist von der Verwendung von Union-Befehlen ausgeschlossen -the.player.is.already.member.of.another.clan=Der Spieler ist bereits Mitglied eines anderen Unionen +this.player.is.banned.from.using.union.commands=Dieser Spieler ist von der Verwendung von Union-Befehlen ausgeschlossen +the.player.is.already.member.of.another.union=Der Spieler ist bereits Mitglied eines anderen Unionen has.been.asked.to.join={0} wurde gebeten, {1} beizutreten you.cannot.kick.yourself=Du kannst dich nicht selbst kicken\! -the.player.is.not.a.member.of.your.clan=Der Spieler ist kein Mitglied deines Unionen +the.player.is.not.a.member.of.your.union=Der Spieler ist kein Mitglied deines Unionen you.cannot.kick.another.leader=Du kannst keinen anderen Anführer kicken has.been.kicked.by={0} wurde von {1} kickt -no.clans.have.been.created=Es wurden keine Unionen erstellt -total.clans=Gesamte Unionen\: +no.unions.have.been.created=Es wurden keine Unionen erstellt +total.unions=Gesamte Unionen\: legend=Legende\: kill.type.civilian=Töte Typ\: {0}Zivilist no.player.data.found=Keine Spielerdaten gefunden -clan.0=Union\: {0} +union.0=Union\: {0} status.0=Status\:{0} rank.0=Rang\: {0} kdr.0=KDR\: {0} inactive.0=Inaktiv\: {0} -clan.commands=union Befehle +union.commands=union Befehle you.can.only.modify.the.color.and.case.of.the.tag=Du kannst nur die Farbe und die Gros- / Kleinschreibung dieses Tags ändern locale.has.been.changed=&cDeine Sprache wurde geändert locale.is.prohibited=&cSprachauswahl ist auf dem Server verboten. @@ -424,11 +424,11 @@ leaders.0=Anführer\:{0} allies.0=Allianz\: {0} rivals.0=Rivalen\: {0} other.player.must.be.online=&cDer Spieler muss online sein\! -the.player.does.not.have.the.permissions.to.lead.a.clan=Der Spieler hat nicht die Berechtigung einen Union zu führen +the.player.does.not.have.the.permissions.to.lead.a.union=Der Spieler hat nicht die Berechtigung einen Union zu führen you.cannot.promote.yourself=Du kannst dich nicht selbst befördern\! the.player.is.already.a.leader=Der Spieler ist bereits Anführer configuration.reloaded=Konfiguration neugeladen -last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.clan=Der letzter Anführer kann nicht zurücktreten. Du musst einen anderen Anführer ernennen oder den Union auflösen +last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.union=Der letzter Anführer kann nicht zurücktreten. Du musst einen anderen Anführer ernennen oder den Union auflösen 0.has.resigned={0} ist zurückgetreten you.cannot.trust.yourself=Du kannst dir selbst nicht vertrauen leaders.are.already.trusted=Anführer sind bereits vertrauenswürdig @@ -436,23 +436,23 @@ this.player.is.already.trusted=Diesem Spieler wird schon vertraut has.been.given.trusted.status.by={1} vertraut nun dem Spieler {0} this.player.is.not.banned=Dieser Spieler ist nicht gebannt player.removed.from.the.banned.list=Spieler wurde von der Bannliste entfernt -you.have.been.unbanned.from.clan.commands=Du wurdest von den Union-Befehlen entbannt +you.have.been.unbanned.from.union.commands=Du wurdest von den Union-Befehlen entbannt you.cannot.untrust.yourself=Du kannst dir nicht selbst Misstrauen leaders.cannot.be.untrusted=Anführern kann nicht Misstrauen werden this.player.is.already.untrusted=Diesem Spieler wird schon nicht vertraut has.been.given.untrusted.status.by={1} vertraut nun nicht mehr dem Spieler {0} -the.clan.does.not.exist=Der Union existiert nicht -the.clan.is.already.verified=Der Union ist bereits verifiziert -the.clan.has.been.verified=Der Union wurde verifiziert -clan.0.has.been.verified=Gilde {0} wurde verifiziert\! -total.clan.players.0=Gesamt Union-Spieler\: {0} +the.union.does.not.exist=Der Union existiert nicht +the.union.is.already.verified=Der Union ist bereits verifiziert +the.union.has.been.verified=Der Union wurde verifiziert +union.0.has.been.verified=Gilde {0} wurde verifiziert\! +total.union.players.0=Gesamt Union-Spieler\: {0} proposing.war={0} schlägt vor, mit dem Union {1} einen Krieg zu beginnen you.can.only.start.war.with.rivals=Du kannst einen Krieg nur mit einem Rivalen beginnen leaders.have.been.asked.to.accept.the.war.request={0} Anführer wurden angefragt die Kriegsanfrage anzunehmen leaders.asked.to.end.rivalry={0} Anführer wurden gebeten den Unionkrieg zu beenden proposing.to.end.the.war={0} möchte den Unionkrieg mit {1} beenden -clans.already.at.war=Deine Unionen sind bereits in einem Krieg -clans.not.at.war=Keiner deiner Unionen führen aktuell einen Krieg +unions.already.at.war=Deine Unionen sind bereits in einem Krieg +unions.not.at.war=Keiner deiner Unionen führen aktuell einen Krieg you.are.at.war={0} ist ist aktuell in einem Krieg mit {1} denied.war.req={0} hat die Anfrage zu einem Unionkrieg von {1} nicht angenommen you.are.no.longer.at.war={0} ist nicht mehr in einem Krieg mit {1} @@ -480,12 +480,12 @@ diamond=Diamant gold=Gold wood=Holz server.announce=Server Ankündigung -clan.announce=Union Ankündigung +union.announce=Union Ankündigung leader.announce=Anführer Ankündigung hunger=Hunger stone=Stein iron=Eisen -the.clan.cannot.be.rivaled=Der Union kann nicht rivalieren +the.union.cannot.be.rivaled=Der Union kann nicht rivalieren bboff=BB ausgeschaltet bbon=BB angeschaltet inviteon=Einladung eingeschaltet\n @@ -509,30 +509,30 @@ waiting.for.teleport.stand.still.for.0.seconds=Warte auf Teleportation, bleibe s on=An off=Aus player.rank.changed=Rang würde gesetzt -your.clans.are.already.rivals=Eure Unionen sind bereits Rivalen +your.unions.are.already.rivals=Eure Unionen sind bereits Rivalen cleared.bb=Das schwarze Brett wurde gelöscht -clan.balance=Union-Kontostand\: {0} -clan.admin.balance={0}''s Kontostand\: {1} -bb.clan.deposit=Es wurden {0} von {1} eingezahlt -player.clan.deposit=Du hast {0} überwiesen -bb.clan.withdraw=Es wurden {0} von {1} abgehoben -bb.clan.take=Es wurden {0} abgebucht von {1} -bb.clan.give={0} hast du bekommen von {1} -bb.clan.set=Dein Kontostand wurde auf {0} gesetzt von {1} -player.clan.withdraw=Du hast {0} abgebucht -clan.admin.take=Du hast {0} von {1}s Konto abgehoben -clan.admin.give=Du hast {0} an die Bank von {1} gegeben -clan.admin.set=Du hast {0}''s Bankkonto auf {1} gesetzt -clan.admin.bank.not.enough.money=Das Konto von {0} verfügt nicht über genügend Geld. -clan.bank.not.enough.money=Das Konto von deinem Union ist nicht ausreichend gedeckt -your.clans.are.not.rivals=Eure Unionen sind keine Rivalen -the.clan.members.reached.limit=Dein Union hat das Mitgliederlimit erreicht -this.clan.has.reached.the.member.limit=&bDieser Union hat das Mitgliederlimit erreicht +union.balance=Union-Kontostand\: {0} +union.admin.balance={0}''s Kontostand\: {1} +bb.union.deposit=Es wurden {0} von {1} eingezahlt +player.union.deposit=Du hast {0} überwiesen +bb.union.withdraw=Es wurden {0} von {1} abgehoben +bb.union.take=Es wurden {0} abgebucht von {1} +bb.union.give={0} hast du bekommen von {1} +bb.union.set=Dein Kontostand wurde auf {0} gesetzt von {1} +player.union.withdraw=Du hast {0} abgebucht +union.admin.take=Du hast {0} von {1}s Konto abgehoben +union.admin.give=Du hast {0} an die Bank von {1} gegeben +union.admin.set=Du hast {0}''s Bankkonto auf {1} gesetzt +union.admin.bank.not.enough.money=Das Konto von {0} verfügt nicht über genügend Geld. +union.bank.not.enough.money=Das Konto von deinem Union ist nicht ausreichend gedeckt +your.unions.are.not.rivals=Eure Unionen sind keine Rivalen +the.union.members.reached.limit=Dein Union hat das Mitgliederlimit erreicht +this.union.has.reached.the.member.limit=&bDieser Union hat das Mitgliederlimit erreicht you.have.reseted.your.kdr=Du hast deine KDR zurückgesetzt you.have.reseted.0.kdr=Du hast die KDR von {0} zurückgesetzt you.have.reseted.kdr.of.all.players=Du hast die KDR von allen Spielern zurückgesetzt -you.have.successfully.renamed.your.clan=&bDu hast deinen Union erfolgreich zu {0} umbenannt -you.have.successfully.renamed.the.clan=&bDu hast den Union erfolgreich zu {0} umbenannt +you.have.successfully.renamed.your.union=&bDu hast deinen Union erfolgreich zu {0} umbenannt +you.have.successfully.renamed.the.union=&bDu hast den Union erfolgreich zu {0} umbenannt you.have.toggled.permanent.status=Sie haben den permanenten Status für {0} umgeschaltet permanent.status.enabled=Der permanente Status deines Unionen wurde von {0} aktiviert permanent.status.disabled=Der permanente Status deines Unionen wurde von {0} deaktiviert @@ -556,11 +556,11 @@ bb.one.hour=1 Stunde bb.days= \ tage bb.one.day=1 Tag player.purged=Der Spieler wurde erfolgreich entfernt -your.clan.description.must.be.longer.than=Die Unionbeschreibung muss mehr als {0} Zeichen betragen -your.clan.description.cannot.be.longer.than=Deine Unionbeschreibung darf nicht länger als {0} Zeichen betragen +your.union.description.must.be.longer.than=Die Unionbeschreibung muss mehr als {0} Zeichen betragen +your.union.description.cannot.be.longer.than=Deine Unionbeschreibung darf nicht länger als {0} Zeichen betragen description.changed=Du hast erfolgreich die Beschreibung deines Unionen geändert no.description=Keine Beschreibung -the.player.must.wait.0.before.joining.your.clan.again=Dieser Spieler muss {0} Minute(n) warten, bevor er erneut deinem Union beitreten kann +the.player.must.wait.0.before.joining.your.union.again=Dieser Spieler muss {0} Minute(n) warten, bevor er erneut deinem Union beitreten kann disabled.command=Deaktivierter Befehl rank.displayname.updated=Der Anzeigename des Ranges wurde aktualisiert\! rank.setdefault=Der Standardrang des Unionen wurde zu {0} gesetzt @@ -573,18 +573,18 @@ rank.created=Rang erstellt permission.0.added.to.rank.1=Die Berechtigung {0} wurde dem Rang {1} hinzugefügt permission.0.removed.from.rank.1=Die Berechtigung {0} wurde von dem Rang {1} entfernt rank.0.deleted=Rang {0} gelöscht -clans.ranks=Union Ränge\: +unions.ranks=Union Ränge\: ranks.list.item={0}\# {1} ({2}) no.ranks=Keine Ränge erstellt rank.no.permissions=Dieser Rang hat bisher keinerlei Berechtigungen player.unassigned.from.rank=Spieler ist dem Rang nicht zugewiesen you.must.be.0.or.have.the.permission.1.to.use.this=Du musst {0} sein, oder dein Anführer muss deinem Rang die die Berechtigung {1} geben, um dies zu benutzen -deposit.not.allowed=Überweisung ist nicht erlaubt. Benutze /%clan %toggle %deposit um die Überweisung zu erlauben -withdraw.not.allowed=Abbuchen ist nicht erlaubt. Benutze /%clan %toggle %withdraw um das Abbuchen zu erlauben +deposit.not.allowed=Überweisung ist nicht erlaubt. Benutze /%union %toggle %deposit um die Überweisung zu erlauben +withdraw.not.allowed=Abbuchen ist nicht erlaubt. Benutze /%union %toggle %withdraw um das Abbuchen zu erlauben resign.request.cancelled=Rücktrittsanfrage abgebrochen disband.request.cancelled=Rücktrittsanfrage abgebrochen resetkdr.request.cancelled=KDR-Zurücksetzungsanfrage abgebrochen -clan.create.request.cancelled=Unionerstellung abgebrochen +union.create.request.cancelled=Unionerstellung abgebrochen rank.create.request.cancelled=Rangerstellung abgebrochen promotion.vote.has.been.requested.from.all.leaders=Das Wählen der Beförderung wurde von allen Anführern angefordert rename.vote.has.been.requested.from.all.leaders=&bAbstimmung über Umbenennung wurde von allen Union-Leadern angefragt @@ -601,11 +601,10 @@ gui.lore.no.permission=&cDu hast keine Berechtigung, dies zu sehen\! gui.main.title={0} - Union-Menü gui.main.languageselector.title=&fWähle deine Sprache gui.main.languageselector.lore.left.click=&7Linksklick, um Ihre Sprache zu wählen -gui.main.languageselector.lore.right.click=&7Rechtsklick um beim Übersetzen zu helfen gui.main.other.commands.title=&fAndere Befehle gui.main.other.commands.lore=&7Linksklick, um alle Unionbefehle anzuzeigen -gui.main.clan.list.title=&fUnion Liste -gui.main.clan.list.lore=&7Linksklick, um die Unionliste anzuzeigen +gui.main.union.list.title=&fUnion Liste +gui.main.union.list.lore=&7Linksklick, um die Unionliste anzuzeigen gui.main.reset.kdr.title=&f Setze KDR zurück gui.main.reset.kdr.lore=&7Linksklick zum Zurücksetzen deiner KDR gui.main.leaderboard.title=&fRangliste @@ -613,8 +612,8 @@ gui.main.leaderboard.lore=&7Linksklick, um die Rangliste zu sehen gui.main.staff.title=&fTeam gui.main.staff.lore=&7Linksklick zum Öffnen des Team Menüs gui.staff.title=Team -gui.staff.clan.list.lore.left.click=&7Linksklick um alle Unionen zu sehen -gui.staff.clan.list.lore.right.click=&7Rechtsklick um alle Unionen anzeigen zu lassen, welche nicht verifiziert sind +gui.staff.union.list.lore.left.click=&7Linksklick um alle Unionen zu sehen +gui.staff.union.list.lore.right.click=&7Rechtsklick um alle Unionen anzeigen zu lassen, welche nicht verifiziert sind gui.player.list.title=Spieler Liste gui.staff.player.list.title=&fSpieler Liste gui.staff.player.list.lore.left.click=&7Linksklick um alle Spieler anzuzeigen @@ -624,8 +623,8 @@ gui.staff.global.ff.lore.status=&7Status\: &b{0} gui.staff.global.ff.lore.toggle=&7Linksklick um den Friendly Fire Status umzuschalten gui.staff.reload.title=&fneu laden gui.staff.reload.lore=&7Linksklick um das Plugin neu zu laden -gui.staff.clanlist.unverified.title=Anzahl nicht verifizierter Unionen\: {0} -gui.staff.clanlist.toplace.title=Wähle den neuen Union von {0} +gui.staff.unionlist.unverified.title=Anzahl nicht verifizierter Unionen\: {0} +gui.staff.unionlist.toplace.title=Wähle den neuen Union von {0} gui.warning.title=Warnung gui.warning.no.permission.title=&fkeine Berechtigung gui.warning.no.permission.plugin.lore=&7Du hast nicht die ausreichende Berechtigung um diese Aktion auszuführen\! @@ -634,20 +633,20 @@ gui.warning.no.permission.rank.lore=&/Du musst den Rang {0} besitzen oder dein A gui.warning.not.verified.title=&fNicht verifiziert gui.warning.not.verified.lore=&7Dein Union muss verifiziert sein\! gui.allies.title=Alliierte -gui.allies.clan.lore=&7Rechtsklick um diese Allianz zu entfernen +gui.allies.union.lore=&7Rechtsklick um diese Allianz zu entfernen gui.allies.add.title=&fFüge eine Allianz hinzu gui.add.ally.title=Füge eine Allianz hinzu -gui.add.ally.clan.lore=&7Linksklick um mit diesem Union eine Allianz einzugehen +gui.add.ally.union.lore=&7Linksklick um mit diesem Union eine Allianz einzugehen gui.rivals.title=Rivalen -gui.rivals.clan.lore=&7Rechtsklick um diese Rivalität zu beenden +gui.rivals.union.lore=&7Rechtsklick um diese Rivalität zu beenden gui.rivals.add.title=&fStarte eine Rivalität gui.add.rival.title=Starte eine Rivalität -gui.add.rival.clan.lore=&7Linksklick um mit diesem Union eine Rivalität zu Starten -gui.clanlist.title=Anzahl aller Unionen\: {0} -gui.clanlist.clan.title=&fUnion\: [{0}&f] {1} -gui.clanlist.clan.lore.position=&b\#{0} -gui.clanlist.clan.lore.kdr=&7KDR\: &b{0} -gui.clanlist.clan.lore.members=&4Mitglieder\: &b{0} +gui.add.rival.union.lore=&7Linksklick um mit diesem Union eine Rivalität zu Starten +gui.unionlist.title=Anzahl aller Unionen\: {0} +gui.unionlist.union.title=&fUnion\: [{0}&f] {1} +gui.unionlist.union.lore.position=&b\#{0} +gui.unionlist.union.lore.kdr=&7KDR\: &b{0} +gui.unionlist.union.lore.members=&4Mitglieder\: &b{0} gui.coords.title=Koordinaten gui.coords.player.lore.distance=&7Distanz\: &b{0} gui.coords.player.lore.coords=&7Koordinaten\: &b{0} {1} {2} @@ -677,83 +676,83 @@ gui.permissions.permission.lore=&7Rechtsklick um diese Berechtigung von von dem gui.add.permission.title=Berechtigung hinzufügen gui.add.permission.permission.title=&f{0} gui.add.permission.permission.lore=&7Linksklick um diese Berechtigung dem Rang hinzuzufügen -gui.clandetails.title=[{0}] {1} -gui.clandetails.free.agent.title=&fFreier Agent -gui.clandetails.free.agent.create.clan.price.lore=&7Preis\: &b{0} -gui.clandetails.free.agent.create.clan.lore=&7Linksklick, um einen Union zu erstellen -gui.clandetails.clan.title=&f[{0}&f] {1} -gui.clandetails.clan.lore.description=&7Beschreibung\: &b{0} -gui.clandetails.clan.lore.status=&7Status\: &b{0} -gui.clandetails.clan.lore.leaders=&7Anführer\: &b{0} -gui.clandetails.clan.lore.online.members=&7Mitglieder Online\: &b{0}/{1} -gui.clandetails.clan.lore.kdr=&7KDR\: &b{0} -gui.clandetails.clan.lore.kill.totals=&7Anzahl aller Kills\: &b[Rivalen\:{0} Neutral\:{1} Zivillisten\:{2}] -gui.clandetails.clan.lore.deaths=&7Tode\: &b{0} +gui.uniondetails.title=[{0}] {1} +gui.uniondetails.free.agent.title=&fFreier Agent +gui.uniondetails.free.agent.create.union.price.lore=&7Preis\: &b{0} +gui.uniondetails.free.agent.create.union.lore=&7Linksklick, um einen Union zu erstellen +gui.uniondetails.union.title=&f[{0}&f] {1} +gui.uniondetails.union.lore.description=&7Beschreibung\: &b{0} +gui.uniondetails.union.lore.status=&7Status\: &b{0} +gui.uniondetails.union.lore.leaders=&7Anführer\: &b{0} +gui.uniondetails.union.lore.online.members=&7Mitglieder Online\: &b{0}/{1} +gui.uniondetails.union.lore.kdr=&7KDR\: &b{0} +gui.uniondetails.union.lore.kill.totals=&7Anzahl aller Kills\: &b[Rivalen\:{0} Neutral\:{1} Zivillisten\:{2}] +gui.uniondetails.union.lore.deaths=&7Tode\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.allies.separator=&b, +gui.uniondetails.union.lore.allies.separator=&b, # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.rivals.separator=&b, -gui.clandetails.clan.lore.allies=&7Allianz\: &b{0} -gui.clandetails.clan.lore.rivals=&7Rivalen\: &b{0} -gui.clandetails.clan.lore.founded=&7Gegründet\: &b{0} -gui.clandetails.clan.lore.inactive=&7Inaktiv\:{0}/{1} Tage -gui.clandetails.allies.title=&fAllianzen -gui.clandetails.allies.lore=&7Linksklick um deine Allianzen anzuzeigen oder um neue einzugehen -gui.clandetails.rivals.title=&fRivalen -gui.clandetails.rivals.lore=&7Linksklick um deine Rivalitäten anzuzeigen oder neue hinzuzufügen -gui.clandetails.roster.title=Dienstplan -gui.clandetails.roster.lore=&7Linksklick, um die Mitglieder deines Unionen zu sehen oder mehr einzuladen -gui.staffclandetails.roster.lore=&7Linksklick, um die Mitglieder des Unionen zu sehen -gui.clandetails.coords.title=&fKoordinaten -gui.clandetails.coords.lore=&7Linksklick, um die Koordinaten der Mitglieder deines Unionen zu sehen -gui.clandetails.home.title=&fBasis -gui.clandetails.home.lore.teleport.price=&7Teleport-Preis\: &b{0} -gui.clandetails.home.lore.teleport=&7Linksklick um zu deiner Union Basis zu kommen -gui.staffclandetails.home.lore.teleport=&7Linksklick um dich zur Basis deines Unionen zu teleportieren -gui.clandetails.home.lore.clear=&7Lass den Gegenstand fallen, um das Zuhause deines Unionen zu löschen -gui.clandetails.home.lore.set.price=&7Setze Preis\: &b{0} -gui.clandetails.home.lore.set=&7Rechtsklick um das Haus deines Unionen zu setzen -gui.staffclandetails.home.lore.set=&7Rechtsklick um das Haus dieses Unionen zu setzen -gui.clandetails.regroup.title=&fRegruppieren -gui.clandetails.regroup.lore.price=&7Preis\: &b{0} -gui.clandetails.regroup.lore.home=&7Linksklick, um die Mitglieder des Unionen neu zu gruppieren -gui.clandetails.regroup.lore.me=&7Rechtsklick, um die Mitglieder deines Unionen an deinem Standort neu zu gruppieren -gui.clandetails.ff.title=&fFreundliches Feuer -gui.clandetails.ff.personal.lore=&7Personal\: &b{0} -gui.clandetails.ff.clan.lore=&7Union\: &b{0} -gui.clandetails.ff.personal.toggle.lore=&7Linksklick, um dein Friendly Fire umzuschalten -gui.clandetails.ff.clan.toggle.lore=&7Rechtsklick, um das Friendly Fire deines Unionen umzuschalten -gui.clandetails.bank.title=&fBank -gui.clandetails.bank.balance.lore=&7Kontostand\: &b{0} -gui.clandetails.bank.withdraw.status.lore=&7Auszahlung\: &b{0} -gui.clandetails.bank.deposit.status.lore=&7Einzahlung\: &b{0} -gui.clandetails.bank.withdraw.toggle.lore=&7Lass den Gegenstand fallen, um den Status der Rücknahme umzuschalten -gui.clandetails.bank.deposit.toggle.lore=&7Rechtsklick, um den Status der Einzahlung umzuschalten -gui.clandetails.rank.title=&fRang -gui.clandetails.rank.lore=&7Linksklick um den Rang von dem Union zu sehen und um ihn zu bearbeiten -gui.clandetails.verified.title=&fVerifiziert -gui.clandetails.not.verified.title=&fNicht verifiziert -gui.clandetails.verify.price.lore=&7Preis\: &b{0} -gui.clandetails.not.verified.lore=&7Linksklick um deinen Union zu verifizieren -gui.staffclandetails.not.verified.lore=&7Linksklick um diesen Union zu verifizieren -gui.clandetails.resign.title=&fZurücktreten -gui.clandetails.resign.lore=&7Linksklick um aus deinem Union zurückzutreten -gui.clandetails.disband.title=&fAuflösen -gui.clandetails.disband.lore=&7Lass den Gegenstand fallen, um deinen Union aufzulösen -gui.staffclandetails.disband.lore=&7Linksklick um diesen Union aufzulösen -gui.clandetails.chat.title=&fChat -gui.clandetails.chat.clan.chat.lore=&7/{0} [message] - &bSendet eine Nachricht an den Union Chat -gui.clandetails.chat.clan.join.leave.lore=&7/{0} {1}/{2} - &bBetritt/verlässt den Union-Chat -gui.clandetails.chat.ally.chat.lore=&7/{0} [message] - &bSendet eine Nachricht an den Allianzchat -gui.clandetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bBetritt/verlässt den Allianzchat -gui.clandetails.chat.clan.status.lore=&7Union\: &b{0} -gui.clandetails.chat.ally.status.lore=&7Allianz\: &b{0} -gui.clandetails.chat.clan.toggle.lore=&7Linksklick, um den Union-Chat-Status zu wechseln -gui.clandetails.chat.ally.toggle.lore=&7Rechtsklick, um den Allianzchat zu wechseln +gui.uniondetails.union.lore.rivals.separator=&b, +gui.uniondetails.union.lore.allies=&7Allianz\: &b{0} +gui.uniondetails.union.lore.rivals=&7Rivalen\: &b{0} +gui.uniondetails.union.lore.founded=&7Gegründet\: &b{0} +gui.uniondetails.union.lore.inactive=&7Inaktiv\:{0}/{1} Tage +gui.uniondetails.allies.title=&fAllianzen +gui.uniondetails.allies.lore=&7Linksklick um deine Allianzen anzuzeigen oder um neue einzugehen +gui.uniondetails.rivals.title=&fRivalen +gui.uniondetails.rivals.lore=&7Linksklick um deine Rivalitäten anzuzeigen oder neue hinzuzufügen +gui.uniondetails.roster.title=Dienstplan +gui.uniondetails.roster.lore=&7Linksklick, um die Mitglieder deines Unionen zu sehen oder mehr einzuladen +gui.staffuniondetails.roster.lore=&7Linksklick, um die Mitglieder des Unionen zu sehen +gui.uniondetails.coords.title=&fKoordinaten +gui.uniondetails.coords.lore=&7Linksklick, um die Koordinaten der Mitglieder deines Unionen zu sehen +gui.uniondetails.home.title=&fBasis +gui.uniondetails.home.lore.teleport.price=&7Teleport-Preis\: &b{0} +gui.uniondetails.home.lore.teleport=&7Linksklick um zu deiner Union Basis zu kommen +gui.staffuniondetails.home.lore.teleport=&7Linksklick um dich zur Basis deines Unionen zu teleportieren +gui.uniondetails.home.lore.clear=&7Lass den Gegenstand fallen, um das Zuhause deines Unionen zu löschen +gui.uniondetails.home.lore.set.price=&7Setze Preis\: &b{0} +gui.uniondetails.home.lore.set=&7Rechtsklick um das Haus deines Unionen zu setzen +gui.staffuniondetails.home.lore.set=&7Rechtsklick um das Haus dieses Unionen zu setzen +gui.uniondetails.regroup.title=&fRegruppieren +gui.uniondetails.regroup.lore.price=&7Preis\: &b{0} +gui.uniondetails.regroup.lore.home=&7Linksklick, um die Mitglieder des Unionen neu zu gruppieren +gui.uniondetails.regroup.lore.me=&7Rechtsklick, um die Mitglieder deines Unionen an deinem Standort neu zu gruppieren +gui.uniondetails.ff.title=&fFreundliches Feuer +gui.uniondetails.ff.personal.lore=&7Personal\: &b{0} +gui.uniondetails.ff.union.lore=&7Union\: &b{0} +gui.uniondetails.ff.personal.toggle.lore=&7Linksklick, um dein Friendly Fire umzuschalten +gui.uniondetails.ff.union.toggle.lore=&7Rechtsklick, um das Friendly Fire deines Unionen umzuschalten +gui.uniondetails.bank.title=&fBank +gui.uniondetails.bank.balance.lore=&7Kontostand\: &b{0} +gui.uniondetails.bank.withdraw.status.lore=&7Auszahlung\: &b{0} +gui.uniondetails.bank.deposit.status.lore=&7Einzahlung\: &b{0} +gui.uniondetails.bank.withdraw.toggle.lore=&7Lass den Gegenstand fallen, um den Status der Rücknahme umzuschalten +gui.uniondetails.bank.deposit.toggle.lore=&7Rechtsklick, um den Status der Einzahlung umzuschalten +gui.uniondetails.rank.title=&fRang +gui.uniondetails.rank.lore=&7Linksklick um den Rang von dem Union zu sehen und um ihn zu bearbeiten +gui.uniondetails.verified.title=&fVerifiziert +gui.uniondetails.not.verified.title=&fNicht verifiziert +gui.uniondetails.verify.price.lore=&7Preis\: &b{0} +gui.uniondetails.not.verified.lore=&7Linksklick um deinen Union zu verifizieren +gui.staffuniondetails.not.verified.lore=&7Linksklick um diesen Union zu verifizieren +gui.uniondetails.resign.title=&fZurücktreten +gui.uniondetails.resign.lore=&7Linksklick um aus deinem Union zurückzutreten +gui.uniondetails.disband.title=&fAuflösen +gui.uniondetails.disband.lore=&7Lass den Gegenstand fallen, um deinen Union aufzulösen +gui.staffuniondetails.disband.lore=&7Linksklick um diesen Union aufzulösen +gui.uniondetails.chat.title=&fChat +gui.uniondetails.chat.union.chat.lore=&7/{0} [message] - &bSendet eine Nachricht an den Union Chat +gui.uniondetails.chat.union.join.leave.lore=&7/{0} {1}/{2} - &bBetritt/verlässt den Union-Chat +gui.uniondetails.chat.ally.chat.lore=&7/{0} [message] - &bSendet eine Nachricht an den Allianzchat +gui.uniondetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bBetritt/verlässt den Allianzchat +gui.uniondetails.chat.union.status.lore=&7Union\: &b{0} +gui.uniondetails.chat.ally.status.lore=&7Allianz\: &b{0} +gui.uniondetails.chat.union.toggle.lore=&7Linksklick, um den Union-Chat-Status zu wechseln +gui.uniondetails.chat.ally.toggle.lore=&7Rechtsklick, um den Allianzchat zu wechseln gui.playerdetails.title={0} gui.playerdetails.player.title=&f{0} -gui.playerdetails.player.lore.noclan=&7Union\: &bKeinen -gui.playerdetails.player.lore.clan=&7Union\: &b[{0}&b] {1} +gui.playerdetails.player.lore.nounion=&7Union\: &bKeinen +gui.playerdetails.player.lore.union=&7Union\: &b[{0}&b] {1} gui.playerdetails.player.lore.rank=&7Rang\: &b{0} gui.playerdetails.player.lore.status=&7Status\: &b{0} gui.playerdetails.player.lore.kdr=&7KDR\: &b{0} @@ -762,8 +761,8 @@ gui.playerdetails.player.lore.deaths=&7Tode\: &b{0} gui.playerdetails.player.lore.join.date=&7Beitrittsdatum\: &b{0} gui.playerdetails.player.lore.last.seen=&7Zuletzt gesehen\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.playerdetails.player.lore.past.clans.separator=&b, -gui.playerdetails.player.lore.past.clans=&7Letzte Unionen\: &b{0} +gui.playerdetails.player.lore.past.unions.separator=&b, +gui.playerdetails.player.lore.past.unions=&7Letzte Unionen\: &b{0} gui.playerdetails.player.lore.inactive=&7Inaktiv\:{0}/{1} Tage gui.playerdetails.kick.title=&fKick gui.playerdetails.promote.demote.title=&fBeförderung/Degradieren @@ -787,55 +786,53 @@ gui.languageselector.title=Sprachen - Aktuell\: {0} gui.languageselector.language.title=&f{0} gui.languageselector.language.lore.left.click=&7Linksklick, um dies als Ihre Sprache zu setzen gui.languageselector.language.lore.translation.status=&7Übersetzungsstatus\: &b{0}% -gui.languageselector.language.lore.right.click=&7Rechtsklick um beim Übersetzen zu helfen gui.confirmation.title=Bestätigung gui.confirmation.confirm=&7Klicke hier, um zu bestätigen gui.confirmation.return=&7Hier klicken um zurückzukehren gui.not.supported=&cWährend dem Öffnen der GUI ist ein Fehler aufgetretren... Deaktivieren der GUI... Hast du die richtige Version heruntergeladen? -staff.member.verify.clan=&cEin Admin muss deinen Union verifizieren\! +staff.member.verify.union=&cEin Admin muss deinen Union verifizieren\! player.already.has.that.rank=&cDer Spieler hat bereits diesen Rang\! -joined.clan.chat=&bDu bist dem Union-Chat beigetreten -already.joined.clan.chat=&bDu bist bereits dem Union-Chat beigetreten -left.clan.chat=&bDu hast den Union-Chat verlassen -muted.clan.chat=&bDu hast den Union-Chat stumm geschaltet -unmuted.clan.chat=&bDu hast den Union-Chat freigeschaltet +joined.union.chat=&bDu bist dem Union-Chat beigetreten +already.joined.union.chat=&bDu bist bereits dem Union-Chat beigetreten +left.union.chat=&bDu hast den Union-Chat verlassen +muted.union.chat=&bDu hast den Union-Chat stumm geschaltet +unmuted.union.chat=&bDu hast den Union-Chat freigeschaltet joined.ally.chat=&bDu hast dem Allianzchat beigetreten left.ally.chat=&bDu hast den Allianzchat verlassen muted.ally.chat=&bDu hast den Allianz-Chat stumm gemacht unmuted.ally.chat=&bDu hast den Allianzchat freigeschaltet already.joined.ally.chat=&bDu bist bereits dem Allianzchat beigetreten -player.already.in.this.clan=&cDer Spieler ist bereits in diesem Union -your.clan.reached.max.alliances=&cDein Union hat die maximale Anzahl an Allianzen erreicht -other.clan.reached.max.alliances=&cDer andere Union hat die maximale Anzahl an Allianzen erreicht -insert.clan.tag=&bFüge den Union-Tag ein (oder "{0}")\: -insert.clan.name=&bDem Union einen Namen geben\: +player.already.in.this.union=&cDer Spieler ist bereits in diesem Union +your.union.reached.max.alliances=&cDein Union hat die maximale Anzahl an Allianzen erreicht +other.union.reached.max.alliances=&cDer andere Union hat die maximale Anzahl an Allianzen erreicht +insert.union.tag=&bFüge den Union-Tag ein (oder "{0}")\: +insert.union.name=&bDem Union einen Namen geben\: insert.rank.name=&bRangname einfügen (oder "{0}")\: -click.to.help.translating=&bKlicke auf diesen Link &r{0} &bum bei der Übersetzung zu helfen -your.clan.must.have.members.to.verify=&cDein Union muss mindestens {0} Mitglieder haben um verifiziert werden zu können\! +your.union.must.have.members.to.verify=&cDein Union muss mindestens {0} Mitglieder haben um verifiziert werden zu können\! you.must.hold.a.banner=&cDu musst einen Banner in deiner Hand halten\! -you.changed.clan.banner=&bDu hast den Banner deines Unionen geändert\! -your.clan.already.verified=&cDein Union ist bereits verifiziert\! +you.changed.union.banner=&bDu hast den Banner deines Unionen geändert\! +your.union.already.verified=&cDein Union ist bereits verifiziert\! # suppress inspection "TrailingSpacesInProperty" -clan.profile=\n&b%clan_name%&7 Profil &8-------------------------------------------\n \n &7Name\: &e[&8%clan_color_tag%&e] &b%clan_name%\n &7Beschreibung\: &f%clan_description%\n &7Status\: &f%clan_status%\n &7Anführer\: %clan_leaders%\n &7Mitglieder Online\: &f%clan_online_count%&7/&f%clan_size%\n &7KDR\: &e%clan_kdr%\n &7Anzahl aller Kills\: &8[Rivalen\:&f%clan_rival_kills% &8Verbündete\:&f%clan_ally_kills% &8Neutrale\:&f%clan_neutral_kills% &8Zivilisten\:&f%clan_civilian_kills%&8]\n &7Tode\: &f%clan_deaths%\n &7Allianzen\: &f%clan_allies%\n &7Rivalen\: &f%clan_rivals%\n &7Gegründet\: &f%clan_founded%\n &7Inaktiv\: &f%clan_inactive_days%&7/&f%clan_max_inactive_days% Tage\n -player.lookup.clanname=&e[&8%clan_color_tag%&e] &b%clan_name% +union.profile=\n&b%union_name%&7 Profil &8-------------------------------------------\n \n &7Name\: &e[&8%union_color_tag%&e] &b%union_name%\n &7Beschreibung\: &f%union_description%\n &7Status\: &f%union_status%\n &7Mitglieder Online\: &f%union_online_count%&7/&f%union_size%\n &7KDR\: &e%union_kdr%\n &7Anzahl aller Kills\: &8[Rivalen\:&f%union_rival_kills% &8Verbündete\:&f%union_ally_kills% &8Neutrale\:&f%union_neutral_kills% &8Zivilisten\:&f%union_civilian_kills%&8]\n &7Tode\: &f%union_deaths%\n &7Allianzen\: &f%union_allies%\n &7Rivalen\: &f%union_rivals%\n &7Gegründet\: &f%union_founded%\n &7Inaktiv\: &f%union_inactive_days%&7/&f%union_max_inactive_days% Tage\n +player.lookup.unionname=&e[&8%union_color_tag%&e] &b%union_name% # suppress inspection "TrailingSpacesInProperty" player.lookup.killtype=&7Kill-Typ\: %player_kill_type%\n -player.lookup=&b%player_name%&7s Spielerinfo&8-------------------------------------------\n \n &7Union\: &f%clan_name%\n &7Rang\: &f%player_rank%\n &7Status\: &f%player_status%\n &7KDR\: &e%player_kdr%\n &7Kills\: &8[Rivalen\:&f%player_rival_kills% &8Verbündete\:&7%player_ally_kills% &8Neutral\:&f%player_neutral_kills% &8Zivilisten\:&f%player_civilian_kills%&8]\n &7Tode\: &f%player_deaths%\n &7Beitrittsdatum\: &f%player_join_date%\n &7Zuletzt gesehen\: &f%player_last_seen%\n &7Vergangene Unionen\: &f%player_past_clans%\n &7Inaktiv\: &f%player_inactive_days%&7/&f%player_max_inactive_days% days\n %kill_type_line% +player.lookup=&b%player_name%&7s Spielerinfo&8-------------------------------------------\n \n &7Union\: &f%union_name%\n &7Status\: &f%player_status%\n &7KDR\: &e%player_kdr%\n &7Kills\: &8[Rivalen\:&f%player_rival_kills% &8Verbündete\:&7%player_ally_kills% &8Neutral\:&f%player_neutral_kills% &8Zivilisten\:&f%player_civilian_kills%&8]\n &7Tode\: &f%player_deaths%\n &7Beitrittsdatum\: &f%player_join_date%\n &7Zuletzt gesehen\: &f%player_last_seen%\n &7Vergangene Unionen\: &f%player_past_unions%\n &7Inaktiv\: &f%player_inactive_days%&7/&f%player_max_inactive_days% days\n %kill_type_line% economy.disabled=&cWirtschaft deaktiviert\! has.been.purged=Die Daten von {0} wurden entfernt accepted.invitation=&bDu hast die Einladung von {0} angenommen denied.invitation=&cDu hast die Einladung von {0} abgelehnt -must.be.in.clan.to.pvp=&cDu und {0} müsst Mitglieder eines Unionen sein um gegeneinander kämpfen zu können\! -clans.not.at.war.pvp.denied=&cDein union ist nicht mit {0} im Krieg\! +must.be.in.union.to.pvp=&cDu und {0} müsst Mitglieder eines Unionen sein um gegeneinander kämpfen zu können\! +unions.not.at.war.pvp.denied=&cDein union ist nicht mit {0} im Krieg\! cannot.attack.civilians=&cDu kannst keine Zivilisten angreifen\! -cannot.attack.clan.member=&cDu kannst kein anderes Unionmitglied angreifen\! +cannot.attack.union.member=&cDu kannst kein anderes Unionmitglied angreifen\! cannot.attack.ally=&cDu kannst keine Allianz angreifen\! cannot.send.discord.message=Du kannst keine Nachrichten an {0} senden. Du bist kein Mitglied dieses Unionen\! discordhook.is.disabled=&cDie Discord-Integration ist deaktiviert oder nicht verfügbar\! -your.clan.doesnt.have.any.linked.player=Dein Union hat keine verbundenen Spieler -your.clan.doesnt.have.minimum.linked.player=Dein Union hat keine Mindestanzahl an verbundenen Spielern -your.clan.is.not.on.the.whitelist=Dein Union ist nicht auf der Whitelist -your.clan.already.has.channel=Dein Union hat bereits einen Discord-Kanal +your.union.doesnt.have.any.linked.player=Dein Union hat keine verbundenen Spieler +your.union.doesnt.have.minimum.linked.player=Dein Union hat keine Mindestanzahl an verbundenen Spielern +your.union.is.not.on.the.whitelist=Dein Union ist nicht auf der Whitelist +your.union.already.has.channel=Dein Union hat bereits einen Discord-Kanal discord.reached.category.limit=Discord hat die Kategoriengrenze erreicht\! discord.reached.channels.limit=Discord hat das Limit der Kanäle erreicht\! discord.created.successfully=&bDiscord-Kanal wurde erfolgreich erstellt\! @@ -845,19 +842,19 @@ cannot.kick.last.leader=&cDu kannst den letzten Anführer nicht rauswerfen\! cannot.disband.permanent=&cDu kannst diesen Union nicht auflösen. Er hat einen permanenten Status. you.can.only.set.base.in.your.land=&cDu kannst dein Zuhause nur auf deinem eigenen Land in Anspruch nehmen\! only.leaders.can.create.lands=&cNur ein Anführer kann ein Land erstellen\! -only.one.land.per.clan=&cDein Union besitzt bereits ein Land\! -only.clan.members.can.create.lands=&cNur Unionmitglieder können Land erstellen\! +only.one.land.per.union=&cDein Union besitzt bereits ein Land\! +only.union.members.can.create.lands=&cNur Unionmitglieder können Land erstellen\! land.allowed.all.actions=&bAlle Aktionen sind nun erlaubt\! land.blocked.all.actions=&bAlle Aktionen sind nicht mehr erlaubt\! land.allowed.action=&bErlaubte Aktion\! land.blocked.action=&bVerbotene Aktion\! you.do.not.own.lands=&cDu besitzt kein Land\! land.sharing.disabled=&cDas Teilen von Land ist deaktiviert\! -clan.chat.disabled=Union Chat ist deaktiviert\! +union.chat.disabled=Union Chat ist deaktiviert\! ally.chat.disabled=&cAllianz-Chat ist deaktiviert\! war.expired=Der Krieg mit {0} ist abgelaufen\! you.cant.start.war.online.members.difference=Du kannst den Krieg nicht starten. Ein Union mehr aktive Mitglieder, als der andere. invitedplayer.invite.off=Dieser Spieler hat Union-Einladungen deaktiviert user.hasnt.played.before=&cDieser Benutzer hat vorher nicht gespielt -clan.list.balance.header=\n{0} &7obere Bilanz &8-----------------------\n \n&8Gesamte Unionen\: &7{1}\n \n&8\#&7. &8Union &7- &8Balance -clan.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} +union.list.balance.header=\n{0} &7obere Bilanz &8-----------------------\n \n&8Gesamte Unionen\: &7{1}\n \n&8\#&7. &8Union &7- &8Balance +union.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} diff --git a/src/main/resources/messages_es_ES.properties b/src/main/resources/messages_es_ES.properties index 5f2ded27..b5549cb3 100644 --- a/src/main/resources/messages_es_ES.properties +++ b/src/main/resources/messages_es_ES.properties @@ -66,7 +66,7 @@ admin.command=admin mod.command=mod promote.command=promote demote.command=demote -clanff.command=clanff +unionff.command=unionff ff.command=ff resign.command=resign disband.command=disband @@ -104,7 +104,7 @@ acf-core.parameter.tag=etiqueta acf-core.parameter.name=name acf-core.parameter.description=description acf-core.parameter.player=jugador -acf-core.parameter.clan=union +acf-core.parameter.union=union acf-core.parameter.type=tipo acf-core.parameter.order=orden acf-core.parameter.help=página o palabras clave @@ -147,8 +147,8 @@ command.description.ff.allow=&7Establece tu fuego amigo personal en permitido. command.description.ff.auto=&7Establece tu fuego amigo personal en automático. command.description.globalff.allow=&7Establece fuego amigo global en permitido. command.description.globalff.auto=&7Establece fuego amigo global en automático. -command.description.clanff.allow=&7Establece el fuego amigo de tu union en permitido. -command.description.clanff.block=&7Bloquea el fuego amigo de tu union. +command.description.unionff.allow=&7Establece el fuego amigo de tu union en permitido. +command.description.unionff.block=&7Bloquea el fuego amigo de tu union. command.description.description=&7Establece la descripción de tu union. command.description.ban=&7Banea a un jugador de los comandos del union. command.description.unban=&7Desbloquea a un jugador de los comandos del union. @@ -176,7 +176,7 @@ command.description.untrust=&7Desconfía en un miembro. command.description.resign=&7Renuncia a tu union. command.description.help=&7Muestra esta ayuda o busca en la ayuda. command.description.ally.add=&7Agrega un aliado. -command.description.clan=&7Abre el menú. +command.description.union=&7Abre el menú. command.description.disband=&7Disuelve tu union. command.description.mod.disband=&7Disuelve un union. command.description.mod.kick=&7Expulsa a un jugador de un union. @@ -232,7 +232,7 @@ command.description.mod.locale=Elige el idioma del jugador home-menu=/{0} home{1} - Telertransportate a la casa del union home-set-menu=/{0} home set{1} - Fija la casa del union home-clear-menu=/{0} home clear{1} - Remueve la casa del union -clan=Union +union=Union allies=Aliados alliances=alliances coords=coords @@ -242,7 +242,7 @@ coords.upper=Coordenadas world=Mundo kdr=KDR members=Miembros -clans.lower=uniones +unions.lower=uniones rival=Rival civilian=Civil neutral=Neutral @@ -286,9 +286,9 @@ nokillsfound=No se han encontrado asesinatos promoted.to.leader={0} ha sido promovido a lider denied.demotion={0} se ha denegado la degradacion de {1}. Consenso fallido. membership.invitation={0} ha denegado la invitacion a miembro -joined.the.clan={0} se ha unido al union +joined.the.union={0} se ha unido al union signed.off.request.cancelled={0} ha terminado. {1} pedido cancelado. -clan.deletion={0} denego la eliminacion del union. Consenso fallido. +union.deletion={0} denego la eliminacion del union. Consenso fallido. rename.refused={0} a rechazado el cambio de nombre. Error. has.been.disbanded=El union {0} ha sido disuelto denied.the.promotion={0} denego promover a {1}. Consenso fallido. @@ -324,9 +324,9 @@ mysql.connection.failed=MySQL Connection failed sqlite.connection.successful=SQLite Connection successful sqlite.connection.failed= SQLite Connection failed purging.player.data=purgando informacion de\: {0} -purging.clan=Purgando union\: {0} -clan.players=Jugadores del union\: {0} -clans=Uniones\: {0} +purging.union=Purgando union\: {0} +union.players=Jugadores del union\: {0} +unions=Uniones\: {0} banned=Fuiste baneado de usar comandos de uniones nothing.more.to.see=Nada mas que ver nothing.to.vote=&cNada que aceptar o denegar @@ -339,78 +339,78 @@ bulletin.board.header=&8* &e{0} &fbulletin board bulletin.board.message={0}\: &f{1} has.been.disbanded.rivalry.ended={0} ha sido disuelto. La rivalidad ha finalizado. has.been.disbanded.alliance.ended={0} ha sido disuelto. La alianza ha finalizado. -clan.disbanded=Union Disuelto +union.disbanded=Union Disuelto 1.color.day=1 {0}dia many.color.days={0}{1} dias insufficient.permissions=Permisos insuficientes -clan.is.not.verified=El union no esta verificado -player.not.a.member.of.any.clan=&8(&cUnion&8)&7 El jugador no es miembro de ningún union. -not.a.member.of.any.clan=No eres un miembro de ningun union +union.is.not.verified=El union no esta verificado +player.not.a.member.of.any.union=&8(&cUnion&8)&7 El jugador no es miembro de ningún union. +not.a.member.of.any.union=No eres un miembro de ningun union minimum.to.make.alliance=Tu union debe tener por lo menos {0} para hacer alianzas -cannot.be.same.clan=&cDebes introducir un union distinto al tuyo\! -other.clan.not.verified=&8(&cUnion&8)&7 ¡El otro union no está verificado\! -your.clans.are.not.allies=Sus uniones no son aliados +cannot.be.same.union=&cDebes introducir un union distinto al tuyo\! +other.union.not.verified=&8(&cUnion&8)&7 ¡El otro union no está verificado\! +your.unions.are.not.allies=Sus uniones no son aliados has.broken.the.alliance={0} ha roto la alianza con {1} at.least.one.leader.accept.the.alliance=Por lo menos un lider del otro union debe estar conectado para hacer la alianza leaders.have.been.asked.for.an.alliance=Los lideres de {0} fueron consultados para realizar una alianza -your.clans.are.already.allies=Sus uniones ya son aliados -your.clan.cannot.create.rivals=Tu union no puede crear rivales +your.unions.are.already.allies=Sus uniones ya son aliados +your.union.cannot.create.rivals=Tu union no puede crear rivales min.players.rivalries=Tu union debe tener por lo menos {0} para crear una rivalidad this.player.is.already.banned=Este jugador ya esta baneado player.added.to.banned.list=Jugador agregado a la lista de ban you.banned=Fuiste baneado de usar comandos de uniones -clan.wide.friendly.fire.blocked=Fuego amigo para todo el union bloqueado -clan.wide.friendly.fire.is.allowed=Fuego amigo para todo el union permitido +union.wide.friendly.fire.blocked=Fuego amigo para todo el union bloqueado +union.wide.friendly.fire.is.allowed=Fuego amigo para todo el union permitido you.are.the.only.member.online=Eres el unico miembro conectados -your.clan.color.tag.cannot.be.longer.than.characters=&8(&cUnion&8)&7 La etiqueta de color de tu union no puede ser más larga que &c{0}&7 caracteres. -your.clan.tag.cannot.be.longer.than.characters=&El tag de tu union no puede ser mas largo que {0} caracteres -your.clan.tag.must.be.longer.than.characters=&cEl tag de tu union debe ser mas largo que {0} caracteres +your.union.color.tag.cannot.be.longer.than.characters=&8(&cUnion&8)&7 La etiqueta de color de tu union no puede ser más larga que &c{0}&7 caracteres. +your.union.tag.cannot.be.longer.than.characters=&El tag de tu union no puede ser mas largo que {0} caracteres +your.union.tag.must.be.longer.than.characters=&cEl tag de tu union debe ser mas largo que {0} caracteres your.tag.cannot.contain.the.following.colors=&cTu tag no puede contener los siguientes formatos de colores\: {0} your.tag.doesnt.meet.the.requirements=&cTu tag no cumple con los requisitos. your.tag.cannot.contain.color.codes=&cTu tag no puede contener formato de colores -your.clan.tag.can.only.contain.letters.numbers.and.color.codes=&cEl tag de tu union solo puede contener letras, numeros y formato de colores +your.union.tag.can.only.contain.letters.numbers.and.color.codes=&cEl tag de tu union solo puede contener letras, numeros y formato de colores you.cannot.set.colored.ranks=No puedes poner rangos con color -your.clan.name.cannot.be.longer.than.characters=El nombre de tu union no puede ser mas largo que {0} caracteres -your.clan.name.must.be.longer.than.characters=El nombre de tu union debe ser mas largo que {0} caracteres -your.clan.name.cannot.contain.color.codes=El nombre de tu union no puede contener formato de colores +your.union.name.cannot.be.longer.than.characters=El nombre de tu union no puede ser mas largo que {0} caracteres +your.union.name.must.be.longer.than.characters=El nombre de tu union debe ser mas largo que {0} caracteres +your.union.name.cannot.contain.color.codes=El nombre de tu union no puede contener formato de colores that.tag.name.is.disallowed=&cEse nombre de tag no está permitido you.must.first.resign=Primero debes abandonar {0} -clan.with.this.tag.already.exists=Un union con ese tag ya existe -get.your.clan.verified.to.access.advanced.features=Verifica tu union para acceder a funcionalidades avanzadas -clan.created=Union {0} creado +union.with.this.tag.already.exists=Un union con ese tag ya existe +get.your.union.verified.to.access.advanced.features=Verifica tu union para acceder a funcionalidades avanzadas +union.created=Union {0} creado not.enough.leaders.online.to.vote.on.demotion=No hay suficientes lideres conectados para votar esta degradacion demotion.vote.has.been.requested.from.all.leaders=Voto para degradar fue solicitado por todos los lideres -player.is.not.a.leader.of.your.clan=El jugador no es un lider de tu union +player.is.not.a.leader.of.your.union=El jugador no es un lider de tu union player.is.not.a.leader=El jugador no es un líder -clan.has.been.disbanded=El union {0} ha sido disuelto -clan.disband.vote.has.been.requested.from.all.leaders=Voto para disolver union fue solicitado por todos los lideres -friendy.fire.is.now.managed.by.your.clan=Fuego amigo es ahora manejado por tu union +union.has.been.disbanded=El union {0} ha sido disuelto +union.disband.vote.has.been.requested.from.all.leaders=Voto para disolver union fue solicitado por todos los lideres +friendy.fire.is.now.managed.by.your.union=Fuego amigo es ahora manejado por tu union personal.friendly.fire.is.set.to.allowed=Fuego amigo personal fue habilitado -global.friendy.fire.is.now.managed.by.each.clan=Fuego amigo global es ahora manejado por cada union -global.friendy.fire.is.already.being.managed.by.each.clan=Fuego amigo global ya es manejado por cada union +global.friendy.fire.is.now.managed.by.each.union=Fuego amigo global es ahora manejado por cada union +global.friendy.fire.is.already.being.managed.by.each.union=Fuego amigo global ya es manejado por cada union global.friendly.fire.is.set.to.allowed=Fuego amigo global fue habilitado global.friendly.fire.is.already.being.allowed=Fuego amigo global ya esta habilitado -the.player.doesn.t.not.have.the.permissions.to.join.clans=El jugador no tiene permisos para unirse a uniones +the.player.doesn.t.not.have.the.permissions.to.join.unions=El jugador no tiene permisos para unirse a uniones you.cannot.invite.yourself=No puedes invitarte a vos mismo you.did.not.answer.in.time=No respondiste a tiempo, cancelando... -this.player.is.banned.from.using.clan.commands=Este jugador fue baneado de usar comandos de uniones -the.player.is.already.member.of.another.clan=El jugador es miembro de otro union +this.player.is.banned.from.using.union.commands=Este jugador fue baneado de usar comandos de uniones +the.player.is.already.member.of.another.union=El jugador es miembro de otro union has.been.asked.to.join={0} te ha solicitado unirte a {1} you.cannot.kick.yourself=No puedes expulsarte a vos mismo -the.player.is.not.a.member.of.your.clan=El jugador no es un miembro de tu union +the.player.is.not.a.member.of.your.union=El jugador no es un miembro de tu union you.cannot.kick.another.leader=No puedes expulsar a un lider has.been.kicked.by={0} fue expulsado por {1} -no.clans.have.been.created=Ningun union fue creado -total.clans=Uniones Totales\: +no.unions.have.been.created=Ningun union fue creado +total.unions=Uniones Totales\: legend=Leyenda\: kill.type.civilian=Tipo de Asesinato\: {0}Civil no.player.data.found=No se encontro informacion de jugador -clan.0=Union\: {0} +union.0=Union\: {0} status.0=Estatus\: {0} rank.0=Rango\: {0} kdr.0=KDR\: {0} inactive.0=Inactivo\: {0} -clan.commands=comandos de union +union.commands=comandos de union you.can.only.modify.the.color.and.case.of.the.tag=Solo se puede modificar el color de la etiqueta locale.has.been.changed=&cEl idioma ha sido cambiado tag.changed.to.0=Tag cambiado a {0} @@ -421,11 +421,11 @@ leaders.0=Lideres\: {0} allies.0=Aliados\: {0} rivals.0=Rivales\: {0} other.player.must.be.online=&cEl jugador debe estar en linea\! -the.player.does.not.have.the.permissions.to.lead.a.clan=El jugador no tiene permiso de ser lider de un union +the.player.does.not.have.the.permissions.to.lead.a.union=El jugador no tiene permiso de ser lider de un union you.cannot.promote.yourself=No puedes promoverte a ti mismo the.player.is.already.a.leader=El jugador ya es un lider configuration.reloaded=Configuracion reiniciada -last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.clan=&8(&cUnion&8)&7 El último líder no puede renunciar. Debes nombrar a otro líder o disolver el union. +last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.union=&8(&cUnion&8)&7 El último líder no puede renunciar. Debes nombrar a otro líder o disolver el union. 0.has.resigned={0} ha abandonado you.cannot.trust.yourself=No puedes ponerte como confiable a vos mismo leaders.are.already.trusted=Lideres ya son confiables @@ -433,23 +433,23 @@ this.player.is.already.trusted=Este jugador ya es confiable has.been.given.trusted.status.by={0} le han dado estatus de confiable por {1} this.player.is.not.banned=Este jugador no esta baneado player.removed.from.the.banned.list=Jugador desbaneado -you.have.been.unbanned.from.clan.commands=Fuiste desbaneado de usar comandos de uniones +you.have.been.unbanned.from.union.commands=Fuiste desbaneado de usar comandos de uniones you.cannot.untrust.yourself=No puedes ponerte como no confiable a vos mismo leaders.cannot.be.untrusted=Lideres no pueden ser no confiables this.player.is.already.untrusted=Este jugador ya es no confiable has.been.given.untrusted.status.by={0} le han dado estatus de no confiable por {1} -the.clan.does.not.exist=El union no existe -the.clan.is.already.verified=El union ya esta verificado -the.clan.has.been.verified=El union fue verificado -clan.0.has.been.verified=Union {0} fue verificado\! -total.clan.players.0=Total de jugadores del union\: {0} +the.union.does.not.exist=El union no existe +the.union.is.already.verified=El union ya esta verificado +the.union.has.been.verified=El union fue verificado +union.0.has.been.verified=Union {0} fue verificado\! +total.union.players.0=Total de jugadores del union\: {0} proposing.war={0} esta proponiendo comenzar una guerra con {1} you.can.only.start.war.with.rivals=Solo puedes comenzar una guerra con rivales leaders.have.been.asked.to.accept.the.war.request=Los lideres del union {0} fueron solicitados de aceptar la solicitud de guerra leaders.asked.to.end.rivalry=Los lideres del union {0} fueron solicitados de terminar la guerra proposing.to.end.the.war={0} esta proponiendo terminar la guerra con {1} -clans.already.at.war=Sus uniones ya estan en guerra -clans.not.at.war=Sus uniones no estan en guerra +unions.already.at.war=Sus uniones ya estan en guerra +unions.not.at.war=Sus uniones no estan en guerra you.are.at.war={0} esta ahora en guerra con {1} denied.war.req={0} denego la solicitud de guerra de {1} you.are.no.longer.at.war={0} no esta mas en guerra con {1} @@ -477,12 +477,12 @@ diamond=diamante gold=oro wood=madera server.announce=Anuncio del Servidor -clan.announce=Anuncio del Union +union.announce=Anuncio del Union leader.announce=Anuncio del Lider hunger=Hambre stone=piedra iron=hierro -the.clan.cannot.be.rivaled=El union no puede hacerse rival +the.union.cannot.be.rivaled=El union no puede hacerse rival bboff=Tabla de anuncios desactivada bbon=Tabla de anuncios activada inviteon=Invitaciones activadas @@ -506,30 +506,30 @@ waiting.for.teleport.stand.still.for.0.seconds=Esperando para teletransportar, q on=on off=off player.rank.changed=El rango se ha asignado -your.clans.are.already.rivals=Sus uniones ya son rivales +your.unions.are.already.rivals=Sus uniones ya son rivales cleared.bb=Has limpiado el tablón de anuncios -clan.balance=Balance del Union\: {0} -clan.admin.balance=&8(&cUnion&8)&7 El dinero del union &c{0}&7 es\: &c{1}&7. -bb.clan.deposit={0} fueron depositados por {1} -player.clan.deposit=Has depositado {0} -bb.clan.withdraw={0} fueron retirados por {1} -bb.clan.take={0} fueron agarrados por {1} -bb.clan.give={0} fueron dados por {1} -bb.clan.set={0} fueron establecidos por {1} -player.clan.withdraw=Has retirado {0} -clan.admin.take=&8(&cUnion&8)&7 Tomaste &c{0}&7 del banco de &c{1}&7. -clan.admin.give=&8(&cUnion&8)&7 Diste &c{0}&7 al banco de &c{1}&7. -clan.admin.set=&8(&cUnion&8)&7 Estableciste el dinero del banco de &c{0}&7 a &c{1}&7. -clan.admin.bank.not.enough.money=&8(&cUnion&8)&7 ¡El banco de &c{0}&7 no tiene suficiente dinero\! -clan.bank.not.enough.money=El banco de tu union no tiene suficientes fondos -your.clans.are.not.rivals=Sus uniones no son rivales -the.clan.members.reached.limit=&8(&cUnion&8)&7 Los miembros de tu union alcanzaron el límite. -this.clan.has.reached.the.member.limit=? ¡Este equipo ya alcanzó el límite de miembros\! +union.balance=Balance del Union\: {0} +union.admin.balance=&8(&cUnion&8)&7 El dinero del union &c{0}&7 es\: &c{1}&7. +bb.union.deposit={0} fueron depositados por {1} +player.union.deposit=Has depositado {0} +bb.union.withdraw={0} fueron retirados por {1} +bb.union.take={0} fueron agarrados por {1} +bb.union.give={0} fueron dados por {1} +bb.union.set={0} fueron establecidos por {1} +player.union.withdraw=Has retirado {0} +union.admin.take=&8(&cUnion&8)&7 Tomaste &c{0}&7 del banco de &c{1}&7. +union.admin.give=&8(&cUnion&8)&7 Diste &c{0}&7 al banco de &c{1}&7. +union.admin.set=&8(&cUnion&8)&7 Estableciste el dinero del banco de &c{0}&7 a &c{1}&7. +union.admin.bank.not.enough.money=&8(&cUnion&8)&7 ¡El banco de &c{0}&7 no tiene suficiente dinero\! +union.bank.not.enough.money=El banco de tu union no tiene suficientes fondos +your.unions.are.not.rivals=Sus uniones no son rivales +the.union.members.reached.limit=&8(&cUnion&8)&7 Los miembros de tu union alcanzaron el límite. +this.union.has.reached.the.member.limit=? ¡Este equipo ya alcanzó el límite de miembros\! you.have.reseted.your.kdr=Has reseteado tu KDR you.have.reseted.0.kdr=Has reseteado el KDR de {0} you.have.reseted.kdr.of.all.players=Has reseteado el KDR de todos los jugadores -you.have.successfully.renamed.your.clan=&bTu union renombrado correctamente a {0} -you.have.successfully.renamed.the.clan=&bEl Union renombrado correctamente a {0} +you.have.successfully.renamed.your.union=&bTu union renombrado correctamente a {0} +you.have.successfully.renamed.the.union=&bEl Union renombrado correctamente a {0} you.have.toggled.permanent.status=&8(&cUnion&8)&7 Has cambiado el estado permanente de &c{0}&7. permanent.status.enabled=&8(&cUnion&8)&c {0}&7 ha habilitado el estado permanente de tu union. permanent.status.disabled=&8(&cUnion&8)&c {0}&7 ha inhabilitado el estado permanente de tu union. @@ -553,11 +553,11 @@ bb.one.hour=1 hora bb.days= \ días bb.one.day=1 dia player.purged=El jugador fue purgado correctamente -your.clan.description.must.be.longer.than=La descripcion del union debe ser mas larga que {0} caracteres -your.clan.description.cannot.be.longer.than=La descripcion del union no debe ser mas larga que {0} caracteres +your.union.description.must.be.longer.than=La descripcion del union debe ser mas larga que {0} caracteres +your.union.description.cannot.be.longer.than=La descripcion del union no debe ser mas larga que {0} caracteres description.changed=Cambiaste la descripcion de tu union exitosamente no.description=No hay descripcion -the.player.must.wait.0.before.joining.your.clan.again=Este jugador debe esperar {0} minuto(s) antes de volver a entrar a tu union +the.player.must.wait.0.before.joining.your.union.again=Este jugador debe esperar {0} minuto(s) antes de volver a entrar a tu union disabled.command=Comando deshabilitado rank.displayname.updated=El nombre de muestra del union fue actualizado\! rank.setdefault=&8(&cUnion&8)&7 El rango predeterminado del union ahora se ha establecido en &c{0}&7. @@ -570,18 +570,18 @@ rank.created=Rango creado permission.0.added.to.rank.1=Permiso {0} agregado al rango {1} permission.0.removed.from.rank.1=Permiso {0} removido del rango {1} rank.0.deleted=Rango {0} eliminado -clans.ranks=Rangos del Union\: +unions.ranks=Rangos del Union\: ranks.list.item={0}\# {1} ({2}) no.ranks=Ningun rango fue creado rank.no.permissions=Este rango no tiene ningun permiso player.unassigned.from.rank=Jugador desasignado del rango you.must.be.0.or.have.the.permission.1.to.use.this=Debes ser {0} o tu lider debe darle a tu rango el permiso {1} para usar esto -deposit.not.allowed=Depositos desactivados, usa /%clan %toggle %deposit para activarlo -withdraw.not.allowed=Retiros desactivados, usa /%clan %toggle %withdraw para activarlo +deposit.not.allowed=Depositos desactivados, usa /%union %toggle %deposit para activarlo +withdraw.not.allowed=Retiros desactivados, usa /%union %toggle %withdraw para activarlo resign.request.cancelled=Solicitud para abandonar el union cancelada. disband.request.cancelled=Solicitud de disolución cancelada resetkdr.request.cancelled=Se ha cancelado la petición\: KDR -clan.create.request.cancelled=Solicitud de creación de union cancelada +union.create.request.cancelled=Solicitud de creación de union cancelada rank.create.request.cancelled=Solicitud de creación de rango cancelada promotion.vote.has.been.requested.from.all.leaders=Votacion para promover ha sido solicitada a todos los lideres rename.vote.has.been.requested.from.all.leaders=&bSe ha organizado una votacion para renombrar el union por los lideres @@ -598,11 +598,10 @@ gui.lore.no.permission=&f¡Lo siento\! &7No tienes suficientes permisos. gui.main.title={0} - menu del union gui.main.languageselector.title=&fElige tu idioma gui.main.languageselector.lore.left.click=&7Haz clic izquierdo para seleccionar tu idioma. -gui.main.languageselector.lore.right.click=&7Haz clic derecho para ayudar a traducir. gui.main.other.commands.title=&6Otros Comandos gui.main.other.commands.lore=&7Haz clic izquierdo para ver todos los comandos del union. -gui.main.clan.list.title=&6Lista de Uniones -gui.main.clan.list.lore=&7Haz clic izquierdo para ver la lista de uniones. +gui.main.union.list.title=&6Lista de Uniones +gui.main.union.list.lore=&7Haz clic izquierdo para ver la lista de uniones. gui.main.reset.kdr.title=&6Reiniciar KDR gui.main.reset.kdr.lore=&7Haz clic con el botón izquierdo para restablecer tu KDR. gui.main.leaderboard.title=&fTablero de posiciones @@ -610,8 +609,8 @@ gui.main.leaderboard.lore=&7Haz clic con el botón izquierdo para ver la tabla d gui.main.staff.title=&6Staff gui.main.staff.lore=&7Haz clic con el botón izquierdo para abrir el menú del staff. gui.staff.title=&8Staff -gui.staff.clan.list.lore.left.click=&7Haz clic izquierdo para ver todos los uniones. -gui.staff.clan.list.lore.right.click=&7Haz clic derecho para ver todos los uniones no verificados. +gui.staff.union.list.lore.left.click=&7Haz clic izquierdo para ver todos los uniones. +gui.staff.union.list.lore.right.click=&7Haz clic derecho para ver todos los uniones no verificados. gui.player.list.title=&8Lista de Jugadores gui.staff.player.list.title=&6Lista de Jugadores gui.staff.player.list.lore.left.click=&7Haz clic izquierdo para ver todos los jugadores. @@ -621,8 +620,8 @@ gui.staff.global.ff.lore.status=&7Estatus\: &f{0}&7. gui.staff.global.ff.lore.toggle=&7Haz clic con el botón izquierdo para alternar el estado del fuego amigo. gui.staff.reload.title=&6Recargar gui.staff.reload.lore=&7Haz clic izquierdo para recargar el plugin. -gui.staff.clanlist.unverified.title=&6Uniones no verificados - Total\: &f{0} -gui.staff.clanlist.toplace.title=&8Selecciona el nuevo union de {0}. +gui.staff.unionlist.unverified.title=&6Uniones no verificados - Total\: &f{0} +gui.staff.unionlist.toplace.title=&8Selecciona el nuevo union de {0}. gui.warning.title=&fAdvertencia gui.warning.no.permission.title=&6Sin autorización gui.warning.no.permission.plugin.lore=&7¡No tienes permiso para hacer esto\! @@ -631,20 +630,20 @@ gui.warning.no.permission.rank.lore=&7¡Debes ser &f{0}&7 o tu líder debe darle gui.warning.not.verified.title=&6No verificado gui.warning.not.verified.lore=&7¡Tu union debe ser verificado\! gui.allies.title=Aliados -gui.allies.clan.lore=&7Haz clic derecho para eliminar este aliado. +gui.allies.union.lore=&7Haz clic derecho para eliminar este aliado. gui.allies.add.title=&fAgregar un aliado gui.add.ally.title=Agregar un aliado -gui.add.ally.clan.lore=&7Haz clic izquierdo para aliarte a este union. +gui.add.ally.union.lore=&7Haz clic izquierdo para aliarte a este union. gui.rivals.title=Rivales -gui.rivals.clan.lore=&7Haz clic derecho para eliminar este rival. +gui.rivals.union.lore=&7Haz clic derecho para eliminar este rival. gui.rivals.add.title=&fAgregar un rival gui.add.rival.title=Agregar un rival -gui.add.rival.clan.lore=&7Haz clic izquierdo para rivalizar con este union. -gui.clanlist.title=&8Uniones - Total\: {0}. -gui.clanlist.clan.title=&6Union\: [{0}&6] {1} -gui.clanlist.clan.lore.position=&e\#&e{0} -gui.clanlist.clan.lore.kdr=&7KDR\: &f{0} -gui.clanlist.clan.lore.members=&7Miembros\: &f{0} +gui.add.rival.union.lore=&7Haz clic izquierdo para rivalizar con este union. +gui.unionlist.title=&8Uniones - Total\: {0}. +gui.unionlist.union.title=&6Union\: [{0}&6] {1} +gui.unionlist.union.lore.position=&e\#&e{0} +gui.unionlist.union.lore.kdr=&7KDR\: &f{0} +gui.unionlist.union.lore.members=&7Miembros\: &f{0} gui.coords.title=&8Coordenadas gui.coords.player.lore.distance=&7Distancia\: &f{0}&7. gui.coords.player.lore.coords=&7Coordenadas\: &f{0}&7 &f{1}&7 &f{2}&7 @@ -674,83 +673,83 @@ gui.permissions.permission.lore=&7Haz clic derecho para eliminar este permiso de gui.add.permission.title=&8Agregar un permiso gui.add.permission.permission.title=&f{0} gui.add.permission.permission.lore=&7Haz clic con el botón izquierdo para agregar este permiso al rango. -gui.clandetails.title=&8[{0}&8] {1} -gui.clandetails.free.agent.title=&6Agente Libre -gui.clandetails.free.agent.create.clan.price.lore=&7Precio\: &f{0}&7. -gui.clandetails.free.agent.create.clan.lore=&7Haz clic izquierdo para crear un union. -gui.clandetails.clan.title=&c&l[{0}&c&l] {1} -gui.clandetails.clan.lore.description=&7Descripción\: &f{0}&7 -gui.clandetails.clan.lore.status=&7Estatus\: &f{0}&7. -gui.clandetails.clan.lore.leaders=&7Líderes\: &f{0} -gui.clandetails.clan.lore.online.members=&7Miembros en Línea\: &f{0}/&f{1} -gui.clandetails.clan.lore.kdr=&7KDR\: &f{0} -gui.clandetails.clan.lore.kill.totals=&7Asesinatos Totales\: &fRival\: {0} / Neutral\: {1} / Civil\: {2} -gui.clandetails.clan.lore.deaths=&7Muertes\: &f{0} +gui.uniondetails.title=&8[{0}&8] {1} +gui.uniondetails.free.agent.title=&6Agente Libre +gui.uniondetails.free.agent.create.union.price.lore=&7Precio\: &f{0}&7. +gui.uniondetails.free.agent.create.union.lore=&7Haz clic izquierdo para crear un union. +gui.uniondetails.union.title=&c&l[{0}&c&l] {1} +gui.uniondetails.union.lore.description=&7Descripción\: &f{0}&7 +gui.uniondetails.union.lore.status=&7Estatus\: &f{0}&7. +gui.uniondetails.union.lore.leaders=&7Líderes\: &f{0} +gui.uniondetails.union.lore.online.members=&7Miembros en Línea\: &f{0}/&f{1} +gui.uniondetails.union.lore.kdr=&7KDR\: &f{0} +gui.uniondetails.union.lore.kill.totals=&7Asesinatos Totales\: &fRival\: {0} / Neutral\: {1} / Civil\: {2} +gui.uniondetails.union.lore.deaths=&7Muertes\: &f{0} # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.allies.separator=, +gui.uniondetails.union.lore.allies.separator=, # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.rivals.separator=, -gui.clandetails.clan.lore.allies=&7Alianzas\: &f{0} -gui.clandetails.clan.lore.rivals=&7Rivales\: &f{0} -gui.clandetails.clan.lore.founded=&7Fundada\: &f{0} -gui.clandetails.clan.lore.inactive=&7Inactivo\: &f{0}/&f{1} días -gui.clandetails.allies.title=&6Alianzas -gui.clandetails.allies.lore=&7Haz clic izquierdo para ver a tus aliados o agregar más. -gui.clandetails.rivals.title=&6Rivales -gui.clandetails.rivals.lore=&7Haz clic izquierdo para ver a tus rivales o agregar más. -gui.clandetails.roster.title=&6Lista -gui.clandetails.roster.lore=&7Haz clic izquierdo para ver a los miembros de tu union o invitar a más. -gui.staffclandetails.roster.lore=&7Haz clic izquierdo para ver los miembros del union. -gui.clandetails.coords.title=&6Coordenadas -gui.clandetails.coords.lore=&7Haz clic izquierdo para ver las coordenadas de los miembros de tu union. -gui.clandetails.home.title=&6Hogar -gui.clandetails.home.lore.teleport.price=&7Precio del teletransporte\: &f{0} -gui.clandetails.home.lore.teleport=&7Haz clic izquierdo para teletransportarte al hogar de tu union. -gui.staffclandetails.home.lore.teleport=&7Haz clic izquierdo para teletransportarte al hogar de este union. -gui.clandetails.home.lore.clear=&7Suelta el objeto para limpiar el hogar de tu union -gui.clandetails.home.lore.set.price=&7Fijar precio\: &f{0} -gui.clandetails.home.lore.set=&7Haz clic derecho para configurar el hogar de tu union. -gui.staffclandetails.home.lore.set=&7Haz clic derecho para configurar el hogar de este union. -gui.clandetails.regroup.title=&fReagrupar -gui.clandetails.regroup.lore.price=&7Precio\: &f{0}&7. -gui.clandetails.regroup.lore.home=&7Haz clic izquierdo para reagrupar a los miembros de tu union en el hogar del union. -gui.clandetails.regroup.lore.me=&7Haz clic derecho para reagrupar a los miembros de tu union en tu ubicación. -gui.clandetails.ff.title=&fFuego Amigo -gui.clandetails.ff.personal.lore=&7Personal\: &f{0} -gui.clandetails.ff.clan.lore=&7Union\: &f{0} -gui.clandetails.ff.personal.toggle.lore=&7Haz clic izquierdo para alternar tu fuego amigo. -gui.clandetails.ff.clan.toggle.lore=&7Haz clic derecho para alternar el fuego amigo de tu union. -gui.clandetails.bank.title=&6Banco -gui.clandetails.bank.balance.lore=&7Dinero\: &f{0} -gui.clandetails.bank.withdraw.status.lore=&7Retiros\: &f{0} -gui.clandetails.bank.deposit.status.lore=&7Depósito\: &f{0} -gui.clandetails.bank.withdraw.toggle.lore=&7Suelta el objeto para cambiar el estado de retiro -gui.clandetails.bank.deposit.toggle.lore=&7Haz clic derecho para cambiar el estado del depósito. -gui.clandetails.rank.title=&6Rango -gui.clandetails.rank.lore=&7Haz clic izquierdo para ver los rangos del union y editarlos. -gui.clandetails.verified.title=&aVerificado -gui.clandetails.not.verified.title=&6No verificado -gui.clandetails.verify.price.lore=&7Precio\: &f{0}&7. -gui.clandetails.not.verified.lore=&7Haz clic izquierdo para verificar tu union. -gui.staffclandetails.not.verified.lore=&7Haz clic izquierdo para verificar este union. -gui.clandetails.resign.title=&6Renuncia -gui.clandetails.resign.lore=&7Haz clic izquierdo para renunciar a tu union. -gui.clandetails.disband.title=&6Borrar -gui.clandetails.disband.lore=&7Suelta el objeto para disolver tu union -gui.staffclandetails.disband.lore=&7Haz clic izquierdo para borrar este union. -gui.clandetails.chat.title=&6Chat -gui.clandetails.chat.clan.chat.lore=&c/{0} [message] &7- Envía un mensaje al chat del union. -gui.clandetails.chat.clan.join.leave.lore=&c/{0} {1}/{2} &7- Únete / abandona el chat del union. -gui.clandetails.chat.ally.chat.lore=&c/{0} [message] &7- Envía un mensaje al chat aliado. -gui.clandetails.chat.ally.join.leave.lore=&c/{0} {1}/{2} &7- Únete / abandona el chat aliado. -gui.clandetails.chat.clan.status.lore=&7Union\: &f{0} -gui.clandetails.chat.ally.status.lore=&7Aliado\: &f{0} -gui.clandetails.chat.clan.toggle.lore=&7Haz clic con el botón izquierdo para alternar el estado del chat del union. -gui.clandetails.chat.ally.toggle.lore=&7Haz clic derecho para alternar el estado del chat de aliado. +gui.uniondetails.union.lore.rivals.separator=, +gui.uniondetails.union.lore.allies=&7Alianzas\: &f{0} +gui.uniondetails.union.lore.rivals=&7Rivales\: &f{0} +gui.uniondetails.union.lore.founded=&7Fundada\: &f{0} +gui.uniondetails.union.lore.inactive=&7Inactivo\: &f{0}/&f{1} días +gui.uniondetails.allies.title=&6Alianzas +gui.uniondetails.allies.lore=&7Haz clic izquierdo para ver a tus aliados o agregar más. +gui.uniondetails.rivals.title=&6Rivales +gui.uniondetails.rivals.lore=&7Haz clic izquierdo para ver a tus rivales o agregar más. +gui.uniondetails.roster.title=&6Lista +gui.uniondetails.roster.lore=&7Haz clic izquierdo para ver a los miembros de tu union o invitar a más. +gui.staffuniondetails.roster.lore=&7Haz clic izquierdo para ver los miembros del union. +gui.uniondetails.coords.title=&6Coordenadas +gui.uniondetails.coords.lore=&7Haz clic izquierdo para ver las coordenadas de los miembros de tu union. +gui.uniondetails.home.title=&6Hogar +gui.uniondetails.home.lore.teleport.price=&7Precio del teletransporte\: &f{0} +gui.uniondetails.home.lore.teleport=&7Haz clic izquierdo para teletransportarte al hogar de tu union. +gui.staffuniondetails.home.lore.teleport=&7Haz clic izquierdo para teletransportarte al hogar de este union. +gui.uniondetails.home.lore.clear=&7Suelta el objeto para limpiar el hogar de tu union +gui.uniondetails.home.lore.set.price=&7Fijar precio\: &f{0} +gui.uniondetails.home.lore.set=&7Haz clic derecho para configurar el hogar de tu union. +gui.staffuniondetails.home.lore.set=&7Haz clic derecho para configurar el hogar de este union. +gui.uniondetails.regroup.title=&fReagrupar +gui.uniondetails.regroup.lore.price=&7Precio\: &f{0}&7. +gui.uniondetails.regroup.lore.home=&7Haz clic izquierdo para reagrupar a los miembros de tu union en el hogar del union. +gui.uniondetails.regroup.lore.me=&7Haz clic derecho para reagrupar a los miembros de tu union en tu ubicación. +gui.uniondetails.ff.title=&fFuego Amigo +gui.uniondetails.ff.personal.lore=&7Personal\: &f{0} +gui.uniondetails.ff.union.lore=&7Union\: &f{0} +gui.uniondetails.ff.personal.toggle.lore=&7Haz clic izquierdo para alternar tu fuego amigo. +gui.uniondetails.ff.union.toggle.lore=&7Haz clic derecho para alternar el fuego amigo de tu union. +gui.uniondetails.bank.title=&6Banco +gui.uniondetails.bank.balance.lore=&7Dinero\: &f{0} +gui.uniondetails.bank.withdraw.status.lore=&7Retiros\: &f{0} +gui.uniondetails.bank.deposit.status.lore=&7Depósito\: &f{0} +gui.uniondetails.bank.withdraw.toggle.lore=&7Suelta el objeto para cambiar el estado de retiro +gui.uniondetails.bank.deposit.toggle.lore=&7Haz clic derecho para cambiar el estado del depósito. +gui.uniondetails.rank.title=&6Rango +gui.uniondetails.rank.lore=&7Haz clic izquierdo para ver los rangos del union y editarlos. +gui.uniondetails.verified.title=&aVerificado +gui.uniondetails.not.verified.title=&6No verificado +gui.uniondetails.verify.price.lore=&7Precio\: &f{0}&7. +gui.uniondetails.not.verified.lore=&7Haz clic izquierdo para verificar tu union. +gui.staffuniondetails.not.verified.lore=&7Haz clic izquierdo para verificar este union. +gui.uniondetails.resign.title=&6Renuncia +gui.uniondetails.resign.lore=&7Haz clic izquierdo para renunciar a tu union. +gui.uniondetails.disband.title=&6Borrar +gui.uniondetails.disband.lore=&7Suelta el objeto para disolver tu union +gui.staffuniondetails.disband.lore=&7Haz clic izquierdo para borrar este union. +gui.uniondetails.chat.title=&6Chat +gui.uniondetails.chat.union.chat.lore=&c/{0} [message] &7- Envía un mensaje al chat del union. +gui.uniondetails.chat.union.join.leave.lore=&c/{0} {1}/{2} &7- Únete / abandona el chat del union. +gui.uniondetails.chat.ally.chat.lore=&c/{0} [message] &7- Envía un mensaje al chat aliado. +gui.uniondetails.chat.ally.join.leave.lore=&c/{0} {1}/{2} &7- Únete / abandona el chat aliado. +gui.uniondetails.chat.union.status.lore=&7Union\: &f{0} +gui.uniondetails.chat.ally.status.lore=&7Aliado\: &f{0} +gui.uniondetails.chat.union.toggle.lore=&7Haz clic con el botón izquierdo para alternar el estado del chat del union. +gui.uniondetails.chat.ally.toggle.lore=&7Haz clic derecho para alternar el estado del chat de aliado. gui.playerdetails.title={0} gui.playerdetails.player.title=&f{0} -gui.playerdetails.player.lore.noclan=&7Union\: &fNinguno -gui.playerdetails.player.lore.clan=&7Union\: &f[{0}&f] &f{1} +gui.playerdetails.player.lore.nounion=&7Union\: &fNinguno +gui.playerdetails.player.lore.union=&7Union\: &f[{0}&f] &f{1} gui.playerdetails.player.lore.rank=&7Rango\: &f{0} gui.playerdetails.player.lore.status=&7Estatus\: &f{0}&7. gui.playerdetails.player.lore.kdr=&7KDR\: &f{0} @@ -759,8 +758,8 @@ gui.playerdetails.player.lore.deaths=&7Muertes\: &f{0} gui.playerdetails.player.lore.join.date=&7Fecha de Ingreso\: &f{0} gui.playerdetails.player.lore.last.seen=&7Ultima vez visto\: &f{0} # suppress inspection "TrailingSpacesInProperty" -gui.playerdetails.player.lore.past.clans.separator=, -gui.playerdetails.player.lore.past.clans=&7Uniones pasados\: &f{0} +gui.playerdetails.player.lore.past.unions.separator=, +gui.playerdetails.player.lore.past.unions=&7Uniones pasados\: &f{0} gui.playerdetails.player.lore.inactive=&7Inactivo\: &f{0}/&f{1} días gui.playerdetails.kick.title=&6Expulsar gui.playerdetails.promote.demote.title=&fPromover/Degradar @@ -784,55 +783,53 @@ gui.languageselector.title=&6Idiomas - Actual\: &f{0} gui.languageselector.language.title=&f{0} gui.languageselector.language.lore.left.click=&7Haga clic con el botón izquierdo para establecer este como tu idioma. gui.languageselector.language.lore.translation.status=&7Estado de la traducción\: &f{0}% -gui.languageselector.language.lore.right.click=&7Haz clic derecho para ayudar a traducir. gui.confirmation.title=&8Confirmación gui.confirmation.confirm=&aHaz clic aquí para confirmar gui.confirmation.return=&cHaz clic aquí para regresar gui.not.supported=&8(&cUnion&8)&7 &c¡Se produjo un error al abrir la GUI\! Deshabilitándolo ... ¿Descargó la versión correcta? -staff.member.verify.clan=&8(&cUnion&8)&7 ¡Un miembro del personal debe verificar tu union\! +staff.member.verify.union=&8(&cUnion&8)&7 ¡Un miembro del personal debe verificar tu union\! player.already.has.that.rank=&8(&cUnion&8)&7 El jugador ya tiene ese rango. -joined.clan.chat=&8(&cUnion&8)&7 Te has unido al chat del union. -already.joined.clan.chat=&bYa estás conectado al chat del union -left.clan.chat=&8(&cUnion&8)&7 Has salido del chat del union. -muted.clan.chat=&8(&cUnion&8)&7 Has silenciado el chat del union. -unmuted.clan.chat=&8(&cUnion&8)&7 Has dejado de silenciar el chat del union. +joined.union.chat=&8(&cUnion&8)&7 Te has unido al chat del union. +already.joined.union.chat=&bYa estás conectado al chat del union +left.union.chat=&8(&cUnion&8)&7 Has salido del chat del union. +muted.union.chat=&8(&cUnion&8)&7 Has silenciado el chat del union. +unmuted.union.chat=&8(&cUnion&8)&7 Has dejado de silenciar el chat del union. joined.ally.chat=&8(&cUnion&8)&7 Te has unido al chat de aliados. left.ally.chat=&8(&cUnion&8)&7 Has dejado el chat de aliados. muted.ally.chat=&8(&cUnion&8)&7 Has silenciado el chat de aliados. unmuted.ally.chat=&8(&cUnion&8)&7 Has desactivado el chat de aliados. already.joined.ally.chat=&bYa te has unido al chat de aliados -player.already.in.this.clan=&8(&cUnion&8)&7 El jugador ya está en este union. -your.clan.reached.max.alliances=&8(&cUnion&8)&7 Tu union ha alcanzado el número máximo de alianzas. -other.clan.reached.max.alliances=&8(&cUnion&8)&7 El otro union ha alcanzado el número máximo de alianzas. -insert.clan.tag=&8(&cUnion&8)&7 Inserta la etiqueta del union (o "{0}")\: -insert.clan.name=&8(&cUnion&8)&7 Inserta el nombre del union\: +player.already.in.this.union=&8(&cUnion&8)&7 El jugador ya está en este union. +your.union.reached.max.alliances=&8(&cUnion&8)&7 Tu union ha alcanzado el número máximo de alianzas. +other.union.reached.max.alliances=&8(&cUnion&8)&7 El otro union ha alcanzado el número máximo de alianzas. +insert.union.tag=&8(&cUnion&8)&7 Inserta la etiqueta del union (o "{0}")\: +insert.union.name=&8(&cUnion&8)&7 Inserta el nombre del union\: insert.rank.name=&8(&cUnion&8)&7 Inserte el nombre del rango (o "{0}")\: -click.to.help.translating=&8(&cUnion&8)&7 Haz clic en este enlace para ayudar a traducir\:\n&c{0} -your.clan.must.have.members.to.verify=&8(&cUnion&8)&7 ¡Tu union debe tener al menos &c{0}&7 miembros para ser verificado\! +your.union.must.have.members.to.verify=&8(&cUnion&8)&7 ¡Tu union debe tener al menos &c{0}&7 miembros para ser verificado\! you.must.hold.a.banner=&8(&cUnion&8)&7 ¡Debes tener un estandarte en tu mano\! -you.changed.clan.banner=&8(&cUnion&8)&7 Cambiaste el estandarte de tu union. -your.clan.already.verified=&8(&cUnion&8)&7 Tu union ya está verificado. +you.changed.union.banner=&8(&cUnion&8)&7 Cambiaste el estandarte de tu union. +your.union.already.verified=&8(&cUnion&8)&7 Tu union ya está verificado. # suppress inspection "TrailingSpacesInProperty" -clan.profile=\n&6Perfil de %clan_name% &7-------------------------------------------\n \n &7Nombre\: &c&l[%clan_color_tag%] %clan_name%\n &7Descripción\: &f%clan_description%\n &7Estatus\: &f%clan_status%\n &7Líderes\: &f%clan_leaders%\n &7Miembros en línea\: &f%clan_online_count%/%clan_size%\n &7KDR\: &f%clan_kdr%\n &7Asesinatos Totales\: &fRival\: %clan_rival_kills% / Aliado\: %clan_ally_kills% / Neutral\: %clan_neutral_kills% / Civil\: %clan_civilian_kills%\n &7Muertes\: &f%clan_deaths%\n &7Aliados\: &f%clan_allies%\n &7Rivales\: &f%clan_rivals%\n &7Fundado\: &f%clan_founded%\n &7Inactivo\: &f%clan_inactive_days%/%clan_max_inactive_days% días\n -player.lookup.clanname=&f[%clan_color_tag%&f] %clan_name% +union.profile=\n&6Perfil de %union_name% &7-------------------------------------------\n \n &7Nombre\: &c&l[%union_color_tag%] %union_name%\n &7Descripción\: &f%union_description%\n &7Estatus\: &f%union_status%\n &7Miembros en línea\: &f%union_online_count%/%union_size%\n &7KDR\: &f%union_kdr%\n &7Asesinatos Totales\: &fRival\: %union_rival_kills% / Aliado\: %union_ally_kills% / Neutral\: %union_neutral_kills% / Civil\: %union_civilian_kills%\n &7Muertes\: &f%union_deaths%\n &7Aliados\: &f%union_allies%\n &7Rivales\: &f%union_rivals%\n &7Fundado\: &f%union_founded%\n &7Inactivo\: &f%union_inactive_days%/%union_max_inactive_days% días\n +player.lookup.unionname=&f[%union_color_tag%&f] %union_name% # suppress inspection "TrailingSpacesInProperty" player.lookup.killtype=&7Tipo de Asesinato\: &c%player_kill_type%\n -player.lookup=\n&6Información del jugador %player_name% &7-------------------------------------------\n \n &7Union\: &f%clan_name%\n &7Rango\: &f%player_rank%\n &7Estatus\: &f%player_status%\n &7KDR\: &f%player_kdr%\n &7Asesinatos Totales\: &fRival\: %player_rival_kills% / Aliado\: %player_ally_kills% / Neutral\: %player_neutral_kills% / Civil\: %player_civilian_kills%\n &7Muertes\: &f%player_deaths%\n &7Fecha de Ingreso\: &f%player_join_date%\n &7Ultima vez visto\: &f%player_last_seen%\n &7Uniones pasados\: &f%player_past_clans%\n &7Inactivo\: &f%player_inactive_days%/%player_max_inactive_days% días\n &f%kill_type_line%&7 +player.lookup=\n&6Información del jugador %player_name% &7-------------------------------------------\n \n &7Union\: &f%union_name%\n &7Estatus\: &f%player_status%\n &7KDR\: &f%player_kdr%\n &7Asesinatos Totales\: &fRival\: %player_rival_kills% / Aliado\: %player_ally_kills% / Neutral\: %player_neutral_kills% / Civil\: %player_civilian_kills%\n &7Muertes\: &f%player_deaths%\n &7Fecha de Ingreso\: &f%player_join_date%\n &7Ultima vez visto\: &f%player_last_seen%\n &7Uniones pasados\: &f%player_past_unions%\n &7Inactivo\: &f%player_inactive_days%/%player_max_inactive_days% días\n &f%kill_type_line%&7 economy.disabled=&cEconomia desactivada\! has.been.purged=&8(&cUnion&8) &7Los datos de &c{0}&7 han sido depurados. accepted.invitation=&8(&cUnion&8)&7 Has aceptado la invitación de &c{0}&7. denied.invitation=&8(&cUnion&8)&7 Has rechazado la invitación de &c{0}&7. -must.be.in.clan.to.pvp=&cTu y {0} deben ser miembros de un union para hacer PvP\! -clans.not.at.war.pvp.denied=&cTu union no esta en guerra con {0}\! +must.be.in.union.to.pvp=&cTu y {0} deben ser miembros de un union para hacer PvP\! +unions.not.at.war.pvp.denied=&cTu union no esta en guerra con {0}\! cannot.attack.civilians=&cNo puedes atacar civiles\! -cannot.attack.clan.member=&cNo puedes atacar miembros de tu union\! +cannot.attack.union.member=&cNo puedes atacar miembros de tu union\! cannot.attack.ally=&cNo puedes atacar a un aliado\! cannot.send.discord.message=No puedes enviar mensajes a {0}. ¡No eres miembro de ese union\! discordhook.is.disabled=¡&cLa integración con Discord está desactivada o no está disponible\! -your.clan.doesnt.have.any.linked.player=Tu union no tiene ningún jugador vinculado -your.clan.doesnt.have.minimum.linked.player=Tu union no tiene un mínimo de jugadores vinculados -your.clan.is.not.on.the.whitelist=Tu union no está en la lista blanca -your.clan.already.has.channel=Tu union ya tiene un canal de Discord +your.union.doesnt.have.any.linked.player=Tu union no tiene ningún jugador vinculado +your.union.doesnt.have.minimum.linked.player=Tu union no tiene un mínimo de jugadores vinculados +your.union.is.not.on.the.whitelist=Tu union no está en la lista blanca +your.union.already.has.channel=Tu union ya tiene un canal de Discord discord.reached.category.limit=¡Discord alcanzó el límite de categorías\! discord.reached.channels.limit=¡Discord alcanzó el límite de canales\! discord.created.successfully=¡&bCanal de Discord creado con éxito\! @@ -842,19 +839,19 @@ cannot.kick.last.leader=&8(&cUnion&8)&7 ¡No puedes expulsar al último líder\! cannot.disband.permanent=&8(&cUnion&8)&7 No puedes borrar este union. Tiene estatus permanente. you.can.only.set.base.in.your.land=&8(&cUnion&8)&7 Solo puedes establecer el hogar en tu tierra. only.leaders.can.create.lands=&8(&cUnion&8)&7 Solo los líderes pueden crear tierras. -only.one.land.per.clan=&8(&cUnion&8)&7 Tu union ya tiene una tierra. -only.clan.members.can.create.lands=&8(&cUnion&8)&7 Solo los miembros del union pueden crear tierras. +only.one.land.per.union=&8(&cUnion&8)&7 Tu union ya tiene una tierra. +only.union.members.can.create.lands=&8(&cUnion&8)&7 Solo los miembros del union pueden crear tierras. land.allowed.all.actions=&8(&cUnion&8)&7 Todas las acciones ahora están permitidas. land.blocked.all.actions=&8(&cUnion&8)&7 Todas las acciones ahora están bloqueadas land.allowed.action=&8(&cUnion&8)&7 Acción permitida. land.blocked.action=&8(&cUnion&8)&7 Acción bloqueada. you.do.not.own.lands=&8(&cUnion&8)&7 No eres dueño de una tierra. land.sharing.disabled=&8(&cUnion&8)&7 Compartir tierras está deshabilitado. -clan.chat.disabled=&cChat del union esta deshabilitado\! +union.chat.disabled=&cChat del union esta deshabilitado\! ally.chat.disabled=&cChat aliado esta deshabilitado\! war.expired=&8(&cUnion&8)&7 La guerra con &c{0}&7 ha finalizado. you.cant.start.war.online.members.difference=&8(&cUnion&8)&7 No puedes empezar la guerra. Un union tiene más miembros en línea que el otro. invitedplayer.invite.off=Este jugador ha desactivado las invitaciones del union user.hasnt.played.before=&cEste usuario no ha jugado antes -clan.list.balance.header=\n{0} &7top balance &8---------------\n \n&8Total de uniones\: &7{1}\n \n&8\#&7. &8Union &7- &8Balance -clan.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} +union.list.balance.header=\n{0} &7top balance &8---------------\n \n&8Total de uniones\: &7{1}\n \n&8\#&7. &8Union &7- &8Balance +union.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} diff --git a/src/main/resources/messages_fi_FI.properties b/src/main/resources/messages_fi_FI.properties index 7a11e965..e32f6af0 100644 --- a/src/main/resources/messages_fi_FI.properties +++ b/src/main/resources/messages_fi_FI.properties @@ -66,7 +66,7 @@ admin.command=admin mod.command=mod promote.command=ylennä demote.command=alenna -clanff.command=clanff +unionff.command=unionff ff.command=ff resign.command=erota disband.command=poista @@ -106,7 +106,7 @@ acf-core.parameter.tag=tunniste acf-core.parameter.name=nimi acf-core.parameter.description=/kuvaus acf-core.parameter.player=pelaaja -acf-core.parameter.clan=unioni +acf-core.parameter.union=unioni acf-core.parameter.type=tyyppi acf-core.parameter.order=järjestys acf-core.parameter.help=sivu tai avainsanat @@ -149,8 +149,8 @@ command.description.ff.allow=Asettaa henkilökohtaisen oman tulen sallituksi command.description.ff.auto=Asettaa oman tulen automaattiseksi command.description.globalff.allow=Asettaa maailmanlaajuisen oman tulen sallituksi command.description.globalff.auto=Asettaa maailmanlaajuisen oman tulen automaattiseksi -command.description.clanff.allow=Asettaa unionisi oman tulen sallituksi -command.description.clanff.block=Asettaa unionisi oman tulen estetyksi +command.description.unionff.allow=Asettaa unionisi oman tulen sallituksi +command.description.unionff.block=Asettaa unionisi oman tulen estetyksi command.description.description=Asettaa unionillesi kuvauksen command.description.ban=Estää pelaajan käyttämästä unioni komentoja command.description.unban=Poistaa pelaajan eston unionin komentojen käytöstä @@ -178,7 +178,7 @@ command.description.untrust=Menettää luoton jäseneen command.description.resign=Erota unionistasi command.description.help=Näyttää tämän avun tai haut avussa command.description.ally.add=Lisää liittolaisen -command.description.clan=Avaa GUI\: n +command.description.union=Avaa GUI\: n command.description.disband=Lakkauttaa unionisi command.description.mod.disband=Lakkauttaa unioni command.description.mod.kick=Potkia jäsen unionista @@ -234,7 +234,7 @@ command.description.mod.locale=Valitsee pelaajan näyttökielen home-menu=/{0} home{1} - Teleporttaa unionin koti-tukikohtaan home-set-menu=/{0} home set{1} - asettaa unionin tukikohdan home-clear-menu=/{0} home clear{1} - tyhjentää unionin tukikohdan sijainnin -clan=Unioni +union=Unioni allies=Liitot alliances=liittoutumat coords=koordinaatit @@ -244,7 +244,7 @@ coords.upper=Koordinaatit world=Maailma kdr=KDR members=Jäsenet -clans.lower=unionit +unions.lower=unionit rival=Vihollinen civilian=Siivili neutral=Neutraali @@ -288,9 +288,9 @@ nokillsfound=Ei tappoja promoted.to.leader={0} on ylennetty johtajaksi denied.demotion={0} hyläsi {1}\: n alennuksen. Yksimielisyys epäonnistui. membership.invitation={0} hyläsi jäsenyyskutsun -joined.the.clan={0} liittyi unioniin +joined.the.union={0} liittyi unioniin signed.off.request.cancelled={0} kirjautui pois. {1} pyyntö peruttu. -clan.deletion={0} hyläsi unionin poistamisen. Yksimielisyys epäonnistui. +union.deletion={0} hyläsi unionin poistamisen. Yksimielisyys epäonnistui. rename.refused={0} hylkäsi unionin uudelleen nimeämisen. Sopimus epäonnistui. has.been.disbanded=Unioni {0} on lakkautettu denied.the.promotion={0} hyläsi {1}\: n ylennyksen. Yksimielisyys epäonnistui. @@ -326,9 +326,9 @@ mysql.connection.failed=Yhteys MySQL\: ään epäonnistui sqlite.connection.successful=Yhteys SQLiteen muodostettu sqlite.connection.failed= Yhteys SQLiteen epäonnistui purging.player.data=nollataan pelaajan tiedot\: {0} -purging.clan=Poistetaan unioni\: {0} -clan.players=Unionin pelaajien määrä\: {0} -clans=Unionien määrä\: {0} +purging.union=Poistetaan unioni\: {0} +union.players=Unionin pelaajien määrä\: {0} +unions=Unionien määrä\: {0} banned=Sinut on estetty käyttämästä unionien komentoja nothing.more.to.see=Ei ole enempää nähtävää nothing.to.vote=&cEi mitään mitä hyväksyä tai mistä kieltäytyä @@ -341,78 +341,78 @@ bulletin.board.header=&8* &e{0} ilmoitustaulu bulletin.board.message={0}\: &f{1} has.been.disbanded.rivalry.ended={0} lakkautettiin. Kilpailu on päättynyt has.been.disbanded.alliance.ended={0} lakkautettiin. Liitto on päättynyt. -clan.disbanded=Unioni lakkautettu +union.disbanded=Unioni lakkautettu 1.color.day=1 {0}päivä many.color.days={0}{1} päivää insufficient.permissions=Oikeudet eivät riitä -clan.is.not.verified=Unionia ei ole vahvistettu -player.not.a.member.of.any.clan=&cPelaaja ei ole minkään unionin jäsen -not.a.member.of.any.clan=Et ole unionissa +union.is.not.verified=Unionia ei ole vahvistettu +player.not.a.member.of.any.union=&cPelaaja ei ole minkään unionin jäsen +not.a.member.of.any.union=Et ole unionissa minimum.to.make.alliance=Unionillasi täytyy olla vähintään {0} pelaajaa, jotta voit tehdä liittoutumia -cannot.be.same.clan=&cSinun tulee lisätä toinen unioni kuin sinun\! -other.clan.not.verified=&cToista unionia ei ole vahvistettu\! -your.clans.are.not.allies=Unionisi eivät ole liittolaisia +cannot.be.same.union=&cSinun tulee lisätä toinen unioni kuin sinun\! +other.union.not.verified=&cToista unionia ei ole vahvistettu\! +your.unions.are.not.allies=Unionisi eivät ole liittolaisia has.broken.the.alliance={0} rikkoi liiton {1} kanssa at.least.one.leader.accept.the.alliance=Vähintään yhden johtajan pitää olla paikalla jotta liiton voi hyväksyä leaders.have.been.asked.for.an.alliance={0}\: n johtajilta on pyydetty liittoutumista -your.clans.are.already.allies=Unionisi ovat jo liittolaisia -your.clan.cannot.create.rivals=Sinun unioni ei voi tehdä vihollisia +your.unions.are.already.allies=Unionisi ovat jo liittolaisia +your.union.cannot.create.rivals=Sinun unioni ei voi tehdä vihollisia min.players.rivalries=Unionillasi täytyy olla vähintään {0} pelaajaa, jotta voit tehdä vihollisia this.player.is.already.banned=Tällä pelaajalla on jo porttikielto player.added.to.banned.list=Pelaaja lisätty porttikielto listalle you.banned=Sinut on estetty käyttämästä unionikomentoja -clan.wide.friendly.fire.blocked=Unionin laajuinen oma tuli estetty -clan.wide.friendly.fire.is.allowed=Unionin laajuinen oma tuli on sallittu +union.wide.friendly.fire.blocked=Unionin laajuinen oma tuli estetty +union.wide.friendly.fire.is.allowed=Unionin laajuinen oma tuli on sallittu you.are.the.only.member.online=Olet ainoa jäsen paikalla -your.clan.color.tag.cannot.be.longer.than.characters=&cUnionisi värillinen tunniste ei voi olla pidempi kuin {0} kirjainta -your.clan.tag.cannot.be.longer.than.characters=&Sinun unionisi tunniste ei voi olla pidempi kuin {0} merkkiä -your.clan.tag.must.be.longer.than.characters=&Sinun unionisi tunnisteessa pitää olla enemmän kuin {0} kirjainta +your.union.color.tag.cannot.be.longer.than.characters=&cUnionisi värillinen tunniste ei voi olla pidempi kuin {0} kirjainta +your.union.tag.cannot.be.longer.than.characters=&Sinun unionisi tunniste ei voi olla pidempi kuin {0} merkkiä +your.union.tag.must.be.longer.than.characters=&Sinun unionisi tunnisteessa pitää olla enemmän kuin {0} kirjainta your.tag.cannot.contain.the.following.colors=&cTunnisteesi ei voi sisältää seuraavia värejä\: {0} your.tag.doesnt.meet.the.requirements=&cTunnisteesi ei täytä vaatimuksia. your.tag.cannot.contain.color.codes=& Sinun tunnisteessa ei saa olla värikoodeja -your.clan.tag.can.only.contain.letters.numbers.and.color.codes=&cSinun unionisi tunnisteessa saa ainoastaan sisältää kirjaimia, numeroita ja värikoodeja +your.union.tag.can.only.contain.letters.numbers.and.color.codes=&cSinun unionisi tunnisteessa saa ainoastaan sisältää kirjaimia, numeroita ja värikoodeja you.cannot.set.colored.ranks=Et voi asettaa värillisiä arvoja -your.clan.name.cannot.be.longer.than.characters=Sinun unionisi nimi ei voi olla pidempi kuin {0} merkkiä -your.clan.name.must.be.longer.than.characters=Sinun unionisi nimi pitää olla pidempi kuin {0} kirjainta -your.clan.name.cannot.contain.color.codes=Sinun unionisi nimessä ei saa olla värikoodeja +your.union.name.cannot.be.longer.than.characters=Sinun unionisi nimi ei voi olla pidempi kuin {0} merkkiä +your.union.name.must.be.longer.than.characters=Sinun unionisi nimi pitää olla pidempi kuin {0} kirjainta +your.union.name.cannot.contain.color.codes=Sinun unionisi nimessä ei saa olla värikoodeja that.tag.name.is.disallowed=&cTuo tunniste ei ole sallittu you.must.first.resign=Sinun täytyy ensin erota unionista {0} -clan.with.this.tag.already.exists=Unioni tällä tunnisteella on jo olemassa -get.your.clan.verified.to.access.advanced.features=Vahvista unionisi päästäksesi käsiksi edistyneisiin ominaisuuksiin -clan.created=Unioni {0} luotu +union.with.this.tag.already.exists=Unioni tällä tunnisteella on jo olemassa +get.your.union.verified.to.access.advanced.features=Vahvista unionisi päästäksesi käsiksi edistyneisiin ominaisuuksiin +union.created=Unioni {0} luotu not.enough.leaders.online.to.vote.on.demotion=Ei ole tarpeeksi johtajia paikalla äänestääkseen alennuksesta demotion.vote.has.been.requested.from.all.leaders=Johtajilta on pyydetty alennus äänestystä -player.is.not.a.leader.of.your.clan=Pelaaja ei ole unionisi yksi johtajista +player.is.not.a.leader.of.your.union=Pelaaja ei ole unionisi yksi johtajista player.is.not.a.leader=Pelaaja ei ole johtaja -clan.has.been.disbanded=Unioni {0} on lakkautettu -clan.disband.vote.has.been.requested.from.all.leaders=Unionin lakkauttamis äänestys on pyydetty kaikilta johtajilta -friendy.fire.is.now.managed.by.your.clan=Omaa tulea hallitsee nyt sinun Unionisi +union.has.been.disbanded=Unioni {0} on lakkautettu +union.disband.vote.has.been.requested.from.all.leaders=Unionin lakkauttamis äänestys on pyydetty kaikilta johtajilta +friendy.fire.is.now.managed.by.your.union=Omaa tulea hallitsee nyt sinun Unionisi personal.friendly.fire.is.set.to.allowed=Henkilökohtainen oma tuli sallittu -global.friendy.fire.is.now.managed.by.each.clan=Kansainvälistä oma tulta hallitsee nyt jokainen unioni -global.friendy.fire.is.already.being.managed.by.each.clan=Jokainen unioni hallinnoi jo kansainvälistä omaa tulta +global.friendy.fire.is.now.managed.by.each.union=Kansainvälistä oma tulta hallitsee nyt jokainen unioni +global.friendy.fire.is.already.being.managed.by.each.union=Jokainen unioni hallinnoi jo kansainvälistä omaa tulta global.friendly.fire.is.set.to.allowed=Kansainvälinen omatuli asetettu sallituksi global.friendly.fire.is.already.being.allowed=Kansainvälinen omatuli jo sallittu -the.player.doesn.t.not.have.the.permissions.to.join.clans=Pelaajalla ei riitä oikeukset liittyä klaaneihin +the.player.doesn.t.not.have.the.permissions.to.join.unions=Pelaajalla ei riitä oikeukset liittyä klaaneihin you.cannot.invite.yourself=Et voi kutsua itseäsi you.did.not.answer.in.time=Et vastannut tarpeeksi nopeasti, peruutetaan... -this.player.is.banned.from.using.clan.commands=Tämä pelaaja on estetty unioni komentojen käytöstä -the.player.is.already.member.of.another.clan=Pelaaja on jo toisen unionin jäsen +this.player.is.banned.from.using.union.commands=Tämä pelaaja on estetty unioni komentojen käytöstä +the.player.is.already.member.of.another.union=Pelaaja on jo toisen unionin jäsen has.been.asked.to.join={0} on pyydetty liittymään {1} you.cannot.kick.yourself=Et voi potkia itseäsi ulos -the.player.is.not.a.member.of.your.clan=Pelaaja ei ole unionisi jäsen +the.player.is.not.a.member.of.your.union=Pelaaja ei ole unionisi jäsen you.cannot.kick.another.leader=Et voi potkaista toista johtajaa has.been.kicked.by={1} potkaisi jäsenen {0} ulos unionista -no.clans.have.been.created=Yhtäkään unionia ei ole luotu -total.clans=Unionien määrä\: +no.unions.have.been.created=Yhtäkään unionia ei ole luotu +total.unions=Unionien määrä\: legend=Selite\: kill.type.civilian=Tapon tyyppi\: {0}Siviili no.player.data.found=Pelaajatietoja ei löytynyt -clan.0=Unioni\: {0} +union.0=Unioni\: {0} status.0=Tila\: {0} rank.0=Arvo\: {0} kdr.0=KDR\: {0} inactive.0=Inaktiivinen\: {0} -clan.commands=unionin komennot +union.commands=unionin komennot you.can.only.modify.the.color.and.case.of.the.tag=Voit ainoastaan muokata tunnisteen väriä ja muotoa locale.has.been.changed=&cKielesi on vaihdettu locale.is.prohibited=&cLanguage valinta palvelimella on kielletty. @@ -424,11 +424,11 @@ leaders.0=Johtajat\: {0} allies.0=Liittolaiset\: {0} rivals.0=Viholliset\: {0} other.player.must.be.online=&cPelaajan täytyy olla paikalla\! -the.player.does.not.have.the.permissions.to.lead.a.clan=Pelaajalla ei riitä oikeukset johtaa unionia +the.player.does.not.have.the.permissions.to.lead.a.union=Pelaajalla ei riitä oikeukset johtaa unionia you.cannot.promote.yourself=Et voi ylentää itseäsi the.player.is.already.a.leader=Pelaaja on jo johtaja configuration.reloaded=Asetukset ladattu uudelleen -last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.clan=Viimeinen johtaja ei voi erota. Sinun täytyy nimittää toinen johtaja tai lakkauttaa unioni +last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.union=Viimeinen johtaja ei voi erota. Sinun täytyy nimittää toinen johtaja tai lakkauttaa unioni 0.has.resigned={0} erosi unionista you.cannot.trust.yourself=Et voi luottaa itseesi leaders.are.already.trusted=Johtajat ovat jo luotettuja @@ -436,23 +436,23 @@ this.player.is.already.trusted=Tämä pelaaja on jo luotettu has.been.given.trusted.status.by={1} antoi luotetun tilan {0}\: lle this.player.is.not.banned=Tällä pelaajalla ei ole porttikieltoa player.removed.from.the.banned.list=Pelaajan porttikielto poistettu -you.have.been.unbanned.from.clan.commands=Sinun estosi unioni komentojen käytöstä on poistettu +you.have.been.unbanned.from.union.commands=Sinun estosi unioni komentojen käytöstä on poistettu you.cannot.untrust.yourself=Et voi menettää luottoa itseesi leaders.cannot.be.untrusted=Johtajien luottoa ei voi menettää this.player.is.already.untrusted=Tämä pelaaja on jo epäluotettava has.been.given.untrusted.status.by={1} poisti {0} luotetun tilan -the.clan.does.not.exist=Unioni ei ole olemassa -the.clan.is.already.verified=Unioni on jo vahvistettu -the.clan.has.been.verified=Unioni on vahvistettu -clan.0.has.been.verified=Unioni {0} on vahvistettu\! -total.clan.players.0=Unionin pelaajamäärä\: {0} +the.union.does.not.exist=Unioni ei ole olemassa +the.union.is.already.verified=Unioni on jo vahvistettu +the.union.has.been.verified=Unioni on vahvistettu +union.0.has.been.verified=Unioni {0} on vahvistettu\! +total.union.players.0=Unionin pelaajamäärä\: {0} proposing.war={0} ehdottaa sodan aloittamista {1} kanssa you.can.only.start.war.with.rivals=Voit ainoastaan aloittaa sodan vihollisten kanssa leaders.have.been.asked.to.accept.the.war.request={0} johtajia on pyydetty hyväksymään sota pyyntö leaders.asked.to.end.rivalry={0} johtajilta on pyydetty sodan lopettamista proposing.to.end.the.war={0} ehdottaa sodan lopettamista {1} kanssa -clans.already.at.war=Unionisi ovat jo sodassa -clans.not.at.war=Unionisi eivät ole sodassa +unions.already.at.war=Unionisi ovat jo sodassa +unions.not.at.war=Unionisi eivät ole sodassa you.are.at.war={0} sotivat {1} kanssa denied.war.req={0} kieltäytyi {1} sota pyynnöstä you.are.no.longer.at.war={0} ei enää sodi {1} kanssa @@ -480,12 +480,12 @@ diamond=timantti gold=kulta wood=puu server.announce=Palvelimen Ilmoitus -clan.announce=Unioni Ilmoitus +union.announce=Unioni Ilmoitus leader.announce=Johtajan Ilmoitus hunger=Nälkä stone=kivi iron=rauta -the.clan.cannot.be.rivaled=Unionin kanssa ei voi kilpailla +the.union.cannot.be.rivaled=Unionin kanssa ei voi kilpailla bboff=BB poistettu käytöstä bbon=BB vaihdettu päälle inviteon=Kutsut laitettu päälle @@ -509,30 +509,30 @@ waiting.for.teleport.stand.still.for.0.seconds=Odotetaan teleporttia, seiso viel on=päällä off=pois player.rank.changed=Arvo on asetettu -your.clans.are.already.rivals=Unionisi ovat jo vihollisia +your.unions.are.already.rivals=Unionisi ovat jo vihollisia cleared.bb=Unionin ilmoitustaulu tyhjennetty -clan.balance=Unionin saldo\: {0} -clan.admin.balance={0} saldo on\: {1} -bb.clan.deposit={1} talletti {0} -player.clan.deposit=Talletit {0} -bb.clan.withdraw={1} nosti {0} -bb.clan.take={1} nosti {0} -bb.clan.give={1} antoi {0} -bb.clan.set={1} asetti saldon {0} -player.clan.withdraw=Nostit {0} -clan.admin.take=Sinä otit {0} {1} pankista -clan.admin.give=Sinä annoit {0} {1} pankkiin -clan.admin.set=Sinä asetit {0} saldon {1} -clan.admin.bank.not.enough.money={0} pankissa ei ole tarpeeksi rahaa\! -clan.bank.not.enough.money=Unionisi pankissa ei ole tarpeeksi rahaa -your.clans.are.not.rivals=Unionisi ei ole vihollisia -the.clan.members.reached.limit=Sinun unioni on saavuttanut jäsenrajan -this.clan.has.reached.the.member.limit=&bTämä unioni on saavuttanut jäsenrajan +union.balance=Unionin saldo\: {0} +union.admin.balance={0} saldo on\: {1} +bb.union.deposit={1} talletti {0} +player.union.deposit=Talletit {0} +bb.union.withdraw={1} nosti {0} +bb.union.take={1} nosti {0} +bb.union.give={1} antoi {0} +bb.union.set={1} asetti saldon {0} +player.union.withdraw=Nostit {0} +union.admin.take=Sinä otit {0} {1} pankista +union.admin.give=Sinä annoit {0} {1} pankkiin +union.admin.set=Sinä asetit {0} saldon {1} +union.admin.bank.not.enough.money={0} pankissa ei ole tarpeeksi rahaa\! +union.bank.not.enough.money=Unionisi pankissa ei ole tarpeeksi rahaa +your.unions.are.not.rivals=Unionisi ei ole vihollisia +the.union.members.reached.limit=Sinun unioni on saavuttanut jäsenrajan +this.union.has.reached.the.member.limit=&bTämä unioni on saavuttanut jäsenrajan you.have.reseted.your.kdr=Olet nollannut KDR\: äsi you.have.reseted.0.kdr=Olet nollannut {0}\: n KDR\: än you.have.reseted.kdr.of.all.players=Sinä nollasit jokasen pelaajan KDR\: än -you.have.successfully.renamed.your.clan=&bOlet onnistuneesti vaihtanut unionisi nimeksi {0} -you.have.successfully.renamed.the.clan=&bOlet onnistuneesti vaihtanut unionin nimeksi {0} +you.have.successfully.renamed.your.union=&bOlet onnistuneesti vaihtanut unionisi nimeksi {0} +you.have.successfully.renamed.the.union=&bOlet onnistuneesti vaihtanut unionin nimeksi {0} you.have.toggled.permanent.status=Asetit pysyvän tilan {0}\: lle permanent.status.enabled={0} kytki unionisi pysyvään tilaan permanent.status.disabled={0} poisti unionisi pysyvän tilan @@ -556,11 +556,11 @@ bb.one.hour=1 tunti bb.days= \ päivää bb.one.day=1 päivä player.purged=Pelaajantiedot poistettu onnistuneesti -your.clan.description.must.be.longer.than=Sinun unionisi kuvaus pitää olla pidempi kuin {0} kirjainta -your.clan.description.cannot.be.longer.than=Sinun unionisi kuvaus ei saa olla pidempi kuin {0} kirjainta +your.union.description.must.be.longer.than=Sinun unionisi kuvaus pitää olla pidempi kuin {0} kirjainta +your.union.description.cannot.be.longer.than=Sinun unionisi kuvaus ei saa olla pidempi kuin {0} kirjainta description.changed=Unionisi kuvaus onnistuneesti muutettu no.description=Ei kuvausta -the.player.must.wait.0.before.joining.your.clan.again=Tämän pelaajan on odotettava {0} minuuttia, ennen kuin hän liittyy unioniin uudellee +the.player.must.wait.0.before.joining.your.union.again=Tämän pelaajan on odotettava {0} minuuttia, ennen kuin hän liittyy unioniin uudellee disabled.command=Komento poistettu käytöstä rank.displayname.updated=Arvon näyttönimi päivitetty\! rank.setdefault=Unionin oletus arvo on nyt {0} @@ -573,18 +573,18 @@ rank.created=Arvo luotu permission.0.added.to.rank.1=Oikeus {0} lisätty arvolle {1} permission.0.removed.from.rank.1=Oikeus {0} poistettu arvosta {1} rank.0.deleted=Arvo {0} poistettu -clans.ranks=Unionin arvot\: +unions.ranks=Unionin arvot\: ranks.list.item={0}\# {1} ({2}) no.ranks=Arvoja ei luotu rank.no.permissions=Tällä arvolla ei ole oikeuksia player.unassigned.from.rank=Pelaajalta poistettu arvo you.must.be.0.or.have.the.permission.1.to.use.this=7 Sinun pitää olla {0} tai johtajasi pitää antaa sinun arvollesi oikeus {1} käyttää tuota -deposit.not.allowed=Talletus ei ole sallittua, käytä /%clan %toggle %deposit salliaksesi sen -withdraw.not.allowed=Nostaminen ei ole sallittua, käytä /%clan %toggle %withdraw salliaksesi sen +deposit.not.allowed=Talletus ei ole sallittua, käytä /%union %toggle %deposit salliaksesi sen +withdraw.not.allowed=Nostaminen ei ole sallittua, käytä /%union %toggle %withdraw salliaksesi sen resign.request.cancelled=Eroamispyyntö peruttu disband.request.cancelled=Lakkauttamis pyyntö peruttu resetkdr.request.cancelled=KDR resetointi pyyntö peruttu -clan.create.request.cancelled=Unionin luontipyyntö peruttu +union.create.request.cancelled=Unionin luontipyyntö peruttu rank.create.request.cancelled=Arvon luontipyyntö peruttu promotion.vote.has.been.requested.from.all.leaders=Johtajilta on pyydetty ylennysalennusta rename.vote.has.been.requested.from.all.leaders=&bJohtajilta on pyydetty uudelleennimeämis äänestystä @@ -601,11 +601,10 @@ gui.lore.no.permission=&7Sinulla ei riitä oikeudet nähdä tätä\! gui.main.title={0} - unionin valikko gui.main.languageselector.title=Valitse kielesi gui.main.languageselector.lore.left.click=&7Klikkaa hiiren vasenta painiketta valitaksesi kielesi -gui.main.languageselector.lore.right.click=&7Klikkaa hiiren oikealla painikkeella auttaaksesi kääntämisessä gui.main.other.commands.title=&fMuut komennot gui.main.other.commands.lore=&7Klikkaa vasemmalla nähdäksesi kaikki unionikomennot -gui.main.clan.list.title=Unioni lista -gui.main.clan.list.lore=&7Klikkaa vasemmalla nähdäksesi unioniluettelon +gui.main.union.list.title=Unioni lista +gui.main.union.list.lore=&7Klikkaa vasemmalla nähdäksesi unioniluettelon gui.main.reset.kdr.title=Nollaa KDR gui.main.reset.kdr.lore=&7Klikkaa vasemmalla nollataksesi KDR gui.main.leaderboard.title=&fTulostaulukko @@ -613,8 +612,8 @@ gui.main.leaderboard.lore=&7Klikkaa vasemmalla nähdäksesi tulostaulukon gui.main.staff.title=&fHenkilökunta gui.main.staff.lore=&7Napsauta vasemmalla avataksesi henkilökunnan valikon gui.staff.title=Henkilökunta -gui.staff.clan.list.lore.left.click=&7Klikkaa vasemmalla nähdäksesi kaikki unionit -gui.staff.clan.list.lore.right.click=&7Klikkaa hiiren kakkospainikkeella nähdäksesi kaikki vahvistamattomat unionit +gui.staff.union.list.lore.left.click=&7Klikkaa vasemmalla nähdäksesi kaikki unionit +gui.staff.union.list.lore.right.click=&7Klikkaa hiiren kakkospainikkeella nähdäksesi kaikki vahvistamattomat unionit gui.player.list.title=Pelaaja luettelo gui.staff.player.list.title=&Pelaaja luettelo gui.staff.player.list.lore.left.click=&7Klikkaa vasemmalla nähdäksesi kaikki pelaajat @@ -624,8 +623,8 @@ gui.staff.global.ff.lore.status=&7Tila\: &b{0} gui.staff.global.ff.lore.toggle=&7Klikkaa hiiren vasemmalla painikkeella vaihtaaksesi oma tulen tilan gui.staff.reload.title=&fLataa uudelleen gui.staff.reload.lore=&7Klikkaa hiiren vasenta ladataksesi laajennuksen uudelleen -gui.staff.clanlist.unverified.title=Vahvistamattomat unionit - yhteensä\: {0} -gui.staff.clanlist.toplace.title=Valitse {0}\: n uusi unioni +gui.staff.unionlist.unverified.title=Vahvistamattomat unionit - yhteensä\: {0} +gui.staff.unionlist.toplace.title=Valitse {0}\: n uusi unioni gui.warning.title=Varoitus gui.warning.no.permission.title=&fEi käyttöoikeuksia gui.warning.no.permission.plugin.lore=&7Sinulla ei riitä oikeudet tehdä noin\! @@ -634,20 +633,20 @@ gui.warning.no.permission.rank.lore=&7 Sinun pitää olla {0} tai johtajasi pit gui.warning.not.verified.title=&fEi vahvistettu gui.warning.not.verified.lore=&7Unionisi pitää olla vahvistettu\! gui.allies.title=Liitot -gui.allies.clan.lore=&7Napsauta hiiren kakkospainikkeella poistaaksesi tämän liittolaisen +gui.allies.union.lore=&7Napsauta hiiren kakkospainikkeella poistaaksesi tämän liittolaisen gui.allies.add.title=&fLisää liittolainen gui.add.ally.title=Lisää liittolainen -gui.add.ally.clan.lore=&7Klikkaa hiiren vasemmalla liittoutuaksesi tämän unionin kanssa +gui.add.ally.union.lore=&7Klikkaa hiiren vasemmalla liittoutuaksesi tämän unionin kanssa gui.rivals.title=Viholliset -gui.rivals.clan.lore=&7Klikkaa hiiren oikeata painiketta poistaaksesi tämän vihollisen +gui.rivals.union.lore=&7Klikkaa hiiren oikeata painiketta poistaaksesi tämän vihollisen gui.rivals.add.title=&fLisää vihollinen gui.add.rival.title=Lisää vihollinen -gui.add.rival.clan.lore=&7Klikkaa vasemmalla kilpaileaksesi tämän unionin kanssa -gui.clanlist.title=Unionit - Yhteensä\: {0} -gui.clanlist.clan.title=&fUnioni\: [{0}&f] {1} -gui.clanlist.clan.lore.position=&b\#{0} -gui.clanlist.clan.lore.kdr=&7KDR\: &B{0} -gui.clanlist.clan.lore.members=&7Jäsenet\: &b{0} +gui.add.rival.union.lore=&7Klikkaa vasemmalla kilpaileaksesi tämän unionin kanssa +gui.unionlist.title=Unionit - Yhteensä\: {0} +gui.unionlist.union.title=&fUnioni\: [{0}&f] {1} +gui.unionlist.union.lore.position=&b\#{0} +gui.unionlist.union.lore.kdr=&7KDR\: &B{0} +gui.unionlist.union.lore.members=&7Jäsenet\: &b{0} gui.coords.title=Koordinaatit gui.coords.player.lore.distance=&7Etäisyys\: &b{0} gui.coords.player.lore.coords=&7Koordinaatit\: &b{0} {1} {2} @@ -677,83 +676,83 @@ gui.permissions.permission.lore=&7Napsauta hiiren kakkospainikkeella poistaakses gui.add.permission.title=Add a permission gui.add.permission.permission.title=&f{0} gui.add.permission.permission.lore=&7Klikkaa hiiren vasemmalla lisätäksesi tämän oikeuden arvolle -gui.clandetails.title=[{0}\# {1} -gui.clandetails.free.agent.title=&Vapaa agentti -gui.clandetails.free.agent.create.clan.price.lore=Hinta\: {0} -gui.clandetails.free.agent.create.clan.lore=&7Klikkaa hiiren vasemmalla luodaksesi unionin -gui.clandetails.clan.title=&f[{0}&f] {1} -gui.clandetails.clan.lore.description=&Kuvaus\: {0} -gui.clandetails.clan.lore.status=&7Tila\: &b{0} -gui.clandetails.clan.lore.leaders=&Johtajat\: {0} -gui.clandetails.clan.lore.online.members=&7Paikalla olevat jäsenet\: &b{0}/{1} -gui.clandetails.clan.lore.kdr=&7KDR\: &B{0} -gui.clandetails.clan.lore.kill.totals=&7Tappoja yhteensä\: &b[Vastustajat\:{0}, Neutraali\: {1}\: Siviili {2}] -gui.clandetails.clan.lore.deaths=&7Kuolemat\: &b{0} +gui.uniondetails.title=[{0}\# {1} +gui.uniondetails.free.agent.title=&Vapaa agentti +gui.uniondetails.free.agent.create.union.price.lore=Hinta\: {0} +gui.uniondetails.free.agent.create.union.lore=&7Klikkaa hiiren vasemmalla luodaksesi unionin +gui.uniondetails.union.title=&f[{0}&f] {1} +gui.uniondetails.union.lore.description=&Kuvaus\: {0} +gui.uniondetails.union.lore.status=&7Tila\: &b{0} +gui.uniondetails.union.lore.leaders=&Johtajat\: {0} +gui.uniondetails.union.lore.online.members=&7Paikalla olevat jäsenet\: &b{0}/{1} +gui.uniondetails.union.lore.kdr=&7KDR\: &B{0} +gui.uniondetails.union.lore.kill.totals=&7Tappoja yhteensä\: &b[Vastustajat\:{0}, Neutraali\: {1}\: Siviili {2}] +gui.uniondetails.union.lore.deaths=&7Kuolemat\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.allies.separator=&b, +gui.uniondetails.union.lore.allies.separator=&b, # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.rivals.separator=&b, -gui.clandetails.clan.lore.allies=&Liittolaiset\: {0} -gui.clandetails.clan.lore.rivals=&Viholliset\: {0} -gui.clandetails.clan.lore.founded=&7Perustettu\: &b{0} -gui.clandetails.clan.lore.inactive=&7Inaktiivinen\: &b{0}/{1} päivää -gui.clandetails.allies.title=&fLiittolaiset -gui.clandetails.allies.lore=&7Klikkaa vasemmalla hiirenpainikkeella nähdäksesi liittolaisesi tai lisätä uusia -gui.clandetails.rivals.title=&fViholliset -gui.clandetails.rivals.lore=&7Klikkaa vasemmalla hiirenpainikkeella nähdäksesi vihollisesi tai lisätä uusia -gui.clandetails.roster.title=&fNimilista -gui.clandetails.roster.lore=&7Klikkaa hiiren vasemmalla nähdäksesi unionisi jäsenet tai kutsuaksesi lisää -gui.staffclandetails.roster.lore=&7Klikkaa hiiren vasemmalla nähdäksesi unionin jäsenet -gui.clandetails.coords.title=&fKoordinaatit -gui.clandetails.coords.lore=&7Klikkaa vasemmalla nähdäksesi unionisi jäsenien koordinaatit -gui.clandetails.home.title=&fKoti -gui.clandetails.home.lore.teleport.price=&7Teleporttaushinta\: &b{0} -gui.clandetails.home.lore.teleport=&7Klikkaa hiiren vasemmalla painikkeella teleporttaaksesi unionin tukikohtaan -gui.staffclandetails.home.lore.teleport=&7Klikkaa hiiren vasemmalla painikkeella teleporttaaksesi tämän unionin kotiin -gui.clandetails.home.lore.clear=&7Pudota esine tyhjentääksesi unionin koti -gui.clandetails.home.lore.set.price=&7Aseta hinta\: &b{0} -gui.clandetails.home.lore.set=&7Klikkaa hiiren oikealla asettaaksesi unionisi kodin -gui.staffclandetails.home.lore.set=&7Klikkaa hiiren oikealla asettaaksesi tämän unionin kodin -gui.clandetails.regroup.title=&fUudelleen ryhmittäydy -gui.clandetails.regroup.lore.price=Hinta\: {0} -gui.clandetails.regroup.lore.home=&7Klikkaa hiiren vasemalla ryhmittääksesi unionisi jäsenet unionin kotiin -gui.clandetails.regroup.lore.me=&7Klikkaa hiiren oikealla ryhmittääksesi unionisi jäsenet sinun sijainillesi -gui.clandetails.ff.title=&fOmatuli -gui.clandetails.ff.personal.lore=&7Henkilökohtainen\: &b{0} -gui.clandetails.ff.clan.lore=&7Unioni\: &b{0} -gui.clandetails.ff.personal.toggle.lore=&7Klikkaa hiiren vasemmalla painikkeella vaihtaaksesi oma tulen tilan -gui.clandetails.ff.clan.toggle.lore=&7Klikkaa hiiren oikealla painikkeella vaihtaaksesi unionisi oman tulen tilan -gui.clandetails.bank.title=&fPankki -gui.clandetails.bank.balance.lore=&7Saldo\: &b{0} -gui.clandetails.bank.withdraw.status.lore=&7Nosta\: &b{0} -gui.clandetails.bank.deposit.status.lore=&7Talletus\: &b{0} -gui.clandetails.bank.withdraw.toggle.lore=&7Tiputa tavara kytkeäksesi nostamisen tilan -gui.clandetails.bank.deposit.toggle.lore=&7Klikkaa hiiren oikealla painikkeella vaihtaaksesi talletuksen tilan -gui.clandetails.rank.title=&fArvo -gui.clandetails.rank.lore=&7Klikkaa vasemmalle nähdäksesi unionin arvot ja muokkaa niitä -gui.clandetails.verified.title=&fVarmennettu -gui.clandetails.not.verified.title=&fEi vahvistettu -gui.clandetails.verify.price.lore=Hinta\: {0} -gui.clandetails.not.verified.lore=&7Klikkaa hiiren vasemmalla varmistaaksesi unionisi -gui.staffclandetails.not.verified.lore=&7Klikkaa hiiren vasemmalla varmistaaksesi tämän unionin -gui.clandetails.resign.title=&fErota -gui.clandetails.resign.lore=&7Klikkaa hiiren vasemmalla erotaksesi unionista -gui.clandetails.disband.title=&fLakkauta -gui.clandetails.disband.lore=&7Pudota esine lakkauttaaksesi unionisi -gui.staffclandetails.disband.lore=&7Paina hiiren vasemmalla lakkauttaaksesi tämän unionin -gui.clandetails.chat.title=&fChatti -gui.clandetails.chat.clan.chat.lore=&7/{0} [message] - &bLähettää viestin unionin keskustelupalstalle -gui.clandetails.chat.clan.join.leave.lore=&7/{0} {1}/{2} - &bLiittyy/poistuu unionikeskustelusta -gui.clandetails.chat.ally.chat.lore=&7/{0} [message] - &bLähettää viestin liittolaisten keskustelupalstalle -gui.clandetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bLiittyy/poistuu liittolaistenkeskustelusta -gui.clandetails.chat.clan.status.lore=&7Unioni\: &b{0} -gui.clandetails.chat.ally.status.lore=&7Liittolainen\: &b{0} -gui.clandetails.chat.clan.toggle.lore=&7Klikkaa vasemmalla vaihtaaksesi unionin keskustelu tilan -gui.clandetails.chat.ally.toggle.lore=&7Klikkaa hiiren oikealla vaihtaaksesi liittolaisten keskustelu tilan +gui.uniondetails.union.lore.rivals.separator=&b, +gui.uniondetails.union.lore.allies=&Liittolaiset\: {0} +gui.uniondetails.union.lore.rivals=&Viholliset\: {0} +gui.uniondetails.union.lore.founded=&7Perustettu\: &b{0} +gui.uniondetails.union.lore.inactive=&7Inaktiivinen\: &b{0}/{1} päivää +gui.uniondetails.allies.title=&fLiittolaiset +gui.uniondetails.allies.lore=&7Klikkaa vasemmalla hiirenpainikkeella nähdäksesi liittolaisesi tai lisätä uusia +gui.uniondetails.rivals.title=&fViholliset +gui.uniondetails.rivals.lore=&7Klikkaa vasemmalla hiirenpainikkeella nähdäksesi vihollisesi tai lisätä uusia +gui.uniondetails.roster.title=&fNimilista +gui.uniondetails.roster.lore=&7Klikkaa hiiren vasemmalla nähdäksesi unionisi jäsenet tai kutsuaksesi lisää +gui.staffuniondetails.roster.lore=&7Klikkaa hiiren vasemmalla nähdäksesi unionin jäsenet +gui.uniondetails.coords.title=&fKoordinaatit +gui.uniondetails.coords.lore=&7Klikkaa vasemmalla nähdäksesi unionisi jäsenien koordinaatit +gui.uniondetails.home.title=&fKoti +gui.uniondetails.home.lore.teleport.price=&7Teleporttaushinta\: &b{0} +gui.uniondetails.home.lore.teleport=&7Klikkaa hiiren vasemmalla painikkeella teleporttaaksesi unionin tukikohtaan +gui.staffuniondetails.home.lore.teleport=&7Klikkaa hiiren vasemmalla painikkeella teleporttaaksesi tämän unionin kotiin +gui.uniondetails.home.lore.clear=&7Pudota esine tyhjentääksesi unionin koti +gui.uniondetails.home.lore.set.price=&7Aseta hinta\: &b{0} +gui.uniondetails.home.lore.set=&7Klikkaa hiiren oikealla asettaaksesi unionisi kodin +gui.staffuniondetails.home.lore.set=&7Klikkaa hiiren oikealla asettaaksesi tämän unionin kodin +gui.uniondetails.regroup.title=&fUudelleen ryhmittäydy +gui.uniondetails.regroup.lore.price=Hinta\: {0} +gui.uniondetails.regroup.lore.home=&7Klikkaa hiiren vasemalla ryhmittääksesi unionisi jäsenet unionin kotiin +gui.uniondetails.regroup.lore.me=&7Klikkaa hiiren oikealla ryhmittääksesi unionisi jäsenet sinun sijainillesi +gui.uniondetails.ff.title=&fOmatuli +gui.uniondetails.ff.personal.lore=&7Henkilökohtainen\: &b{0} +gui.uniondetails.ff.union.lore=&7Unioni\: &b{0} +gui.uniondetails.ff.personal.toggle.lore=&7Klikkaa hiiren vasemmalla painikkeella vaihtaaksesi oma tulen tilan +gui.uniondetails.ff.union.toggle.lore=&7Klikkaa hiiren oikealla painikkeella vaihtaaksesi unionisi oman tulen tilan +gui.uniondetails.bank.title=&fPankki +gui.uniondetails.bank.balance.lore=&7Saldo\: &b{0} +gui.uniondetails.bank.withdraw.status.lore=&7Nosta\: &b{0} +gui.uniondetails.bank.deposit.status.lore=&7Talletus\: &b{0} +gui.uniondetails.bank.withdraw.toggle.lore=&7Tiputa tavara kytkeäksesi nostamisen tilan +gui.uniondetails.bank.deposit.toggle.lore=&7Klikkaa hiiren oikealla painikkeella vaihtaaksesi talletuksen tilan +gui.uniondetails.rank.title=&fArvo +gui.uniondetails.rank.lore=&7Klikkaa vasemmalle nähdäksesi unionin arvot ja muokkaa niitä +gui.uniondetails.verified.title=&fVarmennettu +gui.uniondetails.not.verified.title=&fEi vahvistettu +gui.uniondetails.verify.price.lore=Hinta\: {0} +gui.uniondetails.not.verified.lore=&7Klikkaa hiiren vasemmalla varmistaaksesi unionisi +gui.staffuniondetails.not.verified.lore=&7Klikkaa hiiren vasemmalla varmistaaksesi tämän unionin +gui.uniondetails.resign.title=&fErota +gui.uniondetails.resign.lore=&7Klikkaa hiiren vasemmalla erotaksesi unionista +gui.uniondetails.disband.title=&fLakkauta +gui.uniondetails.disband.lore=&7Pudota esine lakkauttaaksesi unionisi +gui.staffuniondetails.disband.lore=&7Paina hiiren vasemmalla lakkauttaaksesi tämän unionin +gui.uniondetails.chat.title=&fChatti +gui.uniondetails.chat.union.chat.lore=&7/{0} [message] - &bLähettää viestin unionin keskustelupalstalle +gui.uniondetails.chat.union.join.leave.lore=&7/{0} {1}/{2} - &bLiittyy/poistuu unionikeskustelusta +gui.uniondetails.chat.ally.chat.lore=&7/{0} [message] - &bLähettää viestin liittolaisten keskustelupalstalle +gui.uniondetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bLiittyy/poistuu liittolaistenkeskustelusta +gui.uniondetails.chat.union.status.lore=&7Unioni\: &b{0} +gui.uniondetails.chat.ally.status.lore=&7Liittolainen\: &b{0} +gui.uniondetails.chat.union.toggle.lore=&7Klikkaa vasemmalla vaihtaaksesi unionin keskustelu tilan +gui.uniondetails.chat.ally.toggle.lore=&7Klikkaa hiiren oikealla vaihtaaksesi liittolaisten keskustelu tilan gui.playerdetails.title={0} gui.playerdetails.player.title=&f{0} -gui.playerdetails.player.lore.noclan=&7Unioni\: &bEi ole -gui.playerdetails.player.lore.clan=&fUnioni\: [{0}&f] {1} +gui.playerdetails.player.lore.nounion=&7Unioni\: &bEi ole +gui.playerdetails.player.lore.union=&fUnioni\: [{0}&f] {1} gui.playerdetails.player.lore.rank=&7Arvo\: &b{0} gui.playerdetails.player.lore.status=&7Tila\: &b{0} gui.playerdetails.player.lore.kdr=&7KDR\: &B{0} @@ -762,8 +761,8 @@ gui.playerdetails.player.lore.deaths=&7Kuolemat\: &b{0} gui.playerdetails.player.lore.join.date=&7Liittymispäivämäärä\: &b{0} gui.playerdetails.player.lore.last.seen=&7Viimeksi nähty\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.playerdetails.player.lore.past.clans.separator=&b, -gui.playerdetails.player.lore.past.clans=&7Aiemmat unionit\: &b{0} +gui.playerdetails.player.lore.past.unions.separator=&b, +gui.playerdetails.player.lore.past.unions=&7Aiemmat unionit\: &b{0} gui.playerdetails.player.lore.inactive=&7Inaktiivinen\: &b{0}/{1} päivää gui.playerdetails.kick.title=&fPotkia gui.playerdetails.promote.demote.title=&fYlentää/Alentaa @@ -787,55 +786,53 @@ gui.languageselector.title=Kielet - Nykyinen\: {0} gui.languageselector.language.title=&f{0} gui.languageselector.language.lore.left.click=&7Klikkaa vasemmalla valitaksesi tämän kieleksesi gui.languageselector.language.lore.translation.status=&7Käännöksen tila\: &b{0}% -gui.languageselector.language.lore.right.click=&7Klikkaa hiiren oikealla painikkeella auttaaksesi kääntämisessä gui.confirmation.title=Vahvistus gui.confirmation.confirm=&7Klikkaa tästä vahvistaaksesi gui.confirmation.return=&7Klikkaa tästä mennäksesi takaisin gui.not.supported=&cVirhe tapahtui GUI\:ta avatessa\! Otetaan pois käytöstä... Latasitko varmasti oikean version? -staff.member.verify.clan=&cHenkilökunnan jäsenen pitää vahvistaa unionisi\! +staff.member.verify.union=&cHenkilökunnan jäsenen pitää vahvistaa unionisi\! player.already.has.that.rank=&cPelaajalla on jo kyseinen arvo\! -joined.clan.chat=&bLiityit unioni chattiin -already.joined.clan.chat=&bOlet jo liittynyt unioni chattiin -left.clan.chat=&bLähdit unionichatista -muted.clan.chat=&bMykistit unionichatin -unmuted.clan.chat=&bPoistit mykistyksen unionichatista +joined.union.chat=&bLiityit unioni chattiin +already.joined.union.chat=&bOlet jo liittynyt unioni chattiin +left.union.chat=&bLähdit unionichatista +muted.union.chat=&bMykistit unionichatin +unmuted.union.chat=&bPoistit mykistyksen unionichatista joined.ally.chat=&bLiityit liittolaisten chattiin left.ally.chat=&bLähdit liittolaisten chatista muted.ally.chat=&bMykistit liittolaisten chatin unmuted.ally.chat=&bPoistit mykistyksen liittolaisten chatista already.joined.ally.chat=&bOlet jo liittynyt liittolaisten chattiin -player.already.in.this.clan=&cPelaaja on jo tässä unionissa -your.clan.reached.max.alliances=&cUnionisi on saavuttanut liittolaisten enimmäismäärän -other.clan.reached.max.alliances=&cToinen unioni jo saavuttanut liittolaisten enimmäismäärän -insert.clan.tag=&bKirjoita unionin tunniste (tai "{0}")\: -insert.clan.name=&bKirjoita unionin tunniste\: +player.already.in.this.union=&cPelaaja on jo tässä unionissa +your.union.reached.max.alliances=&cUnionisi on saavuttanut liittolaisten enimmäismäärän +other.union.reached.max.alliances=&cToinen unioni jo saavuttanut liittolaisten enimmäismäärän +insert.union.tag=&bKirjoita unionin tunniste (tai "{0}")\: +insert.union.name=&bKirjoita unionin tunniste\: insert.rank.name=&bKirjoita arvon nimi (tai "{0}")\: -click.to.help.translating=&bKlikkaa tätä linkkiä auttaaksesi kääntämisessä\:\n&r{0} -your.clan.must.have.members.to.verify=&bUnionillasi täytyy olla ainakin {0} jäsentä jotta unioni voidaan vahvistaa\! +your.union.must.have.members.to.verify=&bUnionillasi täytyy olla ainakin {0} jäsentä jotta unioni voidaan vahvistaa\! you.must.hold.a.banner=&cSinulla pitää olla lippu kädessäsi\! -you.changed.clan.banner=&bVaihdoit unionisi lippua\! -your.clan.already.verified=&cUnionisi on jo vahvistettu\! +you.changed.union.banner=&bVaihdoit unionisi lippua\! +your.union.already.verified=&cUnionisi on jo vahvistettu\! # suppress inspection "TrailingSpacesInProperty" -clan.profile=\n&b%clan_name%&7 profiili &8-------------------------------------------\n \n &7Nimi\: &e[&8%clan_color_tag%&e] &b%clan_name%\n &7Kuvaus\: &f%clan_description%\n &7Tila\: &f%clan_status%\n &7Johtajat\: %clan_leaders%\n &7Jäseniä pelaamassa\: &f%clan_online_count%&7/&f%clan_size%\n &7KDR\: &e%clan_kdr%\n &7Tapot yhteensä\: &8[Rival\:&f%clan_rival_kills% &8Liittolaiset\:&f%clan_ally_kills% &8Neutraali\:&f%clan_neutral_kills% &8Siviili\:&f%clan_civilian_kills%&8]\n &7Kuolemat\: &f%clan_deaths%\n &7Liittolaiset\: &f%clan_allies%\n &7Viholliset\: &f%clan_rivals%\n &7Perustettu\: &f%clan_founded%\n &7Toimeeton\: &f%clan_inactive_days%&7/&f%clan_max_inactive_days% päivää\n -player.lookup.clanname=&e[&8%clan_color_tag%&e] &b%clan_name% +union.profile=\n&b%union_name%&7 profiili &8-------------------------------------------\n \n &7Nimi\: &e[&8%union_color_tag%&e] &b%union_name%\n &7Kuvaus\: &f%union_description%\n &7Tila\: &f%union_status%\n &7Jäseniä pelaamassa\: &f%union_online_count%&7/&f%union_size%\n &7KDR\: &e%union_kdr%\n &7Tapot yhteensä\: &8[Rival\:&f%union_rival_kills% &8Liittolaiset\:&f%union_ally_kills% &8Neutraali\:&f%union_neutral_kills% &8Siviili\:&f%union_civilian_kills%&8]\n &7Kuolemat\: &f%union_deaths%\n &7Liittolaiset\: &f%union_allies%\n &7Viholliset\: &f%union_rivals%\n &7Perustettu\: &f%union_founded%\n &7Toimeeton\: &f%union_inactive_days%&7/&f%union_max_inactive_days% päivää\n +player.lookup.unionname=&e[&8%union_color_tag%&e] &b%union_name% # suppress inspection "TrailingSpacesInProperty" player.lookup.killtype=&7Tappotyyppi\: %player_kill_type% -player.lookup=\n&b%player_name%&7''s pelaajan tiedot &8-------------------------------------------\n \n &7Unioni\: &f%clan_name%\n &7Arvo\: &f%player_rank%\n &7Tila\: &f%player_status%\n &7KDR\: &e%player_kdr%\n &7Tappoja yhteensä\: &8[Viholliset\:&f%player_rival_kills% &8Liittolaiset\:&7%player_ally_kills% &8Neutraali\:&f%player_neutral_kills% &8Siviili\:&f%player_civilian_kills%&8]\n &7Kuolema\: &f%player_deaths%\n &7Liittymispäivä\: &f%player_join_date%\n &7Viimeksi nähty\: &f%player_last_seen%\n &7Aiemmat unionit\: &f%player_past_clans%\n &7Toimeeton &f%player_inactive_days%&7/&f%player_max_inactive_days% päivää\n %kill_type_line% +player.lookup=\n&b%player_name%&7''s pelaajan tiedot &8-------------------------------------------\n \n &7Unioni\: &f%union_name%\n &7Tila\: &f%player_status%\n &7KDR\: &e%player_kdr%\n &7Tappoja yhteensä\: &8[Viholliset\:&f%player_rival_kills% &8Liittolaiset\:&7%player_ally_kills% &8Neutraali\:&f%player_neutral_kills% &8Siviili\:&f%player_civilian_kills%&8]\n &7Kuolema\: &f%player_deaths%\n &7Liittymispäivä\: &f%player_join_date%\n &7Viimeksi nähty\: &f%player_last_seen%\n &7Aiemmat unionit\: &f%player_past_unions%\n &7Toimeeton &f%player_inactive_days%&7/&f%player_max_inactive_days% päivää\n %kill_type_line% economy.disabled=&cEkonomia poistettu käytöstä\! has.been.purged=Pelaajan {0} tiedot puhdistettu accepted.invitation=&bHyväksyit {0} pyynnön denied.invitation=&cKielisit {0} pyynnön -must.be.in.clan.to.pvp=&cSinun ja pelaajan {0} pitää olla unionissa jotta voitte PVP\! -clans.not.at.war.pvp.denied=&cUnionisi ei sodi unionin {0} kanssa\! +must.be.in.union.to.pvp=&cSinun ja pelaajan {0} pitää olla unionissa jotta voitte PVP\! +unions.not.at.war.pvp.denied=&cUnionisi ei sodi unionin {0} kanssa\! cannot.attack.civilians=&cEt voi hyökätä siviilejä\! -cannot.attack.clan.member=&cEt voi hyökätä toista unionin jäsentä\! +cannot.attack.union.member=&cEt voi hyökätä toista unionin jäsentä\! cannot.attack.ally=&cEt voi hyökätä liittolaistasi\! cannot.send.discord.message=Et voi lähettää viestejä {0}. Et ole unionin jäsen\! discordhook.is.disabled=&cDiscord-integraatio on poistettu käytöstä tai sitä ei ole saatavilla\! -your.clan.doesnt.have.any.linked.player=Unionillasi ei ole liitettyjä jäseniä -your.clan.doesnt.have.minimum.linked.player=Unionillasi ei ole tarpeeksi liitettyjä jäseniä -your.clan.is.not.on.the.whitelist=Unionisi ei ole sallittu -your.clan.already.has.channel=Unionillasi on jo discord kanava +your.union.doesnt.have.any.linked.player=Unionillasi ei ole liitettyjä jäseniä +your.union.doesnt.have.minimum.linked.player=Unionillasi ei ole tarpeeksi liitettyjä jäseniä +your.union.is.not.on.the.whitelist=Unionisi ei ole sallittu +your.union.already.has.channel=Unionillasi on jo discord kanava discord.reached.category.limit=Discord on osunut kategorien rajaan\! discord.reached.channels.limit=Discord on osunut kanavien rajaan\! discord.created.successfully=&bDiscord-kanava luotiin onnistuneesti\! @@ -845,19 +842,19 @@ cannot.kick.last.leader=&Et voi siirtää viimeistä johtajaa\! cannot.disband.permanent=&cEt voi poistaa tätä unionia. Sillä on pysyvä tila. you.can.only.set.base.in.your.land=&cVoit asettaa kodin vain maallasi\! only.leaders.can.create.lands=&cVain johtajat voivat luoda maita\! -only.one.land.per.clan=&cUnionillasi on jo maa\! -only.clan.members.can.create.lands=&cVain unionin jäsenet voivat luoda maita\! +only.one.land.per.union=&cUnionillasi on jo maa\! +only.union.members.can.create.lands=&cVain unionin jäsenet voivat luoda maita\! land.allowed.all.actions=&bKaikki toiminnot ovat nyt sallittuja\! land.blocked.all.actions=&bKaikki toiminnot ovat nyt estettyjä\! land.allowed.action=&bSallittu toiminto\! land.blocked.action=&bEstetty toiminto\! you.do.not.own.lands=&cEt omista maata\! land.sharing.disabled=&cMaiden jakaminen on poistettu käytöstä\! -clan.chat.disabled=&cUnioni chatti on pois päältä\! +union.chat.disabled=&cUnioni chatti on pois päältä\! ally.chat.disabled=&cLiittolaisten chatti on pois päältä\! war.expired=Sota {0} kanssa on päättynyt\! you.cant.start.war.online.members.difference=Et voi alottaa sotaa. Toisella unionilla on enemmän jäseniä paikalla kuin toisella. invitedplayer.invite.off=Tämä pelaaja on poistanut unionikutsut pois käytöstä user.hasnt.played.before=&cTämä käyttäjä ei ole pelannut ennen -clan.list.balance.header=\n{0} &7korkein saldo &8-----------------------\n\n&8Klaaneja yhteensä\: &7{1}\n\n&8\#&7. &8Unioni &7- &8Saldo -clan.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} +union.list.balance.header=\n{0} &7korkein saldo &8-----------------------\n\n&8Klaaneja yhteensä\: &7{1}\n\n&8\#&7. &8Unioni &7- &8Saldo +union.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} diff --git a/src/main/resources/messages_fr_FR.properties b/src/main/resources/messages_fr_FR.properties index 261f9434..92daeffd 100644 --- a/src/main/resources/messages_fr_FR.properties +++ b/src/main/resources/messages_fr_FR.properties @@ -66,7 +66,7 @@ admin.command=admin mod.command=modérateur promote.command=promouvoir demote.command=rétrograder -clanff.command=clanff +unionff.command=unionff ff.command=ff resign.command=résigner disband.command=dissoudre @@ -106,7 +106,7 @@ acf-core.parameter.tag=tag acf-core.parameter.name=nom acf-core.parameter.description=description acf-core.parameter.player=joueur -acf-core.parameter.clan=union +acf-core.parameter.union=union acf-core.parameter.type=type acf-core.parameter.order=ordre acf-core.parameter.help=page ou mots-clés @@ -149,8 +149,8 @@ command.description.ff.allow=Défini vos dégats aux autres joueurs sur désacti command.description.ff.auto=Défini vos dégats aux autres joueurs sur automatique command.description.globalff.allow=Défini le combat allié du serveur sur activé command.description.globalff.auto=Défini le combat allié du serveur sur automatique -command.description.clanff.allow=Défini le combat allié de votre union sur activé -command.description.clanff.block=Défini le combat allié de votre union sur bloqué +command.description.unionff.allow=Défini le combat allié de votre union sur activé +command.description.unionff.block=Défini le combat allié de votre union sur bloqué command.description.description=Défini votre description de union command.description.ban=Banni un joueur des commandes du union command.description.unban=Débanni un joueur des commandes du union @@ -178,7 +178,7 @@ command.description.untrust=Ne fait plus confiance à un membre command.description.resign=Rejette de votre union command.description.help=Affiche cette aide ou recherche dans l''aide command.description.ally.add=Ajoute un allié -command.description.clan=Ouvre l''interface +command.description.union=Ouvre l''interface command.description.disband=Dissoudre votre union command.description.mod.disband=Dissoudre un union command.description.mod.kick=Exclure un joueur du union @@ -234,7 +234,7 @@ command.description.mod.locale=Définir la langue d''un joueur home-menu=/{0} home{1} - Téléporte au domicile du union home-set-menu=/{0} home set{1} - Définir le domicile du union home-clear-menu=/{0} home set{1} - Effacer le domicile du union -clan=Union +union=Union allies=Alliés alliances=alliances coords=coordonnées @@ -244,7 +244,7 @@ coords.upper=Coordonnées world=Monde kdr=KDR members=Membres -clans.lower=unions +unions.lower=unions rival=Rival civilian=Civil neutral=Neutre @@ -288,9 +288,9 @@ nokillsfound=Pas de Morts Trouvés promoted.to.leader={0} a été promu chef denied.demotion={0} a refusé la rétrogradation de {1}. Le consensus a échoué. membership.invitation={0} a refusé l''invitation à rejoindre -joined.the.clan={0} a rejoint le union +joined.the.union={0} a rejoint le union signed.off.request.cancelled={0} s''est déconnecté. Demande {1} annulée. -clan.deletion={0} a refusé la suppression du union. Le consensus a échoué. +union.deletion={0} a refusé la suppression du union. Le consensus a échoué. rename.refused={0} a refusé le changement de nom du union. Le consensus a échoué. has.been.disbanded=Le union {0} a été dissous denied.the.promotion={0} a refusé la promotion de {1}. Le consensus a échoué. @@ -326,9 +326,9 @@ mysql.connection.failed=MySQL Échec de la connexion sqlite.connection.successful=SQLite Connexion réussie sqlite.connection.failed= SQLite Échec de la connexion purging.player.data=purge les données du joueur\: {0} -purging.clan=Purge du union\: {0} -clan.players=Joueurs du Union\: {0} -clans=Unions\: {0} +purging.union=Purge du union\: {0} +union.players=Joueurs du Union\: {0} +unions=Unions\: {0} banned=Vous êtes banni des commandes de union nothing.more.to.see=Rien de plus à voir nothing.to.vote=&cRien à accepter ou à refuser @@ -341,78 +341,78 @@ bulletin.board.header=&8* &e{0} &ftableau d''affichage bulletin.board.message={0}\: &f{1} has.been.disbanded.rivalry.ended={0} a été dissous. Rivalité terminée. has.been.disbanded.alliance.ended={0} a été dissous. L''alliance est terminée. -clan.disbanded=Union Dissous +union.disbanded=Union Dissous 1.color.day=1 {0}jour many.color.days={0}{1} jours insufficient.permissions=Permissions insuffisantes -clan.is.not.verified=Le union n''est pas vérifié -player.not.a.member.of.any.clan=&cLe joueur n''est membre d''aucun union -not.a.member.of.any.clan=Vous n''êtes membre d''aucun union +union.is.not.verified=Le union n''est pas vérifié +player.not.a.member.of.any.union=&cLe joueur n''est membre d''aucun union +not.a.member.of.any.union=Vous n''êtes membre d''aucun union minimum.to.make.alliance=Votre union doit avoir au moins {0} joueurs pour faire des alliances -cannot.be.same.clan=&cVous devez insérer un union différent du vôtre \! -other.clan.not.verified=&cL''autre union n''est pas vérifié \! -your.clans.are.not.allies=Vos unions ne sont pas alliés +cannot.be.same.union=&cVous devez insérer un union différent du vôtre \! +other.union.not.verified=&cL''autre union n''est pas vérifié \! +your.unions.are.not.allies=Vos unions ne sont pas alliés has.broken.the.alliance={0} a rompu l''alliance avec {1} at.least.one.leader.accept.the.alliance=Au moins un chef de l''alliance doit être en ligne pour accepter l''alliance leaders.have.been.asked.for.an.alliance={0} chefs ont été consulté pour une alliance -your.clans.are.already.allies=Vos unions sont déjà alliés -your.clan.cannot.create.rivals=Votre union ne peut pas créer de rivaux +your.unions.are.already.allies=Vos unions sont déjà alliés +your.union.cannot.create.rivals=Votre union ne peut pas créer de rivaux min.players.rivalries=Votre union doit avoir au moins {0} joueurs pour faire des rivalités this.player.is.already.banned=Ce joueur est déjà banni player.added.to.banned.list=Joueur ajouté à la liste des bannis you.banned=Tu as été banni à partir d''une commande de union -clan.wide.friendly.fire.blocked=Tir allié de union bloqué -clan.wide.friendly.fire.is.allowed=Tir allié de union autorisé +union.wide.friendly.fire.blocked=Tir allié de union bloqué +union.wide.friendly.fire.is.allowed=Tir allié de union autorisé you.are.the.only.member.online=Vous êtes le seul membre en ligne -your.clan.color.tag.cannot.be.longer.than.characters=&Votre tag de union ne peut pas dépasser {0} caractères -your.clan.tag.cannot.be.longer.than.characters=&cVotre tag de union ne peut pas être plus long que {0} caractères -your.clan.tag.must.be.longer.than.characters=&cVotre tag de union doit être plus grand que {0} caractères +your.union.color.tag.cannot.be.longer.than.characters=&Votre tag de union ne peut pas dépasser {0} caractères +your.union.tag.cannot.be.longer.than.characters=&cVotre tag de union ne peut pas être plus long que {0} caractères +your.union.tag.must.be.longer.than.characters=&cVotre tag de union doit être plus grand que {0} caractères your.tag.cannot.contain.the.following.colors=&cVotre tag de union ne peut pas contenir les couleurs suivantes\: {0} your.tag.doesnt.meet.the.requirements=&cVotre tag ne répond pas aux exigences. your.tag.cannot.contain.color.codes=&cVotre tag ne peut pas contenir des codes de couleur -your.clan.tag.can.only.contain.letters.numbers.and.color.codes=&cLe tag de votre union ne peut contenir que des lettres, des chiffres et des codes de couleur +your.union.tag.can.only.contain.letters.numbers.and.color.codes=&cLe tag de votre union ne peut contenir que des lettres, des chiffres et des codes de couleur you.cannot.set.colored.ranks=Vous ne pouvez pas définir de rangs colorés -your.clan.name.cannot.be.longer.than.characters=Votre tag de union ne peut pas dépasser {0} caractères -your.clan.name.must.be.longer.than.characters=Le nom d''utilisateur doit être composé de plus de {0} caractères -your.clan.name.cannot.contain.color.codes=Votre tag ne peut pas contenir des codes de couleur +your.union.name.cannot.be.longer.than.characters=Votre tag de union ne peut pas dépasser {0} caractères +your.union.name.must.be.longer.than.characters=Le nom d''utilisateur doit être composé de plus de {0} caractères +your.union.name.cannot.contain.color.codes=Votre tag ne peut pas contenir des codes de couleur that.tag.name.is.disallowed=&cCe nom de tag n''est pas autorisé you.must.first.resign=Vous devez d''abord démissionner de {0} -clan.with.this.tag.already.exists=Un union avec cette étiquette existe déjà -get.your.clan.verified.to.access.advanced.features=Faites vérifier votre union pour accéder aux fonctionnalités avancées -clan.created=Union {0} créé +union.with.this.tag.already.exists=Un union avec cette étiquette existe déjà +get.your.union.verified.to.access.advanced.features=Faites vérifier votre union pour accéder aux fonctionnalités avancées +union.created=Union {0} créé not.enough.leaders.online.to.vote.on.demotion=Il n''y a pas assez de chefs en ligne pour voter sur cette rétrogradation demotion.vote.has.been.requested.from.all.leaders=Le vote de rétrogradation a été demandé par tous les chefs -player.is.not.a.leader.of.your.clan=Le joueur n''est pas un chef de votre union +player.is.not.a.leader.of.your.union=Le joueur n''est pas un chef de votre union player.is.not.a.leader=Le joueur n''est pas un leader -clan.has.been.disbanded=Le union {0} a été dissous -clan.disband.vote.has.been.requested.from.all.leaders=Le vote de dissolution du union a été demandé par tous les chefs -friendy.fire.is.now.managed.by.your.clan=Le feu d''allié est maintenant géré par votre union +union.has.been.disbanded=Le union {0} a été dissous +union.disband.vote.has.been.requested.from.all.leaders=Le vote de dissolution du union a été demandé par tous les chefs +friendy.fire.is.now.managed.by.your.union=Le feu d''allié est maintenant géré par votre union personal.friendly.fire.is.set.to.allowed=Le feu personnel est configuré sur autorisé -global.friendy.fire.is.now.managed.by.each.clan=Le feu d''allié est maintenant géré par chaque union -global.friendy.fire.is.already.being.managed.by.each.clan=Le feu d''allié est déjà géré par chaque union +global.friendy.fire.is.now.managed.by.each.union=Le feu d''allié est maintenant géré par chaque union +global.friendy.fire.is.already.being.managed.by.each.union=Le feu d''allié est déjà géré par chaque union global.friendly.fire.is.set.to.allowed=Le feu d''allié global est configuré sur autorisé global.friendly.fire.is.already.being.allowed=Le feu d''allié global est déjà configuré sur autorisé -the.player.doesn.t.not.have.the.permissions.to.join.clans=Le joueur n''a pas les permissions nécessaires pour rejoindre les unions +the.player.doesn.t.not.have.the.permissions.to.join.unions=Le joueur n''a pas les permissions nécessaires pour rejoindre les unions you.cannot.invite.yourself=Vous ne pouvez pas vous invitez vous-même you.did.not.answer.in.time=Vous n''avez pas répondu à temps, annulation... -this.player.is.banned.from.using.clan.commands=Ce joueur n''est pas autorisé à utiliser les commandes du union -the.player.is.already.member.of.another.clan=Le joueur est déjà membre d''un autre union +this.player.is.banned.from.using.union.commands=Ce joueur n''est pas autorisé à utiliser les commandes du union +the.player.is.already.member.of.another.union=Le joueur est déjà membre d''un autre union has.been.asked.to.join={0} a été demandé à rejoindre {1} you.cannot.kick.yourself=Vous ne pouvez pas vous expulsez vous-même -the.player.is.not.a.member.of.your.clan=Le joueur n''est pas un membre de votre union +the.player.is.not.a.member.of.your.union=Le joueur n''est pas un membre de votre union you.cannot.kick.another.leader=Vous ne pouvez pas expulser un autre chef has.been.kicked.by={0} a été expulsé par {1} -no.clans.have.been.created=Aucun union n''a été créé -total.clans=Total des unions\: +no.unions.have.been.created=Aucun union n''a été créé +total.unions=Total des unions\: legend=Légende\: kill.type.civilian=Type de Tué\: {0}Civil no.player.data.found=Pas de données de joueur trouvées -clan.0=Union\: {0} +union.0=Union\: {0} status.0=Statuts\: {0} rank.0=Rang\: {0} kdr.0=KDR\: {0} inactive.0=Inactif\: {0} -clan.commands=commandes de union +union.commands=commandes de union you.can.only.modify.the.color.and.case.of.the.tag=Vous ne pouvez seulement modifier la couleur et le tag locale.has.been.changed=&cVotre langue a été modifiée locale.is.prohibited=&cLa sélection de la langue sur le serveur est interdite. @@ -424,11 +424,11 @@ leaders.0=Chefs\: {0} allies.0=Alliés\: {0} rivals.0=Rivaux\: {0} other.player.must.be.online=Le joueur doit être en ligne \! -the.player.does.not.have.the.permissions.to.lead.a.clan=Le joueur n''a pas la permission de diriger un union +the.player.does.not.have.the.permissions.to.lead.a.union=Le joueur n''a pas la permission de diriger un union you.cannot.promote.yourself=Vous ne pouvez pas vous promouvoir vous-même the.player.is.already.a.leader=Le joueur est déjà un chef configuration.reloaded=Configuration rechargée -last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.clan=Le dernier chef ne peut pas démissionner. Vous devez nommer un autre chef ou dissoudre le union +last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.union=Le dernier chef ne peut pas démissionner. Vous devez nommer un autre chef ou dissoudre le union 0.has.resigned={0} a démissionné you.cannot.trust.yourself=Vous ne pouvez pas vous faire confiance leaders.are.already.trusted=Les chefs sont déjà de confiance @@ -436,23 +436,23 @@ this.player.is.already.trusted=Ce lecteur est déjà de confiance has.been.given.trusted.status.by={0} a reçu un statut de confiance par {1} this.player.is.not.banned=Ce joueur n''est pas banni player.removed.from.the.banned.list=Joueur retiré de la liste des joueurs bannis -you.have.been.unbanned.from.clan.commands=Vous avez été dé-banni des commandes du union +you.have.been.unbanned.from.union.commands=Vous avez été dé-banni des commandes du union you.cannot.untrust.yourself=Vous ne pouvez pas vous défaire de votre confiance leaders.cannot.be.untrusted=Les chefs ne peuvent pas être défaits de leur confiance this.player.is.already.untrusted=Ce lecteur n''est déjà pas fiable has.been.given.untrusted.status.by={0} a reçu un statut de non-confiance par {1} -the.clan.does.not.exist=Le union n''existe pas -the.clan.is.already.verified=Le union est déjà vérifié -the.clan.has.been.verified=Le union a été vérifié -clan.0.has.been.verified=Le union {0} a été vérifié \! -total.clan.players.0=Total de joueurs du unions\: {0} +the.union.does.not.exist=Le union n''existe pas +the.union.is.already.verified=Le union est déjà vérifié +the.union.has.been.verified=Le union a été vérifié +union.0.has.been.verified=Le union {0} a été vérifié \! +total.union.players.0=Total de joueurs du unions\: {0} proposing.war={0} est en train de proposer de commencer une guerre avec {1} you.can.only.start.war.with.rivals=Vous ne pouvez commencer la guerre qu''avec des rivaux leaders.have.been.asked.to.accept.the.war.request={0} chefs ont été invités à accepter la demande de guerre leaders.asked.to.end.rivalry={0} chefs ont été invités à mettre fin à la guerre proposing.to.end.the.war={0} est en train de proposer de terminer une guerre avec {1} -clans.already.at.war=Vos unions sont déjà en guerre -clans.not.at.war=Vos unions ne sont pas en guerre +unions.already.at.war=Vos unions sont déjà en guerre +unions.not.at.war=Vos unions ne sont pas en guerre you.are.at.war={0} est maintenant en guerre avec {1} denied.war.req={0} a refusé la demande de guerre envoyée par {1} you.are.no.longer.at.war={0} n’est plus en guerre avec {1} @@ -480,12 +480,12 @@ diamond=diamant gold=or wood=bois server.announce=Annonce du serveur -clan.announce=Annonce du Union +union.announce=Annonce du Union leader.announce=Annonce du Chef hunger=Faim stone=pierre iron=fer -the.clan.cannot.be.rivaled=Le union ne peut pas être rivalisé +the.union.cannot.be.rivaled=Le union ne peut pas être rivalisé bboff=BB désactivé bbon=BB activé inviteon=Invitation activée @@ -509,30 +509,30 @@ waiting.for.teleport.stand.still.for.0.seconds=En attente de téléportation, re on=on off=off player.rank.changed=Le rang a été défini -your.clans.are.already.rivals=Vos unions sont déjà rivaux +your.unions.are.already.rivals=Vos unions sont déjà rivaux cleared.bb=Tableau d''affichage effacé -clan.balance=Solde du union\: {0} -clan.admin.balance={0}''s solde\: {1} -bb.clan.deposit={0} ont été déposés par {1} -player.clan.deposit=Vous avez déposé {0} -bb.clan.withdraw={0} ont été retirés par {1} -bb.clan.take={0} ont été pris par {1} -bb.clan.give={0} ont été données par {1} -bb.clan.set={0} ont été définis par {1} -player.clan.withdraw=Vous retirez {0} -clan.admin.take=Vous avez prélevé {0} sur la solde de {1} -clan.admin.give=Vous avez donné {0} à la solde de {1} -clan.admin.set=Vous mettez le solde bancaire de {0} à {1} -clan.admin.bank.not.enough.money=La solde de {0} n''a pas assez d''argent \! -clan.bank.not.enough.money=Votre banque de unions n''a pas assez d''argent -your.clans.are.not.rivals=Vos unions ne sont pas rivaux -the.clan.members.reached.limit=Votre union a atteint la limite de membres -this.clan.has.reached.the.member.limit=&bCe union à atteint la limite de union maximale +union.balance=Solde du union\: {0} +union.admin.balance={0}''s solde\: {1} +bb.union.deposit={0} ont été déposés par {1} +player.union.deposit=Vous avez déposé {0} +bb.union.withdraw={0} ont été retirés par {1} +bb.union.take={0} ont été pris par {1} +bb.union.give={0} ont été données par {1} +bb.union.set={0} ont été définis par {1} +player.union.withdraw=Vous retirez {0} +union.admin.take=Vous avez prélevé {0} sur la solde de {1} +union.admin.give=Vous avez donné {0} à la solde de {1} +union.admin.set=Vous mettez le solde bancaire de {0} à {1} +union.admin.bank.not.enough.money=La solde de {0} n''a pas assez d''argent \! +union.bank.not.enough.money=Votre banque de unions n''a pas assez d''argent +your.unions.are.not.rivals=Vos unions ne sont pas rivaux +the.union.members.reached.limit=Votre union a atteint la limite de membres +this.union.has.reached.the.member.limit=&bCe union à atteint la limite de union maximale you.have.reseted.your.kdr=Vous avez réinitialisé votre KDR you.have.reseted.0.kdr=Vous avez réinitialisé la KDR de {0} you.have.reseted.kdr.of.all.players=Vous avez réinitialisé la KDR de tous les joueurs -you.have.successfully.renamed.your.clan=&bVous avez renommé votre union en {0} avec succès -you.have.successfully.renamed.the.clan=&bVous avez renommé le union en {0} avec succès +you.have.successfully.renamed.your.union=&bVous avez renommé votre union en {0} avec succès +you.have.successfully.renamed.the.union=&bVous avez renommé le union en {0} avec succès you.have.toggled.permanent.status=Vous avez activé le statut permanent pour {0} permanent.status.enabled=Le statut permanent de votre union à été activé par {0} permanent.status.disabled=Le statut permanent de votre union à été désactivé par {0} @@ -556,11 +556,11 @@ bb.one.hour=1 heure bb.days= jours bb.one.day=1 jour player.purged=Le joueur a bien été purgé -your.clan.description.must.be.longer.than=La description de votre union doit faire plus de {0} caractères -your.clan.description.cannot.be.longer.than=La description de votre union doit faire plus de {0} caractères +your.union.description.must.be.longer.than=La description de votre union doit faire plus de {0} caractères +your.union.description.cannot.be.longer.than=La description de votre union doit faire plus de {0} caractères description.changed=Vous avez modifié avec succès la description du union no.description=Sans description -the.player.must.wait.0.before.joining.your.clan.again=Ce joueur doit attendre {0} minute(s) avant de rejoindre votre union à nouveau +the.player.must.wait.0.before.joining.your.union.again=Ce joueur doit attendre {0} minute(s) avant de rejoindre votre union à nouveau disabled.command=Commande désactivée rank.displayname.updated=Le nom d''affichage du rang a été mis à jour \! rank.setdefault=Le rang par défaut du union a été mis a {0} @@ -573,18 +573,18 @@ rank.created=Rang créé permission.0.added.to.rank.1=Permission {0} ajoutée au rang {1} permission.0.removed.from.rank.1=Permission {0} supprimée du rang {1} rank.0.deleted=Rang {0} supprimé -clans.ranks=Rangs du union\: +unions.ranks=Rangs du union\: ranks.list.item={0}\# {1} ({2}) no.ranks=Aucun rang n''a été créé rank.no.permissions=Ce rang n''a aucune permission player.unassigned.from.rank=Joueur retiré d''un rang you.must.be.0.or.have.the.permission.1.to.use.this=Vous devez être {0} ou votre chef doit donner à votre rang la permission {1} pour utiliser ceci -deposit.not.allowed=Les dépôts d''argent sont désactivés, utilisés /%clan %toggle %deposit pour l''activé -withdraw.not.allowed=Les retraits sont désactivés, utilisé /%clan %toggle %withdraw pour l''activé +deposit.not.allowed=Les dépôts d''argent sont désactivés, utilisés /%union %toggle %deposit pour l''activé +withdraw.not.allowed=Les retraits sont désactivés, utilisé /%union %toggle %withdraw pour l''activé resign.request.cancelled=Demande de démission annulée disband.request.cancelled=Demande de démission annulée resetkdr.request.cancelled=Demande de réinitialisation du KDR annulée -clan.create.request.cancelled=Demande de création de union annulée +union.create.request.cancelled=Demande de création de union annulée rank.create.request.cancelled=Demande de création de rang annulée promotion.vote.has.been.requested.from.all.leaders=Le vote de promotion a été demandé par tous les chefs rename.vote.has.been.requested.from.all.leaders=&bLe vote de changement de nom a été demandé par tout les leaders @@ -601,11 +601,10 @@ gui.lore.no.permission=Vous n''avez pas la permission pour effectuer cela\! gui.main.title={0} - menu du union gui.main.languageselector.title=Sélectionnez votre langue gui.main.languageselector.lore.left.click=&7Clic gauche pour sélectionner votre langue -gui.main.languageselector.lore.right.click=&7Clic droit pour aider à traduire gui.main.other.commands.title=&fAutres commandes gui.main.other.commands.lore=&7Clic gauche pour voir toutes les commandes du union -gui.main.clan.list.title=&fListe des Unions -gui.main.clan.list.lore=&7Clic gauche pour voir toutes les commandes du union +gui.main.union.list.title=&fListe des Unions +gui.main.union.list.lore=&7Clic gauche pour voir toutes les commandes du union gui.main.reset.kdr.title=&fRemettre à le KDR gui.main.reset.kdr.lore=&7Clic gauche pour réinitialiser votre KDR gui.main.leaderboard.title=&fClassement @@ -613,8 +612,8 @@ gui.main.leaderboard.lore=&fClique gauche pour voir le classement gui.main.staff.title=&fStaff gui.main.staff.lore=&7Clic gauche pour ouvrir le menu du staff gui.staff.title=Staff -gui.staff.clan.list.lore.left.click=&7Clic gauche pour voir tous les unions -gui.staff.clan.list.lore.right.click=&7Clic droit pour voir tous les unions non vérifiés +gui.staff.union.list.lore.left.click=&7Clic gauche pour voir tous les unions +gui.staff.union.list.lore.right.click=&7Clic droit pour voir tous les unions non vérifiés gui.player.list.title=Liste des joueurs gui.staff.player.list.title=&Liste des joueurs gui.staff.player.list.lore.left.click=&7Clic gauche pour voir tous les joueurs @@ -624,8 +623,8 @@ gui.staff.global.ff.lore.status=&fStatus\: {0} gui.staff.global.ff.lore.toggle=&7Clique gauche pour activer le statut de tir d''ami gui.staff.reload.title=&fRecharger gui.staff.reload.lore=&7Clique gauche pour recharger le plugin -gui.staff.clanlist.unverified.title=Unions non vérifiés - Total\: {0} -gui.staff.clanlist.toplace.title=Sélectionnés le nouveau union de {0} +gui.staff.unionlist.unverified.title=Unions non vérifiés - Total\: {0} +gui.staff.unionlist.toplace.title=Sélectionnés le nouveau union de {0} gui.warning.title=Avertissement gui.warning.no.permission.title=&fAucune permission gui.warning.no.permission.plugin.lore=Vous n''avez pas la permission pour effectuer cela\! @@ -634,20 +633,20 @@ gui.warning.no.permission.rank.lore=&Vous devez être {0} ou votre chef doit don gui.warning.not.verified.title=&fNon vérifié gui.warning.not.verified.lore=&7Votre union doit être vérifié \! gui.allies.title=Alliés -gui.allies.clan.lore=&fClic droit pour supprimer cet allié +gui.allies.union.lore=&fClic droit pour supprimer cet allié gui.allies.add.title=&fAjoute un allié gui.add.ally.title=Ajoute un allié -gui.add.ally.clan.lore=&fClic gauche s''allier avec ce union +gui.add.ally.union.lore=&fClic gauche s''allier avec ce union gui.rivals.title=Rivaux -gui.rivals.clan.lore=&fClic droit pour supprimer ce rival +gui.rivals.union.lore=&fClic droit pour supprimer ce rival gui.rivals.add.title=&fAjoute un rival gui.add.rival.title=Ajoute un rival -gui.add.rival.clan.lore=&fClic gauche pour rivaliser avec ce union -gui.clanlist.title=Unions - Total \: {0} -gui.clanlist.clan.title=&fUnion\: [{0}&f] {1} -gui.clanlist.clan.lore.position=&b\#{0} -gui.clanlist.clan.lore.kdr=&fKDR\: {0} -gui.clanlist.clan.lore.members=&fMembres\: {0} +gui.add.rival.union.lore=&fClic gauche pour rivaliser avec ce union +gui.unionlist.title=Unions - Total \: {0} +gui.unionlist.union.title=&fUnion\: [{0}&f] {1} +gui.unionlist.union.lore.position=&b\#{0} +gui.unionlist.union.lore.kdr=&fKDR\: {0} +gui.unionlist.union.lore.members=&fMembres\: {0} gui.coords.title=Coordonnées gui.coords.player.lore.distance=&Distance \: {0} gui.coords.player.lore.coords=&fCoordonnées \: {0} {1} {2} @@ -677,83 +676,83 @@ gui.permissions.permission.lore=&7Clic droit pour supprimer cette permission du gui.add.permission.title=Ajouter une permission gui.add.permission.permission.title=&f{0} gui.add.permission.permission.lore=&7Clic gauche pour ajouter cette permission au rang -gui.clandetails.title=[{0}] {1} -gui.clandetails.free.agent.title=&Agent Libre -gui.clandetails.free.agent.create.clan.price.lore=&7Prix\: &b{0} -gui.clandetails.free.agent.create.clan.lore=&7Clic gauche pour créer un union -gui.clandetails.clan.title=&f[{0}&f] {1} -gui.clandetails.clan.lore.description=&Description\: {0} -gui.clandetails.clan.lore.status=&fStatus\: {0} -gui.clandetails.clan.lore.leaders=&Chefs\: {0} -gui.clandetails.clan.lore.online.members=Membres en ligne \: {0}/{1} -gui.clandetails.clan.lore.kdr=&fKDR\: {0} -gui.clandetails.clan.lore.kill.totals=&fNombre de meurtres\: [Rival\:{0} Neutre\:{1} Civile\:{2}] -gui.clandetails.clan.lore.deaths=&fMorts\: {0} +gui.uniondetails.title=[{0}] {1} +gui.uniondetails.free.agent.title=&Agent Libre +gui.uniondetails.free.agent.create.union.price.lore=&7Prix\: &b{0} +gui.uniondetails.free.agent.create.union.lore=&7Clic gauche pour créer un union +gui.uniondetails.union.title=&f[{0}&f] {1} +gui.uniondetails.union.lore.description=&Description\: {0} +gui.uniondetails.union.lore.status=&fStatus\: {0} +gui.uniondetails.union.lore.leaders=&Chefs\: {0} +gui.uniondetails.union.lore.online.members=Membres en ligne \: {0}/{1} +gui.uniondetails.union.lore.kdr=&fKDR\: {0} +gui.uniondetails.union.lore.kill.totals=&fNombre de meurtres\: [Rival\:{0} Neutre\:{1} Civile\:{2}] +gui.uniondetails.union.lore.deaths=&fMorts\: {0} # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.allies.separator=&b, +gui.uniondetails.union.lore.allies.separator=&b, # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.rivals.separator=&b, -gui.clandetails.clan.lore.allies=&Alliés\: {0} -gui.clandetails.clan.lore.rivals=&7Rivaux\: &b{0} -gui.clandetails.clan.lore.founded=&7Fondé le\: &b{0} -gui.clandetails.clan.lore.inactive=&7Inactif\: &b{0}/{1} jours -gui.clandetails.allies.title=&fAlliés -gui.clandetails.allies.lore=&fClic gauche pour voir vos alliés ou en ajouter plus -gui.clandetails.rivals.title=&fRivaux -gui.clandetails.rivals.lore=&fClic gauche pour voir vos rivaux ou en ajouter plus -gui.clandetails.roster.title=&fListe -gui.clandetails.roster.lore=&fClic gauche pour voir les membres de votre union ou inviter plus -gui.staffclandetails.roster.lore=&7Clic gauche pour voir les membres du union -gui.clandetails.coords.title=&fCoordonnées -gui.clandetails.coords.lore=&fClic gauche pour voir les coordonnées des membres de votre union -gui.clandetails.home.title=&fMaison -gui.clandetails.home.lore.teleport.price=&7Prix de téléportation \: &b{0} -gui.clandetails.home.lore.teleport=&fClic gauche pour vous téléporter à la maison de votre union -gui.staffclandetails.home.lore.teleport=&fClic gauche pour vous téléporter à ce home de votre union -gui.clandetails.home.lore.clear=&7Poser l''objet pour nettoyer votre home de union -gui.clandetails.home.lore.set.price=&7Définir le prix\: &b{0} -gui.clandetails.home.lore.set=&fClic droit pour définir le domicile de votre union -gui.staffclandetails.home.lore.set=&fClic droit pour définir ce home de union -gui.clandetails.regroup.title=&fRegrouper -gui.clandetails.regroup.lore.price=&7Prix\: &b{0} -gui.clandetails.regroup.lore.home=&7Clic gauche pour regrouper les membres de votre union au home du union -gui.clandetails.regroup.lore.me=&7Clic droit pour regrouper les membres de votre union à votre emplacement -gui.clandetails.ff.title=&Feu allié -gui.clandetails.ff.personal.lore=&fPersonnel\: {0} -gui.clandetails.ff.clan.lore=&fUnion\: {0} -gui.clandetails.ff.personal.toggle.lore=&fClic gauche pour activer/désactiver votre feu allié -gui.clandetails.ff.clan.toggle.lore=&fClic droit pour activer/désactiver le feu allié de votre union -gui.clandetails.bank.title=&fBank -gui.clandetails.bank.balance.lore=§7Solde \: &b{0} -gui.clandetails.bank.withdraw.status.lore=&7Retirer \: &b{0} -gui.clandetails.bank.deposit.status.lore=&7Dépôt\: &b{0} -gui.clandetails.bank.withdraw.toggle.lore=&7Lâcher l''élément pour activer/désactiver le statut de retrait -gui.clandetails.bank.deposit.toggle.lore=&7Clic droit pour activer/désactiver le statut de dépôt -gui.clandetails.rank.title=&fRang -gui.clandetails.rank.lore=&7Clic gauche pour voir les rangs du union et les modifier -gui.clandetails.verified.title=&fVérifié -gui.clandetails.not.verified.title=&fNon vérifié -gui.clandetails.verify.price.lore=&7Prix\: &b{0} -gui.clandetails.not.verified.lore=&7Clic gauche pour vérifier votre union -gui.staffclandetails.not.verified.lore=&7Clic gauche pour vérifier ce union -gui.clandetails.resign.title=&fAbandonner -gui.clandetails.resign.lore=&7Clic gauche pour abandonner votre union -gui.clandetails.disband.title=&fDissoudre -gui.clandetails.disband.lore=&7Lâchez l''objet pour dissoudre votre union -gui.staffclandetails.disband.lore=&7Clic gauche pour dissoudre ce union -gui.clandetails.chat.title=&fChat -gui.clandetails.chat.clan.chat.lore=&7/{0} [message] - Envoie un message au chat du union -gui.clandetails.chat.clan.join.leave.lore=&7/{0} {1}/{2} - &bRejoindre/quitte le chat du union -gui.clandetails.chat.ally.chat.lore=&7/{0} [message] - Envoie un message au chat d''allié -gui.clandetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bRejoindre/Quitter le chat d''alliés -gui.clandetails.chat.clan.status.lore=&fUnion\: {0} -gui.clandetails.chat.ally.status.lore=&7Allié\: &b{0} -gui.clandetails.chat.clan.toggle.lore=&7Clic gauche pour basculer le statut du chat du union -gui.clandetails.chat.ally.toggle.lore=&7Clique droit pour activer le statut de chat d''allié +gui.uniondetails.union.lore.rivals.separator=&b, +gui.uniondetails.union.lore.allies=&Alliés\: {0} +gui.uniondetails.union.lore.rivals=&7Rivaux\: &b{0} +gui.uniondetails.union.lore.founded=&7Fondé le\: &b{0} +gui.uniondetails.union.lore.inactive=&7Inactif\: &b{0}/{1} jours +gui.uniondetails.allies.title=&fAlliés +gui.uniondetails.allies.lore=&fClic gauche pour voir vos alliés ou en ajouter plus +gui.uniondetails.rivals.title=&fRivaux +gui.uniondetails.rivals.lore=&fClic gauche pour voir vos rivaux ou en ajouter plus +gui.uniondetails.roster.title=&fListe +gui.uniondetails.roster.lore=&fClic gauche pour voir les membres de votre union ou inviter plus +gui.staffuniondetails.roster.lore=&7Clic gauche pour voir les membres du union +gui.uniondetails.coords.title=&fCoordonnées +gui.uniondetails.coords.lore=&fClic gauche pour voir les coordonnées des membres de votre union +gui.uniondetails.home.title=&fMaison +gui.uniondetails.home.lore.teleport.price=&7Prix de téléportation \: &b{0} +gui.uniondetails.home.lore.teleport=&fClic gauche pour vous téléporter à la maison de votre union +gui.staffuniondetails.home.lore.teleport=&fClic gauche pour vous téléporter à ce home de votre union +gui.uniondetails.home.lore.clear=&7Poser l''objet pour nettoyer votre home de union +gui.uniondetails.home.lore.set.price=&7Définir le prix\: &b{0} +gui.uniondetails.home.lore.set=&fClic droit pour définir le domicile de votre union +gui.staffuniondetails.home.lore.set=&fClic droit pour définir ce home de union +gui.uniondetails.regroup.title=&fRegrouper +gui.uniondetails.regroup.lore.price=&7Prix\: &b{0} +gui.uniondetails.regroup.lore.home=&7Clic gauche pour regrouper les membres de votre union au home du union +gui.uniondetails.regroup.lore.me=&7Clic droit pour regrouper les membres de votre union à votre emplacement +gui.uniondetails.ff.title=&Feu allié +gui.uniondetails.ff.personal.lore=&fPersonnel\: {0} +gui.uniondetails.ff.union.lore=&fUnion\: {0} +gui.uniondetails.ff.personal.toggle.lore=&fClic gauche pour activer/désactiver votre feu allié +gui.uniondetails.ff.union.toggle.lore=&fClic droit pour activer/désactiver le feu allié de votre union +gui.uniondetails.bank.title=&fBank +gui.uniondetails.bank.balance.lore=§7Solde \: &b{0} +gui.uniondetails.bank.withdraw.status.lore=&7Retirer \: &b{0} +gui.uniondetails.bank.deposit.status.lore=&7Dépôt\: &b{0} +gui.uniondetails.bank.withdraw.toggle.lore=&7Lâcher l''élément pour activer/désactiver le statut de retrait +gui.uniondetails.bank.deposit.toggle.lore=&7Clic droit pour activer/désactiver le statut de dépôt +gui.uniondetails.rank.title=&fRang +gui.uniondetails.rank.lore=&7Clic gauche pour voir les rangs du union et les modifier +gui.uniondetails.verified.title=&fVérifié +gui.uniondetails.not.verified.title=&fNon vérifié +gui.uniondetails.verify.price.lore=&7Prix\: &b{0} +gui.uniondetails.not.verified.lore=&7Clic gauche pour vérifier votre union +gui.staffuniondetails.not.verified.lore=&7Clic gauche pour vérifier ce union +gui.uniondetails.resign.title=&fAbandonner +gui.uniondetails.resign.lore=&7Clic gauche pour abandonner votre union +gui.uniondetails.disband.title=&fDissoudre +gui.uniondetails.disband.lore=&7Lâchez l''objet pour dissoudre votre union +gui.staffuniondetails.disband.lore=&7Clic gauche pour dissoudre ce union +gui.uniondetails.chat.title=&fChat +gui.uniondetails.chat.union.chat.lore=&7/{0} [message] - Envoie un message au chat du union +gui.uniondetails.chat.union.join.leave.lore=&7/{0} {1}/{2} - &bRejoindre/quitte le chat du union +gui.uniondetails.chat.ally.chat.lore=&7/{0} [message] - Envoie un message au chat d''allié +gui.uniondetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bRejoindre/Quitter le chat d''alliés +gui.uniondetails.chat.union.status.lore=&fUnion\: {0} +gui.uniondetails.chat.ally.status.lore=&7Allié\: &b{0} +gui.uniondetails.chat.union.toggle.lore=&7Clic gauche pour basculer le statut du chat du union +gui.uniondetails.chat.ally.toggle.lore=&7Clique droit pour activer le statut de chat d''allié gui.playerdetails.title={0} gui.playerdetails.player.title=&f{0} -gui.playerdetails.player.lore.noclan=&fUnion\: Aucun -gui.playerdetails.player.lore.clan=&fUnion\: [{0}&f] {1} +gui.playerdetails.player.lore.nounion=&fUnion\: Aucun +gui.playerdetails.player.lore.union=&fUnion\: [{0}&f] {1} gui.playerdetails.player.lore.rank=&fRang\: {0} gui.playerdetails.player.lore.status=&fStatus\: {0} gui.playerdetails.player.lore.kdr=&fKDR\: {0} @@ -762,8 +761,8 @@ gui.playerdetails.player.lore.deaths=&fMorts\: {0} gui.playerdetails.player.lore.join.date=&fDate d''adhésion\: {0} gui.playerdetails.player.lore.last.seen=&fVu pour la dernière fois\: {0} # suppress inspection "TrailingSpacesInProperty" -gui.playerdetails.player.lore.past.clans.separator=&b, -gui.playerdetails.player.lore.past.clans=&fAnciens unions\: {0} +gui.playerdetails.player.lore.past.unions.separator=&b, +gui.playerdetails.player.lore.past.unions=&fAnciens unions\: {0} gui.playerdetails.player.lore.inactive=&7Inactif\: &b{0}/{1} jours gui.playerdetails.kick.title=&fExpulser gui.playerdetails.promote.demote.title=&fPromouvoir/Rétrograder @@ -787,55 +786,53 @@ gui.languageselector.title=Langues - Actuellement \: {0} gui.languageselector.language.title=&f{0} gui.languageselector.language.lore.left.click=&7Clic gauche pour définir ceci comme votre langue gui.languageselector.language.lore.translation.status=&7État de la traduction \: &b{0}% -gui.languageselector.language.lore.right.click=&7Clic droit pour aider à traduire gui.confirmation.title=Confirmation gui.confirmation.confirm=&7Cliquez ici pour confirmer gui.confirmation.return=&7Cliquez ici pour revenir gui.not.supported=&cUne erreur s''est produite lors de l''ouverture de l''interface graphique \! Désactivation... Avez-vous téléchargé la bonne version ? -staff.member.verify.clan=&cUn membre du staff doit vérifier votre union \! +staff.member.verify.union=&cUn membre du staff doit vérifier votre union \! player.already.has.that.rank=&cLe joueur a déjà ce rang \! -joined.clan.chat=&bVous avez rejoint le chat du union -already.joined.clan.chat=&bVous êtes déjà connecté au chat du union -left.clan.chat=&bVous avez quitté le chat du union -muted.clan.chat=&bVous avez rendu muet le chat du union -unmuted.clan.chat=&bVous avez débloqué le chat du union +joined.union.chat=&bVous avez rejoint le chat du union +already.joined.union.chat=&bVous êtes déjà connecté au chat du union +left.union.chat=&bVous avez quitté le chat du union +muted.union.chat=&bVous avez rendu muet le chat du union +unmuted.union.chat=&bVous avez débloqué le chat du union joined.ally.chat=&bVous avez rejoint le chat allié left.ally.chat=&bVous avez quitté le chat allié muted.ally.chat=&bVous avez rendu muet le chat allié unmuted.ally.chat=&bVous avez réactivé le chat allié already.joined.ally.chat=&bVous avez deja rejoind le chat d''allié -player.already.in.this.clan=&cLe joueur est déjà dans ce union -your.clan.reached.max.alliances=&cVotre union a atteint le nombre maximum d''alliances -other.clan.reached.max.alliances=&cL''autre union a atteint le nombre maximum d''alliances -insert.clan.tag=&bInsérez le tag du union (ou "{0} ") \: -insert.clan.name=&bInsérer le nom du union \: +player.already.in.this.union=&cLe joueur est déjà dans ce union +your.union.reached.max.alliances=&cVotre union a atteint le nombre maximum d''alliances +other.union.reached.max.alliances=&cL''autre union a atteint le nombre maximum d''alliances +insert.union.tag=&bInsérez le tag du union (ou "{0} ") \: +insert.union.name=&bInsérer le nom du union \: insert.rank.name=&bInsérez le nom du rang (ou "{0} ") \: -click.to.help.translating=&bCliquez sur ce lien pour aider à traduire \:\n&r{0} -your.clan.must.have.members.to.verify=&cVotre union doit avoir au moins {0} membres pour être vérifié \! +your.union.must.have.members.to.verify=&cVotre union doit avoir au moins {0} membres pour être vérifié \! you.must.hold.a.banner=&cVous devez avoir une bannière dans votre main \! -you.changed.clan.banner=&bVous avez changé la bannière de votre union\! -your.clan.already.verified=&cVotre union est déjà vérifié \! +you.changed.union.banner=&bVous avez changé la bannière de votre union\! +your.union.already.verified=&cVotre union est déjà vérifié \! # suppress inspection "TrailingSpacesInProperty" -clan.profile=&b%clan_name%&7 profile &8-------------------------------------------\n \n &7Nom\: &e[&8%clan_color_tag%&e] &b%clan_name%\n &7Description\: &f%clan_description%\n &7Statust\: &f%clan_status%\n &7Leaders\: %clan_leaders%\n &7Membres En Lignes\: &f%clan_online_count%&7/&f%clan_size%\n &7KDR\: &e%clan_kdr%\n &7Totales des meurtres\: &8[Rival\:&f%clan_rival_kills% &8Allié\:&f%clan_ally_kills% &8Neutre\:&f%clan_neutral_kills% &8Civil\:&f%clan_civilian_kills%&8]\n &7Morts\: &f%clan_deaths%\n &7Alliés\: &f%clan_allies%\n &7Rivaux\: &f%clan_rivals%\n &7Fondés\: &f%clan_founded%\n &7Inactif\: &f%clan_inactive_days%&7/&f%clan_max_inactive_days% days\n -player.lookup.clanname=&e[&8%clan_color_tag%&e] &b%clan_name% +union.profile=&b%union_name%&7 profile &8-------------------------------------------\n \n &7Nom\: &e[&8%union_color_tag%&e] &b%union_name%\n &7Description\: &f%union_description%\n &7Statust\: &f%union_status%\n &7Membres En Lignes\: &f%union_online_count%&7/&f%union_size%\n &7KDR\: &e%union_kdr%\n &7Totales des meurtres\: &8[Rival\:&f%union_rival_kills% &8Allié\:&f%union_ally_kills% &8Neutre\:&f%union_neutral_kills% &8Civil\:&f%union_civilian_kills%&8]\n &7Morts\: &f%union_deaths%\n &7Alliés\: &f%union_allies%\n &7Rivaux\: &f%union_rivals%\n &7Fondés\: &f%union_founded%\n &7Inactif\: &f%union_inactive_days%&7/&f%union_max_inactive_days% days\n +player.lookup.unionname=&e[&8%union_color_tag%&e] &b%union_name% # suppress inspection "TrailingSpacesInProperty" player.lookup.killtype=&7Type de Kill \: %player_kill_type%\n -player.lookup=\nInfos du joueur%player_name%&7-------------------------------------------\n \n &7Union\: &f%clan_name%\n &7Rang \: &f%player_rank%\n &7Statut\: &f%player_status%\n &7KDR \: &e%player_kdr%\n &7Totaux de Kill \: &8[Rival\:&f%player_rival_kills% &8Allié\:&7%player_ally_kills% &8Neutre\:%player_neutral_kills% &8Civil\:&f%player_civilian_kills%&8]\n &7Morts\: &7Deaths\: &f%player_deaths%\n &7Date d''entrée\:%player_join_date%\n &7Dernière fois en ligne \:%player_last_seen%\n &7Unions précédents \:%player_past_clans%\n &7Inactif depuis\: &f%player_inactive_days%&7/&f%player_max_inactive_days% jours\n %kill_type_line% +player.lookup=\nInfos du joueur%player_name%&7-------------------------------------------\n \n &7Union\: &f%union_name%\n &7Statut\: &f%player_status%\n &7KDR \: &e%player_kdr%\n &7Totaux de Kill \: &8[Rival\:&f%player_rival_kills% &8Allié\:&7%player_ally_kills% &8Neutre\:%player_neutral_kills% &8Civil\:&f%player_civilian_kills%&8]\n &7Morts\: &7Deaths\: &f%player_deaths%\n &7Date d''entrée\:%player_join_date%\n &7Dernière fois en ligne \:%player_last_seen%\n &7Unions précédents \:%player_past_unions%\n &7Inactif depuis\: &f%player_inactive_days%&7/&f%player_max_inactive_days% jours\n %kill_type_line% economy.disabled=&cÉconomie désactivée\! has.been.purged=Les données de {0} ont été purgées accepted.invitation=&bVous avez accepté l''invitation de {0} denied.invitation=&cVous avez refusé l''invitation de {0} -must.be.in.clan.to.pvp=&cVous et {0} devez être membre de union en PvP \! -clans.not.at.war.pvp.denied=&cVotre union n''est pas en guerre avec {0}\! +must.be.in.union.to.pvp=&cVous et {0} devez être membre de union en PvP \! +unions.not.at.war.pvp.denied=&cVotre union n''est pas en guerre avec {0}\! cannot.attack.civilians=&cVous ne pouvez pas attaquer un civil \! -cannot.attack.clan.member=&cVous ne pouvez pas attaquer un autre membre du union \! +cannot.attack.union.member=&cVous ne pouvez pas attaquer un autre membre du union \! cannot.attack.ally=&cVous ne pouvez pas attaquer un allié \! cannot.send.discord.message=Vous ne pouvez pas envoyer de messages à {0}. Vous n''êtes pas membre de ce union \! discordhook.is.disabled=&cL''intégration de Discord est désactivée ou indisponible \! -your.clan.doesnt.have.any.linked.player=Votre union n''a aucun joueur lié -your.clan.doesnt.have.minimum.linked.player=Votre union n''a pas un minimum de joueurs liés -your.clan.is.not.on.the.whitelist=Votre union n''est pas dans la liste blanche -your.clan.already.has.channel=Votre union a déjà un salon Discord +your.union.doesnt.have.any.linked.player=Votre union n''a aucun joueur lié +your.union.doesnt.have.minimum.linked.player=Votre union n''a pas un minimum de joueurs liés +your.union.is.not.on.the.whitelist=Votre union n''est pas dans la liste blanche +your.union.already.has.channel=Votre union a déjà un salon Discord discord.reached.category.limit=Discord a atteint la limite de catégories \! discord.reached.channels.limit=Discord a atteint la limite de salons \! discord.created.successfully=&bSalon Discord créé avec succès \! @@ -845,19 +842,19 @@ cannot.kick.last.leader=&cVous ne pouvez pas expulser le dernier leader\! cannot.disband.permanent=&cVous ne pouvez pas dissoudre ce union. Il a un statut permanent. you.can.only.set.base.in.your.land=&cVous ne pouvez vous installer un home que sur votre terre \! only.leaders.can.create.lands=&cSeuls les leaders peuvent créer des territoires \! -only.one.land.per.clan=&cVotre union a déjà une terre \! -only.clan.members.can.create.lands=&cSeuls les membres du union peuvent créer des terres \! +only.one.land.per.union=&cVotre union a déjà une terre \! +only.union.members.can.create.lands=&cSeuls les membres du union peuvent créer des terres \! land.allowed.all.actions=&bToutes les actions sont maintenant autorisées \! land.blocked.all.actions=&bToutes les actions sont maintenant bloquées \! land.allowed.action=&bAction autorisée \! land.blocked.action=&bAction bloquée \! you.do.not.own.lands=&cVous ne possédez pas de terre \! land.sharing.disabled=&cLe partage de terres est désactivé \! -clan.chat.disabled=&cLe chat du union est désactivé \! +union.chat.disabled=&cLe chat du union est désactivé \! ally.chat.disabled=&cLe chat allié est désactivé \! war.expired=La guerre avec {0} a expiré\! you.cant.start.war.online.members.difference=Vous ne pouvez pas commencer la guerre. Un union a plus de membres en ligne que l''autre. invitedplayer.invite.off=Ce joueur a désactivé les invitations de union user.hasnt.played.before=&cCet utilisateur n''a pas joué avant -clan.list.balance.header=\n{0} &7Solde la plus haute &8-----------------------\n \n&8Total des unions\: &7{1}\n \n&8\#&7. &8Union &7- &8Solde -clan.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} +union.list.balance.header=\n{0} &7Solde la plus haute &8-----------------------\n \n&8Total des unions\: &7{1}\n \n&8\#&7. &8Union &7- &8Solde +union.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} diff --git a/src/main/resources/messages_hu_HU.properties b/src/main/resources/messages_hu_HU.properties index 70ddf6a3..adc9da98 100644 --- a/src/main/resources/messages_hu_HU.properties +++ b/src/main/resources/messages_hu_HU.properties @@ -66,7 +66,7 @@ admin.command=admin mod.command=mod promote.command=előléptetés demote.command=lefokozás -clanff.command=clanff +unionff.command=unionff ff.command=ff resign.command=lemondás disband.command=feloszlatás @@ -104,7 +104,7 @@ acf-core.parameter.tag=címke acf-core.parameter.name=név acf-core.parameter.description=leírás acf-core.parameter.player=játékos -acf-core.parameter.clan=unió +acf-core.parameter.union=unió acf-core.parameter.type=típus acf-core.parameter.order=sorrend acf-core.parameter.help=oldal vagy kulcsszavak @@ -147,8 +147,8 @@ command.description.ff.allow=Beállítja a személyes baráti tüzedet engedély command.description.ff.auto=Beállítja a személyes baráti tüzedet automatikusra command.description.globalff.allow=Beállítja a globális baráti tüzet engedélyezettre command.description.globalff.auto=Beállítja a globális baráti tüzet automatikusra -command.description.clanff.allow=Beállítja a unióod baráti tüzét engedélyezettre -command.description.clanff.block=Beállítja a unióod baráti tüzét tiltásra +command.description.unionff.allow=Beállítja a unióod baráti tüzét engedélyezettre +command.description.unionff.block=Beállítja a unióod baráti tüzét tiltásra command.description.description=Beállítja a unióod leírását command.description.ban=Kitilt egy játékost a unió parancsoktól command.description.unban=Felold egy játékost a unió parancsoktól @@ -176,7 +176,7 @@ command.description.untrust=Feloldja a megbízást egy taggal command.description.resign=Újraregisztrálja a uniót command.description.help=Megmutatja ezt a segítséget, vagy keres a segítségben command.description.ally.add=Hozzáad egy szövetségest -command.description.clan=Megnyitja a GUI-t +command.description.union=Megnyitja a GUI-t command.description.disband=Feloszlatja a unióodat command.description.mod.disband=Egyik unió feloszlatása command.description.mod.kick=Kirúgja a játékost a unióodból @@ -232,7 +232,7 @@ command.description.mod.locale=Kiválasztja a játékos nyelvét home-menu=/{0} home{1} - Teleportálás a unió hazai bázisához home-set-menu=/{0} home set{1} - Beállítsa a unió hazai bázisát home-clear-menu=/{0} home clear{1} - Törli a unió hazai bázisát -clan=Unió +union=Unió allies=Szövetségesek alliances=szövetségek coords=koordináták @@ -242,7 +242,7 @@ coords.upper=Koordináták world=Világ kdr=KDR members=Tagok -clans.lower=uniók +unions.lower=uniók rival=Vetélytárs civilian=Polgári neutral=Semleges @@ -286,9 +286,9 @@ nokillsfound=Nincs ölések találva promoted.to.leader={0} vezető szerepet kapott denied.demotion={0} tagadta a lecsökkentését {1}. A konszenzus sikertelen volt. membership.invitation={0} tagadta a tagsági meghívást -joined.the.clan={0} csatlakozott a unióhoz +joined.the.union={0} csatlakozott a unióhoz signed.off.request.cancelled={0} aláírták. {1} kérés törölve. -clan.deletion={0} tagadta a unió törlését. A konszenzus sikertelen volt. +union.deletion={0} tagadta a unió törlését. A konszenzus sikertelen volt. rename.refused={0} tagadta a unió törlését. A törlés sikertelen volt. has.been.disbanded=A(z) {0} unió feloszlott denied.the.promotion={0} tagadta a {1} promócióját. A konszenzus sikertelen volt. @@ -324,9 +324,9 @@ mysql.connection.failed=MySQL kapcsolat sikertelen sqlite.connection.successful=SQLite kapcsolat sikeres sqlite.connection.failed= SQLite kapcsolat sikertelen purging.player.data=tisztító játékos adatai\: {0} -purging.clan=Pusztító unió\: {0} -clan.players=Unió játékosok\: {0} -clans=Uniók\: {0} +purging.union=Pusztító unió\: {0} +union.players=Unió játékosok\: {0} +unions=Uniók\: {0} banned=Kitiltottad a unióparancsok használatát nothing.more.to.see=Semmi többet látni nothing.to.vote=&cSemmi sincs, amit elfogadna/elutasítana @@ -339,78 +339,78 @@ bulletin.board.header=&8* &e{0} &ffaliújság bulletin.board.message={0}\: &f{1} has.been.disbanded.rivalry.ended={0} feloszlott. A rivalizálás véget ért. has.been.disbanded.alliance.ended={0} feloszlott. A Szövetség véget ért. -clan.disbanded=A unió megszűnt +union.disbanded=A unió megszűnt 1.color.day=1 {0}nap many.color.days={0}{1} nap insufficient.permissions=Nincs elegendő engedély -clan.is.not.verified=A unió nem ellenőrzött -player.not.a.member.of.any.clan=&cA játékos nem tagja bármilyen uniónak -not.a.member.of.any.clan=Nem vagy tagja semmilyen uniónak +union.is.not.verified=A unió nem ellenőrzött +player.not.a.member.of.any.union=&cA játékos nem tagja bármilyen uniónak +not.a.member.of.any.union=Nem vagy tagja semmilyen uniónak minimum.to.make.alliance=A uniónak legalább {0} játékosnak kell lennie ahhoz, hogy szövetségeket kössön -cannot.be.same.clan=&cIllessz be a tiedtől eltérő union-t\! -other.clan.not.verified=&cAz a unió nem hitelesített\! -your.clans.are.not.allies=A unióod nem szövetségesek +cannot.be.same.union=&cIllessz be a tiedtől eltérő union-t\! +other.union.not.verified=&cAz a unió nem hitelesített\! +your.unions.are.not.allies=A unióod nem szövetségesek has.broken.the.alliance={0} megszakította a szövetséget {1} at.least.one.leader.accept.the.alliance=A szövetség legalább egy vezetőjének online kell lennie ahhoz, hogy elfogadja a szövetséget leaders.have.been.asked.for.an.alliance=A(z) {0} vezetők szövetségre szólítottak fel -your.clans.are.already.allies=A unióod már szövetségesek -your.clan.cannot.create.rivals=A unió nem hozhat létre riválisokat +your.unions.are.already.allies=A unióod már szövetségesek +your.union.cannot.create.rivals=A unió nem hozhat létre riválisokat min.players.rivalries=A uniónak legalább {0} játékosnak kell lennie a rivalizálás érdekében this.player.is.already.banned=Ez a játékos már tiltott player.added.to.banned.list=A játékos hozzáadva a tiltott listához you.banned=Kitiltottad a unióparancsokból -clan.wide.friendly.fire.blocked=A unió egész barátságos tűz zárt -clan.wide.friendly.fire.is.allowed=A Unióbarát barátságos tűz megengedett +union.wide.friendly.fire.blocked=A unió egész barátságos tűz zárt +union.wide.friendly.fire.is.allowed=A Unióbarát barátságos tűz megengedett you.are.the.only.member.online=Te vagy az egyetlen tag online -your.clan.color.tag.cannot.be.longer.than.characters=&cA unióod színezett tag-je nem lehet több {0} karakternél -your.clan.tag.cannot.be.longer.than.characters=&cA unió emblémája nem lehet {0} karakternél hosszabb -your.clan.tag.must.be.longer.than.characters=&cA unió emblémája nem lehet {0} karakternél rövidebb +your.union.color.tag.cannot.be.longer.than.characters=&cA unióod színezett tag-je nem lehet több {0} karakternél +your.union.tag.cannot.be.longer.than.characters=&cA unió emblémája nem lehet {0} karakternél hosszabb +your.union.tag.must.be.longer.than.characters=&cA unió emblémája nem lehet {0} karakternél rövidebb your.tag.cannot.contain.the.following.colors=&cAz emblémád nem tartalmazhatja a következő színeket\: {0} your.tag.doesnt.meet.the.requirements=&cAz emblémád nem felel meg a követelményeknek. your.tag.cannot.contain.color.codes=&cAz emblémád nem tartalmazhat színeket -your.clan.tag.can.only.contain.letters.numbers.and.color.codes=&cAz emblémád csak betűket, számokat, és színeket tartalmazhat +your.union.tag.can.only.contain.letters.numbers.and.color.codes=&cAz emblémád csak betűket, számokat, és színeket tartalmazhat you.cannot.set.colored.ranks=Nem használhatsz színes rangokat -your.clan.name.cannot.be.longer.than.characters=A unió neve legfeljebb {0} karakter lehet -your.clan.name.must.be.longer.than.characters=A unió neveinek {0} karakter hosszúnak kell lenniük -your.clan.name.cannot.contain.color.codes=A unió neve nem tartalmazhat színkódokat +your.union.name.cannot.be.longer.than.characters=A unió neve legfeljebb {0} karakter lehet +your.union.name.must.be.longer.than.characters=A unió neveinek {0} karakter hosszúnak kell lenniük +your.union.name.cannot.contain.color.codes=A unió neve nem tartalmazhat színkódokat that.tag.name.is.disallowed=&cAz adott embléma nem engedélyezett you.must.first.resign=Először lemondania a {0} -clan.with.this.tag.already.exists=Ezzel a címkével már létezik egy unió -get.your.clan.verified.to.access.advanced.features=Szerezd meg a uniót, hogy ellenőrizze a speciális funkciók elérését -clan.created=A(z) {0} unió létrehozva +union.with.this.tag.already.exists=Ezzel a címkével már létezik egy unió +get.your.union.verified.to.access.advanced.features=Szerezd meg a uniót, hogy ellenőrizze a speciális funkciók elérését +union.created=A(z) {0} unió létrehozva not.enough.leaders.online.to.vote.on.demotion=Nincs elegendő vezető online hogy megszavazd ezt demotion.vote.has.been.requested.from.all.leaders=Demotion szavazást kértek minden vezetőtől -player.is.not.a.leader.of.your.clan=A játékos nem a unió egyik vezetője +player.is.not.a.leader.of.your.union=A játékos nem a unió egyik vezetője player.is.not.a.leader=A játékos nem egy vezető -clan.has.been.disbanded=A(z) {0} unió feloszlott -clan.disband.vote.has.been.requested.from.all.leaders=A unió feloszlatásáról szavazást kértek minden vezetőtől -friendy.fire.is.now.managed.by.your.clan=A barátságos tüzet most kezeli a unió +union.has.been.disbanded=A(z) {0} unió feloszlott +union.disband.vote.has.been.requested.from.all.leaders=A unió feloszlatásáról szavazást kértek minden vezetőtől +friendy.fire.is.now.managed.by.your.union=A barátságos tüzet most kezeli a unió personal.friendly.fire.is.set.to.allowed=A személyes barátságos tűz megengedett -global.friendy.fire.is.now.managed.by.each.clan=A globális barátságos tüzet minden egyes unió kezeli -global.friendy.fire.is.already.being.managed.by.each.clan=A globális barátságos tüzeket már kezelik minden egyes unió +global.friendy.fire.is.now.managed.by.each.union=A globális barátságos tüzet minden egyes unió kezeli +global.friendy.fire.is.already.being.managed.by.each.union=A globális barátságos tüzeket már kezelik minden egyes unió global.friendly.fire.is.set.to.allowed=A globális barátságos tűz megengedett global.friendly.fire.is.already.being.allowed=A globális barátságos tűz már engedélyezett -the.player.doesn.t.not.have.the.permissions.to.join.clans=A játékosnak nincs joga ahhoz hogy belépjén egy unióba +the.player.doesn.t.not.have.the.permissions.to.join.unions=A játékosnak nincs joga ahhoz hogy belépjén egy unióba you.cannot.invite.yourself=Nem hívhatod meg magad you.did.not.answer.in.time=Nem válaszoltál időben, felfüggesztés... -this.player.is.banned.from.using.clan.commands=Ez a játékos tiltja a unióparancsok használatát -the.player.is.already.member.of.another.clan=A játékos már tagja egy másik uniónak +this.player.is.banned.from.using.union.commands=Ez a játékos tiltja a unióparancsok használatát +the.player.is.already.member.of.another.union=A játékos már tagja egy másik uniónak has.been.asked.to.join={0} felkérést kapott, hogy csatlakozzon {1} you.cannot.kick.yourself=Nem tudod magadat kirúgni -the.player.is.not.a.member.of.your.clan=A játékos nem tagja a uniónak +the.player.is.not.a.member.of.your.union=A játékos nem tagja a uniónak you.cannot.kick.another.leader=Nem tehetsz meg egy másik vezetőt has.been.kicked.by={0} kirúgva {1} által -no.clans.have.been.created=Nem hoztak létre uniókat -total.clans=Összes unió\: +no.unions.have.been.created=Nem hoztak létre uniókat +total.unions=Összes unió\: legend=Legenda\: kill.type.civilian=Ölés típus\: {0} Civil no.player.data.found=Nincsenek játékosadatok -clan.0=Unió\: {0} +union.0=Unió\: {0} status.0=Állapot\: {0} rank.0=Rang\: {0} kdr.0=KDR\: {0} inactive.0=Elérhetetlen(ek)\: {0} -clan.commands=unió parancsok +union.commands=unió parancsok you.can.only.modify.the.color.and.case.of.the.tag=Csak a címke színét és esetét módosíthatod locale.has.been.changed=&cA nyelvedet megváltoztattad tag.changed.to.0=A címke megváltoztatva {0} @@ -421,11 +421,11 @@ leaders.0=Vezetők\: {0} allies.0=Szövetségesek\: {0} rivals.0=Vetélytárs(ak)\: {0} other.player.must.be.online=&cA játékosnak elérhetőnek kell lennie\! -the.player.does.not.have.the.permissions.to.lead.a.clan=A játékosnak nincs joga a unió vezetésére +the.player.does.not.have.the.permissions.to.lead.a.union=A játékosnak nincs joga a unió vezetésére you.cannot.promote.yourself=Nem fokozhatod fel magadat the.player.is.already.a.leader=A játékos már vezető szerepet játszik configuration.reloaded=A konfiguráció újratöltve -last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.clan=A legutóbbi vezető nem tud lemondani. Új vezetőt kell kijelölni vagy fel kell oszlatni a uniót +last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.union=A legutóbbi vezető nem tud lemondani. Új vezetőt kell kijelölni vagy fel kell oszlatni a uniót 0.has.resigned={0} lemondott you.cannot.trust.yourself=Nem bízhatsz magadban leaders.are.already.trusted=A vezetők már megbízhatóak @@ -433,23 +433,23 @@ this.player.is.already.trusted=Ez a játékos már megbízható has.been.given.trusted.status.by={0} megbízható állapotot kapott {1} által this.player.is.not.banned=Ez a játékos nem tiltott player.removed.from.the.banned.list=A játékos eltávolítva a tiltott listáról -you.have.been.unbanned.from.clan.commands=Vissza engedted a unióparancsoktól +you.have.been.unbanned.from.union.commands=Vissza engedted a unióparancsoktól you.cannot.untrust.yourself=Nem bízhatsz magadban leaders.cannot.be.untrusted=A vezetők nem lehetnek megbízhatatlanok this.player.is.already.untrusted=Ez a játékos már nem megbízható has.been.given.untrusted.status.by={0} megbízható állapotot kapott {1} által -the.clan.does.not.exist=A unió nem létezik -the.clan.is.already.verified=A unió már ellenőrzött -the.clan.has.been.verified=A unió igazolt -clan.0.has.been.verified=A(z) {0} unió ellenőrizve\! -total.clan.players.0=Összes unió játékos\: {0} +the.union.does.not.exist=A unió nem létezik +the.union.is.already.verified=A unió már ellenőrzött +the.union.has.been.verified=A unió igazolt +union.0.has.been.verified=A(z) {0} unió ellenőrizve\! +total.union.players.0=Összes unió játékos\: {0} proposing.war={0} azt javasolja, hogy indítsanak háborút {1} ellen you.can.only.start.war.with.rivals=Csak háborút kezdhet a riválisokkal leaders.have.been.asked.to.accept.the.war.request=A(z) {0} vezetőket felkérték, hogy fogadják el a háborús kérést leaders.asked.to.end.rivalry=A(z) {0} vezetőket felkérték, hogy vessenek véget a háborúnak proposing.to.end.the.war={0} a háború befejezését javasolja {1} -clans.already.at.war=A unióod már háborúban van -clans.not.at.war=A unióod nincsenek háborúban +unions.already.at.war=A unióod már háborúban van +unions.not.at.war=A unióod nincsenek háborúban you.are.at.war={0} most háborúban van {1} ellen denied.war.req={0} megtagadta {1} által küldött háborús kérést you.are.no.longer.at.war={0} már nincs háborúban {1} ellen @@ -477,12 +477,12 @@ diamond=gyémánt gold=arany wood=fa server.announce=Szerver bejelentés -clan.announce=Unió bejelentés +union.announce=Unió bejelentés leader.announce=Vezetői bejelentés hunger=Éhség stone=kő iron=vas -the.clan.cannot.be.rivaled=A unió nem lehet versengeni +the.union.cannot.be.rivaled=A unió nem lehet versengeni bboff=BB kikapcsolva bbon=BB bekapcsolva inviteon=Meghívások bekapcsolva @@ -506,30 +506,30 @@ waiting.for.teleport.stand.still.for.0.seconds=Várakozás a teleportálásra, on=be off=ki player.rank.changed=A rang beállítva -your.clans.are.already.rivals=A unióod már riválisok +your.unions.are.already.rivals=A unióod már riválisok cleared.bb=Törölte a hirdetőtáblát -clan.balance=Unió egyenleg\: {0} -clan.admin.balance={0} egyenlege\: {1} -bb.clan.deposit={0}-t letétbe helyezett {1} -player.clan.deposit=Letétbe helyezted {0} -bb.clan.withdraw={0}-t kivet {1} -bb.clan.take={0}-t kivett {1} -bb.clan.give={0}-t adott {1} -bb.clan.set={0}-ra lett szabva általa\: {1} -player.clan.withdraw=Visszavonsz {0} -clan.admin.take=Elvettél {0}-t {1} bankjából -clan.admin.give=Adtál {0}-t neki\: {1} -clan.admin.set=Átszabtad {0} egyenlegét ennyire\: {1} -clan.admin.bank.not.enough.money={0} bankjában nincs elég pénze\! -clan.bank.not.enough.money=A unió bankjaidnak nincs elég pénzük -your.clans.are.not.rivals=A uniók nem riválisok -the.clan.members.reached.limit=A unióod elérte a tag limitet -this.clan.has.reached.the.member.limit=&bEz a unió elérte a tag limitet +union.balance=Unió egyenleg\: {0} +union.admin.balance={0} egyenlege\: {1} +bb.union.deposit={0}-t letétbe helyezett {1} +player.union.deposit=Letétbe helyezted {0} +bb.union.withdraw={0}-t kivet {1} +bb.union.take={0}-t kivett {1} +bb.union.give={0}-t adott {1} +bb.union.set={0}-ra lett szabva általa\: {1} +player.union.withdraw=Visszavonsz {0} +union.admin.take=Elvettél {0}-t {1} bankjából +union.admin.give=Adtál {0}-t neki\: {1} +union.admin.set=Átszabtad {0} egyenlegét ennyire\: {1} +union.admin.bank.not.enough.money={0} bankjában nincs elég pénze\! +union.bank.not.enough.money=A unió bankjaidnak nincs elég pénzük +your.unions.are.not.rivals=A uniók nem riválisok +the.union.members.reached.limit=A unióod elérte a tag limitet +this.union.has.reached.the.member.limit=&bEz a unió elérte a tag limitet you.have.reseted.your.kdr=Visszaállítottad KDR-t you.have.reseted.0.kdr=Visszaállítottad a(z) {0} KDR-t you.have.reseted.kdr.of.all.players=Visszaállítottad a játékosok KDR-jét -you.have.successfully.renamed.your.clan=&bSikeresen megváltoztattad a unió nevét erre\: {0} -you.have.successfully.renamed.the.clan=&bSikeresen megváltoztattad a unió nevét erre\: {0} +you.have.successfully.renamed.your.union=&bSikeresen megváltoztattad a unió nevét erre\: {0} +you.have.successfully.renamed.the.union=&bSikeresen megváltoztattad a unió nevét erre\: {0} you.have.toggled.permanent.status={0} -nak/nek átállítottad a végleges státuszát permanent.status.enabled=A unióod végleges státusza be lett kapcsolva {0} által permanent.status.disabled=A unióod végleges státusza ki lett kapcsolva {0} által @@ -553,11 +553,11 @@ bb.one.hour=1 óra bb.days= \ napok bb.one.day=1 nap player.purged=A játékos sikeresen nullázva lett -your.clan.description.must.be.longer.than=A unió leírásodnak minimum ennyi {0} karakternek kell lennie -your.clan.description.cannot.be.longer.than=A unió leírásod nem lehet hosszabb {0} karakternél +your.union.description.must.be.longer.than=A unió leírásodnak minimum ennyi {0} karakternek kell lennie +your.union.description.cannot.be.longer.than=A unió leírásod nem lehet hosszabb {0} karakternél description.changed=Sikeresen megváltoztattad a unióodnak a leírását no.description=Nincs leírás -the.player.must.wait.0.before.joining.your.clan.again=Ennek a játékosnak várnia kell {0} percet mielőtt újra belépne a unióodba +the.player.must.wait.0.before.joining.your.union.again=Ennek a játékosnak várnia kell {0} percet mielőtt újra belépne a unióodba disabled.command=Tiltott parancs rank.displayname.updated=A rang kijelzett neve frissítve lett\! rank.setdefault=A uniónak az alapértelmezett rangja erre lett állítva {0} @@ -570,18 +570,18 @@ rank.created=Rang létrehozva permission.0.added.to.rank.1=Jog {0} hozzálett adva a {1} ranghoz permission.0.removed.from.rank.1=Jog {0} lelett vonva a {1} rangnál rank.0.deleted=Rang {0} törölve -clans.ranks=Unió rangok\: +unions.ranks=Unió rangok\: ranks.list.item={0}\# {1} ({2}) no.ranks=Nem lettek rangok létrehozva rank.no.permissions=Ennek a rangnak nincs leírása player.unassigned.from.rank=A játékosnak nincs besorolása a rangból you.must.be.0.or.have.the.permission.1.to.use.this=Szükséges {0} nak lenned vagy a tulajnak ezt a jogot adnia {1}, hogy ezt használd -deposit.not.allowed=Betétel nem engedélyezett, használd /%clan %toggle %deposit az engedélyezéséhez -withdraw.not.allowed=Kivétel nem engedélyezett, használd /%clan %toggle %withdraw az engedélyezéséhez +deposit.not.allowed=Betétel nem engedélyezett, használd /%union %toggle %deposit az engedélyezéséhez +withdraw.not.allowed=Kivétel nem engedélyezett, használd /%union %toggle %withdraw az engedélyezéséhez resign.request.cancelled=Lemondási kérelem megszakítva disband.request.cancelled=Lemondási kérelem megszakítva resetkdr.request.cancelled=Lemondási kérelem megszakítva -clan.create.request.cancelled=Unió készítési kérelem megszakítva +union.create.request.cancelled=Unió készítési kérelem megszakítva rank.create.request.cancelled=Rang készítési kérelem megszakítva promotion.vote.has.been.requested.from.all.leaders=Felfokozási szavazás kérvényezve lett minden vezetőtől rename.vote.has.been.requested.from.all.leaders=&b Átnevezési szavazást kértek minden vezetőtől @@ -598,11 +598,10 @@ gui.lore.no.permission=&cNincsen jogod hogy megnézd\! gui.main.title={0} - unió menü gui.main.languageselector.title=&fVálaszd ki a nyelvedet gui.main.languageselector.lore.left.click=&7Jobb-klikk a nyelved kiválasztásához -gui.main.languageselector.lore.right.click=&7Bal-klikk hogy segítsd a fordítást gui.main.other.commands.title=&fEgyéb parancsok gui.main.other.commands.lore=&7Jobb-klikk hogy megnézd az összes unió parancsot -gui.main.clan.list.title=&fUniólista -gui.main.clan.list.lore=&7Jobb-klikk hogy megnézd a uniólistát +gui.main.union.list.title=&fUniólista +gui.main.union.list.lore=&7Jobb-klikk hogy megnézd a uniólistát gui.main.reset.kdr.title=&fKDR visszaállítása gui.main.reset.kdr.lore=&7Jobb-klikk hogy visszaállítsd a KD átlagodat gui.main.leaderboard.title=&fToplista @@ -610,8 +609,8 @@ gui.main.leaderboard.lore=&7Jobb-klikk hogy megnézd a toplistát gui.main.staff.title=&fStaff gui.main.staff.lore=&7Jobb-klikk a staff menü megnyitásához gui.staff.title=Személyzet -gui.staff.clan.list.lore.left.click=&7Jobb-klikk hogy megnézd az összes uniót -gui.staff.clan.list.lore.right.click=Jobb-katt a összes nem hitelesített unióhoz +gui.staff.union.list.lore.left.click=&7Jobb-klikk hogy megnézd az összes uniót +gui.staff.union.list.lore.right.click=Jobb-katt a összes nem hitelesített unióhoz gui.player.list.title=Játékoslista gui.staff.player.list.title=&fJátékoslista gui.staff.player.list.lore.left.click=Bal-kattintás hogy megnézed az összes játékost @@ -621,8 +620,8 @@ gui.staff.global.ff.lore.status=&7Állapot\: &b{0} gui.staff.global.ff.lore.toggle=Bal-katt hogy beállítsd a barátságos státuszt gui.staff.reload.title=&fÚjratöltés gui.staff.reload.lore=Bal-katt hogy újraindítsd a plugint -gui.staff.clanlist.unverified.title=Nem ellenőrzött uniók - Összes\: {0} -gui.staff.clanlist.toplace.title=Válaszd ki {0} új unióját +gui.staff.unionlist.unverified.title=Nem ellenőrzött uniók - Összes\: {0} +gui.staff.unionlist.toplace.title=Válaszd ki {0} új unióját gui.warning.title=Figyelem gui.warning.no.permission.title=&fNincs jog gui.warning.no.permission.plugin.lore=&7Nincsen jogod ahhoz hogy ezt csináld\! @@ -631,20 +630,20 @@ gui.warning.no.permission.rank.lore=&7Szükséges {0} nak lenned vagy a tulajnak gui.warning.not.verified.title=&fNem ellenőrzött gui.warning.not.verified.lore=&7A te unióodnak hitelesítve kell hogy legyen\! gui.allies.title=Szövetségesek -gui.allies.clan.lore=&7Jobb-klikk, hogy töröld ezt a szövetségest +gui.allies.union.lore=&7Jobb-klikk, hogy töröld ezt a szövetségest gui.allies.add.title=&fHozzáad egy szövetségest gui.add.ally.title=Hozzáad egy szövetségest -gui.add.ally.clan.lore=&7Jobb-klikk hogy szövetkezz a uniónal +gui.add.ally.union.lore=&7Jobb-klikk hogy szövetkezz a uniónal gui.rivals.title=Versenytárs -gui.rivals.clan.lore=&7Jobb-klikk, hogy töröld ezt az ellenséget +gui.rivals.union.lore=&7Jobb-klikk, hogy töröld ezt az ellenséget gui.rivals.add.title=&fRivális hozzáadása gui.add.rival.title=Rivális hozzáadása -gui.add.rival.clan.lore=&7Jobb-klikk hogy riválisok legyetek a uniónal -gui.clanlist.title=Uniók - Összesen\: {0} -gui.clanlist.clan.title=&fUnió\: [{0}&f] {1} -gui.clanlist.clan.lore.position=&b\#{0} -gui.clanlist.clan.lore.kdr=&7KDR\: &b{0} -gui.clanlist.clan.lore.members=&7Tagok\: &b{0} +gui.add.rival.union.lore=&7Jobb-klikk hogy riválisok legyetek a uniónal +gui.unionlist.title=Uniók - Összesen\: {0} +gui.unionlist.union.title=&fUnió\: [{0}&f] {1} +gui.unionlist.union.lore.position=&b\#{0} +gui.unionlist.union.lore.kdr=&7KDR\: &b{0} +gui.unionlist.union.lore.members=&7Tagok\: &b{0} gui.coords.title=Koordináták gui.coords.player.lore.distance=&7Távolság\: &b{0} gui.coords.player.lore.coords=&7Koordináták\: &b{0} {1} {2} @@ -674,83 +673,83 @@ gui.permissions.permission.lore=&7Jobb-katt a rang jogosultságának eltávolít gui.add.permission.title=Jog hozzáadása gui.add.permission.permission.title=&f{0} gui.add.permission.permission.lore=&7Bal-katt a rang jogosultságának eltávolításához -gui.clandetails.title=[{0}] {1} -gui.clandetails.free.agent.title=&Szabadúszó -gui.clandetails.free.agent.create.clan.price.lore=&7Ár\: &b{0} -gui.clandetails.free.agent.create.clan.lore=&7Bal-katt a rang elkészítéséhez -gui.clandetails.clan.title=&f[{0}&f] {1} -gui.clandetails.clan.lore.description=&7Leírás\: &b{0} -gui.clandetails.clan.lore.status=&7Állapot\: &b{0} -gui.clandetails.clan.lore.leaders=&7Vezetők\: &b{0} -gui.clandetails.clan.lore.online.members=&7Elérhető tagok\: &b{0}/{1} -gui.clandetails.clan.lore.kdr=&7KDR\: &b{0} -gui.clandetails.clan.lore.kill.totals=&7Összes ölés\: &b[Rival\:{0} Neutral\:{1} Civilian\:{2}] -gui.clandetails.clan.lore.deaths=&7Halálok\: &b{0} +gui.uniondetails.title=[{0}] {1} +gui.uniondetails.free.agent.title=&Szabadúszó +gui.uniondetails.free.agent.create.union.price.lore=&7Ár\: &b{0} +gui.uniondetails.free.agent.create.union.lore=&7Bal-katt a rang elkészítéséhez +gui.uniondetails.union.title=&f[{0}&f] {1} +gui.uniondetails.union.lore.description=&7Leírás\: &b{0} +gui.uniondetails.union.lore.status=&7Állapot\: &b{0} +gui.uniondetails.union.lore.leaders=&7Vezetők\: &b{0} +gui.uniondetails.union.lore.online.members=&7Elérhető tagok\: &b{0}/{1} +gui.uniondetails.union.lore.kdr=&7KDR\: &b{0} +gui.uniondetails.union.lore.kill.totals=&7Összes ölés\: &b[Rival\:{0} Neutral\:{1} Civilian\:{2}] +gui.uniondetails.union.lore.deaths=&7Halálok\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.allies.separator=&b, +gui.uniondetails.union.lore.allies.separator=&b, # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.rivals.separator=&b, -gui.clandetails.clan.lore.allies=&7Szövetségesek\: &b{0} -gui.clandetails.clan.lore.rivals=&Vetélytárs(ak)\: {0} -gui.clandetails.clan.lore.founded=&7Alapítva\: &b{0} -gui.clandetails.clan.lore.inactive=&7Inaktív\: &b{0}/{1} napok -gui.clandetails.allies.title=&fSzövetségesek -gui.clandetails.allies.lore=&7Bal-katt az allysok megtekintéséhez -gui.clandetails.rivals.title=&fRiválisok -gui.clandetails.rivals.lore=&7Bal-katt az allysok megtekintéséhez -gui.clandetails.roster.title=&fNévsor -gui.clandetails.roster.lore=&7Bal-katt a unió tagjainak megtekintéséhez, vagy hívj be többet -gui.staffclandetails.roster.lore=&7Bal-klikk hogy megnézd a uniólistát -gui.clandetails.coords.title=&fKoordináták -gui.clandetails.coords.lore=&7Ball-klikk megmutatja a koordinátákat a unióod tagjáiról -gui.clandetails.home.title=&fOtthon -gui.clandetails.home.lore.teleport.price=&7Teleportációs összeg\: &b{0} -gui.clandetails.home.lore.teleport=&7Bal-katt a haza teleportáláshoz -gui.staffclandetails.home.lore.teleport=&7Bal-katt a haza teleportáláshoz -gui.clandetails.home.lore.clear=&7Dobd ki az itemet hogy kiürítsd a unióod házát -gui.clandetails.home.lore.set.price=&7Teleportációs összeg\: &b{0} -gui.clandetails.home.lore.set=&7Jobb-katt a haza teleportáláshoz -gui.staffclandetails.home.lore.set=&7Jobb-katt a haza beállításához -gui.clandetails.regroup.title=&fÖsszecsoportosítás -gui.clandetails.regroup.lore.price=&7Ár\: &b{0} -gui.clandetails.regroup.lore.home=&7Bal-katt a unió tagjainak megtekintéséhez, vagy hívj be többet -gui.clandetails.regroup.lore.me=&7Jobb-katt a unió tagjainak összecsoportosításához -gui.clandetails.ff.title=&fBaráti tűz -gui.clandetails.ff.personal.lore=&7Személyes\: &b{0} -gui.clandetails.ff.clan.lore=&7Unió\: &b{0} -gui.clandetails.ff.personal.toggle.lore=Bal-katt hogy beállítsd a barátságos státuszt -gui.clandetails.ff.clan.toggle.lore=Jobb-katt hogy beállítsd a barátságos státuszt -gui.clandetails.bank.title=&fBank -gui.clandetails.bank.balance.lore=&fEgyenleg\: &b{0} -gui.clandetails.bank.withdraw.status.lore=&7Kivétel\: &b{0} -gui.clandetails.bank.deposit.status.lore=&7Betétel\: &b{0} -gui.clandetails.bank.withdraw.toggle.lore=&7Dobd el az elemet a visszavonás állapotának váltásához -gui.clandetails.bank.deposit.toggle.lore=&7Kattints a jobb gombbal a befizetés állapotának váltásához -gui.clandetails.rank.title=&fRang -gui.clandetails.rank.lore=&7Kattints a bal gombbal a unió rangjainak megtekintéséhez és szerkesztéséhez -gui.clandetails.verified.title=&fHitelesítve -gui.clandetails.not.verified.title=&fNem ellenőrzött -gui.clandetails.verify.price.lore=&7Ár\: &b{0} -gui.clandetails.not.verified.lore=&7Kattintsa bal gombbal a unió megerősítéséhez -gui.staffclandetails.not.verified.lore=&7Kattintson a bal gombbal a unió megerősítéséhez -gui.clandetails.resign.title=&fKilépés -gui.clandetails.resign.lore=&7Kattints a bal gombbal a unió kilépéséhez -gui.clandetails.disband.title=&7Feloszlatás -gui.clandetails.disband.lore=&7Dobd el az itemet a unióod feloszlatásához -gui.staffclandetails.disband.lore=&7Kattints a bal gombbal a unió feloszlatásához -gui.clandetails.chat.title=&fChat -gui.clandetails.chat.clan.chat.lore=&7/{0} [message] - &bÜzenetet küld a unió chatbe -gui.clandetails.chat.clan.join.leave.lore=&7/{0} {1}/{2} - &bBelép/kilép a unió chatből -gui.clandetails.chat.ally.chat.lore=&7/{0} [message] - &bÜzenetet küld a ally chatbe -gui.clandetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bBelép/kilép a ally chatből -gui.clandetails.chat.clan.status.lore=&7Unió\: &b{0} -gui.clandetails.chat.ally.status.lore=&7Szövetségesek\: &b{0} -gui.clandetails.chat.clan.toggle.lore=Bal-katt hogy beállítsd a unió chat státuszt -gui.clandetails.chat.ally.toggle.lore=Jobb-katt hogy beállítsd a ally chat státuszt +gui.uniondetails.union.lore.rivals.separator=&b, +gui.uniondetails.union.lore.allies=&7Szövetségesek\: &b{0} +gui.uniondetails.union.lore.rivals=&Vetélytárs(ak)\: {0} +gui.uniondetails.union.lore.founded=&7Alapítva\: &b{0} +gui.uniondetails.union.lore.inactive=&7Inaktív\: &b{0}/{1} napok +gui.uniondetails.allies.title=&fSzövetségesek +gui.uniondetails.allies.lore=&7Bal-katt az allysok megtekintéséhez +gui.uniondetails.rivals.title=&fRiválisok +gui.uniondetails.rivals.lore=&7Bal-katt az allysok megtekintéséhez +gui.uniondetails.roster.title=&fNévsor +gui.uniondetails.roster.lore=&7Bal-katt a unió tagjainak megtekintéséhez, vagy hívj be többet +gui.staffuniondetails.roster.lore=&7Bal-klikk hogy megnézd a uniólistát +gui.uniondetails.coords.title=&fKoordináták +gui.uniondetails.coords.lore=&7Ball-klikk megmutatja a koordinátákat a unióod tagjáiról +gui.uniondetails.home.title=&fOtthon +gui.uniondetails.home.lore.teleport.price=&7Teleportációs összeg\: &b{0} +gui.uniondetails.home.lore.teleport=&7Bal-katt a haza teleportáláshoz +gui.staffuniondetails.home.lore.teleport=&7Bal-katt a haza teleportáláshoz +gui.uniondetails.home.lore.clear=&7Dobd ki az itemet hogy kiürítsd a unióod házát +gui.uniondetails.home.lore.set.price=&7Teleportációs összeg\: &b{0} +gui.uniondetails.home.lore.set=&7Jobb-katt a haza teleportáláshoz +gui.staffuniondetails.home.lore.set=&7Jobb-katt a haza beállításához +gui.uniondetails.regroup.title=&fÖsszecsoportosítás +gui.uniondetails.regroup.lore.price=&7Ár\: &b{0} +gui.uniondetails.regroup.lore.home=&7Bal-katt a unió tagjainak megtekintéséhez, vagy hívj be többet +gui.uniondetails.regroup.lore.me=&7Jobb-katt a unió tagjainak összecsoportosításához +gui.uniondetails.ff.title=&fBaráti tűz +gui.uniondetails.ff.personal.lore=&7Személyes\: &b{0} +gui.uniondetails.ff.union.lore=&7Unió\: &b{0} +gui.uniondetails.ff.personal.toggle.lore=Bal-katt hogy beállítsd a barátságos státuszt +gui.uniondetails.ff.union.toggle.lore=Jobb-katt hogy beállítsd a barátságos státuszt +gui.uniondetails.bank.title=&fBank +gui.uniondetails.bank.balance.lore=&fEgyenleg\: &b{0} +gui.uniondetails.bank.withdraw.status.lore=&7Kivétel\: &b{0} +gui.uniondetails.bank.deposit.status.lore=&7Betétel\: &b{0} +gui.uniondetails.bank.withdraw.toggle.lore=&7Dobd el az elemet a visszavonás állapotának váltásához +gui.uniondetails.bank.deposit.toggle.lore=&7Kattints a jobb gombbal a befizetés állapotának váltásához +gui.uniondetails.rank.title=&fRang +gui.uniondetails.rank.lore=&7Kattints a bal gombbal a unió rangjainak megtekintéséhez és szerkesztéséhez +gui.uniondetails.verified.title=&fHitelesítve +gui.uniondetails.not.verified.title=&fNem ellenőrzött +gui.uniondetails.verify.price.lore=&7Ár\: &b{0} +gui.uniondetails.not.verified.lore=&7Kattintsa bal gombbal a unió megerősítéséhez +gui.staffuniondetails.not.verified.lore=&7Kattintson a bal gombbal a unió megerősítéséhez +gui.uniondetails.resign.title=&fKilépés +gui.uniondetails.resign.lore=&7Kattints a bal gombbal a unió kilépéséhez +gui.uniondetails.disband.title=&7Feloszlatás +gui.uniondetails.disband.lore=&7Dobd el az itemet a unióod feloszlatásához +gui.staffuniondetails.disband.lore=&7Kattints a bal gombbal a unió feloszlatásához +gui.uniondetails.chat.title=&fChat +gui.uniondetails.chat.union.chat.lore=&7/{0} [message] - &bÜzenetet küld a unió chatbe +gui.uniondetails.chat.union.join.leave.lore=&7/{0} {1}/{2} - &bBelép/kilép a unió chatből +gui.uniondetails.chat.ally.chat.lore=&7/{0} [message] - &bÜzenetet küld a ally chatbe +gui.uniondetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bBelép/kilép a ally chatből +gui.uniondetails.chat.union.status.lore=&7Unió\: &b{0} +gui.uniondetails.chat.ally.status.lore=&7Szövetségesek\: &b{0} +gui.uniondetails.chat.union.toggle.lore=Bal-katt hogy beállítsd a unió chat státuszt +gui.uniondetails.chat.ally.toggle.lore=Jobb-katt hogy beállítsd a ally chat státuszt gui.playerdetails.title={0} gui.playerdetails.player.title=&f{0} -gui.playerdetails.player.lore.noclan=&7Unió\: &bNincs -gui.playerdetails.player.lore.clan=&7Unió\: &b[{0}&b] {1} +gui.playerdetails.player.lore.nounion=&7Unió\: &bNincs +gui.playerdetails.player.lore.union=&7Unió\: &b[{0}&b] {1} gui.playerdetails.player.lore.rank=&7Rang\: &b{0} gui.playerdetails.player.lore.status=&7Állapot\: &b{0} gui.playerdetails.player.lore.kdr=&7KDR\: &b{0} @@ -759,8 +758,8 @@ gui.playerdetails.player.lore.deaths=&7Halálok\: &b{0} gui.playerdetails.player.lore.join.date=&7Csatlakozás\: &b{0} gui.playerdetails.player.lore.last.seen=&7Utoljára látva\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.playerdetails.player.lore.past.clans.separator=&b, -gui.playerdetails.player.lore.past.clans=&7Előző uniók\: &b{0} +gui.playerdetails.player.lore.past.unions.separator=&b, +gui.playerdetails.player.lore.past.unions=&7Előző uniók\: &b{0} gui.playerdetails.player.lore.inactive=&7Inaktív\: &b{0}/{1} napok gui.playerdetails.kick.title=&fKirúgás gui.playerdetails.promote.demote.title=&fFokozás/Lefokozás @@ -784,55 +783,53 @@ gui.languageselector.title=Nyelvek - Jelenlegi\: {0} gui.languageselector.language.title=&f{0} gui.languageselector.language.lore.left.click=&7Bal klikk, hogy beállítsd ezt a fordítást gui.languageselector.language.lore.translation.status=&7Fordítási státusz\: &b{0}% -gui.languageselector.language.lore.right.click=&7Bal-klikk hogy segítsd a fordítást gui.confirmation.title=Megerősítés gui.confirmation.confirm=&7Kattints ide a megerősítéshez gui.confirmation.return=&7Kattints ide a visszavonáshoz gui.not.supported=&cHiba történt a GUI megnyitása közben\! Kikapcsolása... Biztos a jó verziót töltötted le? -staff.member.verify.clan=&cEgy staffnak hitelesítenie kell a unióodat\! +staff.member.verify.union=&cEgy staffnak hitelesítenie kell a unióodat\! player.already.has.that.rank=&cEnnek a játékosnak már ez a rankja\! -joined.clan.chat=&bCsatlakoztál a unió csevegéshez -already.joined.clan.chat=&bMár csatlakoztál a unió csevegéshez -left.clan.chat=&bKiléptél a unió csevegésből -muted.clan.chat=&bNémítottad a unió csevegőt -unmuted.clan.chat=&bFeloldottad a unió csevegőt +joined.union.chat=&bCsatlakoztál a unió csevegéshez +already.joined.union.chat=&bMár csatlakoztál a unió csevegéshez +left.union.chat=&bKiléptél a unió csevegésből +muted.union.chat=&bNémítottad a unió csevegőt +unmuted.union.chat=&bFeloldottad a unió csevegőt joined.ally.chat=&bBeléptél a szövetséges csevegőbe left.ally.chat=&bKiléptél a szövetséges csevegésből muted.ally.chat=&bNémítottad a szövetséges csevegőt unmuted.ally.chat=&bFeloldottad a szövetséges csevegőt already.joined.ally.chat=&bMár csatlakoztál a szövetséges csevegéshez -player.already.in.this.clan=&cEz a játékos már ebben a unióban van -your.clan.reached.max.alliances=&cA unióodnak nem lehetnek több szövetségesei -other.clan.reached.max.alliances=&cA másik uniónak már nem lehet több szövetségese -insert.clan.tag=&bÍrd be a unió taget (vagy "{0}")\: -insert.clan.name=&bÍrd be a unióodnak a nevét\: +player.already.in.this.union=&cEz a játékos már ebben a unióban van +your.union.reached.max.alliances=&cA unióodnak nem lehetnek több szövetségesei +other.union.reached.max.alliances=&cA másik uniónak már nem lehet több szövetségese +insert.union.tag=&bÍrd be a unió taget (vagy "{0}")\: +insert.union.name=&bÍrd be a unióodnak a nevét\: insert.rank.name=&bÍrd be a rank nevét (vagy "{0}")\: -click.to.help.translating=&bKlikk erre a linkre, hogy segíts a fordításban\:\n&r{0} -your.clan.must.have.members.to.verify=&cA unióodban minimum {0} tagnak kell lennie, hogy hitelesítve legyen\! +your.union.must.have.members.to.verify=&cA unióodban minimum {0} tagnak kell lennie, hogy hitelesítve legyen\! you.must.hold.a.banner=&cEgy bannernek kell a kezedben lennie\! -you.changed.clan.banner=Megváltoztattad a unióod zászlaját\! -your.clan.already.verified=&cA te unióod már ellenőrizve van\! +you.changed.union.banner=Megváltoztattad a unióod zászlaját\! +your.union.already.verified=&cA te unióod már ellenőrizve van\! # suppress inspection "TrailingSpacesInProperty" -clan.profile=\n&b%clan_name%&7 profilja &8-------------------------------------------\n \n &7Név\: &e[&8%clan_color_tag%&e] &b%clan_name%\n &7Leírás\: &f%clan_description%\n &7Állapot\: &f%clan_status%\n &7Vezetők\: %clan_leaders%\n &7Online tagok\: &f%clan_online_count%&7/&f%clan_size%\n &7KDR\: &e%clan_kdr%\n &7Összes ölés\: &8[Vetélytárs\:&f%clan_rival_kills% &8Szövetséges\:&f%clan_ally_kills% &8Semleges\:&f%clan_neutral_kills% &8Polgár\:&f%clan_civilian_kills%&8]\n &7Halálok\: &f%clan_deaths%\n &7Szövetségesek\: &f%clan_allies%\n &7Vetélytársak\: &f%clan_rivals%\n &7Létrehozva\: &f%clan_founded%\n &7Inaktív\: &f%clan_inactive_days%&7/&f%clan_max_inactive_days% nap\n -player.lookup.clanname=&e[&8%clan_color_tag%&e] &b%clan_name% +union.profile=\n&b%union_name%&7 profilja &8-------------------------------------------\n \n &7Név\: &e[&8%union_color_tag%&e] &b%union_name%\n &7Leírás\: &f%union_description%\n &7Állapot\: &f%union_status%\n &7Online tagok\: &f%union_online_count%&7/&f%union_size%\n &7KDR\: &e%union_kdr%\n &7Összes ölés\: &8[Vetélytárs\:&f%union_rival_kills% &8Szövetséges\:&f%union_ally_kills% &8Semleges\:&f%union_neutral_kills% &8Polgár\:&f%union_civilian_kills%&8]\n &7Halálok\: &f%union_deaths%\n &7Szövetségesek\: &f%union_allies%\n &7Vetélytársak\: &f%union_rivals%\n &7Létrehozva\: &f%union_founded%\n &7Inaktív\: &f%union_inactive_days%&7/&f%union_max_inactive_days% nap\n +player.lookup.unionname=&e[&8%union_color_tag%&e] &b%union_name% # suppress inspection "TrailingSpacesInProperty" player.lookup.killtype=&7Ölés típusa\: %player_kill_type% -player.lookup=\n&b%player_name%&7 információ &8-------------------------------------------\n \n &7Unió\: &f%clan_name%\n &7Ranf\: &f%player_rank%\n &7Állapot\: &f%player_status%\n &7ÖHR\: &e%player_kdr%\n &7Ölések\: &8[Rivális\:&f%player_rival_kills% &8Szövetséges\:&7%player_ally_kills% &8Semleges\:&f%player_neutral_kills% &8Civil\:&f%player_civilian_kills%&8]\n &7Halálok\: &f%player_deaths%\n &7Csatlakozás\: &f%player_join_date%\n &7Utoljára látva\: &f%player_last_seen%\n &7Előző uniók\: &f%player_past_clans%\n &7Inaktív\: &f%player_inactive_days%&7/&f%player_max_inactive_days% days\n %kill_type_line% +player.lookup=\n&b%player_name%&7 információ &8-------------------------------------------\n \n &7Unió\: &f%union_name%\n &7Állapot\: &f%player_status%\n &7ÖHR\: &e%player_kdr%\n &7Ölések\: &8[Rivális\:&f%player_rival_kills% &8Szövetséges\:&7%player_ally_kills% &8Semleges\:&f%player_neutral_kills% &8Civil\:&f%player_civilian_kills%&8]\n &7Halálok\: &f%player_deaths%\n &7Csatlakozás\: &f%player_join_date%\n &7Utoljára látva\: &f%player_last_seen%\n &7Előző uniók\: &f%player_past_unions%\n &7Inaktív\: &f%player_inactive_days%&7/&f%player_max_inactive_days% days\n %kill_type_line% economy.disabled=&cGazdaság kikapcsolva\! has.been.purged={0} adatai törölve lettek accepted.invitation=&bElfogadtad {0} meghívását denied.invitation=&bElutasítottad {0} meghívását -must.be.in.clan.to.pvp=&cNeked meg {0} játékosnak unió tagnak kell lennetek a PvP-hez\! -clans.not.at.war.pvp.denied=&cA unióod csatában áll {0} uniónal\! +must.be.in.union.to.pvp=&cNeked meg {0} játékosnak unió tagnak kell lennetek a PvP-hez\! +unions.not.at.war.pvp.denied=&cA unióod csatában áll {0} uniónal\! cannot.attack.civilians=&cNem támadhatsz meg civileket\! -cannot.attack.clan.member=&cNem támadhatod meg a unió tagokat\! +cannot.attack.union.member=&cNem támadhatod meg a unió tagokat\! cannot.attack.ally=&cNem támadhatsz egy szövetségest\! cannot.send.discord.message=Nem küldhetsz üzeneteket {0} unióba, nem vagy a tagjuk\! discordhook.is.disabled=&cDiscordos összekapcsolás ki van kapcsolva, vagy nem érhető el\! -your.clan.doesnt.have.any.linked.player=A unióodnak nincsenek linkelt játékosai -your.clan.doesnt.have.minimum.linked.player=A unióodnak nincs meg a minimum linkelt játékosok száma -your.clan.is.not.on.the.whitelist=A unióod nem fehérlistás -your.clan.already.has.channel=A unióodnak már van Discord csatornája +your.union.doesnt.have.any.linked.player=A unióodnak nincsenek linkelt játékosai +your.union.doesnt.have.minimum.linked.player=A unióodnak nincs meg a minimum linkelt játékosok száma +your.union.is.not.on.the.whitelist=A unióod nem fehérlistás +your.union.already.has.channel=A unióodnak már van Discord csatornája discord.reached.category.limit=Discord elérte a kategória limitet\! discord.reached.channels.limit=Discord elérte a csatorna limitet\! discord.created.successfully=&bDiscord csatorna sikeresen létrehozva\! @@ -842,19 +839,19 @@ cannot.kick.last.leader=&cNem rúghatod ki az utolsó vezetőt\! cannot.disband.permanent=&cNem oszthatod fel ezt a uniót, végleges státusza van. you.can.only.set.base.in.your.land=&cCsak a saját területeden tehetsz le otthont\! only.leaders.can.create.lands=&cCsak a vezetők tudnak birtokot létrehozni\! -only.one.land.per.clan=&cA unióodnak már van területe\! -only.clan.members.can.create.lands=&cCsak a unió tagok tudnak birtokot létrehozni\! +only.one.land.per.union=&cA unióodnak már van területe\! +only.union.members.can.create.lands=&cCsak a unió tagok tudnak birtokot létrehozni\! land.allowed.all.actions=&bMinden tevénykenség mostantól engedélyezett\! land.blocked.all.actions=&bMinden tevénykenség mostantól tiltott\! land.allowed.action=&bEngedélyezett tevénykenség\! land.blocked.action=&bTiltott tevénykenség\! you.do.not.own.lands=&cEz nem a te birtokod\! land.sharing.disabled=&cTerület megosztás kikapcsolva\! -clan.chat.disabled=&cUnió chat tiltva van\! +union.chat.disabled=&cUnió chat tiltva van\! ally.chat.disabled=&cSzövetséges csevegés kikapcsolva\! war.expired=A háború {0} uniónal befejeződött\! you.cant.start.war.online.members.difference=Nem indíthatsz csatát. Egyik unió túlerőben van. invitedplayer.invite.off=Ez a játékos letiltotta a unió meghívásokat user.hasnt.played.before=&cEz a felhasználó nem játszott előtte -clan.list.balance.header=\n{0} &7leggazdagabb unió &8-----------------------\n \n&8Uniók\: &7{1}\n \n&8\#&7. &8Unió &7- &8Egyenleg -clan.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} +union.list.balance.header=\n{0} &7leggazdagabb unió &8-----------------------\n \n&8Uniók\: &7{1}\n \n&8\#&7. &8Unió &7- &8Egyenleg +union.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} diff --git a/src/main/resources/messages_it_IT.properties b/src/main/resources/messages_it_IT.properties index fbec4aed..627f76e5 100644 --- a/src/main/resources/messages_it_IT.properties +++ b/src/main/resources/messages_it_IT.properties @@ -66,7 +66,7 @@ admin.command=amministratore mod.command=mod promote.command=promuovere demote.command=demote -clanff.command=clanff +unionff.command=unionff ff.command=ff resign.command=resign disband.command=sciogliere @@ -106,7 +106,7 @@ acf-core.parameter.tag=tag acf-core.parameter.name=nome acf-core.parameter.description=descrizione acf-core.parameter.player=giocatore -acf-core.parameter.clan=unione +acf-core.parameter.union=unione acf-core.parameter.type=tipo acf-core.parameter.order=ordine acf-core.parameter.help=pagina di parole chiave @@ -149,8 +149,8 @@ command.description.ff.allow=Permetti il fuoco amico su di te command.description.ff.auto=Lascia gestire il fuoco amico in automatico command.description.globalff.allow=Permetti il fuoco amico globale command.description.globalff.auto=Lascia gestire il fuoco amico globale in automatico -command.description.clanff.allow=Permetti il fuoco amico nel tuo unione -command.description.clanff.block=Nega il fuoco amico nel tuo unione +command.description.unionff.allow=Permetti il fuoco amico nel tuo unione +command.description.unionff.block=Nega il fuoco amico nel tuo unione command.description.description=Imposta la descrizione del tuo unione command.description.ban=Banna un giocatore dai comandi del unione command.description.unban=Sbanna un giocatore dai comandi del unione @@ -178,7 +178,7 @@ command.description.untrust=Annulla la fiducia di un membro command.description.resign=Dimettiti dal tuo unione command.description.help=Mostra questa pagina o cerca nella guida command.description.ally.add=Aggiungi un alleato -command.description.clan=Apre la GUI +command.description.union=Apre la GUI command.description.disband=Sciogli il tuo unione command.description.mod.disband=Sciogli un unione command.description.mod.kick=Espelli un membro da un unione @@ -234,7 +234,7 @@ command.description.mod.locale=Imposta la lingua del giocatore home-menu=/{0} home{1} - Teletrasporta alla base di casa home-set-menu=/{0} home set{1} - Imposta la base principale del unione home-clear-menu=/{0} home set{1} - Cancella la base principale del unione -clan=Unione +union=Unione allies=Alleati alliances=alleanze coords=coordinate @@ -244,7 +244,7 @@ coords.upper=Coordinate world=Mondo kdr=KDR members=Membri -clans.lower=unioni +unions.lower=unioni rival=Rivale civilian=Civili neutral=Neutrale @@ -288,9 +288,9 @@ nokillsfound=Nessuna uccisione trovata promoted.to.leader={0} è stato promosso al leader denied.demotion={0} ha negato la promozione di {1}. Consenso fallito. membership.invitation={0} ha rifiutato l''invito di adesione -joined.the.clan={0} si è unito al unione +joined.the.union={0} si è unito al unione signed.off.request.cancelled={0} si è disconnesso. {1} richiesta annullata. -clan.deletion={0} ha negato l''eliminazione del unione. Consenso fallito. +union.deletion={0} ha negato l''eliminazione del unione. Consenso fallito. rename.refused={0} rifiutata la rinominazione del unione. Consenso negato. has.been.disbanded=Il Unione {0} è stato sciolto denied.the.promotion={0} ha negato la promozione di {1}. Consenso fallito. @@ -326,9 +326,9 @@ mysql.connection.failed=Connessione MySQL fallita sqlite.connection.successful=Connessione SQLite riuscita sqlite.connection.failed= Connessione SQLite fallita purging.player.data=eliminazione dati del giocatore\: {0} -purging.clan=Eliminazione unione\: {0} -clan.players=Giocatori di Unione\: {0} -clans=Rango\: {0} +purging.union=Eliminazione unione\: {0} +union.players=Giocatori di Unione\: {0} +unions=Rango\: {0} banned=Sei bannato dall''usare i comandi del unione nothing.more.to.see=Niente di più da vedere nothing.to.vote=&cNulla da accettare o negare @@ -341,78 +341,78 @@ bulletin.board.header=&8* &e{0} &fbacheca bollettino bulletin.board.message={0}\: &f{1} has.been.disbanded.rivalry.ended={0} è stato sciolto. La rivalità è finita. has.been.disbanded.alliance.ended={0} è stato sciolto. L''alleanza è finita. -clan.disbanded=Unione sciolto +union.disbanded=Unione sciolto 1.color.day=1 {0}giorno many.color.days={0}{1} giorni insufficient.permissions=Permessi insufficienti -clan.is.not.verified=Il unione non è verificato -player.not.a.member.of.any.clan=&cIl giocatore non è membro di nessun unione -not.a.member.of.any.clan=Non sei membro di nessun unione +union.is.not.verified=Il unione non è verificato +player.not.a.member.of.any.union=&cIl giocatore non è membro di nessun unione +not.a.member.of.any.union=Non sei membro di nessun unione minimum.to.make.alliance=Il tuo unione deve avere almeno {0} giocatori per poter fare un''alleanza -cannot.be.same.clan=&cDevi inserire un unione diverso dal tuo\! -other.clan.not.verified=&cL''altro unione non è verificato\! -your.clans.are.not.allies=I tuoi unione non sono alleati +cannot.be.same.union=&cDevi inserire un unione diverso dal tuo\! +other.union.not.verified=&cL''altro unione non è verificato\! +your.unions.are.not.allies=I tuoi unione non sono alleati has.broken.the.alliance={0} ha rotto l''alleanza con {1} at.least.one.leader.accept.the.alliance=Almeno un leader dell''alleato deve essere online per accettare l''alleanza leaders.have.been.asked.for.an.alliance={0} leader richiedono un''alleanza -your.clans.are.already.allies=I tuoi unione sono già alleati -your.clan.cannot.create.rivals=Il tuo unione non può creare rivali +your.unions.are.already.allies=I tuoi unione sono già alleati +your.union.cannot.create.rivals=Il tuo unione non può creare rivali min.players.rivalries=Il tuo unione deve avere almeno {0} giocatori per poter fare rivalità this.player.is.already.banned=Questo giocatore è già bannato player.added.to.banned.list=Giocatore aggiunto alla lista dei bannati you.banned=Sei stato bannato dai comandi di unione -clan.wide.friendly.fire.blocked=Fuoco alleato del unione bloccato -clan.wide.friendly.fire.is.allowed=Fuoco alleato del unione bloccato +union.wide.friendly.fire.blocked=Fuoco alleato del unione bloccato +union.wide.friendly.fire.is.allowed=Fuoco alleato del unione bloccato you.are.the.only.member.online=Sei l''unico membro online -your.clan.color.tag.cannot.be.longer.than.characters=&cLa targa colorata del tuo unione non può essere più lunga di {0} caratteri -your.clan.tag.cannot.be.longer.than.characters=&cIl nome del tuo unione non può contenere più di {0} caratteri -your.clan.tag.must.be.longer.than.characters=&cIl nome del tuo unione deve essere più lungo di {0} caratteri +your.union.color.tag.cannot.be.longer.than.characters=&cLa targa colorata del tuo unione non può essere più lunga di {0} caratteri +your.union.tag.cannot.be.longer.than.characters=&cIl nome del tuo unione non può contenere più di {0} caratteri +your.union.tag.must.be.longer.than.characters=&cIl nome del tuo unione deve essere più lungo di {0} caratteri your.tag.cannot.contain.the.following.colors=&cIl nome del unione non può contenere i seguenti colori\: {0} your.tag.doesnt.meet.the.requirements=&cIl nome del tuo unione non soddisfa i requisiti. your.tag.cannot.contain.color.codes=&cIl nome del unione non può contenere codici colore -your.clan.tag.can.only.contain.letters.numbers.and.color.codes=&cIl nome del tuo unione può contenere solo lettere, numeri e codici colore +your.union.tag.can.only.contain.letters.numbers.and.color.codes=&cIl nome del tuo unione può contenere solo lettere, numeri e codici colore you.cannot.set.colored.ranks=Non puoi impostare ranghi colorati -your.clan.name.cannot.be.longer.than.characters=Il nome del tuo unione non può contenere più di {0} caratteri -your.clan.name.must.be.longer.than.characters=Il nome del unione deve essere più lungo di {0} caratteri -your.clan.name.cannot.contain.color.codes=Il tuo tag non può contenere codici di colore +your.union.name.cannot.be.longer.than.characters=Il nome del tuo unione non può contenere più di {0} caratteri +your.union.name.must.be.longer.than.characters=Il nome del unione deve essere più lungo di {0} caratteri +your.union.name.cannot.contain.color.codes=Il tuo tag non può contenere codici di colore that.tag.name.is.disallowed=Questo nome per il tuo unione non è ammesso you.must.first.resign=È necessario prima dimettersi da {0} -clan.with.this.tag.already.exists=Un unione con questo nome esiste già. -get.your.clan.verified.to.access.advanced.features=Ottieni la verifica del tuo unione per accedere alle funzioni avanzate -clan.created=Unione {0} creati +union.with.this.tag.already.exists=Un unione con questo nome esiste già. +get.your.union.verified.to.access.advanced.features=Ottieni la verifica del tuo unione per accedere alle funzioni avanzate +union.created=Unione {0} creati not.enough.leaders.online.to.vote.on.demotion=È necessario siano online più leader per votare questa demozione di ruolo demotion.vote.has.been.requested.from.all.leaders=Il voto di dimissione e stato richiesto da tutti i leader -player.is.not.a.leader.of.your.clan=Il giocatore non un leader del tuo unione +player.is.not.a.leader.of.your.union=Il giocatore non un leader del tuo unione player.is.not.a.leader=Il giocatore non è un leader -clan.has.been.disbanded=Il Unione {0} è stato sciolto -clan.disband.vote.has.been.requested.from.all.leaders=È stato richiesto il voto di scioglimento del unione da tutti i leader -friendy.fire.is.now.managed.by.your.clan=Il fuoco amichevole è ora gestito dal tuo unione +union.has.been.disbanded=Il Unione {0} è stato sciolto +union.disband.vote.has.been.requested.from.all.leaders=È stato richiesto il voto di scioglimento del unione da tutti i leader +friendy.fire.is.now.managed.by.your.union=Il fuoco amichevole è ora gestito dal tuo unione personal.friendly.fire.is.set.to.allowed=Il fuoco amichevole personale è impostato su permesso -global.friendy.fire.is.now.managed.by.each.clan=Il fuoco amichevole globale viene ora gestito da ogni unione -global.friendy.fire.is.already.being.managed.by.each.clan=Il fuoco amichevole globale è già gestito da ogni unione +global.friendy.fire.is.now.managed.by.each.union=Il fuoco amichevole globale viene ora gestito da ogni unione +global.friendy.fire.is.already.being.managed.by.each.union=Il fuoco amichevole globale è già gestito da ogni unione global.friendly.fire.is.set.to.allowed=Il fuoco amichevole globale è impostato su consentito global.friendly.fire.is.already.being.allowed=Il fuoco amichevole globale è già stato consentito -the.player.doesn.t.not.have.the.permissions.to.join.clans=Il giocatore non ha i permessi per aggiungersi ai unione +the.player.doesn.t.not.have.the.permissions.to.join.unions=Il giocatore non ha i permessi per aggiungersi ai unione you.cannot.invite.yourself=Non puoi invitare te stesso you.did.not.answer.in.time=Non ho fatto in tempo a rispondere, annulla... -this.player.is.banned.from.using.clan.commands=Questo giocatore è bannato dall''utilizzo dei comandi unione -the.player.is.already.member.of.another.clan=Il giocatore è già membro di un altro unione +this.player.is.banned.from.using.union.commands=Questo giocatore è bannato dall''utilizzo dei comandi unione +the.player.is.already.member.of.another.union=Il giocatore è già membro di un altro unione has.been.asked.to.join={0} è stato chiesto di unirsi a {1} you.cannot.kick.yourself=Non puoi kickarti da solo\! -the.player.is.not.a.member.of.your.clan=Questo giocatore non un membro del tuo unione +the.player.is.not.a.member.of.your.union=Questo giocatore non un membro del tuo unione you.cannot.kick.another.leader=Non puoi calciare un''altro leader has.been.kicked.by={0} è stato rimosso dal unione da {1} -no.clans.have.been.created=Nessun unione è stato creato -total.clans=Unione totali\: +no.unions.have.been.created=Nessun unione è stato creato +total.unions=Unione totali\: legend=Legenda\: kill.type.civilian=Tipo di Uccisione\: {0}Civile no.player.data.found=Nessun dato del giocatore trovato -clan.0=Unione\: {0} +union.0=Unione\: {0} status.0=Stato\: {0} rank.0=Rango\: {0} kdr.0=KDR\: {0} inactive.0=Inattivo da\: {0} -clan.commands=unione comandi +union.commands=unione comandi you.can.only.modify.the.color.and.case.of.the.tag=È possibile modificare solo il colore e le maiuscole del nome unione locale.has.been.changed=La lingua è stata cambiata con successo tag.changed.to.0=Tag cambiato in {0} @@ -423,11 +423,11 @@ leaders.0=Leader\: {0} allies.0=Alleati\: {0} rivals.0=Rivali\: {0} other.player.must.be.online=&cIl giocatore deve essere online\! -the.player.does.not.have.the.permissions.to.lead.a.clan=Il giocatore non ha i permessi adeguati per aggiungersi ai unione +the.player.does.not.have.the.permissions.to.lead.a.union=Il giocatore non ha i permessi adeguati per aggiungersi ai unione you.cannot.promote.yourself=Non puoi auto promuoverti the.player.is.already.a.leader=Questo giocatore è già leader di un unione configuration.reloaded=Configurazioni aggiornate -last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.clan=L''ultimo leader non può dimettersi. Devi nominare un altro capo o sciogliere il unione +last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.union=L''ultimo leader non può dimettersi. Devi nominare un altro capo o sciogliere il unione 0.has.resigned={0} si è dimesso you.cannot.trust.yourself=Non puoi eseguire questa azione su te stesso leaders.are.already.trusted=I leader sono già autorizzati @@ -435,23 +435,23 @@ this.player.is.already.trusted=Questo giocatore è già autorizzato has.been.given.trusted.status.by={0} ha appena ricevuto fiducia da {1} this.player.is.not.banned=Questo utente non è bannato player.removed.from.the.banned.list=Giocatore rimosso dalla lista nera -you.have.been.unbanned.from.clan.commands=Sei stato sbannato dai comandi del unione +you.have.been.unbanned.from.union.commands=Sei stato sbannato dai comandi del unione you.cannot.untrust.yourself=Non puoi eseguire questa azione su te stesso leaders.cannot.be.untrusted=Lo stato di fiducia dei leader non può essere alterato this.player.is.already.untrusted=Quest giocatore non ha già lo stato di fiducia has.been.given.untrusted.status.by={0} ha appena rimosso lo stato di fiducia da {1} -the.clan.does.not.exist=Il unione non esiste -the.clan.is.already.verified=Il unione e già verificato -the.clan.has.been.verified=Il unione è stato verificato -clan.0.has.been.verified=Il unione {0} è stato verificato con successo\! -total.clan.players.0=Giocatori del unione\: {0} +the.union.does.not.exist=Il unione non esiste +the.union.is.already.verified=Il unione e già verificato +the.union.has.been.verified=Il unione è stato verificato +union.0.has.been.verified=Il unione {0} è stato verificato con successo\! +total.union.players.0=Giocatori del unione\: {0} proposing.war={0} sta proponendo di iniziare una guerra contro {1} you.can.only.start.war.with.rivals=Puoi iniziare una guerra solo contro unione rivali leaders.have.been.asked.to.accept.the.war.request=Ai capi di {0} è stato chiesto di accettare la richiesta di guerra leaders.asked.to.end.rivalry=Ai capi di {0} è stato chiesto di terminare la guerra proposing.to.end.the.war={0} sta proponendo di terminare la guerra contro {1} -clans.already.at.war=I vostri unione sono già in guerra tra loro -clans.not.at.war=I vostri unione non sono in guerra tra loro +unions.already.at.war=I vostri unione sono già in guerra tra loro +unions.not.at.war=I vostri unione non sono in guerra tra loro you.are.at.war={0} è ora in guerra con {1} denied.war.req={0} ha negato la richiesta di guerra inviata da {1} you.are.no.longer.at.war={0} non è più in guerra contro {1} @@ -479,12 +479,12 @@ diamond=diamante gold=oro wood=legna server.announce=Annuncio Del Server -clan.announce=Annuncio del unione +union.announce=Annuncio del unione leader.announce=Annuncio del Leader hunger=Fame stone=pietra iron=ferro -the.clan.cannot.be.rivaled=Il unione non può essere rivale +the.union.cannot.be.rivaled=Il unione non può essere rivale bboff=BB disattivato bbon=BB attivata inviteon=Invito attivato su @@ -508,30 +508,30 @@ waiting.for.teleport.stand.still.for.0.seconds=In attesa di teletrasporto, resta on=attivo off=disattivato player.rank.changed=Il Rango è stato impostato -your.clans.are.already.rivals=I vostri unione sono già rivali +your.unions.are.already.rivals=I vostri unione sono già rivali cleared.bb=La bacheca è stata svuotata -clan.balance=Bilancio-Unione\: {0} -clan.admin.balance=Saldo di {0}\: {1} -bb.clan.deposit={0} sono stati depositati da {1} -player.clan.deposit=Hai depositato {0} -bb.clan.withdraw={0} sono stati prelevati da {1} -bb.clan.take={0} sono stati presi da {1} -bb.clan.give={0} sono stati dati da {1} -bb.clan.set={0} sono stati impostati da {1} -player.clan.withdraw=Prelievi {0} -clan.admin.take=Hai prelevato {0} dalla banca di {1} -clan.admin.give=Hai depositato {0} in banca di {1} -clan.admin.set=Hai impostato il saldo bancario di {0} su {1} -clan.admin.bank.not.enough.money=La banca di {0} non dispone di abbastanza soldi\! -clan.bank.not.enough.money=La banca del tuo unione non ha abbastanza soldi -your.clans.are.not.rivals=I vostri unione non sono rivali -the.clan.members.reached.limit=Il tuo unione ha raggiunto il limite di membri -this.clan.has.reached.the.member.limit=&bQuesto unione ha raggiunto il limite di membri +union.balance=Bilancio-Unione\: {0} +union.admin.balance=Saldo di {0}\: {1} +bb.union.deposit={0} sono stati depositati da {1} +player.union.deposit=Hai depositato {0} +bb.union.withdraw={0} sono stati prelevati da {1} +bb.union.take={0} sono stati presi da {1} +bb.union.give={0} sono stati dati da {1} +bb.union.set={0} sono stati impostati da {1} +player.union.withdraw=Prelievi {0} +union.admin.take=Hai prelevato {0} dalla banca di {1} +union.admin.give=Hai depositato {0} in banca di {1} +union.admin.set=Hai impostato il saldo bancario di {0} su {1} +union.admin.bank.not.enough.money=La banca di {0} non dispone di abbastanza soldi\! +union.bank.not.enough.money=La banca del tuo unione non ha abbastanza soldi +your.unions.are.not.rivals=I vostri unione non sono rivali +the.union.members.reached.limit=Il tuo unione ha raggiunto il limite di membri +this.union.has.reached.the.member.limit=&bQuesto unione ha raggiunto il limite di membri you.have.reseted.your.kdr=Hai resettato il tuo KDR you.have.reseted.0.kdr=Hai resettato il KDR di {0} you.have.reseted.kdr.of.all.players=Hai resettato il KDR di tutti i giocatori -you.have.successfully.renamed.your.clan=&bHai rinominato con successo il tuo unione in {0} -you.have.successfully.renamed.the.clan=&bHai rinominato con successo il unione in {0} +you.have.successfully.renamed.your.union=&bHai rinominato con successo il tuo unione in {0} +you.have.successfully.renamed.the.union=&bHai rinominato con successo il unione in {0} you.have.toggled.permanent.status=Hai abilitato lo stato permanente per {0} permanent.status.enabled=Lo stato permanente del tuo unione è stato abilitato da {0} permanent.status.disabled=Lo stato permanente del tuo unione è stato disabilitato da {0} @@ -555,11 +555,11 @@ bb.one.hour=1 ora bb.days= \ giorni bb.one.day=1 giorno player.purged=Il giocatore e stato epurato con successo -your.clan.description.must.be.longer.than=La descrizione del tuo unione deve essere più lunga di {0} caratteri -your.clan.description.cannot.be.longer.than=La descrizione del tuo unione non può essere più lunga di {0} caratteri +your.union.description.must.be.longer.than=La descrizione del tuo unione deve essere più lunga di {0} caratteri +your.union.description.cannot.be.longer.than=La descrizione del tuo unione non può essere più lunga di {0} caratteri description.changed=Hai cambiato con successo la descrizione del tuo unione no.description=Nessuna descrizione -the.player.must.wait.0.before.joining.your.clan.again=Questo giocatore deve aspettare {0} minuto/i prima di unirsi di nuovo ad un nuovo unione +the.player.must.wait.0.before.joining.your.union.again=Questo giocatore deve aspettare {0} minuto/i prima di unirsi di nuovo ad un nuovo unione disabled.command=Comando disabilitato rank.displayname.updated=Il nome visualizzato del rango è stato aggiornato\! rank.setdefault=Il rango predefinito del unione è stato ora impostato su {0} @@ -572,18 +572,18 @@ rank.created=Rango creato permission.0.added.to.rank.1=Permesso {0} aggiunto al rango {1} permission.0.removed.from.rank.1=Permesso {0} rimosso dal rango {1} rank.0.deleted=Rango {0} eliminato -clans.ranks=Classifica del Unione\: +unions.ranks=Classifica del Unione\: ranks.list.item={0}\# {1} ({2}) no.ranks=Nessun rango è stato ancora creato rank.no.permissions=Questo rango non ha alcun permesso player.unassigned.from.rank=Giocatore non assegnato dal rango you.must.be.0.or.have.the.permission.1.to.use.this=Devi essere {0} o il tuo leader deve dare al tuo rango il permesso {1} per utilizzare questo -deposit.not.allowed=Il deposito non è abilitato, usa /%clan %toggle %deposit per permetterlo -withdraw.not.allowed=Il prelievo non è permesso, usa /%clan %toggle %withdraw per permetterlo +deposit.not.allowed=Il deposito non è abilitato, usa /%union %toggle %deposit per permetterlo +withdraw.not.allowed=Il prelievo non è permesso, usa /%union %toggle %withdraw per permetterlo resign.request.cancelled=Richiesta di dimissioni cancellata disband.request.cancelled=Richiesta di scioglimento annullata resetkdr.request.cancelled=Richiesta di ripristino KDR annullata -clan.create.request.cancelled=Richiesta di creazione unione annullata +union.create.request.cancelled=Richiesta di creazione unione annullata rank.create.request.cancelled=Richiesta di creazione del Rango annullata promotion.vote.has.been.requested.from.all.leaders=Il voto di promozione è stato richiesto a tutti i leader rename.vote.has.been.requested.from.all.leaders=La richiesta di cambio nome è stata richiesta a tutti i leader @@ -600,11 +600,10 @@ gui.lore.no.permission=&7Non hai i permessi per vedere questo\! gui.main.title={0} - Menu del unione gui.main.languageselector.title=Seleziona la tua lingua gui.main.languageselector.lore.left.click=&7Click sinistro per selezionare la lingua -gui.main.languageselector.lore.right.click=&7Click destro per aiutare la traduzione gui.main.other.commands.title=&fAltri comandi gui.main.other.commands.lore=&7Click sinistro per vedere tutti i comandi del unione -gui.main.clan.list.title=&fLista Unione -gui.main.clan.list.lore=&7Click sinistro per vedere l''elenco dei unione +gui.main.union.list.title=&fLista Unione +gui.main.union.list.lore=&7Click sinistro per vedere l''elenco dei unione gui.main.reset.kdr.title=&fResetta il KDR gui.main.reset.kdr.lore=&7Click sinistro per resettare il tuo KDR gui.main.leaderboard.title=&fClassifica @@ -612,8 +611,8 @@ gui.main.leaderboard.lore=&7Clicca sinistro per vedere la classifica gui.main.staff.title=&fStaff gui.main.staff.lore=&7Clicca sinistro per aprire il menu Staff gui.staff.title=Staff -gui.staff.clan.list.lore.left.click=&7Clicca sinistro per vedere tutti i unione -gui.staff.clan.list.lore.right.click=&7Clicca destro per vedere tutti i unione non verificati +gui.staff.union.list.lore.left.click=&7Clicca sinistro per vedere tutti i unione +gui.staff.union.list.lore.right.click=&7Clicca destro per vedere tutti i unione non verificati gui.player.list.title=Elenco dei giocatori gui.staff.player.list.title=&fElenco Giocatori gui.staff.player.list.lore.left.click=&7Clicca sinistro per vedere tutti i giocatori @@ -623,8 +622,8 @@ gui.staff.global.ff.lore.status=&7Stato\: &b{0} gui.staff.global.ff.lore.toggle=&7Clicca sinistro per attivare il fuoco amico gui.staff.reload.title=&fAggiorna gui.staff.reload.lore=&7Clicca sinistro per ricaricare il plugin -gui.staff.clanlist.unverified.title=Unione Non Verificati - Totale\: {0} -gui.staff.clanlist.toplace.title=Seleziona il nuovo unione {0} +gui.staff.unionlist.unverified.title=Unione Non Verificati - Totale\: {0} +gui.staff.unionlist.toplace.title=Seleziona il nuovo unione {0} gui.warning.title=Attenzione gui.warning.no.permission.title=&fNessun permesso gui.warning.no.permission.plugin.lore=&7Non hai i permessi per eseguire questa azione\! @@ -633,20 +632,20 @@ gui.warning.no.permission.rank.lore=&7Devi essere {0} o un leader deve dare al t gui.warning.not.verified.title=&fNon verificato gui.warning.not.verified.lore=&7Il tuo unione deve essere verificato\! gui.allies.title=Alleati -gui.allies.clan.lore=&7Click destro per rimuovere questo alleato +gui.allies.union.lore=&7Click destro per rimuovere questo alleato gui.allies.add.title=&Aggiungi un alleato gui.add.ally.title=Aggiungi un alleato -gui.add.ally.clan.lore=&7Click sinistro per alleare questo unione +gui.add.ally.union.lore=&7Click sinistro per alleare questo unione gui.rivals.title=Rivale -gui.rivals.clan.lore=&7Click destro per rimuovere questo rivale +gui.rivals.union.lore=&7Click destro per rimuovere questo rivale gui.rivals.add.title=&fAggiungi un rivale gui.add.rival.title=Aggiungi un rivale -gui.add.rival.clan.lore=&7Click sinistro per rivaleggiare questo unione -gui.clanlist.title=Unioni - Totale\: {0} -gui.clanlist.clan.title=&7Unione\: &b[{0}&b] {1} -gui.clanlist.clan.lore.position=&b\#{0} -gui.clanlist.clan.lore.kdr=&7KDR\: &b{0} -gui.clanlist.clan.lore.members=&7Membri\: &b{0} +gui.add.rival.union.lore=&7Click sinistro per rivaleggiare questo unione +gui.unionlist.title=Unioni - Totale\: {0} +gui.unionlist.union.title=&7Unione\: &b[{0}&b] {1} +gui.unionlist.union.lore.position=&b\#{0} +gui.unionlist.union.lore.kdr=&7KDR\: &b{0} +gui.unionlist.union.lore.members=&7Membri\: &b{0} gui.coords.title=Coordinate gui.coords.player.lore.distance=&7Distanza\: &b{0} gui.coords.player.lore.coords=&7Coordinate\: &b{0} {1} {2} @@ -676,83 +675,83 @@ gui.permissions.permission.lore=&7Click destro per rimuovere questo permesso dal gui.add.permission.title=Aggiungi un permesso gui.add.permission.permission.title=&f{0} gui.add.permission.permission.lore=&7Click sinistro per aggiungere questo permesso al rango -gui.clandetails.title=[{0}] {1} -gui.clandetails.free.agent.title=&Utente libero -gui.clandetails.free.agent.create.clan.price.lore=&7Prezzo\: &b{0} -gui.clandetails.free.agent.create.clan.lore=&7Click sinistro per creare un unione -gui.clandetails.clan.title=&f[{0}&f] {1} -gui.clandetails.clan.lore.description=&7Descrizione\: &b{0} -gui.clandetails.clan.lore.status=&7Stato\: &b{0} -gui.clandetails.clan.lore.leaders=&7Leader\: &b{0} -gui.clandetails.clan.lore.online.members=&7Membri online\: &b{0}/{1} -gui.clandetails.clan.lore.kdr=&7KDR\: &b{0} -gui.clandetails.clan.lore.kill.totals=&7Uccisioni Totali\: &b[Rivali\:{0} Neutrali\:{1} Civili\:{2}] -gui.clandetails.clan.lore.deaths=&7Morti\: &b{0} +gui.uniondetails.title=[{0}] {1} +gui.uniondetails.free.agent.title=&Utente libero +gui.uniondetails.free.agent.create.union.price.lore=&7Prezzo\: &b{0} +gui.uniondetails.free.agent.create.union.lore=&7Click sinistro per creare un unione +gui.uniondetails.union.title=&f[{0}&f] {1} +gui.uniondetails.union.lore.description=&7Descrizione\: &b{0} +gui.uniondetails.union.lore.status=&7Stato\: &b{0} +gui.uniondetails.union.lore.leaders=&7Leader\: &b{0} +gui.uniondetails.union.lore.online.members=&7Membri online\: &b{0}/{1} +gui.uniondetails.union.lore.kdr=&7KDR\: &b{0} +gui.uniondetails.union.lore.kill.totals=&7Uccisioni Totali\: &b[Rivali\:{0} Neutrali\:{1} Civili\:{2}] +gui.uniondetails.union.lore.deaths=&7Morti\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.allies.separator=&b, +gui.uniondetails.union.lore.allies.separator=&b, # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.rivals.separator=&b, -gui.clandetails.clan.lore.allies=&7Alleati\: &b{0} -gui.clandetails.clan.lore.rivals=&7Rivali\: &b{0} -gui.clandetails.clan.lore.founded=&7Fondato\: &b{0} -gui.clandetails.clan.lore.inactive=&7Inattivo\: &b{0}/{1} giorni -gui.clandetails.allies.title=&fAlleati -gui.clandetails.allies.lore=&7Clicca sinistro per vedere i tuoi alleati o aggiungerne altri -gui.clandetails.rivals.title=&fRivali -gui.clandetails.rivals.lore=&7Clicca sinistro per vedere i tuoi rivali o aggiungerne altri -gui.clandetails.roster.title=&fElenco -gui.clandetails.roster.lore=&7Clicca sinistro per vedere i membri del tuo unione o invitarne altri -gui.staffclandetails.roster.lore=&7Clicca sinistro per vedere i membri del unione -gui.clandetails.coords.title=&fCoordinate -gui.clandetails.coords.lore=&7Clic sinistro per vedere le coordinate dei membri del tuo unione -gui.clandetails.home.title=&fCasa -gui.clandetails.home.lore.teleport.price=&7Prezzo teletrasporto\: &b{0} -gui.clandetails.home.lore.teleport=&7Clic sinistro per teletrasportarti nella casa del tuo unione -gui.staffclandetails.home.lore.teleport=&7Clic sinistro per teletrasportarti nella casa di questo unione -gui.clandetails.home.lore.clear=&7Rilascia l''oggetto per cancellare la casa del tuo unione -gui.clandetails.home.lore.set.price=&7Imposta prezzo\: &b{0} -gui.clandetails.home.lore.set=&7Clicca destro per impostare la casa del tuo unione -gui.staffclandetails.home.lore.set=&7Clicca destro per impostare la casa di questo unione -gui.clandetails.regroup.title=&fRaggruppare -gui.clandetails.regroup.lore.price=&7Prezzo\: &b{0} -gui.clandetails.regroup.lore.home=&7Clic sinistro per raggruppare i membri del tuo unione nella casa del unione -gui.clandetails.regroup.lore.me=&7Click destro per raggruppare i membri del tuo unione alla tua posizione -gui.clandetails.ff.title=&fFuoco Amico -gui.clandetails.ff.personal.lore=&7Personale\: &b{0} -gui.clandetails.ff.clan.lore=&7Unione\: &b{0} -gui.clandetails.ff.personal.toggle.lore=&7Clicca sinistro per attivare o disattivare il tuo fuoco amico -gui.clandetails.ff.clan.toggle.lore=&7Clicca destro per attivare o disattivare il fuoco amico del tuo unione -gui.clandetails.bank.title=&fBanca -gui.clandetails.bank.balance.lore=&7Saldo\: &b{0} -gui.clandetails.bank.withdraw.status.lore=&7Prelievo\: &b{0} -gui.clandetails.bank.deposit.status.lore=&7Deposito\: &b{0} -gui.clandetails.bank.withdraw.toggle.lore=&7Rilascia l''elemento per attivare o disattivare lo stato di prelievo -gui.clandetails.bank.deposit.toggle.lore=&7Clicca destro per attivare o disattivare lo stato del deposito -gui.clandetails.rank.title=&fRango -gui.clandetails.rank.lore=&7Clicca sinistro per vedere i ranghi del unione e modificarli -gui.clandetails.verified.title=&fVerificato -gui.clandetails.not.verified.title=&fNon verificato -gui.clandetails.verify.price.lore=&7Prezzo\: &b{0} -gui.clandetails.not.verified.lore=&7Clicca sinistro per verificare il tuo unione -gui.staffclandetails.not.verified.lore=&7Clicca sinistro per verificare questo unione -gui.clandetails.resign.title=&fDimettiti -gui.clandetails.resign.lore=&7Clicca sinistro per dimetterti dal tuo unione -gui.clandetails.disband.title=&fSciogli -gui.clandetails.disband.lore=&7Rilascia l''oggetto per sciogliere il tuo unione -gui.staffclandetails.disband.lore=&7Clicca sinistro per sciogliere questo unione -gui.clandetails.chat.title=&fChat -gui.clandetails.chat.clan.chat.lore=&7/{0} [message] - &bInvia un messaggio alla chat del unione -gui.clandetails.chat.clan.join.leave.lore=&7/{0} {1}/{2} - &bEntra/esci dalla chat del unione -gui.clandetails.chat.ally.chat.lore=&7/{0} [message] - &bInvia un messaggio nella chat alleati -gui.clandetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bEntra/esci dalla chat alleati -gui.clandetails.chat.clan.status.lore=&7Unione\: &b{0} -gui.clandetails.chat.ally.status.lore=&7Alleati\: &b{0} -gui.clandetails.chat.clan.toggle.lore=&7Click sinistro per attivare o disattivare lo stato della chat -gui.clandetails.chat.ally.toggle.lore=&7Click destro per attivare o disattivare lo stato della chat alleata +gui.uniondetails.union.lore.rivals.separator=&b, +gui.uniondetails.union.lore.allies=&7Alleati\: &b{0} +gui.uniondetails.union.lore.rivals=&7Rivali\: &b{0} +gui.uniondetails.union.lore.founded=&7Fondato\: &b{0} +gui.uniondetails.union.lore.inactive=&7Inattivo\: &b{0}/{1} giorni +gui.uniondetails.allies.title=&fAlleati +gui.uniondetails.allies.lore=&7Clicca sinistro per vedere i tuoi alleati o aggiungerne altri +gui.uniondetails.rivals.title=&fRivali +gui.uniondetails.rivals.lore=&7Clicca sinistro per vedere i tuoi rivali o aggiungerne altri +gui.uniondetails.roster.title=&fElenco +gui.uniondetails.roster.lore=&7Clicca sinistro per vedere i membri del tuo unione o invitarne altri +gui.staffuniondetails.roster.lore=&7Clicca sinistro per vedere i membri del unione +gui.uniondetails.coords.title=&fCoordinate +gui.uniondetails.coords.lore=&7Clic sinistro per vedere le coordinate dei membri del tuo unione +gui.uniondetails.home.title=&fCasa +gui.uniondetails.home.lore.teleport.price=&7Prezzo teletrasporto\: &b{0} +gui.uniondetails.home.lore.teleport=&7Clic sinistro per teletrasportarti nella casa del tuo unione +gui.staffuniondetails.home.lore.teleport=&7Clic sinistro per teletrasportarti nella casa di questo unione +gui.uniondetails.home.lore.clear=&7Rilascia l''oggetto per cancellare la casa del tuo unione +gui.uniondetails.home.lore.set.price=&7Imposta prezzo\: &b{0} +gui.uniondetails.home.lore.set=&7Clicca destro per impostare la casa del tuo unione +gui.staffuniondetails.home.lore.set=&7Clicca destro per impostare la casa di questo unione +gui.uniondetails.regroup.title=&fRaggruppare +gui.uniondetails.regroup.lore.price=&7Prezzo\: &b{0} +gui.uniondetails.regroup.lore.home=&7Clic sinistro per raggruppare i membri del tuo unione nella casa del unione +gui.uniondetails.regroup.lore.me=&7Click destro per raggruppare i membri del tuo unione alla tua posizione +gui.uniondetails.ff.title=&fFuoco Amico +gui.uniondetails.ff.personal.lore=&7Personale\: &b{0} +gui.uniondetails.ff.union.lore=&7Unione\: &b{0} +gui.uniondetails.ff.personal.toggle.lore=&7Clicca sinistro per attivare o disattivare il tuo fuoco amico +gui.uniondetails.ff.union.toggle.lore=&7Clicca destro per attivare o disattivare il fuoco amico del tuo unione +gui.uniondetails.bank.title=&fBanca +gui.uniondetails.bank.balance.lore=&7Saldo\: &b{0} +gui.uniondetails.bank.withdraw.status.lore=&7Prelievo\: &b{0} +gui.uniondetails.bank.deposit.status.lore=&7Deposito\: &b{0} +gui.uniondetails.bank.withdraw.toggle.lore=&7Rilascia l''elemento per attivare o disattivare lo stato di prelievo +gui.uniondetails.bank.deposit.toggle.lore=&7Clicca destro per attivare o disattivare lo stato del deposito +gui.uniondetails.rank.title=&fRango +gui.uniondetails.rank.lore=&7Clicca sinistro per vedere i ranghi del unione e modificarli +gui.uniondetails.verified.title=&fVerificato +gui.uniondetails.not.verified.title=&fNon verificato +gui.uniondetails.verify.price.lore=&7Prezzo\: &b{0} +gui.uniondetails.not.verified.lore=&7Clicca sinistro per verificare il tuo unione +gui.staffuniondetails.not.verified.lore=&7Clicca sinistro per verificare questo unione +gui.uniondetails.resign.title=&fDimettiti +gui.uniondetails.resign.lore=&7Clicca sinistro per dimetterti dal tuo unione +gui.uniondetails.disband.title=&fSciogli +gui.uniondetails.disband.lore=&7Rilascia l''oggetto per sciogliere il tuo unione +gui.staffuniondetails.disband.lore=&7Clicca sinistro per sciogliere questo unione +gui.uniondetails.chat.title=&fChat +gui.uniondetails.chat.union.chat.lore=&7/{0} [message] - &bInvia un messaggio alla chat del unione +gui.uniondetails.chat.union.join.leave.lore=&7/{0} {1}/{2} - &bEntra/esci dalla chat del unione +gui.uniondetails.chat.ally.chat.lore=&7/{0} [message] - &bInvia un messaggio nella chat alleati +gui.uniondetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bEntra/esci dalla chat alleati +gui.uniondetails.chat.union.status.lore=&7Unione\: &b{0} +gui.uniondetails.chat.ally.status.lore=&7Alleati\: &b{0} +gui.uniondetails.chat.union.toggle.lore=&7Click sinistro per attivare o disattivare lo stato della chat +gui.uniondetails.chat.ally.toggle.lore=&7Click destro per attivare o disattivare lo stato della chat alleata gui.playerdetails.title={0} gui.playerdetails.player.title=&f{0} -gui.playerdetails.player.lore.noclan=&7Unione\: &bNessuno -gui.playerdetails.player.lore.clan=&7Unione\: &b[{0}&b] {1} +gui.playerdetails.player.lore.nounion=&7Unione\: &bNessuno +gui.playerdetails.player.lore.union=&7Unione\: &b[{0}&b] {1} gui.playerdetails.player.lore.rank=&7Rango\: &b{0} gui.playerdetails.player.lore.status=&7Stato\: &b{0} gui.playerdetails.player.lore.kdr=&7KDR\: &b{0} @@ -761,8 +760,8 @@ gui.playerdetails.player.lore.deaths=&7Morti\: &b{0} gui.playerdetails.player.lore.join.date=&7Data di iscrizione\: &b{0} gui.playerdetails.player.lore.last.seen=&7Ultima vista\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.playerdetails.player.lore.past.clans.separator=&b, -gui.playerdetails.player.lore.past.clans=&7Unione precedenti\: &b{0} +gui.playerdetails.player.lore.past.unions.separator=&b, +gui.playerdetails.player.lore.past.unions=&7Unione precedenti\: &b{0} gui.playerdetails.player.lore.inactive=&7Inattivo\: &b{0}/{1} giorni gui.playerdetails.kick.title=&fEspelli gui.playerdetails.promote.demote.title=&fPromuovi/Retrocedi @@ -786,55 +785,53 @@ gui.languageselector.title=Lingue - Attuale\: {0} gui.languageselector.language.title=&f{0} gui.languageselector.language.lore.left.click=&7Clicca sinistro per selezionare la tua lingua gui.languageselector.language.lore.translation.status=&7Stato traduzione\: &b{0}% -gui.languageselector.language.lore.right.click=&7Click destro per aiutare la traduzione gui.confirmation.title=Conferma gui.confirmation.confirm=&7Clicca qui per confermare gui.confirmation.return=&cClicca qui per ritornare indietro gui.not.supported=&cSi è verificato un errore durante l''apertura della GUI\! Disattivazione... Hai scaricato la versione corretta? -staff.member.verify.clan=&cUn membro dello staff deve verificare il tuo unione\! +staff.member.verify.union=&cUn membro dello staff deve verificare il tuo unione\! player.already.has.that.rank=&cIl giocatore ha già questo rango\! -joined.clan.chat=&bSei entrato nella chat del unione -already.joined.clan.chat=&bSei già dentro la chat del unione -left.clan.chat=&bSei uscito dalla la chat del unione -muted.clan.chat=&bHai silenziato la chat del unione -unmuted.clan.chat=&bHai riabilitato la lettura della la chat del unione +joined.union.chat=&bSei entrato nella chat del unione +already.joined.union.chat=&bSei già dentro la chat del unione +left.union.chat=&bSei uscito dalla la chat del unione +muted.union.chat=&bHai silenziato la chat del unione +unmuted.union.chat=&bHai riabilitato la lettura della la chat del unione joined.ally.chat=&bSei entrato nella chat alleati left.ally.chat=&bSei uscito dalla chat alleati muted.ally.chat=&bHai silenziato la chat alleati unmuted.ally.chat=&bHai riabilitato la lettura della chat alleati already.joined.ally.chat=&bSei già dentro la chat alleati -player.already.in.this.clan=&cIl giocatore è già in questo unione -your.clan.reached.max.alliances=&cIl tuo unione ha raggiunto il numero massimo di alleanze -other.clan.reached.max.alliances=&cL''altro unione ha raggiunto il numero massimo di alleanze -insert.clan.tag=&bInserisci il nome del unione (o "{0}")\: -insert.clan.name=&bInserisci il nome del unione\: +player.already.in.this.union=&cIl giocatore è già in questo unione +your.union.reached.max.alliances=&cIl tuo unione ha raggiunto il numero massimo di alleanze +other.union.reached.max.alliances=&cL''altro unione ha raggiunto il numero massimo di alleanze +insert.union.tag=&bInserisci il nome del unione (o "{0}")\: +insert.union.name=&bInserisci il nome del unione\: insert.rank.name=&bInserisci il nome del rango (o "{0}")\: -click.to.help.translating=&bClicca su questo link per aiutarci a tradurre\:\n&r{0} -your.clan.must.have.members.to.verify=&cIl tuo unione deve avere almeno {0} membri per essere verificato\! +your.union.must.have.members.to.verify=&cIl tuo unione deve avere almeno {0} membri per essere verificato\! you.must.hold.a.banner=&cDevi avere un stendardo in mano\! -you.changed.clan.banner=&bHai cambiato lo stendardo del tuo unione\! -your.clan.already.verified=&cIl tuo unione è già stato verificato\! +you.changed.union.banner=&bHai cambiato lo stendardo del tuo unione\! +your.union.already.verified=&cIl tuo unione è già stato verificato\! # suppress inspection "TrailingSpacesInProperty" -clan.profile=\n&7Profilo del unione\: &b%clan_name% &8-------------------------------------------\n \n &7Nome\: &e[&8%clan_color_tag%&e] &b%clan_name%\n &7Descrizione\: &f%clan_description%\n &7Stato\: &f%clan_status%\n &7Leader\: %clan_leaders%\n &7Membri Online\: &f%clan_online_count%&7/&f%clan_size%\n &7KDR\: &e%clan_kdr%\n &7Uccisioni totali\: &8[Nemici\:&f%clan_rival_kills% &8Alleati\:&f%clan_ally_kills% &8Neutrali\:&f%clan_neutral_kills% &8Civili\:&f%clan_civilian_kills%&8]\n &7Morti\: &f%clan_deaths%\n &7Alleanze\: &f%clan_allies%\n &7Nemici\: &f%clan_rivals%\n &7Creazione\: &f%clan_founded%\n &7Inattivo da\: &f%clan_inactive_days%&7/&f%clan_max_inactive_days% giorni\n -player.lookup.clanname=&e[&8%clan_color_tag%&e] &b%clan_name% +union.profile=\n&7Profilo del unione\: &b%union_name% &8-------------------------------------------\n \n &7Nome\: &e[&8%union_color_tag%&e] &b%union_name%\n &7Descrizione\: &f%union_description%\n &7Stato\: &f%union_status%\n &7Membri Online\: &f%union_online_count%&7/&f%union_size%\n &7KDR\: &e%union_kdr%\n &7Uccisioni totali\: &8[Nemici\:&f%union_rival_kills% &8Alleati\:&f%union_ally_kills% &8Neutrali\:&f%union_neutral_kills% &8Civili\:&f%union_civilian_kills%&8]\n &7Morti\: &f%union_deaths%\n &7Alleanze\: &f%union_allies%\n &7Nemici\: &f%union_rivals%\n &7Creazione\: &f%union_founded%\n &7Inattivo da\: &f%union_inactive_days%&7/&f%union_max_inactive_days% giorni\n +player.lookup.unionname=&e[&8%union_color_tag%&e] &b%union_name% # suppress inspection "TrailingSpacesInProperty" player.lookup.killtype=&7Tipo Uccisione\: %player_kill_type%\n -player.lookup=\n&7 Informazioni utente\: &b%player_name% &8-------------------------------------------\n \n &7Unione\: &f%clan_name%\n &7Rango\: &f%player_rank%\n &7Stato\: &f%player_status%\n &7KDR\: &e%player_kdr%\n &7Uccisioni totali\: &8[Nemici\:&f%player_rival_kills% &8Alleati\:&7%player_ally_kills% &8Neutrali\:&f%player_neutral_kills% &8Civili\:&f%player_civilian_kills%&8]\n &7Morti\: &f%player_deaths%\n &7Data unione\: &f%player_join_date%\n &7Ultimo login\: &f%player_last_seen%\n &7Unione passati\: &f%player_past_clans%\n &7Inattivo da\: &f%player_inactive_days%&7/&f%player_max_inactive_days% giorni\n %kill_type_line% +player.lookup=\n&7 Informazioni utente\: &b%player_name% &8-------------------------------------------\n \n &7Unione\: &f%union_name%\n &7Stato\: &f%player_status%\n &7KDR\: &e%player_kdr%\n &7Uccisioni totali\: &8[Nemici\:&f%player_rival_kills% &8Alleati\:&7%player_ally_kills% &8Neutrali\:&f%player_neutral_kills% &8Civili\:&f%player_civilian_kills%&8]\n &7Morti\: &f%player_deaths%\n &7Data unione\: &f%player_join_date%\n &7Ultimo login\: &f%player_last_seen%\n &7Unione passati\: &f%player_past_unions%\n &7Inattivo da\: &f%player_inactive_days%&7/&f%player_max_inactive_days% giorni\n %kill_type_line% economy.disabled=&cEconomia disattivata\! has.been.purged=I dati di {0} sono stati eliminati accepted.invitation=&bHai accettato l''invito di {0} denied.invitation=&cHai negato l''invito di {0} -must.be.in.clan.to.pvp=&cTu e {0} dovete essere membri del unione per fare pvp\! -clans.not.at.war.pvp.denied=&cIl tuo unione non è in guerra con {0}\! +must.be.in.union.to.pvp=&cTu e {0} dovete essere membri del unione per fare pvp\! +unions.not.at.war.pvp.denied=&cIl tuo unione non è in guerra con {0}\! cannot.attack.civilians=&cNon puoi attaccare i civili\! -cannot.attack.clan.member=&cNon puoi attaccare un altro membro del unione\! +cannot.attack.union.member=&cNon puoi attaccare un altro membro del unione\! cannot.attack.ally=&cNon puoi attaccare un alleato\! cannot.send.discord.message=Non puoi inviare messaggi a {0}. Non sei un membro di quel unione\! discordhook.is.disabled=&cL''integrazione di Discord è disabilitata o non disponibile\! -your.clan.doesnt.have.any.linked.player=Il tuo unione non ha nessun giocatore collegato -your.clan.doesnt.have.minimum.linked.player=Il tuo unione non ha minimo giocatori collegati -your.clan.is.not.on.the.whitelist=Il tuo unione non è whitelist -your.clan.already.has.channel=Il tuo unione ha già un canale discord +your.union.doesnt.have.any.linked.player=Il tuo unione non ha nessun giocatore collegato +your.union.doesnt.have.minimum.linked.player=Il tuo unione non ha minimo giocatori collegati +your.union.is.not.on.the.whitelist=Il tuo unione non è whitelist +your.union.already.has.channel=Il tuo unione ha già un canale discord discord.reached.category.limit=Discord ha raggiunto il limite delle categorie\! discord.reached.channels.limit=Discord ha raggiunto il limite dei canali\! discord.created.successfully=&bCanale Discord creato con successo\! @@ -844,19 +841,19 @@ cannot.kick.last.leader=&cNon puoi espellere l''ultimo leader\! cannot.disband.permanent=&cNon puoi dissolvere questo unione. Ha stato permanente. you.can.only.set.base.in.your.land=&cPuoi impostare casa solo nella tua terra\! only.leaders.can.create.lands=&cSolo i leader possono claimare terreni\! -only.one.land.per.clan=&cIl tuo unione ha già una terra\! -only.clan.members.can.create.lands=&cSolo i membri di un unione possono creare terre\! +only.one.land.per.union=&cIl tuo unione ha già una terra\! +only.union.members.can.create.lands=&cSolo i membri di un unione possono creare terre\! land.allowed.all.actions=&bTutte le azioni sono state permesse\! land.blocked.all.actions=&bTutte le azioni sono state bloccate\! land.allowed.action=&bAzione permessa\! land.blocked.action=&bAzione bloccata\! you.do.not.own.lands=&cNon possiedi una terra\! land.sharing.disabled=&cCondivisione di terra è disattivata\! -clan.chat.disabled=&cLa chat del Unione è disabilitata\! +union.chat.disabled=&cLa chat del Unione è disabilitata\! ally.chat.disabled=&cLa chat alleati è disabilitata\! war.expired=La guerra con {0} è scaduta\! you.cant.start.war.online.members.difference=Non puoi iniziare la guerra. Un unione ha più membri online dell''altro. invitedplayer.invite.off=Questo giocatore ha disabilitato gli inviti al unione user.hasnt.played.before=&cQuesto utente non ha mai giocato prima -clan.list.balance.header=\n{0} &7Classifica Bilanci &8-----------------------\n \n&8Unione Totali\: &7{1}\n \n&8\#&7. &8Unione &7- &8Bilancio -clan.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} +union.list.balance.header=\n{0} &7Classifica Bilanci &8-----------------------\n \n&8Unione Totali\: &7{1}\n \n&8\#&7. &8Unione &7- &8Bilancio +union.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} diff --git a/src/main/resources/messages_ja_JP.properties b/src/main/resources/messages_ja_JP.properties index 06888aa0..a66503c3 100644 --- a/src/main/resources/messages_ja_JP.properties +++ b/src/main/resources/messages_ja_JP.properties @@ -27,7 +27,7 @@ reload.command=再読み込み acf-core.parameter.rank=ランク acf-core.parameter.name=名前 acf-core.parameter.description=説明 -acf-core.parameter.clan=ユニオン +acf-core.parameter.union=ユニオン acf-core.parameter.help=ページまたはキーワード command.description.land.allow.all=あなたの土地のすべてのアクションを許可します command.description.land.allow.interact_entity=ユニオンメンバーが自分の土地にいるエンティティとやり取りできるようになります @@ -68,8 +68,8 @@ command.description.ff.allow=味方への攻撃を許可するように設定し command.description.ff.auto=味方への攻撃の許可を自動で設定します command.description.globalff.allow=グローバルな味方への攻撃を許可するように設定します command.description.globalff.auto=グローバルな味方への攻撃の許可を自動で設定します -command.description.clanff.allow=ユニオンの味方への攻撃を許可するように設定します -command.description.clanff.block=ユニオンの味方への攻撃をブロックするように設定します +command.description.unionff.allow=ユニオンの味方への攻撃を許可するように設定します +command.description.unionff.block=ユニオンの味方への攻撃をブロックするように設定します command.description.description=ユニオンの説明を設定します command.description.ban=プレイヤーのユニオンコマンドを禁止します command.description.unban=プレイヤーのユニオンコマンドの禁止を解除します @@ -97,7 +97,7 @@ command.description.untrust=メンバーの信用を解除します command.description.resign=ユニオンから退会します command.description.help=ヘルプまたは検索を表示します command.description.ally.add=同盟を申請します -command.description.clan=GUIを開きます +command.description.union=GUIを開きます command.description.disband=ユニオンを解散します command.description.mod.disband=ユニオンを解散します command.description.mod.kick=ユニオンからメンバーを除外します @@ -138,7 +138,7 @@ command.description.mod.rename=ユニオンの名前を変更します home-menu=/{0} home{1} - ユニオンの本拠地にテレポートします home-set-menu=/{0} home set{1} - ユニオンの本拠地を設定します home-clear-menu=/{0} home clear{1} - ユニオンの本拠地をクリアします -clan=ユニオン +union=ユニオン allies=同盟 name=名前 distance=距離 @@ -146,7 +146,7 @@ coords.upper=座標 world=ワールド kdr=キルデス比 members=メンバー -clans.lower=ユニオン +unions.lower=ユニオン rival=ライバル civilian=市民 neutral=中立 @@ -184,9 +184,9 @@ nokillsfound=キルがありません promoted.to.leader={0} はリーダーに昇格しました denied.demotion={0} は {1} の降格を拒否しました。合意に失敗しました。 membership.invitation={0} はメンバーシップの招待を拒否しました -joined.the.clan={0} がユニオンに加入しました +joined.the.union={0} がユニオンに加入しました signed.off.request.cancelled={0} はサインオフしました。 {1} リクエストはキャンセルされました。 -clan.deletion={0} はユニオンの削除を拒否しました。合意に失敗しました。 +union.deletion={0} はユニオンの削除を拒否しました。合意に失敗しました。 rename.refused={0} はユニオン名の変更を拒否しました。合意は失敗しました。 has.been.disbanded=ユニオン {0} が解散しました denied.the.promotion={0} は {1} のプロモーションを拒否しました。合意に失敗しました。 @@ -226,72 +226,72 @@ voted.to.accept={0} が承認に投票しました bulletin.board.header=&8* &e{0} &f掲示板 has.been.disbanded.rivalry.ended={0} は解散されました。ライバルは終了しました。 has.been.disbanded.alliance.ended={0} は解散しました。同盟は終了しました。 -clan.disbanded=ユニオンを解散しました +union.disbanded=ユニオンを解散しました 1.color.day=1 {0}日 many.color.days={0}{1} 日 insufficient.permissions=権限が不足しています -clan.is.not.verified=ユニオンが認証されていません -player.not.a.member.of.any.clan=&cプレイヤーはユニオンのメンバーではありません -not.a.member.of.any.clan=あなたはどのユニオンのメンバーでもありません +union.is.not.verified=ユニオンが認証されていません +player.not.a.member.of.any.union=&cプレイヤーはユニオンのメンバーではありません +not.a.member.of.any.union=あなたはどのユニオンのメンバーでもありません minimum.to.make.alliance=同盟を行うには、ユニオンに少なくとも {0} のプレイヤーがいなければなりません -cannot.be.same.clan=&cあなたと異なるユニオンを追加する必要があります！ -other.clan.not.verified=&c他のユニオンは認証されていません！ -your.clans.are.not.allies=ユニオンは味方ではありません +cannot.be.same.union=&cあなたと異なるユニオンを追加する必要があります！ +other.union.not.verified=&c他のユニオンは認証されていません！ +your.unions.are.not.allies=ユニオンは味方ではありません has.broken.the.alliance={0} は {1} と同盟を破りました at.least.one.leader.accept.the.alliance=同盟の少なくとも1人のリーダーがオンラインで同盟を受け入れる必要があります leaders.have.been.asked.for.an.alliance={0} のリーダーが同盟を求められました -your.clans.are.already.allies=ユニオンはすでに同盟しています -your.clan.cannot.create.rivals=ユニオンはライバルを作成できません +your.unions.are.already.allies=ユニオンはすでに同盟しています +your.union.cannot.create.rivals=ユニオンはライバルを作成できません min.players.rivalries=ライバルを作成するにはユニオンは少なくとも {0} プレイヤーを持っている必要があります this.player.is.already.banned=このプレイヤーはすでに禁止されています player.added.to.banned.list=プレイヤーが禁止リストに追加されました you.banned=ユニオンコマンドが禁止されています -clan.wide.friendly.fire.blocked=ユニオン全体での味方への攻撃がブロックされています -clan.wide.friendly.fire.is.allowed=ユニオン全体での味方への攻撃が許可されています +union.wide.friendly.fire.blocked=ユニオン全体での味方への攻撃がブロックされています +union.wide.friendly.fire.is.allowed=ユニオン全体での味方への攻撃が許可されています you.are.the.only.member.online=あなたは唯一のオンラインメンバーです -your.clan.color.tag.cannot.be.longer.than.characters=&cユニオンのカラータグは {0} 文字より長くすることはできません +your.union.color.tag.cannot.be.longer.than.characters=&cユニオンのカラータグは {0} 文字より長くすることはできません you.cannot.set.colored.ranks=カラーランクを設定することはできません -your.clan.name.cannot.be.longer.than.characters=ユニオン名は {0} 文字より長くすることはできません -your.clan.name.must.be.longer.than.characters=ユニオン名は {0} 文字より長くなければなりません -your.clan.name.cannot.contain.color.codes=ユニオンの名前にカラーコードを含めることはできません +your.union.name.cannot.be.longer.than.characters=ユニオン名は {0} 文字より長くすることはできません +your.union.name.must.be.longer.than.characters=ユニオン名は {0} 文字より長くなければなりません +your.union.name.cannot.contain.color.codes=ユニオンの名前にカラーコードを含めることはできません you.must.first.resign={0} から脱退する必要があります -clan.with.this.tag.already.exists=このタグを持つユニオンは既に存在します -get.your.clan.verified.to.access.advanced.features=高度な機能にアクセスするにはユニオンを認証してください -clan.created=ユニオン {0} が作成されました +union.with.this.tag.already.exists=このタグを持つユニオンは既に存在します +get.your.union.verified.to.access.advanced.features=高度な機能にアクセスするにはユニオンを認証してください +union.created=ユニオン {0} が作成されました not.enough.leaders.online.to.vote.on.demotion=この降格に投票できるオンラインのリーダーが不足しています demotion.vote.has.been.requested.from.all.leaders=全てのリーダーから降格票が要求されました -player.is.not.a.leader.of.your.clan=そのプレイヤーはユニオンのリーダーではありません +player.is.not.a.leader.of.your.union=そのプレイヤーはユニオンのリーダーではありません player.is.not.a.leader=そのプレイヤーはリーダーではありません -clan.has.been.disbanded=ユニオン {0} が解散しました -clan.disband.vote.has.been.requested.from.all.leaders=ユニオンの解散票が全てのリーダーから要求されました -friendy.fire.is.now.managed.by.your.clan=味方への攻撃はユニオンによって管理されています +union.has.been.disbanded=ユニオン {0} が解散しました +union.disband.vote.has.been.requested.from.all.leaders=ユニオンの解散票が全てのリーダーから要求されました +friendy.fire.is.now.managed.by.your.union=味方への攻撃はユニオンによって管理されています personal.friendly.fire.is.set.to.allowed=味方への攻撃が許可されました -global.friendy.fire.is.now.managed.by.each.clan=味方への攻撃はそれぞれのユニオンによって管理されています -global.friendy.fire.is.already.being.managed.by.each.clan=味方への攻撃はすでにそれぞれのユニオンによって管理されています +global.friendy.fire.is.now.managed.by.each.union=味方への攻撃はそれぞれのユニオンによって管理されています +global.friendy.fire.is.already.being.managed.by.each.union=味方への攻撃はすでにそれぞれのユニオンによって管理されています global.friendly.fire.is.set.to.allowed=グローバルな味方への攻撃が許可されました global.friendly.fire.is.already.being.allowed=グローバルな味方への攻撃がすでに許可されています -the.player.doesn.t.not.have.the.permissions.to.join.clans=プレイヤーはユニオンに参加する権限を持っていません +the.player.doesn.t.not.have.the.permissions.to.join.unions=プレイヤーはユニオンに参加する権限を持っていません you.cannot.invite.yourself=自分を招待することはできません you.did.not.answer.in.time=時間内に回答がありませんでした。キャンセルしています... -this.player.is.banned.from.using.clan.commands=このプレイヤーはユニオンコマンドの使用を禁止されています -the.player.is.already.member.of.another.clan=プレイヤーは既に他のユニオンに所属しています +this.player.is.banned.from.using.union.commands=このプレイヤーはユニオンコマンドの使用を禁止されています +the.player.is.already.member.of.another.union=プレイヤーは既に他のユニオンに所属しています has.been.asked.to.join={0} は {1} への参加を求められました you.cannot.kick.yourself=自分自身はキックできません！ -the.player.is.not.a.member.of.your.clan=プレイヤーはユニオンのメンバーではありません +the.player.is.not.a.member.of.your.union=プレイヤーはユニオンのメンバーではありません you.cannot.kick.another.leader=リーダーは追放できません has.been.kicked.by={0} は {1} から追放されました -no.clans.have.been.created=ユニオンが作成されていません -total.clans=ユニオンの総数： +no.unions.have.been.created=ユニオンが作成されていません +total.unions=ユニオンの総数： no.player.data.found=プレイヤーデータが見つかりません leaders.0=リーダー： {0} allies.0=同盟メンバー： {0} rivals.0=ライバル： {0} other.player.must.be.online=&cプレイヤーはオンラインでなければなりません！ -the.player.does.not.have.the.permissions.to.lead.a.clan=プレイヤーはユニオンに参加する権限を持っていません +the.player.does.not.have.the.permissions.to.lead.a.union=プレイヤーはユニオンに参加する権限を持っていません you.cannot.promote.yourself=自分自身を昇格させることはできません！ the.player.is.already.a.leader=プレイヤーは既にリーダーです configuration.reloaded=設定を再読み込みしました -last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.clan=最後のリーダーは辞任できません。他のリーダーを任命するかユニオンを解散してください +last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.union=最後のリーダーは辞任できません。他のリーダーを任命するかユニオンを解散してください 0.has.resigned={0} は退会しました you.cannot.trust.yourself=自分自身を信用することはできません leaders.are.already.trusted=リーダーはすでに信用されています @@ -299,23 +299,23 @@ this.player.is.already.trusted=このプレイヤーは既に信用されてい has.been.given.trusted.status.by={0} は {1} から信頼されたステータスを与えられました this.player.is.not.banned=このユーザーは禁止されていません player.removed.from.the.banned.list=プレイヤーが禁止リストから削除されました -you.have.been.unbanned.from.clan.commands=ユニオンコマンドの禁止を解除されました +you.have.been.unbanned.from.union.commands=ユニオンコマンドの禁止を解除されました you.cannot.untrust.yourself=自分自身の信用を解除することはできません leaders.cannot.be.untrusted=リーダーの信用は解除できません this.player.is.already.untrusted=このプレイヤーはすでに信用されていません has.been.given.untrusted.status.by={0} は {1} から信頼できないステータスを与えられました -the.clan.does.not.exist=ユニオンは存在しません -the.clan.is.already.verified=ユニオンはすでに認証されています -the.clan.has.been.verified=ユニオンが認証されました -clan.0.has.been.verified=ユニオン {0} が認証されました\! -total.clan.players.0=ユニオンプレイヤーの総数： {0} +the.union.does.not.exist=ユニオンは存在しません +the.union.is.already.verified=ユニオンはすでに認証されています +the.union.has.been.verified=ユニオンが認証されました +union.0.has.been.verified=ユニオン {0} が認証されました\! +total.union.players.0=ユニオンプレイヤーの総数： {0} proposing.war={0} は {1} との戦争を提案しています you.can.only.start.war.with.rivals=ライバルとのみ戦争を始めることができます leaders.have.been.asked.to.accept.the.war.request={0} のリーダーが戦争要請を受け入れるよう求められました leaders.asked.to.end.rivalry={0} のリーダーが戦争終結を求められました proposing.to.end.the.war={0} は {1} との戦争終結を提案しています -clans.already.at.war=ユニオンはすでに戦争状態になっています -clans.not.at.war=ユニオンは戦争状態ではありません +unions.already.at.war=ユニオンはすでに戦争状態になっています +unions.not.at.war=ユニオンは戦争状態ではありません you.are.at.war={0} は現在 {1} との戦争中です denied.war.req={0} は {1} によって送られた戦争要求を拒否しました you.are.no.longer.at.war={0} はもう {1} と戦争していません @@ -327,12 +327,12 @@ diamond=ダイヤモンド gold=金 wood=木 server.announce=サーバーの通知 -clan.announce=ユニオンの通知 +union.announce=ユニオンの通知 leader.announce=リーダーの通知 hunger=空腹 stone=石 iron=鉄 -the.clan.cannot.be.rivaled=ユニオンは対抗できません +the.union.cannot.be.rivaled=ユニオンは対抗できません bboff=掲示板がオフになりました bbon=掲示板がオンになりました inviteon=招待をオンにします @@ -356,30 +356,30 @@ waiting.for.teleport.stand.still.for.0.seconds=テレポートします。 {0} on=オン off=オフ player.rank.changed=ランクが設定されました -your.clans.are.already.rivals=ユニオンはすでにライバルです +your.unions.are.already.rivals=ユニオンはすでにライバルです cleared.bb=掲示板をクリアしました -clan.balance=ユニオン残高： {0} -clan.admin.balance={0} の残高\: {1} -bb.clan.deposit={0} は {1} によって入金されました -player.clan.deposit={0} を預金しました -bb.clan.withdraw={0} は {1} によって引き出されました -bb.clan.take={0} は {1} に奪われました -bb.clan.give={0} は {1} によって与えられました -bb.clan.set={0} は {1} によって与えられました -player.clan.withdraw={0} を引き出しました -clan.admin.take={0} の銀行から {1} を取得しました -clan.admin.give={0} を {1} の銀行に与えました -clan.admin.set={0} の銀行残高を {1} に設定しました -clan.admin.bank.not.enough.money={0} の銀行は十分な資金がありません！ -clan.bank.not.enough.money=ユニオンバンクに十分な資金がありません。 -your.clans.are.not.rivals=あなたのユニオンはライバルではありません -the.clan.members.reached.limit=ユニオンがメンバー上限に達しました -this.clan.has.reached.the.member.limit=&bこのユニオンはメンバーの上限に達しました +union.balance=ユニオン残高： {0} +union.admin.balance={0} の残高\: {1} +bb.union.deposit={0} は {1} によって入金されました +player.union.deposit={0} を預金しました +bb.union.withdraw={0} は {1} によって引き出されました +bb.union.take={0} は {1} に奪われました +bb.union.give={0} は {1} によって与えられました +bb.union.set={0} は {1} によって与えられました +player.union.withdraw={0} を引き出しました +union.admin.take={0} の銀行から {1} を取得しました +union.admin.give={0} を {1} の銀行に与えました +union.admin.set={0} の銀行残高を {1} に設定しました +union.admin.bank.not.enough.money={0} の銀行は十分な資金がありません！ +union.bank.not.enough.money=ユニオンバンクに十分な資金がありません。 +your.unions.are.not.rivals=あなたのユニオンはライバルではありません +the.union.members.reached.limit=ユニオンがメンバー上限に達しました +this.union.has.reached.the.member.limit=&bこのユニオンはメンバーの上限に達しました you.have.reseted.your.kdr=KDR をリセットしました you.have.reseted.0.kdr={0} の KDR をリセットしました you.have.reseted.kdr.of.all.players=すべてのプレイヤーの KDR をリセットしました -you.have.successfully.renamed.your.clan=&bユニオンの名前を {0} に変更しました -you.have.successfully.renamed.the.clan=&bユニオンの名前を {0} に変更しました +you.have.successfully.renamed.your.union=&bユニオンの名前を {0} に変更しました +you.have.successfully.renamed.the.union=&bユニオンの名前を {0} に変更しました you.have.toggled.permanent.status={0} の永続的なステータスを切り替えました permanent.status.enabled=あなたのユニオンの永続的なステータスは {0} によって有効になりました permanent.status.disabled=あなたのユニオンの永続的なステータスは {0} によって無効にされました @@ -402,11 +402,11 @@ bb.one.hour=1 時間 bb.days= \ 日 bb.one.day=1日 player.purged=プレイヤーのパージが完了しました -your.clan.description.must.be.longer.than=ユニオンの説明は {0} 文字より長くなければなりません -your.clan.description.cannot.be.longer.than=ユニオンの説明は {0} 文字より長くすることはできません +your.union.description.must.be.longer.than=ユニオンの説明は {0} 文字より長くなければなりません +your.union.description.cannot.be.longer.than=ユニオンの説明は {0} 文字より長くすることはできません description.changed=ユニオンの説明を変更しました no.description=説明がありません -the.player.must.wait.0.before.joining.your.clan.again=このプレイヤーはユニオンに参加する前に {0} 分待機する必要があります +the.player.must.wait.0.before.joining.your.union.again=このプレイヤーはユニオンに参加する前に {0} 分待機する必要があります disabled.command=無効なコマンド rank.displayname.updated=ランクの表示名が更新されました！ rank.setdefault=ユニオンのデフォルトランクが {0} に設定されました @@ -419,7 +419,7 @@ rank.created=ランクを作成しました permission.0.added.to.rank.1=権限 {0} がランク {1} に追加されました permission.0.removed.from.rank.1=権限 {0} がランク {1} から削除されました rank.0.deleted=ランク {0} が削除されました -clans.ranks=ユニオンのランク： +unions.ranks=ユニオンのランク： no.ranks=ランクが作成されていません rank.no.permissions=このランクには許可がありません。 player.unassigned.from.rank=プレイヤーがランクから外されました @@ -429,7 +429,7 @@ withdraw.not.allowed=引き出しは許可されていません。/ユニオン resign.request.cancelled=退会リクエストがキャンセルされました disband.request.cancelled=解散リクエストがキャンセルされました resetkdr.request.cancelled=KDR リセットリクエストがキャンセルされました -clan.create.request.cancelled=ユニオンの作成リクエストがキャンセルされました +union.create.request.cancelled=ユニオンの作成リクエストがキャンセルされました rank.create.request.cancelled=ランク作成リクエストがキャンセルされました promotion.vote.has.been.requested.from.all.leaders=すべてのリーダーから昇格票が要求されました rename.vote.has.been.requested.from.all.leaders=&bすべてのリーダーから名前の変更が要求されました @@ -446,11 +446,10 @@ gui.lore.no.permission=&cあなたにはこれを見る権限がありません gui.main.title={0} - ユニオンメニュー gui.main.languageselector.title=&f言語を選択 gui.main.languageselector.lore.left.click=&7左クリックで言語を選択 -gui.main.languageselector.lore.right.click=&7右クリックして翻訳を支援する gui.main.other.commands.title=&fその他のコマンド gui.main.other.commands.lore=&7左クリックしてすべてのユニオンコマンドを表示 -gui.main.clan.list.title=&fユニオンリスト -gui.main.clan.list.lore=&7左クリックしてユニオンリストを表示 +gui.main.union.list.title=&fユニオンリスト +gui.main.union.list.lore=&7左クリックしてユニオンリストを表示 gui.main.reset.kdr.title=&fKDRをリセットする gui.main.reset.kdr.lore=&7左クリックしてKDRをリセットします gui.main.leaderboard.title=&fリーダーボード @@ -458,8 +457,8 @@ gui.main.leaderboard.lore=&7左クリックしてリーダーボードを表示 gui.main.staff.title=&fスタッフ gui.main.staff.lore=&7左クリックしてスタッフメニューを開く gui.staff.title=スタッフ -gui.staff.clan.list.lore.left.click=&7左クリックしてすべてのユニオンを表示 -gui.staff.clan.list.lore.right.click=&7右クリックしてすべての未認証のユニオンを表示する +gui.staff.union.list.lore.left.click=&7左クリックしてすべてのユニオンを表示 +gui.staff.union.list.lore.right.click=&7右クリックしてすべての未認証のユニオンを表示する gui.player.list.title=プレイヤーリスト gui.staff.player.list.title=&fプレイヤーリスト gui.staff.player.list.lore.left.click=&7左クリックしてすべてのプレイヤーを表示 @@ -469,8 +468,8 @@ gui.staff.global.ff.lore.status=&7状態：&e{0} gui.staff.global.ff.lore.toggle=&7左クリックしてフレンドリーファイアを切り替えます gui.staff.reload.title=&f再読み込み gui.staff.reload.lore=&7左クリックしてプラグインを再読み込みします -gui.staff.clanlist.unverified.title=未認証のユニオン - 合計： {0} -gui.staff.clanlist.toplace.title={0} の新しいユニオンを選択 +gui.staff.unionlist.unverified.title=未認証のユニオン - 合計： {0} +gui.staff.unionlist.toplace.title={0} の新しいユニオンを選択 gui.warning.title=警告 gui.warning.no.permission.title=&f権限がありません gui.warning.no.permission.plugin.lore=&7あなたには実行するための権限がありません @@ -479,18 +478,18 @@ gui.warning.no.permission.rank.lore=&あなたが {0} であるか、リーダ gui.warning.not.verified.title=&f未認証 gui.warning.not.verified.lore=&7あなたのユニオンは認証されなければなりません！ gui.allies.title=同盟 -gui.allies.clan.lore=&7右クリックしてこの同盟を削除する +gui.allies.union.lore=&7右クリックしてこの同盟を削除する gui.allies.add.title=&f同盟を追加 gui.add.ally.title=同盟を追加 -gui.add.ally.clan.lore=&7左クリックしてユニオンと同盟する +gui.add.ally.union.lore=&7左クリックしてユニオンと同盟する gui.rivals.title=ライバル -gui.rivals.clan.lore=&7右クリックしてライバルを削除する +gui.rivals.union.lore=&7右クリックしてライバルを削除する gui.rivals.add.title=&fライバルを追加 gui.add.rival.title=ライバルを追加 -gui.add.rival.clan.lore=&7左クリックしてユニオンをライバルにします -gui.clanlist.title=ユニオンの総数： {0} -gui.clanlist.clan.title=&fユニオン\: [{0}&f] {1} -gui.clanlist.clan.lore.members=&7メンバー\: &b{0} +gui.add.rival.union.lore=&7左クリックしてユニオンをライバルにします +gui.unionlist.title=ユニオンの総数： {0} +gui.unionlist.union.title=&fユニオン\: [{0}&f] {1} +gui.unionlist.union.lore.members=&7メンバー\: &b{0} gui.coords.title=座標 gui.coords.player.lore.distance=&7距離\: &b{0} gui.coords.player.lore.coords=&7座標\: &b{0} {1} {2} @@ -516,46 +515,46 @@ gui.permissions.add.title=&f権限を追加 gui.permissions.permission.lore=&7右クリックしてランクからこの権限を削除する gui.add.permission.title=権限を追加 gui.add.permission.permission.lore=&7左クリックしてランクにこの権限を追加します -gui.clandetails.free.agent.title=&f無所属 -gui.clandetails.free.agent.create.clan.price.lore=&e価格\: &b{0} -gui.clandetails.clan.lore.description=&7説明\: &b{0} -gui.clandetails.clan.lore.status=&7状態：&e{0} -gui.clandetails.clan.lore.online.members=&7オンラインメンバー\: &b{0}/{1} +gui.uniondetails.free.agent.title=&f無所属 +gui.uniondetails.free.agent.create.union.price.lore=&e価格\: &b{0} +gui.uniondetails.union.lore.description=&7説明\: &b{0} +gui.uniondetails.union.lore.status=&7状態：&e{0} +gui.uniondetails.union.lore.online.members=&7オンラインメンバー\: &b{0}/{1} # suppress inspection "TrailingSpacesInProperty" # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.allies=&同盟メンバー： {0} -gui.clandetails.clan.lore.rivals=&ライバル： {0} -gui.clandetails.clan.lore.founded=&7発見済み\: &b{0} -gui.clandetails.clan.lore.inactive=&7非アクティブ\: &b{0}/{1} 日 -gui.clandetails.allies.title=&f同盟 -gui.clandetails.allies.lore=&7左クリックして同盟メンバーを確認したり、さらに追加する -gui.clandetails.rivals.title=&fライバル -gui.clandetails.rivals.lore=&7左クリックでライバルを確認したり、さらに追加する -gui.clandetails.roster.title=&f名簿 -gui.clandetails.roster.lore=&7左クリックしてユニオンのメンバーを表示したり、さらに招待する -gui.staffclandetails.roster.lore=&7左クリックしてユニオンのメンバーを表示 -gui.clandetails.coords.title=&f座標 -gui.clandetails.coords.lore=&7左クリックしてユニオンのメンバーの座標を表示します -gui.clandetails.home.title=&fホーム -gui.clandetails.home.lore.teleport.price=&7テレポート価格：&b{0} -gui.clandetails.home.lore.set.price=&7価格設定\: &b{0} -gui.clandetails.regroup.lore.price=&e価格\: &b{0} -gui.clandetails.regroup.lore.home=&7左クリックしてユニオンのホームでユニオンのメンバーを再編成します -gui.clandetails.regroup.lore.me=&7右クリックして現在地でユニオンのメンバーを再編成する -gui.clandetails.ff.title=&fフレンドリーファイア -gui.clandetails.bank.withdraw.toggle.lore=&7アイテムをドロップして引き出しステータスを切り替えます -gui.clandetails.not.verified.title=&f未認証 -gui.clandetails.verify.price.lore=&e価格\: &b{0} -gui.clandetails.chat.clan.toggle.lore=&7左クリックしてユニオンチャットの状態を切り替えます -gui.clandetails.chat.ally.toggle.lore=&7右クリックして同盟メンバーチャットのステータスを切り替えます -gui.playerdetails.player.lore.noclan=&7ユニオン\: &bなし -gui.playerdetails.player.lore.clan=&7ユニオン\: &b[{0}&b] {1} +gui.uniondetails.union.lore.allies=&同盟メンバー： {0} +gui.uniondetails.union.lore.rivals=&ライバル： {0} +gui.uniondetails.union.lore.founded=&7発見済み\: &b{0} +gui.uniondetails.union.lore.inactive=&7非アクティブ\: &b{0}/{1} 日 +gui.uniondetails.allies.title=&f同盟 +gui.uniondetails.allies.lore=&7左クリックして同盟メンバーを確認したり、さらに追加する +gui.uniondetails.rivals.title=&fライバル +gui.uniondetails.rivals.lore=&7左クリックでライバルを確認したり、さらに追加する +gui.uniondetails.roster.title=&f名簿 +gui.uniondetails.roster.lore=&7左クリックしてユニオンのメンバーを表示したり、さらに招待する +gui.staffuniondetails.roster.lore=&7左クリックしてユニオンのメンバーを表示 +gui.uniondetails.coords.title=&f座標 +gui.uniondetails.coords.lore=&7左クリックしてユニオンのメンバーの座標を表示します +gui.uniondetails.home.title=&fホーム +gui.uniondetails.home.lore.teleport.price=&7テレポート価格：&b{0} +gui.uniondetails.home.lore.set.price=&7価格設定\: &b{0} +gui.uniondetails.regroup.lore.price=&e価格\: &b{0} +gui.uniondetails.regroup.lore.home=&7左クリックしてユニオンのホームでユニオンのメンバーを再編成します +gui.uniondetails.regroup.lore.me=&7右クリックして現在地でユニオンのメンバーを再編成する +gui.uniondetails.ff.title=&fフレンドリーファイア +gui.uniondetails.bank.withdraw.toggle.lore=&7アイテムをドロップして引き出しステータスを切り替えます +gui.uniondetails.not.verified.title=&f未認証 +gui.uniondetails.verify.price.lore=&e価格\: &b{0} +gui.uniondetails.chat.union.toggle.lore=&7左クリックしてユニオンチャットの状態を切り替えます +gui.uniondetails.chat.ally.toggle.lore=&7右クリックして同盟メンバーチャットのステータスを切り替えます +gui.playerdetails.player.lore.nounion=&7ユニオン\: &bなし +gui.playerdetails.player.lore.union=&7ユニオン\: &b[{0}&b] {1} gui.playerdetails.player.lore.rank=&7ランク\: &b{0} gui.playerdetails.player.lore.status=&7状態：&e{0} gui.playerdetails.player.lore.join.date=&7参加日\: &b{0} gui.playerdetails.player.lore.last.seen=&7最終確認\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.playerdetails.player.lore.past.clans=&7過去のユニオン\: &b{0} +gui.playerdetails.player.lore.past.unions=&7過去のユニオン\: &b{0} gui.playerdetails.player.lore.inactive=&7非アクティブ\: &b{0}/{1} 日 gui.playerdetails.promote.demote.title=&f昇格/降格 gui.playerdetails.promote.lore.left.click=&7左クリックで昇格する @@ -573,53 +572,51 @@ gui.playerdetails.place.lore=&7左クリックでこのプレイヤーのユニ gui.languageselector.title=言語 - 現在\: {0} gui.languageselector.language.lore.left.click=&7左クリックであなたの言語に設定します gui.languageselector.language.lore.translation.status=&7翻訳ステータス\: &b{0}% -gui.languageselector.language.lore.right.click=&7右クリックして翻訳を支援する gui.confirmation.title=確認 gui.confirmation.confirm=&7ここをクリックして確認する gui.confirmation.return=&7ここをクリックして戻る -staff.member.verify.clan=&cあなたのユニオンを認証する必要があります！ +staff.member.verify.union=&cあなたのユニオンを認証する必要があります！ player.already.has.that.rank=&cプレイヤーは既にそのランクを持っています！ -joined.clan.chat=&bユニオンチャットに参加しました -already.joined.clan.chat=&b既にユニオンチャットに参加しています -left.clan.chat=&bユニオンチャットから退出しました -muted.clan.chat=&bユニオンチャットをミュートしました -unmuted.clan.chat=&bユニオンチャットのミュートを解除しました +joined.union.chat=&bユニオンチャットに参加しました +already.joined.union.chat=&b既にユニオンチャットに参加しています +left.union.chat=&bユニオンチャットから退出しました +muted.union.chat=&bユニオンチャットをミュートしました +unmuted.union.chat=&bユニオンチャットのミュートを解除しました joined.ally.chat=&b同盟メンバーチャットに参加しました left.ally.chat=&b同盟メンバーチャットを退出しました muted.ally.chat=&b同盟メンバーチャットをミュートしました unmuted.ally.chat=&b同盟メンバーチャットのミュートを解除しました already.joined.ally.chat=&bあなたはすでに同盟チャットに参加しています -player.already.in.this.clan=&cプレイヤーは既にこのユニオンに所属しています -your.clan.reached.max.alliances=&cユニオンが同盟の最大数に達しました。 -other.clan.reached.max.alliances=&c他のユニオンは同盟数の上限に達しました -insert.clan.tag=&bユニオンタグ(または "{0}") を送信\: -insert.clan.name=&bユニオン名を送信\: +player.already.in.this.union=&cプレイヤーは既にこのユニオンに所属しています +your.union.reached.max.alliances=&cユニオンが同盟の最大数に達しました。 +other.union.reached.max.alliances=&c他のユニオンは同盟数の上限に達しました +insert.union.tag=&bユニオンタグ(または "{0}") を送信\: +insert.union.name=&bユニオン名を送信\: insert.rank.name=&bランク名(または "{0}") を送信\: -click.to.help.translating=&bこのリンクをクリックして翻訳を支援\:\n&r{0} -your.clan.must.have.members.to.verify=&c認証を受けるには、ユニオンに少なくとも {0} 人のメンバーが必要です。 +your.union.must.have.members.to.verify=&c認証を受けるには、ユニオンに少なくとも {0} 人のメンバーが必要です。 you.must.hold.a.banner=&cバナーを手に持っている必要があります\! -you.changed.clan.banner=&bユニオンのバナーを変更しました！ -your.clan.already.verified=&ユニオンはすでに認証されています\! +you.changed.union.banner=&bユニオンのバナーを変更しました！ +your.union.already.verified=&ユニオンはすでに認証されています\! # suppress inspection "TrailingSpacesInProperty" -clan.profile=\n&b%clan_name%&7 プロフィール &8------------------------------------------\n\n &7名前\: &e[&8%clan_color_tag%&e] &b%clan_name%\n &7説明\: &f%clan_description%\n &7ステータス\: &f%clan_status%\n &7リーダー\: %clan_leaders%\n &7オンラインのメンバー\: &f%clan_online_count%&7/&f%clan_size%\n &7KDR\: &e%clan_kdr%\n &7キル合計\: &8[ライバル\:&f%clan_rival_kills% &8同盟者\:&f%clan_ally_kills% &8中立\:&f%clan_neutral_kills% &8民間人\:&f%clan_civilian_kills%&8]\n &7デス\: &f%clan_deaths%\n &7同盟者\: &f%clan_allies%\n &7ライバル\: &f%clan_rivals%\n &7設立\: &f%clan_founded%\n &7非アクティブ\: &f%clan_inactive_days%&7/&f%clan_max_inactive_days% 日 +union.profile=\n&b%union_name%&7 プロフィール &8------------------------------------------\n\n &7名前\: &e[&8%union_color_tag%&e] &b%union_name%\n &7説明\: &f%union_description%\n &7ステータス\: &f%union_status%\n &7オンラインのメンバー\: &f%union_online_count%&7/&f%union_size%\n &7KDR\: &e%union_kdr%\n &7キル合計\: &8[ライバル\:&f%union_rival_kills% &8同盟者\:&f%union_ally_kills% &8中立\:&f%union_neutral_kills% &8民間人\:&f%union_civilian_kills%&8]\n &7デス\: &f%union_deaths%\n &7同盟者\: &f%union_allies%\n &7ライバル\: &f%union_rivals%\n &7設立\: &f%union_founded%\n &7非アクティブ\: &f%union_inactive_days%&7/&f%union_max_inactive_days% 日 # suppress inspection "TrailingSpacesInProperty" player.lookup.killtype=&7キルタイプ\: %player_kill_type%\n -player.lookup=\n&b%player_name%&7 のプレイヤー情報 &8------------------------------------------ -\n \n &7ユニオン\: &f%clan_name%\n &7ランク\: &f%player_rank%\n &7ステータス\: &f%player_status%\n &7KDR\: &e%player_kdr%\n &7キル合計\: &8[ライバル\:&f%player_rival_kills% &8同盟者\:&7%player_ally_kills% &8中立\:&f%player_neutral_kills% &8民間人\:&f%player_civilian_kills%&8]\n &7デス\: &f%player_deaths%\n &7参加日\: &f%player_join_date%\n &7最後に見た\: &f%player_last_seen%\n &7過去のユニオン\: &f%player_past_clans%\n &7非アクティブ\: &f%player_inactive_days%&7/&f%player_max_inactive_days% 日\n %kill_type_line% +player.lookup=\n&b%player_name%&7 のプレイヤー情報 &8------------------------------------------ -\n \n &7ユニオン\: &f%union_name%\n &7ステータス\: &f%player_status%\n &7KDR\: &e%player_kdr%\n &7キル合計\: &8[ライバル\:&f%player_rival_kills% &8同盟者\:&7%player_ally_kills% &8中立\:&f%player_neutral_kills% &8民間人\:&f%player_civilian_kills%&8]\n &7デス\: &f%player_deaths%\n &7参加日\: &f%player_join_date%\n &7最後に見た\: &f%player_last_seen%\n &7過去のユニオン\: &f%player_past_unions%\n &7非アクティブ\: &f%player_inactive_days%&7/&f%player_max_inactive_days% 日\n %kill_type_line% economy.disabled=&cエコノミーが無効になっています has.been.purged={0} のデータが削除されました accepted.invitation=&bあなたは {0} の招待を承認しました denied.invitation=&cあなたは {0} の招待を拒否しました -must.be.in.clan.to.pvp=&cあなたと {0} はPvPのユニオンメンバーである必要があります！ -clans.not.at.war.pvp.denied=&cあなたのユニオンは {0} との戦争に参加していません！ +must.be.in.union.to.pvp=&cあなたと {0} はPvPのユニオンメンバーである必要があります！ +unions.not.at.war.pvp.denied=&cあなたのユニオンは {0} との戦争に参加していません！ cannot.attack.civilians=&c一般人を攻撃することはできません！ -cannot.attack.clan.member=&c他のユニオンメンバーを攻撃することはできません！ +cannot.attack.union.member=&c他のユニオンメンバーを攻撃することはできません！ cannot.attack.ally=&c同盟メンバーを攻撃することはできません！ cannot.send.discord.message={0} にメッセージを送信できません。 あなたはそのユニオンのメンバーではありません\! discordhook.is.disabled=&cDiscord連携が無効または利用できません！ -your.clan.doesnt.have.any.linked.player=ユニオンはプレイヤーをリンクしていません。 -your.clan.doesnt.have.minimum.linked.player=ユニオンには最低限のリンクされたプレイヤーがいません。 -your.clan.is.not.on.the.whitelist=ユニオンがホワイトリストに登録されていません -your.clan.already.has.channel=ユニオンはすでにDiscordチャンネルを持っています +your.union.doesnt.have.any.linked.player=ユニオンはプレイヤーをリンクしていません。 +your.union.doesnt.have.minimum.linked.player=ユニオンには最低限のリンクされたプレイヤーがいません。 +your.union.is.not.on.the.whitelist=ユニオンがホワイトリストに登録されていません +your.union.already.has.channel=ユニオンはすでにDiscordチャンネルを持っています discord.reached.category.limit=Discordがカテゴリ数の上限に達しました！ discord.reached.channels.limit=Discordがチャンネル数の制限に達しました！ discord.created.successfully=&bDiscord チャンネルが正常に作成されました！ @@ -629,16 +626,16 @@ cannot.kick.last.leader=&c最後のリーダーは退出できません！ cannot.disband.permanent=&cこのユニオンを解散することはできません。これは永続的なステータスです。 you.can.only.set.base.in.your.land=&cあなたはあなたの土地でのみ家に帰ることができます！ only.leaders.can.create.lands=&cリーダーだけが土地を作ることができます！ -only.one.land.per.clan=&cあなたのユニオンは既に土地を持っています！ -only.clan.members.can.create.lands=&cユニオンメンバーのみが土地を作成できます！ +only.one.land.per.union=&cあなたのユニオンは既に土地を持っています！ +only.union.members.can.create.lands=&cユニオンメンバーのみが土地を作成できます！ land.allowed.all.actions=&bすべてのアクションが許可されました！ land.blocked.all.actions=&bすべてのアクションがブロックされました！ you.do.not.own.lands=&cあなたは土地を所有していません！ land.sharing.disabled=&cランドシェアは無効です！ -clan.chat.disabled=&cユニオンチャットが無効です！ +union.chat.disabled=&cユニオンチャットが無効です！ ally.chat.disabled=&c同盟メンバーチャットが無効です！ war.expired={0} との戦争は終了しました！ you.cant.start.war.online.members.difference=戦争を開始することはできません。一方のユニオンは他のユニオンよりも多くのメンバーをオンラインにしています。 invitedplayer.invite.off=このプレイヤーはユニオンの招待を無効にしました user.hasnt.played.before=&cこのユーザーはまだプレイしていません -clan.list.balance.header=\n{0} &7残高ランキング &8-----------------------\n \n&8ユニオンの合計\: &7{1}\n \n&8\#&7. &8ユニオン &7- &8残高 +union.list.balance.header=\n{0} &7残高ランキング &8-----------------------\n \n&8ユニオンの合計\: &7{1}\n \n&8\#&7. &8ユニオン &7- &8残高 diff --git a/src/main/resources/messages_lt_LT.properties b/src/main/resources/messages_lt_LT.properties index 68540a47..c6fcdc8f 100644 --- a/src/main/resources/messages_lt_LT.properties +++ b/src/main/resources/messages_lt_LT.properties @@ -20,7 +20,7 @@ admin.command=administratorius mod.command=moderatorius promote.command=paaukštinti demote.command=pažeminti -clanff.command=clanff +unionff.command=unionff resign.command=pasiduoti disband.command=ištrinti verify.command=patvirtinti @@ -56,7 +56,7 @@ acf-core.parameter.message=žinutė acf-core.parameter.name=vardas acf-core.parameter.description=aprašymas acf-core.parameter.player=žaidėjas -acf-core.parameter.clan=sąjunga +acf-core.parameter.union=sąjunga acf-core.parameter.type=tipas acf-core.parameter.order=rikiavimas acf-core.parameter.help=puslapis ar raktinis žodis @@ -99,8 +99,8 @@ command.description.ff.allow=Nustato jūsų asmeninę draugišką ugnį (friendl command.description.ff.auto=Nustato jūsų asmeninę draugišką ugnį į automatinę command.description.globalff.allow=Įjungia visuotinę draugišką ugnį į leistiną command.description.globalff.auto=Įjungia visuotinę draugišką ugnį į automatinę -command.description.clanff.allow=Nustato jūsų sąjungos draugišką ugnį į leistiną -command.description.clanff.block=Užblokuoja jūsų sąjungos draugišką ugnį +command.description.unionff.allow=Nustato jūsų sąjungos draugišką ugnį į leistiną +command.description.unionff.block=Užblokuoja jūsų sąjungos draugišką ugnį command.description.description=Nustato jūsų sąjungos aprašymą command.description.ban=Užblokuoja sąjungos komandas žaidėjui command.description.unban=Atblokuoja sąjungos komandas žaidėjui @@ -128,7 +128,7 @@ command.description.untrust=Nustato žaidėją kaip nepatikimą command.description.resign=Atsistatydinti iš sąjungos command.description.help=Rodo pagalbą ir paiešką command.description.ally.add=Prideda alijansą -command.description.clan=Atidaro GUI +command.description.union=Atidaro GUI command.description.disband=Panaikina jūsų sąjungą command.description.mod.disband=Panaikina sąjungą command.description.mod.kick=Išmeta žaidėją iš sąjungos @@ -182,7 +182,7 @@ command.description.mod.rename=Pervardina sąjungą home-menu=/{0} home{1} - Teleportacija į sąjungos bazę home-set-menu=/{0} home set{1} - Nustato sąjungos bazę home-clear-menu=/{0} home clear{1} - Panaikina sąjungos bazę -clan=Sąjunga +union=Sąjunga allies=Alijansas name=Pavadinimas distance=Atstumas @@ -190,7 +190,7 @@ coords.upper=Koordinatės world=Pasaulis kdr=KDR members=Nariai -clans.lower=sąjungos +unions.lower=sąjungos rival=Priešai civilian=Civiliai neutral=Neutralai @@ -229,9 +229,9 @@ nokillsfound=Nužudymų nėra promoted.to.leader={0} buvo paaukštintas į lyderį denied.demotion={0} atmetė {1} pažeminimą. Sutarimas nepavyko. membership.invitation={0} atmetė kvietimą į sąjungą -joined.the.clan={0} prisijungė prie sąjungos +joined.the.union={0} prisijungė prie sąjungos signed.off.request.cancelled={0} atsijungė. {1} užklausa į sąjungą atšaukta. -clan.deletion={0} atmetė sąjungos ištrynimą. Sutarimas nepavyko. +union.deletion={0} atmetė sąjungos ištrynimą. Sutarimas nepavyko. rename.refused={0} atmetė sąjungos pervardinimą. Sutarimas nepavyko. has.been.disbanded=Sąjunga {0} buvo panaikintas denied.the.promotion={0} atmetė {1} paaukštinimą. Sutarimas nepavyko. @@ -267,9 +267,9 @@ mysql.connection.failed=MySQL Prisijungimas nesėkmingas sqlite.connection.successful=SQLite prisijungimas sėkmingas sqlite.connection.failed= SQLite prisijungimas nesėkmingas purging.player.data=šalinami žaidėjo duomenys\: {0} -purging.clan=Šalinamas sąjunga\: {0} -clan.players=Sąjungos nariai\: {0} -clans=Sąjungos\: {0} +purging.union=Šalinamas sąjunga\: {0} +union.players=Sąjungos nariai\: {0} +unions=Sąjungos\: {0} banned=Jums uždrausta naudoti sąjungų komandas (Manai kad tai klaida? Kreipkis į (www.nomi.lt) nothing.more.to.see=Nieko nėra nothing.to.vote=&cNėra ką sutikti ar atšaukti @@ -282,71 +282,71 @@ bulletin.board.header=&8* &e{0} &fskelbimų lenta bulletin.board.message={0}\: &f{1} has.been.disbanded.rivalry.ended=Sąjungos priešai {0} išardė savo sąjungą. Nebeturite priešo. has.been.disbanded.alliance.ended=Sąjungos alijansas {0} išardė savo sąjungą. Nebeturite sąjungininko. -clan.disbanded=Sąjunga išardytas +union.disbanded=Sąjunga išardytas 1.color.day=1 {0}diena many.color.days={0}{1} dienos insufficient.permissions=Neužtenka leidimų -clan.is.not.verified=Sąjunga nėra patvirtintas -player.not.a.member.of.any.clan=&cŽaidėjas nėra jokio sąjungos narys -not.a.member.of.any.clan=Jūs neesate jokio sąjungos narys +union.is.not.verified=Sąjunga nėra patvirtintas +player.not.a.member.of.any.union=&cŽaidėjas nėra jokio sąjungos narys +not.a.member.of.any.union=Jūs neesate jokio sąjungos narys minimum.to.make.alliance=Norėdami sukurti sąjunga su kitu alijansu, privalote tūrėti {0} narius -cannot.be.same.clan=&cPrivalote įvesti kitą sąjungą, ne savo\! -other.clan.not.verified=&cĮvestas sąjunga vis dar nėra patvirtintas\! -your.clans.are.not.allies=Jūsų sąjungos nėra sąjungininkai +cannot.be.same.union=&cPrivalote įvesti kitą sąjungą, ne savo\! +other.union.not.verified=&cĮvestas sąjunga vis dar nėra patvirtintas\! +your.unions.are.not.allies=Jūsų sąjungos nėra sąjungininkai has.broken.the.alliance={0} nutraukė sąjungą su {1} at.least.one.leader.accept.the.alliance=Norėdami sutikti su alijanso sąjunga, privalu kad nors vienas sąjungos lyderis būtų prisijungęs leaders.have.been.asked.for.an.alliance={0} lyderiai nori tapti alijansu -your.clans.are.already.allies=Jūsų sąjungos jau yra alijanso sąjungininkai -your.clan.cannot.create.rivals=Jūsų sąjunga negali tūrėti priešų +your.unions.are.already.allies=Jūsų sąjungos jau yra alijanso sąjungininkai +your.union.cannot.create.rivals=Jūsų sąjunga negali tūrėti priešų min.players.rivalries=Norėdami tūrėti priešų, savo sąjungoje privalote tūrėti nors {0} narius this.player.is.already.banned=Šis žaidėjas jau yra užblokuotas player.added.to.banned.list=Žaidėjas yra ištrauktas į užblokuotų sąrašą you.banned=Jūs buvote užblokuotas nuo sąjungos komandų naudojimo -clan.wide.friendly.fire.blocked=Viso sąjungos draugiška ugnis išjungta -clan.wide.friendly.fire.is.allowed=Viso sąjungos draugiška ugnis įjungta +union.wide.friendly.fire.blocked=Viso sąjungos draugiška ugnis išjungta +union.wide.friendly.fire.is.allowed=Viso sąjungos draugiška ugnis įjungta you.are.the.only.member.online=Jūs esate vienintelis narys prisijungęs šiuo metu -your.clan.color.tag.cannot.be.longer.than.characters=&cJūsų sąjungos tag negali būti ilgesnis nei {0} simboliai +your.union.color.tag.cannot.be.longer.than.characters=&cJūsų sąjungos tag negali būti ilgesnis nei {0} simboliai you.cannot.set.colored.ranks=Negali nustatyti spalvotų rank -your.clan.name.cannot.be.longer.than.characters=Sąjungos pavadinimas negali būti ilgesnis nei {0} simboliai -your.clan.name.must.be.longer.than.characters=Sąjungos pavadinimas turi būti ilgesnis nei {0} simboliai -your.clan.name.cannot.contain.color.codes=Jūsų sąjungos pavadinimas negali tūrėti spalvos kodų +your.union.name.cannot.be.longer.than.characters=Sąjungos pavadinimas negali būti ilgesnis nei {0} simboliai +your.union.name.must.be.longer.than.characters=Sąjungos pavadinimas turi būti ilgesnis nei {0} simboliai +your.union.name.cannot.contain.color.codes=Jūsų sąjungos pavadinimas negali tūrėti spalvos kodų you.must.first.resign=Pirmiausia turite atsistatydinti iš {0} -clan.with.this.tag.already.exists=Sąjunga su šiuo tag jau egzistuoja -get.your.clan.verified.to.access.advanced.features=Patvirtinkite savo sąjungą, kad galėtumėte pasiekti visas funkcijas -clan.created=mc.nomi.lt\: &2Sąjunga {0} sėkmingai sukurtas\! +union.with.this.tag.already.exists=Sąjunga su šiuo tag jau egzistuoja +get.your.union.verified.to.access.advanced.features=Patvirtinkite savo sąjungą, kad galėtumėte pasiekti visas funkcijas +union.created=mc.nomi.lt\: &2Sąjunga {0} sėkmingai sukurtas\! not.enough.leaders.online.to.vote.on.demotion=Nėra prisijungusių pakankamai lyderių kad balsuoti dėl pažeminimo demotion.vote.has.been.requested.from.all.leaders=Visų lyderių buvo paprašyta pažeminti -player.is.not.a.leader.of.your.clan=Žaidėjas nėra tavo sąjungos lyderis +player.is.not.a.leader.of.your.union=Žaidėjas nėra tavo sąjungos lyderis player.is.not.a.leader=Žaidėjas nėra sąjungos lyderis -clan.has.been.disbanded=Sąjunga {0} buvo panaikintas -clan.disband.vote.has.been.requested.from.all.leaders=Sąjungos panaikinimo prašymas buvo išsiūstas visiems lyderiams -friendy.fire.is.now.managed.by.your.clan=Friendy-fire dabar valdoma nuo jūsų sąjungos +union.has.been.disbanded=Sąjunga {0} buvo panaikintas +union.disband.vote.has.been.requested.from.all.leaders=Sąjungos panaikinimo prašymas buvo išsiūstas visiems lyderiams +friendy.fire.is.now.managed.by.your.union=Friendy-fire dabar valdoma nuo jūsų sąjungos personal.friendly.fire.is.set.to.allowed=Sąjungos friendly-fire yra leidžiama -global.friendy.fire.is.now.managed.by.each.clan=Visuotinis friendly-fire dabar yra valdomi pagal sąjungas -global.friendy.fire.is.already.being.managed.by.each.clan=Visuotinis friendly-fire jau yra valdomas pagal kiekvieną sąjungą +global.friendy.fire.is.now.managed.by.each.union=Visuotinis friendly-fire dabar yra valdomi pagal sąjungas +global.friendy.fire.is.already.being.managed.by.each.union=Visuotinis friendly-fire jau yra valdomas pagal kiekvieną sąjungą global.friendly.fire.is.set.to.allowed=Visuotinis friendly-fire yra leidžiamas global.friendly.fire.is.already.being.allowed=Visuotinis friendly-fire jau yra leidžiamas -the.player.doesn.t.not.have.the.permissions.to.join.clans=Žaidėjas neturi teisės jungtis į sąjungas +the.player.doesn.t.not.have.the.permissions.to.join.unions=Žaidėjas neturi teisės jungtis į sąjungas you.cannot.invite.yourself=Savęs pakviesti negali, geriau pakviesk draugą į www.nomi.lt \! you.did.not.answer.in.time=Neatsakėte laiku... atšaukiama... -this.player.is.banned.from.using.clan.commands=Žaidėjui draudžiama naudoti sąjungos komandas -the.player.is.already.member.of.another.clan=Žaidėjas jau priklauso kitam sąjungai +this.player.is.banned.from.using.union.commands=Žaidėjui draudžiama naudoti sąjungos komandas +the.player.is.already.member.of.another.union=Žaidėjas jau priklauso kitam sąjungai has.been.asked.to.join={0} prašo prisijungti prie {1} you.cannot.kick.yourself=Savęs išmesti negali -the.player.is.not.a.member.of.your.clan=Žaidėjas nepriklauso tavo sąjungai +the.player.is.not.a.member.of.your.union=Žaidėjas nepriklauso tavo sąjungai you.cannot.kick.another.leader=Negali išmesti kito lyderio has.been.kicked.by={0} išmetė {1} -no.clans.have.been.created=Jokių sąjungų dar kolkas nėra -total.clans=Viso sąjungų\: +no.unions.have.been.created=Jokių sąjungų dar kolkas nėra +total.unions=Viso sąjungų\: legend=Legenda\: kill.type.civilian=Nužudimo tipas\: {0}Civiliai no.player.data.found=Jokios informacijos nerasta -clan.0=Sąjunga\: {0} +union.0=Sąjunga\: {0} status.0=Statusas\: {0} rank.0=Rank\: {0} kdr.0=KDR\: {0} inactive.0=Neaktyvūs\: {0} -clan.commands=sąjungos komandos +union.commands=sąjungos komandos you.can.only.modify.the.color.and.case.of.the.tag=Jūs galite redaguoti tik spalvą ir dydį tag.changed.to.0=TAG pakeistas į {0} 0.tag.changed.to.1=&bSėkmingai pakeitėte {0} tag į {1} @@ -356,11 +356,11 @@ leaders.0=Lyderiai\: {0} allies.0=Alijansai\: {0} rivals.0=Priešai\: {0} other.player.must.be.online=&cŽaidėjas privalo būti &2prisijungęs\! -the.player.does.not.have.the.permissions.to.lead.a.clan=Šis žaidėjas neturi teisės valdyti sąjungos +the.player.does.not.have.the.permissions.to.lead.a.union=Šis žaidėjas neturi teisės valdyti sąjungos you.cannot.promote.yourself=Negali paaukštinti savęs the.player.is.already.a.leader=Žaidėjas jau yra lyderis configuration.reloaded=Konfiguracija perkrauta -last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.clan=Vienintelis lyderis negali palikti sąjungos. Norėdami palikti privalote paskirti kita lyderį +last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.union=Vienintelis lyderis negali palikti sąjungos. Norėdami palikti privalote paskirti kita lyderį 0.has.resigned={0} atsistatydino you.cannot.trust.yourself=Negali įtraukti savęs į patikimų sąrašą leaders.are.already.trusted=Lyderiai automatiškai įtraukiami į patikimų sąrašą @@ -368,23 +368,23 @@ this.player.is.already.trusted=Šis žaidėjas jau yra patikimas has.been.given.trusted.status.by={0} buvo įtrauktas į patikimų sąrašą nuo {1} this.player.is.not.banned=Šis žaidėjas nėra užblokuotas player.removed.from.the.banned.list=Žaidėjas pašalintas iš užblokuotų sąrašo -you.have.been.unbanned.from.clan.commands=Jūs buvote atblokuotas, galite vėl naudoti sąjungos komandas +you.have.been.unbanned.from.union.commands=Jūs buvote atblokuotas, galite vėl naudoti sąjungos komandas you.cannot.untrust.yourself=Negali įtraukti savęs į nepatikimų sąrašą leaders.cannot.be.untrusted=Lyderiai negali būti nepatikimi this.player.is.already.untrusted=Šis žaidėjas jau yra nepatikimas has.been.given.untrusted.status.by={0} buvo įtrauktas į nepatikimų sąrašą nuo {1} -the.clan.does.not.exist=Sąjunga neegzistuoja -the.clan.is.already.verified=Sąjunga jau yra patvirtintas -the.clan.has.been.verified=Sąjunga buvo sėkmingai patvirtintas -clan.0.has.been.verified=Sąjunga {0} buvo sėkmingai patvirtintas\! -total.clan.players.0=Viso sąjungos narių\: {0} +the.union.does.not.exist=Sąjunga neegzistuoja +the.union.is.already.verified=Sąjunga jau yra patvirtintas +the.union.has.been.verified=Sąjunga buvo sėkmingai patvirtintas +union.0.has.been.verified=Sąjunga {0} buvo sėkmingai patvirtintas\! +total.union.players.0=Viso sąjungos narių\: {0} proposing.war={0} siūlo pradėti karą prieš {1} sąjungą you.can.only.start.war.with.rivals=Karą gali pradėti tik prieš priešus leaders.have.been.asked.to.accept.the.war.request={0} lyderiai gavo užklausą dėl karo leaders.asked.to.end.rivalry={0} gavo prašymus nutraukti karą proposing.to.end.the.war={0} prašo nutraukti karą su {1} -clans.already.at.war=Jūsų sąjunga jau kariauja -clans.not.at.war=Jūsų sąjunga nekariauja +unions.already.at.war=Jūsų sąjunga jau kariauja +unions.not.at.war=Jūsų sąjunga nekariauja you.are.at.war={0} pradėjo karą prieš {1} sąjungą denied.war.req={0} atmetė karo užklausą kurią siuntė {1} you.are.no.longer.at.war={0} nutraukė karą prieš {1} @@ -407,12 +407,12 @@ diamond=deimantai gold=auksas wood=medis server.announce=Serverio pranešimas -clan.announce=Sąjungos pranešimas +union.announce=Sąjungos pranešimas leader.announce=Lyderio pranešimas hunger=Alkis stone=akmuo iron=metalas -the.clan.cannot.be.rivaled=Šis sąjunga negali būti priešu +the.union.cannot.be.rivaled=Šis sąjunga negali būti priešu bboff=BB išjungta bbon=BB įjungta inviteon=Pakvietimai įjungti @@ -436,30 +436,30 @@ waiting.for.teleport.stand.still.for.0.seconds=Laukiama teleportacijos, stovėki on=įjungta off=išjungta player.rank.changed=Rank nustatytas -your.clans.are.already.rivals=Jūsų sąjungos jau yra priešai +your.unions.are.already.rivals=Jūsų sąjungos jau yra priešai cleared.bb=Išvalė lentą -clan.balance=Sąjungos-Balansas\: {0} -clan.admin.balance={0} balansas {1} -bb.clan.deposit={0} buvo įdėti nuo {1} -player.clan.deposit=Padėjai {0} -bb.clan.withdraw={1} iš sąjungos fondo pasiemė {0} -bb.clan.take={1} iš sąjungos fondo paimė {0} -bb.clan.give={1} davė {0} -bb.clan.set={1} nustatė fondą į {0} -player.clan.withdraw=Nusiemėi {0} -clan.admin.take=Nusiemei {0} iš {1} fondo -clan.admin.give=Tu įnešei {0} į {1} fondą -clan.admin.set=Nustatei {0} fondą į {1} -clan.admin.bank.not.enough.money={0} fondas neturi užtektinai pinigų\! -clan.bank.not.enough.money=Jūsų sąjungos fondas neturi užtektinai pinigų -your.clans.are.not.rivals=Jūsų sąjungos nėra priešai -the.clan.members.reached.limit=Jūsų sąjunga pasiekė maksimalų narių skaičių -this.clan.has.reached.the.member.limit=&Šis sąjunga pasiekė maksimalų narių skaičių +union.balance=Sąjungos-Balansas\: {0} +union.admin.balance={0} balansas {1} +bb.union.deposit={0} buvo įdėti nuo {1} +player.union.deposit=Padėjai {0} +bb.union.withdraw={1} iš sąjungos fondo pasiemė {0} +bb.union.take={1} iš sąjungos fondo paimė {0} +bb.union.give={1} davė {0} +bb.union.set={1} nustatė fondą į {0} +player.union.withdraw=Nusiemėi {0} +union.admin.take=Nusiemei {0} iš {1} fondo +union.admin.give=Tu įnešei {0} į {1} fondą +union.admin.set=Nustatei {0} fondą į {1} +union.admin.bank.not.enough.money={0} fondas neturi užtektinai pinigų\! +union.bank.not.enough.money=Jūsų sąjungos fondas neturi užtektinai pinigų +your.unions.are.not.rivals=Jūsų sąjungos nėra priešai +the.union.members.reached.limit=Jūsų sąjunga pasiekė maksimalų narių skaičių +this.union.has.reached.the.member.limit=&Šis sąjunga pasiekė maksimalų narių skaičių you.have.reseted.your.kdr=Atsistatei savo KDR you.have.reseted.0.kdr=Atstatei žaidėjo {0} KDR you.have.reseted.kdr.of.all.players=Atstatei visu žaidėjų KDR -you.have.successfully.renamed.your.clan=&bSėkmingai pervadinote savo sąjungą į {0} -you.have.successfully.renamed.the.clan=&bSėkmingai pervadinote sąjungą į {0} +you.have.successfully.renamed.your.union=&bSėkmingai pervadinote savo sąjungą į {0} +you.have.successfully.renamed.the.union=&bSėkmingai pervadinote sąjungą į {0} you.have.toggled.permanent.status=Nustatėte {0} amžiną būseną permanent.status.enabled=Jūsų sąjungos būsena nustatyta į amžiną (nuo {0}) permanent.status.disabled=Jūsų sąjungos amžinoji būsena buvo atšaukta nuo {0} @@ -483,11 +483,11 @@ bb.one.hour=1 valandą bb.days= \ dienos bb.one.day=1 diena player.purged=Žaidėjas sėkmingai pašalintas -your.clan.description.must.be.longer.than=Jūsų sąjungos aprašymas turi būti ilgesnis nei {0} raidės -your.clan.description.cannot.be.longer.than=Jūsų sąjungos aprašymas negali būti ilgesnis nei {0} raidės +your.union.description.must.be.longer.than=Jūsų sąjungos aprašymas turi būti ilgesnis nei {0} raidės +your.union.description.cannot.be.longer.than=Jūsų sąjungos aprašymas negali būti ilgesnis nei {0} raidės description.changed=Sėkmingai atnaujinote savo sąjungos aprašymą no.description=Aprašymo nėra -the.player.must.wait.0.before.joining.your.clan.again=Žaidėjas norėdamas prisijungti į jūsų sąjungą privalo palaukti {0} minutes +the.player.must.wait.0.before.joining.your.union.again=Žaidėjas norėdamas prisijungti į jūsų sąjungą privalo palaukti {0} minutes disabled.command=Komanda išjungta rank.displayname.updated=Rank pavadinimas buvo sėkmingai atnaujintas\! rank.setdefault=Sąjungos įprastas (pirminis) rank nustatytas į {0} @@ -500,18 +500,18 @@ rank.created=Rank sukurtas permission.0.added.to.rank.1=Leidimai {0} prideti rank {1} permission.0.removed.from.rank.1=Leidimai {0} panaikinti rankui {1} rank.0.deleted=Rank {0} panaikintas -clans.ranks=Sąjungos ranks\: +unions.ranks=Sąjungos ranks\: ranks.list.item={0}\# {1} ({2}) no.ranks=Nera jokiu sukurtu ranks rank.no.permissions=Šis rank neturi jokių leidimų player.unassigned.from.rank=Žaidėjas nepriskirtas rankui you.must.be.0.or.have.the.permission.1.to.use.this=Privalai būti {0} arba lyderis turi duoti tavo rankui leidima {1} kad galėtum tai daryti -deposit.not.allowed=Įnešimas yra draudžiamas, naudokite /%clan %toggle %deposit kad leistumėte tai -withdraw.not.allowed=Nuėmimas yra draudžiamas, naudokite /%clan %toggle %withdraw kad tai įjungtumėte +deposit.not.allowed=Įnešimas yra draudžiamas, naudokite /%union %toggle %deposit kad leistumėte tai +withdraw.not.allowed=Nuėmimas yra draudžiamas, naudokite /%union %toggle %withdraw kad tai įjungtumėte resign.request.cancelled=Atsistatydinimo prašymas atšauktas disband.request.cancelled=Sąjungos panaikinimo užklausa atšaukta resetkdr.request.cancelled=Atsistatydinimo prašymas atšauktas -clan.create.request.cancelled=Sąjungos kūrimo užklausa atšaukta +union.create.request.cancelled=Sąjungos kūrimo užklausa atšaukta rank.create.request.cancelled=Rank kūrimo užklausa atšaukta promotion.vote.has.been.requested.from.all.leaders=Visų lyderių buvo paprašyta balsuoti dėl paaukštinimo rename.vote.has.been.requested.from.all.leaders=&bPervadinimo balsavimas buvo paprašytas visų lyderių @@ -528,11 +528,10 @@ gui.lore.no.permission=&cNeturi teisės to peržiūrėti\! gui.main.title={0} - Sąjungos meniu gui.main.languageselector.title=Pasirinkti kalbą gui.main.languageselector.lore.left.click=Kairys-mygtukas pasirinkti kalbą -gui.main.languageselector.lore.right.click=&7NOMI gui.main.other.commands.title=Kitos komandos gui.main.other.commands.lore=&7Kairys-mygtukas peržiūrėti visas sąjungų komandas -gui.main.clan.list.title=&fSąjungų sąrašas -gui.main.clan.list.lore=&7Kairys-mygtukas peržiūrėti sąjungų sąrašą +gui.main.union.list.title=&fSąjungų sąrašas +gui.main.union.list.lore=&7Kairys-mygtukas peržiūrėti sąjungų sąrašą gui.main.reset.kdr.title=&fAtstatyti KDR gui.main.reset.kdr.lore=&7Kairys-mygtukas atstatyti jūsų KDR gui.main.leaderboard.title=Geriausių lentelė @@ -540,8 +539,8 @@ gui.main.leaderboard.lore=&7Kairys-mygtukas peržiūrėti geriausių lentelė (L gui.main.staff.title=&fPersonalas gui.main.staff.lore=&7Kairys-mygtukas atidaryti personalo meniu gui.staff.title=NOMI Personalas -gui.staff.clan.list.lore.left.click=&7Kairys-mygtukas peržiūrėti visus sąjungas -gui.staff.clan.list.lore.right.click=&7Dešinys-mygtukas peržiūrėti visus nepatvirtintus sąjungas +gui.staff.union.list.lore.left.click=&7Kairys-mygtukas peržiūrėti visus sąjungas +gui.staff.union.list.lore.right.click=&7Dešinys-mygtukas peržiūrėti visus nepatvirtintus sąjungas gui.player.list.title=Žaidėjų sąrašas gui.staff.player.list.title=&fŽaidėjų sąrašas gui.staff.player.list.lore.left.click=&7Kairys-mygtukas pamatyti visus žaidėjus @@ -551,8 +550,8 @@ gui.staff.global.ff.lore.status=&7Statusas\: &b{0} gui.staff.global.ff.lore.toggle=&7Kairys-mygtukas, kad perjungtumėte draugiškos ugnies būseną gui.staff.reload.title=&fPerkrauti gui.staff.reload.lore=&7Kairys-mygtukas plugin perkrovimas -gui.staff.clanlist.unverified.title=Nepatvirtinti sąjungos - Viso\: {0} -gui.staff.clanlist.toplace.title=Pasirinkti {0} sąjungą +gui.staff.unionlist.unverified.title=Nepatvirtinti sąjungos - Viso\: {0} +gui.staff.unionlist.toplace.title=Pasirinkti {0} sąjungą gui.warning.title=Įspėjimas gui.warning.no.permission.title=&fNėra leidimo gui.warning.no.permission.plugin.lore=&7Neturi teises to daryti\! @@ -561,20 +560,20 @@ gui.warning.no.permission.rank.lore=&7Privalai būti {0} arba lyderis privalo ta gui.warning.not.verified.title=&fNepatvirtinta gui.warning.not.verified.lore=&7Tavo sąjunga privalo būti patvirtintas\! gui.allies.title=Alijansas -gui.allies.clan.lore=&7Desinys-mygtukas pašalinti sąjungininką +gui.allies.union.lore=&7Desinys-mygtukas pašalinti sąjungininką gui.allies.add.title=&fPridėti sąjungininką gui.add.ally.title=Pridėti sąjungininką -gui.add.ally.clan.lore=&7Kairys-mygtukas pridėti į alijansą +gui.add.ally.union.lore=&7Kairys-mygtukas pridėti į alijansą gui.rivals.title=Priešai -gui.rivals.clan.lore=&7Dešinys-mygtukas pašalinti priešą +gui.rivals.union.lore=&7Dešinys-mygtukas pašalinti priešą gui.rivals.add.title=&fPridėti priešą gui.add.rival.title=Pridėti priešą -gui.add.rival.clan.lore=&7Kairys-mygtukas pridėti į priešų sąrašą -gui.clanlist.title=Sąjungos - Viso\: {0} -gui.clanlist.clan.title=&fSąjunga\: [{0}&f] {1} -gui.clanlist.clan.lore.position=&b\#{0} -gui.clanlist.clan.lore.kdr=&7KDR\: &b{0} -gui.clanlist.clan.lore.members=&7Nariai\: &b{0} +gui.add.rival.union.lore=&7Kairys-mygtukas pridėti į priešų sąrašą +gui.unionlist.title=Sąjungos - Viso\: {0} +gui.unionlist.union.title=&fSąjunga\: [{0}&f] {1} +gui.unionlist.union.lore.position=&b\#{0} +gui.unionlist.union.lore.kdr=&7KDR\: &b{0} +gui.unionlist.union.lore.members=&7Nariai\: &b{0} gui.coords.title=Koordinatės gui.coords.player.lore.distance=&7Atstumas\: &b{0} gui.coords.player.lore.coords=&7Koordinatės\: &b{0} {1} {2} @@ -604,83 +603,83 @@ gui.permissions.permission.lore=&7Dešinys-mygtukas pašalinti leidimą nuo rank gui.add.permission.title=Pridėti leidimą gui.add.permission.permission.title=&f{0} gui.add.permission.permission.lore=&7Kairys-mygtukas pridėti leidimą rankui -gui.clandetails.title=[{0}] {1} -gui.clandetails.free.agent.title=&fKurti sąjungą -gui.clandetails.free.agent.create.clan.price.lore=&7Kaina\: &b{0} -gui.clandetails.free.agent.create.clan.lore=&7Kairys-mygtukas kurti sąjungą -gui.clandetails.clan.title=&f[{0}&f] {1} -gui.clandetails.clan.lore.description=&7Aprašymas\: &b{0} -gui.clandetails.clan.lore.status=&7Statusas\: &b{0} -gui.clandetails.clan.lore.leaders=&7Lyderiai\: &b{0} -gui.clandetails.clan.lore.online.members=&7Prisijungę nariai\: &b{0}/{1} -gui.clandetails.clan.lore.kdr=&7KDR\: &b{0} -gui.clandetails.clan.lore.kill.totals=&7Viso nužudymų\: &b[Priešai\:{0} Neutralai\:{1} Civiliai\:{2}] -gui.clandetails.clan.lore.deaths=&7Mirtys\: &b{0} +gui.uniondetails.title=[{0}] {1} +gui.uniondetails.free.agent.title=&fKurti sąjungą +gui.uniondetails.free.agent.create.union.price.lore=&7Kaina\: &b{0} +gui.uniondetails.free.agent.create.union.lore=&7Kairys-mygtukas kurti sąjungą +gui.uniondetails.union.title=&f[{0}&f] {1} +gui.uniondetails.union.lore.description=&7Aprašymas\: &b{0} +gui.uniondetails.union.lore.status=&7Statusas\: &b{0} +gui.uniondetails.union.lore.leaders=&7Lyderiai\: &b{0} +gui.uniondetails.union.lore.online.members=&7Prisijungę nariai\: &b{0}/{1} +gui.uniondetails.union.lore.kdr=&7KDR\: &b{0} +gui.uniondetails.union.lore.kill.totals=&7Viso nužudymų\: &b[Priešai\:{0} Neutralai\:{1} Civiliai\:{2}] +gui.uniondetails.union.lore.deaths=&7Mirtys\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.allies.separator=&b, +gui.uniondetails.union.lore.allies.separator=&b, # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.rivals.separator=&b, -gui.clandetails.clan.lore.allies=&7Alijansas\: &b{0} -gui.clandetails.clan.lore.rivals=&7Priešai\: &b{0} -gui.clandetails.clan.lore.founded=&7Įkurta\: &b{0} -gui.clandetails.clan.lore.inactive=&7Neaktyvumas\: &b{0}/{1} dienos -gui.clandetails.allies.title=&fAlijansas -gui.clandetails.allies.lore=&7Kairys-mygtukas peržiūrėti arba pridėti sąjungininkus -gui.clandetails.rivals.title=&fPriešai -gui.clandetails.rivals.lore=&7Kairys-mygtukas peržiūrėti arba pridėti priešus -gui.clandetails.roster.title=&fSąrašas -gui.clandetails.roster.lore=&7Kairys-mygtukas peržiūrėti sąjungos narius arba pakviesti į sąjungą -gui.staffclandetails.roster.lore=&7Kairys-mygtukas peržiūrėti sąjungos narius -gui.clandetails.coords.title=&fKoordinatės -gui.clandetails.coords.lore=&7Kairys-mygtukas peržiūrėti sąjungos narių koordinates -gui.clandetails.home.title=&fBazė -gui.clandetails.home.lore.teleport.price=&7Teleport kaina\: &b{0} -gui.clandetails.home.lore.teleport=&7Kairys-mygtukas teleportacija į sąjungos bazę -gui.staffclandetails.home.lore.teleport=&7Kairys-mygtukas teleportacija į šio sąjungos bazę -gui.clandetails.home.lore.clear=&7Norėdami panaikinti sąjungos bazę, išmeskite daiktą -gui.clandetails.home.lore.set.price=&7Nustatyti kainą\: &b{0} -gui.clandetails.home.lore.set=&7Dešinys-mygtukas nustatyti jūsų sąjungos bazę -gui.staffclandetails.home.lore.set=&7Dešinys-mygtukas nustatyti sąjungos bazę -gui.clandetails.regroup.title=NOMI -gui.clandetails.regroup.lore.price=&7Kaina\: &b{0} -gui.clandetails.regroup.lore.home=&7Kairys-mygtukas atkelti visus sąjungos narius į bazę -gui.clandetails.regroup.lore.me=&7Dešinys-mygtukas atkelti visus narius pas save -gui.clandetails.ff.title=&fFriendly Fire -gui.clandetails.ff.personal.lore=&7Asmeninis\: &b{0} -gui.clandetails.ff.clan.lore=&7Sąjunga\: &b{0} -gui.clandetails.ff.personal.toggle.lore=&7Kairys-mygtukas perjungti jūsų friendly-fire -gui.clandetails.ff.clan.toggle.lore=&7Dešinys-mygtukas perjungti jūsų sąjungos friendly-fire -gui.clandetails.bank.title=&fFondas -gui.clandetails.bank.balance.lore=&7Balansas\: &b{0} -gui.clandetails.bank.withdraw.status.lore=&7Nuimti\: &b{0} -gui.clandetails.bank.deposit.status.lore=&7Padėti\: &b{0} -gui.clandetails.bank.withdraw.toggle.lore=&7Norėdami perjungti pinigų nuėmimą išmeskite daiktą -gui.clandetails.bank.deposit.toggle.lore=&7Dešinys-mygtukas perjungti pinigų padėjimo funkciją -gui.clandetails.rank.title=&fRank -gui.clandetails.rank.lore=&7Kairys-mygtukas peržiūrėti sąjungos rankus ir redaguoti juos -gui.clandetails.verified.title=&fPatvirtinta -gui.clandetails.not.verified.title=&fNepatvirtinta -gui.clandetails.verify.price.lore=&7Kaina\: &b{0} -gui.clandetails.not.verified.lore=&7Kairys-mygtukas patvirtinti sąjungą -gui.staffclandetails.not.verified.lore=&7Kairys-mygtukas patvirtinti sąjungą -gui.clandetails.resign.title=&fPalikti -gui.clandetails.resign.lore=&7Kairys-mygtukas palikti sąjungą -gui.clandetails.disband.title=&fNaikinti -gui.clandetails.disband.lore=&7Norėdami panaikinti sąjungą, išmeskite daiktą -gui.staffclandetails.disband.lore=&7Kairys-mygtukas panaikinti sąjungą -gui.clandetails.chat.title=&fPokalbiai -gui.clandetails.chat.clan.chat.lore=&7/{0} [message] - &bPranešimas į sąjungos pokalbius -gui.clandetails.chat.clan.join.leave.lore=&7/{0} {1}/{2} - &bPrisijungia/Palieka sąjungos pokalbius -gui.clandetails.chat.ally.chat.lore=&7/{0} [message] - &bSiunčia pranešimą į alijanso pokalbius -gui.clandetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bPrisijungia/Palieka alijanso pokalbius -gui.clandetails.chat.clan.status.lore=&7Sąjunga\: &b{0} -gui.clandetails.chat.ally.status.lore=&7Alijansas\: &b{0} -gui.clandetails.chat.clan.toggle.lore=&7Kairys-mygtukas perjungti sąjungos pokalbių statusą -gui.clandetails.chat.ally.toggle.lore=&7Dešinys-mygtukas perjungti alijanso pokalbių statusą +gui.uniondetails.union.lore.rivals.separator=&b, +gui.uniondetails.union.lore.allies=&7Alijansas\: &b{0} +gui.uniondetails.union.lore.rivals=&7Priešai\: &b{0} +gui.uniondetails.union.lore.founded=&7Įkurta\: &b{0} +gui.uniondetails.union.lore.inactive=&7Neaktyvumas\: &b{0}/{1} dienos +gui.uniondetails.allies.title=&fAlijansas +gui.uniondetails.allies.lore=&7Kairys-mygtukas peržiūrėti arba pridėti sąjungininkus +gui.uniondetails.rivals.title=&fPriešai +gui.uniondetails.rivals.lore=&7Kairys-mygtukas peržiūrėti arba pridėti priešus +gui.uniondetails.roster.title=&fSąrašas +gui.uniondetails.roster.lore=&7Kairys-mygtukas peržiūrėti sąjungos narius arba pakviesti į sąjungą +gui.staffuniondetails.roster.lore=&7Kairys-mygtukas peržiūrėti sąjungos narius +gui.uniondetails.coords.title=&fKoordinatės +gui.uniondetails.coords.lore=&7Kairys-mygtukas peržiūrėti sąjungos narių koordinates +gui.uniondetails.home.title=&fBazė +gui.uniondetails.home.lore.teleport.price=&7Teleport kaina\: &b{0} +gui.uniondetails.home.lore.teleport=&7Kairys-mygtukas teleportacija į sąjungos bazę +gui.staffuniondetails.home.lore.teleport=&7Kairys-mygtukas teleportacija į šio sąjungos bazę +gui.uniondetails.home.lore.clear=&7Norėdami panaikinti sąjungos bazę, išmeskite daiktą +gui.uniondetails.home.lore.set.price=&7Nustatyti kainą\: &b{0} +gui.uniondetails.home.lore.set=&7Dešinys-mygtukas nustatyti jūsų sąjungos bazę +gui.staffuniondetails.home.lore.set=&7Dešinys-mygtukas nustatyti sąjungos bazę +gui.uniondetails.regroup.title=NOMI +gui.uniondetails.regroup.lore.price=&7Kaina\: &b{0} +gui.uniondetails.regroup.lore.home=&7Kairys-mygtukas atkelti visus sąjungos narius į bazę +gui.uniondetails.regroup.lore.me=&7Dešinys-mygtukas atkelti visus narius pas save +gui.uniondetails.ff.title=&fFriendly Fire +gui.uniondetails.ff.personal.lore=&7Asmeninis\: &b{0} +gui.uniondetails.ff.union.lore=&7Sąjunga\: &b{0} +gui.uniondetails.ff.personal.toggle.lore=&7Kairys-mygtukas perjungti jūsų friendly-fire +gui.uniondetails.ff.union.toggle.lore=&7Dešinys-mygtukas perjungti jūsų sąjungos friendly-fire +gui.uniondetails.bank.title=&fFondas +gui.uniondetails.bank.balance.lore=&7Balansas\: &b{0} +gui.uniondetails.bank.withdraw.status.lore=&7Nuimti\: &b{0} +gui.uniondetails.bank.deposit.status.lore=&7Padėti\: &b{0} +gui.uniondetails.bank.withdraw.toggle.lore=&7Norėdami perjungti pinigų nuėmimą išmeskite daiktą +gui.uniondetails.bank.deposit.toggle.lore=&7Dešinys-mygtukas perjungti pinigų padėjimo funkciją +gui.uniondetails.rank.title=&fRank +gui.uniondetails.rank.lore=&7Kairys-mygtukas peržiūrėti sąjungos rankus ir redaguoti juos +gui.uniondetails.verified.title=&fPatvirtinta +gui.uniondetails.not.verified.title=&fNepatvirtinta +gui.uniondetails.verify.price.lore=&7Kaina\: &b{0} +gui.uniondetails.not.verified.lore=&7Kairys-mygtukas patvirtinti sąjungą +gui.staffuniondetails.not.verified.lore=&7Kairys-mygtukas patvirtinti sąjungą +gui.uniondetails.resign.title=&fPalikti +gui.uniondetails.resign.lore=&7Kairys-mygtukas palikti sąjungą +gui.uniondetails.disband.title=&fNaikinti +gui.uniondetails.disband.lore=&7Norėdami panaikinti sąjungą, išmeskite daiktą +gui.staffuniondetails.disband.lore=&7Kairys-mygtukas panaikinti sąjungą +gui.uniondetails.chat.title=&fPokalbiai +gui.uniondetails.chat.union.chat.lore=&7/{0} [message] - &bPranešimas į sąjungos pokalbius +gui.uniondetails.chat.union.join.leave.lore=&7/{0} {1}/{2} - &bPrisijungia/Palieka sąjungos pokalbius +gui.uniondetails.chat.ally.chat.lore=&7/{0} [message] - &bSiunčia pranešimą į alijanso pokalbius +gui.uniondetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bPrisijungia/Palieka alijanso pokalbius +gui.uniondetails.chat.union.status.lore=&7Sąjunga\: &b{0} +gui.uniondetails.chat.ally.status.lore=&7Alijansas\: &b{0} +gui.uniondetails.chat.union.toggle.lore=&7Kairys-mygtukas perjungti sąjungos pokalbių statusą +gui.uniondetails.chat.ally.toggle.lore=&7Dešinys-mygtukas perjungti alijanso pokalbių statusą gui.playerdetails.title={0} gui.playerdetails.player.title=&f{0} -gui.playerdetails.player.lore.noclan=&7Sąjunga\: &bJoks -gui.playerdetails.player.lore.clan=&7Sąjunga\: &b[{0}&b] {1} +gui.playerdetails.player.lore.nounion=&7Sąjunga\: &bJoks +gui.playerdetails.player.lore.union=&7Sąjunga\: &b[{0}&b] {1} gui.playerdetails.player.lore.rank=&7Rank\: &b{0} gui.playerdetails.player.lore.status=&7Statusas\: &b{0} gui.playerdetails.player.lore.kdr=&7KDR\: &b{0} @@ -689,8 +688,8 @@ gui.playerdetails.player.lore.deaths=&7Mirtys\: &b{0} gui.playerdetails.player.lore.join.date=&7Prisijungė\: &b{0} gui.playerdetails.player.lore.last.seen=&7Paskutinį kartą matytas\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.playerdetails.player.lore.past.clans.separator=&b, -gui.playerdetails.player.lore.past.clans=&7Ankstesni sąjungos\: &b{0} +gui.playerdetails.player.lore.past.unions.separator=&b, +gui.playerdetails.player.lore.past.unions=&7Ankstesni sąjungos\: &b{0} gui.playerdetails.player.lore.inactive=&7Neaktyvumas\: &b{0}/{1} dienos gui.playerdetails.kick.title=&fIšspirti gui.playerdetails.promote.demote.title=&fPaaukštinti/Pažeminti @@ -714,55 +713,53 @@ gui.languageselector.title=Kalbos - esama\: {0} gui.languageselector.language.title=&f{0} gui.languageselector.language.lore.left.click=&7Kairys-mygtukas pasirinkti šią kalbą gui.languageselector.language.lore.translation.status=&7Vertimo būklė\: &b{0}% -gui.languageselector.language.lore.right.click=&7NOMI gui.confirmation.title=Patvirtinimas gui.confirmation.confirm=&7Spauskite norėdami patvirtinti gui.confirmation.return=&7Spauskite čia norėdami gryžti gui.not.supported=&cKlaida atidarant GUI... Ar plugino versija yra teisinga? -staff.member.verify.clan=&cNomi. lt administracija privalo patvirtinti jūsų sąjungą\! +staff.member.verify.union=&cNomi. lt administracija privalo patvirtinti jūsų sąjungą\! player.already.has.that.rank=&cŽaidėjas jau turi šį rank\! -joined.clan.chat=&bPrisijungei prie sąjungos pokalbių -already.joined.clan.chat=&bJūs jau prisijungę prie sąjungos pokalbių -left.clan.chat=&bPalikai sąjungos pokalbius -muted.clan.chat=&bUžtildei sąjungos pokalbius -unmuted.clan.chat=&bAtitildei sąjungos pokalbius +joined.union.chat=&bPrisijungei prie sąjungos pokalbių +already.joined.union.chat=&bJūs jau prisijungę prie sąjungos pokalbių +left.union.chat=&bPalikai sąjungos pokalbius +muted.union.chat=&bUžtildei sąjungos pokalbius +unmuted.union.chat=&bAtitildei sąjungos pokalbius joined.ally.chat=&bPrisijungei prie alijanso pokalbių left.ally.chat=&bPalikai alijanso pokalbius muted.ally.chat=&bUžtildei alijanso pokalbius unmuted.ally.chat=&bAtitildei sąjungos pokalbius already.joined.ally.chat=&bJūs jau prisijungęs prie alijanso pokalbio -player.already.in.this.clan=&cŽaidėjas jau yra šiame sąjungoje -your.clan.reached.max.alliances=&cJūsų sąjunga pasiekė maksimalų alijansų skaičių -other.clan.reached.max.alliances=&cSąjunga jau turi maksimalų alijansų skaičių -insert.clan.tag=&bĮveskite sąjungos Tag (arba "{0}")\: -insert.clan.name=&bĮveskite sąjungos pavadinimą\: +player.already.in.this.union=&cŽaidėjas jau yra šiame sąjungoje +your.union.reached.max.alliances=&cJūsų sąjunga pasiekė maksimalų alijansų skaičių +other.union.reached.max.alliances=&cSąjunga jau turi maksimalų alijansų skaičių +insert.union.tag=&bĮveskite sąjungos Tag (arba "{0}")\: +insert.union.name=&bĮveskite sąjungos pavadinimą\: insert.rank.name=&bĮveskite rank pavadinimą (arba "{0}")\: -click.to.help.translating=&bIšversta mc. nomi. lt\:\n&r{0} -your.clan.must.have.members.to.verify=&cJūsų sąjunga privalo tūrėti bent {0} narius, tam kad jūs būtumėte patvirtinti\! +your.union.must.have.members.to.verify=&cJūsų sąjunga privalo tūrėti bent {0} narius, tam kad jūs būtumėte patvirtinti\! you.must.hold.a.banner=&cPrivalai laikyti vėliavą savo rankose\! -you.changed.clan.banner=&bPakeitei sąjungos vėliavą\! -your.clan.already.verified=&cJūsų sąjunga jau yra patvirtintas\! +you.changed.union.banner=&bPakeitei sąjungos vėliavą\! +your.union.already.verified=&cJūsų sąjunga jau yra patvirtintas\! # suppress inspection "TrailingSpacesInProperty" -clan.profile=\n&b%clan_name%&7 profilis &8-------------mc. nomi. lt------------------------------\n \n &7Pavadinimas\: &e[&8%clan_color_tag%&e] &b%clan_name%\n &7Aprašymas\: &f%clan_description%\n &7Statusas\: &f%clan_status%\n &7Lyderiai\: %clan_leaders%\n &7Prisijungę nariai\: &f%clan_online_count%&7/&f%clan_size%\n &7KDR\: &e%clan_kdr%\n &7Viso nužudymų\: &8[Priešai\:&f%clan_rival_kills% &8Alijansas\:&f%clan_ally_kills% &8Neutralai\:&f%clan_neutral_kills% &8Civiliai\:&f%clan_civilian_kills%&8]\n &7Mirtys\: &f%clan_deaths%\n &7Sąjungininkai\: &f%clan_allies%\n &7Priešai\: &f%clan_rivals%\n &7Įkurta\: &f%clan_founded%\n &7Neaktyvumas\: &f%clan_inactive_days%&7/&f%clan_max_inactive_days% dienų\n -player.lookup.clanname=&e[&8%clan_color_tag%&e] &b%clan_name% +union.profile=\n&b%union_name%&7 profilis &8-------------mc. nomi. lt------------------------------\n \n &7Pavadinimas\: &e[&8%union_color_tag%&e] &b%union_name%\n &7Aprašymas\: &f%union_description%\n &7Statusas\: &f%union_status%\n &7Prisijungę nariai\: &f%union_online_count%&7/&f%union_size%\n &7KDR\: &e%union_kdr%\n &7Viso nužudymų\: &8[Priešai\:&f%union_rival_kills% &8Alijansas\:&f%union_ally_kills% &8Neutralai\:&f%union_neutral_kills% &8Civiliai\:&f%union_civilian_kills%&8]\n &7Mirtys\: &f%union_deaths%\n &7Sąjungininkai\: &f%union_allies%\n &7Priešai\: &f%union_rivals%\n &7Įkurta\: &f%union_founded%\n &7Neaktyvumas\: &f%union_inactive_days%&7/&f%union_max_inactive_days% dienų\n +player.lookup.unionname=&e[&8%union_color_tag%&e] &b%union_name% # suppress inspection "TrailingSpacesInProperty" player.lookup.killtype=&7Nužudimo tipas\: %player_kill_type% -player.lookup=\n&b%player_name%&7''s informacija &8------mc. nomi. lt-------------------------------------\n \n &7Sąjunga\: &f%clan_name%\n &7Rank\: &f%player_rank%\n &7Statusas\: &f%player_status%\n &7KDR\: &e%player_kdr%\n &7Viso nužudymų\: &8[Priešai\:&f%player_rival_kills% &8Allijansas\:&7%player_ally_kills% &8Neutralai\:&f%player_neutral_kills% &8Civiliai\:&f%player_civilian_kills%&8]\n &7Mirtys\: &f%player_deaths%\n &7Prisijungė\: &f%player_join_date%\n &7Paskutinį kartą buvo\: &f%player_last_seen%\n &7Buvę sąjungos\: &f%player_past_clans%\n &7Neaktyvus\: &f%player_inactive_days%&7/&f%player_max_inactive_days% dienų\n %kill_type_line% +player.lookup=\n&b%player_name%&7''s informacija &8------mc. nomi. lt-------------------------------------\n \n &7Sąjunga\: &f%union_name%\n &7Statusas\: &f%player_status%\n &7KDR\: &e%player_kdr%\n &7Viso nužudymų\: &8[Priešai\:&f%player_rival_kills% &8Allijansas\:&7%player_ally_kills% &8Neutralai\:&f%player_neutral_kills% &8Civiliai\:&f%player_civilian_kills%&8]\n &7Mirtys\: &f%player_deaths%\n &7Prisijungė\: &f%player_join_date%\n &7Paskutinį kartą buvo\: &f%player_last_seen%\n &7Buvę sąjungos\: &f%player_past_unions%\n &7Neaktyvus\: &f%player_inactive_days%&7/&f%player_max_inactive_days% dienų\n %kill_type_line% economy.disabled=&cEconomy išjungta\! has.been.purged={0} duomenys buvo išvalyti accepted.invitation=&bPriemei {0} pakvietimą denied.invitation=&cAtšaukei &f{0} &cpakvietimą -must.be.in.clan.to.pvp=&cTu ir {0} privalote būti sąjungos nariais norėdami Pvp\! -clans.not.at.war.pvp.denied=&cJūsų sąjunga nekariauja su {0}\! +must.be.in.union.to.pvp=&cTu ir {0} privalote būti sąjungos nariais norėdami Pvp\! +unions.not.at.war.pvp.denied=&cJūsų sąjunga nekariauja su {0}\! cannot.attack.civilians=&cNegali atakuoti paprastų civilių\! -cannot.attack.clan.member=&cNegali atakuoti kitų sąjungų narių\! +cannot.attack.union.member=&cNegali atakuoti kitų sąjungų narių\! cannot.attack.ally=&cNegali atakuoti savo sąjungos narių\! cannot.send.discord.message=Negali siūsti pranešimų į {0}. Neesi šio sąjungos narys\! discordhook.is.disabled=&Discord integracija yra išjungta arba nepasiekiama\! -your.clan.doesnt.have.any.linked.player=Jūsų sąjunga neturi susietų žaidėjų -your.clan.doesnt.have.minimum.linked.player=Jūsų sąjunga neturi minimalaus susietų žaidėjų skaičiaus -your.clan.is.not.on.the.whitelist=Tavo sąjunga nėra įtrauktas į whitelist -your.clan.already.has.channel=Tavo sąjunga jau turi discord kanalą +your.union.doesnt.have.any.linked.player=Jūsų sąjunga neturi susietų žaidėjų +your.union.doesnt.have.minimum.linked.player=Jūsų sąjunga neturi minimalaus susietų žaidėjų skaičiaus +your.union.is.not.on.the.whitelist=Tavo sąjunga nėra įtrauktas į whitelist +your.union.already.has.channel=Tavo sąjunga jau turi discord kanalą discord.reached.category.limit=Discord pasiekė kategorijų limitą\! discord.reached.channels.limit=Discordas pasiekė kanalų limitą\! discord.created.successfully=&Discord kanalas sukurtas sėkmingai\! @@ -772,19 +769,19 @@ cannot.kick.last.leader=&cNegali išspirti paskutinio lyderio\! cannot.disband.permanent=&cNegali sunaikinti šio sąjungos. Jis turi amžiną statusą. you.can.only.set.base.in.your.land=&cNusistatyti namus galite tik savo sklype\! only.leaders.can.create.lands=&cTik lyderiai gali kurti sklypus\! -only.one.land.per.clan=&cTavo sąjunga jau turi sklypą\! -only.clan.members.can.create.lands=&cTik sąjungos nariai gali kurti sklypus\! +only.one.land.per.union=&cTavo sąjunga jau turi sklypą\! +only.union.members.can.create.lands=&cTik sąjungos nariai gali kurti sklypus\! land.allowed.all.actions=&bVisi veiksmai dabar yra leidžiami\! land.blocked.all.actions=&bVisi veiksmai dabar yra blokuojami\! land.allowed.action=&bVeiksmas leidžiamas\! land.blocked.action=&bVeiksmas uždraustas\! you.do.not.own.lands=&cJūs neturite nuosavos žemės\! land.sharing.disabled=&cŽemės dalinimasis yra išjungtas\! -clan.chat.disabled=&cSąjungos pokalbiai yra išjungti\! +union.chat.disabled=&cSąjungos pokalbiai yra išjungti\! ally.chat.disabled=Alijanso pokalbiai yra išjungti\! war.expired=Karas su {0} nebegalioja\! you.cant.start.war.online.members.difference=Negali pradėti karto. Sąjungos turi didelį skirtumą prisijungusių narių skaičiumi. invitedplayer.invite.off=Žaidėjas yra išjungęs pakvietimus į sąjungą user.hasnt.played.before=&cŠis žaidėjas dar nėra žaidęs -clan.list.balance.header=\n{0} &7top balansas &8-----------------------\n \n&8Viso sąjungų\: &7{1}\n \n&8\#&7. &8Sąjunga &7- &8Balansas -clan.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} +union.list.balance.header=\n{0} &7top balansas &8-----------------------\n \n&8Viso sąjungų\: &7{1}\n \n&8\#&7. &8Sąjunga &7- &8Balansas +union.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} diff --git a/src/main/resources/messages_nl_NL.properties b/src/main/resources/messages_nl_NL.properties index 1f2c44ba..5660b78b 100644 --- a/src/main/resources/messages_nl_NL.properties +++ b/src/main/resources/messages_nl_NL.properties @@ -65,7 +65,7 @@ admin.command=beheerder mod.command=mod promote.command=promoten demote.command=degradeer -clanff.command=clanff +unionff.command=unionff ff.command=ff resign.command=opzeggen disband.command=ontbinden @@ -104,7 +104,7 @@ acf-core.parameter.tag=label acf-core.parameter.name=naam acf-core.parameter.description=beschrijving acf-core.parameter.player=speler -acf-core.parameter.clan=unie +acf-core.parameter.union=unie acf-core.parameter.type=type acf-core.parameter.order=bestelling acf-core.parameter.help=pagina of trefwoorden @@ -147,8 +147,8 @@ command.description.ff.allow=Stelt je persoonlijke vriendelijke vuur naar toesta command.description.ff.auto=Stelt je persoonlijke vriendelijke vuur naar automatisch command.description.globalff.allow=Stelt je globale vriendelijke vuur naar toestaan command.description.globalff.auto=Stelt je globale vriendelijke vuur naar automatisch -command.description.clanff.allow=Stelt je unie''s persoonlijke vriendelijke vuur naar toestaan -command.description.clanff.block=Stelt je unie''s persoonlijke vriendelijke vuur naar geblokkeerd +command.description.unionff.allow=Stelt je unie''s persoonlijke vriendelijke vuur naar toestaan +command.description.unionff.block=Stelt je unie''s persoonlijke vriendelijke vuur naar geblokkeerd command.description.description=Stel je unieomschrijving in command.description.ban=Verbied een speler van uniecommando''s command.description.unban=Deblokkeert een speler van uniecommando''s @@ -176,7 +176,7 @@ command.description.untrust=Vertrouwt een lid niet command.description.resign=Neemt ontslag uit je unie command.description.help=Toont deze hulp of zoekt in de help command.description.ally.add=Voeg een bondgenoot toe -command.description.clan=Opent de GUI +command.description.union=Opent de GUI command.description.disband=Beëindig je unie command.description.mod.disband=Beëindig een unie command.description.mod.kick=Verwijdert een lid uit je unie @@ -231,7 +231,7 @@ command.description.locale=Kies je taal home-menu=/{0} home{1} - Teleport naar home van unie home-set-menu=/{0} home set{1} - Stel de home van de unie'' in home-clear-menu=/{0} home clear{1} - Verwijder de home base van de unies -clan=Unie +union=Unie allies=Bondgenoten alliances=alliantie coords=coördinaten @@ -241,7 +241,7 @@ coords.upper=Coördinaten world=Wereld kdr=KDR members=Leden -clans.lower=unies +unions.lower=unies rival=Rivaal civilian=Burger neutral=Neutraal @@ -285,9 +285,9 @@ nokillsfound=Geen doden gevonden promoted.to.leader={0} is gepromoveerd tot leider denied.demotion={0} heeft de demotie van {1} geweigerd. Consensus is mislukt. membership.invitation={0} heeft lidmaatschap uitnodiging geweigerd -joined.the.clan={0} heeft zich aangesloten bij de unie +joined.the.union={0} heeft zich aangesloten bij de unie signed.off.request.cancelled={0} is afgemeld. {1} verzoek geannuleerd. -clan.deletion={0} heeft de unie verwijdering geweigerd. Consensus is mislukt. +union.deletion={0} heeft de unie verwijdering geweigerd. Consensus is mislukt. has.been.disbanded=Unie {0} is verwijderd denied.the.promotion={0} heeft promotie van {1} geweigerd. Consensus is mislukt. demoted.back.to.member={0} is teruggezet naar lid @@ -320,9 +320,9 @@ mysql.connection.failed=MySQL verbinding mislukt sqlite.connection.successful=SQLite verbinding succesvol sqlite.connection.failed= SQLite verbinding mislukt purging.player.data=verwijder speler''s gegevens\: {0} -purging.clan=Unie verwijderen\: {0} -clan.players=Unie spelers\: {0} -clans=Unies\: {0} +purging.union=Unie verwijderen\: {0} +union.players=Unie spelers\: {0} +unions=Unies\: {0} banned=Je bent verbannen van het gebruik van unie commando''s nothing.more.to.see=Niets meer te bekijken nothing.to.vote=&cNiets te accepteren of weigeren @@ -334,71 +334,71 @@ voted.to.accept={0} heeft gestemd om te accepteren bulletin.board.header=&8* &e{0} &fmededelingenbord has.been.disbanded.rivalry.ended={0} is beëindigt. Rivaliteit is geëindigd. has.been.disbanded.alliance.ended={0} is beëindigt. Alliantie is geëindigd. -clan.disbanded=Unie verwijderd +union.disbanded=Unie verwijderd 1.color.day=1 {0}dag many.color.days={0}{1} dagen insufficient.permissions=Onvoldoende rechten -clan.is.not.verified=Unie is niet geverifieerd -player.not.a.member.of.any.clan=&cDe speler is geen lid van een unie -not.a.member.of.any.clan=Je bent geen lid van een unie +union.is.not.verified=Unie is niet geverifieerd +player.not.a.member.of.any.union=&cDe speler is geen lid van een unie +not.a.member.of.any.union=Je bent geen lid van een unie minimum.to.make.alliance=Je unie moet ten minste {0} spelers hebben om allianties te kunnen maken -cannot.be.same.clan=&cU moet een andere unie dan die van jou invoegen\! -other.clan.not.verified=&cDe andere unie is niet geverifieerd\! -your.clans.are.not.allies=Jouw unies zijn geen bondgenoten +cannot.be.same.union=&cU moet een andere unie dan die van jou invoegen\! +other.union.not.verified=&cDe andere unie is niet geverifieerd\! +your.unions.are.not.allies=Jouw unies zijn geen bondgenoten has.broken.the.alliance={0} heeft de alliantie met {1} gebroken at.least.one.leader.accept.the.alliance=Ten minste één leider van de geallieerden moet online zijn om de alliantie te accepteren leaders.have.been.asked.for.an.alliance={0} leiders zijn gevraagd om een alliantie -your.clans.are.already.allies=Jullie unies zijn al bondgenoten -your.clan.cannot.create.rivals=Je unie kan geen rivalen maken +your.unions.are.already.allies=Jullie unies zijn al bondgenoten +your.union.cannot.create.rivals=Je unie kan geen rivalen maken min.players.rivalries=Je kloon moet ten minste {0} spelers hebben om rivaliteit te maken this.player.is.already.banned=Deze speler is al verbannen player.added.to.banned.list=Speler toegevoegd aan verbannen lijst you.banned=Je bent verbannen van unie commando''s -clan.wide.friendly.fire.blocked=Onderling pvp is niet toegestaan -clan.wide.friendly.fire.is.allowed=Onderling pvp is toegestaan +union.wide.friendly.fire.blocked=Onderling pvp is niet toegestaan +union.wide.friendly.fire.is.allowed=Onderling pvp is toegestaan you.are.the.only.member.online=U bent het enige lid online -your.clan.color.tag.cannot.be.longer.than.characters=&cJouw unie''s gekleurde tag mag niet langer zijn dan {0} tekens +your.union.color.tag.cannot.be.longer.than.characters=&cJouw unie''s gekleurde tag mag niet langer zijn dan {0} tekens you.cannot.set.colored.ranks=U kunt geen gekleurde gelederen instellen -your.clan.name.cannot.be.longer.than.characters=De naam van je unie''s mag niet langer zijn dan {0} tekens -your.clan.name.must.be.longer.than.characters=De naam van je unie''s moet langer zijn dan {0} tekens -your.clan.name.cannot.contain.color.codes=Uw unie''s naam mag geen kleurcodes bevatten +your.union.name.cannot.be.longer.than.characters=De naam van je unie''s mag niet langer zijn dan {0} tekens +your.union.name.must.be.longer.than.characters=De naam van je unie''s moet langer zijn dan {0} tekens +your.union.name.cannot.contain.color.codes=Uw unie''s naam mag geen kleurcodes bevatten you.must.first.resign=Je moet eerst aftreden uit {0} -clan.with.this.tag.already.exists=Er bestaat al een unie met deze tag -get.your.clan.verified.to.access.advanced.features=Krijg je unie geverifieerd om toegang te krijgen tot geavanceerde functies -clan.created=Unie {0} gemaakt +union.with.this.tag.already.exists=Er bestaat al een unie met deze tag +get.your.union.verified.to.access.advanced.features=Krijg je unie geverifieerd om toegang te krijgen tot geavanceerde functies +union.created=Unie {0} gemaakt not.enough.leaders.online.to.vote.on.demotion=Er zijn niet genoeg leiders online om op deze demotie te stemmen demotion.vote.has.been.requested.from.all.leaders=Alle leiders zijn gevraagd voor de stemming over de demotie -player.is.not.a.leader.of.your.clan=De speler is geen leider van je unie +player.is.not.a.leader.of.your.union=De speler is geen leider van je unie player.is.not.a.leader=Deze speler is niet de leider van de unie -clan.has.been.disbanded=Unie {0} is verwijderd -clan.disband.vote.has.been.requested.from.all.leaders=Alle leiders zijn gevraagd voor de stemming over het verwijderen van de unie -friendy.fire.is.now.managed.by.your.clan=Onderlinge pvp wordt nu beheerd door je unie +union.has.been.disbanded=Unie {0} is verwijderd +union.disband.vote.has.been.requested.from.all.leaders=Alle leiders zijn gevraagd voor de stemming over het verwijderen van de unie +friendy.fire.is.now.managed.by.your.union=Onderlinge pvp wordt nu beheerd door je unie personal.friendly.fire.is.set.to.allowed=Onderlinge pvp is ingesteld op toegestaan -global.friendy.fire.is.now.managed.by.each.clan=Wereldwijde onderlinge pvp wordt nu beheerd door elke unie -global.friendy.fire.is.already.being.managed.by.each.clan=Wereldwijde onderlinge pvp wordt al beheerd door elke unie +global.friendy.fire.is.now.managed.by.each.union=Wereldwijde onderlinge pvp wordt nu beheerd door elke unie +global.friendy.fire.is.already.being.managed.by.each.union=Wereldwijde onderlinge pvp wordt al beheerd door elke unie global.friendly.fire.is.set.to.allowed=Onderlinge pvp is ingesteld op toegestaan global.friendly.fire.is.already.being.allowed=Onderlinge pvp is ingesteld op niet toegestaan -the.player.doesn.t.not.have.the.permissions.to.join.clans=De speler heeft niet de juiste rechten om de unie te joinen +the.player.doesn.t.not.have.the.permissions.to.join.unions=De speler heeft niet de juiste rechten om de unie te joinen you.cannot.invite.yourself=Je kunt jezelf niet uitnodigen you.did.not.answer.in.time=Je hebt niet op tijd geantwoord, annuleren... -this.player.is.banned.from.using.clan.commands=Deze speler is verbannen van het gebruik van unie commando''s -the.player.is.already.member.of.another.clan=De speler is al lid van een andere unie +this.player.is.banned.from.using.union.commands=Deze speler is verbannen van het gebruik van unie commando''s +the.player.is.already.member.of.another.union=De speler is al lid van een andere unie has.been.asked.to.join={0} is gevraagd om toe te treden tot {1} you.cannot.kick.yourself=Je kan jezelf niet verwijderen -the.player.is.not.a.member.of.your.clan=De speler is geen lid van je unie +the.player.is.not.a.member.of.your.union=De speler is geen lid van je unie you.cannot.kick.another.leader=Je kan geen andere leider kicken has.been.kicked.by={0} is eruit gekicked door {1} -no.clans.have.been.created=Er zijn geen unies aangemaakt -total.clans=Totale unies\: +no.unions.have.been.created=Er zijn geen unies aangemaakt +total.unions=Totale unies\: legend=Legenda\: kill.type.civilian=Kill Type\: {0}Civilian no.player.data.found=Geen spelersgegevens gevonden -clan.0=Unie\: {0} +union.0=Unie\: {0} status.0=Status\:{0} rank.0=Rank\: {0} kdr.0=KDR\: {0} inactive.0=Inactief\: {0} -clan.commands=unie commando''s +union.commands=unie commando''s you.can.only.modify.the.color.and.case.of.the.tag=Je kunt alleen de kleur en het uiterlijk van de tag aanpassen locale.has.been.changed=Je taalkeuze is veranderd locale.is.prohibited=Taalkeuze is verboden op deze server @@ -410,11 +410,11 @@ leaders.0=Leiders\: {0} allies.0=Bondgenoten\: {0} rivals.0=Rivalen\: {0} other.player.must.be.online=&cDe speler moet online zijn\! -the.player.does.not.have.the.permissions.to.lead.a.clan=De speler heeft niet de machtigingen om een unie te leiden +the.player.does.not.have.the.permissions.to.lead.a.union=De speler heeft niet de machtigingen om een unie te leiden you.cannot.promote.yourself=Je kunt jezelf niet promoveren the.player.is.already.a.leader=De speler is al een leider configuration.reloaded=Configuratie is herladen -last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.clan=Laatste leider kan niet aftreden. Je moet een andere leider aanwijzen of de unie verwijderen +last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.union=Laatste leider kan niet aftreden. Je moet een andere leider aanwijzen of de unie verwijderen 0.has.resigned={0} is afgetreden you.cannot.trust.yourself=Je kunt jezelf niet vertrouwen leaders.are.already.trusted=Leiders zijn al vertrouwd @@ -422,23 +422,23 @@ this.player.is.already.trusted=Deze speler is al vertrouwd has.been.given.trusted.status.by={0} heeft een vertrouwde status gekregen door {1} this.player.is.not.banned=Deze speler is niet verbannen player.removed.from.the.banned.list=Speler verwijderd van de gebande lijst -you.have.been.unbanned.from.clan.commands=Je bent niet meer verbannen van unie commando''s +you.have.been.unbanned.from.union.commands=Je bent niet meer verbannen van unie commando''s you.cannot.untrust.yourself=Je kunt jezelf niet ontvertrouwen leaders.cannot.be.untrusted=Leiders kunnen niet onvertrouwd worden this.player.is.already.untrusted=Deze speler is al niet vertrouwd has.been.given.untrusted.status.by={0} heeft een niet-vertrouwde status gekregen door {1} -the.clan.does.not.exist=De unie bestaat niet -the.clan.is.already.verified=De kloon is al geverifieerd -the.clan.has.been.verified=De unie is geverifieerd -clan.0.has.been.verified=Unie {0} is geverifieerd\! -total.clan.players.0=Totaal aantal unie spelers\: {0} +the.union.does.not.exist=De unie bestaat niet +the.union.is.already.verified=De kloon is al geverifieerd +the.union.has.been.verified=De unie is geverifieerd +union.0.has.been.verified=Unie {0} is geverifieerd\! +total.union.players.0=Totaal aantal unie spelers\: {0} proposing.war={0} stelt voor om een oorlog te beginnen met {1} you.can.only.start.war.with.rivals=Je kunt alleen oorlog beginnen met rivalen leaders.have.been.asked.to.accept.the.war.request={0} leiders zijn gevraagd om het oorlogsverzoek te accepteren leaders.asked.to.end.rivalry={0} leiders zijn gevraagd om de oorlog te beëindigen proposing.to.end.the.war={0} stelt voor om de oorlog met {1} te beëindigen -clans.already.at.war=Jullie unies zijn al in oorlog -clans.not.at.war=Jullie unies zijn niet in oorlog +unions.already.at.war=Jullie unies zijn al in oorlog +unions.not.at.war=Jullie unies zijn niet in oorlog you.are.at.war={0} is nu in oorlog met {1} denied.war.req={0} weigerde het oorlogsverzoek verzonden door {1} you.are.no.longer.at.war={0} is niet langer in oorlog met {1} @@ -466,12 +466,12 @@ diamond=diamond gold=gold wood=wood server.announce=Server aankondigen -clan.announce=Unie Aankondiging +union.announce=Unie Aankondiging leader.announce=Leider Aankondiging hunger=Honger stone=stone iron=iron -the.clan.cannot.be.rivaled=De unie kan niet rivaleerd worden +the.union.cannot.be.rivaled=De unie kan niet rivaleerd worden bboff=BB uitgeschakeld bbon=BB ingeschakeld inviteon=Uitnodigingen aangezet @@ -494,25 +494,25 @@ waiting.for.teleport.stand.still.for.0.seconds=Wachten op teleportatie, blijf st on=aan off=uit player.rank.changed=Rank is ingesteld -your.clans.are.already.rivals=Je unies zijn al rivalen +your.unions.are.already.rivals=Je unies zijn al rivalen cleared.bb=Het bulletin board is gewist -clan.balance=Unie-Balans\: {0} -clan.admin.balance={0}''s saldo\: {1} -bb.clan.deposit={0} zijn gestort door {1} -player.clan.deposit=Je hebt {0} gestort -bb.clan.withdraw={0} zijn opgenomen door {1} -bb.clan.take={0} zijn afgenomen door {1} -bb.clan.give={0} zijn gegeven door {1} -bb.clan.set={0} zijn ingesteld door {1} -player.clan.withdraw=Je neemt {0} op -clan.admin.take=Je nam {0} van {1}''s bank -clan.admin.give=Je gaf {0} aan {1}''s bank -clan.admin.set=U heeft de bankbalans van {0} ingesteld op {1} -clan.admin.bank.not.enough.money=De bank van {0} heeft niet genoeg geld\! -clan.bank.not.enough.money=Je unies bank heeft niet genoeg geld -your.clans.are.not.rivals=Jullie unies zijn geen rivalen -the.clan.members.reached.limit=Je unie heeft de ledenlimiet bereikt -this.clan.has.reached.the.member.limit=&bDeze unie heeft het ledenlimiet bereikt +union.balance=Unie-Balans\: {0} +union.admin.balance={0}''s saldo\: {1} +bb.union.deposit={0} zijn gestort door {1} +player.union.deposit=Je hebt {0} gestort +bb.union.withdraw={0} zijn opgenomen door {1} +bb.union.take={0} zijn afgenomen door {1} +bb.union.give={0} zijn gegeven door {1} +bb.union.set={0} zijn ingesteld door {1} +player.union.withdraw=Je neemt {0} op +union.admin.take=Je nam {0} van {1}''s bank +union.admin.give=Je gaf {0} aan {1}''s bank +union.admin.set=U heeft de bankbalans van {0} ingesteld op {1} +union.admin.bank.not.enough.money=De bank van {0} heeft niet genoeg geld\! +union.bank.not.enough.money=Je unies bank heeft niet genoeg geld +your.unions.are.not.rivals=Jullie unies zijn geen rivalen +the.union.members.reached.limit=Je unie heeft de ledenlimiet bereikt +this.union.has.reached.the.member.limit=&bDeze unie heeft het ledenlimiet bereikt you.have.reseted.your.kdr=Je hebt je KDR gereset you.have.reseted.0.kdr=Je hebt de KDR van {0} gereset you.have.reseted.kdr.of.all.players=Je hebt de KDR van alle spelers gereset @@ -538,11 +538,11 @@ bb.one.hour=1 uur bb.days= Notitie bord bb.one.day=1 dag player.purged=De speler is met succes verwijderd -your.clan.description.must.be.longer.than=Je unie beschrijving moet langer zijn dan {0} tekens -your.clan.description.cannot.be.longer.than=Je unie beschrijving mag niet langer zijn dan {0} tekens +your.union.description.must.be.longer.than=Je unie beschrijving moet langer zijn dan {0} tekens +your.union.description.cannot.be.longer.than=Je unie beschrijving mag niet langer zijn dan {0} tekens description.changed=Je hebt je unie''s beschrijving met succes gewijzigd no.description=Geen omschrijving -the.player.must.wait.0.before.joining.your.clan.again=Deze speler moet {0} minu(u)t(en) wachten voordat hij weer aan je unie kan deelnemen +the.player.must.wait.0.before.joining.your.union.again=Deze speler moet {0} minu(u)t(en) wachten voordat hij weer aan je unie kan deelnemen disabled.command=Command uitgeschakeld rank.displayname.updated=De weergavenaam van rank is bijgewerkt\! rank.setdefault=De standaard rank van de unie''s is nu ingesteld op {0} @@ -555,17 +555,17 @@ rank.created=Rank aangemaakt permission.0.added.to.rank.1=Rechten {0} toegevoegd aan rank {1} permission.0.removed.from.rank.1=Toestemming {0} verwijderd uit rank {1} rank.0.deleted=Rang {0} verwijderd -clans.ranks=Unie''s ranks\: +unions.ranks=Unie''s ranks\: ranks.list.item={0}\# {1} ({2}) no.ranks=Er zijn geen rangen gemaakt rank.no.permissions=Deze rank heeft geen toestemming player.unassigned.from.rank=Rank van speler weggehaald you.must.be.0.or.have.the.permission.1.to.use.this=Je moet {0} zijn of je leider moet je rang {1} toestemming geven om dit te gebruiken -deposit.not.allowed=Storten is niet toegestaan, gebruik /%clan %toggle %deposit om toe te staan -withdraw.not.allowed=Opnemen is niet toegestaan, gebruik /%clan %toggle %withdraw om toe te staan +deposit.not.allowed=Storten is niet toegestaan, gebruik /%union %toggle %deposit om toe te staan +withdraw.not.allowed=Opnemen is niet toegestaan, gebruik /%union %toggle %withdraw om toe te staan resign.request.cancelled=Verzoek geannuleerd disband.request.cancelled=Ontbindingsaanvraag geannuleerd -clan.create.request.cancelled=Aanmaken verzoek geannuleerd +union.create.request.cancelled=Aanmaken verzoek geannuleerd rank.create.request.cancelled=Aanmaken verzoek geannuleerd promotion.vote.has.been.requested.from.all.leaders=Er is van alle leiders om stemming gevraagd allowed=toegestaan @@ -581,11 +581,10 @@ gui.lore.no.permission=&cJe hebt geen toestemming om dit te zien\! gui.main.title={0} - unie menu gui.main.languageselector.title=&fSelecteer je taal gui.main.languageselector.lore.left.click=&7Linksklik om je taal te selecteren -gui.main.languageselector.lore.right.click=&7Rechtsklik om te helpen met vertalen gui.main.other.commands.title=&fAndere commando''s gui.main.other.commands.lore=&7Links-klik om alle unie commando''s te zien -gui.main.clan.list.title=&fUnie Lijst -gui.main.clan.list.lore=&7Linksklik om de unie lijst te zien +gui.main.union.list.title=&fUnie Lijst +gui.main.union.list.lore=&7Linksklik om de unie lijst te zien gui.main.reset.kdr.title=&fReset KDR gui.main.reset.kdr.lore=&7Linksklik om je KDR te resetten gui.main.leaderboard.title=&fLeaderboard @@ -593,8 +592,8 @@ gui.main.leaderboard.lore=&7Linksklik om het scorebord te zien gui.main.staff.title=&fStaff gui.main.staff.lore=&7Linksklik om het staffmenu te openen gui.staff.title=Staff -gui.staff.clan.list.lore.left.click=&7Linksklik om alle unies te zien -gui.staff.clan.list.lore.right.click=&7Rechtsklik om alle niet geverifieerde unies te zien +gui.staff.union.list.lore.left.click=&7Linksklik om alle unies te zien +gui.staff.union.list.lore.right.click=&7Rechtsklik om alle niet geverifieerde unies te zien gui.player.list.title=Spelerslijst gui.staff.player.list.title=&fSpeler Lijst gui.staff.player.list.lore.left.click=&7Linksklik om alle spelers te zien @@ -604,8 +603,8 @@ gui.staff.global.ff.lore.status=&7Status\: &b{0} gui.staff.global.ff.lore.toggle=&7Linksklik om de onderlinge PvP in of uit te schakelen gui.staff.reload.title=&fHerladen gui.staff.reload.lore=&7Linksklik om de plug-in te herladen -gui.staff.clanlist.unverified.title=Niet-geverifieerde Unies - Totaal\: {0} -gui.staff.clanlist.toplace.title=Selecteer de nieuwe unie van {0} +gui.staff.unionlist.unverified.title=Niet-geverifieerde Unies - Totaal\: {0} +gui.staff.unionlist.toplace.title=Selecteer de nieuwe unie van {0} gui.warning.title=Waarschuwing gui.warning.no.permission.title=&fGeen toestemming gui.warning.no.permission.plugin.lore=&7Je hebt hier geen toestemming voor\! @@ -614,20 +613,20 @@ gui.warning.no.permission.rank.lore=&7Je moet {0} zijn of je leider moet je rang gui.warning.not.verified.title=&fNiet geverifieerd gui.warning.not.verified.lore=&7Je unie moet worden geverifieerd\! gui.allies.title=Bondgenoten -gui.allies.clan.lore=&7Rechtsklik om deze bondgenoot te verwijderen +gui.allies.union.lore=&7Rechtsklik om deze bondgenoot te verwijderen gui.allies.add.title=&fVoeg een bondgenoot toe gui.add.ally.title=Een bondgenoot toevoegen -gui.add.ally.clan.lore=&7Linksklik om deze unie te allieren +gui.add.ally.union.lore=&7Linksklik om deze unie te allieren gui.rivals.title=Rivalen -gui.rivals.clan.lore=&7Rechtsklik om deze rivaal te verwijderen +gui.rivals.union.lore=&7Rechtsklik om deze rivaal te verwijderen gui.rivals.add.title=&fVoeg rivaal toe gui.add.rival.title=Een rivaal toevoegen -gui.add.rival.clan.lore=&7Linksklik om deze unie te rivalen -gui.clanlist.title=Unies - Totaal\: {0} -gui.clanlist.clan.title=&fUnie\: [{0}&f] {1} -gui.clanlist.clan.lore.position=&b\#{0} -gui.clanlist.clan.lore.kdr=&7KDR\: &b{0} -gui.clanlist.clan.lore.members=&7Leden\: &b{0} +gui.add.rival.union.lore=&7Linksklik om deze unie te rivalen +gui.unionlist.title=Unies - Totaal\: {0} +gui.unionlist.union.title=&fUnie\: [{0}&f] {1} +gui.unionlist.union.lore.position=&b\#{0} +gui.unionlist.union.lore.kdr=&7KDR\: &b{0} +gui.unionlist.union.lore.members=&7Leden\: &b{0} gui.coords.title=Coördinaten gui.coords.player.lore.distance=&7Afstand\: &b{0} gui.coords.player.lore.coords=&7Coördinaten\: &b{0} {1} {2} @@ -657,83 +656,83 @@ gui.permissions.permission.lore=&7Rechtsklik om deze toestemming van de rank te gui.add.permission.title=Machtiging toevoegen gui.add.permission.permission.title=&f{0} gui.add.permission.permission.lore=&7Linksklik om deze permissie toe te voegen aan de rank -gui.clandetails.title=[{0}] {1} -gui.clandetails.free.agent.title=&fFree Agent -gui.clandetails.free.agent.create.clan.price.lore=&7Prijs\: &b{0} -gui.clandetails.free.agent.create.clan.lore=&7Linksklik om een unie te maken -gui.clandetails.clan.title=&f[{0}&f] {1} -gui.clandetails.clan.lore.description=&7Omschrijving\: &b{0} -gui.clandetails.clan.lore.status=&7Status\: &b{0} -gui.clandetails.clan.lore.leaders=&7Leiders\: &b{0} -gui.clandetails.clan.lore.online.members=&7Online Leden\: &b{0}/{1} -gui.clandetails.clan.lore.kdr=&7KDR\: &b{0} -gui.clandetails.clan.lore.kill.totals=&7Dood Totalen\: &b[Rivaal\:{0} Neutraal\:{1} Beschaving\:{2}] -gui.clandetails.clan.lore.deaths=&7Deaths\: &b{0} +gui.uniondetails.title=[{0}] {1} +gui.uniondetails.free.agent.title=&fFree Agent +gui.uniondetails.free.agent.create.union.price.lore=&7Prijs\: &b{0} +gui.uniondetails.free.agent.create.union.lore=&7Linksklik om een unie te maken +gui.uniondetails.union.title=&f[{0}&f] {1} +gui.uniondetails.union.lore.description=&7Omschrijving\: &b{0} +gui.uniondetails.union.lore.status=&7Status\: &b{0} +gui.uniondetails.union.lore.leaders=&7Leiders\: &b{0} +gui.uniondetails.union.lore.online.members=&7Online Leden\: &b{0}/{1} +gui.uniondetails.union.lore.kdr=&7KDR\: &b{0} +gui.uniondetails.union.lore.kill.totals=&7Dood Totalen\: &b[Rivaal\:{0} Neutraal\:{1} Beschaving\:{2}] +gui.uniondetails.union.lore.deaths=&7Deaths\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.allies.separator=&b, +gui.uniondetails.union.lore.allies.separator=&b, # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.rivals.separator=&b, -gui.clandetails.clan.lore.allies=&7Bondgenoten\: &b{0} -gui.clandetails.clan.lore.rivals=&Rivalen\: {0} -gui.clandetails.clan.lore.founded=&7Gevonden\: &b{0} -gui.clandetails.clan.lore.inactive=&7Inactief\: &b{0}/{1} dagen -gui.clandetails.allies.title=&fBondgenoten -gui.clandetails.allies.lore=&7Linksklik om je bondgenoten te zien of voeg meer toe -gui.clandetails.rivals.title=&fRivalen -gui.clandetails.rivals.lore=&7Linksklik om rivalen te zien of voeg meer toe -gui.clandetails.roster.title=&fRoster -gui.clandetails.roster.lore=&7Linksklik om je unie''s leden te zien of meer uit te nodigen -gui.staffclandetails.roster.lore=&7Linksklik om de unie''s leden te zien -gui.clandetails.coords.title=&fCoördinaten -gui.clandetails.coords.lore=&7Linksklik om de coördinaten van je unie''s leden te zien -gui.clandetails.home.title=&fHome -gui.clandetails.home.lore.teleport.price=&7Teleporteer prijs\: &b{0} -gui.clandetails.home.lore.teleport=&7Linksklik om naar je unie''s home te teleporteren -gui.staffclandetails.home.lore.teleport=&7Linksklik om te teleporteren naar de home van deze unie''s -gui.clandetails.home.lore.clear=&7Laat het item vallen om het huis van je unie''s te verwijderen -gui.clandetails.home.lore.set.price=&7Zet prijs\: &b{0} -gui.clandetails.home.lore.set=&7Rechtsklik om je unie''s home in te stellen -gui.staffclandetails.home.lore.set=&7Rechtsklik om de home van deze unie in te stellen -gui.clandetails.regroup.title=&fRegroup -gui.clandetails.regroup.lore.price=&7Prijs\: &b{0} -gui.clandetails.regroup.lore.home=&7Linksklik om je unie''s leden samen te voegen bij de unie home -gui.clandetails.regroup.lore.me=&7Rechtsklik om je unie''s leden samen te voegen op je locatie -gui.clandetails.ff.title=&fOnderlinge pvp -gui.clandetails.ff.personal.lore=&7Persoonlijk\: &b{0} -gui.clandetails.ff.clan.lore=&7Unie\: &b{0} -gui.clandetails.ff.personal.toggle.lore=&7Linksklik om onderlinge pvp aan te zetten -gui.clandetails.ff.clan.toggle.lore=&7Rechtsklik om je onderlinge pvp in/uit te zetten -gui.clandetails.bank.title=&fBank -gui.clandetails.bank.balance.lore=&7Saldo\: &b{0} -gui.clandetails.bank.withdraw.status.lore=&7Opnemen\: &b{0} -gui.clandetails.bank.deposit.status.lore=&7Storten\: &b{0} -gui.clandetails.bank.withdraw.toggle.lore=&7Laat het item vallen om de manier van opname in te stellen -gui.clandetails.bank.deposit.toggle.lore=&7Rechtsklik om de stortingsstatus in te schakelen -gui.clandetails.rank.title=&fRank -gui.clandetails.rank.lore=&7Linksklik om de unie''s ranks te zien en ze te bewerken -gui.clandetails.verified.title=&fGeverifieerd -gui.clandetails.not.verified.title=&fNiet geverifieerd -gui.clandetails.verify.price.lore=&7Prijs\: &b{0} -gui.clandetails.not.verified.lore=&7Linksklik om je unie te verifiëren -gui.staffclandetails.not.verified.lore=&7Linksklik om deze unie te verifiëren -gui.clandetails.resign.title=&fOpgeven -gui.clandetails.resign.lore=&7Linksklik om je unie op te geven -gui.clandetails.disband.title=&fVerwijderen -gui.clandetails.disband.lore=&7Laat het voorwerp vallen om je unie te ontbinden -gui.staffclandetails.disband.lore=&7Linksklik om deze kloon te te verwijderen -gui.clandetails.chat.title=&fChat -gui.clandetails.chat.clan.chat.lore=&7/{0} [message] - &bStuurt een bericht naar de unie chat -gui.clandetails.chat.clan.join.leave.lore=&7/{0} {1}/{2} - &bJoins/verlaat de unie chat -gui.clandetails.chat.ally.chat.lore=&7/{0} [message] - Verzendt een bericht naar ally chat -gui.clandetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bJoins/verlaat de ally chat -gui.clandetails.chat.clan.status.lore=&7Unie\: &b{0} -gui.clandetails.chat.ally.status.lore=&7Bondgenoot\: &b{0} -gui.clandetails.chat.clan.toggle.lore=&7Linksklik om de unie chat status in of uit te zetten -gui.clandetails.chat.ally.toggle.lore=&7Rechtsklik om de chatstatus van ally in-/uitschakelen +gui.uniondetails.union.lore.rivals.separator=&b, +gui.uniondetails.union.lore.allies=&7Bondgenoten\: &b{0} +gui.uniondetails.union.lore.rivals=&Rivalen\: {0} +gui.uniondetails.union.lore.founded=&7Gevonden\: &b{0} +gui.uniondetails.union.lore.inactive=&7Inactief\: &b{0}/{1} dagen +gui.uniondetails.allies.title=&fBondgenoten +gui.uniondetails.allies.lore=&7Linksklik om je bondgenoten te zien of voeg meer toe +gui.uniondetails.rivals.title=&fRivalen +gui.uniondetails.rivals.lore=&7Linksklik om rivalen te zien of voeg meer toe +gui.uniondetails.roster.title=&fRoster +gui.uniondetails.roster.lore=&7Linksklik om je unie''s leden te zien of meer uit te nodigen +gui.staffuniondetails.roster.lore=&7Linksklik om de unie''s leden te zien +gui.uniondetails.coords.title=&fCoördinaten +gui.uniondetails.coords.lore=&7Linksklik om de coördinaten van je unie''s leden te zien +gui.uniondetails.home.title=&fHome +gui.uniondetails.home.lore.teleport.price=&7Teleporteer prijs\: &b{0} +gui.uniondetails.home.lore.teleport=&7Linksklik om naar je unie''s home te teleporteren +gui.staffuniondetails.home.lore.teleport=&7Linksklik om te teleporteren naar de home van deze unie''s +gui.uniondetails.home.lore.clear=&7Laat het item vallen om het huis van je unie''s te verwijderen +gui.uniondetails.home.lore.set.price=&7Zet prijs\: &b{0} +gui.uniondetails.home.lore.set=&7Rechtsklik om je unie''s home in te stellen +gui.staffuniondetails.home.lore.set=&7Rechtsklik om de home van deze unie in te stellen +gui.uniondetails.regroup.title=&fRegroup +gui.uniondetails.regroup.lore.price=&7Prijs\: &b{0} +gui.uniondetails.regroup.lore.home=&7Linksklik om je unie''s leden samen te voegen bij de unie home +gui.uniondetails.regroup.lore.me=&7Rechtsklik om je unie''s leden samen te voegen op je locatie +gui.uniondetails.ff.title=&fOnderlinge pvp +gui.uniondetails.ff.personal.lore=&7Persoonlijk\: &b{0} +gui.uniondetails.ff.union.lore=&7Unie\: &b{0} +gui.uniondetails.ff.personal.toggle.lore=&7Linksklik om onderlinge pvp aan te zetten +gui.uniondetails.ff.union.toggle.lore=&7Rechtsklik om je onderlinge pvp in/uit te zetten +gui.uniondetails.bank.title=&fBank +gui.uniondetails.bank.balance.lore=&7Saldo\: &b{0} +gui.uniondetails.bank.withdraw.status.lore=&7Opnemen\: &b{0} +gui.uniondetails.bank.deposit.status.lore=&7Storten\: &b{0} +gui.uniondetails.bank.withdraw.toggle.lore=&7Laat het item vallen om de manier van opname in te stellen +gui.uniondetails.bank.deposit.toggle.lore=&7Rechtsklik om de stortingsstatus in te schakelen +gui.uniondetails.rank.title=&fRank +gui.uniondetails.rank.lore=&7Linksklik om de unie''s ranks te zien en ze te bewerken +gui.uniondetails.verified.title=&fGeverifieerd +gui.uniondetails.not.verified.title=&fNiet geverifieerd +gui.uniondetails.verify.price.lore=&7Prijs\: &b{0} +gui.uniondetails.not.verified.lore=&7Linksklik om je unie te verifiëren +gui.staffuniondetails.not.verified.lore=&7Linksklik om deze unie te verifiëren +gui.uniondetails.resign.title=&fOpgeven +gui.uniondetails.resign.lore=&7Linksklik om je unie op te geven +gui.uniondetails.disband.title=&fVerwijderen +gui.uniondetails.disband.lore=&7Laat het voorwerp vallen om je unie te ontbinden +gui.staffuniondetails.disband.lore=&7Linksklik om deze kloon te te verwijderen +gui.uniondetails.chat.title=&fChat +gui.uniondetails.chat.union.chat.lore=&7/{0} [message] - &bStuurt een bericht naar de unie chat +gui.uniondetails.chat.union.join.leave.lore=&7/{0} {1}/{2} - &bJoins/verlaat de unie chat +gui.uniondetails.chat.ally.chat.lore=&7/{0} [message] - Verzendt een bericht naar ally chat +gui.uniondetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bJoins/verlaat de ally chat +gui.uniondetails.chat.union.status.lore=&7Unie\: &b{0} +gui.uniondetails.chat.ally.status.lore=&7Bondgenoot\: &b{0} +gui.uniondetails.chat.union.toggle.lore=&7Linksklik om de unie chat status in of uit te zetten +gui.uniondetails.chat.ally.toggle.lore=&7Rechtsklik om de chatstatus van ally in-/uitschakelen gui.playerdetails.title={0} gui.playerdetails.player.title=&f{0} -gui.playerdetails.player.lore.noclan=&7Unie\: &bGeen -gui.playerdetails.player.lore.clan=&7Unie\: &b[{0}&b] {1} +gui.playerdetails.player.lore.nounion=&7Unie\: &bGeen +gui.playerdetails.player.lore.union=&7Unie\: &b[{0}&b] {1} gui.playerdetails.player.lore.rank=&7Rank\: &b{0} gui.playerdetails.player.lore.status=&7Status\: &b{0} gui.playerdetails.player.lore.kdr=&7KDR\: &b{0} @@ -742,8 +741,8 @@ gui.playerdetails.player.lore.deaths=&7Deaths\: &b{0} gui.playerdetails.player.lore.join.date=&7Join datum\: &b{0} gui.playerdetails.player.lore.last.seen=&7Laatst gezien\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.playerdetails.player.lore.past.clans.separator=&b, -gui.playerdetails.player.lore.past.clans=&7Vorige unies\: &b{0} +gui.playerdetails.player.lore.past.unions.separator=&b, +gui.playerdetails.player.lore.past.unions=&7Vorige unies\: &b{0} gui.playerdetails.player.lore.inactive=&7Inactief\: &b{0}/{1} dagen gui.playerdetails.kick.title=&fKick gui.playerdetails.promote.demote.title=&fPromotie/degraderen @@ -767,55 +766,53 @@ gui.languageselector.title=Talen - Huidig\: {0} gui.languageselector.language.title=&f{0} gui.languageselector.language.lore.left.click=&7Linksklik om je taal te selecteren gui.languageselector.language.lore.translation.status=&7Status van Vertaling\: &b{0}% -gui.languageselector.language.lore.right.click=&7Rechtsklik om te helpen met vertalen gui.confirmation.title=Bevestiging gui.confirmation.confirm=&7Klik hier om te bevestigen gui.confirmation.return=&7Klik hier om terug te keren gui.not.supported=&cEr is een fout opgetreden tijdens het openen van de GUI\! Uitschakelen... Heb je de juiste versie gedownload? -staff.member.verify.clan=&cEen staflid moet jouw unie verifiëren\! +staff.member.verify.union=&cEen staflid moet jouw unie verifiëren\! player.already.has.that.rank=&cDe speler heeft die rank al\! -joined.clan.chat=&bJe praat nu in unie chat -already.joined.clan.chat=&bJe hebt al de unie chat gejoind -left.clan.chat=&bJe praat nu niet meer in unie chat -muted.clan.chat=&bJe hebt de unie chat gedempt -unmuted.clan.chat=&bJe hebt de unie chat niet meer gedempt +joined.union.chat=&bJe praat nu in unie chat +already.joined.union.chat=&bJe hebt al de unie chat gejoind +left.union.chat=&bJe praat nu niet meer in unie chat +muted.union.chat=&bJe hebt de unie chat gedempt +unmuted.union.chat=&bJe hebt de unie chat niet meer gedempt joined.ally.chat=&bJe praat nu in ally chat left.ally.chat=&bJe praat nu niet meer in ally chat muted.ally.chat=&bJe hebt de ally chat gedempt unmuted.ally.chat=&bJe hebt de ally chat niet meer gedempt already.joined.ally.chat=&bJe bent al de geallieerde chat gejoind -player.already.in.this.clan=&cDe speler is al in deze unie -your.clan.reached.max.alliances=&cJouw unie heeft het maximale aantal allianties bereikt -other.clan.reached.max.alliances=&cDe andere unie heeft het maximale aantal allianties bereikt -insert.clan.tag=&bVoeg de unie tag (of "{0}")\: -insert.clan.name=&bVoeg de unie naam toe\: +player.already.in.this.union=&cDe speler is al in deze unie +your.union.reached.max.alliances=&cJouw unie heeft het maximale aantal allianties bereikt +other.union.reached.max.alliances=&cDe andere unie heeft het maximale aantal allianties bereikt +insert.union.tag=&bVoeg de unie tag (of "{0}")\: +insert.union.name=&bVoeg de unie naam toe\: insert.rank.name=&bVoer de rank naam in (of "{0}")\: -click.to.help.translating=&bKlik op deze link om te helpen met vertalen\:\n&r{0} -your.clan.must.have.members.to.verify=&cJe unie moet ten minste {0} leden hebben om te worden geverifieerd\! +your.union.must.have.members.to.verify=&cJe unie moet ten minste {0} leden hebben om te worden geverifieerd\! you.must.hold.a.banner=&cJe moet een banner in je hand hebben\! -you.changed.clan.banner=&bJe hebt je unie''s banner veranderd\! -your.clan.already.verified=&cJe unie is al geverifieerd\! +you.changed.union.banner=&bJe hebt je unie''s banner veranderd\! +your.union.already.verified=&cJe unie is al geverifieerd\! # suppress inspection "TrailingSpacesInProperty" -clan.profile=\n&b%clan_name%&7 profiel &8-------------------------------------------\n \n &7Naam\: &e[&8%clan_color_tag%&e] &b%clan_name%\n &7Omschrijving\: &f%clan_description%\n &7Status\: &f%clan_status%\n &7Leiders\: %clan_leaders%\n &7Leden online\: &f%clan_online_count%&7/&f%clan_size%\n &7KDR\: &e%clan_kdr%\n &7Kill Totals\: &8[Rival\:&f%clan_rival_kills% &8Allience\:&f%clan_ally_kills% &8Neutraal\:&f%clan_neutral_kills% &8Burger\:&f%clan_civilian_kills%&8]\n &7Deaths\: &f%clan_deaths%\n &7Alliances\: &f%clan_allies%\n &7Rivalen\: &f%clan_rivals%\n &7Opgericht\: &f%clan_founded%\n &7Inactief\: &f%clan_inactive_days%&7/&f%clan_max_inactive_days% dagen\n -player.lookup.clanname=&e[&8%clan_color_tag%&e] &b%clan_name% +union.profile=\n&b%union_name%&7 profiel &8-------------------------------------------\n \n &7Naam\: &e[&8%union_color_tag%&e] &b%union_name%\n &7Omschrijving\: &f%union_description%\n &7Status\: &f%union_status%\n &7Leden online\: &f%union_online_count%&7/&f%union_size%\n &7KDR\: &e%union_kdr%\n &7Kill Totals\: &8[Rival\:&f%union_rival_kills% &8Allience\:&f%union_ally_kills% &8Neutraal\:&f%union_neutral_kills% &8Burger\:&f%union_civilian_kills%&8]\n &7Deaths\: &f%union_deaths%\n &7Alliances\: &f%union_allies%\n &7Rivalen\: &f%union_rivals%\n &7Opgericht\: &f%union_founded%\n &7Inactief\: &f%union_inactive_days%&7/&f%union_max_inactive_days% dagen\n +player.lookup.unionname=&e[&8%union_color_tag%&e] &b%union_name% # suppress inspection "TrailingSpacesInProperty" player.lookup.killtype=&7Kill Type\: %player_kill_type%\n -player.lookup=\n&b%player_name%&7''s speler info &8-------------------------------------------\n \n &7Unie\: &f%clan_name%\n &7Rank\: &f%player_rank%\n &7Status\: &f%player_status%\n &7KDR\: &e%player_kdr%\n &7Kill Totals\: &8[Rival\:&f%player_rival_kills% &8Ally\:&7%player_ally_kills% &8Neutral\:&f%player_neutral_kills% &8Civilian\:&f%player_civilian_kills%&8]\n &7Deaths\: &f%player_deaths%\n &7Datum Gejoined\: &f%player_join_date%\n &7Laatst Gezien\: &f%player_last_seen%\n &7Vorige Unies\: &f%player_past_clans%\n &7Inactief\: &f%player_inactive_days%&7/&f%player_max_inactive_days% days\n %kill_type_line% +player.lookup=\n&b%player_name%&7''s speler info &8-------------------------------------------\n \n &7Unie\: &f%union_name%\n &7Status\: &f%player_status%\n &7KDR\: &e%player_kdr%\n &7Kill Totals\: &8[Rival\:&f%player_rival_kills% &8Ally\:&7%player_ally_kills% &8Neutral\:&f%player_neutral_kills% &8Civilian\:&f%player_civilian_kills%&8]\n &7Deaths\: &f%player_deaths%\n &7Datum Gejoined\: &f%player_join_date%\n &7Laatst Gezien\: &f%player_last_seen%\n &7Vorige Unies\: &f%player_past_unions%\n &7Inactief\: &f%player_inactive_days%&7/&f%player_max_inactive_days% days\n %kill_type_line% economy.disabled=&cEconomy uitgeschakeld\! has.been.purged=Gegevens van {0} zijn verwijderd accepted.invitation=&bJe hebt de uitnodiging van {0} geaccepteerd denied.invitation=&cJe hebt de uitnodiging van {0} geweigerd -must.be.in.clan.to.pvp=&cJij en {0} moeten unie leden zijn om te PvPen\! -clans.not.at.war.pvp.denied=&cJe unie is niet in oorlog met {0}\! +must.be.in.union.to.pvp=&cJij en {0} moeten unie leden zijn om te PvPen\! +unions.not.at.war.pvp.denied=&cJe unie is niet in oorlog met {0}\! cannot.attack.civilians=&cJe kan burgers niet aanvallen\! -cannot.attack.clan.member=&cJe kan een ander unie lid niet aanvallen\! +cannot.attack.union.member=&cJe kan een ander unie lid niet aanvallen\! cannot.attack.ally=&cJe kan een bondgenoot niet aanvallen\! cannot.send.discord.message=Je kan geen berichten naar {0} verzenden. Je bent geen lid van die unie\! discordhook.is.disabled=&cDiscord integratie is uitgeschakeld of niet beschikbaar\! -your.clan.doesnt.have.any.linked.player=Je unie heeft geen gekoppelde spelers -your.clan.doesnt.have.minimum.linked.player=Je unie heeft niet de minimale hoeveelheid gekoppelde spelers -your.clan.is.not.on.the.whitelist=Je unie staat niet op de whitelist -your.clan.already.has.channel=Je unie heeft al een discord kanaal +your.union.doesnt.have.any.linked.player=Je unie heeft geen gekoppelde spelers +your.union.doesnt.have.minimum.linked.player=Je unie heeft niet de minimale hoeveelheid gekoppelde spelers +your.union.is.not.on.the.whitelist=Je unie staat niet op de whitelist +your.union.already.has.channel=Je unie heeft al een discord kanaal discord.reached.category.limit=Discord heeft de categorielimiet bereikt\! discord.reached.channels.limit=Discord heeft het kanalen limiet bereikt\! discord.created.successfully=&bDiscord kanaal succesvol aangemaakt\! @@ -825,19 +822,19 @@ cannot.kick.last.leader=&cJe kan de laatste leider niet kicken\! cannot.disband.permanent=&cJe kan deze unie, niet ontbinden. Het heeft een permanente status. you.can.only.set.base.in.your.land=&cJe kan alleen de home zetten in je land\! only.leaders.can.create.lands=&cAlleen leiders kunnen landen maken\! -only.one.land.per.clan=&cJe unie heeft al een land\! -only.clan.members.can.create.lands=&cAlleen unie leden kunnen landen maken\! +only.one.land.per.union=&cJe unie heeft al een land\! +only.union.members.can.create.lands=&cAlleen unie leden kunnen landen maken\! land.allowed.all.actions=&bAlle acties zijn nu toegestaan\! land.blocked.all.actions=&bAlle acties zijn nu geblokkeerd\! land.allowed.action=&bToegestane actie\! land.blocked.action=&bGeblokkeerde actie\! you.do.not.own.lands=&cJe bezit geen land\! land.sharing.disabled=&cLand delen is uitgeschakeld\! -clan.chat.disabled=&cUnie chat is uitgeschakeld\! +union.chat.disabled=&cUnie chat is uitgeschakeld\! ally.chat.disabled=&Geallieerde chat uitgeschakelt\! war.expired=De oorlog met {0} is verlopen\! you.cant.start.war.online.members.difference=Je kunt de oorlog niet starten. De ene unie heeft meer leden online dan de andere. invitedplayer.invite.off=Deze speler heeft unie uitnodigingen uitstaan user.hasnt.played.before=Deze gebruiker heeft nog niet eerder gespeeld -clan.list.balance.header=\n{0} &7hoogste saldo &8-----------------------\n \n&8Totaal aantal unies\: &7{1}\n \n&8#&7. &8Unie &7- &8Saldo -clan.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} +union.list.balance.header=\n{0} &7hoogste saldo &8-----------------------\n \n&8Totaal aantal unies\: &7{1}\n \n&8#&7. &8Unie &7- &8Saldo +union.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} diff --git a/src/main/resources/messages_no_NO.properties b/src/main/resources/messages_no_NO.properties index 742725d2..82ab9757 100644 --- a/src/main/resources/messages_no_NO.properties +++ b/src/main/resources/messages_no_NO.properties @@ -61,7 +61,7 @@ admin.command=administrator mod.command=moderator promote.command=promotere demote.command=demotere -clanff.command=clanff +unionff.command=unionff ff.command=ff resign.command=trekke disband.command=oppløse @@ -94,7 +94,7 @@ acf-core.parameter.message=melding acf-core.parameter.name=navn acf-core.parameter.description=beskrivelse acf-core.parameter.player=spiller -acf-core.parameter.clan=union +acf-core.parameter.union=union acf-core.parameter.type=skriv acf-core.parameter.help=side eller nøkkelord command.description.land.allow.all=Tillater alle handlinger på ditt land @@ -109,14 +109,14 @@ command.description.more=Viser mer informasjon command.description.create=Oppretter Union command.description.discord.create=Oppretter en Discord kanal for din union command.description.ff.allow=Setter din personlige vennlige ild til tillat -clan=Union +union=Union alliances=allianser coords=koord name=Navn distance=Avstand world=Verden members=Medlemmer -clans.lower=unioner +unions.lower=unioner civilian=Sivil neutral=Nøytral ally=Alliert @@ -155,9 +155,9 @@ nokillsfound=Ingen Drap Funnet promoted.to.leader={0} har blitt forfremmet til leder denied.demotion={0} avviste degradering av {1} Konsensus mislyktes. membership.invitation={0} har avslått medlemskapinvitasjonen -joined.the.clan={0} har blitt med i unionen +joined.the.union={0} har blitt med i unionen signed.off.request.cancelled={0} har logget av. {1} forespørsel kansellert. -clan.deletion={0} avviste sletting av unionen. Konsensus mislyktes. +union.deletion={0} avviste sletting av unionen. Konsensus mislyktes. has.been.disbanded=Union {0} har blitt oppløst denied.the.promotion={0} avviste forfremmelsen av {1}. Konsensus mislyktes. demoted.back.to.member={0} har blitt degradert tilbake til medlem @@ -169,11 +169,11 @@ the.alliance.was.denied=Alliansen med {0} ble avvist # suppress inspection "TrailingSpacesInProperty" no.leader.permissions=Du har ikke leder tillatelse you.have.already.voted=Du har allerede stemt -clan.disbanded=Union Oppløst -clan.is.not.verified=Unionen er ikke bekreftet -not.a.member.of.any.clan=Du er ikke medlem i en union -your.clans.are.not.allies=Unionene dine er ikke allierte -clan.has.been.disbanded=Union {0} har blitt oppløst +union.disbanded=Union Oppløst +union.is.not.verified=Unionen er ikke bekreftet +not.a.member.of.any.union=Du er ikke medlem i en union +your.unions.are.not.allies=Unionene dine er ikke allierte +union.has.been.disbanded=Union {0} har blitt oppløst start=start add=legge til remove=fjern diff --git a/src/main/resources/messages_pl_PL.properties b/src/main/resources/messages_pl_PL.properties index 1121a6a9..6cf783e0 100644 --- a/src/main/resources/messages_pl_PL.properties +++ b/src/main/resources/messages_pl_PL.properties @@ -66,7 +66,7 @@ admin.command=administrator mod.command=mod promote.command=awansuj demote.command=degraduj -clanff.command=clanff +unionff.command=unionff ff.command=ff resign.command=opusc disband.command=rozwiąż @@ -105,7 +105,7 @@ acf-core.parameter.tag=tag acf-core.parameter.name=nazwa acf-core.parameter.description=opis acf-core.parameter.player=Gracz -acf-core.parameter.clan=Unia +acf-core.parameter.union=Unia acf-core.parameter.type=Typ acf-core.parameter.order=Zamówienie acf-core.parameter.help=Strona lub słowa kluczowe @@ -148,8 +148,8 @@ command.description.ff.allow=Ustawia Friendly Fire unii na dozwolony command.description.ff.auto=Ustawia Twój Friendly Fire na auto command.description.globalff.allow=Ustawia Friendly Fire na dozwolone command.description.globalff.auto=Ustawia Friendy Fire na auto -command.description.clanff.allow=Ustawia przyjazny ogień unii na dozwolony -command.description.clanff.block=Ustawia przyjazny ogień unii na zablokowany +command.description.unionff.allow=Ustawia przyjazny ogień unii na dozwolony +command.description.unionff.block=Ustawia przyjazny ogień unii na zablokowany command.description.description=Ustaw opis unii command.description.ban=Banuje gracza z poleceń unii command.description.unban=Banuje gracza z poleceń unii @@ -177,7 +177,7 @@ command.description.untrust=Niezaufany członek command.description.resign=Rezygnacja z unii command.description.help=Pokazuje pomoc lub wyszukiwanie w pomocy command.description.ally.add=Dodaj sojusznika -command.description.clan=Otwórz GUI +command.description.union=Otwórz GUI command.description.disband=Rozwiąż swój unia command.description.mod.disband=Rozwiąż unia command.description.mod.kick=Wyrzuć członka z twojego unii @@ -232,7 +232,7 @@ command.description.locale=Ustawia Twój język home-menu=/{0} home{1} - Teleportuje w miejsce zapisanej lokacji home-set-menu=/{0} home set{1} - Ustaw teleport unii home-clear-menu=/{0} dom czysty{1} - wyczyść bazę unii -clan=Unia +union=Unia allies=Sojusznicy alliances=sojusznicy coords=współrzędne @@ -242,7 +242,7 @@ coords.upper=Wspolrzedne world=Swiat kdr=KDR members=Czlonkowie -clans.lower=unie +unions.lower=unie rival=Wrog civilian=Cywile neutral=Neutralny @@ -286,9 +286,9 @@ nokillsfound=Nie znaleziono zabójstw promoted.to.leader={0} zostal awansowany na przywodce denied.demotion={0} odrzucil degradacje {1}. Nie osiagnieto porozumienia. membership.invitation={0} odmowil zaproszenia w szeregi unii -joined.the.clan={0} dolaczyl do unii +joined.the.union={0} dolaczyl do unii signed.off.request.cancelled={0} odszedl z unii. {1} odrzucil propozycje -clan.deletion={0} nie zgodzil sie nie usuniecie unii. +union.deletion={0} nie zgodzil sie nie usuniecie unii. rename.refused={0} nie zgodził się na usunięcie unii. Nie osiągnięto porozumienia. has.been.disbanded=Unia {0} zostal rozwiazany denied.the.promotion={0} odrzucił awans {1}. Nie osiagnieto porozumienia. @@ -324,9 +324,9 @@ mysql.connection.failed=MySQL nie udane polaczenie sqlite.connection.successful=SQLite udane polaczenie sqlite.connection.failed= SQLite nie udane polaczenie purging.player.data=usuwanie danych gracza (purge) {0} -purging.clan=usuwanie danych unii\: {0} -clan.players=gracze unii \: {0} -clans=Unie\: {0} +purging.union=usuwanie danych unii\: {0} +union.players=gracze unii \: {0} +unions=Unie\: {0} banned=Masz bana na uzywanie uniaowych komend nothing.more.to.see=Nic wiecej tu nie ma nothing.to.vote=&cNic do zaakceptowania lub odrzucenia @@ -339,76 +339,76 @@ bulletin.board.header=&8* &e{0} &ftablica ogłoszeń bulletin.board.message={0}\: &f{1} has.been.disbanded.rivalry.ended={0} zostal rozwiazany. Koniec wojny. has.been.disbanded.alliance.ended={0} zostal rozwiazany. Koniec przymieza. -clan.disbanded=Rozwiazano unia +union.disbanded=Rozwiazano unia 1.color.day=1 {0}dni many.color.days={0}{1} dni insufficient.permissions=Niewystarczajace uprawnienia -clan.is.not.verified=Unia nie zweryfikowany -player.not.a.member.of.any.clan=&cGracz nie jest członkiem żadnego unii -not.a.member.of.any.clan=Nie jestes czlonkiem zadnego unii +union.is.not.verified=Unia nie zweryfikowany +player.not.a.member.of.any.union=&cGracz nie jest członkiem żadnego unii +not.a.member.of.any.union=Nie jestes czlonkiem zadnego unii minimum.to.make.alliance=Muszisz miec w unii co najmniej {0} czlonkow aby moc zawierac sojusze. -cannot.be.same.clan=&cMusisz wstawić unia inny niż twoj\! -other.clan.not.verified=&cInny unia nie jest zweryfikowany\! -your.clans.are.not.allies=Wasze unie nie sa sojusznikami +cannot.be.same.union=&cMusisz wstawić unia inny niż twoj\! +other.union.not.verified=&cInny unia nie jest zweryfikowany\! +your.unions.are.not.allies=Wasze unie nie sa sojusznikami has.broken.the.alliance={0} zerwal sojusz z {1} at.least.one.leader.accept.the.alliance=Co najmniej jeden z przywodcow unii musi byc dostepny aby przyjac propozycje sojuszu. leaders.have.been.asked.for.an.alliance=Przywodcy {0} zostali zapytani o sojusz. -your.clans.are.already.allies=Wasze unie to już sojusznicy -your.clan.cannot.create.rivals=Twoj unia nie moze miec wrogow +your.unions.are.already.allies=Wasze unie to już sojusznicy +your.union.cannot.create.rivals=Twoj unia nie moze miec wrogow min.players.rivalries=Musisz miec w unii co najmniej {0} czlonkow aby moc wypowiadac wojny. this.player.is.already.banned=Ten gracz ma juz bana player.added.to.banned.list=Gracz dodany do listy imion zbanowanych you.banned=Zostales pozbawiony komend uniaowych (masz bana) -clan.wide.friendly.fire.blocked=Friendly Fire dla calego unii jest wylaczony. -clan.wide.friendly.fire.is.allowed=Friendly Fire dla calego unii jest wlaczony. +union.wide.friendly.fire.blocked=Friendly Fire dla calego unii jest wylaczony. +union.wide.friendly.fire.is.allowed=Friendly Fire dla calego unii jest wlaczony. you.are.the.only.member.online=Jestes jedynym czlonkiem unii online. Badz czujny. -your.clan.color.tag.cannot.be.longer.than.characters=&cKolorowy tag unii nie może być dłuższy niż {0} znaków -your.clan.tag.cannot.be.longer.than.characters=Tag twojej gildii nie może być dłuższy niż {0} znaków -your.clan.tag.must.be.longer.than.characters=Tag twojego unii musi być dłuższy od {0} znaków +your.union.color.tag.cannot.be.longer.than.characters=&cKolorowy tag unii nie może być dłuższy niż {0} znaków +your.union.tag.cannot.be.longer.than.characters=Tag twojej gildii nie może być dłuższy niż {0} znaków +your.union.tag.must.be.longer.than.characters=Tag twojego unii musi być dłuższy od {0} znaków your.tag.doesnt.meet.the.requirements=Twój tag nie osiąga potrzebnych wymagań. your.tag.cannot.contain.color.codes=&cNazwa twojego unii nie moze zawierac kodow kolorow you.cannot.set.colored.ranks=Nie możesz ustawić koloru rang -your.clan.name.cannot.be.longer.than.characters=Nazwa unii nie moze byc dluzsza niz {0} znakow -your.clan.name.must.be.longer.than.characters=Nazwa twojego unii musi byc dluzsza niz {0} znakow -your.clan.name.cannot.contain.color.codes=Nazwa twojego unii nie moze zawierac kodow kolorow +your.union.name.cannot.be.longer.than.characters=Nazwa unii nie moze byc dluzsza niz {0} znakow +your.union.name.must.be.longer.than.characters=Nazwa twojego unii musi byc dluzsza niz {0} znakow +your.union.name.cannot.contain.color.codes=Nazwa twojego unii nie moze zawierac kodow kolorow that.tag.name.is.disallowed=Ten tag jest niedozwolony you.must.first.resign=Najpierw musisz odejsc z {0} -clan.with.this.tag.already.exists=Unia o takim Tagu juz istnieje -get.your.clan.verified.to.access.advanced.features=Weryfikacja twojego unii umozliwi dostep do pozostalych opcji -clan.created=Unia {0} pomyslnie utworzony +union.with.this.tag.already.exists=Unia o takim Tagu juz istnieje +get.your.union.verified.to.access.advanced.features=Weryfikacja twojego unii umozliwi dostep do pozostalych opcji +union.created=Unia {0} pomyslnie utworzony not.enough.leaders.online.to.vote.on.demotion=Brak wystarczającej liczby liderów online, aby głosować na ta degradacje demotion.vote.has.been.requested.from.all.leaders=Wszyscy przywodcy zostali poproszeni o glos w sprawie degradacji -player.is.not.a.leader.of.your.clan=Ten gracz nie jest przywodca twojego unii +player.is.not.a.leader.of.your.union=Ten gracz nie jest przywodca twojego unii player.is.not.a.leader=Gracz nie jest przywódcą -clan.has.been.disbanded=Unia {0} zostal rozwiazany -clan.disband.vote.has.been.requested.from.all.leaders=Wszyscy przywodcy zostali poproszeni o glos w sprawie rozwiazania unii -friendy.fire.is.now.managed.by.your.clan=Ustawienie Friendly fire zgodne z obecnym ustawieniem twojego unii +union.has.been.disbanded=Unia {0} zostal rozwiazany +union.disband.vote.has.been.requested.from.all.leaders=Wszyscy przywodcy zostali poproszeni o glos w sprawie rozwiazania unii +friendy.fire.is.now.managed.by.your.union=Ustawienie Friendly fire zgodne z obecnym ustawieniem twojego unii personal.friendly.fire.is.set.to.allowed=Osobisty Friendly fire zostal wlaczony -global.friendy.fire.is.now.managed.by.each.clan=Swiatowy Friendly fire zalezy teraz od indywidualnych ustalen kazdego unii -global.friendy.fire.is.already.being.managed.by.each.clan=Friendly fire juz jest zalezny od ustawien uniaow +global.friendy.fire.is.now.managed.by.each.union=Swiatowy Friendly fire zalezy teraz od indywidualnych ustalen kazdego unii +global.friendy.fire.is.already.being.managed.by.each.union=Friendly fire juz jest zalezny od ustawien uniaow global.friendly.fire.is.set.to.allowed=Włączono globalny ogień przyjacielski global.friendly.fire.is.already.being.allowed=Globalny ogień przyjacielski jest już włączony -the.player.doesn.t.not.have.the.permissions.to.join.clans=Gracz nie ma uprawnień do dołączenia do unii +the.player.doesn.t.not.have.the.permissions.to.join.unions=Gracz nie ma uprawnień do dołączenia do unii you.cannot.invite.yourself=Nie możesz zaprosić samego siebie you.did.not.answer.in.time=Nie odpowiedziałeś w czasie, anulowanie... -this.player.is.banned.from.using.clan.commands=Ten gracz ma zablokowany dostęp do komend uniaowych -the.player.is.already.member.of.another.clan=Ten gracz jest już członkiem innego unii +this.player.is.banned.from.using.union.commands=Ten gracz ma zablokowany dostęp do komend uniaowych +the.player.is.already.member.of.another.union=Ten gracz jest już członkiem innego unii has.been.asked.to.join={0} został zapytany o dołączenie do {1} you.cannot.kick.yourself=Nie możesz wyrzucić samego siebie -the.player.is.not.a.member.of.your.clan=Ten gracz nie jest członkiem twojego unii +the.player.is.not.a.member.of.your.union=Ten gracz nie jest członkiem twojego unii you.cannot.kick.another.leader=Nie możesz wyrzucić innego przywódcy has.been.kicked.by={0} został wyrzucony przez {1} -no.clans.have.been.created=Żadne unie nie zostały utworzone -total.clans=Wszystkie unie\: +no.unions.have.been.created=Żadne unie nie zostały utworzone +total.unions=Wszystkie unie\: legend=Legenda\: kill.type.civilian=Zabito\: {0} Cywili no.player.data.found=Nie znaleziono danych gracza -clan.0=Unia\: {0} +union.0=Unia\: {0} status.0=Status\: {0} rank.0=Ranga\: {0} kdr.0=KDR\: {0} inactive.0=Nieaktywny\: {0} -clan.commands=komendy uniaowe +union.commands=komendy uniaowe you.can.only.modify.the.color.and.case.of.the.tag=Możesz modyfikować tylko kolor i wielkość liter tagu locale.has.been.changed=Zmieniono Twój język locale.is.prohibited=Wybór języka na serwerze jest zabroniony. @@ -420,11 +420,11 @@ leaders.0=Przywódcy\: {0} allies.0=Sojusznicy\: {0} rivals.0=Wrogowie\: {0} other.player.must.be.online=&cGracz musi być online\! -the.player.does.not.have.the.permissions.to.lead.a.clan=Ten gracz nie ma uprawnień, aby dowodzić unią +the.player.does.not.have.the.permissions.to.lead.a.union=Ten gracz nie ma uprawnień, aby dowodzić unią you.cannot.promote.yourself=Nie możesz awansować samego siebie the.player.is.already.a.leader=Ten gracz jest już przywódcą configuration.reloaded=Przeładowano ustawienia -last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.clan=Ostatni dowódca nie może zrezygnować. Musisz wyznaczyć innego dowódcę lub rozwiązać unia +last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.union=Ostatni dowódca nie może zrezygnować. Musisz wyznaczyć innego dowódcę lub rozwiązać unia 0.has.resigned={0} zrezygnował you.cannot.trust.yourself=Nie możesz oznaczyć samego siebie jako osobę zaufaną leaders.are.already.trusted=Przywódcy są już oznaczeni jako zaufani @@ -432,23 +432,23 @@ this.player.is.already.trusted=Ten gracz już jest oznaczony jako zaufany has.been.given.trusted.status.by={0} otrzymał status zaufanego od {1} this.player.is.not.banned=Ten gracz nie jest zbanowany player.removed.from.the.banned.list=Gracz usunięty z listy zbanowanych -you.have.been.unbanned.from.clan.commands=Zostales odbanowany w prawach uniaowych i mozesz ponownie korzystac komend. +you.have.been.unbanned.from.union.commands=Zostales odbanowany w prawach uniaowych i mozesz ponownie korzystac komend. you.cannot.untrust.yourself=Nie mozesz sam siebie oznaczyc jako osobe niezaufana. Popros kogos kto cie dobrze poznal. leaders.cannot.be.untrusted=Przywodca nie mozna ustawic statusu osoby negodnej zaufania. this.player.is.already.untrusted=Ten gracz ma juz status osoby niegodnej zaufania. has.been.given.untrusted.status.by={0} otrzymal status osoby niegodnej zaufania od {1} -the.clan.does.not.exist=Ten unia nie istnieje -the.clan.is.already.verified=Ten unia jest juz zweryfikowany -the.clan.has.been.verified=Unia zostal zweryfikowany -clan.0.has.been.verified=Unia {0} zostal zweryfikowany\! -total.clan.players.0=Wszystkich graczy\: {0} +the.union.does.not.exist=Ten unia nie istnieje +the.union.is.already.verified=Ten unia jest juz zweryfikowany +the.union.has.been.verified=Unia zostal zweryfikowany +union.0.has.been.verified=Unia {0} zostal zweryfikowany\! +total.union.players.0=Wszystkich graczy\: {0} proposing.war={0} proponuje rozpoczac wojne z {1} you.can.only.start.war.with.rivals=Mozesz tylko rozpoczac wojne z rywalami leaders.have.been.asked.to.accept.the.war.request={0} przywódcy zostali poproszeni o zaakceptowanie wypowiedzenia wojny leaders.asked.to.end.rivalry={0} przywódcy zostali zapytani o zakończenie wojny proposing.to.end.the.war={0} proponuje zakończenie wojny z {1} -clans.already.at.war=Unie są już w stanie wojny -clans.not.at.war=Unie nie są w stanie wojny +unions.already.at.war=Unie są już w stanie wojny +unions.not.at.war=Unie nie są w stanie wojny you.are.at.war={0} jest teraz w stanie wojny z {1} denied.war.req={0} odrzucił prośbę o wojnę wysłaną przez {1} you.are.no.longer.at.war={0} nie jest już w stanie wojny z {1} @@ -476,12 +476,12 @@ diamond=diament gold=złoto wood=drewno server.announce=Ogłoszenie serwera -clan.announce=Ogłoszenie unii +union.announce=Ogłoszenie unii leader.announce=Ogłoszenie przywódcy hunger=Głód stone=kamien iron=żelazo -the.clan.cannot.be.rivaled=Unia nie moze rywalizowac +the.union.cannot.be.rivaled=Unia nie moze rywalizowac bboff=BB wyłączony bbon=BB włączony inviteon=Zaproszenie włączone @@ -505,30 +505,30 @@ waiting.for.teleport.stand.still.for.0.seconds=Oczekiwanie na teleport, stój w on=wł off=wył player.rank.changed=Ranking został ustawiony -your.clans.are.already.rivals=Wasze unie to juz sojusznicy +your.unions.are.already.rivals=Wasze unie to juz sojusznicy cleared.bb=Usunięto tablicę ogłoszeń. -clan.balance=Saldo Uniaowe\: {0} -clan.admin.balance={0} - Stan\: {1} -bb.clan.deposit={0} zostało wpłaconych {1} -player.clan.deposit=Złożyłeś {0} -bb.clan.withdraw={0} zostało wypłaconych {1} -bb.clan.take={0} zostało przyznane przez {1} -bb.clan.give={0} zostało przyznane przez {1} -bb.clan.set={0} zostało ustalone przez {1} -player.clan.withdraw=Wypłaciłeś {0} -clan.admin.take=Zdobyłeś {0} z banku {1} -clan.admin.give=Zdobyłeś {0} z banku {1} -clan.admin.set=Ustawiłeś {0} saldo bankowe na {1} -clan.admin.bank.not.enough.money=Bank {0} nie posiada wystarczającej ilości pieniędzy\! -clan.bank.not.enough.money=Twój bank unii nie ma wystarczającej ilości pieniędzy -your.clans.are.not.rivals=Wasze unie nie sa sojusznikami -the.clan.members.reached.limit=Twój unia osiągnął limit członków -this.clan.has.reached.the.member.limit=&bTen unia osiągnął limit użytkowników +union.balance=Saldo Uniaowe\: {0} +union.admin.balance={0} - Stan\: {1} +bb.union.deposit={0} zostało wpłaconych {1} +player.union.deposit=Złożyłeś {0} +bb.union.withdraw={0} zostało wypłaconych {1} +bb.union.take={0} zostało przyznane przez {1} +bb.union.give={0} zostało przyznane przez {1} +bb.union.set={0} zostało ustalone przez {1} +player.union.withdraw=Wypłaciłeś {0} +union.admin.take=Zdobyłeś {0} z banku {1} +union.admin.give=Zdobyłeś {0} z banku {1} +union.admin.set=Ustawiłeś {0} saldo bankowe na {1} +union.admin.bank.not.enough.money=Bank {0} nie posiada wystarczającej ilości pieniędzy\! +union.bank.not.enough.money=Twój bank unii nie ma wystarczającej ilości pieniędzy +your.unions.are.not.rivals=Wasze unie nie sa sojusznikami +the.union.members.reached.limit=Twój unia osiągnął limit członków +this.union.has.reached.the.member.limit=&bTen unia osiągnął limit użytkowników you.have.reseted.your.kdr=Zresetowałeś swój KDR you.have.reseted.0.kdr=Zresetowałeś KDR {0} you.have.reseted.kdr.of.all.players=Zresetowałeś KDR wszystkich graczy -you.have.successfully.renamed.your.clan=&bPomyślnie zmieniłeś nazwę twojego unii na {0} -you.have.successfully.renamed.the.clan=&bPomyślnie zmieniłeś nazwę unii na {0} +you.have.successfully.renamed.your.union=&bPomyślnie zmieniłeś nazwę twojego unii na {0} +you.have.successfully.renamed.the.union=&bPomyślnie zmieniłeś nazwę unii na {0} you.have.toggled.permanent.status=Przełączyłeś stały status dla {0} permanent.status.enabled=Stały status Twojego unii został włączony przez {0} permanent.status.disabled=Stały status Twojego unii został wyłączony przez {0} @@ -552,11 +552,11 @@ bb.one.hour=1 godzina bb.days= \ dni bb.one.day=1 dzień player.purged=Gracz został pomyślnie oczyszczony -your.clan.description.must.be.longer.than=Twój uniaowy opis nie moze byc dluzszy, niz {0} znakow -your.clan.description.cannot.be.longer.than=Twój opis unii nie może być dłuższy niż {0} znakow +your.union.description.must.be.longer.than=Twój uniaowy opis nie moze byc dluzszy, niz {0} znakow +your.union.description.cannot.be.longer.than=Twój opis unii nie może być dłuższy niż {0} znakow description.changed=Pomyslnie, zmieniles opis unii no.description=Bez opisu -the.player.must.wait.0.before.joining.your.clan.again=Ten gracz musi poczekać {0} minut przed ponownym dołączeniem do unii +the.player.must.wait.0.before.joining.your.union.again=Ten gracz musi poczekać {0} minut przed ponownym dołączeniem do unii disabled.command=Wyłączone komendy rank.displayname.updated=Nazwa wyświetlana rangi została zaktualizowana\! rank.setdefault=Domyślny ranking unii został ustawiony na {0} @@ -569,18 +569,18 @@ rank.created=Utworzono rangę permission.0.added.to.rank.1=Uprawnienia {0} dodane do rangi {1} permission.0.removed.from.rank.1=Uprawnienie {0} usunięte z rangi {1} rank.0.deleted=Ranga {0} usunięta -clans.ranks=Ranga Unii\: +unions.ranks=Ranga Unii\: ranks.list.item={0}\# {1} ({2}) no.ranks=Nie utworzono rang rank.no.permissions=Ta ranga nie ma żadnych uprawnień player.unassigned.from.rank=Gracz nieprzypisany do rangi you.must.be.0.or.have.the.permission.1.to.use.this=Musisz być {0} lub twój lider musi dać swoją rangę {1} aby użyć tego -deposit.not.allowed=Wpłata jest niedozwolona, użyj /%clan %toggle %dedeposit -withdraw.not.allowed=Wypłata jest niedozwolona, użyj /%clan %toggle %withdraw aby na to zezwolić +deposit.not.allowed=Wpłata jest niedozwolona, użyj /%union %toggle %dedeposit +withdraw.not.allowed=Wypłata jest niedozwolona, użyj /%union %toggle %withdraw aby na to zezwolić resign.request.cancelled=Rezygnacja została anulowana disband.request.cancelled=Żądanie rozwiązania unii anulowane resetkdr.request.cancelled=Anulowano reset KDR -clan.create.request.cancelled=Żądanie utworzenia unii anulowane +union.create.request.cancelled=Żądanie utworzenia unii anulowane rank.create.request.cancelled=Żądanie utworzenia rangi anulowane promotion.vote.has.been.requested.from.all.leaders=Prośba o awans została złożona dla wszystkich przywódców rename.vote.has.been.requested.from.all.leaders=&bWszyscy przywódcy zostali poproszeni o głos w sprawie degradacji @@ -597,11 +597,10 @@ gui.lore.no.permission=Nie masz uprawnień żeby to zrobić\! gui.main.title={0} - menu unii gui.main.languageselector.title=Wybierz język gui.main.languageselector.lore.left.click=&7Kliknij lewym przyciskiem myszy, aby wybrać swój język -gui.main.languageselector.lore.right.click=&7Kliknij prawym przyciskiem myszy, aby pomóc w tłumaczeniu gui.main.other.commands.title=&fInne komendy gui.main.other.commands.lore=&7Kliknij lewym przyciskiem myszy, zeby zobaczyć listę unii -gui.main.clan.list.title=&fLista unii -gui.main.clan.list.lore=&7Kliknij lewym przyciskiem myszy, aby zobaczyć listę unii +gui.main.union.list.title=&fLista unii +gui.main.union.list.lore=&7Kliknij lewym przyciskiem myszy, aby zobaczyć listę unii gui.main.reset.kdr.title=&fReset KDR gui.main.reset.kdr.lore=&7Kliknij lewym przyciskiem myszy, aby zresetować KDR gui.main.leaderboard.title=&fRanking @@ -609,8 +608,8 @@ gui.main.leaderboard.lore=&7Lewy-przycisk, zeby zobaczyc ranking gui.main.staff.title=&fZarządzanie gui.main.staff.lore=&7Kliknij lewym przyciskiem myszy aby otworzyć Staff menu gui.staff.title=Zarządzanie -gui.staff.clan.list.lore.left.click=&7Kliknij lewym przyciskiem myszy, aby zobaczyć listę unii -gui.staff.clan.list.lore.right.click=&7Kliknij prawym przyciskiem myszy, aby zobaczyć wszystkie niezweryfikowane unie +gui.staff.union.list.lore.left.click=&7Kliknij lewym przyciskiem myszy, aby zobaczyć listę unii +gui.staff.union.list.lore.right.click=&7Kliknij prawym przyciskiem myszy, aby zobaczyć wszystkie niezweryfikowane unie gui.player.list.title=Lista graczy gui.staff.player.list.title=&fLista graczy gui.staff.player.list.lore.left.click=&7Kliknij lewym przyciskiem myszy, aby zobaczyć wszystkich graczy @@ -620,8 +619,8 @@ gui.staff.global.ff.lore.status=&7Status\: &b{0} gui.staff.global.ff.lore.toggle=&7Kliknij lewym przyciskiem myszy, aby przełączyć Friendly Fire gui.staff.reload.title=&fPrzeładuj gui.staff.reload.lore=&7Kliknij lewym przyciskiem myszy, aby przeładować wtyczkę -gui.staff.clanlist.unverified.title=Niezweryfikowane Unie - Razem\: {0} -gui.staff.clanlist.toplace.title=Wybierz nowy unia {0} +gui.staff.unionlist.unverified.title=Niezweryfikowane Unie - Razem\: {0} +gui.staff.unionlist.toplace.title=Wybierz nowy unia {0} gui.warning.title=Ostrzeżenie gui.warning.no.permission.title=&fBrak uprawnień gui.warning.no.permission.plugin.lore=Nie masz uprawnień żeby to zrobić\! @@ -630,20 +629,20 @@ gui.warning.no.permission.rank.lore=&7Musisz być {0} lub twój lider musi dać gui.warning.not.verified.title=&fNiezweryfikowany gui.warning.not.verified.lore=&7Twój unia musi zostać zweryfikowany\! gui.allies.title=Sojusznicy -gui.allies.clan.lore=&7Kliknij prawym przyciskiem myszy, aby usunąć tego sojusznika +gui.allies.union.lore=&7Kliknij prawym przyciskiem myszy, aby usunąć tego sojusznika gui.allies.add.title=&fDodaj sojusznika gui.add.ally.title=Dodaj sojusznika -gui.add.ally.clan.lore=&7Kliknij lewym przyciskiem myszy, aby zobaczyć listę unii +gui.add.ally.union.lore=&7Kliknij lewym przyciskiem myszy, aby zobaczyć listę unii gui.rivals.title=Wrgogowie -gui.rivals.clan.lore=&7Kliknij prawym przyciskiem myszy, aby usunąć tego sojusznika +gui.rivals.union.lore=&7Kliknij prawym przyciskiem myszy, aby usunąć tego sojusznika gui.rivals.add.title=&fDodaj rywala gui.add.rival.title=Dodaj rywala -gui.add.rival.clan.lore=&7Kliknij lewym przyciskiem myszy, aby rywalizować z unią -gui.clanlist.title=Unie - Razem\: {0} -gui.clanlist.clan.title=&fUnia\: [{0}&f] {1} -gui.clanlist.clan.lore.position=&b\#{0} -gui.clanlist.clan.lore.kdr=&7KDR\: &b{0} -gui.clanlist.clan.lore.members=&7Członkowie\: &b{0} +gui.add.rival.union.lore=&7Kliknij lewym przyciskiem myszy, aby rywalizować z unią +gui.unionlist.title=Unie - Razem\: {0} +gui.unionlist.union.title=&fUnia\: [{0}&f] {1} +gui.unionlist.union.lore.position=&b\#{0} +gui.unionlist.union.lore.kdr=&7KDR\: &b{0} +gui.unionlist.union.lore.members=&7Członkowie\: &b{0} gui.coords.title=Współrzędne gui.coords.player.lore.distance=&7Odległość\: &b{0} gui.coords.player.lore.coords=&7Współrzędne\: &b{0} {1} {2} @@ -673,83 +672,83 @@ gui.permissions.permission.lore=&7Kliknij prawym przyciskiem myszy, aby usunąć gui.add.permission.title=Dodaj uprawnienie gui.add.permission.permission.title=&f{0} gui.add.permission.permission.lore=&7Kliknij lewym przyciskiem myszy aby dodać to uprawnienie do rangi -gui.clandetails.title={0} {1} -gui.clandetails.free.agent.title=&fStwórz Swój unia -gui.clandetails.free.agent.create.clan.price.lore=&7Cena\: &b{0} -gui.clandetails.free.agent.create.clan.lore=&7Kliknij lewym przyciskiem myszy, aby utworzyć unia -gui.clandetails.clan.title=&f[{0}&f] {1} -gui.clandetails.clan.lore.description=&7Opis\: &b{0} -gui.clandetails.clan.lore.status=&7Status\: &b{0} -gui.clandetails.clan.lore.leaders=&7Liderzy\: &b{0} -gui.clandetails.clan.lore.online.members=&7Członkowie online\: &b{0}/{1} -gui.clandetails.clan.lore.kdr=&7KDR\: &b{0} -gui.clandetails.clan.lore.kill.totals=&7Kille Razem\: &b[Wrogowie\:{0} Neutralni\:{1} Cywile\:{2}] -gui.clandetails.clan.lore.deaths=&7Smierci\: &b{0} +gui.uniondetails.title={0} {1} +gui.uniondetails.free.agent.title=&fStwórz Swój unia +gui.uniondetails.free.agent.create.union.price.lore=&7Cena\: &b{0} +gui.uniondetails.free.agent.create.union.lore=&7Kliknij lewym przyciskiem myszy, aby utworzyć unia +gui.uniondetails.union.title=&f[{0}&f] {1} +gui.uniondetails.union.lore.description=&7Opis\: &b{0} +gui.uniondetails.union.lore.status=&7Status\: &b{0} +gui.uniondetails.union.lore.leaders=&7Liderzy\: &b{0} +gui.uniondetails.union.lore.online.members=&7Członkowie online\: &b{0}/{1} +gui.uniondetails.union.lore.kdr=&7KDR\: &b{0} +gui.uniondetails.union.lore.kill.totals=&7Kille Razem\: &b[Wrogowie\:{0} Neutralni\:{1} Cywile\:{2}] +gui.uniondetails.union.lore.deaths=&7Smierci\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.allies.separator=&b, +gui.uniondetails.union.lore.allies.separator=&b, # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.rivals.separator=&b, -gui.clandetails.clan.lore.allies=&7Sojusznicy\: {0} -gui.clandetails.clan.lore.rivals=&7Wrogowie\: &b{0} -gui.clandetails.clan.lore.founded=&7Założono\: &b{0} -gui.clandetails.clan.lore.inactive=&7Nieaktywne\: &b{0}/{1} dni -gui.clandetails.allies.title=&fSojusznicy -gui.clandetails.allies.lore=&7Kliknij lewym przyciskiem myszy, aby zobaczyć swoich sojuszników lub dodać więcej -gui.clandetails.rivals.title=&fWrogowie -gui.clandetails.rivals.lore=&7Kliknij lewym przyciskiem myszy aby zobaczyć swoich rywali lub dodać więcej -gui.clandetails.roster.title=&fLista -gui.clandetails.roster.lore=&7Kliknij lewym przyciskiem myszy, aby zobaczyć członków unii lub zaprosić więcej -gui.staffclandetails.roster.lore=&7Kliknij lewym przyciskiem myszy, aby zobaczyć listę unii -gui.clandetails.coords.title=&fWspółrzędne -gui.clandetails.coords.lore=&7Pokazuje współrzędne członków unii -gui.clandetails.home.title=&fHome -gui.clandetails.home.lore.teleport.price=&7Cena Teleportacji\: &b{0} -gui.clandetails.home.lore.teleport=&7Kliknij lewym przyciskiem myszy, aby teleportować się do domu unii -gui.staffclandetails.home.lore.teleport=&7Kliknij lewym przyciskiem myszy, aby teleportować się do domu unii -gui.clandetails.home.lore.clear=&7Upuść przedmiot, aby usunąć dom unii -gui.clandetails.home.lore.set.price=&7Ustaw cenę\: &b{0} -gui.clandetails.home.lore.set=&7Kliknij prawym przyciskiem myszy, aby ustawić dom unii -gui.staffclandetails.home.lore.set=&7Kliknij prawym przyciskiem myszy, aby ustawić dom unii -gui.clandetails.regroup.title=&fPrzegrupowanie -gui.clandetails.regroup.lore.price=&7Cena\: &b{0} -gui.clandetails.regroup.lore.home=&7Kliknij lewym przyciskiem myszy, aby przegrupować członków unii w bazie -gui.clandetails.regroup.lore.me=&7Kliknij prawym przyciskiem myszy, aby przegrupować członków unii w Twojej lokalizacji -gui.clandetails.ff.title=&fFriendly Fire -gui.clandetails.ff.personal.lore=&7Osobiste\: &b{0} -gui.clandetails.ff.clan.lore=&7Unia\: &b{0} -gui.clandetails.ff.personal.toggle.lore=&7Kliknij lewym przyciskiem myszy, aby przełączyć Friendly Fire -gui.clandetails.ff.clan.toggle.lore=&7Kliknij lewym przyciskiem myszy, aby przełączyć unii Friendly Fire -gui.clandetails.bank.title=&fBank -gui.clandetails.bank.balance.lore=&7Saldo\: &b{0} -gui.clandetails.bank.withdraw.status.lore=&7Wypłata\: &b{0} -gui.clandetails.bank.deposit.status.lore=&7Depozyt\: &b{0} -gui.clandetails.bank.withdraw.toggle.lore=&7Upuść przedmiot, aby przełączyć status wypłaty -gui.clandetails.bank.deposit.toggle.lore=&7Kliknij prawym przyciskiem myszy, aby przełączyć status wpłaty -gui.clandetails.rank.title=&fRanga -gui.clandetails.rank.lore=&7Kliknij lewym przyciskiem myszy, aby zobaczyć rangi unii i edytować je -gui.clandetails.verified.title=&fZweryfikowano -gui.clandetails.not.verified.title=&fNiezweryfikowany -gui.clandetails.verify.price.lore=&7Cena\: &b{0} -gui.clandetails.not.verified.lore=&7Kliknij lewym przyciskiem myszy, aby zweryfikować swój unia -gui.staffclandetails.not.verified.lore=&7Kliknij lewym przyciskiem myszy, aby zweryfikować ten unia -gui.clandetails.resign.title=&fZrezygnuj -gui.clandetails.resign.lore=&7Kliknij lewym przyciskiem myszy, aby zrezygnować z unii -gui.clandetails.disband.title=&fRozwiąż -gui.clandetails.disband.lore=&7Upuść przedmiot, aby rozwiązać swój unia -gui.staffclandetails.disband.lore=&7Kliknij lewym przyciskiem myszy, aby rozwiązać ten unia. -gui.clandetails.chat.title=&fCzat -gui.clandetails.chat.clan.chat.lore=&7/{0} [message] - &bWysyła wiadomość do czatu uniaowego -gui.clandetails.chat.clan.join.leave.lore=&7/{0} {1}/{2} - &bDołącza/opuszcza czat uniaowy -gui.clandetails.chat.ally.chat.lore=&7/{0} [message] - &bWysyła wiadomość do czatu sojusznika -gui.clandetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bDołącza/opuszcza czat sojusznika -gui.clandetails.chat.clan.status.lore=&7Unia\: &b{0} -gui.clandetails.chat.ally.status.lore=&7Sojusznicy\: &b{0} -gui.clandetails.chat.clan.toggle.lore=&7Kliknij lewym przyciskiem myszy, aby przełączyć status czatu uniaowego -gui.clandetails.chat.ally.toggle.lore=&7Kliknij prawym przyciskiem myszy, aby przełączyć status czatu sojusznika +gui.uniondetails.union.lore.rivals.separator=&b, +gui.uniondetails.union.lore.allies=&7Sojusznicy\: {0} +gui.uniondetails.union.lore.rivals=&7Wrogowie\: &b{0} +gui.uniondetails.union.lore.founded=&7Założono\: &b{0} +gui.uniondetails.union.lore.inactive=&7Nieaktywne\: &b{0}/{1} dni +gui.uniondetails.allies.title=&fSojusznicy +gui.uniondetails.allies.lore=&7Kliknij lewym przyciskiem myszy, aby zobaczyć swoich sojuszników lub dodać więcej +gui.uniondetails.rivals.title=&fWrogowie +gui.uniondetails.rivals.lore=&7Kliknij lewym przyciskiem myszy aby zobaczyć swoich rywali lub dodać więcej +gui.uniondetails.roster.title=&fLista +gui.uniondetails.roster.lore=&7Kliknij lewym przyciskiem myszy, aby zobaczyć członków unii lub zaprosić więcej +gui.staffuniondetails.roster.lore=&7Kliknij lewym przyciskiem myszy, aby zobaczyć listę unii +gui.uniondetails.coords.title=&fWspółrzędne +gui.uniondetails.coords.lore=&7Pokazuje współrzędne członków unii +gui.uniondetails.home.title=&fHome +gui.uniondetails.home.lore.teleport.price=&7Cena Teleportacji\: &b{0} +gui.uniondetails.home.lore.teleport=&7Kliknij lewym przyciskiem myszy, aby teleportować się do domu unii +gui.staffuniondetails.home.lore.teleport=&7Kliknij lewym przyciskiem myszy, aby teleportować się do domu unii +gui.uniondetails.home.lore.clear=&7Upuść przedmiot, aby usunąć dom unii +gui.uniondetails.home.lore.set.price=&7Ustaw cenę\: &b{0} +gui.uniondetails.home.lore.set=&7Kliknij prawym przyciskiem myszy, aby ustawić dom unii +gui.staffuniondetails.home.lore.set=&7Kliknij prawym przyciskiem myszy, aby ustawić dom unii +gui.uniondetails.regroup.title=&fPrzegrupowanie +gui.uniondetails.regroup.lore.price=&7Cena\: &b{0} +gui.uniondetails.regroup.lore.home=&7Kliknij lewym przyciskiem myszy, aby przegrupować członków unii w bazie +gui.uniondetails.regroup.lore.me=&7Kliknij prawym przyciskiem myszy, aby przegrupować członków unii w Twojej lokalizacji +gui.uniondetails.ff.title=&fFriendly Fire +gui.uniondetails.ff.personal.lore=&7Osobiste\: &b{0} +gui.uniondetails.ff.union.lore=&7Unia\: &b{0} +gui.uniondetails.ff.personal.toggle.lore=&7Kliknij lewym przyciskiem myszy, aby przełączyć Friendly Fire +gui.uniondetails.ff.union.toggle.lore=&7Kliknij lewym przyciskiem myszy, aby przełączyć unii Friendly Fire +gui.uniondetails.bank.title=&fBank +gui.uniondetails.bank.balance.lore=&7Saldo\: &b{0} +gui.uniondetails.bank.withdraw.status.lore=&7Wypłata\: &b{0} +gui.uniondetails.bank.deposit.status.lore=&7Depozyt\: &b{0} +gui.uniondetails.bank.withdraw.toggle.lore=&7Upuść przedmiot, aby przełączyć status wypłaty +gui.uniondetails.bank.deposit.toggle.lore=&7Kliknij prawym przyciskiem myszy, aby przełączyć status wpłaty +gui.uniondetails.rank.title=&fRanga +gui.uniondetails.rank.lore=&7Kliknij lewym przyciskiem myszy, aby zobaczyć rangi unii i edytować je +gui.uniondetails.verified.title=&fZweryfikowano +gui.uniondetails.not.verified.title=&fNiezweryfikowany +gui.uniondetails.verify.price.lore=&7Cena\: &b{0} +gui.uniondetails.not.verified.lore=&7Kliknij lewym przyciskiem myszy, aby zweryfikować swój unia +gui.staffuniondetails.not.verified.lore=&7Kliknij lewym przyciskiem myszy, aby zweryfikować ten unia +gui.uniondetails.resign.title=&fZrezygnuj +gui.uniondetails.resign.lore=&7Kliknij lewym przyciskiem myszy, aby zrezygnować z unii +gui.uniondetails.disband.title=&fRozwiąż +gui.uniondetails.disband.lore=&7Upuść przedmiot, aby rozwiązać swój unia +gui.staffuniondetails.disband.lore=&7Kliknij lewym przyciskiem myszy, aby rozwiązać ten unia. +gui.uniondetails.chat.title=&fCzat +gui.uniondetails.chat.union.chat.lore=&7/{0} [message] - &bWysyła wiadomość do czatu uniaowego +gui.uniondetails.chat.union.join.leave.lore=&7/{0} {1}/{2} - &bDołącza/opuszcza czat uniaowy +gui.uniondetails.chat.ally.chat.lore=&7/{0} [message] - &bWysyła wiadomość do czatu sojusznika +gui.uniondetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bDołącza/opuszcza czat sojusznika +gui.uniondetails.chat.union.status.lore=&7Unia\: &b{0} +gui.uniondetails.chat.ally.status.lore=&7Sojusznicy\: &b{0} +gui.uniondetails.chat.union.toggle.lore=&7Kliknij lewym przyciskiem myszy, aby przełączyć status czatu uniaowego +gui.uniondetails.chat.ally.toggle.lore=&7Kliknij prawym przyciskiem myszy, aby przełączyć status czatu sojusznika gui.playerdetails.title={0} gui.playerdetails.player.title=&f{0} -gui.playerdetails.player.lore.noclan=&7Unia\: &bBrak -gui.playerdetails.player.lore.clan=&7Unia\: &b[{0}&b] {1} +gui.playerdetails.player.lore.nounion=&7Unia\: &bBrak +gui.playerdetails.player.lore.union=&7Unia\: &b[{0}&b] {1} gui.playerdetails.player.lore.rank=&7Ranga\: &b{0} gui.playerdetails.player.lore.status=&7Status\: &b{0} gui.playerdetails.player.lore.kdr=&7KDR\: &b{0} @@ -758,8 +757,8 @@ gui.playerdetails.player.lore.deaths=&7Smierci\: &b{0} gui.playerdetails.player.lore.join.date=&7Data dołączenia\: &b{0} gui.playerdetails.player.lore.last.seen=&7Ostatnio widziany\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.playerdetails.player.lore.past.clans.separator=&b, -gui.playerdetails.player.lore.past.clans=&7Poprzednie unie\: &b{0} +gui.playerdetails.player.lore.past.unions.separator=&b, +gui.playerdetails.player.lore.past.unions=&7Poprzednie unie\: &b{0} gui.playerdetails.player.lore.inactive=&7Nieaktywne\: &b{0}/{1} dni gui.playerdetails.kick.title=&fWyrzuć gui.playerdetails.promote.demote.title=&fPromocja/Degradacja @@ -783,55 +782,53 @@ gui.languageselector.title=Języki - obecnie\: {0} gui.languageselector.language.title=&f{0} gui.languageselector.language.lore.left.click=&7Kliknij lewym przyciskiem myszy, aby wybrać swój język gui.languageselector.language.lore.translation.status=&7Status tłumaczenia\: &b{0}% -gui.languageselector.language.lore.right.click=&7Kliknij prawym przyciskiem myszy, aby pomóc w tłumaczeniu gui.confirmation.title=Potwierdź gui.confirmation.confirm=&7Kliknij tutaj, aby potwierdzić gui.confirmation.return=&7Kliknij tutaj, aby powrócić gui.not.supported=&cWystąpił błąd podczas otwierania GUI\! Wyłączanie... Czy pobrałeś poprawną wersję? -staff.member.verify.clan=&cAdmin musi zweryfikować Twój unia\! +staff.member.verify.union=&cAdmin musi zweryfikować Twój unia\! player.already.has.that.rank=&cGracz ma już taką rangę\! -joined.clan.chat=&bDołączyłeś do uniaowego czatu -already.joined.clan.chat=&bJuż dołączyłeś do czatu uniaowego -left.clan.chat=&bOpuściłeś czat uniaowy -muted.clan.chat=&bWyciszyłeś czat uniaowy -unmuted.clan.chat=&bWyciszyłeś czat uniaowy +joined.union.chat=&bDołączyłeś do uniaowego czatu +already.joined.union.chat=&bJuż dołączyłeś do czatu uniaowego +left.union.chat=&bOpuściłeś czat uniaowy +muted.union.chat=&bWyciszyłeś czat uniaowy +unmuted.union.chat=&bWyciszyłeś czat uniaowy joined.ally.chat=&bDołączyłeś do czatu sojusznika left.ally.chat=&bOpuściłeś czat sojusznika muted.ally.chat=&bWyciszyłeś czat uniaowy unmuted.ally.chat=&bWłączyłeś czat uniaowy already.joined.ally.chat=&bJuż dołączyłeś do czatu sojuszniczego -player.already.in.this.clan=&cGracz jest już w tym unii -your.clan.reached.max.alliances=&cTwój unia osiągnął maksymalną liczbę sojuszy -other.clan.reached.max.alliances=&cTen unia osiągnął maksymalną liczbę sojuszy -insert.clan.tag=&bWprowadź tag uniaowy (lub "{0}")\: -insert.clan.name=&bWprowadź nazwę unii\: +player.already.in.this.union=&cGracz jest już w tym unii +your.union.reached.max.alliances=&cTwój unia osiągnął maksymalną liczbę sojuszy +other.union.reached.max.alliances=&cTen unia osiągnął maksymalną liczbę sojuszy +insert.union.tag=&bWprowadź tag uniaowy (lub "{0}")\: +insert.union.name=&bWprowadź nazwę unii\: insert.rank.name=&bWprowadź nazwę rangi (lub "{0}")\: -click.to.help.translating=&bKliknij ten link, aby pomóc w tłumaczeniu\:\n&r{0} -your.clan.must.have.members.to.verify=&cTwój unia musi mieć co najmniej {0} członków, aby mógł zostać zweryfikowany\! +your.union.must.have.members.to.verify=&cTwój unia musi mieć co najmniej {0} członków, aby mógł zostać zweryfikowany\! you.must.hold.a.banner=&cMusisz mieć baner w ręce\! -you.changed.clan.banner=&bZmieniłeś baner Twojego unii\! -your.clan.already.verified=&Ten unia jest już zweryfikowany\! +you.changed.union.banner=&bZmieniłeś baner Twojego unii\! +your.union.already.verified=&Ten unia jest już zweryfikowany\! # suppress inspection "TrailingSpacesInProperty" -clan.profile=\n&7Profil unii &b%clan_name% &8-------------------------------------------\n \n &7Nazwa\: &e[&8%clan_color_tag%&e] &b%clan_name%\n &7Opis\: &f%clan_description%\n &7Status\: &f%clan_status%\n &7Liderzy\: %clan_leaders%\n &7Członkowie Online\: &f%clan_online_count%&7/&f%clan_size%\n &7KDR\: &e%clan_kdr%\n &7Suma Zabójstw\: &8[Rywale\:&f%clan_rival_kills% &8Sojusznicy\:&f%clan_ally_kills% &8Neutralni\:&f%clan_neutral_kills% &8Cywile\:&f%clan_civilian_kills%&8]\n &7Zgony\: &f%clan_deaths%\n &7Sojusznicy\: &f%clan_allies%\n &7Wrogowie\: &f%clan_rivals%\n &7Unia Założony\: &f%clan_founded%\n &7Nieaktywność\: &f%clan_inactive_days%&7/&f%clan_max_inactive_days% dni\n -player.lookup.clanname=&e[&8%clan_color_tag%&e] &b%clan_name% +union.profile=\n&7Profil unii &b%union_name% &8-------------------------------------------\n \n &7Nazwa\: &e[&8%union_color_tag%&e] &b%union_name%\n &7Opis\: &f%union_description%\n &7Status\: &f%union_status%\n &7Członkowie Online\: &f%union_online_count%&7/&f%union_size%\n &7KDR\: &e%union_kdr%\n &7Suma Zabójstw\: &8[Rywale\:&f%union_rival_kills% &8Sojusznicy\:&f%union_ally_kills% &8Neutralni\:&f%union_neutral_kills% &8Cywile\:&f%union_civilian_kills%&8]\n &7Zgony\: &f%union_deaths%\n &7Sojusznicy\: &f%union_allies%\n &7Wrogowie\: &f%union_rivals%\n &7Unia Założony\: &f%union_founded%\n &7Nieaktywność\: &f%union_inactive_days%&7/&f%union_max_inactive_days% dni\n +player.lookup.unionname=&e[&8%union_color_tag%&e] &b%union_name% # suppress inspection "TrailingSpacesInProperty" player.lookup.killtype=&7Typ zabójstwa\: %player_kill_type%\n -player.lookup=\n&7Informacje o graczu &b%player_name% &8-------------------------------------------\n \n &7Unia\: &f%clan_name%\n &7Ranking\: &f%player_rank%\n &7Status\: &f%player_status%\n &7KDR\: &e%player_kdr%\n &7Suma Zabójstw\: &8[Rywale\:&f%player_rival_kills% &8Sojusznicy\:&7%player_ally_kills% &8Neutralni\:&f%player_neutral_kills% &8Cywile\:&f%player_civilian_kills%&8]\n &7Zgodny\: &f%player_deaths%\n &7Data Dołączenia\: &f%player_join_date%\n &7Ostatnio Widziany\: &f%player_last_seen%\n &7Poprzednie Unie\: &f%player_past_clans%\n &7Nieaktywność\: &f%player_inactive_days%&7/&f%player_max_inactive_days% dni\n %kill_type_line% +player.lookup=\n&7Informacje o graczu &b%player_name% &8-------------------------------------------\n \n &7Unia\: &f%union_name%\n &7Status\: &f%player_status%\n &7KDR\: &e%player_kdr%\n &7Suma Zabójstw\: &8[Rywale\:&f%player_rival_kills% &8Sojusznicy\:&7%player_ally_kills% &8Neutralni\:&f%player_neutral_kills% &8Cywile\:&f%player_civilian_kills%&8]\n &7Zgodny\: &f%player_deaths%\n &7Data Dołączenia\: &f%player_join_date%\n &7Ostatnio Widziany\: &f%player_last_seen%\n &7Poprzednie Unie\: &f%player_past_unions%\n &7Nieaktywność\: &f%player_inactive_days%&7/&f%player_max_inactive_days% dni\n %kill_type_line% economy.disabled=&cGospodarka wyłączona\! has.been.purged=Dane {0}zostały wyczyszczone accepted.invitation=&bZaakceptowałeś zaproszenie {0} denied.invitation=&cOdmówiłeś zaproszenia {0} -must.be.in.clan.to.pvp=&cTy i {0} musisz być członkami unii do PvP\! -clans.not.at.war.pvp.denied=&cTwój unia nie jest w wojnie z {0}\! +must.be.in.union.to.pvp=&cTy i {0} musisz być członkami unii do PvP\! +unions.not.at.war.pvp.denied=&cTwój unia nie jest w wojnie z {0}\! cannot.attack.civilians=&cNie możesz atakować cywilów\! -cannot.attack.clan.member=&cNie możesz zaatakować innego członka unii\! +cannot.attack.union.member=&cNie możesz zaatakować innego członka unii\! cannot.attack.ally=&cNie możesz zaatakować sojusznika\! cannot.send.discord.message=Nie możesz wysyłać wiadomości do {0}. Nie jesteś członkiem tego unii\! discordhook.is.disabled=&cIntegracja Discord jest wyłączona lub niedostępna\! -your.clan.doesnt.have.any.linked.player=Twój unia nie ma żadnych powiązanych graczy -your.clan.doesnt.have.minimum.linked.player=Twój unia nie posiada minimum powiązanych graczy -your.clan.is.not.on.the.whitelist=Twój unia nie jest na białej liście -your.clan.already.has.channel=Twój unia ma już kanał Discord +your.union.doesnt.have.any.linked.player=Twój unia nie ma żadnych powiązanych graczy +your.union.doesnt.have.minimum.linked.player=Twój unia nie posiada minimum powiązanych graczy +your.union.is.not.on.the.whitelist=Twój unia nie jest na białej liście +your.union.already.has.channel=Twój unia ma już kanał Discord discord.reached.category.limit=Discord osiągnął limit kategorii\! discord.reached.channels.limit=Discord osiągnął limit kanałów\! discord.created.successfully=&bKanał Discord został utworzony pomyślnie\! @@ -841,19 +838,19 @@ cannot.kick.last.leader=&cNie możesz wyrzucić ostatniego lidera\! cannot.disband.permanent=&cNie możesz rozwiązać tego unii. Ma on stały status. you.can.only.set.base.in.your.land=&cMożesz ustawić dom tylko na swojej ziemi\! only.leaders.can.create.lands=&cTylko liderzy mogą tworzyć ziemię\! -only.one.land.per.clan=&cTwój unia ma już ziemię\! -only.clan.members.can.create.lands=&cTylko członkowie unii mogą tworzyć ziemię\! +only.one.land.per.union=&cTwój unia ma już ziemię\! +only.union.members.can.create.lands=&cTylko członkowie unii mogą tworzyć ziemię\! land.allowed.all.actions=&bWszystkie akcje są teraz dozwolone\! land.blocked.all.actions=&bWszystkie akcje są teraz zablokowane\! land.allowed.action=&bAkcja dozwolona\! land.blocked.action=&bAkcja zablokowana\! you.do.not.own.lands=&cNie posiadasz ziemi\! land.sharing.disabled=&cDzielenie ziemi jest wyłączone\! -clan.chat.disabled=&cCzat uniaowy jest wyłączony\! +union.chat.disabled=&cCzat uniaowy jest wyłączony\! ally.chat.disabled=&cCzat sojuszniczy jest wyłączony\! war.expired=Wojna z {0} wygasła\! you.cant.start.war.online.members.difference=Nie możesz rozpocząć wojny. Jeden unia ma więcej członków online niż drugi. invitedplayer.invite.off=Ten gracz wyłączył zaproszenia do unii user.hasnt.played.before=&cTen użytkownik nie grał wcześniej -clan.list.balance.header=\n{0} &7górne saldo &8-----------------------\n \n&8Wszystkich unii\: &7{1}\n \n&8\#&7. &8Union &7- &8Saldo -clan.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} +union.list.balance.header=\n{0} &7górne saldo &8-----------------------\n \n&8Wszystkich unii\: &7{1}\n \n&8\#&7. &8Union &7- &8Saldo +union.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} diff --git a/src/main/resources/messages_pt_BR.properties b/src/main/resources/messages_pt_BR.properties index d74f39b3..bfa4c023 100644 --- a/src/main/resources/messages_pt_BR.properties +++ b/src/main/resources/messages_pt_BR.properties @@ -66,7 +66,7 @@ admin.command=admin mod.command=mod promote.command=promover demote.command=rebaixar -clanff.command=clanff +unionff.command=unionff ff.command=ff resign.command=abandonar disband.command=debandar @@ -105,7 +105,7 @@ acf-core.parameter.tag=tag acf-core.parameter.name=nome acf-core.parameter.description=descricao acf-core.parameter.player=jogador -acf-core.parameter.clan=união +acf-core.parameter.union=união acf-core.parameter.type=tipo acf-core.parameter.order=ordem acf-core.parameter.help=página ou palavras-chave @@ -148,8 +148,8 @@ command.description.ff.allow=Define o seu fogo amigo pessoal como permitido command.description.ff.auto=Define o seu fogo amigo pessoal como automático command.description.globalff.allow=Define o fogo amigo global como permitido command.description.globalff.auto=Define o fogo amigo global como automático -command.description.clanff.allow=Define o fogo amigo do seu união como permitido -command.description.clanff.block=Define o fogo amigo do seu união como bloqueado +command.description.unionff.allow=Define o fogo amigo do seu união como permitido +command.description.unionff.block=Define o fogo amigo do seu união como bloqueado command.description.description=Define a descrição do seu união command.description.ban=Bane um jogador de comandos de união command.description.unban=Desbane um jogador de comandos de união @@ -177,7 +177,7 @@ command.description.untrust=Marca um jogador como não-confiável command.description.resign=Abandona o seu união command.description.help=Mostra esta ajuda ou pesquisa na ajuda command.description.ally.add=Adiciona um aliado -command.description.clan=Abre a GUI +command.description.union=Abre a GUI command.description.disband=Debanda o seu união command.description.mod.disband=Debanda um união command.description.mod.kick=Expulsa um jogador de um união @@ -232,7 +232,7 @@ command.description.mod.locale=Define o idioma do jogador home-menu=/{0} base{1} - Teleporta para a base do união home-set-menu=/{0} base set{1} - Define a base do união home-clear-menu=/{0} base clear{1} - Apaga a base do união -clan=União +union=União allies=Aliados alliances=aliancas coords=coordenadas @@ -242,7 +242,7 @@ coords.upper=Coordenadas world=Mundo kdr=KDR members=Membros -clans.lower=uniões +unions.lower=uniões rival=Rival civilian=Civil neutral=Neutro @@ -286,9 +286,9 @@ nokillsfound=Nenhuma morte encontrada promoted.to.leader={0} foi promovido para líder denied.demotion={0} negou o rebaixamento de {1}. Não houve consenso. membership.invitation={0} negou o pedido para ser membro -joined.the.clan={0} entrou no união +joined.the.union={0} entrou no união signed.off.request.cancelled={0} saiu. Pedido de {1} cancelado. -clan.deletion={0} negou a remoção do união. Não houve consenso. +union.deletion={0} negou a remoção do união. Não houve consenso. rename.refused={0} negou a renomeação do união. O consenso falhou. has.been.disbanded=União {0} foi debandado denied.the.promotion={0} negou a promoção de {1}. Não houve consenso. @@ -324,9 +324,9 @@ mysql.connection.failed=Conexão MySQL falhou sqlite.connection.successful=Conexão SQLite bem sucedida sqlite.connection.failed= Conexão SQLite falhou purging.player.data=apagando dados do jogador\: {0} -purging.clan=Apagando união\: {0} -clan.players=Jogadores\: {0} -clans=Uniões\: {0} +purging.union=Apagando união\: {0} +union.players=Jogadores\: {0} +unions=Uniões\: {0} banned=Você foi banido de usar comandos de união nothing.more.to.see=Nada mais para ver nothing.to.vote=&cNada para aceitar ou negar @@ -339,78 +339,78 @@ bulletin.board.header=&8* &e{0} &fquadro de avisos bulletin.board.message={0}\: &f{1} has.been.disbanded.rivalry.ended={0} foi debandado. A rivalidade terminou. has.been.disbanded.alliance.ended={0} foi debandado. A aliança terminou. -clan.disbanded=União debandado +union.disbanded=União debandado 1.color.day=1 {0}dia many.color.days={0}{1} dias insufficient.permissions=Permissões insuficientes -clan.is.not.verified=União não é verificado -player.not.a.member.of.any.clan=&cO jogador não é membro de nenhum união -not.a.member.of.any.clan=Você não é membro de nenhum união +union.is.not.verified=União não é verificado +player.not.a.member.of.any.union=&cO jogador não é membro de nenhum união +not.a.member.of.any.union=Você não é membro de nenhum união minimum.to.make.alliance=Seu união deve ter pelo menos {0} membros para fazer alianças -cannot.be.same.clan=&cVocê deve inserir um união diferente do seu\! -other.clan.not.verified=&cO outro união não é verificado\! -your.clans.are.not.allies=Seus uniões não são aliados +cannot.be.same.union=&cVocê deve inserir um união diferente do seu\! +other.union.not.verified=&cO outro união não é verificado\! +your.unions.are.not.allies=Seus uniões não são aliados has.broken.the.alliance={0} quebrou a aliança com {1} at.least.one.leader.accept.the.alliance=Pelo menos um líder do outro união precisa estar online para aceitar a aliança leaders.have.been.asked.for.an.alliance=Um pedido de aliança foi enviado para os líderes de {0} -your.clans.are.already.allies=Seus uniões já são aliados -your.clan.cannot.create.rivals=Seu união não pode criar rivais +your.unions.are.already.allies=Seus uniões já são aliados +your.union.cannot.create.rivals=Seu união não pode criar rivais min.players.rivalries=Seu união deve ter pelo menos {0} membros para fazer rivalidades this.player.is.already.banned=Este jogador já está banido player.added.to.banned.list=Jogador adicionado a lista de banidos you.banned=Você foi banido de comandos de união -clan.wide.friendly.fire.blocked=Fogo amigo do união bloqueado -clan.wide.friendly.fire.is.allowed=Fogo amigo do união permitido +union.wide.friendly.fire.blocked=Fogo amigo do união bloqueado +union.wide.friendly.fire.is.allowed=Fogo amigo do união permitido you.are.the.only.member.online=Você é o único membro online -your.clan.color.tag.cannot.be.longer.than.characters=&cA tag colorida do seu união não pode ter mais de {0} caracteres -your.clan.tag.cannot.be.longer.than.characters=&c» A tag do seu união não pode ser maior que {0} caracteres -your.clan.tag.must.be.longer.than.characters=&c» A tag do seu união deve ser maior que {0} caracteres +your.union.color.tag.cannot.be.longer.than.characters=&cA tag colorida do seu união não pode ter mais de {0} caracteres +your.union.tag.cannot.be.longer.than.characters=&c» A tag do seu união não pode ser maior que {0} caracteres +your.union.tag.must.be.longer.than.characters=&c» A tag do seu união deve ser maior que {0} caracteres your.tag.cannot.contain.the.following.colors=&c» Sua tag não pode conter as seguintes cores\: {0} your.tag.doesnt.meet.the.requirements=&c» Sua tag não cumpre os requisitos. your.tag.cannot.contain.color.codes=&c» Sua tag não pode conter códigos de cores -your.clan.tag.can.only.contain.letters.numbers.and.color.codes=&c» A tag do seu união pode conter apenas letras, números e códigos de cores +your.union.tag.can.only.contain.letters.numbers.and.color.codes=&c» A tag do seu união pode conter apenas letras, números e códigos de cores you.cannot.set.colored.ranks=Você não pode definir cargos coloridos -your.clan.name.cannot.be.longer.than.characters=O nome do seu união não pode ser maior que {0} caracteres -your.clan.name.must.be.longer.than.characters=O nome do seu união deve ser maior que {0} caracteres -your.clan.name.cannot.contain.color.codes=O nome do seu união não pode conter códigos de cor +your.union.name.cannot.be.longer.than.characters=O nome do seu união não pode ser maior que {0} caracteres +your.union.name.must.be.longer.than.characters=O nome do seu união deve ser maior que {0} caracteres +your.union.name.cannot.contain.color.codes=O nome do seu união não pode conter códigos de cor that.tag.name.is.disallowed=&c» A tag desejada não é permitida. you.must.first.resign=Você antes precisa abandonar {0} -clan.with.this.tag.already.exists=Um união com essa tag já existe -get.your.clan.verified.to.access.advanced.features=Verifique o seu união para ter acesso a funções mais avançadas -clan.created=União {0} criado +union.with.this.tag.already.exists=Um união com essa tag já existe +get.your.union.verified.to.access.advanced.features=Verifique o seu união para ter acesso a funções mais avançadas +union.created=União {0} criado not.enough.leaders.online.to.vote.on.demotion=Não há líderes suficientes online para votar nesse rebaixamento demotion.vote.has.been.requested.from.all.leaders=Um voto de rebaixamento foi pedido a todos os líderes -player.is.not.a.leader.of.your.clan=O jogador não é um líder do seu união +player.is.not.a.leader.of.your.union=O jogador não é um líder do seu união player.is.not.a.leader=O jogador não é um líder -clan.has.been.disbanded=União {0} foi debandado -clan.disband.vote.has.been.requested.from.all.leaders=Um voto para debandar o união foi pedido a todos os líderes -friendy.fire.is.now.managed.by.your.clan=Fogo amigo é agora gerenciado pelo seu união +union.has.been.disbanded=União {0} foi debandado +union.disband.vote.has.been.requested.from.all.leaders=Um voto para debandar o união foi pedido a todos os líderes +friendy.fire.is.now.managed.by.your.union=Fogo amigo é agora gerenciado pelo seu união personal.friendly.fire.is.set.to.allowed=Fogo amigo pessoal foi definido como permitido -global.friendy.fire.is.now.managed.by.each.clan=Fogo amigo global é agora gerenciado por cada união -global.friendy.fire.is.already.being.managed.by.each.clan=Fogo amigo global já está sendo gerenciado por cada união +global.friendy.fire.is.now.managed.by.each.union=Fogo amigo global é agora gerenciado por cada união +global.friendy.fire.is.already.being.managed.by.each.union=Fogo amigo global já está sendo gerenciado por cada união global.friendly.fire.is.set.to.allowed=Fogo amigo global foi definido como permitido global.friendly.fire.is.already.being.allowed=Fogo amigo global já está permitido -the.player.doesn.t.not.have.the.permissions.to.join.clans=O jogador não tem permissão para entrar em uniões +the.player.doesn.t.not.have.the.permissions.to.join.unions=O jogador não tem permissão para entrar em uniões you.cannot.invite.yourself=Você não pode se convidar you.did.not.answer.in.time=Você não respondeu a tempo, cancelando... -this.player.is.banned.from.using.clan.commands=Este jogador foi banido de usar comandos de uniões -the.player.is.already.member.of.another.clan=Este jogador já é membro de outro união +this.player.is.banned.from.using.union.commands=Este jogador foi banido de usar comandos de uniões +the.player.is.already.member.of.another.union=Este jogador já é membro de outro união has.been.asked.to.join=Um convite foi enviado a {0} para entrar em {1} you.cannot.kick.yourself=Você não pode se expulsar -the.player.is.not.a.member.of.your.clan=O jogador não é membro do seu união +the.player.is.not.a.member.of.your.union=O jogador não é membro do seu união you.cannot.kick.another.leader=Você não pode expulsar outro líder has.been.kicked.by={0} foi expulso por {1} -no.clans.have.been.created=Nenhum união foi criado -total.clans=Total de uniões\: +no.unions.have.been.created=Nenhum união foi criado +total.unions=Total de uniões\: legend=Legenda\: kill.type.civilian=Tipo de morte\: {0}Civil no.player.data.found=Nenhum dado de jogador encontrado -clan.0=União\: {0} +union.0=União\: {0} status.0=Estado\: {0} rank.0=Cargo\: {0} kdr.0=KDR\: {0} inactive.0=Inativo\: {0} -clan.commands=comandos de união +union.commands=comandos de união you.can.only.modify.the.color.and.case.of.the.tag=Você pode modificar apenas a cor ou a caixa (maiúsculo ou minúsculo) da tag locale.has.been.changed=&c» O seu idioma foi alterado locale.is.prohibited=&cSeleção Idioma no servidor é proibido. @@ -422,11 +422,11 @@ leaders.0=Líderes\: {0} allies.0=Aliados\: {0} rivals.0=Rivais\: {0} other.player.must.be.online=&cO jogador deve estar online\! -the.player.does.not.have.the.permissions.to.lead.a.clan=O jogador não tem permissões para liderar um união +the.player.does.not.have.the.permissions.to.lead.a.union=O jogador não tem permissões para liderar um união you.cannot.promote.yourself=Você não pode se promover the.player.is.already.a.leader=O jogador já é um líder configuration.reloaded=Configuração recarregada -last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.clan=O último líder não pode renunciar. Você deve nomear outro líder ou dissolver o união +last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.union=O último líder não pode renunciar. Você deve nomear outro líder ou dissolver o união 0.has.resigned={0} abandonou you.cannot.trust.yourself=Você não pode se marcar como confiável leaders.are.already.trusted=Líderes já são confiáveis @@ -434,23 +434,23 @@ this.player.is.already.trusted=Este jogador já é confiável has.been.given.trusted.status.by=A {0} foi dado status de confiável por {1} this.player.is.not.banned=Este jogador não está banido player.removed.from.the.banned.list=Jogador removido da lista de banidos -you.have.been.unbanned.from.clan.commands=Você foi desbanido de comandos de união +you.have.been.unbanned.from.union.commands=Você foi desbanido de comandos de união you.cannot.untrust.yourself=Você não pode se marcar como não-confiável leaders.cannot.be.untrusted=Líderes não podem ser não-confiáveis this.player.is.already.untrusted=Este jogador já é não-confiável has.been.given.untrusted.status.by=A {0} foi dado status de não-confiável por {1} -the.clan.does.not.exist=O união não existe -the.clan.is.already.verified=O união já é verificado -the.clan.has.been.verified=O união foi verificado -clan.0.has.been.verified=O união {0} foi verificado\! -total.clan.players.0=Total de jogadores\: {0} +the.union.does.not.exist=O união não existe +the.union.is.already.verified=O união já é verificado +the.union.has.been.verified=O união foi verificado +union.0.has.been.verified=O união {0} foi verificado\! +total.union.players.0=Total de jogadores\: {0} proposing.war={0} está propondo iniciar uma guerra com {1} you.can.only.start.war.with.rivals=Você pode apenas iniciar guerras com rivais leaders.have.been.asked.to.accept.the.war.request=Um pedido para iniciar uma guerra foi enviado para os líderes de {0} leaders.asked.to.end.rivalry=Um pedido para finalizar a guerra foi enviado para os líderes de {0} proposing.to.end.the.war={0} está propondo o fim da guerra com {1} -clans.already.at.war=Seus uniões já estão em guerra -clans.not.at.war=Seus uniões não estão em guerra +unions.already.at.war=Seus uniões já estão em guerra +unions.not.at.war=Seus uniões não estão em guerra you.are.at.war={0} está agora em guerra com {1} denied.war.req={0} negou o pedido de guerra enviado por {1} you.are.no.longer.at.war={0} não está mais em guerra com {1} @@ -478,12 +478,12 @@ diamond=Diamante gold=Ouro wood=Madeira server.announce=Anúncio de Servidor -clan.announce=Anúncio de União +union.announce=Anúncio de União leader.announce=Anúncio de Líder hunger=Fome stone=pedra iron=ferro -the.clan.cannot.be.rivaled=O união não pode ser rivalizado +the.union.cannot.be.rivaled=O união não pode ser rivalizado bboff=Quadro de avisos desativado bbon=Quadro de avisos ativado inviteon=Convite ativado @@ -507,30 +507,30 @@ waiting.for.teleport.stand.still.for.0.seconds=Aguardando teleporte, fique parad on=ligar off=desligar player.rank.changed=O cargo foi definido -your.clans.are.already.rivals=Seus uniões já são rivais +your.unions.are.already.rivals=Seus uniões já são rivais cleared.bb=Você limpou o quadro de avisos -clan.balance=Saldo do união\: {0} -clan.admin.balance=Saldo de {0}\: R{1} -bb.clan.deposit={0} foram depositados por {1} -player.clan.deposit=Você depositou R{0} -bb.clan.withdraw={0} foram sacados por {1} -bb.clan.take={0} foram retirados por {1} -bb.clan.give={0} foram dados por {1} -bb.clan.set={0} foram definidos por {1} -player.clan.withdraw=Você sacou R{0} -clan.admin.take=Você tirou R{0} do banco de {1} -clan.admin.give=Você deu R{0} para o banco de {1} -clan.admin.set=Você definiu o saldo do banco de {0} para R{1} -clan.admin.bank.not.enough.money=O banco de {0} não tem saldo suficiente\! -clan.bank.not.enough.money=O banco do seu união não tem saldo suficiente -your.clans.are.not.rivals=Seus uniões não são rivais -the.clan.members.reached.limit=Seu união atingiu o limite de membros -this.clan.has.reached.the.member.limit=&bEste união atingiu o limite de membros +union.balance=Saldo do união\: {0} +union.admin.balance=Saldo de {0}\: R{1} +bb.union.deposit={0} foram depositados por {1} +player.union.deposit=Você depositou R{0} +bb.union.withdraw={0} foram sacados por {1} +bb.union.take={0} foram retirados por {1} +bb.union.give={0} foram dados por {1} +bb.union.set={0} foram definidos por {1} +player.union.withdraw=Você sacou R{0} +union.admin.take=Você tirou R{0} do banco de {1} +union.admin.give=Você deu R{0} para o banco de {1} +union.admin.set=Você definiu o saldo do banco de {0} para R{1} +union.admin.bank.not.enough.money=O banco de {0} não tem saldo suficiente\! +union.bank.not.enough.money=O banco do seu união não tem saldo suficiente +your.unions.are.not.rivals=Seus uniões não são rivais +the.union.members.reached.limit=Seu união atingiu o limite de membros +this.union.has.reached.the.member.limit=&bEste união atingiu o limite de membros you.have.reseted.your.kdr=Você redefiniu o seu KDR you.have.reseted.0.kdr=Você redefiniu o KDR de {0} you.have.reseted.kdr.of.all.players=Você redefiniu o KDR de todos os jogadores -you.have.successfully.renamed.your.clan=&bVocê renomeou seu união com sucesso para {0} -you.have.successfully.renamed.the.clan=&bVocê renomeou o união com sucesso para {0} +you.have.successfully.renamed.your.union=&bVocê renomeou seu união com sucesso para {0} +you.have.successfully.renamed.the.union=&bVocê renomeou o união com sucesso para {0} you.have.toggled.permanent.status=Você alternou o status permanente para {0} permanent.status.enabled=O status permanente do seu união foi ativado por {0} permanent.status.disabled=O status permanente do seu união foi desativado por {0} @@ -554,11 +554,11 @@ bb.one.hour=1 hora bb.days= \ dias bb.one.day=1 dia player.purged=Os dados do jogador foram apagados com sucesso -your.clan.description.must.be.longer.than=A descrição do seu união deve ser mais longa que {0} caracteres -your.clan.description.cannot.be.longer.than=A descrição do seu união não pode ser mais longa que {0} caracteres +your.union.description.must.be.longer.than=A descrição do seu união deve ser mais longa que {0} caracteres +your.union.description.cannot.be.longer.than=A descrição do seu união não pode ser mais longa que {0} caracteres description.changed=Você mudou com sucesso a descrição do seu união no.description=Sem descrição -the.player.must.wait.0.before.joining.your.clan.again=Este jogador deve esperar {0} minuto(s) antes de poder entrar no seu união de novo +the.player.must.wait.0.before.joining.your.union.again=Este jogador deve esperar {0} minuto(s) antes de poder entrar no seu união de novo disabled.command=Comando desativado rank.displayname.updated=O nome de exibição do cargo foi atualizado\! rank.setdefault=O cargo padrão do união foi definido como {0} @@ -571,18 +571,18 @@ rank.created=Cargo criado permission.0.added.to.rank.1=Permissão {0} adicionada ao cargo {1} permission.0.removed.from.rank.1=Permissão {0} removida do cargo {1} rank.0.deleted=Cargo {0} deletado -clans.ranks=Cargos do união\: +unions.ranks=Cargos do união\: ranks.list.item={0}\# {1} ({2}) no.ranks=Nenhum cargo foi criado rank.no.permissions=O cargo não tem nenhuma permissão player.unassigned.from.rank=Jogador removido do cargo you.must.be.0.or.have.the.permission.1.to.use.this=Você deve ser {0} ou o seu líder deve dar ao seu cargo a permissão {1} para usar isso -deposit.not.allowed=Depósito não é permitido, use /%clan %toggle %deposit para permitir -withdraw.not.allowed=Saque não é permitido, use /%clan %toggle %withdraw para permitir +deposit.not.allowed=Depósito não é permitido, use /%union %toggle %deposit para permitir +withdraw.not.allowed=Saque não é permitido, use /%union %toggle %withdraw para permitir resign.request.cancelled=Pedido para abandonar união cancelado disband.request.cancelled=Pedido de dissolução cancelado resetkdr.request.cancelled=Solicitação de redefinição KDR cancelada -clan.create.request.cancelled=Solicitação para criação de união cancelada +union.create.request.cancelled=Solicitação para criação de união cancelada rank.create.request.cancelled=Solicitação para criação de cargo cancelada promotion.vote.has.been.requested.from.all.leaders=Um voto de promoção foi pedido a todos os líderes rename.vote.has.been.requested.from.all.leaders=&bA votação para renomear foi solicitada por todos os líderes @@ -599,11 +599,10 @@ gui.lore.no.permission=&cVocê não tem permissão para ver isso\! gui.main.title={0} - menu de uniões gui.main.languageselector.title=&fSelecione seu idioma gui.main.languageselector.lore.left.click=&7Clique com o botão esquerdo para selecionar seu idioma -gui.main.languageselector.lore.right.click=&7Clique com o botão direito para ajudar a traduzir gui.main.other.commands.title=&fOutros comandos gui.main.other.commands.lore=&7Clique com o botão esquerdo para ver todos os comandos de união -gui.main.clan.list.title=&fLista de Uniões -gui.main.clan.list.lore=&7Clique com o botão esquerdo para ver a lista de uniões +gui.main.union.list.title=&fLista de Uniões +gui.main.union.list.lore=&7Clique com o botão esquerdo para ver a lista de uniões gui.main.reset.kdr.title=&fRedefinir KDR gui.main.reset.kdr.lore=&7Clique com o botão esquerdo para redefinir o seu KDR gui.main.leaderboard.title=&fRanking @@ -611,8 +610,8 @@ gui.main.leaderboard.lore=&7Clique com o botão esquerdo para ver o ranking gui.main.staff.title=&fEquipe gui.main.staff.lore=&7Clique com o botão esquerdo para abrir o menu da equipe gui.staff.title=Equipe -gui.staff.clan.list.lore.left.click=&7Clique com o botão esquerdo para ver todos os uniões -gui.staff.clan.list.lore.right.click=&7Clique com o botão direito para ver todos os uniões não verificados +gui.staff.union.list.lore.left.click=&7Clique com o botão esquerdo para ver todos os uniões +gui.staff.union.list.lore.right.click=&7Clique com o botão direito para ver todos os uniões não verificados gui.player.list.title=Lista de jogadores gui.staff.player.list.title=&fLista de jogadores gui.staff.player.list.lore.left.click=&7Clique com o botão esquerdo para ver todos os jogadores @@ -622,8 +621,8 @@ gui.staff.global.ff.lore.status=&7Estado\: &b{0} gui.staff.global.ff.lore.toggle=&7Clique com o botão esquerdo para alternar o fogo amigo gui.staff.reload.title=&fRecarregar gui.staff.reload.lore=&7Clique com o botão esquerdo para recarregar o plugin -gui.staff.clanlist.unverified.title=Uniões Não-Verificados - Total\: {0} -gui.staff.clanlist.toplace.title=Selecione o novo união de {0} +gui.staff.unionlist.unverified.title=Uniões Não-Verificados - Total\: {0} +gui.staff.unionlist.toplace.title=Selecione o novo união de {0} gui.warning.title=Aviso gui.warning.no.permission.title=&fSem permissão gui.warning.no.permission.plugin.lore=&7Você não tem permissão para fazer isso\! @@ -632,20 +631,20 @@ gui.warning.no.permission.rank.lore=&7Você deve ser {0} ou o seu líder deve da gui.warning.not.verified.title=&fNão verificado gui.warning.not.verified.lore=&7Seu união precisa ser verificado\! gui.allies.title=Aliados -gui.allies.clan.lore=&7Clique com o botão direito para remover este aliado +gui.allies.union.lore=&7Clique com o botão direito para remover este aliado gui.allies.add.title=&fAdicionar um aliado gui.add.ally.title=Adicionar um aliado -gui.add.ally.clan.lore=&7Clique com o botão esquerdo para se aliar a este união +gui.add.ally.union.lore=&7Clique com o botão esquerdo para se aliar a este união gui.rivals.title=Rivais -gui.rivals.clan.lore=&7Clique com o botão direito para remover este rival +gui.rivals.union.lore=&7Clique com o botão direito para remover este rival gui.rivals.add.title=&fAdicionar um rival gui.add.rival.title=Adicionar um rival -gui.add.rival.clan.lore=&7Clique com o botão esquerdo para rivalizar com este união -gui.clanlist.title=Uniões - Total\: {0} -gui.clanlist.clan.title=&fUnião\: [{0}&f] {1} -gui.clanlist.clan.lore.position=&b\#{0} -gui.clanlist.clan.lore.kdr=&7KDR\: &b{0} -gui.clanlist.clan.lore.members=&7Membros\: {0} +gui.add.rival.union.lore=&7Clique com o botão esquerdo para rivalizar com este união +gui.unionlist.title=Uniões - Total\: {0} +gui.unionlist.union.title=&fUnião\: [{0}&f] {1} +gui.unionlist.union.lore.position=&b\#{0} +gui.unionlist.union.lore.kdr=&7KDR\: &b{0} +gui.unionlist.union.lore.members=&7Membros\: {0} gui.coords.title=Coordenadas gui.coords.player.lore.distance=&7Distância\: {0} gui.coords.player.lore.coords=&7Coordenadas\: {0} {1} {2} @@ -675,83 +674,83 @@ gui.permissions.permission.lore=&7Clique com o botão direito para remover esta gui.add.permission.title=Adicionar uma permissão gui.add.permission.permission.title=&f{0} gui.add.permission.permission.lore=&7Clique com o botão esquerdo para adicionar esta permissão ao cargo -gui.clandetails.title=[{0}] {1} -gui.clandetails.free.agent.title=&fAgente Livre -gui.clandetails.free.agent.create.clan.price.lore=&7Preço\: &b{0} -gui.clandetails.free.agent.create.clan.lore=&7Clique com o botão esquerdo para criar um união -gui.clandetails.clan.title=&f[{0}&f] {1} -gui.clandetails.clan.lore.description=&7Descrição\: &b{0} -gui.clandetails.clan.lore.status=&7Estado\: &b{0} -gui.clandetails.clan.lore.leaders=&7Líderes\: &b{0} -gui.clandetails.clan.lore.online.members=&7Membros Online\: &b{0}/{1} -gui.clandetails.clan.lore.kdr=&7KDR\: &b{0} -gui.clandetails.clan.lore.kill.totals=&7Matou\: &b[Rival\:{0} Neutro\:{1} Civil\:{2}] -gui.clandetails.clan.lore.deaths=&7Morreu\: &b{0} +gui.uniondetails.title=[{0}] {1} +gui.uniondetails.free.agent.title=&fAgente Livre +gui.uniondetails.free.agent.create.union.price.lore=&7Preço\: &b{0} +gui.uniondetails.free.agent.create.union.lore=&7Clique com o botão esquerdo para criar um união +gui.uniondetails.union.title=&f[{0}&f] {1} +gui.uniondetails.union.lore.description=&7Descrição\: &b{0} +gui.uniondetails.union.lore.status=&7Estado\: &b{0} +gui.uniondetails.union.lore.leaders=&7Líderes\: &b{0} +gui.uniondetails.union.lore.online.members=&7Membros Online\: &b{0}/{1} +gui.uniondetails.union.lore.kdr=&7KDR\: &b{0} +gui.uniondetails.union.lore.kill.totals=&7Matou\: &b[Rival\:{0} Neutro\:{1} Civil\:{2}] +gui.uniondetails.union.lore.deaths=&7Morreu\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.allies.separator=&b, +gui.uniondetails.union.lore.allies.separator=&b, # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.rivals.separator=&b, -gui.clandetails.clan.lore.allies=&7Aliados\: &b{0} -gui.clandetails.clan.lore.rivals=&7Rivais\: &b{0} -gui.clandetails.clan.lore.founded=&7Fundado\: &b{0} -gui.clandetails.clan.lore.inactive=&7Inativo\: &b{0}/{1} dias -gui.clandetails.allies.title=&fAliados -gui.clandetails.allies.lore=&7Clique com o botão esquerdo para ver seus aliados ou adicionar mais -gui.clandetails.rivals.title=&fRivais -gui.clandetails.rivals.lore=&7Clique com o botão esquerdo para ver seus rivais ou adicionar mais -gui.clandetails.roster.title=&fMembros -gui.clandetails.roster.lore=&7Clique com o botão esquerdo para ver os membros do seu união ou convidar mais -gui.staffclandetails.roster.lore=&7Clique com o botão esquerdo para ver os membros do união -gui.clandetails.coords.title=&fCoordenadas -gui.clandetails.coords.lore=&7Clique com o botão esquerdo para ver as coordenadas dos membros do seu união -gui.clandetails.home.title=&fBase -gui.clandetails.home.lore.teleport.price=&7Preço do Teleporte\: &b{0} -gui.clandetails.home.lore.teleport=&7Clique com o botão esquerdo para se teleportar para a base do seu união -gui.staffclandetails.home.lore.teleport=&7Clique com o botão esquerdo para se teleportar para a base deste união -gui.clandetails.home.lore.clear=&7Solte o item para limpar a casa do seu união -gui.clandetails.home.lore.set.price=&7Preço para definir\: &b{0} -gui.clandetails.home.lore.set=&7Clique com o botão direito para definir a base do seu união -gui.staffclandetails.home.lore.set=&7Clique com o botão direito para definir a base deste união -gui.clandetails.regroup.title=&fReagrupar -gui.clandetails.regroup.lore.price=&7Preço\: &b{0} -gui.clandetails.regroup.lore.home=&7Clique com o botão esquerdo para reagrupar os membros do seu união na base do união -gui.clandetails.regroup.lore.me=&7Clique com o botão direito para reagrupar os membros do seu união na sua posição -gui.clandetails.ff.title=&fFogo amigo -gui.clandetails.ff.personal.lore=&fPessoal\: {0} -gui.clandetails.ff.clan.lore=&fUnião\: {0} -gui.clandetails.ff.personal.toggle.lore=&fClique com o botão esquerdo para alternar o seu fogo amigo -gui.clandetails.ff.clan.toggle.lore=&fClique com o botão direito para alternar o fogo amigo do seu união -gui.clandetails.bank.title=&fBanco -gui.clandetails.bank.balance.lore=&7Saldo\: &b{0} -gui.clandetails.bank.withdraw.status.lore=&7Saque\: &b{0} -gui.clandetails.bank.deposit.status.lore=&7Depósito\: &b{0} -gui.clandetails.bank.withdraw.toggle.lore=&7Solte o item para alternar o status de saque -gui.clandetails.bank.deposit.toggle.lore=&7Clique com o botão direito para alternar o estado do depósito -gui.clandetails.rank.title=&fCargo -gui.clandetails.rank.lore=&7Clique com o botão esquerdo para ver os cargos do união e editá-los -gui.clandetails.verified.title=&fVerificado -gui.clandetails.not.verified.title=&fNão verificado -gui.clandetails.verify.price.lore=&7Preço\: &b{0} -gui.clandetails.not.verified.lore=&7Clique com o botão esquerdo para verificar o seu união -gui.staffclandetails.not.verified.lore=&7Clique com o botão esquerdo para verificar este união -gui.clandetails.resign.title=&fAbandonar -gui.clandetails.resign.lore=&7Clique com o botão esquerdo para abandonar o seu união -gui.clandetails.disband.title=&fDebandar -gui.clandetails.disband.lore=&7Solte o item para desfazer seu união -gui.staffclandetails.disband.lore=&7Clique com o botão esquerdo para debandar este união -gui.clandetails.chat.title=&fChat -gui.clandetails.chat.clan.chat.lore=&7/{0} [mensagem] - &bEnvia uma mensagem no chat do união -gui.clandetails.chat.clan.join.leave.lore=&7/{0} {1}/{2} - &bEntrar/Sair do chat do união -gui.clandetails.chat.ally.chat.lore=&7/{0} [mensagem] - &bEnvia uma mensagem no chat dos aliados -gui.clandetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bEntrar/Sair do chat dos aliados -gui.clandetails.chat.clan.status.lore=&fUnião\: {0} -gui.clandetails.chat.ally.status.lore=&7Aliados\: &b{0} -gui.clandetails.chat.clan.toggle.lore=&7Clique com o botão esquerdo para alternar o estado do chat do união -gui.clandetails.chat.ally.toggle.lore=&7Clique com o botão direito para alternar o estado do chat dos aliados +gui.uniondetails.union.lore.rivals.separator=&b, +gui.uniondetails.union.lore.allies=&7Aliados\: &b{0} +gui.uniondetails.union.lore.rivals=&7Rivais\: &b{0} +gui.uniondetails.union.lore.founded=&7Fundado\: &b{0} +gui.uniondetails.union.lore.inactive=&7Inativo\: &b{0}/{1} dias +gui.uniondetails.allies.title=&fAliados +gui.uniondetails.allies.lore=&7Clique com o botão esquerdo para ver seus aliados ou adicionar mais +gui.uniondetails.rivals.title=&fRivais +gui.uniondetails.rivals.lore=&7Clique com o botão esquerdo para ver seus rivais ou adicionar mais +gui.uniondetails.roster.title=&fMembros +gui.uniondetails.roster.lore=&7Clique com o botão esquerdo para ver os membros do seu união ou convidar mais +gui.staffuniondetails.roster.lore=&7Clique com o botão esquerdo para ver os membros do união +gui.uniondetails.coords.title=&fCoordenadas +gui.uniondetails.coords.lore=&7Clique com o botão esquerdo para ver as coordenadas dos membros do seu união +gui.uniondetails.home.title=&fBase +gui.uniondetails.home.lore.teleport.price=&7Preço do Teleporte\: &b{0} +gui.uniondetails.home.lore.teleport=&7Clique com o botão esquerdo para se teleportar para a base do seu união +gui.staffuniondetails.home.lore.teleport=&7Clique com o botão esquerdo para se teleportar para a base deste união +gui.uniondetails.home.lore.clear=&7Solte o item para limpar a casa do seu união +gui.uniondetails.home.lore.set.price=&7Preço para definir\: &b{0} +gui.uniondetails.home.lore.set=&7Clique com o botão direito para definir a base do seu união +gui.staffuniondetails.home.lore.set=&7Clique com o botão direito para definir a base deste união +gui.uniondetails.regroup.title=&fReagrupar +gui.uniondetails.regroup.lore.price=&7Preço\: &b{0} +gui.uniondetails.regroup.lore.home=&7Clique com o botão esquerdo para reagrupar os membros do seu união na base do união +gui.uniondetails.regroup.lore.me=&7Clique com o botão direito para reagrupar os membros do seu união na sua posição +gui.uniondetails.ff.title=&fFogo amigo +gui.uniondetails.ff.personal.lore=&fPessoal\: {0} +gui.uniondetails.ff.union.lore=&fUnião\: {0} +gui.uniondetails.ff.personal.toggle.lore=&fClique com o botão esquerdo para alternar o seu fogo amigo +gui.uniondetails.ff.union.toggle.lore=&fClique com o botão direito para alternar o fogo amigo do seu união +gui.uniondetails.bank.title=&fBanco +gui.uniondetails.bank.balance.lore=&7Saldo\: &b{0} +gui.uniondetails.bank.withdraw.status.lore=&7Saque\: &b{0} +gui.uniondetails.bank.deposit.status.lore=&7Depósito\: &b{0} +gui.uniondetails.bank.withdraw.toggle.lore=&7Solte o item para alternar o status de saque +gui.uniondetails.bank.deposit.toggle.lore=&7Clique com o botão direito para alternar o estado do depósito +gui.uniondetails.rank.title=&fCargo +gui.uniondetails.rank.lore=&7Clique com o botão esquerdo para ver os cargos do união e editá-los +gui.uniondetails.verified.title=&fVerificado +gui.uniondetails.not.verified.title=&fNão verificado +gui.uniondetails.verify.price.lore=&7Preço\: &b{0} +gui.uniondetails.not.verified.lore=&7Clique com o botão esquerdo para verificar o seu união +gui.staffuniondetails.not.verified.lore=&7Clique com o botão esquerdo para verificar este união +gui.uniondetails.resign.title=&fAbandonar +gui.uniondetails.resign.lore=&7Clique com o botão esquerdo para abandonar o seu união +gui.uniondetails.disband.title=&fDebandar +gui.uniondetails.disband.lore=&7Solte o item para desfazer seu união +gui.staffuniondetails.disband.lore=&7Clique com o botão esquerdo para debandar este união +gui.uniondetails.chat.title=&fChat +gui.uniondetails.chat.union.chat.lore=&7/{0} [mensagem] - &bEnvia uma mensagem no chat do união +gui.uniondetails.chat.union.join.leave.lore=&7/{0} {1}/{2} - &bEntrar/Sair do chat do união +gui.uniondetails.chat.ally.chat.lore=&7/{0} [mensagem] - &bEnvia uma mensagem no chat dos aliados +gui.uniondetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bEntrar/Sair do chat dos aliados +gui.uniondetails.chat.union.status.lore=&fUnião\: {0} +gui.uniondetails.chat.ally.status.lore=&7Aliados\: &b{0} +gui.uniondetails.chat.union.toggle.lore=&7Clique com o botão esquerdo para alternar o estado do chat do união +gui.uniondetails.chat.ally.toggle.lore=&7Clique com o botão direito para alternar o estado do chat dos aliados gui.playerdetails.title={0} gui.playerdetails.player.title=&f{0} -gui.playerdetails.player.lore.noclan=&7União\: &bNenhum -gui.playerdetails.player.lore.clan=&7União\: &b[{0}&f] {1} +gui.playerdetails.player.lore.nounion=&7União\: &bNenhum +gui.playerdetails.player.lore.union=&7União\: &b[{0}&f] {1} gui.playerdetails.player.lore.rank=&7Cargo\: &b{0} gui.playerdetails.player.lore.status=&7Estado\: &b{0} gui.playerdetails.player.lore.kdr=&7KDR\: &b{0} @@ -760,8 +759,8 @@ gui.playerdetails.player.lore.deaths=&7Morreu\: &b{0} gui.playerdetails.player.lore.join.date=&7Entrou\: &b{0} gui.playerdetails.player.lore.last.seen=&7Visto por último\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.playerdetails.player.lore.past.clans.separator=&b, -gui.playerdetails.player.lore.past.clans=&7Uniões anteriores\: &b{0} +gui.playerdetails.player.lore.past.unions.separator=&b, +gui.playerdetails.player.lore.past.unions=&7Uniões anteriores\: &b{0} gui.playerdetails.player.lore.inactive=&7Inativo\: &b{0}/{1} dias gui.playerdetails.kick.title=&fExpulsar gui.playerdetails.promote.demote.title=&fPromover/Rebaixar @@ -785,55 +784,53 @@ gui.languageselector.title=Idiomas - Atual\: {0} gui.languageselector.language.title=&f{0} gui.languageselector.language.lore.left.click=&7Clique com o botão esquerdo para definir este como o seu idioma gui.languageselector.language.lore.translation.status=&7Estado da tradução\: &b{0}% -gui.languageselector.language.lore.right.click=&7Clique com o botão direito para ajudar a traduzir gui.confirmation.title=Confirmação gui.confirmation.confirm=&7Clique aqui para confirmar gui.confirmation.return=&7Clique aqui para voltar gui.not.supported=&cOcorreu um erro ao abrir a GUI\! Desabilitando... Você fez o download da versão correta? -staff.member.verify.clan=&cUm membro da equipe deve verificar o seu união\! +staff.member.verify.union=&cUm membro da equipe deve verificar o seu união\! player.already.has.that.rank=&cO jogador já possui este cargo\! -joined.clan.chat=&bVocê entrou no chat do união -already.joined.clan.chat=&bVocê já entrou no chat do união -left.clan.chat=&bVocê saiu do chat do união -muted.clan.chat=&bVocê silenciou o chat do união -unmuted.clan.chat=&bVocê desmutou o chat do união +joined.union.chat=&bVocê entrou no chat do união +already.joined.union.chat=&bVocê já entrou no chat do união +left.union.chat=&bVocê saiu do chat do união +muted.union.chat=&bVocê silenciou o chat do união +unmuted.union.chat=&bVocê desmutou o chat do união joined.ally.chat=&bVocê se juntou ao chat dos aliados left.ally.chat=&bVocê saiu do chat dos aliados muted.ally.chat=&bVocê silenciou o chat dos aliados unmuted.ally.chat=&bVocê desmutou o chat dos aliados already.joined.ally.chat=&bVocê já entrou no chat dos aliados -player.already.in.this.clan=&cO jogador já está no união -your.clan.reached.max.alliances=&cSeu união atingiu o número máximo de alianças -other.clan.reached.max.alliances=&cO outro união atingiu o número máximo de alianças -insert.clan.tag=&bInsira a tag do união (ou "{0}")\: -insert.clan.name=&bInsira o nome do união\: +player.already.in.this.union=&cO jogador já está no união +your.union.reached.max.alliances=&cSeu união atingiu o número máximo de alianças +other.union.reached.max.alliances=&cO outro união atingiu o número máximo de alianças +insert.union.tag=&bInsira a tag do união (ou "{0}")\: +insert.union.name=&bInsira o nome do união\: insert.rank.name=&bInsira o nome do cargo (ou "{0}")\: -click.to.help.translating=&bClique neste link para ajudar a traduzir\:\n&r{0} -your.clan.must.have.members.to.verify=&cSeu união deve ter pelo menos {0} membros para ser verificado\! +your.union.must.have.members.to.verify=&cSeu união deve ter pelo menos {0} membros para ser verificado\! you.must.hold.a.banner=&cVocê precisa ter um estandarte em sua mão\! -you.changed.clan.banner=&bVocê mudou o estandarte do seu união\! -your.clan.already.verified=&cSeu união já está verificado\! +you.changed.union.banner=&bVocê mudou o estandarte do seu união\! +your.union.already.verified=&cSeu união já está verificado\! # suppress inspection "TrailingSpacesInProperty" -clan.profile=\n&b%clan_name%&7 perfil &8-------------------------------------------\n \n &7Nome\: &e[&8%clan_color_tag%&e] &b%clan_name%\n &7Descrição\: &f%clan_description%\n &7Status\: &f%clan_status%\n &7Líderes\: %clan_leaders%\n &7Membros Online\: &f%clan_online_count%&7/&f%clan_size%\n &7KDR\: &e%clan_kdr%\n &7Eliminações\: &8[Rival\:&f%clan_rival_kills% &8Aliado\:&f%clan_ally_kills% &8Neutro\:&f%clan_neutral_kills% &8Civil\:&f%clan_civilian_kills%&8]\n &7Mortes\: &f%clan_deaths%\n &7Aliados\: &f%clan_allies%\n &7Rivais\: &f%clan_rivals%\n &7Fundado\: &f%clan_founded%\n &7Inativo\: &f%clan_inactive_days%&7/&f%clan_max_inactive_days% dias\n -player.lookup.clanname=&e[&8%clan_color_tag%&e] &b%clan_name% +union.profile=\n&b%union_name%&7 perfil &8-------------------------------------------\n \n &7Nome\: &e[&8%union_color_tag%&e] &b%union_name%\n &7Descrição\: &f%union_description%\n &7Status\: &f%union_status%\n &7Membros Online\: &f%union_online_count%&7/&f%union_size%\n &7KDR\: &e%union_kdr%\n &7Eliminações\: &8[Rival\:&f%union_rival_kills% &8Aliado\:&f%union_ally_kills% &8Neutro\:&f%union_neutral_kills% &8Civil\:&f%union_civilian_kills%&8]\n &7Mortes\: &f%union_deaths%\n &7Aliados\: &f%union_allies%\n &7Rivais\: &f%union_rivals%\n &7Fundado\: &f%union_founded%\n &7Inativo\: &f%union_inactive_days%&7/&f%union_max_inactive_days% dias\n +player.lookup.unionname=&e[&8%union_color_tag%&e] &b%union_name% # suppress inspection "TrailingSpacesInProperty" player.lookup.killtype=&7Tipo de Morte\: %player_kill_type%\n -player.lookup=\n&7Informações do jogador &b%player_name% &8-------------------------------------------\n \n &7União\: &f%clan_name%\n &7Cargo\: &f%player_rank%\n &7Status\: &f%player_status%\n &7KDR\: &e%player_kdr%\n &7Eliminações\: &8[Rival\:&f%player_rival_kills% &8Aliado\:&7%player_ally_kills% &8Neutro\:&f%player_neutral_kills% &8Civil\:&f%player_civilian_kills%&8]\n &7Mortes\: &f%player_deaths%\n &7Data de entrada\: &f%player_join_date%\n &7Visto por último\: &f%player_last_seen%\n &7Últimos uniões\: &f%player_past_clans%\n &7Inativo\: &f%player_inactive_days%&7/&f%player_max_inactive_days% dias\n %kill_type_line% +player.lookup=\n&7Informações do jogador &b%player_name% &8-------------------------------------------\n \n &7União\: &f%union_name%\n &7Status\: &f%player_status%\n &7KDR\: &e%player_kdr%\n &7Eliminações\: &8[Rival\:&f%player_rival_kills% &8Aliado\:&7%player_ally_kills% &8Neutro\:&f%player_neutral_kills% &8Civil\:&f%player_civilian_kills%&8]\n &7Mortes\: &f%player_deaths%\n &7Data de entrada\: &f%player_join_date%\n &7Visto por último\: &f%player_last_seen%\n &7Últimos uniões\: &f%player_past_unions%\n &7Inativo\: &f%player_inactive_days%&7/&f%player_max_inactive_days% dias\n %kill_type_line% economy.disabled=&cEconomia desativada\! has.been.purged=Os dados de {0} foram apagados accepted.invitation=&bVocê aceitou o convite de {0} denied.invitation=&cVocê negou o convite de {0} -must.be.in.clan.to.pvp=&cVocê e {0} devem ser membros de união para poder lutar\! -clans.not.at.war.pvp.denied=&cSeu união não está em guerra com {0}\! +must.be.in.union.to.pvp=&cVocê e {0} devem ser membros de união para poder lutar\! +unions.not.at.war.pvp.denied=&cSeu união não está em guerra com {0}\! cannot.attack.civilians=&cVocê não pode atacar civis\! -cannot.attack.clan.member=&cVocê não pode atacar um membro do união\! +cannot.attack.union.member=&cVocê não pode atacar um membro do união\! cannot.attack.ally=&cVocê não pode atacar um aliado\! cannot.send.discord.message=Você não pode enviar mensagens para {0}. Você não é membro desse união\! discordhook.is.disabled=&cA integração do Discord está desativada ou indisponível\! -your.clan.doesnt.have.any.linked.player=Seu união não tem jogadores vinculados -your.clan.doesnt.have.minimum.linked.player=Seu união não tem o mínimo de jogadores vinculados -your.clan.is.not.on.the.whitelist=Seu união não está na lista branca -your.clan.already.has.channel=Seu união já tem um canal do Discord +your.union.doesnt.have.any.linked.player=Seu união não tem jogadores vinculados +your.union.doesnt.have.minimum.linked.player=Seu união não tem o mínimo de jogadores vinculados +your.union.is.not.on.the.whitelist=Seu união não está na lista branca +your.union.already.has.channel=Seu união já tem um canal do Discord discord.reached.category.limit=O Discord atingiu o limite de categorias\! discord.reached.channels.limit=O Discord atingiu o limite de canais\! discord.created.successfully=&bCanal do Discord criado com sucesso\! @@ -843,19 +840,19 @@ cannot.kick.last.leader=&cVocê não pode expulsar o último líder\! cannot.disband.permanent=&cVocê não pode dissolver este união. Ele tem um status permanente. you.can.only.set.base.in.your.land=&cVocê só pode definir a base em seu terreno\! only.leaders.can.create.lands=&cApenas líderes podem criar terrenos\! -only.one.land.per.clan=&cSeu união já tem um terreno\! -only.clan.members.can.create.lands=&cApenas membros de união podem criar terrenos\! +only.one.land.per.union=&cSeu união já tem um terreno\! +only.union.members.can.create.lands=&cApenas membros de união podem criar terrenos\! land.allowed.all.actions=&bTodas as ações estão permitidas agora\! land.blocked.all.actions=&bTodas as ações estão bloqueadas agora\! land.allowed.action=&bAção permitida\! land.blocked.action=&bAção bloqueada\! you.do.not.own.lands=&cVocê não tem um terreno\! land.sharing.disabled=&cCompartilhamento de terrenos está desabilitado\! -clan.chat.disabled=&cO chat do união está desativado\! +union.chat.disabled=&cO chat do união está desativado\! ally.chat.disabled=&cO chat dos aliados está desativado\! war.expired=A guerra com {0} expirou\! you.cant.start.war.online.members.difference=Você não pode começar a guerra. Um união tem mais membros online do que o outro. invitedplayer.invite.off=Este jogador desativou convites de união user.hasnt.played.before=&cEsse usuário nunca jogou antes -clan.list.balance.header=\n{0} &7unions top saldo &8-----------------------\n \n&8Total de unions\: &7{1}\n \n&8\#&7. &8Union &7- &8Saldo -clan.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &eR{5} +union.list.balance.header=\n{0} &7unions top saldo &8-----------------------\n \n&8Total de unions\: &7{1}\n \n&8\#&7. &8Union &7- &8Saldo +union.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &eR{5} diff --git a/src/main/resources/messages_pt_PT.properties b/src/main/resources/messages_pt_PT.properties index a601f295..cff3416e 100644 --- a/src/main/resources/messages_pt_PT.properties +++ b/src/main/resources/messages_pt_PT.properties @@ -66,7 +66,7 @@ admin.command=admin mod.command=mod promote.command=promover demote.command=demover -clanff.command=clanff +unionff.command=unionff ff.command=ff resign.command=resignar disband.command=desfazer @@ -104,7 +104,7 @@ acf-core.parameter.tag=tag acf-core.parameter.name=nome acf-core.parameter.description=descrição acf-core.parameter.player=jogador -acf-core.parameter.clan=união +acf-core.parameter.union=união acf-core.parameter.type=tipo acf-core.parameter.order=ordem acf-core.parameter.help=página ou palavras-chave @@ -147,8 +147,8 @@ command.description.ff.allow=Define o teu fogo-amigável para permitido command.description.ff.auto=Define o teu fogo-amigável para automático command.description.globalff.allow=Define o fogo-amigável global para permitido command.description.globalff.auto=Define o fogo amigável global para automático -command.description.clanff.allow=Define o fogo amigo do seu união como permitido -command.description.clanff.block=Define o fogo amigo do seu união como bloqueado +command.description.unionff.allow=Define o fogo amigo do seu união como permitido +command.description.unionff.block=Define o fogo amigo do seu união como bloqueado command.description.description=Define a descrição do seu união command.description.ban=Bane um jogador dos comandos do união command.description.unban=Desbane um jogador dos comandos do união @@ -176,7 +176,7 @@ command.description.untrust=Desconfia de um membro command.description.resign=Abandonar o seu união command.description.help=Mostra esta ajuda ou procura na ajuda command.description.ally.add=Adiciona um aliado -command.description.clan=Abre a Interface +command.description.union=Abre a Interface command.description.disband=Desfazer o teu união command.description.mod.disband=Destrói um união command.description.mod.kick=Expulsar um jogador de um união @@ -232,7 +232,7 @@ command.description.mod.locale=Define o idioma do jogador home-menu=/{0} casa{1} - Teleportar para a casa do união home-set-menu=/{0} casa set{1} - Definir a casa do união home-clear-menu=/{0} casa apagar{1} - Apaga a base do união -clan=União +union=União allies=Aliados alliances=aliancas coords=coordenadas @@ -242,7 +242,7 @@ coords.upper=Coordenadas world=Mundo kdr=KDR members=Membros -clans.lower=uniões +unions.lower=uniões rival=Rival civilian=Civil neutral=Neutro @@ -286,9 +286,9 @@ nokillsfound=Kills não encontradas promoted.to.leader={0} foi promovido a líder denied.demotion={0} negou a despromoção de {1}. Consenso falhou. membership.invitation={0} recusou o convite de associação -joined.the.clan={0} entrou no união +joined.the.union={0} entrou no união signed.off.request.cancelled={0} cancelou o pedido. {1} solicitação cancelada. -clan.deletion={0} negou a eliminação do união. Consenso falhou. +union.deletion={0} negou a eliminação do união. Consenso falhou. rename.refused={0} negou a renomeação do união. O consenso falhou. has.been.disbanded=O união {0} foi desfeito denied.the.promotion={0} negou a promoção de {1}. Consenso falhou. @@ -324,9 +324,9 @@ mysql.connection.failed=A ligação falhou sqlite.connection.successful=Ligação estabelecida com êxito sqlite.connection.failed= Falha na conexão SQLite purging.player.data=removendo dados do jogador\: {0} -purging.clan=Limpeza do união\: {0} -clan.players=Jogadores do união\: {0} -clans=União\: {0} +purging.union=Limpeza do união\: {0} +union.players=Jogadores do união\: {0} +unions=União\: {0} banned=Estás proibido de usar comandos do união nothing.more.to.see=Não há mais nada para ver nothing.to.vote=&cNada para aceitar ou negar @@ -339,78 +339,78 @@ bulletin.board.header=&8* &e{0} &fbulletin board bulletin.board.message={0}\: &f{1} has.been.disbanded.rivalry.ended={0} foi desfeito. A rivalidade acabou. has.been.disbanded.alliance.ended={0} foi desfeita. A Aliança acabou. -clan.disbanded=União desfeito +union.disbanded=União desfeito 1.color.day=1 {0}dia many.color.days={0}{1} dias insufficient.permissions=Permissões insuficientes -clan.is.not.verified=União não é verificado -player.not.a.member.of.any.clan=&cO jogador não é membro de nenhum união -not.a.member.of.any.clan=Tu não és membro de nenhum união +union.is.not.verified=União não é verificado +player.not.a.member.of.any.union=&cO jogador não é membro de nenhum união +not.a.member.of.any.union=Tu não és membro de nenhum união minimum.to.make.alliance=O teu união deve ter pelo menos {0} membros para fazer alianças -cannot.be.same.clan=&cDeves colocar um união diferente do teu\! -other.clan.not.verified=&cO outro união não é verificado\! -your.clans.are.not.allies=Os teus uniões não são aliados +cannot.be.same.union=&cDeves colocar um união diferente do teu\! +other.union.not.verified=&cO outro união não é verificado\! +your.unions.are.not.allies=Os teus uniões não são aliados has.broken.the.alliance={0} terminou a aliança com {1} at.least.one.leader.accept.the.alliance=Pelo menos um líder dos aliados deve estar online para aceitar a aliança leaders.have.been.asked.for.an.alliance={0} líderes foram solicitados para uma aliança -your.clans.are.already.allies=Os teus uniões já são aliados -your.clan.cannot.create.rivals=O teu união não pode criar rivais +your.unions.are.already.allies=Os teus uniões já são aliados +your.union.cannot.create.rivals=O teu união não pode criar rivais min.players.rivalries=O teu união deve ter pelo menos {0} membros para fazer rivalidades this.player.is.already.banned=O membro já está banido player.added.to.banned.list=Jogador adicionado à lista negra you.banned=Foste banido de usar os comandos de união -clan.wide.friendly.fire.blocked=Fogo-amigável entre uniões bloqueado -clan.wide.friendly.fire.is.allowed=Fogo-amigável entre uniões permitido +union.wide.friendly.fire.blocked=Fogo-amigável entre uniões bloqueado +union.wide.friendly.fire.is.allowed=Fogo-amigável entre uniões permitido you.are.the.only.member.online=Tu és o único membro online -your.clan.color.tag.cannot.be.longer.than.characters=&cA cor da tag do teu união não pode ter mais de {0} caracteres -your.clan.tag.cannot.be.longer.than.characters=&A tag do teu união não pode ter mais de {0} caracteres -your.clan.tag.must.be.longer.than.characters=&A tag do teu união deve ter mais de {0} caracteres +your.union.color.tag.cannot.be.longer.than.characters=&cA cor da tag do teu união não pode ter mais de {0} caracteres +your.union.tag.cannot.be.longer.than.characters=&A tag do teu união não pode ter mais de {0} caracteres +your.union.tag.must.be.longer.than.characters=&A tag do teu união deve ter mais de {0} caracteres your.tag.cannot.contain.the.following.colors=&A tag não pode conter as seguintes cores\: {0} your.tag.doesnt.meet.the.requirements=&cSua tag não cumpre os requisitos. your.tag.cannot.contain.color.codes=&A tag não pode conter códigos de cores -your.clan.tag.can.only.contain.letters.numbers.and.color.codes=&A tag do teu união só pode conter letras, números e códigos de cores +your.union.tag.can.only.contain.letters.numbers.and.color.codes=&A tag do teu união só pode conter letras, números e códigos de cores you.cannot.set.colored.ranks=Não podes definir cargos coloridos -your.clan.name.cannot.be.longer.than.characters=A tag do teu união não pode ter mais de {0} caracteres -your.clan.name.must.be.longer.than.characters=O nome do teu união deve ter mais de {0} caracteres -your.clan.name.cannot.contain.color.codes=O nome do teu união não pode conter códigos de cores +your.union.name.cannot.be.longer.than.characters=A tag do teu união não pode ter mais de {0} caracteres +your.union.name.must.be.longer.than.characters=O nome do teu união deve ter mais de {0} caracteres +your.union.name.cannot.contain.color.codes=O nome do teu união não pode conter códigos de cores that.tag.name.is.disallowed=&Esse nome de tag não é permitido you.must.first.resign=Primeiro deves renunciar de {0} -clan.with.this.tag.already.exists=Já existe um union com essa tag -get.your.clan.verified.to.access.advanced.features=O teu união deve ser verificado para ter acesso a recursos avançados, chama a Staff\! -clan.created=União {0} criado +union.with.this.tag.already.exists=Já existe um union com essa tag +get.your.union.verified.to.access.advanced.features=O teu união deve ser verificado para ter acesso a recursos avançados, chama a Staff\! +union.created=União {0} criado not.enough.leaders.online.to.vote.on.demotion=Não há líderes disponíveis online para votar nesta despromoção demotion.vote.has.been.requested.from.all.leaders=Foi solicitado o voto de rebaixamento de todos os líderes -player.is.not.a.leader.of.your.clan=O jogador não é o líder do teu união +player.is.not.a.leader.of.your.union=O jogador não é o líder do teu união player.is.not.a.leader=O jogador não é um líder -clan.has.been.disbanded=O união {0} foi desfeito -clan.disband.vote.has.been.requested.from.all.leaders=O voto de dissolção do União foi solicitado de todos os líderes -friendy.fire.is.now.managed.by.your.clan=O fogo amigo agora é gerenciado pelo teu união +union.has.been.disbanded=O união {0} foi desfeito +union.disband.vote.has.been.requested.from.all.leaders=O voto de dissolção do União foi solicitado de todos os líderes +friendy.fire.is.now.managed.by.your.union=O fogo amigo agora é gerenciado pelo teu união personal.friendly.fire.is.set.to.allowed=O Fogo Amigo pessoal está definido como permitido -global.friendy.fire.is.now.managed.by.each.clan=O Fogo amigo global agora é gerido por cada união -global.friendy.fire.is.already.being.managed.by.each.clan=O Fogo Amigo global já está a ser gerenciado por cada união +global.friendy.fire.is.now.managed.by.each.union=O Fogo amigo global agora é gerido por cada união +global.friendy.fire.is.already.being.managed.by.each.union=O Fogo Amigo global já está a ser gerenciado por cada união global.friendly.fire.is.set.to.allowed=Fogo-amigo global está definido como permitido global.friendly.fire.is.already.being.allowed=Já é permitido fogo amigo global -the.player.doesn.t.not.have.the.permissions.to.join.clans=O jogador não tem permissão para entrar nos uniões +the.player.doesn.t.not.have.the.permissions.to.join.unions=O jogador não tem permissão para entrar nos uniões you.cannot.invite.yourself=Não podes convidar-te a ti mesmo you.did.not.answer.in.time=Não respondeste a tempo, a cancelar... -this.player.is.banned.from.using.clan.commands=Este jogador está proibido de usar comandos do união -the.player.is.already.member.of.another.clan=O jogador já é membro de outro união +this.player.is.banned.from.using.union.commands=Este jogador está proibido de usar comandos do união +the.player.is.already.member.of.another.union=O jogador já é membro de outro união has.been.asked.to.join={0} foi solicitado para se juntar {1} you.cannot.kick.yourself=Tu não te podes expulsar -the.player.is.not.a.member.of.your.clan=O jogador não faz parte do teu união +the.player.is.not.a.member.of.your.union=O jogador não faz parte do teu união you.cannot.kick.another.leader=Não podes expulsar outro líder has.been.kicked.by={0} foi expulso por {1} -no.clans.have.been.created=Nenhum união foi criado -total.clans=Total de uniões\: +no.unions.have.been.created=Nenhum união foi criado +total.unions=Total de uniões\: legend=Legenda\: kill.type.civilian=Tipo de Kill\: {0}Civil no.player.data.found=Nenhum dado de jogador encontrado -clan.0=União\: {0} +union.0=União\: {0} status.0=Estado\: {0} rank.0=Cargo\: {0} kdr.0=KDR\: {0} inactive.0=Inativo\: {0} -clan.commands=comandos do união +union.commands=comandos do união you.can.only.modify.the.color.and.case.of.the.tag=Só podes modificar as cores da Tag locale.has.been.changed=&cO seu idioma foi alterado tag.changed.to.0=Tag alterada para {0} @@ -421,11 +421,11 @@ leaders.0=Líderes\: {0} allies.0=Aliados\: {0} rivals.0=Rivais\: {0} other.player.must.be.online=&cO jogador precisa estar online\! -the.player.does.not.have.the.permissions.to.lead.a.clan=O jogador não tem permissão para entrar nos uniões +the.player.does.not.have.the.permissions.to.lead.a.union=O jogador não tem permissão para entrar nos uniões you.cannot.promote.yourself=Não te podes promover a ti mesmo\! the.player.is.already.a.leader=O jogador já é um líder configuration.reloaded=Configuração recarregada -last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.clan=O último líder não pode renunciar. Deves nomear outro líder ou apagar o união. +last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.union=O último líder não pode renunciar. Deves nomear outro líder ou apagar o união. 0.has.resigned={0} desistiu you.cannot.trust.yourself=Não podes confiar em ti mesmo leaders.are.already.trusted=Líderes já são confiáveis @@ -433,23 +433,23 @@ this.player.is.already.trusted=Este jogador já é confiável has.been.given.trusted.status.by={0} recebeu um estado de confiança por {1} this.player.is.not.banned=Este jogador não está banido player.removed.from.the.banned.list=Jogador removido da lista de banidos -you.have.been.unbanned.from.clan.commands=Foste desbanido dos comandos do união +you.have.been.unbanned.from.union.commands=Foste desbanido dos comandos do união you.cannot.untrust.yourself=Não podes desconfiar-te a ti mesmo leaders.cannot.be.untrusted=Líderes não podem ser desconfiáveis this.player.is.already.untrusted=Este jogador já não é confiável has.been.given.untrusted.status.by={0} recebeu um estado não confiável por {1} -the.clan.does.not.exist=O união não existe -the.clan.is.already.verified=O união já está verificado -the.clan.has.been.verified=O união foi verificado -clan.0.has.been.verified=O união {0} foi verificado\! -total.clan.players.0=Total de jogadores do união\: {0} +the.union.does.not.exist=O união não existe +the.union.is.already.verified=O união já está verificado +the.union.has.been.verified=O união foi verificado +union.0.has.been.verified=O união {0} foi verificado\! +total.union.players.0=Total de jogadores do união\: {0} proposing.war={0} propõe começar uma guerra com {1} you.can.only.start.war.with.rivals=Só podes começar a guerra com rivais leaders.have.been.asked.to.accept.the.war.request={0} líderes foram chamados a aceitar o pedido de guerra leaders.asked.to.end.rivalry={0} líderes foram convidados a terminar a guerra proposing.to.end.the.war={0} está a propor terminar a guerra com {1} -clans.already.at.war=Os teus uniões já estão em guerra -clans.not.at.war=Os teus uniões não estão em guerra +unions.already.at.war=Os teus uniões já estão em guerra +unions.not.at.war=Os teus uniões não estão em guerra you.are.at.war={0} está agora em guerra com {1} denied.war.req={0} negou a solicitação de guerra enviada por {1} you.are.no.longer.at.war={0} não está mais em guerra com {1} @@ -477,12 +477,12 @@ diamond=diamante gold=ouro wood=madeira server.announce=Anúncio do Servidor -clan.announce=Anúncio do União +union.announce=Anúncio do União leader.announce=Anúncio do Líder hunger=Fome stone=pedra iron=ferro -the.clan.cannot.be.rivaled=O união não pode ser rival +the.union.cannot.be.rivaled=O união não pode ser rival bboff=BB desligado bbon=BB ativado inviteon=Convidar alternado para ligado @@ -506,30 +506,30 @@ waiting.for.teleport.stand.still.for.0.seconds=Esperando pelo teletransporte, fi on=ligado off=desligado player.rank.changed=O rank foi definido -your.clans.are.already.rivals=Os teus uniões já são rivais +your.unions.are.already.rivals=Os teus uniões já são rivais cleared.bb=O quadro de avisos do união foi limpo -clan.balance=Saldo do união\: {0} -clan.admin.balance=Saldo de {0}\: {1}€ -bb.clan.deposit={0} € foram depositados por {1} -player.clan.deposit=Depositaste {0} -bb.clan.withdraw={0} € foram retirados por {1} -bb.clan.take={0} € foram retirados por {1} -bb.clan.give={0} € foram dados por {1} -bb.clan.set={0} € foram definidos por {1} -player.clan.withdraw=Retiraste {0} -clan.admin.take=Tiraste {0} € do banco {1} -clan.admin.give=Deste {0} € para o banco {1} -clan.admin.set=Definiste o saldo do banco de {0} para {1} -clan.admin.bank.not.enough.money=O banco {0} não tem dinheiro suficiente\! -clan.bank.not.enough.money=O teu banco do união não tem dinheiro suficiente -your.clans.are.not.rivals=Os teus uniões não são rivais -the.clan.members.reached.limit=O união atingiu o limite de membros -this.clan.has.reached.the.member.limit=&bEste união atingiu o limite de membros +union.balance=Saldo do união\: {0} +union.admin.balance=Saldo de {0}\: {1}€ +bb.union.deposit={0} € foram depositados por {1} +player.union.deposit=Depositaste {0} +bb.union.withdraw={0} € foram retirados por {1} +bb.union.take={0} € foram retirados por {1} +bb.union.give={0} € foram dados por {1} +bb.union.set={0} € foram definidos por {1} +player.union.withdraw=Retiraste {0} +union.admin.take=Tiraste {0} € do banco {1} +union.admin.give=Deste {0} € para o banco {1} +union.admin.set=Definiste o saldo do banco de {0} para {1} +union.admin.bank.not.enough.money=O banco {0} não tem dinheiro suficiente\! +union.bank.not.enough.money=O teu banco do união não tem dinheiro suficiente +your.unions.are.not.rivals=Os teus uniões não são rivais +the.union.members.reached.limit=O união atingiu o limite de membros +this.union.has.reached.the.member.limit=&bEste união atingiu o limite de membros you.have.reseted.your.kdr=Resetaste o teu KDR you.have.reseted.0.kdr=Rsetaste o KDR de {0} you.have.reseted.kdr.of.all.players=Resetaste o KDR de todos os jogadores -you.have.successfully.renamed.your.clan=&bRenomeaste o teu união para {0} com sucesso -you.have.successfully.renamed.the.clan=&bRenomeaste com sucesso o união para {0} +you.have.successfully.renamed.your.union=&bRenomeaste o teu união para {0} com sucesso +you.have.successfully.renamed.the.union=&bRenomeaste com sucesso o união para {0} you.have.toggled.permanent.status=Ativaste o estado permanente para {0} permanent.status.enabled=O estado permanente do teu união foi ativado por {0} permanent.status.disabled=O estado permanente do teu união foi desativado por {0} @@ -553,11 +553,11 @@ bb.one.hour=1 hora bb.days= \ dias bb.one.day=1 dia player.purged=O jogador foi removido com sucesso -your.clan.description.must.be.longer.than=A descrição do teu união deve ser maior que {0} caracteres -your.clan.description.cannot.be.longer.than=A descrição do teu união não pode ser maior que {0} caracteres +your.union.description.must.be.longer.than=A descrição do teu união deve ser maior que {0} caracteres +your.union.description.cannot.be.longer.than=A descrição do teu união não pode ser maior que {0} caracteres description.changed=Alteraste com sucesso a descrição do teu união no.description=Sem descrição -the.player.must.wait.0.before.joining.your.clan.again=Este jogador deve esperar {0} minuto(s) antes de entrar no união novamente +the.player.must.wait.0.before.joining.your.union.again=Este jogador deve esperar {0} minuto(s) antes de entrar no união novamente disabled.command=Comando desativado rank.displayname.updated=O nome de exibição do rank foi atualizado\! rank.setdefault=O rank padrão do união foi definido como {0} @@ -570,18 +570,18 @@ rank.created=Cargo criado permission.0.added.to.rank.1=Permissão {0} adicionada ao rank {1} permission.0.removed.from.rank.1=Permissão {0} removida do rank {1} rank.0.deleted=Cargo {0} apagado -clans.ranks=Ranks do união\: +unions.ranks=Ranks do união\: ranks.list.item={0}\# {1} ({2}) no.ranks=Nenhum cargo foi criado rank.no.permissions=Este cargo não tem nenhuma permissão player.unassigned.from.rank=Jogador não atribuído ao cargo you.must.be.0.or.have.the.permission.1.to.use.this=Tens de ser {0} ou o teu líder deve ao teu rank a permissão {1} para usar isto -deposit.not.allowed=O depósito não é permitido, faz /%clan %toggle %deposit para permiti-lo -withdraw.not.allowed=Não é permitido retirar, faz /%clan %toggle %withdraw para permitir +deposit.not.allowed=O depósito não é permitido, faz /%union %toggle %deposit para permiti-lo +withdraw.not.allowed=Não é permitido retirar, faz /%union %toggle %withdraw para permitir resign.request.cancelled=Solicitação cancelada disband.request.cancelled=Solicitação de dissolução cancelada resetkdr.request.cancelled=Pedido para resetar o KDR cancelado -clan.create.request.cancelled=Pedido de criação de união cancelado +union.create.request.cancelled=Pedido de criação de união cancelado rank.create.request.cancelled=Pedido de criação de rank cancelado promotion.vote.has.been.requested.from.all.leaders=Voto de promoção foi solicitado por todos os líderes rename.vote.has.been.requested.from.all.leaders=&bVoto de renomeação foi solicitado por todos os líderes @@ -598,11 +598,10 @@ gui.lore.no.permission=&cNão tens permissão para ver isso\! gui.main.title={0} - menu do união gui.main.languageselector.title=&fSeleciona o teu idioma gui.main.languageselector.lore.left.click=&7Clique com o botão esquerdo para selecionar o seu idioma -gui.main.languageselector.lore.right.click=&7Clique com o botão direito para ajudar a traduzir gui.main.other.commands.title=&fOutros comandos gui.main.other.commands.lore=&7Clique com o botão esquerdo para ver todos os comandos do união -gui.main.clan.list.title=&fLista de Uniões -gui.main.clan.list.lore=&7Clique com o botão esquerdo para ver a lista de uniões +gui.main.union.list.title=&fLista de Uniões +gui.main.union.list.lore=&7Clique com o botão esquerdo para ver a lista de uniões gui.main.reset.kdr.title=&fReiniciar o KDR gui.main.reset.kdr.lore=&7Clique com o botão esquerdo para reiniciar o teu KDR gui.main.leaderboard.title=&fTabela de Liderança @@ -610,8 +609,8 @@ gui.main.leaderboard.lore=&7Clique com o botão esquerdo para ver a tabela de li gui.main.staff.title=&fStaff gui.main.staff.lore=&7Clique esquerdo para abrir o menu da staff gui.staff.title=Staff -gui.staff.clan.list.lore.left.click=&7Clique com o botão esquerdo para ver a lista de uniões -gui.staff.clan.list.lore.right.click=&7Clique com o botão direito para ver todos os uniões não verificados +gui.staff.union.list.lore.left.click=&7Clique com o botão esquerdo para ver a lista de uniões +gui.staff.union.list.lore.right.click=&7Clique com o botão direito para ver todos os uniões não verificados gui.player.list.title=Lista de Jogadores gui.staff.player.list.title=&fLista de Jogadores gui.staff.player.list.lore.left.click=&7Clique com o botão esquerdo para ver todos os jogadores @@ -621,8 +620,8 @@ gui.staff.global.ff.lore.status=&Estado\: {0} gui.staff.global.ff.lore.toggle=&7Clique com o botão esquerdo para alternar o estado do fogo amigo gui.staff.reload.title=&fRecarregar gui.staff.reload.lore=&7Clique com o botão esquerdo para recarregar o plugin -gui.staff.clanlist.unverified.title=Uniões não verificados - Total\: {0} -gui.staff.clanlist.toplace.title=Selecionar o novo união de {0} +gui.staff.unionlist.unverified.title=Uniões não verificados - Total\: {0} +gui.staff.unionlist.toplace.title=Selecionar o novo união de {0} gui.warning.title=Aviso gui.warning.no.permission.title=&fSem permissão gui.warning.no.permission.plugin.lore=&7Não tens permissão para fazer isso\! @@ -631,20 +630,20 @@ gui.warning.no.permission.rank.lore=&7Tens de ser {0} ou o teu líder deve dar a gui.warning.not.verified.title=&fNão verificado gui.warning.not.verified.lore=&7O teu união precisa de estar verificado\! gui.allies.title=Aliados -gui.allies.clan.lore=&7Carrega com botão direito para remover este aliado +gui.allies.union.lore=&7Carrega com botão direito para remover este aliado gui.allies.add.title=&fAdiciona um aliado gui.add.ally.title=Adiciona um aliado -gui.add.ally.clan.lore=Carrega com o botão esquerdo para fazer aliança com este união +gui.add.ally.union.lore=Carrega com o botão esquerdo para fazer aliança com este união gui.rivals.title=Rivais -gui.rivals.clan.lore=&7Carrega com o botão direito para remover esta rivalidade +gui.rivals.union.lore=&7Carrega com o botão direito para remover esta rivalidade gui.rivals.add.title=&fAdiciona um rival gui.add.rival.title=Adiciona um rival -gui.add.rival.clan.lore=&7Carrega com o botão esquerdo para fazer rivalidade com este união -gui.clanlist.title=Uniões - Total\: {0} -gui.clanlist.clan.title=&fUnião\: [{0}&f] {1} -gui.clanlist.clan.lore.position=&b\#{0} -gui.clanlist.clan.lore.kdr=&7KDR\: &b{0} -gui.clanlist.clan.lore.members=&7Membros\: &b{0} +gui.add.rival.union.lore=&7Carrega com o botão esquerdo para fazer rivalidade com este união +gui.unionlist.title=Uniões - Total\: {0} +gui.unionlist.union.title=&fUnião\: [{0}&f] {1} +gui.unionlist.union.lore.position=&b\#{0} +gui.unionlist.union.lore.kdr=&7KDR\: &b{0} +gui.unionlist.union.lore.members=&7Membros\: &b{0} gui.coords.title=Coordenadas gui.coords.player.lore.distance=&7Distância\: &b{0} gui.coords.player.lore.coords=&7Coordenadas\: &b{0} {1} {2} @@ -674,83 +673,83 @@ gui.permissions.permission.lore=&7Carrega com o botão direito para remover esta gui.add.permission.title=Adiciona uma permissão gui.add.permission.permission.title=&f{0} gui.add.permission.permission.lore=&7Clique com o botão esquerdo para adicionar esta permissão ao cargo -gui.clandetails.title=[{0}] {1} -gui.clandetails.free.agent.title=&Agente Livre -gui.clandetails.free.agent.create.clan.price.lore=&7Preço\: &b{0} -gui.clandetails.free.agent.create.clan.lore=&7Clique com o botão esquerdo para criar um união -gui.clandetails.clan.title=&f[{0}&f] {1} -gui.clandetails.clan.lore.description=&7Descrição\: &b{0} -gui.clandetails.clan.lore.status=&Estado\: {0} -gui.clandetails.clan.lore.leaders=&7Líderes\: &b{0} -gui.clandetails.clan.lore.online.members=&7Membros Online\: &b{0}/{1} -gui.clandetails.clan.lore.kdr=&7KDR\: &b{0} -gui.clandetails.clan.lore.kill.totals=&7Total de Matanças\: &b[Rival\:{0} Neutro\:{1} Civil\:{2}] -gui.clandetails.clan.lore.deaths=&7Mortes\: &b{0} +gui.uniondetails.title=[{0}] {1} +gui.uniondetails.free.agent.title=&Agente Livre +gui.uniondetails.free.agent.create.union.price.lore=&7Preço\: &b{0} +gui.uniondetails.free.agent.create.union.lore=&7Clique com o botão esquerdo para criar um união +gui.uniondetails.union.title=&f[{0}&f] {1} +gui.uniondetails.union.lore.description=&7Descrição\: &b{0} +gui.uniondetails.union.lore.status=&Estado\: {0} +gui.uniondetails.union.lore.leaders=&7Líderes\: &b{0} +gui.uniondetails.union.lore.online.members=&7Membros Online\: &b{0}/{1} +gui.uniondetails.union.lore.kdr=&7KDR\: &b{0} +gui.uniondetails.union.lore.kill.totals=&7Total de Matanças\: &b[Rival\:{0} Neutro\:{1} Civil\:{2}] +gui.uniondetails.union.lore.deaths=&7Mortes\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.allies.separator=&b, +gui.uniondetails.union.lore.allies.separator=&b, # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.rivals.separator=&b, -gui.clandetails.clan.lore.allies=&7Aliados\: &b{0} -gui.clandetails.clan.lore.rivals=&7Rivals\: &b{0} -gui.clandetails.clan.lore.founded=&7Fundado\: &b{0} -gui.clandetails.clan.lore.inactive=&7Inativo\: &b{0}/{1} dias -gui.clandetails.allies.title=&7Aliados -gui.clandetails.allies.lore=Clica com o botão esquerdo para ver os teus aliados ou adicionar mais -gui.clandetails.rivals.title=&fRivais -gui.clandetails.rivals.lore=&7Clica com o botão esquerdo para ver os teus rivais ou adicionar mais -gui.clandetails.roster.title=&fElenco -gui.clandetails.roster.lore=Clica com o botão esquerdo para ver os membros do união ou convidar mais -gui.staffclandetails.roster.lore=&7Clique com o botão esquerdo para ver os membros do união -gui.clandetails.coords.title=&fCoordenadas -gui.clandetails.coords.lore=&7Clique com o botão esquerdo para ver as coordenadas dos membros do união -gui.clandetails.home.title=&fCasa -gui.clandetails.home.lore.teleport.price=&7Preço do Teletransporte\: &b{0} -gui.clandetails.home.lore.teleport=&7Clica com o botão esquerdo para teleportar para a casa do seu união -gui.staffclandetails.home.lore.teleport=&7Clica com o botão esquerdo para teleportar para a casa do união -gui.clandetails.home.lore.clear=&7Solte o item para limpar a casa do seu união -gui.clandetails.home.lore.set.price=&7Definir preço\: &b{0} -gui.clandetails.home.lore.set=&7 Clica com o botão direito para definir a casa do união -gui.staffclandetails.home.lore.set=&7 Clica com o botão direito para definir a casa do união -gui.clandetails.regroup.title=&fReagrupar -gui.clandetails.regroup.lore.price=&7Preço\: &b{0} -gui.clandetails.regroup.lore.home=&7Clica com o botão esquerdo para reagrupar os membros do união para a casa do união -gui.clandetails.regroup.lore.me=&7Clica com o botão direito para reagrupar os membros do união para a tua localização -gui.clandetails.ff.title=Fogo amigo -gui.clandetails.ff.personal.lore=&7Pessoal\: &b{0} -gui.clandetails.ff.clan.lore=&7União\: &b{0} -gui.clandetails.ff.personal.toggle.lore=&7Clica com o botão esquerdo para alternar o fogo amigo -gui.clandetails.ff.clan.toggle.lore=&7Clica com o botão direito para alternar o fogo amigo do união -gui.clandetails.bank.title=&fBanco -gui.clandetails.bank.balance.lore=&7Saldo\: &b{0} -gui.clandetails.bank.withdraw.status.lore=&7Levantar\: &b{0} -gui.clandetails.bank.deposit.status.lore=&7Deposito\: &b{0} -gui.clandetails.bank.withdraw.toggle.lore=&7Solte o item para alternar o estado de levantamento -gui.clandetails.bank.deposit.toggle.lore=Clique com o botão direito para alternar o status do depósito -gui.clandetails.rank.title=&fCargo -gui.clandetails.rank.lore=&7Clica com o botão esquerdo para ver os cargos do união e editá-los -gui.clandetails.verified.title=&fVerificado -gui.clandetails.not.verified.title=&fNão verificado -gui.clandetails.verify.price.lore=&7Preço\: &b{0} -gui.clandetails.not.verified.lore=&7Clica com o botão esquerdo para verificar o teu união -gui.staffclandetails.not.verified.lore=&7Clica com o botão esquerdo para verificar este união -gui.clandetails.resign.title=&fDemitir -gui.clandetails.resign.lore=&7Clica com o botão esquerdo para cancelar o seu união -gui.clandetails.disband.title=&Dissolver -gui.clandetails.disband.lore=&7Solte o item para dissolver o teu união -gui.staffclandetails.disband.lore=Clique com o botão esquerdo para dissolver este união -gui.clandetails.chat.title=&fChat -gui.clandetails.chat.clan.chat.lore=&7/{0} [message] - &bEnvia uma mensagem para o chat do união -gui.clandetails.chat.clan.join.leave.lore=&7/{0} {1}/{2} - &bEntrar/sair do chat do união -gui.clandetails.chat.ally.chat.lore=&7/{0} [message] - &bEnvia uma mensagem para o chat aliado -gui.clandetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bEntrar/sair do chat do união -gui.clandetails.chat.clan.status.lore=&7União\: &b{0} -gui.clandetails.chat.ally.status.lore=&7Aliado\: &b{0} -gui.clandetails.chat.clan.toggle.lore=&7Clica com o botão esquerdo para alternar o estado do chat do união -gui.clandetails.chat.ally.toggle.lore=&7Clica com o botão direito para alternar o estado do chat aliado +gui.uniondetails.union.lore.rivals.separator=&b, +gui.uniondetails.union.lore.allies=&7Aliados\: &b{0} +gui.uniondetails.union.lore.rivals=&7Rivals\: &b{0} +gui.uniondetails.union.lore.founded=&7Fundado\: &b{0} +gui.uniondetails.union.lore.inactive=&7Inativo\: &b{0}/{1} dias +gui.uniondetails.allies.title=&7Aliados +gui.uniondetails.allies.lore=Clica com o botão esquerdo para ver os teus aliados ou adicionar mais +gui.uniondetails.rivals.title=&fRivais +gui.uniondetails.rivals.lore=&7Clica com o botão esquerdo para ver os teus rivais ou adicionar mais +gui.uniondetails.roster.title=&fElenco +gui.uniondetails.roster.lore=Clica com o botão esquerdo para ver os membros do união ou convidar mais +gui.staffuniondetails.roster.lore=&7Clique com o botão esquerdo para ver os membros do união +gui.uniondetails.coords.title=&fCoordenadas +gui.uniondetails.coords.lore=&7Clique com o botão esquerdo para ver as coordenadas dos membros do união +gui.uniondetails.home.title=&fCasa +gui.uniondetails.home.lore.teleport.price=&7Preço do Teletransporte\: &b{0} +gui.uniondetails.home.lore.teleport=&7Clica com o botão esquerdo para teleportar para a casa do seu união +gui.staffuniondetails.home.lore.teleport=&7Clica com o botão esquerdo para teleportar para a casa do união +gui.uniondetails.home.lore.clear=&7Solte o item para limpar a casa do seu união +gui.uniondetails.home.lore.set.price=&7Definir preço\: &b{0} +gui.uniondetails.home.lore.set=&7 Clica com o botão direito para definir a casa do união +gui.staffuniondetails.home.lore.set=&7 Clica com o botão direito para definir a casa do união +gui.uniondetails.regroup.title=&fReagrupar +gui.uniondetails.regroup.lore.price=&7Preço\: &b{0} +gui.uniondetails.regroup.lore.home=&7Clica com o botão esquerdo para reagrupar os membros do união para a casa do união +gui.uniondetails.regroup.lore.me=&7Clica com o botão direito para reagrupar os membros do união para a tua localização +gui.uniondetails.ff.title=Fogo amigo +gui.uniondetails.ff.personal.lore=&7Pessoal\: &b{0} +gui.uniondetails.ff.union.lore=&7União\: &b{0} +gui.uniondetails.ff.personal.toggle.lore=&7Clica com o botão esquerdo para alternar o fogo amigo +gui.uniondetails.ff.union.toggle.lore=&7Clica com o botão direito para alternar o fogo amigo do união +gui.uniondetails.bank.title=&fBanco +gui.uniondetails.bank.balance.lore=&7Saldo\: &b{0} +gui.uniondetails.bank.withdraw.status.lore=&7Levantar\: &b{0} +gui.uniondetails.bank.deposit.status.lore=&7Deposito\: &b{0} +gui.uniondetails.bank.withdraw.toggle.lore=&7Solte o item para alternar o estado de levantamento +gui.uniondetails.bank.deposit.toggle.lore=Clique com o botão direito para alternar o status do depósito +gui.uniondetails.rank.title=&fCargo +gui.uniondetails.rank.lore=&7Clica com o botão esquerdo para ver os cargos do união e editá-los +gui.uniondetails.verified.title=&fVerificado +gui.uniondetails.not.verified.title=&fNão verificado +gui.uniondetails.verify.price.lore=&7Preço\: &b{0} +gui.uniondetails.not.verified.lore=&7Clica com o botão esquerdo para verificar o teu união +gui.staffuniondetails.not.verified.lore=&7Clica com o botão esquerdo para verificar este união +gui.uniondetails.resign.title=&fDemitir +gui.uniondetails.resign.lore=&7Clica com o botão esquerdo para cancelar o seu união +gui.uniondetails.disband.title=&Dissolver +gui.uniondetails.disband.lore=&7Solte o item para dissolver o teu união +gui.staffuniondetails.disband.lore=Clique com o botão esquerdo para dissolver este união +gui.uniondetails.chat.title=&fChat +gui.uniondetails.chat.union.chat.lore=&7/{0} [message] - &bEnvia uma mensagem para o chat do união +gui.uniondetails.chat.union.join.leave.lore=&7/{0} {1}/{2} - &bEntrar/sair do chat do união +gui.uniondetails.chat.ally.chat.lore=&7/{0} [message] - &bEnvia uma mensagem para o chat aliado +gui.uniondetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bEntrar/sair do chat do união +gui.uniondetails.chat.union.status.lore=&7União\: &b{0} +gui.uniondetails.chat.ally.status.lore=&7Aliado\: &b{0} +gui.uniondetails.chat.union.toggle.lore=&7Clica com o botão esquerdo para alternar o estado do chat do união +gui.uniondetails.chat.ally.toggle.lore=&7Clica com o botão direito para alternar o estado do chat aliado gui.playerdetails.title={0} gui.playerdetails.player.title=&f{0} -gui.playerdetails.player.lore.noclan=&7União\: &bNenhum -gui.playerdetails.player.lore.clan=&7União\: &b[{0}&b] {1} +gui.playerdetails.player.lore.nounion=&7União\: &bNenhum +gui.playerdetails.player.lore.union=&7União\: &b[{0}&b] {1} gui.playerdetails.player.lore.rank=&7Cargo\: &b{0} gui.playerdetails.player.lore.status=&Estado\: {0} gui.playerdetails.player.lore.kdr=&7KDR\: &b{0} @@ -759,8 +758,8 @@ gui.playerdetails.player.lore.deaths=&7Mortes\: &b{0} gui.playerdetails.player.lore.join.date=&7Data de entrada\: &b{0} gui.playerdetails.player.lore.last.seen=&7Último visto\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.playerdetails.player.lore.past.clans.separator=&b, -gui.playerdetails.player.lore.past.clans=&7Últimos uniões\: &b{0} +gui.playerdetails.player.lore.past.unions.separator=&b, +gui.playerdetails.player.lore.past.unions=&7Últimos uniões\: &b{0} gui.playerdetails.player.lore.inactive=&7Inativo\: &b{0}/{1} dias gui.playerdetails.kick.title=&fExpulsar gui.playerdetails.promote.demote.title=&fPromover/Rebaixar @@ -784,55 +783,53 @@ gui.languageselector.title=Idiomas - Atual\: {0} gui.languageselector.language.title=&f{0} gui.languageselector.language.lore.left.click=&7Clica com o botão esquerdo para definir isto como o teu idioma gui.languageselector.language.lore.translation.status=&7Estado da tradução\: &b{0}% -gui.languageselector.language.lore.right.click=&7Clique com o botão direito para ajudar a traduzir gui.confirmation.title=Confirmação gui.confirmation.confirm=&7Clique aqui para confirmar gui.confirmation.return=&7Clica aqui para voltar gui.not.supported=&cOcorreu um erro ao abrir a GUI\! Desabilitando... Fizeste o download da versão correta? -staff.member.verify.clan=&cUm membro da staff deve verificar o teu união\! +staff.member.verify.union=&cUm membro da staff deve verificar o teu união\! player.already.has.that.rank=&cO jogador já tem este rank\! -joined.clan.chat=&bEntras-te no chat do união -already.joined.clan.chat=&bTu já entras-te no chat do união -left.clan.chat=&bSaíste do chat do união -muted.clan.chat=&bSilenciaste o chat do união -unmuted.clan.chat=&bDesmutaste o chat do união +joined.union.chat=&bEntras-te no chat do união +already.joined.union.chat=&bTu já entras-te no chat do união +left.union.chat=&bSaíste do chat do união +muted.union.chat=&bSilenciaste o chat do união +unmuted.union.chat=&bDesmutaste o chat do união joined.ally.chat=&bEntras-te no chat do união aliado left.ally.chat=&bSaíste do chat do união aliado muted.ally.chat=&bSilenciaste o chat do união aliado unmuted.ally.chat=&bDesmutaste o chat do união aliado already.joined.ally.chat=&bTu já entras-te no chat do união aliado -player.already.in.this.clan=&cO jogador já se encontra no teu união -your.clan.reached.max.alliances=&cO união já atingiu o limite máximo de alianças -other.clan.reached.max.alliances=&cO outro união atingiu o número máximo de alianças -insert.clan.tag=&bInserir a tag do união (ou "{0}")\: -insert.clan.name=&bInsere o nome do união\: +player.already.in.this.union=&cO jogador já se encontra no teu união +your.union.reached.max.alliances=&cO união já atingiu o limite máximo de alianças +other.union.reached.max.alliances=&cO outro união atingiu o número máximo de alianças +insert.union.tag=&bInserir a tag do união (ou "{0}")\: +insert.union.name=&bInsere o nome do união\: insert.rank.name=&bInsere o nome do união (or "{0}")\: -click.to.help.translating=&bClique neste link para ajudar a traduzir\:\n&r{0} -your.clan.must.have.members.to.verify=&cO teu união precisa ter pelo menos {0} membros para ser verificado\! +your.union.must.have.members.to.verify=&cO teu união precisa ter pelo menos {0} membros para ser verificado\! you.must.hold.a.banner=&cPrecisas de ter um banner na mão\! -you.changed.clan.banner=&bMudas-te o banner do união\! -your.clan.already.verified=&O união já está verificado\! +you.changed.union.banner=&bMudas-te o banner do união\! +your.union.already.verified=&O união já está verificado\! # suppress inspection "TrailingSpacesInProperty" -clan.profile=\n&b%clan_name%&7 Perfil &8-------------------------------------------\n \n &7Nome\: &e[&8%clan_color_tag%&e] &b%clan_name%\n &7Descrição\: &f%clan_description%\n &7Status\: &f%clan_status%\n &7Líderes\: %clan_leaders%\n &7Membros Online\: &f%clan_online_count%&7/&f%clan_size%\n &7KDR\: &e%clan_kdr%\n &7Total de Kills\: &8[Rival\:&f%clan_rival_kills% &8Aliado\:&f%clan_ally_kills% &8Neutro\:&f%clan_neutral_kills% &8Civil\:&f%clan_civilian_kills%&8]\n &7Mortes\: &f%clan_deaths%\n &7Aliados\: &f%clan_allies%\n &7Rivais\: &f%clan_rivals%\n &7Data criação\: &f%clan_founded%\n &7Inatividade\: &f%clan_inactive_days%&7/&f%clan_max_inactive_days% dias\n -player.lookup.clanname=&e[&8%clan_color_tag%&e] &b%clan_name% +union.profile=\n&b%union_name%&7 Perfil &8-------------------------------------------\n \n &7Nome\: &e[&8%union_color_tag%&e] &b%union_name%\n &7Descrição\: &f%union_description%\n &7Status\: &f%union_status%\n &7Membros Online\: &f%union_online_count%&7/&f%union_size%\n &7KDR\: &e%union_kdr%\n &7Total de Kills\: &8[Rival\:&f%union_rival_kills% &8Aliado\:&f%union_ally_kills% &8Neutro\:&f%union_neutral_kills% &8Civil\:&f%union_civilian_kills%&8]\n &7Mortes\: &f%union_deaths%\n &7Aliados\: &f%union_allies%\n &7Rivais\: &f%union_rivals%\n &7Data criação\: &f%union_founded%\n &7Inatividade\: &f%union_inactive_days%&7/&f%union_max_inactive_days% dias\n +player.lookup.unionname=&e[&8%union_color_tag%&e] &b%union_name% # suppress inspection "TrailingSpacesInProperty" player.lookup.killtype=&7Tipo de Morte\: %player_kill_type%\n -player.lookup=\n&b%player_name%&7''s Informação de Jogador &8-------------------------------------------\n \n &7União\: &f%clan_name%\n &7Rank\: &f%player_rank%\n &7Status\: &f%player_status%\n &7KDR\: &e%player_kdr%\n &7Total de Kills\: &8[Rival\:&f%player_rival_kills% &8Aliado\:&7%player_ally_kills% &8Neutro\:&f%player_neutral_kills% &8Civil\:&f%player_civilian_kills%&8]\n &7Mortes\: &f%player_deaths%\n &7Data de Entrada\: &f%player_join_date%\n &7Última vez visto\: &f%player_last_seen%\n &7Uniões passados\: &f%player_past_clans%\n &7Inatividade\: &f%player_inactive_days%&7/&f%player_max_inactive_days% dias\n %kill_type_line% +player.lookup=\n&b%player_name%&7''s Informação de Jogador &8-------------------------------------------\n \n &7União\: &f%union_name%\n &7Status\: &f%player_status%\n &7KDR\: &e%player_kdr%\n &7Total de Kills\: &8[Rival\:&f%player_rival_kills% &8Aliado\:&7%player_ally_kills% &8Neutro\:&f%player_neutral_kills% &8Civil\:&f%player_civilian_kills%&8]\n &7Mortes\: &f%player_deaths%\n &7Data de Entrada\: &f%player_join_date%\n &7Última vez visto\: &f%player_last_seen%\n &7Uniões passados\: &f%player_past_unions%\n &7Inatividade\: &f%player_inactive_days%&7/&f%player_max_inactive_days% dias\n %kill_type_line% economy.disabled=&cEconomia desativada\! has.been.purged=Os dados de {0} foram excluídos accepted.invitation=&bAceitas-te aceitou o convite de {0} denied.invitation=&bRejeitas-te o convite de {0} -must.be.in.clan.to.pvp=&cTu e {0} devem ser membros do união para o PvP\! -clans.not.at.war.pvp.denied=&cO teu união não está em guerra com {0}\! +must.be.in.union.to.pvp=&cTu e {0} devem ser membros do união para o PvP\! +unions.not.at.war.pvp.denied=&cO teu união não está em guerra com {0}\! cannot.attack.civilians=&cNão podes atacar civis\! -cannot.attack.clan.member=&cNão podes atacar outros membros do união\! +cannot.attack.union.member=&cNão podes atacar outros membros do união\! cannot.attack.ally=&cNão podes atacar um aliado\! cannot.send.discord.message=Não podes enviar mensagens para {0}. Não és um membro desse união\! discordhook.is.disabled=Integração &cDiscord está desativada ou indisponível\! -your.clan.doesnt.have.any.linked.player=O teu união não tem jogadores vinculados -your.clan.doesnt.have.minimum.linked.player=O teu união não tem o número mínimo de jogadores vinculados -your.clan.is.not.on.the.whitelist=O teu união não está whitelist -your.clan.already.has.channel=O teu união já tem um canal do discord +your.union.doesnt.have.any.linked.player=O teu união não tem jogadores vinculados +your.union.doesnt.have.minimum.linked.player=O teu união não tem o número mínimo de jogadores vinculados +your.union.is.not.on.the.whitelist=O teu união não está whitelist +your.union.already.has.channel=O teu união já tem um canal do discord discord.reached.category.limit=O Discord atingiu o limite de categorias\! discord.reached.channels.limit=O Discord atingiu o limite de canais\! discord.created.successfully=&bCanal do Discord criado com sucesso\! @@ -842,19 +839,19 @@ cannot.kick.last.leader=&Não podes mover o último líder\! cannot.disband.permanent=&cNão podes dissolver este união. Ele tem status permanente. you.can.only.set.base.in.your.land=&cApenas podes definir a casa do teu união nos teus terrenos\! only.leaders.can.create.lands=&cSomente líderes podem criar terrenos\! -only.one.land.per.clan=&cO teu união já tem uma terra\! -only.clan.members.can.create.lands=&cApenas membros do união podem criar terrenos\! +only.one.land.per.union=&cO teu união já tem uma terra\! +only.union.members.can.create.lands=&cApenas membros do união podem criar terrenos\! land.allowed.all.actions=&bTodas as ações são agora permitidas\! land.blocked.all.actions=&bTodas as ações estão agora bloqueadas\! land.allowed.action=&bAção permitida\! land.blocked.action=&bAção bloqueada\! you.do.not.own.lands=&cNão possuis um terreno\! land.sharing.disabled=&cCompartilhamento de terrenos está desabilitado\! -clan.chat.disabled=&cO chat do união está desativado\! +union.chat.disabled=&cO chat do união está desativado\! ally.chat.disabled=&cO chat do união aliado está desativado\! war.expired=A guerra com {0} expirou\! you.cant.start.war.online.members.difference=Não é possível iniciar a guerra. Um união tem mais membros online que o outro. invitedplayer.invite.off=Este jogador desativou os convites de união user.hasnt.played.before=&cEsse usuário nunca jogou antes -clan.list.balance.header=\n{0} &7Top Saldo &8-----------------------\n \n&8Total de uniões\: &7{1}\n \n&8\#&7. &8União &7- Saldo -clan.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} +union.list.balance.header=\n{0} &7Top Saldo &8-----------------------\n \n&8Total de uniões\: &7{1}\n \n&8\#&7. &8União &7- Saldo +union.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} diff --git a/src/main/resources/messages_ro_RO.properties b/src/main/resources/messages_ro_RO.properties index df6f494b..c460c786 100644 --- a/src/main/resources/messages_ro_RO.properties +++ b/src/main/resources/messages_ro_RO.properties @@ -66,7 +66,7 @@ admin.command=administrator mod.command=moderator promote.command=promovare demote.command=retrogradează -clanff.command=clanff +unionff.command=unionff ff.command=ff resign.command=resemnează disband.command=deband @@ -91,7 +91,7 @@ acf-core.parameter.rank=grad acf-core.parameter.tag=eticheta acf-core.parameter.name=nume acf-core.parameter.description=descriere -acf-core.parameter.clan=uniune +acf-core.parameter.union=uniune command.description.profile.other=Arata profilul altui uniune command.description.profile=Arata profilul uniunii tau command.description.vitals=Arata viata membrilor uniunii tau si aliatilor @@ -106,8 +106,8 @@ command.description.ff.allow=Seteaza daunele tale personale pe permis command.description.ff.auto=Seteaza daunele tale personale pe auto command.description.globalff.allow=Seteaza daunele intre coechipieri pe global command.description.globalff.auto=Seteaza daunele intre coechipieri global pe auto -command.description.clanff.allow=Seteaza daunele intre coechipieri pe permis -command.description.clanff.block=Seteaza daunele intre coechipieri pe inchis +command.description.unionff.allow=Seteaza daunele intre coechipieri pe permis +command.description.unionff.block=Seteaza daunele intre coechipieri pe inchis command.description.description=Seteaza descriere la uniune command.description.ban=Interzice comenzile unui membru din uniune command.description.unban=Dezinterzice comenzile unui membru din uniune diff --git a/src/main/resources/messages_ru_RU.properties b/src/main/resources/messages_ru_RU.properties index cbfdeeab..43afe723 100644 --- a/src/main/resources/messages_ru_RU.properties +++ b/src/main/resources/messages_ru_RU.properties @@ -66,7 +66,7 @@ admin.command=admin mod.command=mod promote.command=promote demote.command=demote -clanff.command=clanff +unionff.command=unionff ff.command=ff resign.command=resign disband.command=disband @@ -106,7 +106,7 @@ acf-core.parameter.tag=tag acf-core.parameter.name=name acf-core.parameter.description=description acf-core.parameter.player=игрок -acf-core.parameter.clan=союз +acf-core.parameter.union=союз acf-core.parameter.type=тип acf-core.parameter.order=порядок acf-core.parameter.help=страница или ключевые слова @@ -149,8 +149,8 @@ command.description.ff.allow=Разрешить "огонь по своим" д command.description.ff.auto=Установить ваш статус "огонь по своим" по умолчанию command.description.globalff.allow=Разрешить участникам всех союзов бить друг друга command.description.globalff.auto=Установить глобальный статус "огонь по своим" по умолчанию -command.description.clanff.allow=Разрешить "огонь по своим" участникам вашего союза -command.description.clanff.block=Запретить "огонь по своим" участникам вашего союза +command.description.unionff.allow=Разрешить "огонь по своим" участникам вашего союза +command.description.unionff.block=Запретить "огонь по своим" участникам вашего союза command.description.description=Установить описание вашего союза command.description.ban=Запретить игроку использовать команды союза command.description.unban=Разрешить игроку использовать команды союза @@ -178,7 +178,7 @@ command.description.untrust=Не доверять участнику. Не пр command.description.resign=Выйти из вашего союза command.description.help=Показать справку или найти в справке command.description.ally.add=Добавить союзника -command.description.clan=Открыть GUI +command.description.union=Открыть GUI command.description.disband=Расформировать ваш союз command.description.mod.disband=Расформировать союз command.description.mod.kick=Выгнать игрока из союза @@ -234,7 +234,7 @@ command.description.mod.locale=Установить язык игроку home-menu=/{0} home{1} - Телепортироваться на базу союза home-set-menu=/{0} home set{1} - Установить точку базы союза home-clear-menu=/{0} home clear{1} - Удалить базу союза -clan=Союз +union=Союз allies=Allies alliances=alliances coords=coords @@ -244,7 +244,7 @@ coords.upper=Координаты world=Мир kdr=КДР members=Участники -clans.lower=союзы +unions.lower=союзы rival=Соперник civilian=Мирный neutral=Общие @@ -288,9 +288,9 @@ nokillsfound=Нет убийств promoted.to.leader={0} был повышен до лидера denied.demotion={0} отказал(-и) в понижении {1}. Не удалось придти к единому мнению. membership.invitation={0} отклонил приглашение в союз -joined.the.clan={0} присоединился к союзу +joined.the.union={0} присоединился к союзу signed.off.request.cancelled={0} дал добро. Запрос на {1} отменен. -clan.deletion={0} отказал(-ись) расформировывать союз. Не удалось придти к единому мнению. +union.deletion={0} отказал(-ись) расформировывать союз. Не удалось придти к единому мнению. rename.refused={0} отказал(-ись) переименовывать союз. Не удалось придти к единому мнению. has.been.disbanded=Союз {0} был распущен denied.the.promotion={0} отказал(-и) в продвижении {1}. Не удалось придти к единому мнению. @@ -326,9 +326,9 @@ mysql.connection.failed=Не удалось подключиться к MySQL sqlite.connection.successful=Соединение с SQLite прошло успешно sqlite.connection.failed= Не удалось подключиться к SQLite purging.player.data=Очистка данных игрока\: {0} -purging.clan=Удаление союза\: {0} -clan.players=Игроков в союзах\: {0} -clans=Союзы\: {0} +purging.union=Удаление союза\: {0} +union.players=Игроков в союзах\: {0} +unions=Союзы\: {0} banned=Вам запрещено использовать команды союза nothing.more.to.see=Больше ничего нет nothing.to.vote=&cНечего принимать или отклонять @@ -341,78 +341,78 @@ bulletin.board.header=&8* &e{0} &fдоска объявлений bulletin.board.message={0}\: &f{1} has.been.disbanded.rivalry.ended={0} был распущен. Вражда была завершена. has.been.disbanded.alliance.ended={0} был распущен. Союз был разорван. -clan.disbanded=Союз распущен +union.disbanded=Союз распущен 1.color.day=1 {0}день many.color.days={0}{1} дней insufficient.permissions=Недостаточно прав -clan.is.not.verified=Союз не подтверждён -player.not.a.member.of.any.clan=&cИгрок не является участником какого-либо союза -not.a.member.of.any.clan=Вы не состоите ни в одном союзе +union.is.not.verified=Союз не подтверждён +player.not.a.member.of.any.union=&cИгрок не является участником какого-либо союза +not.a.member.of.any.union=Вы не состоите ни в одном союзе minimum.to.make.alliance=Ваш союз должен иметь как минимум {0} игроков, чтобы заключить союз -cannot.be.same.clan=&cВы должны написать союз, отличающийся от вашего\! -other.clan.not.verified=&cДругой союз не подтвержден\! -your.clans.are.not.allies=Ваши союзы не являются союзниками +cannot.be.same.union=&cВы должны написать союз, отличающийся от вашего\! +other.union.not.verified=&cДругой союз не подтвержден\! +your.unions.are.not.allies=Ваши союзы не являются союзниками has.broken.the.alliance={0} разорвал союз с {1} at.least.one.leader.accept.the.alliance=Хотя бы один из союзных лидеров должен быть в сети, чтобы принять союз leaders.have.been.asked.for.an.alliance=Отправлен запрос к лидерам союза {0} для заключения союза -your.clans.are.already.allies=Ваши союзы уже являются союзниками -your.clan.cannot.create.rivals=Ваш союз не может иметь соперников +your.unions.are.already.allies=Ваши союзы уже являются союзниками +your.union.cannot.create.rivals=Ваш союз не может иметь соперников min.players.rivalries=У вашего союза должно быть не менее {0} игроков, чтобы соперничать this.player.is.already.banned=Этот игрок уже забанен player.added.to.banned.list=Игрок был добавлен в бан-лист you.banned=Вам был заблокирован доступ к командам союза -clan.wide.friendly.fire.blocked="Огонь по своим" в союзе запрещён\! -clan.wide.friendly.fire.is.allowed="Огонь по своим" в союзе был разрешён +union.wide.friendly.fire.blocked="Огонь по своим" в союзе запрещён\! +union.wide.friendly.fire.is.allowed="Огонь по своим" в союзе был разрешён you.are.the.only.member.online=Вы единственный участник онлайн -your.clan.color.tag.cannot.be.longer.than.characters=&cЦветной тег вашего союза не может быть длиннее {0} символов -your.clan.tag.cannot.be.longer.than.characters=&cТег вашего союза должен не может быть длиннее {0} символов -your.clan.tag.must.be.longer.than.characters=&cТег вашего союза должен быть длиннее {0} символов +your.union.color.tag.cannot.be.longer.than.characters=&cЦветной тег вашего союза не может быть длиннее {0} символов +your.union.tag.cannot.be.longer.than.characters=&cТег вашего союза должен не может быть длиннее {0} символов +your.union.tag.must.be.longer.than.characters=&cТег вашего союза должен быть длиннее {0} символов your.tag.cannot.contain.the.following.colors=&cВаш тег не может содержать следующие цвета\: {0} your.tag.doesnt.meet.the.requirements=&cВаш тег не соответствует требованиям. your.tag.cannot.contain.color.codes=&cВаш тег не может содержать цветовые коды -your.clan.tag.can.only.contain.letters.numbers.and.color.codes=&cТег вашего союза может содержать только буквы, цифры и цветовые коды +your.union.tag.can.only.contain.letters.numbers.and.color.codes=&cТег вашего союза может содержать только буквы, цифры и цветовые коды you.cannot.set.colored.ranks=Вы не можете установить цвет рангом -your.clan.name.cannot.be.longer.than.characters=Имя вашего союза не может быть длиннее {0} символов -your.clan.name.must.be.longer.than.characters=Имя вашего союза должно быть длиннее {0} символов -your.clan.name.cannot.contain.color.codes=Имя вашего союза не может содержать цветовые коды +your.union.name.cannot.be.longer.than.characters=Имя вашего союза не может быть длиннее {0} символов +your.union.name.must.be.longer.than.characters=Имя вашего союза должно быть длиннее {0} символов +your.union.name.cannot.contain.color.codes=Имя вашего союза не может содержать цветовые коды that.tag.name.is.disallowed=&cЭтот тег запрещен you.must.first.resign=Сперва вы должны выйти из {0} -clan.with.this.tag.already.exists=Союз с таким тегом уже существует -get.your.clan.verified.to.access.advanced.features=Получите подтверждение союза, чтобы получить доступ к расширенным функциям -clan.created=Союз {0} создан +union.with.this.tag.already.exists=Союз с таким тегом уже существует +get.your.union.verified.to.access.advanced.features=Получите подтверждение союза, чтобы получить доступ к расширенным функциям +union.created=Союз {0} создан not.enough.leaders.online.to.vote.on.demotion=Нет лидеров в сети, чтобы проголосовать за это понижение demotion.vote.has.been.requested.from.all.leaders=Все лидеры были уведомлены о начале голосования за понижение игрока -player.is.not.a.leader.of.your.clan=Игрок не является лидером вашего союза +player.is.not.a.leader.of.your.union=Игрок не является лидером вашего союза player.is.not.a.leader=Игрок не является лидером -clan.has.been.disbanded=Союз {0} был распущен -clan.disband.vote.has.been.requested.from.all.leaders=Все лидеры были уведомлены о начале голосования за роспуск союза -friendy.fire.is.now.managed.by.your.clan="Огонь по своим" теперь управляется вашим союзом +union.has.been.disbanded=Союз {0} был распущен +union.disband.vote.has.been.requested.from.all.leaders=Все лидеры были уведомлены о начале голосования за роспуск союза +friendy.fire.is.now.managed.by.your.union="Огонь по своим" теперь управляется вашим союзом personal.friendly.fire.is.set.to.allowed=Собственный "огонь по своим" разрешён -global.friendy.fire.is.now.managed.by.each.clan=Каждый союз теперь может менять "Огонь по своим" -global.friendy.fire.is.already.being.managed.by.each.clan=Каждый союз уже управляет глобальным параметром "Огонь по своим" +global.friendy.fire.is.now.managed.by.each.union=Каждый союз теперь может менять "Огонь по своим" +global.friendy.fire.is.already.being.managed.by.each.union=Каждый союз уже управляет глобальным параметром "Огонь по своим" global.friendly.fire.is.set.to.allowed=Глобальный параметр "Огонь по своим" разрешён global.friendly.fire.is.already.being.allowed=Глобальный параметр "Огонь по своим" уже разрешён -the.player.doesn.t.not.have.the.permissions.to.join.clans=У игрока нет прав для вступления в союзы +the.player.doesn.t.not.have.the.permissions.to.join.unions=У игрока нет прав для вступления в союзы you.cannot.invite.yourself=Вы не можете пригласить себя you.did.not.answer.in.time=Вы не ответили вовремя, отмена... -this.player.is.banned.from.using.clan.commands=Этот игрок заблокирован от использования команд союза -the.player.is.already.member.of.another.clan=Игрок уже является участником другого союза +this.player.is.banned.from.using.union.commands=Этот игрок заблокирован от использования команд союза +the.player.is.already.member.of.another.union=Игрок уже является участником другого союза has.been.asked.to.join={0} было предложено присоединиться к {1} you.cannot.kick.yourself=Вы не можете выгнать себя -the.player.is.not.a.member.of.your.clan=Игрок не является участником вашего союза +the.player.is.not.a.member.of.your.union=Игрок не является участником вашего союза you.cannot.kick.another.leader=Вы не можете выгнать другого лидера has.been.kicked.by={0} был выгнан из союза {1} -no.clans.have.been.created=Нет созданных союзов -total.clans=Всего союзов\: +no.unions.have.been.created=Нет созданных союзов +total.unions=Всего союзов\: legend=Цветовые обозначения\: kill.type.civilian=Тип убийства\: {0}Мирный житель no.player.data.found=Данные игрока не найдены -clan.0=Союз\: {0} +union.0=Союз\: {0} status.0=Статус\: {0} rank.0=Ранг\: {0} kdr.0=KDR\: {0} inactive.0=Неактивно\: {0} -clan.commands=команды союза +union.commands=команды союза you.can.only.modify.the.color.and.case.of.the.tag=Вы можете изменить только цвет и регистр тега locale.has.been.changed=&cВаш язык был изменен tag.changed.to.0=Тег изменён на {0} @@ -423,11 +423,11 @@ leaders.0=Лидеры\: {0} allies.0=Союзники\: {0} rivals.0=Соперники\: {0} other.player.must.be.online=&cИгрок должен быть онлайн\! -the.player.does.not.have.the.permissions.to.lead.a.clan=У игрока нет прав возглавить союз +the.player.does.not.have.the.permissions.to.lead.a.union=У игрока нет прав возглавить союз you.cannot.promote.yourself=Вы не можете повысить самого себя the.player.is.already.a.leader=Игрок уже является лидером configuration.reloaded=Конфигурация перезагружена -last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.clan=Последний лидер не может покинуть союз. Вы должны назначить другого лидера или распустить союз +last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.union=Последний лидер не может покинуть союз. Вы должны назначить другого лидера или распустить союз 0.has.resigned={0} покинул союз you.cannot.trust.yourself=Вы не можете установить статус доверия самому себе leaders.are.already.trusted=Лидеры уже имеет статус доверенного @@ -435,23 +435,23 @@ this.player.is.already.trusted=Этот игрок уже имеет надёж has.been.given.trusted.status.by={0} получил доверенный статус от {1} this.player.is.not.banned=Этот игрок не забанен player.removed.from.the.banned.list=Игрок был удален из бан-листа -you.have.been.unbanned.from.clan.commands=Вам был разблокирован доступ к командам союза +you.have.been.unbanned.from.union.commands=Вам был разблокирован доступ к командам союза you.cannot.untrust.yourself=Вы не можете установить статус ненадёжного самому себе leaders.cannot.be.untrusted=Лидеры не могут иметь ненадежный статус this.player.is.already.untrusted=Этот игрок уже имеет ненадёжный статус has.been.given.untrusted.status.by={0} получил ненадёжный статус от {1} -the.clan.does.not.exist=Указанного союза не существует -the.clan.is.already.verified=Союз уже подтвержден -the.clan.has.been.verified=Союз был подтвержден -clan.0.has.been.verified=Союз {0} был подтвержден\! -total.clan.players.0=Всего игроков\: {0} +the.union.does.not.exist=Указанного союза не существует +the.union.is.already.verified=Союз уже подтвержден +the.union.has.been.verified=Союз был подтвержден +union.0.has.been.verified=Союз {0} был подтвержден\! +total.union.players.0=Всего игроков\: {0} proposing.war={0} предлагает начать войну с {1} you.can.only.start.war.with.rivals=Объявить войну можно только соперникам leaders.have.been.asked.to.accept.the.war.request=Лидеры {0} были уведомлены о начале голосования за объявление войны leaders.asked.to.end.rivalry=Отправлен запрос к лидерам союза {0} для завершения войны proposing.to.end.the.war={0} предлагает завершить войну с {1} -clans.already.at.war=Ваши союзы уже воюют -clans.not.at.war=Ваши союзы не в состоянии войны +unions.already.at.war=Ваши союзы уже воюют +unions.not.at.war=Ваши союзы не в состоянии войны you.are.at.war={0} воюет с {1} denied.war.req={0} отклонил запрос войны, отправленный союзом {1} you.are.no.longer.at.war={0} больше не воюют с {1} @@ -479,12 +479,12 @@ diamond=алмаз gold=золото wood=древесина server.announce=Объявление сервера -clan.announce=Объявления Союза +union.announce=Объявления Союза leader.announce=Объявление Лидера hunger=Голод stone=камень iron=железо -the.clan.cannot.be.rivaled=Союз не может быть соперником +the.union.cannot.be.rivaled=Союз не может быть соперником bboff=Доска объявлений выключена bbon=Доска объявлений включена inviteon=Приглашения включены @@ -508,30 +508,30 @@ waiting.for.teleport.stand.still.for.0.seconds=Ожидание телепорт on=on off=off player.rank.changed=Ранг был установлен -your.clans.are.already.rivals=Ваши союзы уже являются соперниками +your.unions.are.already.rivals=Ваши союзы уже являются соперниками cleared.bb=Доска объявлений очищена -clan.balance=Баланс Союза\: {0} -clan.admin.balance=Баланс {0}\: {1} -bb.clan.deposit={0} было внесено {1} -player.clan.deposit=Вы вложили {0} -bb.clan.withdraw={0} было снято {1} -bb.clan.take={0} было взято {1} -bb.clan.give={0} было выдано {1} -bb.clan.set={0} было установлено {1} -player.clan.withdraw=Вы сняли {0} -clan.admin.take=Вы взяли {0} из банка {1} -clan.admin.give=Вы отдали {0} в банк {1} -clan.admin.set=Вы установили баланс {0} на {1} -clan.admin.bank.not.enough.money={0} имеет недостаточно денег\! -clan.bank.not.enough.money=У вашего союза недостаточно денег -your.clans.are.not.rivals=Ваши союзы не являются соперниками -the.clan.members.reached.limit=Ваш союз достиг лимита участников -this.clan.has.reached.the.member.limit=&bЭтот союз достиг лимита участников +union.balance=Баланс Союза\: {0} +union.admin.balance=Баланс {0}\: {1} +bb.union.deposit={0} было внесено {1} +player.union.deposit=Вы вложили {0} +bb.union.withdraw={0} было снято {1} +bb.union.take={0} было взято {1} +bb.union.give={0} было выдано {1} +bb.union.set={0} было установлено {1} +player.union.withdraw=Вы сняли {0} +union.admin.take=Вы взяли {0} из банка {1} +union.admin.give=Вы отдали {0} в банк {1} +union.admin.set=Вы установили баланс {0} на {1} +union.admin.bank.not.enough.money={0} имеет недостаточно денег\! +union.bank.not.enough.money=У вашего союза недостаточно денег +your.unions.are.not.rivals=Ваши союзы не являются соперниками +the.union.members.reached.limit=Ваш союз достиг лимита участников +this.union.has.reached.the.member.limit=&bЭтот союз достиг лимита участников you.have.reseted.your.kdr=Вы сбросили свой KDR you.have.reseted.0.kdr=Вы сбросили KDR игрока {0} you.have.reseted.kdr.of.all.players=Вы сбросили KDR всех игроков -you.have.successfully.renamed.your.clan=&bВы успешно переименовали ваш союз на {0} -you.have.successfully.renamed.the.clan=&bВы успешно переименовали союз на {0} +you.have.successfully.renamed.your.union=&bВы успешно переименовали ваш союз на {0} +you.have.successfully.renamed.the.union=&bВы успешно переименовали союз на {0} you.have.toggled.permanent.status=Вы переключили постоянный статус для {0} permanent.status.enabled={0} включил постоянный статус вашего союза permanent.status.disabled={0} выключил постоянный статус вашего союза @@ -555,11 +555,11 @@ bb.one.hour=1 час bb.days= \ дней bb.one.day=1 день player.purged=Игрок был успешно очищен -your.clan.description.must.be.longer.than=Описание вашего союза должно быть длиннее, чем {0} символов -your.clan.description.cannot.be.longer.than=Описание вашего союза не может быть длиннее {0} символов +your.union.description.must.be.longer.than=Описание вашего союза должно быть длиннее, чем {0} символов +your.union.description.cannot.be.longer.than=Описание вашего союза не может быть длиннее {0} символов description.changed=Вы успешно изменили описание вашего союза no.description=Нет описания -the.player.must.wait.0.before.joining.your.clan.again=Этот игрок должен подождать {0} минут(ы), прежде чем сможет вступить в ваш союз +the.player.must.wait.0.before.joining.your.union.again=Этот игрок должен подождать {0} минут(ы), прежде чем сможет вступить в ваш союз disabled.command=Команда отключена rank.displayname.updated=Отображаемое имя ранга обновлено\! rank.setdefault=Ранг союза по умолчанию теперь установлен на {0} @@ -572,18 +572,18 @@ rank.created=Ранг создан permission.0.added.to.rank.1=Право {0} добавлено в ранг {1} permission.0.removed.from.rank.1=Право {0} удалено из ранга {1} rank.0.deleted=Ранг {0} удален -clans.ranks=Ранги союза\: +unions.ranks=Ранги союза\: ranks.list.item={0}\# {1} ({2}) no.ranks=Нет рангов rank.no.permissions=Этот ранг не имеет никаких прав player.unassigned.from.rank=Игрок снят с ранга you.must.be.0.or.have.the.permission.1.to.use.this=Вы должны быть {0} или ваш лидер должен выдать вам разрешение {1} на использование этого -deposit.not.allowed=Взнос средств запрещен, используйте /%clan %toggle %deposit, чтобы разрешить его -withdraw.not.allowed=Вывод средства запрещен, используйте /%clan %toggle %withdraw, чтобы разрешить его +deposit.not.allowed=Взнос средств запрещен, используйте /%union %toggle %deposit, чтобы разрешить его +withdraw.not.allowed=Вывод средства запрещен, используйте /%union %toggle %withdraw, чтобы разрешить его resign.request.cancelled=Запрос на выход из союза отменен disband.request.cancelled=Запрос на расформирование союза отменен resetkdr.request.cancelled=Запрос на сброс КД был отменен -clan.create.request.cancelled=Запрос на создание союза отменён +union.create.request.cancelled=Запрос на создание союза отменён rank.create.request.cancelled=Запрос на создание ранга отменён promotion.vote.has.been.requested.from.all.leaders=Все лидеры были уведомлены о начале голосования за повышение игрока rename.vote.has.been.requested.from.all.leaders=&Все лидеры были уведомлены о начале голосования за переименование союза @@ -600,11 +600,10 @@ gui.lore.no.permission=&cУ вас нет прав для просмотра э gui.main.title={0} - меню союза gui.main.languageselector.title=&fВыбрать язык gui.main.languageselector.lore.left.click=&7ЛКМ\: Посмотреть список доступных языков -gui.main.languageselector.lore.right.click=&7ПКМ\: Помочь с переводом gui.main.other.commands.title=&fДругие команды gui.main.other.commands.lore=&7ЛКМ\: Посмотреть все команды союза -gui.main.clan.list.title=&fСписок союзов -gui.main.clan.list.lore=&7ЛКМ\: Список всех союзов +gui.main.union.list.title=&fСписок союзов +gui.main.union.list.lore=&7ЛКМ\: Список всех союзов gui.main.reset.kdr.title=&fСбросить KDR gui.main.reset.kdr.lore=&7ЛКМ\: Сбросить KDR gui.main.leaderboard.title=&fТаблица лидеров @@ -612,8 +611,8 @@ gui.main.leaderboard.lore=&7ЛКМ\: Посмотреть таблицу лид gui.main.staff.title=&fПанель администратора gui.main.staff.lore=&7ЛКМ\: Открыть панель администратора gui.staff.title=Панель администратора -gui.staff.clan.list.lore.left.click=&7ЛКМ\: Посмотреть список всех союзов -gui.staff.clan.list.lore.right.click=&7ПКМ\: Посмотреть список не подтвержденных союзов +gui.staff.union.list.lore.left.click=&7ЛКМ\: Посмотреть список всех союзов +gui.staff.union.list.lore.right.click=&7ПКМ\: Посмотреть список не подтвержденных союзов gui.player.list.title=Список игроков gui.staff.player.list.title=&fСписок игроков gui.staff.player.list.lore.left.click=&7ЛКМ\: Посмотреть список всех игроков @@ -623,8 +622,8 @@ gui.staff.global.ff.lore.status=&7Статус\: &b{0} gui.staff.global.ff.lore.toggle=&7ЛКМ\: Переключить статус "Огонь по своим" gui.staff.reload.title=&fПерезагрузить gui.staff.reload.lore=&7ЛКМ\: Перезагрузить плагин и его конфигурацию -gui.staff.clanlist.unverified.title=Неподтвержденные Союзы - Всего\: {0} -gui.staff.clanlist.toplace.title=Выберите новый союз {0} +gui.staff.unionlist.unverified.title=Неподтвержденные Союзы - Всего\: {0} +gui.staff.unionlist.toplace.title=Выберите новый союз {0} gui.warning.title=Внимание gui.warning.no.permission.title=&fНет прав gui.warning.no.permission.plugin.lore=&7У вас недостаточно прав, чтобы сделать это\! @@ -633,20 +632,20 @@ gui.warning.no.permission.rank.lore=&7Вы должны быть {0} или ва gui.warning.not.verified.title=&fНе подтвержден gui.warning.not.verified.lore=&7Ваш союз должен быть подтвержден\! gui.allies.title=Allies -gui.allies.clan.lore=&7ПКМ\: Разорвать союз +gui.allies.union.lore=&7ПКМ\: Разорвать союз gui.allies.add.title=&fДобавить союзника gui.add.ally.title=Добавить союзника -gui.add.ally.clan.lore=&7ЛКМ\: Создать союз +gui.add.ally.union.lore=&7ЛКМ\: Создать союз gui.rivals.title=Соперники -gui.rivals.clan.lore=&7ПКМ\: Удалить соперника +gui.rivals.union.lore=&7ПКМ\: Удалить соперника gui.rivals.add.title=&fДобавить соперника gui.add.rival.title=Добавить соперника -gui.add.rival.clan.lore=&7ЛКМ\: Добавить соперника -gui.clanlist.title=Союзы - Всего\: {0} -gui.clanlist.clan.title=&fСоюз\: [{0}&f] {1} -gui.clanlist.clan.lore.position=&b\#{0} -gui.clanlist.clan.lore.kdr=&7KDR\: &b{0} -gui.clanlist.clan.lore.members=&7Участники\: &b{0} +gui.add.rival.union.lore=&7ЛКМ\: Добавить соперника +gui.unionlist.title=Союзы - Всего\: {0} +gui.unionlist.union.title=&fСоюз\: [{0}&f] {1} +gui.unionlist.union.lore.position=&b\#{0} +gui.unionlist.union.lore.kdr=&7KDR\: &b{0} +gui.unionlist.union.lore.members=&7Участники\: &b{0} gui.coords.title=Координаты gui.coords.player.lore.distance=&7Расстояние\: &b{0} gui.coords.player.lore.coords=&7Координаты\: &b{0} {1} {2} @@ -676,83 +675,83 @@ gui.permissions.permission.lore=&7ПКМ\: Удалить право у ранг gui.add.permission.title=Добавить право gui.add.permission.permission.title=&f{0} gui.add.permission.permission.lore=&7ЛКМ\: Добавить право к рангу -gui.clandetails.title=[{0}] {1} -gui.clandetails.free.agent.title=&fБез союза -gui.clandetails.free.agent.create.clan.price.lore=&7Цена\: &b{0} -gui.clandetails.free.agent.create.clan.lore=&7ЛКМ\: Создать союз -gui.clandetails.clan.title=&f[{0}&f] {1} -gui.clandetails.clan.lore.description=&7Описание\: &b{0} -gui.clandetails.clan.lore.status=&7Статус\: &b{0} -gui.clandetails.clan.lore.leaders=&7Лидеры\: &b{0} -gui.clandetails.clan.lore.online.members=&7Участников онлайн\: &b{0}/{1} -gui.clandetails.clan.lore.kdr=&7KDR\: &b{0} -gui.clandetails.clan.lore.kill.totals=&7Убито всего\: &b[Врагов\: {0} Нейтралов\: {1} Мирных жителей\: {2}] -gui.clandetails.clan.lore.deaths=&7Смертей\: &b{0} +gui.uniondetails.title=[{0}] {1} +gui.uniondetails.free.agent.title=&fБез союза +gui.uniondetails.free.agent.create.union.price.lore=&7Цена\: &b{0} +gui.uniondetails.free.agent.create.union.lore=&7ЛКМ\: Создать союз +gui.uniondetails.union.title=&f[{0}&f] {1} +gui.uniondetails.union.lore.description=&7Описание\: &b{0} +gui.uniondetails.union.lore.status=&7Статус\: &b{0} +gui.uniondetails.union.lore.leaders=&7Лидеры\: &b{0} +gui.uniondetails.union.lore.online.members=&7Участников онлайн\: &b{0}/{1} +gui.uniondetails.union.lore.kdr=&7KDR\: &b{0} +gui.uniondetails.union.lore.kill.totals=&7Убито всего\: &b[Врагов\: {0} Нейтралов\: {1} Мирных жителей\: {2}] +gui.uniondetails.union.lore.deaths=&7Смертей\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.allies.separator=&b, +gui.uniondetails.union.lore.allies.separator=&b, # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.rivals.separator=&b, -gui.clandetails.clan.lore.allies=&7Союзники\: &b{0} -gui.clandetails.clan.lore.rivals=&7Соперники\: &b{0} -gui.clandetails.clan.lore.founded=&7Основан\: &b{0} -gui.clandetails.clan.lore.inactive=&7Неактивен\: &b{0}/{1} дней -gui.clandetails.allies.title=&fСоюзники -gui.clandetails.allies.lore=&7ЛКМ\: Посмотреть список союзников или создать новый союз -gui.clandetails.rivals.title=&fСоперники -gui.clandetails.rivals.lore=&7ЛКМ\: Посмотреть список соперников или добавить нового соперника -gui.clandetails.roster.title=&fСписок -gui.clandetails.roster.lore=&7ЛКМ\: Посмотреть список участников вашего союза или пригласить новых участников -gui.staffclandetails.roster.lore=&7ЛКМ\: Посмотреть участников союза -gui.clandetails.coords.title=&fКоординаты -gui.clandetails.coords.lore=&7ЛКМ\: Просмотреть координаты участников вашего союза -gui.clandetails.home.title=&fБаза союза -gui.clandetails.home.lore.teleport.price=&7Цена телепортирования\: &b{0} -gui.clandetails.home.lore.teleport=&7ЛКМ\: Телепортироваться на базу вашего союза -gui.staffclandetails.home.lore.teleport=&7ЛКМ\: Телепортироваться на базу этого союза -gui.clandetails.home.lore.clear=&7Выбросите предмет, чтобы удалить точку базы союза -gui.clandetails.home.lore.set.price=&7Цена установки \: &b{0} -gui.clandetails.home.lore.set=&7ПКМ\: Установить точку базы вашего союза -gui.staffclandetails.home.lore.set=&7ПКМ\: Установить точку базы для этого союза -gui.clandetails.regroup.title=&fСозвать -gui.clandetails.regroup.lore.price=&7Цена\: &b{0} -gui.clandetails.regroup.lore.home=&7ЛКМ\: Телепортировать всех участников вашего союза на базу -gui.clandetails.regroup.lore.me=&7ПКМ\: Телепортировать участников вашего союза к вам -gui.clandetails.ff.title=&fОгонь по своим -gui.clandetails.ff.personal.lore=&7Персональный\: &b{0} -gui.clandetails.ff.clan.lore=&7Союз\: &b{0} -gui.clandetails.ff.personal.toggle.lore=&7ЛКМ\: Переключение параметра "Огонь по своим" -gui.clandetails.ff.clan.toggle.lore=&7ПКМ\: Переключить режим "Огонь по своим" вашего союза -gui.clandetails.bank.title=&6Банк -gui.clandetails.bank.balance.lore=&fБаланс\: {0} -gui.clandetails.bank.withdraw.status.lore=&fВывод\: {0} -gui.clandetails.bank.deposit.status.lore=&7Депозит\: &b{0} -gui.clandetails.bank.withdraw.toggle.lore=&7Выбросите предмет, чтобы переключить статус вывода -gui.clandetails.bank.deposit.toggle.lore=&7ПКМ\: Переключить статус депозита -gui.clandetails.rank.title=&fРанг -gui.clandetails.rank.lore=&7ЛКМ\: Посмотреть ранги союза и редактировать их -gui.clandetails.verified.title=&fПодтвержден -gui.clandetails.not.verified.title=&fНе подтвержден -gui.clandetails.verify.price.lore=&7Цена\: &b{0} -gui.clandetails.not.verified.lore=&7ЛКМ\: Подтвердить ваш союз -gui.staffclandetails.not.verified.lore=&7ЛКМ\: Подтвердить этот союз -gui.clandetails.resign.title=&fВыйти -gui.clandetails.resign.lore=&7ЛКМ\: Выйти из вашего союза -gui.clandetails.disband.title=&fРасформировать -gui.clandetails.disband.lore=&7Выбросьте предмет, чтобы расформировать ваш союз -gui.staffclandetails.disband.lore=&7ЛКМ\: Расформировать этот союз -gui.clandetails.chat.title=&fЧат -gui.clandetails.chat.clan.chat.lore=&7/{0} [message] - &bОтправляет сообщение в чат союза -gui.clandetails.chat.clan.join.leave.lore=&7/{0} {1}/{2} - &bПрисоединиться/покинуть чат союза -gui.clandetails.chat.ally.chat.lore=&7/{0} [message] - &bОтправляет сообщение в чат союзников -gui.clandetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bПрисоединиться/покинуть союзный чат -gui.clandetails.chat.clan.status.lore=&7Союз\: &b{0} -gui.clandetails.chat.ally.status.lore=&7Союзник\: &b{0} -gui.clandetails.chat.clan.toggle.lore=&7ЛКМ\: Изменить статус чата в союзе -gui.clandetails.chat.ally.toggle.lore=&7ПКМ\: Переключить статус чата для союзников +gui.uniondetails.union.lore.rivals.separator=&b, +gui.uniondetails.union.lore.allies=&7Союзники\: &b{0} +gui.uniondetails.union.lore.rivals=&7Соперники\: &b{0} +gui.uniondetails.union.lore.founded=&7Основан\: &b{0} +gui.uniondetails.union.lore.inactive=&7Неактивен\: &b{0}/{1} дней +gui.uniondetails.allies.title=&fСоюзники +gui.uniondetails.allies.lore=&7ЛКМ\: Посмотреть список союзников или создать новый союз +gui.uniondetails.rivals.title=&fСоперники +gui.uniondetails.rivals.lore=&7ЛКМ\: Посмотреть список соперников или добавить нового соперника +gui.uniondetails.roster.title=&fСписок +gui.uniondetails.roster.lore=&7ЛКМ\: Посмотреть список участников вашего союза или пригласить новых участников +gui.staffuniondetails.roster.lore=&7ЛКМ\: Посмотреть участников союза +gui.uniondetails.coords.title=&fКоординаты +gui.uniondetails.coords.lore=&7ЛКМ\: Просмотреть координаты участников вашего союза +gui.uniondetails.home.title=&fБаза союза +gui.uniondetails.home.lore.teleport.price=&7Цена телепортирования\: &b{0} +gui.uniondetails.home.lore.teleport=&7ЛКМ\: Телепортироваться на базу вашего союза +gui.staffuniondetails.home.lore.teleport=&7ЛКМ\: Телепортироваться на базу этого союза +gui.uniondetails.home.lore.clear=&7Выбросите предмет, чтобы удалить точку базы союза +gui.uniondetails.home.lore.set.price=&7Цена установки \: &b{0} +gui.uniondetails.home.lore.set=&7ПКМ\: Установить точку базы вашего союза +gui.staffuniondetails.home.lore.set=&7ПКМ\: Установить точку базы для этого союза +gui.uniondetails.regroup.title=&fСозвать +gui.uniondetails.regroup.lore.price=&7Цена\: &b{0} +gui.uniondetails.regroup.lore.home=&7ЛКМ\: Телепортировать всех участников вашего союза на базу +gui.uniondetails.regroup.lore.me=&7ПКМ\: Телепортировать участников вашего союза к вам +gui.uniondetails.ff.title=&fОгонь по своим +gui.uniondetails.ff.personal.lore=&7Персональный\: &b{0} +gui.uniondetails.ff.union.lore=&7Союз\: &b{0} +gui.uniondetails.ff.personal.toggle.lore=&7ЛКМ\: Переключение параметра "Огонь по своим" +gui.uniondetails.ff.union.toggle.lore=&7ПКМ\: Переключить режим "Огонь по своим" вашего союза +gui.uniondetails.bank.title=&6Банк +gui.uniondetails.bank.balance.lore=&fБаланс\: {0} +gui.uniondetails.bank.withdraw.status.lore=&fВывод\: {0} +gui.uniondetails.bank.deposit.status.lore=&7Депозит\: &b{0} +gui.uniondetails.bank.withdraw.toggle.lore=&7Выбросите предмет, чтобы переключить статус вывода +gui.uniondetails.bank.deposit.toggle.lore=&7ПКМ\: Переключить статус депозита +gui.uniondetails.rank.title=&fРанг +gui.uniondetails.rank.lore=&7ЛКМ\: Посмотреть ранги союза и редактировать их +gui.uniondetails.verified.title=&fПодтвержден +gui.uniondetails.not.verified.title=&fНе подтвержден +gui.uniondetails.verify.price.lore=&7Цена\: &b{0} +gui.uniondetails.not.verified.lore=&7ЛКМ\: Подтвердить ваш союз +gui.staffuniondetails.not.verified.lore=&7ЛКМ\: Подтвердить этот союз +gui.uniondetails.resign.title=&fВыйти +gui.uniondetails.resign.lore=&7ЛКМ\: Выйти из вашего союза +gui.uniondetails.disband.title=&fРасформировать +gui.uniondetails.disband.lore=&7Выбросьте предмет, чтобы расформировать ваш союз +gui.staffuniondetails.disband.lore=&7ЛКМ\: Расформировать этот союз +gui.uniondetails.chat.title=&fЧат +gui.uniondetails.chat.union.chat.lore=&7/{0} [message] - &bОтправляет сообщение в чат союза +gui.uniondetails.chat.union.join.leave.lore=&7/{0} {1}/{2} - &bПрисоединиться/покинуть чат союза +gui.uniondetails.chat.ally.chat.lore=&7/{0} [message] - &bОтправляет сообщение в чат союзников +gui.uniondetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bПрисоединиться/покинуть союзный чат +gui.uniondetails.chat.union.status.lore=&7Союз\: &b{0} +gui.uniondetails.chat.ally.status.lore=&7Союзник\: &b{0} +gui.uniondetails.chat.union.toggle.lore=&7ЛКМ\: Изменить статус чата в союзе +gui.uniondetails.chat.ally.toggle.lore=&7ПКМ\: Переключить статус чата для союзников gui.playerdetails.title={0} gui.playerdetails.player.title=&f{0} -gui.playerdetails.player.lore.noclan=&7Союз\: &bНет -gui.playerdetails.player.lore.clan=&7Союз\: &b[{0}&b] {1} +gui.playerdetails.player.lore.nounion=&7Союз\: &bНет +gui.playerdetails.player.lore.union=&7Союз\: &b[{0}&b] {1} gui.playerdetails.player.lore.rank=&7Ранг\: &b{0} gui.playerdetails.player.lore.status=&7Статус\: &b{0} gui.playerdetails.player.lore.kdr=&7KDR\: &b{0} @@ -761,8 +760,8 @@ gui.playerdetails.player.lore.deaths=&7Смертей\: &b{0} gui.playerdetails.player.lore.join.date=&7Дата вступления\: &b{0} gui.playerdetails.player.lore.last.seen=&7Был в сети\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.playerdetails.player.lore.past.clans.separator=&b, -gui.playerdetails.player.lore.past.clans=&7Прошлые Союзы\: &b{0} +gui.playerdetails.player.lore.past.unions.separator=&b, +gui.playerdetails.player.lore.past.unions=&7Прошлые Союзы\: &b{0} gui.playerdetails.player.lore.inactive=&7Неактивен\: &b{0}/{1} дней gui.playerdetails.kick.title=&fВыгнать gui.playerdetails.promote.demote.title=&fПовысить/Понизить @@ -786,55 +785,53 @@ gui.languageselector.title=Языки – Текущий\: {0} gui.languageselector.language.title=&f{0} gui.languageselector.language.lore.left.click=&7ЛКМ\: Сменить язык на этот gui.languageselector.language.lore.translation.status=&7Статус перевода\: &b{0}% -gui.languageselector.language.lore.right.click=&7ПКМ\: Помочь с переводом gui.confirmation.title=Подтверждение gui.confirmation.confirm=&7Нажмите, чтобы подтвердить gui.confirmation.return=&7Нажмите, чтобы вернуться gui.not.supported=&cПроизошла ошибка при открытии GUI\! Отключение... Вы скачали правильную версию? -staff.member.verify.clan=&cАдминистратор должен подтвердить ваш союз\! +staff.member.verify.union=&cАдминистратор должен подтвердить ваш союз\! player.already.has.that.rank=&cУ игрока уже есть этот ранг\! -joined.clan.chat=&bВы присоединились к чату союза -already.joined.clan.chat=&bВы уже присоединились к чату союза -left.clan.chat=&bВы покинули чат союза -muted.clan.chat=&bВы заглушили чат союза -unmuted.clan.chat=&bВы включили чат союза +joined.union.chat=&bВы присоединились к чату союза +already.joined.union.chat=&bВы уже присоединились к чату союза +left.union.chat=&bВы покинули чат союза +muted.union.chat=&bВы заглушили чат союза +unmuted.union.chat=&bВы включили чат союза joined.ally.chat=&bВы присоединились к союзному чату left.ally.chat=&bВы покинули союзный чат muted.ally.chat=&bВы заглушили союзный чат unmuted.ally.chat=&bВы включили союзный чат already.joined.ally.chat=&bВы уже присоединились к союзному чату -player.already.in.this.clan=&cИгрок уже состоит в этом союзе -your.clan.reached.max.alliances=&cВаш союз достиг максимального количества союзников -other.clan.reached.max.alliances=&cДругой союз достиг максимального количества союзников -insert.clan.tag=&bВведите тег союза (или "{0}")\: -insert.clan.name=&bВведите имя союза в чат\: +player.already.in.this.union=&cИгрок уже состоит в этом союзе +your.union.reached.max.alliances=&cВаш союз достиг максимального количества союзников +other.union.reached.max.alliances=&cДругой союз достиг максимального количества союзников +insert.union.tag=&bВведите тег союза (или "{0}")\: +insert.union.name=&bВведите имя союза в чат\: insert.rank.name=&bВведите название ранга (или "{0}")\: -click.to.help.translating=&bНажмите на ссылку, для помощи с переводом\:\n&r{0} -your.clan.must.have.members.to.verify=&cВаш союз должен иметь по крайней мере {0} участников, чтобы получить подтверждение\! +your.union.must.have.members.to.verify=&cВаш союз должен иметь по крайней мере {0} участников, чтобы получить подтверждение\! you.must.hold.a.banner=&cУ вас в руках должен быть флаг\! -you.changed.clan.banner=&bВы изменили флаг своего союза\! -your.clan.already.verified=&cВаш союз уже подтвержден\! +you.changed.union.banner=&bВы изменили флаг своего союза\! +your.union.already.verified=&cВаш союз уже подтвержден\! # suppress inspection "TrailingSpacesInProperty" -clan.profile=\n&7Профиль союза &b%clan_name% &8-------------------------------------------\n \n &7Название\: &e[&8%clan_color_tag%&e] &b%clan_name%\n &7Описание\: &f%clan_description%\n &7Статус\: &f%clan_status%\n &7Лидеры\: %clan_leaders%\n &7Участников онлайн\: &f%clan_online_count%&7/&f%clan_size%\n &7KDR\: &e%clan_kdr%\n &7Всего убийств\: &8[Соперников\:&f%clan_rival_kills% &8Союзников\:&f%clan_ally_kills% &8Нейтральных\:&f%clan_neutral_kills% &8Гражданских\:&f%clan_civilian_kills%&8]\n &7Смерти\: &f%clan_deaths%\n &7Союзники\: &f%clan_allies%\n &7Соперники\: &f%clan_rivals%\n &7Основан\: &f%clan_founded%\n &7Неактивен\: &f%clan_inactive_days%&7/&f%clan_max_inactive_days% дня\n -player.lookup.clanname=&e[&8%clan_color_tag%&e] &b%clan_name% +union.profile=\n&7Профиль союза &b%union_name% &8-------------------------------------------\n \n &7Название\: &e[&8%union_color_tag%&e] &b%union_name%\n &7Описание\: &f%union_description%\n &7Статус\: &f%union_status%\n &7Участников онлайн\: &f%union_online_count%&7/&f%union_size%\n &7KDR\: &e%union_kdr%\n &7Всего убийств\: &8[Соперников\:&f%union_rival_kills% &8Союзников\:&f%union_ally_kills% &8Нейтральных\:&f%union_neutral_kills% &8Гражданских\:&f%union_civilian_kills%&8]\n &7Смерти\: &f%union_deaths%\n &7Союзники\: &f%union_allies%\n &7Соперники\: &f%union_rivals%\n &7Основан\: &f%union_founded%\n &7Неактивен\: &f%union_inactive_days%&7/&f%union_max_inactive_days% дня\n +player.lookup.unionname=&e[&8%union_color_tag%&e] &b%union_name% # suppress inspection "TrailingSpacesInProperty" player.lookup.killtype=&7Тип убийства\: %player_kill_type%\n -player.lookup=\n&7Информация о игроке &b%player_name% &8---------------------------------------------------\n \n &7Союз\: &f%clan_name%\n &7Ранг\: &f%player_rank%\n &7Статус\: &f%player_status%\n &7KDR\: &e%player_kdr%\n &7Убийств\: &8[Соперников\:&f%player_rival_kills% &8Союзников\:&7%player_ally_kills% &8Нейтральных\:&f%player_neutral_kills% &8Гражданских\:&f%player_civilian_kills%&8]\n &7Смертей\: &f%player_deaths%\n &7Дата вступления\: &f%player_join_date%\n &7Был в сети\: &f%player_last_seen%\n &7Прошлые союзы\: &f%player_past_clans%\n &7Неактивен\: &f%player_inactive_days%&7/&f%player_max_inactive_days% дней\n %kill_type_line% +player.lookup=\n&7Информация о игроке &b%player_name% &8---------------------------------------------------\n \n &7Союз\: &f%union_name%\n &7Статус\: &f%player_status%\n &7KDR\: &e%player_kdr%\n &7Убийств\: &8[Соперников\:&f%player_rival_kills% &8Союзников\:&7%player_ally_kills% &8Нейтральных\:&f%player_neutral_kills% &8Гражданских\:&f%player_civilian_kills%&8]\n &7Смертей\: &f%player_deaths%\n &7Дата вступления\: &f%player_join_date%\n &7Был в сети\: &f%player_last_seen%\n &7Прошлые союзы\: &f%player_past_unions%\n &7Неактивен\: &f%player_inactive_days%&7/&f%player_max_inactive_days% дней\n %kill_type_line% economy.disabled=&cЭкономика отключена\! has.been.purged=Данные {0} очищены accepted.invitation=&bВы приняли приглашение от {0} denied.invitation=&cВы отклонили приглашение от {0} -must.be.in.clan.to.pvp=&cВы и {0} должны быть участниками союза, чтобы сражаться\! -clans.not.at.war.pvp.denied=&cВаш союз не воюет с {0}\! +must.be.in.union.to.pvp=&cВы и {0} должны быть участниками союза, чтобы сражаться\! +unions.not.at.war.pvp.denied=&cВаш союз не воюет с {0}\! cannot.attack.civilians=&cВы не можете атаковать гражданских\! -cannot.attack.clan.member=&cВы не можете атаковать участников других союзов\! +cannot.attack.union.member=&cВы не можете атаковать участников других союзов\! cannot.attack.ally=&cВы не можете атаковать союзника\! cannot.send.discord.message=Вы не можете отправить сообщения для {0}. Вы не являетесь участником этого союза\! discordhook.is.disabled=&cИнтеграция с дискордом отключена или недоступна\! -your.clan.doesnt.have.any.linked.player=У вашего союза нет привязанных игроков -your.clan.doesnt.have.minimum.linked.player=Ваш союз не имеет минимального количества привязанных игроков -your.clan.is.not.on.the.whitelist=Ваш союз не в белом списке -your.clan.already.has.channel=Ваш союз уже имеет свой Discord канал +your.union.doesnt.have.any.linked.player=У вашего союза нет привязанных игроков +your.union.doesnt.have.minimum.linked.player=Ваш союз не имеет минимального количества привязанных игроков +your.union.is.not.on.the.whitelist=Ваш союз не в белом списке +your.union.already.has.channel=Ваш союз уже имеет свой Discord канал discord.reached.category.limit=Discord достиг лимита категорий\! discord.reached.channels.limit=Discord достиг лимита каналов\! discord.created.successfully=&bDiscord канал успешно создан\! @@ -844,19 +841,19 @@ cannot.kick.last.leader=&cВы не можете выгнать последне cannot.disband.permanent=&cВы не можете распустить этот союз. Он имеет постоянный статус. you.can.only.set.base.in.your.land=&cВы можете разместить точку базы только на вашей территории\! only.leaders.can.create.lands=&cТолько лидеры союза могут создавать территории\! -only.one.land.per.clan=&cУ вашего союза уже есть территория\! -only.clan.members.can.create.lands=&cТолько участники союза могут создавать территории\! +only.one.land.per.union=&cУ вашего союза уже есть территория\! +only.union.members.can.create.lands=&cТолько участники союза могут создавать территории\! land.allowed.all.actions=&bВсе действия теперь разрешены\! land.blocked.all.actions=&bВсе действия теперь запрещены\! land.allowed.action=&bДействие разрешено\! land.blocked.action=&bДействие запрещено\! you.do.not.own.lands=&cВы не владеете территорией\! land.sharing.disabled=&cРазделение территорий отключено\! -clan.chat.disabled=&cЧат союза отключен\! +union.chat.disabled=&cЧат союза отключен\! ally.chat.disabled=&cСоюзный чат отключен\! war.expired=Война с {0} истекла\! you.cant.start.war.online.members.difference=Вы не можете начать войну. Один из союзов имеет больше участников в сети, чем у другого. invitedplayer.invite.off=Данный игрок отключил приглашения союзов user.hasnt.played.before=&cЭтот игрок не играл ранее -clan.list.balance.header=\n{0} &7топ по балансу &8-----------------------\n \n&8Всего союзов\: &7{1}\n \n&8\#7. &8Союз &7- &8Баланс -clan.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} +union.list.balance.header=\n{0} &7топ по балансу &8-----------------------\n \n&8Всего союзов\: &7{1}\n \n&8\#7. &8Союз &7- &8Баланс +union.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} diff --git a/src/main/resources/messages_sv_SE.properties b/src/main/resources/messages_sv_SE.properties index c8453ce2..2ca67dc3 100644 --- a/src/main/resources/messages_sv_SE.properties +++ b/src/main/resources/messages_sv_SE.properties @@ -66,7 +66,7 @@ admin.command=administratör mod.command=moderator promote.command=befodra demote.command=nerbefodra -clanff.command=clanff +unionff.command=unionff ff.command=ff resign.command=avgå disband.command=upplösa @@ -104,7 +104,7 @@ acf-core.parameter.tag=tagg acf-core.parameter.name=namn acf-core.parameter.description=beskrivning acf-core.parameter.player=spelare -acf-core.parameter.clan=union +acf-core.parameter.union=union acf-core.parameter.type=typ acf-core.parameter.order=ordning acf-core.parameter.help=sida eller nyckelord @@ -147,8 +147,8 @@ command.description.ff.allow=Ställer in din personliga vänliga eld till tillå command.description.ff.auto=Ställer in din personliga vänliga eld till auto command.description.globalff.allow=Ställer in global vänlig eld till tillåten command.description.globalff.auto=Ställer in global vänlig eld till auto -command.description.clanff.allow=Ställer in unionens vänliga eld till tillåten -command.description.clanff.block=Ställer in unionens vänliga eld till blockerad +command.description.unionff.allow=Ställer in unionens vänliga eld till tillåten +command.description.unionff.block=Ställer in unionens vänliga eld till blockerad command.description.description=Anger din unioner beskrivning command.description.ban=Bannlyser en spelare från unionkommandon command.description.unban=Unbannar en spelare från unionkommandon @@ -176,7 +176,7 @@ command.description.untrust=Litar inte på en medlem command.description.resign=Abdikerar från din union command.description.help=Visar den här hjälpen eller söker i hjälpen command.description.ally.add=Lägger till en allierad -command.description.clan=Öppnar GUI +command.description.union=Öppnar GUI command.description.disband=Raderar din union command.description.mod.disband=Raderar en union command.description.mod.kick=Kickar en spelare från en union @@ -230,7 +230,7 @@ command.description.mod.rename=Byt namn på en union home-menu=/{0} hem{1} - Teleportera till union hem-bas home-set-menu=/{0} hem set{1} - Ställ in unionens hemmabas home-clear-menu=/{0} hem rensa{1} - Rensa unionens hemmabas -clan=Union +union=Union allies=Allierade alliances=allianser coords=kordinater @@ -240,7 +240,7 @@ coords.upper=Kordinater world=Värld kdr=KDR members=Medlemmar -clans.lower=unioner +unions.lower=unioner rival=Fiende civilian=Civila neutral=Neutral @@ -284,9 +284,9 @@ nokillsfound=Inga Dödade hittades promoted.to.leader={0} har blivit befordrad till ledare denied.demotion={0} nekade demotionen av {1}. Konsensus misslyckades. membership.invitation={0} har nekat medlemsinbjudan -joined.the.clan={0} har gått med i unionen +joined.the.union={0} har gått med i unionen signed.off.request.cancelled={0} har loggat av. {1} begäran avbröts. -clan.deletion={0} nekade att ta bort unionen. Konsensus misslyckades. +union.deletion={0} nekade att ta bort unionen. Konsensus misslyckades. rename.refused={0} nekade unionen byta namn. Konsensus misslyckades. has.been.disbanded=Unionen {0} har blivit borttagen denied.the.promotion={0} nekade främjandet av {1}. Konsensus misslyckades. @@ -322,9 +322,9 @@ mysql.connection.failed=MySQL-anslutning misslyckades sqlite.connection.successful=SQLite-anslutning lyckades sqlite.connection.failed= SQLite-anslutning misslyckades purging.player.data=rensar spelarens data\: {0} -purging.clan=Rensar union\: {0} -clan.players=Unionspelare\: {0} -clans=Union\: {0} +purging.union=Rensar union\: {0} +union.players=Unionspelare\: {0} +unions=Union\: {0} banned=Du är bannad från att använda unionkommandon nothing.more.to.see=Inget mer att se nothing.to.vote=&cIngenting att acceptera eller neka @@ -337,71 +337,71 @@ bulletin.board.header=&8* &e{0} &fbulletin board bulletin.board.message={0}\: &f{1} has.been.disbanded.rivalry.ended={0} har blivit upplöst. Rivalitet har upphört. has.been.disbanded.alliance.ended={0} har blivit upplöst. Alliansen har avslutats. -clan.disbanded=Union upplöstes +union.disbanded=Union upplöstes 1.color.day=1 {0}dag many.color.days={0}{1} dagar insufficient.permissions=Otillräcklig behörighet -clan.is.not.verified=Unionen är inte verifierad -player.not.a.member.of.any.clan=&cSpelaren är inte medlem i någon union -not.a.member.of.any.clan=Du är inte medlem i någon union +union.is.not.verified=Unionen är inte verifierad +player.not.a.member.of.any.union=&cSpelaren är inte medlem i någon union +not.a.member.of.any.union=Du är inte medlem i någon union minimum.to.make.alliance=Din union måste ha minst {0} spelare för att kunna göra allianser -cannot.be.same.clan=&cDu måste infoga en union som skiljer sig från din\! -other.clan.not.verified=&cDen andra unionen är inte verifierad\! -your.clans.are.not.allies=Dina unioner är inte allierade +cannot.be.same.union=&cDu måste infoga en union som skiljer sig från din\! +other.union.not.verified=&cDen andra unionen är inte verifierad\! +your.unions.are.not.allies=Dina unioner är inte allierade has.broken.the.alliance={0} har brutit alliansen med {1} at.least.one.leader.accept.the.alliance=Minst en ledare av de allierade måste vara online för att acceptera alliansen leaders.have.been.asked.for.an.alliance={0} ledare har blivit ombedda om en allians -your.clans.are.already.allies=Dina unioner är redan allierade -your.clan.cannot.create.rivals=Din union kan inte skapa rivaler +your.unions.are.already.allies=Dina unioner är redan allierade +your.union.cannot.create.rivals=Din union kan inte skapa rivaler min.players.rivalries=Din union måste ha minst {0} spelare för att kunna göra rivaliteter this.player.is.already.banned=Den här spelaren är redan bannad player.added.to.banned.list=Spelare tillagd i bannlyst lista you.banned=Du har blivit bannad från unionkommandon -clan.wide.friendly.fire.blocked=Vänlig eld blockerad av union-bredd -clan.wide.friendly.fire.is.allowed=Våld mot union är tillåten +union.wide.friendly.fire.blocked=Vänlig eld blockerad av union-bredd +union.wide.friendly.fire.is.allowed=Våld mot union är tillåten you.are.the.only.member.online=Du är den enda medlemmen online -your.clan.color.tag.cannot.be.longer.than.characters=&cDin unionfärgade tagg får inte vara längre än {0} tecken +your.union.color.tag.cannot.be.longer.than.characters=&cDin unionfärgade tagg får inte vara längre än {0} tecken you.cannot.set.colored.ranks=Du kan inte ställa in färgade leden -your.clan.name.cannot.be.longer.than.characters=Ditt unionnamn får inte vara längre än {0} tecken -your.clan.name.must.be.longer.than.characters=Ditt unionnamn måste vara längre än {0} tecken -your.clan.name.cannot.contain.color.codes=Ditt unionnamn får inte innehålla färgkoder +your.union.name.cannot.be.longer.than.characters=Ditt unionnamn får inte vara längre än {0} tecken +your.union.name.must.be.longer.than.characters=Ditt unionnamn måste vara längre än {0} tecken +your.union.name.cannot.contain.color.codes=Ditt unionnamn får inte innehålla färgkoder you.must.first.resign=Du måste först avgå från {0} -clan.with.this.tag.already.exists=En union med denna tagg finns redan -get.your.clan.verified.to.access.advanced.features=Få din union verifierad för att få tillgång till avancerade funktioner -clan.created=Union {0} skapad +union.with.this.tag.already.exists=En union med denna tagg finns redan +get.your.union.verified.to.access.advanced.features=Få din union verifierad för att få tillgång till avancerade funktioner +union.created=Union {0} skapad not.enough.leaders.online.to.vote.on.demotion=Det finns inte tillräckligt med ledare online för att rösta om denna nedläggning demotion.vote.has.been.requested.from.all.leaders=Röstning har begärts från alla ledare -player.is.not.a.leader.of.your.clan=Spelaren är inte ledare för din union +player.is.not.a.leader.of.your.union=Spelaren är inte ledare för din union player.is.not.a.leader=Spelaren är inte en ledare -clan.has.been.disbanded=Unionen {0} har blivit borttagen -clan.disband.vote.has.been.requested.from.all.leaders=Union disband omröstning har begärts från alla ledare -friendy.fire.is.now.managed.by.your.clan=Vänskap-eld hanteras nu av din union +union.has.been.disbanded=Unionen {0} har blivit borttagen +union.disband.vote.has.been.requested.from.all.leaders=Union disband omröstning har begärts från alla ledare +friendy.fire.is.now.managed.by.your.union=Vänskap-eld hanteras nu av din union personal.friendly.fire.is.set.to.allowed=Personlig vänlig-eld är inställd på att tillåtas -global.friendy.fire.is.now.managed.by.each.clan=Global friendy-fire hanteras nu av varje union -global.friendy.fire.is.already.being.managed.by.each.clan=Global friendy-fire hanteras redan av varje union +global.friendy.fire.is.now.managed.by.each.union=Global friendy-fire hanteras nu av varje union +global.friendy.fire.is.already.being.managed.by.each.union=Global friendy-fire hanteras redan av varje union global.friendly.fire.is.set.to.allowed=Global vänlig-eld är inställd på att tillåtas global.friendly.fire.is.already.being.allowed=Globala vänliga eld tillåts redan -the.player.doesn.t.not.have.the.permissions.to.join.clans=Spelaren har inte behörighet att gå med i unioner +the.player.doesn.t.not.have.the.permissions.to.join.unions=Spelaren har inte behörighet att gå med i unioner you.cannot.invite.yourself=Du kan inte bjuda in dig själv you.did.not.answer.in.time=Du svarade inte i tid, avbryter... -this.player.is.banned.from.using.clan.commands=Den här spelaren är bannad från att använda unionkommandon -the.player.is.already.member.of.another.clan=Spelaren är redan medlem i en annan union +this.player.is.banned.from.using.union.commands=Den här spelaren är bannad från att använda unionkommandon +the.player.is.already.member.of.another.union=Spelaren är redan medlem i en annan union has.been.asked.to.join={0} har blivit ombedd att gå med {1} you.cannot.kick.yourself=Du kan inte sparka dig själv -the.player.is.not.a.member.of.your.clan=Spelaren är inte medlem i din union +the.player.is.not.a.member.of.your.union=Spelaren är inte medlem i din union you.cannot.kick.another.leader=Du kan inte sparka en annan ledare has.been.kicked.by={0} har sparkats av {1} -no.clans.have.been.created=Inga unioner har skapats -total.clans=Totalt antal unioner\: +no.unions.have.been.created=Inga unioner har skapats +total.unions=Totalt antal unioner\: legend=Legend kill.type.civilian=Typ av död\: {0}Civiliska no.player.data.found=Inga spelardata hittades -clan.0=Union\: {0} +union.0=Union\: {0} status.0=Status\: {0} rank.0=Rank\: {0} kdr.0=KDR\: {0} inactive.0=Inaktiv\: {0} -clan.commands=unionkommandon +union.commands=unionkommandon you.can.only.modify.the.color.and.case.of.the.tag=Du kan bara ändra färg och fall på taggen tag.changed.to.0=Tagg ändrad till {0} 0.tag.changed.to.1=&bFramgångsrikt ändrat {0} s tagg till {1} @@ -411,11 +411,11 @@ leaders.0=Ledare\: {0} allies.0=Allierade\: {0} rivals.0=Rivaler\: {0} other.player.must.be.online=&cSpelaren måste vara online\! -the.player.does.not.have.the.permissions.to.lead.a.clan=Spelaren har inte behörighet att leda en union +the.player.does.not.have.the.permissions.to.lead.a.union=Spelaren har inte behörighet att leda en union you.cannot.promote.yourself=Du kan inte befordra dig själv the.player.is.already.a.leader=Spelaren är redan en ledare configuration.reloaded=Konfigurationen laddades om -last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.clan=Sista ledaren kan inte avgå. Du måste utse en annan ledare eller upplösa unionen +last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.union=Sista ledaren kan inte avgå. Du måste utse en annan ledare eller upplösa unionen 0.has.resigned={0} har avgått you.cannot.trust.yourself=Du kan inte lita på dig själv leaders.are.already.trusted=Ledare är redan betrodda @@ -423,23 +423,23 @@ this.player.is.already.trusted=Den här spelaren är redan betrodd has.been.given.trusted.status.by={0} har fått betrodd status av {1} this.player.is.not.banned=Den här spelaren är inte bannad player.removed.from.the.banned.list=Spelaren borttagen från den bannade listan -you.have.been.unbanned.from.clan.commands=Du har blivit obannad från unionkommandon +you.have.been.unbanned.from.union.commands=Du har blivit obannad från unionkommandon you.cannot.untrust.yourself=Du kan inte lita på dig själv leaders.cannot.be.untrusted=Ledare kan inte lita på this.player.is.already.untrusted=Den här spelaren är redan opålitlig has.been.given.untrusted.status.by={0} har fått obetrodd status av {1} -the.clan.does.not.exist=Unionen finns inte -the.clan.is.already.verified=Unionen är redan verifierad -the.clan.has.been.verified=Unionen har verifierats -clan.0.has.been.verified=Union {0} har verifierats\! -total.clan.players.0=Totalt antal unionspelare\: {0} +the.union.does.not.exist=Unionen finns inte +the.union.is.already.verified=Unionen är redan verifierad +the.union.has.been.verified=Unionen har verifierats +union.0.has.been.verified=Union {0} har verifierats\! +total.union.players.0=Totalt antal unionspelare\: {0} proposing.war={0} föreslår att starta ett krig med {1} you.can.only.start.war.with.rivals=Du kan bara starta krig med rivaler leaders.have.been.asked.to.accept.the.war.request={0} ledare har blivit ombedda att acceptera krigsförfrågan leaders.asked.to.end.rivalry={0} ledare har blivit ombedda att avsluta kriget proposing.to.end.the.war={0} föreslår att kriget avslutas med {1} -clans.already.at.war=Dina unioner är redan i krig -clans.not.at.war=Era unioner är inte i krig +unions.already.at.war=Dina unioner är redan i krig +unions.not.at.war=Era unioner är inte i krig you.are.at.war={0} är nu i krig med {1} denied.war.req={0} nekade krigsförfrågan skickad av {1} you.are.no.longer.at.war={0} är inte längre i krig med {1} @@ -467,12 +467,12 @@ diamond=diamant- gold=guld wood=trä server.announce=Meddelande från servern -clan.announce=Union notis +union.announce=Union notis leader.announce=Meddelande från ledaren hunger=Hunger stone=sten iron=järn -the.clan.cannot.be.rivaled=Unionen kan inte vara rivaliserad +the.union.cannot.be.rivaled=Unionen kan inte vara rivaliserad bboff=BB avaktiverat bbon=BB har aktiverats inviteon=Inbjudan har aktiverats @@ -496,30 +496,30 @@ waiting.for.teleport.stand.still.for.0.seconds=Väntar på teleport, stå stilla on=på off=av player.rank.changed=Rankning har angetts -your.clans.are.already.rivals=Dina unioner är redan rivaler +your.unions.are.already.rivals=Dina unioner är redan rivaler cleared.bb=Rensade anslagstavlan -clan.balance=Union-saldo\: {0} -clan.admin.balance={0}s saldo\: {1} -bb.clan.deposit={0} deponerades av {1} -player.clan.deposit=Du satte in {0} -bb.clan.withdraw={0} har dragits tillbaka av {1} -bb.clan.take={0} togs av {1} -bb.clan.give={0} gavs av {1} -bb.clan.set={0} sattes av {1} -player.clan.withdraw=Du tar ut {0} -clan.admin.take=Du tog {0} från {1}s bank -clan.admin.give=Du gav {0} till {1} s bank -clan.admin.set=Du har satt {0} s banksaldo till {1} -clan.admin.bank.not.enough.money={0} s bank har inte tillräckligt med pengar\! -clan.bank.not.enough.money=Din unionbank har inte tillräckligt med pengar -your.clans.are.not.rivals=Dina unioner är inte rivaler -the.clan.members.reached.limit=Din union har nått medlemsgränsen -this.clan.has.reached.the.member.limit=&bThis union har nått medlemsgränsen +union.balance=Union-saldo\: {0} +union.admin.balance={0}s saldo\: {1} +bb.union.deposit={0} deponerades av {1} +player.union.deposit=Du satte in {0} +bb.union.withdraw={0} har dragits tillbaka av {1} +bb.union.take={0} togs av {1} +bb.union.give={0} gavs av {1} +bb.union.set={0} sattes av {1} +player.union.withdraw=Du tar ut {0} +union.admin.take=Du tog {0} från {1}s bank +union.admin.give=Du gav {0} till {1} s bank +union.admin.set=Du har satt {0} s banksaldo till {1} +union.admin.bank.not.enough.money={0} s bank har inte tillräckligt med pengar\! +union.bank.not.enough.money=Din unionbank har inte tillräckligt med pengar +your.unions.are.not.rivals=Dina unioner är inte rivaler +the.union.members.reached.limit=Din union har nått medlemsgränsen +this.union.has.reached.the.member.limit=&bThis union har nått medlemsgränsen you.have.reseted.your.kdr=Du har återställt din KDR you.have.reseted.0.kdr=Du har återställt {0} s KDR you.have.reseted.kdr.of.all.players=Du har återställt KDR av alla spelare -you.have.successfully.renamed.your.clan=&bYou har framgångsrikt bytt namn på din union till {0} -you.have.successfully.renamed.the.clan=&bYou har framgångsrikt döpt om unionen till {0} +you.have.successfully.renamed.your.union=&bYou har framgångsrikt bytt namn på din union till {0} +you.have.successfully.renamed.the.union=&bYou har framgångsrikt döpt om unionen till {0} you.have.toggled.permanent.status=Du har bytt permanent status för {0} permanent.status.enabled=Din unions permanenta status har aktiverats av {0} permanent.status.disabled=Din unions permanenta status har inaktiverats av {0} @@ -542,11 +542,11 @@ bb.one.hour=1 timme bb.days= \ dagar bb.one.day=1 dag player.purged=Spelaren har rensats -your.clan.description.must.be.longer.than=Din unionbeskrivning måste vara längre än {0} tecken -your.clan.description.cannot.be.longer.than=Din unionbeskrivning får inte vara längre än {0} tecken +your.union.description.must.be.longer.than=Din unionbeskrivning måste vara längre än {0} tecken +your.union.description.cannot.be.longer.than=Din unionbeskrivning får inte vara längre än {0} tecken description.changed=Du har ändrat din unions beskrivning no.description=Ingen beskrivning -the.player.must.wait.0.before.joining.your.clan.again=Denna spelare måste vänta {0} minut(er) innan du går med i din union igen +the.player.must.wait.0.before.joining.your.union.again=Denna spelare måste vänta {0} minut(er) innan du går med i din union igen disabled.command=Kommando inaktiverat rank.displayname.updated=Rankens visningsnamn uppdaterades\! rank.setdefault=Unionens standardrang har nu satts till {0} @@ -559,17 +559,17 @@ rank.created=Rankning skapad permission.0.added.to.rank.1=Behörighet {0} tillagd i rank {1} permission.0.removed.from.rank.1=Behörighet {0} togs bort från rank {1} rank.0.deleted=Rank {0} borttagen -clans.ranks=Unioner rank\: +unions.ranks=Unioner rank\: ranks.list.item={0}{1} ({2}) no.ranks=Inga ledord skapades rank.no.permissions=Denna rank har ingen behörighet player.unassigned.from.rank=Spelare otilldelad från rank you.must.be.0.or.have.the.permission.1.to.use.this=Du måste vara {0} eller din ledare måste ge din rank tillstånd {1} för att använda detta -deposit.not.allowed=Insättning är inte tillåtet, använd /%clan %toggle %deposit för att tillåta det -withdraw.not.allowed=Uttag är inte tillåtet, använd /%clan %toggle %withdraw för att tillåta det +deposit.not.allowed=Insättning är inte tillåtet, använd /%union %toggle %deposit för att tillåta det +withdraw.not.allowed=Uttag är inte tillåtet, använd /%union %toggle %withdraw för att tillåta det resign.request.cancelled=Återställnings begäran avbruten disband.request.cancelled=Uppsägningsbegäran avbruten -clan.create.request.cancelled=Begäran om skapande av union avbruten +union.create.request.cancelled=Begäran om skapande av union avbruten rank.create.request.cancelled=Begäran att skapa rank avbruten promotion.vote.has.been.requested.from.all.leaders=Promotion har begärts av alla ledare rename.vote.has.been.requested.from.all.leaders=&bByt namn har begärts från alla ledare @@ -586,11 +586,10 @@ gui.lore.no.permission=&cDu har inte behörighet att se detta\! gui.main.title={0} - unionmeny gui.main.languageselector.title=&fSelect ditt språk gui.main.languageselector.lore.left.click=&7Vänsterklicka för att välja språk -gui.main.languageselector.lore.right.click=&7Högerklicka för att hjälpa till att översätta gui.main.other.commands.title=&fAndra kommandon gui.main.other.commands.lore=&7Vänsterklicka för att se alla unionkommandon -gui.main.clan.list.title=&Funionlista -gui.main.clan.list.lore=&7Vänsterklicka för att se unionlistan +gui.main.union.list.title=&Funionlista +gui.main.union.list.lore=&7Vänsterklicka för att se unionlistan gui.main.reset.kdr.title=&fReset KDR gui.main.reset.kdr.lore=&7Vänsterklicka för att återställa din KDR gui.main.leaderboard.title=&FLeaderboard @@ -598,8 +597,8 @@ gui.main.leaderboard.lore=&7Vänsterklicka för att se topplistan gui.main.staff.title=&fStaff gui.main.staff.lore=&7Vänsterklicka för att öppna personalmenyn gui.staff.title=Personal -gui.staff.clan.list.lore.left.click=&7Vänsterklicka för att se alla unioner -gui.staff.clan.list.lore.right.click=&7Högerklicka för att se alla overifierade unioner +gui.staff.union.list.lore.left.click=&7Vänsterklicka för att se alla unioner +gui.staff.union.list.lore.right.click=&7Högerklicka för att se alla overifierade unioner gui.player.list.title=Spelarlista gui.staff.player.list.title=&Fplayer lista gui.staff.player.list.lore.left.click=&7Vänsterklicka för att se alla spelare @@ -609,8 +608,8 @@ gui.staff.global.ff.lore.status=&7Status\: &b{0} gui.staff.global.ff.lore.toggle=&7Vänsterklicka för att växla den vänliga brandstatus gui.staff.reload.title=&Freload gui.staff.reload.lore=&7Vänsterklicka för att ladda om plugin -gui.staff.clanlist.unverified.title=Overifierade unioner - Totalt\: {0} -gui.staff.clanlist.toplace.title=Välj {0} s nya union +gui.staff.unionlist.unverified.title=Overifierade unioner - Totalt\: {0} +gui.staff.unionlist.toplace.title=Välj {0} s nya union gui.warning.title=Varning gui.warning.no.permission.title=&fNo behörighet gui.warning.no.permission.plugin.lore=&7Du har inte behörighet att göra detta\! @@ -619,20 +618,20 @@ gui.warning.no.permission.rank.lore=&7Du måste vara {0} eller din ledare måste gui.warning.not.verified.title=&Inte verifierad gui.warning.not.verified.lore=&7Din union måste verifieras\! gui.allies.title=Allierade -gui.allies.clan.lore=&7Högerklicka för att ta bort denna allierade +gui.allies.union.lore=&7Högerklicka för att ta bort denna allierade gui.allies.add.title=&fAdd en allierad gui.add.ally.title=Lägg till en Ally -gui.add.ally.clan.lore=&7Vänsterklicka för att alliera denna union +gui.add.ally.union.lore=&7Vänsterklicka för att alliera denna union gui.rivals.title=Rivaler -gui.rivals.clan.lore=&7Högerklicka för att ta bort denna rival +gui.rivals.union.lore=&7Högerklicka för att ta bort denna rival gui.rivals.add.title=&fAdd en rival gui.add.rival.title=Lägg till en rival -gui.add.rival.clan.lore=&7Vänsterklicka för att konkurrera med denna union -gui.clanlist.title=Unioner - Totalt\: {0} -gui.clanlist.clan.title=&fUnion\: [{0}&f] {1} -gui.clanlist.clan.lore.position=&b\#{0} -gui.clanlist.clan.lore.kdr=&7KDR\: &b{0} -gui.clanlist.clan.lore.members=&7Medlemmar\: &b{0} +gui.add.rival.union.lore=&7Vänsterklicka för att konkurrera med denna union +gui.unionlist.title=Unioner - Totalt\: {0} +gui.unionlist.union.title=&fUnion\: [{0}&f] {1} +gui.unionlist.union.lore.position=&b\#{0} +gui.unionlist.union.lore.kdr=&7KDR\: &b{0} +gui.unionlist.union.lore.members=&7Medlemmar\: &b{0} gui.coords.title=Koordinater gui.coords.player.lore.distance=&7Distance\: &b{0} gui.coords.player.lore.coords=&7Koordinater\: &b{0} {1} {2} @@ -662,83 +661,83 @@ gui.permissions.permission.lore=&7Högerklicka för att ta bort denna behörighe gui.add.permission.title=Add a permission gui.add.permission.permission.title=&f{0} gui.add.permission.permission.lore=&7Vänsterklicka för att lägga till denna behörighet till rankningen -gui.clandetails.title=[{0}{1} -gui.clandetails.free.agent.title=&Gratis Agentkommando -gui.clandetails.free.agent.create.clan.price.lore=&7Pris\: &b{0} -gui.clandetails.free.agent.create.clan.lore=&7Vänsterklicka för att skapa en union -gui.clandetails.clan.title=&f[{0}&f] {1} -gui.clandetails.clan.lore.description=&7Beskrivning\: &b{0} -gui.clandetails.clan.lore.status=&7Status\: &b{0} -gui.clandetails.clan.lore.leaders=&7Ledare\: &b{0} -gui.clandetails.clan.lore.online.members=&7Medlemmar på nätet\: &b{0}/{1} -gui.clandetails.clan.lore.kdr=&7KDR\: &b{0} -gui.clandetails.clan.lore.kill.totals=&7Döda totalt\: &b[Rival\:{0} Neutral\:{1} Civilian\:{2}] -gui.clandetails.clan.lore.deaths=&7Dödsfall\: &b{0} +gui.uniondetails.title=[{0}{1} +gui.uniondetails.free.agent.title=&Gratis Agentkommando +gui.uniondetails.free.agent.create.union.price.lore=&7Pris\: &b{0} +gui.uniondetails.free.agent.create.union.lore=&7Vänsterklicka för att skapa en union +gui.uniondetails.union.title=&f[{0}&f] {1} +gui.uniondetails.union.lore.description=&7Beskrivning\: &b{0} +gui.uniondetails.union.lore.status=&7Status\: &b{0} +gui.uniondetails.union.lore.leaders=&7Ledare\: &b{0} +gui.uniondetails.union.lore.online.members=&7Medlemmar på nätet\: &b{0}/{1} +gui.uniondetails.union.lore.kdr=&7KDR\: &b{0} +gui.uniondetails.union.lore.kill.totals=&7Döda totalt\: &b[Rival\:{0} Neutral\:{1} Civilian\:{2}] +gui.uniondetails.union.lore.deaths=&7Dödsfall\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.allies.separator=&b, +gui.uniondetails.union.lore.allies.separator=&b, # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.rivals.separator=&b, -gui.clandetails.clan.lore.allies=&7Allierade\: &b{0} -gui.clandetails.clan.lore.rivals=&7Rivals\: &b{0} -gui.clandetails.clan.lore.founded=&7Grundad\: &b{0} -gui.clandetails.clan.lore.inactive=&7Inaktiv\: &b{0}/{1} dagar -gui.clandetails.allies.title=&Allies -gui.clandetails.allies.lore=&7Vänsterklicka för att se dina allierade eller lägga till mer -gui.clandetails.rivals.title=&fRivaler -gui.clandetails.rivals.lore=&7Vänsterklicka för att se dina rivaler eller lägga till fler -gui.clandetails.roster.title=&deltagarlista -gui.clandetails.roster.lore=&7Vänsterklicka för att se dina unionmedlemmar eller bjuda in fler -gui.staffclandetails.roster.lore=&7Vänsterklicka för att se unionens medlemmar -gui.clandetails.coords.title=&Koordinater -gui.clandetails.coords.lore=&7Vänsterklicka för att se koordinaterna för din unions medlemmar -gui.clandetails.home.title=&fHome -gui.clandetails.home.lore.teleport.price=&7Teleporteringspris\: &b{0} -gui.clandetails.home.lore.teleport=&7Vänsterklicka för att teleportera till din unions hem -gui.staffclandetails.home.lore.teleport=&7Vänsterklicka för att teleportera till unionens hem -gui.clandetails.home.lore.clear=&7Släpp objektet för att rensa unionens hem -gui.clandetails.home.lore.set.price=&7Ställ in pris\: &b{0} -gui.clandetails.home.lore.set=&7Högerklicka för att ställa in unionens hem -gui.staffclandetails.home.lore.set=&7Högerklicka för att ställa in unionens hem -gui.clandetails.regroup.title=&Omgruppering -gui.clandetails.regroup.lore.price=&7Pris\: &b{0} -gui.clandetails.regroup.lore.home=&7Vänsterklicka för att omgruppera dina unionmedlemmar i unionhemmet -gui.clandetails.regroup.lore.me=&7Högerklicka för att omgruppera dina unionmedlemmar på din plats -gui.clandetails.ff.title=&FFriendly Fire -gui.clandetails.ff.personal.lore=&7Personligt\: &b{0} -gui.clandetails.ff.clan.lore=&7Union\: &b{0} -gui.clandetails.ff.personal.toggle.lore=&7Vänsterklicka för att växla din vänskapliga eld -gui.clandetails.ff.clan.toggle.lore=&7Högerklicka för att växla mellan unionens vänliga-brand -gui.clandetails.bank.title=&fBank -gui.clandetails.bank.balance.lore=&7Balans\: &b{0} -gui.clandetails.bank.withdraw.status.lore=&7Utdrag\: &b{0} -gui.clandetails.bank.deposit.status.lore=&7Insättning\: &b{0} -gui.clandetails.bank.withdraw.toggle.lore=&7Släpp objektet för att växla status för uttag -gui.clandetails.bank.deposit.toggle.lore=&7Högerklicka för att växla status för insättning -gui.clandetails.rank.title=&Frank -gui.clandetails.rank.lore=&7Vänsterklicka för att se unionens led och redigera dem -gui.clandetails.verified.title=&fVerifierad -gui.clandetails.not.verified.title=&Inte verifierad -gui.clandetails.verify.price.lore=&7Pris\: &b{0} -gui.clandetails.not.verified.lore=&7Vänsterklicka för att verifiera din union -gui.staffclandetails.not.verified.lore=&7Vänsterklicka för att verifiera denna union -gui.clandetails.resign.title=&Fresign -gui.clandetails.resign.lore=&7Vänsterklicka för att avgå din union -gui.clandetails.disband.title=&fDisband -gui.clandetails.disband.lore=&7Släpp objektet för att ta bort unionen -gui.staffclandetails.disband.lore=&7Vänsterklicka för att ta bort denna union -gui.clandetails.chat.title=&fChat -gui.clandetails.chat.clan.chat.lore=&7/{0} [message] - &bSkickar ett meddelande till unionchatten -gui.clandetails.chat.clan.join.leave.lore=&7/{0} {1}/{2} - &bJoins/lämnar unionchatten -gui.clandetails.chat.ally.chat.lore=&7/{0} [message] - &bSkickar ett meddelande till allierad chatt -gui.clandetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bJoins/lämnar allierad chatt -gui.clandetails.chat.clan.status.lore=&7Union\: &b{0} -gui.clandetails.chat.ally.status.lore=&7Allt\: &b{0} -gui.clandetails.chat.clan.toggle.lore=&7Vänsterklicka för att växla unionen chattstatus -gui.clandetails.chat.ally.toggle.lore=&7Högerklicka för att växla allierad chattstatus +gui.uniondetails.union.lore.rivals.separator=&b, +gui.uniondetails.union.lore.allies=&7Allierade\: &b{0} +gui.uniondetails.union.lore.rivals=&7Rivals\: &b{0} +gui.uniondetails.union.lore.founded=&7Grundad\: &b{0} +gui.uniondetails.union.lore.inactive=&7Inaktiv\: &b{0}/{1} dagar +gui.uniondetails.allies.title=&Allies +gui.uniondetails.allies.lore=&7Vänsterklicka för att se dina allierade eller lägga till mer +gui.uniondetails.rivals.title=&fRivaler +gui.uniondetails.rivals.lore=&7Vänsterklicka för att se dina rivaler eller lägga till fler +gui.uniondetails.roster.title=&deltagarlista +gui.uniondetails.roster.lore=&7Vänsterklicka för att se dina unionmedlemmar eller bjuda in fler +gui.staffuniondetails.roster.lore=&7Vänsterklicka för att se unionens medlemmar +gui.uniondetails.coords.title=&Koordinater +gui.uniondetails.coords.lore=&7Vänsterklicka för att se koordinaterna för din unions medlemmar +gui.uniondetails.home.title=&fHome +gui.uniondetails.home.lore.teleport.price=&7Teleporteringspris\: &b{0} +gui.uniondetails.home.lore.teleport=&7Vänsterklicka för att teleportera till din unions hem +gui.staffuniondetails.home.lore.teleport=&7Vänsterklicka för att teleportera till unionens hem +gui.uniondetails.home.lore.clear=&7Släpp objektet för att rensa unionens hem +gui.uniondetails.home.lore.set.price=&7Ställ in pris\: &b{0} +gui.uniondetails.home.lore.set=&7Högerklicka för att ställa in unionens hem +gui.staffuniondetails.home.lore.set=&7Högerklicka för att ställa in unionens hem +gui.uniondetails.regroup.title=&Omgruppering +gui.uniondetails.regroup.lore.price=&7Pris\: &b{0} +gui.uniondetails.regroup.lore.home=&7Vänsterklicka för att omgruppera dina unionmedlemmar i unionhemmet +gui.uniondetails.regroup.lore.me=&7Högerklicka för att omgruppera dina unionmedlemmar på din plats +gui.uniondetails.ff.title=&FFriendly Fire +gui.uniondetails.ff.personal.lore=&7Personligt\: &b{0} +gui.uniondetails.ff.union.lore=&7Union\: &b{0} +gui.uniondetails.ff.personal.toggle.lore=&7Vänsterklicka för att växla din vänskapliga eld +gui.uniondetails.ff.union.toggle.lore=&7Högerklicka för att växla mellan unionens vänliga-brand +gui.uniondetails.bank.title=&fBank +gui.uniondetails.bank.balance.lore=&7Balans\: &b{0} +gui.uniondetails.bank.withdraw.status.lore=&7Utdrag\: &b{0} +gui.uniondetails.bank.deposit.status.lore=&7Insättning\: &b{0} +gui.uniondetails.bank.withdraw.toggle.lore=&7Släpp objektet för att växla status för uttag +gui.uniondetails.bank.deposit.toggle.lore=&7Högerklicka för att växla status för insättning +gui.uniondetails.rank.title=&Frank +gui.uniondetails.rank.lore=&7Vänsterklicka för att se unionens led och redigera dem +gui.uniondetails.verified.title=&fVerifierad +gui.uniondetails.not.verified.title=&Inte verifierad +gui.uniondetails.verify.price.lore=&7Pris\: &b{0} +gui.uniondetails.not.verified.lore=&7Vänsterklicka för att verifiera din union +gui.staffuniondetails.not.verified.lore=&7Vänsterklicka för att verifiera denna union +gui.uniondetails.resign.title=&Fresign +gui.uniondetails.resign.lore=&7Vänsterklicka för att avgå din union +gui.uniondetails.disband.title=&fDisband +gui.uniondetails.disband.lore=&7Släpp objektet för att ta bort unionen +gui.staffuniondetails.disband.lore=&7Vänsterklicka för att ta bort denna union +gui.uniondetails.chat.title=&fChat +gui.uniondetails.chat.union.chat.lore=&7/{0} [message] - &bSkickar ett meddelande till unionchatten +gui.uniondetails.chat.union.join.leave.lore=&7/{0} {1}/{2} - &bJoins/lämnar unionchatten +gui.uniondetails.chat.ally.chat.lore=&7/{0} [message] - &bSkickar ett meddelande till allierad chatt +gui.uniondetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bJoins/lämnar allierad chatt +gui.uniondetails.chat.union.status.lore=&7Union\: &b{0} +gui.uniondetails.chat.ally.status.lore=&7Allt\: &b{0} +gui.uniondetails.chat.union.toggle.lore=&7Vänsterklicka för att växla unionen chattstatus +gui.uniondetails.chat.ally.toggle.lore=&7Högerklicka för att växla allierad chattstatus gui.playerdetails.title={0} gui.playerdetails.player.title=&f{0} -gui.playerdetails.player.lore.noclan=&7Union\: &bNone -gui.playerdetails.player.lore.clan=&7Union\: &b[{0}&b] {1} +gui.playerdetails.player.lore.nounion=&7Union\: &bNone +gui.playerdetails.player.lore.union=&7Union\: &b[{0}&b] {1} gui.playerdetails.player.lore.rank=&7Rank\: &b{0} gui.playerdetails.player.lore.status=&7Status\: &b{0} gui.playerdetails.player.lore.kdr=&7KDR\: &b{0} @@ -747,8 +746,8 @@ gui.playerdetails.player.lore.deaths=&7Dödsfall\: &b{0} gui.playerdetails.player.lore.join.date=&7Ansluta till datum\: &b{0} gui.playerdetails.player.lore.last.seen=&7Senast sedd\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.playerdetails.player.lore.past.clans.separator=&b, -gui.playerdetails.player.lore.past.clans=&7Tidigare unioner\: &b{0} +gui.playerdetails.player.lore.past.unions.separator=&b, +gui.playerdetails.player.lore.past.unions=&7Tidigare unioner\: &b{0} gui.playerdetails.player.lore.inactive=&7Inaktiv\: &b{0}/{1} dagar gui.playerdetails.kick.title=&fKick gui.playerdetails.promote.demote.title=&fPromot/Demote @@ -772,55 +771,53 @@ gui.languageselector.title=Språk - Aktuellt\: {0} gui.languageselector.language.title=&f{0} gui.languageselector.language.lore.left.click=&7Vänsterklicka för att ställa in detta som ditt språk gui.languageselector.language.lore.translation.status=&7Översättningsstatus\: &b{0}% -gui.languageselector.language.lore.right.click=&7Högerklicka för att hjälpa till att översätta gui.confirmation.title=Bekräftelse gui.confirmation.confirm=&7Klicka här för att bekräfta gui.confirmation.return=&7Klicka här för att returnera gui.not.supported=&cEtt fel uppstod när GUI\! Inaktivera det... Har du hämtat rätt version? -staff.member.verify.clan=&cA handläggare måste verifiera din union\! +staff.member.verify.union=&cA handläggare måste verifiera din union\! player.already.has.that.rank=&cSpelaren har redan den rangen\! -joined.clan.chat=&bYou har anslutit sig till unionchatt -already.joined.clan.chat=&bDu är redan ansluten till unionchatt -left.clan.chat=&bYou har lämnat unionchatt -muted.clan.chat=&bYou har tystat unionchatt -unmuted.clan.chat=&bYou har avtystat unionchatt +joined.union.chat=&bYou har anslutit sig till unionchatt +already.joined.union.chat=&bDu är redan ansluten till unionchatt +left.union.chat=&bYou har lämnat unionchatt +muted.union.chat=&bYou har tystat unionchatt +unmuted.union.chat=&bYou har avtystat unionchatt joined.ally.chat=&bYou har anslutit allierad chatt left.ally.chat=&bYou har lämnat allierad chatt muted.ally.chat=&bYou har tystat allierad chatt unmuted.ally.chat=&bYou har avtystat allierad chatt already.joined.ally.chat=&bDu är redan ansluten till allierad chatt -player.already.in.this.clan=&cSpelaren är redan i denna union -your.clan.reached.max.alliances=&cDin union har nått det maximala antalet allianser -other.clan.reached.max.alliances=&cDen andra unionen har nått max antal allianser -insert.clan.tag=&bInfoga uniontaggen (eller "{0}")\: -insert.clan.name=&bInfoga unionnamn\: +player.already.in.this.union=&cSpelaren är redan i denna union +your.union.reached.max.alliances=&cDin union har nått det maximala antalet allianser +other.union.reached.max.alliances=&cDen andra unionen har nått max antal allianser +insert.union.tag=&bInfoga uniontaggen (eller "{0}")\: +insert.union.name=&bInfoga unionnamn\: insert.rank.name=&bInfoga rankningsnamnet (eller "{0}")\: -click.to.help.translating=&bKlicka på denna länk för att översätta\:\n&r{0} -your.clan.must.have.members.to.verify=&cDin union måste ha minst {0} medlemmar för att bli verifierad\! +your.union.must.have.members.to.verify=&cDin union måste ha minst {0} medlemmar för att bli verifierad\! you.must.hold.a.banner=&cDu måste ha en banner i handen\! -you.changed.clan.banner=&bYou ändrade din unionbanner\! -your.clan.already.verified=&cDin union är redan verifierad\! +you.changed.union.banner=&bYou ändrade din unionbanner\! +your.union.already.verified=&cDin union är redan verifierad\! # suppress inspection "TrailingSpacesInProperty" -clan.profile=\n&b%clan_name%&7 profil &8-------------------------------------------------------\n \n &7Namn\: &e[&8%clan_color_tag%&e] &b%clan_name%\n &7Beskrivning\: &f%clan_description%\n &7Status\: &f%clan_status%\n &7Ledare\: %clan_leaders%\n &7Medlemmar på nätet\: &f%clan_online_count%&7/&f%clan_size%\n &7KDR\: &e%clan_kdr%\n &7Döda Totalt\: &8[Rival\:&f%clan_rival_kills% &8Alla\:&f%clan_ally_kills% &8Neutral\:&f%clan_neutral_kills% &8Civilian\:&f%clan_civilian_kills%&8]\n &7Dödsfall\: &f%clan_deaths%\n &7Allies\: &f%clan_allies%\n &7Rivals\: &f%clan_rivals%\n &7Grundad\: &f%clan_founded%\n &7Inaktiv\: &f%clan_inactive_days%&7/&f%clan_max_inactive_days% dagar\n -player.lookup.clanname=&e[&8%clan_color_tag%&e] &b%clan_name% +union.profile=\n&b%union_name%&7 profil &8-------------------------------------------------------\n \n &7Namn\: &e[&8%union_color_tag%&e] &b%union_name%\n &7Beskrivning\: &f%union_description%\n &7Status\: &f%union_status%\n &7Medlemmar på nätet\: &f%union_online_count%&7/&f%union_size%\n &7KDR\: &e%union_kdr%\n &7Döda Totalt\: &8[Rival\:&f%union_rival_kills% &8Alla\:&f%union_ally_kills% &8Neutral\:&f%union_neutral_kills% &8Civilian\:&f%union_civilian_kills%&8]\n &7Dödsfall\: &f%union_deaths%\n &7Allies\: &f%union_allies%\n &7Rivals\: &f%union_rivals%\n &7Grundad\: &f%union_founded%\n &7Inaktiv\: &f%union_inactive_days%&7/&f%union_max_inactive_days% dagar\n +player.lookup.unionname=&e[&8%union_color_tag%&e] &b%union_name% # suppress inspection "TrailingSpacesInProperty" player.lookup.killtype=&7Döda typ\: %player_kill_type%\n -player.lookup=\n&b%player_name%&7''s spelarinfo &8-----------------------------------------------\n \n &7Union\: &f%clan_name%\n &7Rank\: &f%player_rank%\n &7Status\: &f%player_status%\n &7KDR\: &e%player_kdr%\n &7Kill Totalt\: &8[Rival\:&f%player_rival_kills% &8Alla\:&7%player_ally_kills% &8Neutral\:&f%player_neutral_kills% &8Civilian\:&f%player_civilian_kills%&8]\n &7Deaths\: &f%player_deaths%\n &7Join Datum\: &f%player_join_date%\n &f%player_last_seen%\n &7Past Unioner\: f%player_past_clans%\n &7Inaktiv\: &f%player_inactive_days%&f %player_inactive_days% &f%player_max_inactive_days% dagar\n named@@27 %kill_type_line% +player.lookup=\n&b%player_name%&7''s spelarinfo &8-----------------------------------------------\n \n &7Union\: &f%union_name%\n &7Status\: &f%player_status%\n &7KDR\: &e%player_kdr%\n &7Kill Totalt\: &8[Rival\:&f%player_rival_kills% &8Alla\:&7%player_ally_kills% &8Neutral\:&f%player_neutral_kills% &8Civilian\:&f%player_civilian_kills%&8]\n &7Deaths\: &f%player_deaths%\n &7Join Datum\: &f%player_join_date%\n &f%player_last_seen%\n &7Past Unioner\: f%player_past_unions%\n &7Inaktiv\: &f%player_inactive_days%&f %player_inactive_days% &f%player_max_inactive_days% dagar\n named@@27 %kill_type_line% economy.disabled=&cEkonomi inaktiverad\! has.been.purged={0}''s data har rensats accepted.invitation=&bYou har accepterat {0}s inbjudan denied.invitation=&cDu har nekat {0}s inbjudan -must.be.in.clan.to.pvp=&cYou och {0} måste vara unionmedlemmar till PvP\! -clans.not.at.war.pvp.denied=&cDin union är inte i krig med {0}\! +must.be.in.union.to.pvp=&cYou och {0} måste vara unionmedlemmar till PvP\! +unions.not.at.war.pvp.denied=&cDin union är inte i krig med {0}\! cannot.attack.civilians=&cYou kan inte attackera civila\! -cannot.attack.clan.member=&cYou kan inte attackera en annan unionmedlem\! +cannot.attack.union.member=&cYou kan inte attackera en annan unionmedlem\! cannot.attack.ally=&cYou kan inte attackera en allierad\! cannot.send.discord.message=Du kan inte skicka meddelanden till {0}. Du är inte medlem i den unionen\! discordhook.is.disabled=&cDiscord-integration är inaktiverad eller otillgänglig\! -your.clan.doesnt.have.any.linked.player=Din union har inga länkade spelare -your.clan.doesnt.have.minimum.linked.player=Din union har inte minsta länkade spelare -your.clan.is.not.on.the.whitelist=Din union är inte vitlistad -your.clan.already.has.channel=Din union har redan en discord-kanal +your.union.doesnt.have.any.linked.player=Din union har inga länkade spelare +your.union.doesnt.have.minimum.linked.player=Din union har inte minsta länkade spelare +your.union.is.not.on.the.whitelist=Din union är inte vitlistad +your.union.already.has.channel=Din union har redan en discord-kanal discord.reached.category.limit=Discord nådde gränsen för kategorier\! discord.reached.channels.limit=Discord nådde kanalernas gränser\! discord.created.successfully=&bDiscord-kanal skapades framgångsrikt\! @@ -830,19 +827,19 @@ cannot.kick.last.leader=&cYou kan inte sparka den sista ledaren\! cannot.disband.permanent=&cYou kan inte ta bort denna union. Den har permanent status. you.can.only.set.base.in.your.land=&cYou kan bara ställa in hem i ditt land\! only.leaders.can.create.lands=&cEndast ledare kan skapa land\! -only.one.land.per.clan=&cDin union har redan ett land\! -only.clan.members.can.create.lands=&cEndast unionmedlemmar kan skapa land\! +only.one.land.per.union=&cDin union har redan ett land\! +only.union.members.can.create.lands=&cEndast unionmedlemmar kan skapa land\! land.allowed.all.actions=&bAll åtgärder är nu tillåtna\! land.blocked.all.actions=&bAll åtgärder är nu blockerade\! land.allowed.action=&böjd åtgärd\! land.blocked.action=&bBlockerad åtgärd\! you.do.not.own.lands=&cDu äger inte ett land\! land.sharing.disabled=&cLand delning är inaktiverad\! -clan.chat.disabled=&cUnion-chatt är inaktiverad\! +union.chat.disabled=&cUnion-chatt är inaktiverad\! ally.chat.disabled=&cAlly-chatten är inaktiverad\! war.expired=Kriget mot {0} har gått ut\! you.cant.start.war.online.members.difference=Du kan inte starta kriget. En union har fler medlemmar på nätet än den andra. invitedplayer.invite.off=Denna spelare har inaktiverat unioninbjudningar user.hasnt.played.before=&cDenna användare har inte spelat innan -clan.list.balance.header=\n{0} &7top balans &8-------------------------\n \n&8Total unioner\: &7{1}\n \n&8\#&7. &8Union &7- &8Balance -clan.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} +union.list.balance.header=\n{0} &7top balans &8-------------------------\n \n&8Total unioner\: &7{1}\n \n&8\#&7. &8Union &7- &8Balance +union.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} diff --git a/src/main/resources/messages_th_TH.properties b/src/main/resources/messages_th_TH.properties index da97c39f..6ca7d1ce 100644 --- a/src/main/resources/messages_th_TH.properties +++ b/src/main/resources/messages_th_TH.properties @@ -66,7 +66,7 @@ admin.command=ผู้ดูแล mod.command=mod promote.command=โปรโมท demote.command=ลดตำแหน่ง -clanff.command=clanff +unionff.command=unionff ff.command=ff resign.command=ลาออก disband.command=เลิก @@ -104,7 +104,7 @@ acf-core.parameter.tag=แท็ก acf-core.parameter.name=ชื่อ acf-core.parameter.description=คำอธิบาย acf-core.parameter.player=ผู้เล่น -acf-core.parameter.clan=สหภาพ +acf-core.parameter.union=สหภาพ acf-core.parameter.type=ประเภท acf-core.parameter.order=ลำดับ acf-core.parameter.help=หน้าหรือคำหลัก @@ -147,8 +147,8 @@ command.description.ff.allow=อนุญาตให้ทําร้ายม command.description.ff.auto=อนุญาตให้ทําร้ายมิตรส่วนตัวของคุณได้ command.description.globalff.allow=อนุญาตให้ทําร้ายมิตรส่วนตัวของคุณได้ command.description.globalff.auto=ตั้งค่าการยิงพวกเดียวกันทั่วโลกเป็นอัตโนมัติ -command.description.clanff.allow=อนุญาตให้ทําร้ายมิตรส่วนตัวของคุณได้ -command.description.clanff.block=อนุญาตให้ทําร้ายมิตรส่วนตัวของคุณได้ +command.description.unionff.allow=อนุญาตให้ทําร้ายมิตรส่วนตัวของคุณได้ +command.description.unionff.block=อนุญาตให้ทําร้ายมิตรส่วนตัวของคุณได้ command.description.description=แก้ไขคำอธิบายสหภาพของคุณ command.description.ban=แบนผู้เล่นจากคำสั่งสหภาพ command.description.unban=ปลดแบนผู้เล่นจากคำสั่งสหภาพ @@ -176,7 +176,7 @@ command.description.untrust=ถอนความไว้วางใจจา command.description.resign=ลาออกจากสหภาพ command.description.help=แสดงความช่วยเหลือหรือค้นหาในระบบช่วยเหลือ command.description.ally.add=เพิ่มพันธมิตรเข้าในสหภาพ -command.description.clan=เปิด GUI +command.description.union=เปิด GUI command.description.disband=ยุบสหภาพ command.description.mod.disband=ยุบสหภาพ command.description.mod.kick=เตะผู้เล่นออกจากสหภาพ @@ -230,7 +230,7 @@ command.description.mod.locale=ตั้งค่าภาษาของผู home-menu=/{0} home{1} - วาร์ปไปยังฐานหลักของสหภาพ home-set-menu=/{0} home set{1} - ตั้งค่าฐานหลักของสหภาพ home-clear-menu=/{0} home clear{1} - ล้างฐานหลักของสหภาพ -clan=สหภาพ +union=สหภาพ allies=ดูพันธมิตรของสหภาพ alliances=พันธมิตร coords=พิกัด @@ -240,7 +240,7 @@ coords.upper=พิกัด world=โลก kdr=อัตราส่วนฆ่าตาย (Kill/Death Ratio) members=สมาชิกสหภาพ -clans.lower=สหภาพ +unions.lower=สหภาพ rival=ศัตรูของสหภาพ civilian=พลเรือน (ผู้เล่นที่ไม่สังกัดสหภาพ) neutral=สถานะเป็นกลาง diff --git a/src/main/resources/messages_tr_TR.properties b/src/main/resources/messages_tr_TR.properties index abb84ffe..2792a10c 100644 --- a/src/main/resources/messages_tr_TR.properties +++ b/src/main/resources/messages_tr_TR.properties @@ -66,7 +66,7 @@ admin.command=yönetici mod.command=moderatör promote.command=yükselt demote.command=düşür -clanff.command=clanff +unionff.command=unionff ff.command=dostateşi resign.command=ayrıl disband.command=dağıt @@ -104,7 +104,7 @@ acf-core.parameter.tag=etiket acf-core.parameter.name=isim acf-core.parameter.description=açıklama acf-core.parameter.player=oyuncu -acf-core.parameter.clan=birlik +acf-core.parameter.union=birlik acf-core.parameter.type=tip acf-core.parameter.order=sıra acf-core.parameter.help=sayfa veya anahtar kelimeler @@ -147,8 +147,8 @@ command.description.ff.allow=Kişisel dost ateşinizi izin verecek şekilde ayar command.description.ff.auto=Kişisel dost ateşinizi otomatik olarak ayarlar command.description.globalff.allow=Genel dost ateşini izin verecek şekilde ayarlar command.description.globalff.auto=Genel dost ateşini otomatik olarak ayarlar -command.description.clanff.allow=Birlikınızın dost ateşine izin verecek şekilde ayarlar -command.description.clanff.block=Birlikınızın dost ateşini kapatır +command.description.unionff.allow=Birlikınızın dost ateşine izin verecek şekilde ayarlar +command.description.unionff.block=Birlikınızın dost ateşini kapatır command.description.description=Birlikınızın açıklamasını ayarlar command.description.ban=Bir oyuncuyu birlik komutlarından yasaklar command.description.unban=Bir oyuncunun birlik komutlarından yasağını kaldırır @@ -176,7 +176,7 @@ command.description.untrust=Bir üyenin güvenini kaldırır command.description.resign=Birlikınızdan ayrılırsınız command.description.help=Bu yardımı veya yardımdaki aramaları gösterir command.description.ally.add=Bir müttefik ekler -command.description.clan=Arayüzü açar +command.description.union=Arayüzü açar command.description.disband=Birlikınızı dağıtır command.description.mod.disband=Bir birlikı dağıtır command.description.mod.kick=Birlikdan bir oyuncuyu atar @@ -231,7 +231,7 @@ command.description.mod.locale=turkish home-menu=/{0} ev{1} - Birlik evine ışınlanma home-set-menu=/{0} ev ayarla{1} - Birlik evini ayarla home-clear-menu=/{0} ev temizle{1} - Birlikın evini temizle -clan=Birlik +union=Birlik allies=Müttefik alliances=müttefikler coords=koordinat @@ -241,7 +241,7 @@ coords.upper=koordinatlar world=Dünya kdr=KD members=Üyeler -clans.lower=Birlikler +unions.lower=Birlikler rival=Rakip civilian=Sivil neutral=Tarafsız @@ -285,9 +285,9 @@ nokillsfound=Öldürme Bulunamadı promoted.to.leader={0} liderliğe yükseltildi denied.demotion={0} {1} rütbesini inkar etti. Fikir birliği başarısız oldu. membership.invitation={0} birlik davetini reddetti -joined.the.clan={0} birlika katıldı +joined.the.union={0} birlika katıldı signed.off.request.cancelled={0} oyundan çıktı. {1} istek iptal edildi. -clan.deletion={0} birlikın silinmesini reddetti. Fikir birliği başarısız oldu. +union.deletion={0} birlikın silinmesini reddetti. Fikir birliği başarısız oldu. rename.refused={0} birlik yeniden adlandırılması reddedildi. has.been.disbanded={0} birlikı dağıtıldı denied.the.promotion={0}, {1} terfiyi reddetti. Fikir birliği başarısız oldu. @@ -323,9 +323,9 @@ mysql.connection.failed=MySQL Bağlantısı başarısız oldu sqlite.connection.successful=SQLite Bağlantısı başarılı sqlite.connection.failed= SQLite Bağlantısı başarısız oldu purging.player.data=Oyuncu verileri siliniyor\: {0} -purging.clan=Birlik siliniyor\: {0} -clan.players=Birlik oyuncuları\: {0} -clans=Birlikler\: {0} +purging.union=Birlik siliniyor\: {0} +union.players=Birlik oyuncuları\: {0} +unions=Birlikler\: {0} banned=Birlik komutlarını kullanmanız yasabirlikdı nothing.more.to.see=Daha fazla görecek bir şey yok nothing.to.vote=&cKabul edilecek ya da reddedilecek bir şey yok @@ -338,72 +338,72 @@ bulletin.board.header=&8* &e{0} &filan tahtası bulletin.board.message={0}\: &f{1} has.been.disbanded.rivalry.ended={0} birlikı dağıtıldı. Rekabet sona erdi. has.been.disbanded.alliance.ended={0} birlikı dağıtıldı. İttifak sona erdi. -clan.disbanded=Birlik Dağıtıldı +union.disbanded=Birlik Dağıtıldı 1.color.day=1 {0}gün many.color.days={0}{1} gün insufficient.permissions=Yetersiz yetki -clan.is.not.verified=Birlik doğrulanmadı -player.not.a.member.of.any.clan=&cOyuncu herhangi bir birlikın üyesi değil -not.a.member.of.any.clan=Herhangi bir birlika üye değilsiniz +union.is.not.verified=Birlik doğrulanmadı +player.not.a.member.of.any.union=&cOyuncu herhangi bir birlikın üyesi değil +not.a.member.of.any.union=Herhangi bir birlika üye değilsiniz minimum.to.make.alliance=İttifak kurabilmek için birlikınızda en az {0} oyuncu bulunmalıdır -cannot.be.same.clan=&cSizinkinden farklı bir birlik eklemelisiniz\! -other.clan.not.verified=&cDiğer birlik doğrulanmadı\! -your.clans.are.not.allies=Birliklerınız müttefik değil +cannot.be.same.union=&cSizinkinden farklı bir birlik eklemelisiniz\! +other.union.not.verified=&cDiğer birlik doğrulanmadı\! +your.unions.are.not.allies=Birliklerınız müttefik değil has.broken.the.alliance={0}, {1} birlikı ile olan ittifakı bozdu at.least.one.leader.accept.the.alliance=İttifakı kabul etmek için müttefikin en az bir lideri çevrimiçi olmalıdır leaders.have.been.asked.for.an.alliance={0} liderden bir ittifak istendi -your.clans.are.already.allies=Birliklerınız zaten müttefik -your.clan.cannot.create.rivals=Birlikınız rakip oluşturamaz +your.unions.are.already.allies=Birliklerınız zaten müttefik +your.union.cannot.create.rivals=Birlikınız rakip oluşturamaz min.players.rivalries=Rakip belirlemek için birlikınızın en az {0} oyuncusu olmalıdır this.player.is.already.banned=Bu oyuncu zaten yasabirlikmış player.added.to.banned.list=Oyuncu yasabirlikanlar listesine eklendi you.banned=Birlik komutlarından yasabirlikdınız -clan.wide.friendly.fire.blocked=Birlik çapında dost ateşi engellendi -clan.wide.friendly.fire.is.allowed=Birlik çapında dost ateşine izin verildi +union.wide.friendly.fire.blocked=Birlik çapında dost ateşi engellendi +union.wide.friendly.fire.is.allowed=Birlik çapında dost ateşine izin verildi you.are.the.only.member.online=Çevrimiçi tek üye sizsiniz -your.clan.color.tag.cannot.be.longer.than.characters=&cBirlikınızın renkli etiketi {0} karakterden uzun olamaz -your.clan.tag.cannot.be.longer.than.characters=&Birlikınızın etiketi {0} karakterden uzun olamaz +your.union.color.tag.cannot.be.longer.than.characters=&cBirlikınızın renkli etiketi {0} karakterden uzun olamaz +your.union.tag.cannot.be.longer.than.characters=&Birlikınızın etiketi {0} karakterden uzun olamaz you.cannot.set.colored.ranks=Renkli rütbeler ayarlayamazsınız -your.clan.name.cannot.be.longer.than.characters=Birlikınızın adı {0} karakterden uzun olamaz -your.clan.name.must.be.longer.than.characters=Birlikınızın adı {0} karakterden uzun olmalıdır -your.clan.name.cannot.contain.color.codes=Birlikınızın adı renk kodları içeremez +your.union.name.cannot.be.longer.than.characters=Birlikınızın adı {0} karakterden uzun olamaz +your.union.name.must.be.longer.than.characters=Birlikınızın adı {0} karakterden uzun olmalıdır +your.union.name.cannot.contain.color.codes=Birlikınızın adı renk kodları içeremez you.must.first.resign=Önce {0} birlikından ayrılmalısınız -clan.with.this.tag.already.exists=Bu etikete sahip bir birlik zaten var. -get.your.clan.verified.to.access.advanced.features=Gelişmiş özelliklere erişmek için birlikınızı doğrulayın -clan.created={0} birlikı oluşturuldu +union.with.this.tag.already.exists=Bu etikete sahip bir birlik zaten var. +get.your.union.verified.to.access.advanced.features=Gelişmiş özelliklere erişmek için birlikınızı doğrulayın +union.created={0} birlikı oluşturuldu not.enough.leaders.online.to.vote.on.demotion=Bu indirgemeye oy vermek için çevrimiçi yeterli lider yok demotion.vote.has.been.requested.from.all.leaders=Tüm liderlerden indirgeme oyu talep edildi -player.is.not.a.leader.of.your.clan=Oyuncu birlikınızın lideri değil +player.is.not.a.leader.of.your.union=Oyuncu birlikınızın lideri değil player.is.not.a.leader=Oyuncu lider değil -clan.has.been.disbanded={0} birlikı dağıtıldı -clan.disband.vote.has.been.requested.from.all.leaders=Tüm liderlerden birlikın dağılması oyu talep edildi -friendy.fire.is.now.managed.by.your.clan=Dostluk ateşi artık birlikınız tarafından yönetiliyor +union.has.been.disbanded={0} birlikı dağıtıldı +union.disband.vote.has.been.requested.from.all.leaders=Tüm liderlerden birlikın dağılması oyu talep edildi +friendy.fire.is.now.managed.by.your.union=Dostluk ateşi artık birlikınız tarafından yönetiliyor personal.friendly.fire.is.set.to.allowed=Kişisel dost ateşine izin verildi -global.friendy.fire.is.now.managed.by.each.clan=Genel dostluk ateşi artık her birlik tarafından yönetiliyor -global.friendy.fire.is.already.being.managed.by.each.clan=Genel dostluk ateşi zaten her birlik tarafından yönetiliyor +global.friendy.fire.is.now.managed.by.each.union=Genel dostluk ateşi artık her birlik tarafından yönetiliyor +global.friendy.fire.is.already.being.managed.by.each.union=Genel dostluk ateşi zaten her birlik tarafından yönetiliyor global.friendly.fire.is.set.to.allowed=Genel dost ateşine izin verildi global.friendly.fire.is.already.being.allowed=Genel dost ateşine zaten izin veriliyor -the.player.doesn.t.not.have.the.permissions.to.join.clans=Oyuncunun birliklera katılma izni yok +the.player.doesn.t.not.have.the.permissions.to.join.unions=Oyuncunun birliklera katılma izni yok you.cannot.invite.yourself=Kendini davet edemezsin you.did.not.answer.in.time=Zamanında cevap vermediniz, iptal ediliyor... -this.player.is.banned.from.using.clan.commands=Bu oyuncunun birlik komutlarını kullanması yasabirlikdı -the.player.is.already.member.of.another.clan=Oyuncu zaten başka bir birlikın üyesi +this.player.is.banned.from.using.union.commands=Bu oyuncunun birlik komutlarını kullanması yasabirlikdı +the.player.is.already.member.of.another.union=Oyuncu zaten başka bir birlikın üyesi has.been.asked.to.join={0} oyuncusundan {1} birlikına katılması istendi you.cannot.kick.yourself=Kendini atamazsın\! -the.player.is.not.a.member.of.your.clan=Oyuncu birlikınızın bir üyesi değil +the.player.is.not.a.member.of.your.union=Oyuncu birlikınızın bir üyesi değil you.cannot.kick.another.leader=Başka bir lideri tekmeleyemezsiniz has.been.kicked.by={0}, {1} tarafından birlikdan atıldı -no.clans.have.been.created=Birlik oluşturulmadı -total.clans=Toplam birlikler\: +no.unions.have.been.created=Birlik oluşturulmadı +total.unions=Toplam birlikler\: legend=Efsane\: kill.type.civilian=Öldürme Türü\: {0}Sivil no.player.data.found=Oyuncu verisi bulunamadı -clan.0=Union\: {0} +union.0=Union\: {0} status.0=Durum\: {0} rank.0=Derece\: {0} kdr.0=KD\: {0} inactive.0=Son aktiflik\: {0} -clan.commands=birlik komutları +union.commands=birlik komutları you.can.only.modify.the.color.and.case.of.the.tag=Yalnızca etiketin rengini ve durumunu değiştirebilirsiniz tag.changed.to.0=Etiket {0} olarak değiştirildi 0.tag.changed.to.1=&b{0} birlikının etiketi {1} olarak değiştirdi @@ -413,11 +413,11 @@ leaders.0=Liderler\: {0} allies.0=Müttefikler\: {0} rivals.0=Rakipler\: {0} other.player.must.be.online=&cOyuncu aktif olmalı\! -the.player.does.not.have.the.permissions.to.lead.a.clan=Oyuncu bir birlika liderlik etme iznine sahip değil +the.player.does.not.have.the.permissions.to.lead.a.union=Oyuncu bir birlika liderlik etme iznine sahip değil you.cannot.promote.yourself=Kendini terfi ettiremezsin the.player.is.already.a.leader=Oyuncu zaten bir lider configuration.reloaded=Yapılandırma yeniden yüklendi -last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.clan=Son lider istifa edemez. Başka bir lider atamalı veya birlikı dağıtmalısınız +last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.union=Son lider istifa edemez. Başka bir lider atamalı veya birlikı dağıtmalısınız 0.has.resigned={0} birlikdan ayrıldı you.cannot.trust.yourself=Kendi durumunu güvenilir olarak değiştiremezsin leaders.are.already.trusted=Liderlere zaten güveniliyor @@ -425,23 +425,23 @@ this.player.is.already.trusted=Bu oyuncuya zaten güveniliyor has.been.given.trusted.status.by={0}, {1} tarafından durumu güvenilir olarak değiştirildi this.player.is.not.banned=Bu oyuncu yasabirlikmadı player.removed.from.the.banned.list=Oyuncu yasaklı listeden çıkarıldı -you.have.been.unbanned.from.clan.commands=Birlik komutlarından yasağınız kaldırıldı +you.have.been.unbanned.from.union.commands=Birlik komutlarından yasağınız kaldırıldı you.cannot.untrust.yourself=Kendi durumunu güvenilmez olarak değiştiremezsin leaders.cannot.be.untrusted=Liderler güvenilmez olamaz this.player.is.already.untrusted=Bu oyuncu zaten güvenilmez has.been.given.untrusted.status.by={0}, {1} tarafından durumu güvenilmeyen olarak değiştirildi -the.clan.does.not.exist=Birlik mevcut değil -the.clan.is.already.verified=Birlik zaten doğrulandı -the.clan.has.been.verified=Birlik doğrulandı -clan.0.has.been.verified={0} birlikı doğrulandı\! -total.clan.players.0=Toplam birlik oyuncuları\: {0} +the.union.does.not.exist=Birlik mevcut değil +the.union.is.already.verified=Birlik zaten doğrulandı +the.union.has.been.verified=Birlik doğrulandı +union.0.has.been.verified={0} birlikı doğrulandı\! +total.union.players.0=Toplam birlik oyuncuları\: {0} proposing.war={0}, {1} birlikı ile savaş başlatmayı teklif ediyor you.can.only.start.war.with.rivals=Sadece rakiplerle savaşa başlayabilirsin leaders.have.been.asked.to.accept.the.war.request={0} liderlerinden savaş talebini kabul etmeleri istendi leaders.asked.to.end.rivalry={0} liderlerinden savaşı bitirmeleri istendi proposing.to.end.the.war={0}, {1} birlikı ile savaşı bitirmeyi teklif ediyor -clans.already.at.war=Birliklerınız zaten savaşta -clans.not.at.war=Birliklerınız savaşta değil +unions.already.at.war=Birliklerınız zaten savaşta +unions.not.at.war=Birliklerınız savaşta değil you.are.at.war={0} şu anda {1} ile savaş halinde denied.war.req={0}, {1} tarafından gönderilen savaş talebini reddetti you.are.no.longer.at.war={0} artık {1} birlikı ile savaşta değil @@ -469,12 +469,12 @@ diamond=Elmas gold=Altın wood=tahta server.announce=Sunucu Duyurusu -clan.announce=Birlik Duyurusu +union.announce=Birlik Duyurusu leader.announce=Lider Duyurusu hunger=Açlık stone=Taş iron=demir -the.clan.cannot.be.rivaled=Bu birlik rakip olamaz. +the.union.cannot.be.rivaled=Bu birlik rakip olamaz. bboff=BB kapatıldı bbon=BB açıldı inviteon=Birlik daveti açıldı @@ -498,30 +498,30 @@ waiting.for.teleport.stand.still.for.0.seconds=Işınlanılıyor, {0} saniye boy on=açık off=kapalı player.rank.changed=Rütbe belirlendi -your.clans.are.already.rivals=Birliklerınız zaten rakip +your.unions.are.already.rivals=Birliklerınız zaten rakip cleared.bb=Birlik panosu temizledi -clan.balance=Birlik-Bakiyesi\: {0} -clan.admin.balance={0} bakiyesi\: {1} -bb.clan.deposit={0}, {1} tarafından yatırıldı -player.clan.deposit={0} yatırdın -bb.clan.withdraw={0}, {1} tarafından çekildi -bb.clan.take={0}, {1} tarafından alındı -bb.clan.give={0}, {1} tarafından verildi -bb.clan.set={0}, {1} tarafından belirlendi -player.clan.withdraw={0} çektin -clan.admin.take={1} adlı birlikın bankasından {0} aldınız -clan.admin.give={1} adlı birlikın bankasına {0} verdiniz -clan.admin.set={0} birlikının banka bakiyesini {1} olarak ayarladınız -clan.admin.bank.not.enough.money={0} bankasında yeterli para yok\! -clan.bank.not.enough.money=Birlik bankanızın yeterli parası yok -your.clans.are.not.rivals=Birliklerınız rakip değil -the.clan.members.reached.limit=Birlikınız üye sınırına ulaştı -this.clan.has.reached.the.member.limit=&bBu birlik üye sınırına ulaştı +union.balance=Birlik-Bakiyesi\: {0} +union.admin.balance={0} bakiyesi\: {1} +bb.union.deposit={0}, {1} tarafından yatırıldı +player.union.deposit={0} yatırdın +bb.union.withdraw={0}, {1} tarafından çekildi +bb.union.take={0}, {1} tarafından alındı +bb.union.give={0}, {1} tarafından verildi +bb.union.set={0}, {1} tarafından belirlendi +player.union.withdraw={0} çektin +union.admin.take={1} adlı birlikın bankasından {0} aldınız +union.admin.give={1} adlı birlikın bankasına {0} verdiniz +union.admin.set={0} birlikının banka bakiyesini {1} olarak ayarladınız +union.admin.bank.not.enough.money={0} bankasında yeterli para yok\! +union.bank.not.enough.money=Birlik bankanızın yeterli parası yok +your.unions.are.not.rivals=Birliklerınız rakip değil +the.union.members.reached.limit=Birlikınız üye sınırına ulaştı +this.union.has.reached.the.member.limit=&bBu birlik üye sınırına ulaştı you.have.reseted.your.kdr=KDR''nizi sıfırladınız you.have.reseted.0.kdr={0} birlikının KDR''sini sıfırladınız you.have.reseted.kdr.of.all.players=Tüm oyuncuların KDR''sini sıfırladınız -you.have.successfully.renamed.your.clan=&bBaşarılıyla birlikının ismini {0} ile değiştirdin -you.have.successfully.renamed.the.clan=&bBaşarılıyla birlikının ismini {0} ile değiştirdin +you.have.successfully.renamed.your.union=&bBaşarılıyla birlikının ismini {0} ile değiştirdin +you.have.successfully.renamed.the.union=&bBaşarılıyla birlikının ismini {0} ile değiştirdin you.have.toggled.permanent.status={0} birlikı için kalıcı durumu değiştirdiniz permanent.status.enabled=Birlikınızın kalıcı durumu {0} tarafından etkinleştirildi permanent.status.disabled=Birlikınızın kalıcı durumu {0} tarafından devre dışı bırakıldı @@ -545,11 +545,11 @@ bb.one.hour=1 Saat bb.days= \ günler bb.one.day=1 gün player.purged=Oyuncu başarıyla temizlendi -your.clan.description.must.be.longer.than=Birlik açıklamanız {0} karakterden uzun olmalıdır -your.clan.description.cannot.be.longer.than=Birlik açıklamanız {0} karakterden uzun olamaz +your.union.description.must.be.longer.than=Birlik açıklamanız {0} karakterden uzun olmalıdır +your.union.description.cannot.be.longer.than=Birlik açıklamanız {0} karakterden uzun olamaz description.changed=Birlikınızın açıklamasını başarıyla değiştirdiniz no.description=Açıklama yok -the.player.must.wait.0.before.joining.your.clan.again=Bu oyuncunun birlikınıza tekrar katılmadan önce {0} dakika beklemesi gerekir +the.player.must.wait.0.before.joining.your.union.again=Bu oyuncunun birlikınıza tekrar katılmadan önce {0} dakika beklemesi gerekir disabled.command=Kapalı komut rank.displayname.updated=Rütbenin görünen adı güncellendi\! rank.setdefault=Birlikın varsayılan rütbesi {0} olarak ayarlandı @@ -562,18 +562,18 @@ rank.created=Rütbe oluşturuldu. permission.0.added.to.rank.1={1} rütbesine {0} izni eklendi permission.0.removed.from.rank.1={0} izni {1} rütbesinden kaldırıldı rank.0.deleted={0} rütbesi silindi -clans.ranks=Birlikın rütbeleri\: +unions.ranks=Birlikın rütbeleri\: ranks.list.item={0}\# {1} ({2}) no.ranks=Rütbe oluşturulmadı rank.no.permissions=Bu rütbenin herhangi bir izni yok player.unassigned.from.rank=Oyuncu rütbeden atanmadı you.must.be.0.or.have.the.permission.1.to.use.this=Bunu kullanmak için {0} olmalısınız veya lideriniz rütbenize {1} izin vermelidir -deposit.not.allowed=Para yatırmaya izin verilmiyor, izin vermek için /%clan %toggle %deposit komutunu kullanın -withdraw.not.allowed=Para çekmeye izin verilmiyor, izin vermek için /%clan %toggle %withdraw komutunu kullanın +deposit.not.allowed=Para yatırmaya izin verilmiyor, izin vermek için /%union %toggle %deposit komutunu kullanın +withdraw.not.allowed=Para çekmeye izin verilmiyor, izin vermek için /%union %toggle %withdraw komutunu kullanın resign.request.cancelled=Ayrılma isteği iptal edildi disband.request.cancelled=Birlikı kapatma iptal edildi resetkdr.request.cancelled=KD Oranı resetleme isteği iptal edildi -clan.create.request.cancelled=Birlik oluşturma isteği iptal edildi +union.create.request.cancelled=Birlik oluşturma isteği iptal edildi rank.create.request.cancelled=Rütbe oluşturma isteği iptal edildi promotion.vote.has.been.requested.from.all.leaders=Tüm liderlerden terfi oylaması talep edildi rename.vote.has.been.requested.from.all.leaders=&bTüm liderlerden isim değiştirme oyu istendi @@ -590,11 +590,10 @@ gui.lore.no.permission=&cBunu görme izniniz yok\! gui.main.title={0} - birlik menüsü gui.main.languageselector.title=&fDilinizi seçiniz gui.main.languageselector.lore.left.click=&7Dilinizi seçmek için sol tıklayın -gui.main.languageselector.lore.right.click=&7Çeviriye yardımcı olmak için sağ tıklayın gui.main.other.commands.title=&fDiğer komutlar gui.main.other.commands.lore=&7Tüm birlik komutlarını görmek için sol tıklayın -gui.main.clan.list.title=&fBirlik Listesi -gui.main.clan.list.lore=&7Birlik listesini görmek için sol tıklayın +gui.main.union.list.title=&fBirlik Listesi +gui.main.union.list.lore=&7Birlik listesini görmek için sol tıklayın gui.main.reset.kdr.title=&fKDR''yi sıfırla gui.main.reset.kdr.lore=&7KDR''nizi sıfırlamak için sol tıklayın gui.main.leaderboard.title=&fLiderler Sıralaması @@ -602,8 +601,8 @@ gui.main.leaderboard.lore=&7Skor tablosunu görmek için sol tıklayın gui.main.staff.title=&fYönetim gui.main.staff.lore=&7Yönetim menüsünü açmak için sol tıklayın gui.staff.title=Yetkili -gui.staff.clan.list.lore.left.click=&7Tüm birliklerı görmek için sol tıklayın -gui.staff.clan.list.lore.right.click=&7Doğrulanmamış tüm birliklerı görmek için sağ tıklayın +gui.staff.union.list.lore.left.click=&7Tüm birliklerı görmek için sol tıklayın +gui.staff.union.list.lore.right.click=&7Doğrulanmamış tüm birliklerı görmek için sağ tıklayın gui.player.list.title=Oyuncu Listesi gui.staff.player.list.title=&fOyuncu Listesi gui.staff.player.list.lore.left.click=&7Tüm oyuncuları görmek için sol tıklayın @@ -613,8 +612,8 @@ gui.staff.global.ff.lore.status=&7Durum\: &b{0} gui.staff.global.ff.lore.toggle=&7Dost ateşi durumunu değiştirmek için sol tıklayın gui.staff.reload.title=&fYeniden yükle gui.staff.reload.lore=&7Eklentiyi yeniden yüklemek için sol tıklayın -gui.staff.clanlist.unverified.title=Doğrulanmamış Birlikler - Toplam\: {0} -gui.staff.clanlist.toplace.title={0} adlı kişinin yeni birlikını seçin +gui.staff.unionlist.unverified.title=Doğrulanmamış Birlikler - Toplam\: {0} +gui.staff.unionlist.toplace.title={0} adlı kişinin yeni birlikını seçin gui.warning.title=Uyarı gui.warning.no.permission.title=&fYetersiz yetki gui.warning.no.permission.plugin.lore=&7Bunu yapmak için izniniz yok\! @@ -623,20 +622,20 @@ gui.warning.no.permission.rank.lore=&7Bunu kullanmak için {0} olmalısınız ve gui.warning.not.verified.title=&fDoğrulanmamış gui.warning.not.verified.lore=&7Birlikınız doğrulanmalıdır\! gui.allies.title=Müttefik -gui.allies.clan.lore=&7Bu müttefiki kaldırmak için sağ tıklayın +gui.allies.union.lore=&7Bu müttefiki kaldırmak için sağ tıklayın gui.allies.add.title=&fBir müttefik ekleyin gui.add.ally.title=Bir müttefik ekleyin -gui.add.ally.clan.lore=&7Bu birlikı müttefik eklemek için sol tıklayın +gui.add.ally.union.lore=&7Bu birlikı müttefik eklemek için sol tıklayın gui.rivals.title=Rakipler -gui.rivals.clan.lore=&7Bu rakibi kaldırmak için sağ tıklayın +gui.rivals.union.lore=&7Bu rakibi kaldırmak için sağ tıklayın gui.rivals.add.title=&fRakip ekle gui.add.rival.title=Rakip ekle -gui.add.rival.clan.lore=&7Bu birlika rakip olmak için sol tıklayın -gui.clanlist.title=Birlikler - Toplam\: {0} -gui.clanlist.clan.title=&fBirlik\: [{0}&f] {1} -gui.clanlist.clan.lore.position=&b\#{0} -gui.clanlist.clan.lore.kdr=&7KD\: &b{0} -gui.clanlist.clan.lore.members=&7Üyeler\: &b{0} +gui.add.rival.union.lore=&7Bu birlika rakip olmak için sol tıklayın +gui.unionlist.title=Birlikler - Toplam\: {0} +gui.unionlist.union.title=&fBirlik\: [{0}&f] {1} +gui.unionlist.union.lore.position=&b\#{0} +gui.unionlist.union.lore.kdr=&7KD\: &b{0} +gui.unionlist.union.lore.members=&7Üyeler\: &b{0} gui.coords.title=Kordinatlar gui.coords.player.lore.distance=&7Mesafe\: &b{0} gui.coords.player.lore.coords=&7Kordinatlar\: &b{0} {1} {2} @@ -666,83 +665,83 @@ gui.permissions.permission.lore=&7Bu izni rütbeden kaldırmak için sağ tıkla gui.add.permission.title=İzin ekle gui.add.permission.permission.title=&f{0} gui.add.permission.permission.lore=&7Bu izni rütbeye eklemek için sol tıklayın -gui.clandetails.title=[{0}] {1} -gui.clandetails.free.agent.title=&fSerbest -gui.clandetails.free.agent.create.clan.price.lore=&7Fiyat\: &b{0} -gui.clandetails.free.agent.create.clan.lore=&7Bir birlik oluşturmak için sol tıklayın -gui.clandetails.clan.title=&f[{0}&f] {1} -gui.clandetails.clan.lore.description=&7Açıklama\: &b{0} -gui.clandetails.clan.lore.status=&7Durum\: &b{0} -gui.clandetails.clan.lore.leaders=&7Liderler\: &b{0} -gui.clandetails.clan.lore.online.members=&7Aktif üyeler\: &b{0}/{1} -gui.clandetails.clan.lore.kdr=&7KD\: &b{0} -gui.clandetails.clan.lore.kill.totals=&7Toplam Öldürme\: &b[Rakip\:{0} Nötr\:{1} Sivil\:{2}] -gui.clandetails.clan.lore.deaths=&7Ölme\: &b{0} +gui.uniondetails.title=[{0}] {1} +gui.uniondetails.free.agent.title=&fSerbest +gui.uniondetails.free.agent.create.union.price.lore=&7Fiyat\: &b{0} +gui.uniondetails.free.agent.create.union.lore=&7Bir birlik oluşturmak için sol tıklayın +gui.uniondetails.union.title=&f[{0}&f] {1} +gui.uniondetails.union.lore.description=&7Açıklama\: &b{0} +gui.uniondetails.union.lore.status=&7Durum\: &b{0} +gui.uniondetails.union.lore.leaders=&7Liderler\: &b{0} +gui.uniondetails.union.lore.online.members=&7Aktif üyeler\: &b{0}/{1} +gui.uniondetails.union.lore.kdr=&7KD\: &b{0} +gui.uniondetails.union.lore.kill.totals=&7Toplam Öldürme\: &b[Rakip\:{0} Nötr\:{1} Sivil\:{2}] +gui.uniondetails.union.lore.deaths=&7Ölme\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.allies.separator=&b, +gui.uniondetails.union.lore.allies.separator=&b, # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.rivals.separator=&b, -gui.clandetails.clan.lore.allies=&7Müttefikler\: &b{0} -gui.clandetails.clan.lore.rivals=&7Rakipler\: &b{0} -gui.clandetails.clan.lore.founded=&7Kuruluş\: &b{0} -gui.clandetails.clan.lore.inactive=&7Son Aktiflik\: &b{0}/{1} days -gui.clandetails.allies.title=&fMüttefikler -gui.clandetails.allies.lore=&7Müttefiklerinizi görmek veya daha fazlasını eklemek için sol tıklayın -gui.clandetails.rivals.title=&fRakipler -gui.clandetails.rivals.lore=&7Rakiplerinizi görmek veya daha fazlasını eklemek için sol tıklayın -gui.clandetails.roster.title=&fÜyeler -gui.clandetails.roster.lore=&7Birlikınızın üyelerini görmek veya daha fazlasını davet etmek için sol tıklayın -gui.staffclandetails.roster.lore=&7Birlikın üyelerini görmek için sol tıklayın -gui.clandetails.coords.title=&fKordinatlar -gui.clandetails.coords.lore=&7Birlikınızın üyelerinin koordinatlarını görmek için sol tıklayın -gui.clandetails.home.title=&fEv -gui.clandetails.home.lore.teleport.price=&7Işınlanma fiyatı\: &b{0} -gui.clandetails.home.lore.teleport=&7Birlikınızın evine ışınlanmak için sol tıklayın -gui.staffclandetails.home.lore.teleport=&7Birlik evine ışınlanmak için sol tıklayın -gui.clandetails.home.lore.clear=&7Birlik evinizi silmek için eşyayı atın -gui.clandetails.home.lore.set.price=&7Ayarlama fiyatı\: &b{0} -gui.clandetails.home.lore.set=&7Birlikınızın evini ayarlamak için sağ tıklayın -gui.staffclandetails.home.lore.set=&7Bu birlikın evini ayarlamak için sağ tıklayın -gui.clandetails.regroup.title=&fToplan -gui.clandetails.regroup.lore.price=&7Fiyat\: &b{0} -gui.clandetails.regroup.lore.home=&7Birlikınızın üyelerini birlik evinde toplamak için sol tıklayın -gui.clandetails.regroup.lore.me=&7Birlikınızın üyelerini bulunduğunuz yerde toplamak için sağ tıklayın -gui.clandetails.ff.title=&fDost Ateşi -gui.clandetails.ff.personal.lore=&7Kişi\: &b{0} -gui.clandetails.ff.clan.lore=&7Birlik\: &b{0} -gui.clandetails.ff.personal.toggle.lore=&7Dost ateşinizi değiştirmek için sol tıklayın -gui.clandetails.ff.clan.toggle.lore=&7Birlikınızın dost ateşini değiştirmek için sağ tıklayın -gui.clandetails.bank.title=&fBanka -gui.clandetails.bank.balance.lore=&7Bakiye\: &b{0} -gui.clandetails.bank.withdraw.status.lore=&7Çek\: &b{0} -gui.clandetails.bank.deposit.status.lore=&7Yatır\: &b{0} -gui.clandetails.bank.withdraw.toggle.lore=&7Para çekme durumunu değiştirmek için öğeyi bırakın -gui.clandetails.bank.deposit.toggle.lore=&7Para yatırma durumunu değiştirmek için sağ tıklayın -gui.clandetails.rank.title=&fRütbe -gui.clandetails.rank.lore=&7Birlikın rütbelerini görmek ve düzenlemek için sol tıklayın -gui.clandetails.verified.title=&fDoğrulanmış -gui.clandetails.not.verified.title=&fDoğrulanmamış -gui.clandetails.verify.price.lore=&7Fiyat\: &b{0} -gui.clandetails.not.verified.lore=&7Birlikınızı doğrulamak için sol tıklayın -gui.staffclandetails.not.verified.lore=&7Bu birlikı doğrulamak için sol tıklayın -gui.clandetails.resign.title=&fAyrıl -gui.clandetails.resign.lore=&7Birlikınızdan ayrılma için sol tıklayın -gui.clandetails.disband.title=&fDağıt -gui.clandetails.disband.lore=&7Birlikınızı kapatmak için eşyayı bırakın -gui.staffclandetails.disband.lore=&7Bu birlikı dağıtmak için sol tıklayın -gui.clandetails.chat.title=&fSohbet -gui.clandetails.chat.clan.chat.lore=&7/{0} [message] - &bBirlik sohbetine mesaj gönderir -gui.clandetails.chat.clan.join.leave.lore=&7/{0} {1}/{2} - &bBirlik sohbetine katılır / ayrılır -gui.clandetails.chat.ally.chat.lore=&7/{0} [message] - &bMüttefik sohbetine bir mesaj gönderir -gui.clandetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bMüttefik sohbetine katılır / ayrılır -gui.clandetails.chat.clan.status.lore=&7Birlik\: &b{0} -gui.clandetails.chat.ally.status.lore=&7Müttefikler\: &b{0} -gui.clandetails.chat.clan.toggle.lore=&7Birlik sohbeti durumunu değiştirmek için sol tıklayın -gui.clandetails.chat.ally.toggle.lore=&7Müttefik sohbet durumunu değiştirmek için sağ tıklayın +gui.uniondetails.union.lore.rivals.separator=&b, +gui.uniondetails.union.lore.allies=&7Müttefikler\: &b{0} +gui.uniondetails.union.lore.rivals=&7Rakipler\: &b{0} +gui.uniondetails.union.lore.founded=&7Kuruluş\: &b{0} +gui.uniondetails.union.lore.inactive=&7Son Aktiflik\: &b{0}/{1} days +gui.uniondetails.allies.title=&fMüttefikler +gui.uniondetails.allies.lore=&7Müttefiklerinizi görmek veya daha fazlasını eklemek için sol tıklayın +gui.uniondetails.rivals.title=&fRakipler +gui.uniondetails.rivals.lore=&7Rakiplerinizi görmek veya daha fazlasını eklemek için sol tıklayın +gui.uniondetails.roster.title=&fÜyeler +gui.uniondetails.roster.lore=&7Birlikınızın üyelerini görmek veya daha fazlasını davet etmek için sol tıklayın +gui.staffuniondetails.roster.lore=&7Birlikın üyelerini görmek için sol tıklayın +gui.uniondetails.coords.title=&fKordinatlar +gui.uniondetails.coords.lore=&7Birlikınızın üyelerinin koordinatlarını görmek için sol tıklayın +gui.uniondetails.home.title=&fEv +gui.uniondetails.home.lore.teleport.price=&7Işınlanma fiyatı\: &b{0} +gui.uniondetails.home.lore.teleport=&7Birlikınızın evine ışınlanmak için sol tıklayın +gui.staffuniondetails.home.lore.teleport=&7Birlik evine ışınlanmak için sol tıklayın +gui.uniondetails.home.lore.clear=&7Birlik evinizi silmek için eşyayı atın +gui.uniondetails.home.lore.set.price=&7Ayarlama fiyatı\: &b{0} +gui.uniondetails.home.lore.set=&7Birlikınızın evini ayarlamak için sağ tıklayın +gui.staffuniondetails.home.lore.set=&7Bu birlikın evini ayarlamak için sağ tıklayın +gui.uniondetails.regroup.title=&fToplan +gui.uniondetails.regroup.lore.price=&7Fiyat\: &b{0} +gui.uniondetails.regroup.lore.home=&7Birlikınızın üyelerini birlik evinde toplamak için sol tıklayın +gui.uniondetails.regroup.lore.me=&7Birlikınızın üyelerini bulunduğunuz yerde toplamak için sağ tıklayın +gui.uniondetails.ff.title=&fDost Ateşi +gui.uniondetails.ff.personal.lore=&7Kişi\: &b{0} +gui.uniondetails.ff.union.lore=&7Birlik\: &b{0} +gui.uniondetails.ff.personal.toggle.lore=&7Dost ateşinizi değiştirmek için sol tıklayın +gui.uniondetails.ff.union.toggle.lore=&7Birlikınızın dost ateşini değiştirmek için sağ tıklayın +gui.uniondetails.bank.title=&fBanka +gui.uniondetails.bank.balance.lore=&7Bakiye\: &b{0} +gui.uniondetails.bank.withdraw.status.lore=&7Çek\: &b{0} +gui.uniondetails.bank.deposit.status.lore=&7Yatır\: &b{0} +gui.uniondetails.bank.withdraw.toggle.lore=&7Para çekme durumunu değiştirmek için öğeyi bırakın +gui.uniondetails.bank.deposit.toggle.lore=&7Para yatırma durumunu değiştirmek için sağ tıklayın +gui.uniondetails.rank.title=&fRütbe +gui.uniondetails.rank.lore=&7Birlikın rütbelerini görmek ve düzenlemek için sol tıklayın +gui.uniondetails.verified.title=&fDoğrulanmış +gui.uniondetails.not.verified.title=&fDoğrulanmamış +gui.uniondetails.verify.price.lore=&7Fiyat\: &b{0} +gui.uniondetails.not.verified.lore=&7Birlikınızı doğrulamak için sol tıklayın +gui.staffuniondetails.not.verified.lore=&7Bu birlikı doğrulamak için sol tıklayın +gui.uniondetails.resign.title=&fAyrıl +gui.uniondetails.resign.lore=&7Birlikınızdan ayrılma için sol tıklayın +gui.uniondetails.disband.title=&fDağıt +gui.uniondetails.disband.lore=&7Birlikınızı kapatmak için eşyayı bırakın +gui.staffuniondetails.disband.lore=&7Bu birlikı dağıtmak için sol tıklayın +gui.uniondetails.chat.title=&fSohbet +gui.uniondetails.chat.union.chat.lore=&7/{0} [message] - &bBirlik sohbetine mesaj gönderir +gui.uniondetails.chat.union.join.leave.lore=&7/{0} {1}/{2} - &bBirlik sohbetine katılır / ayrılır +gui.uniondetails.chat.ally.chat.lore=&7/{0} [message] - &bMüttefik sohbetine bir mesaj gönderir +gui.uniondetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bMüttefik sohbetine katılır / ayrılır +gui.uniondetails.chat.union.status.lore=&7Birlik\: &b{0} +gui.uniondetails.chat.ally.status.lore=&7Müttefikler\: &b{0} +gui.uniondetails.chat.union.toggle.lore=&7Birlik sohbeti durumunu değiştirmek için sol tıklayın +gui.uniondetails.chat.ally.toggle.lore=&7Müttefik sohbet durumunu değiştirmek için sağ tıklayın gui.playerdetails.title={0} gui.playerdetails.player.title=&f{0} -gui.playerdetails.player.lore.noclan=&7Birlik\: &bYok -gui.playerdetails.player.lore.clan=&7Birlik\: &b[{0}&b] {1} +gui.playerdetails.player.lore.nounion=&7Birlik\: &bYok +gui.playerdetails.player.lore.union=&7Birlik\: &b[{0}&b] {1} gui.playerdetails.player.lore.rank=&7Rütbe\: &b{0} gui.playerdetails.player.lore.status=&7Durum\: &b{0} gui.playerdetails.player.lore.kdr=&7KD\: &b{0} @@ -751,8 +750,8 @@ gui.playerdetails.player.lore.deaths=&7Ölme\: &b{0} gui.playerdetails.player.lore.join.date=&7Katılma tarihi\: &b{0} gui.playerdetails.player.lore.last.seen=&7Son görülme\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.playerdetails.player.lore.past.clans.separator=&b, -gui.playerdetails.player.lore.past.clans=&7Geçmiş birlikler\: &b{0} +gui.playerdetails.player.lore.past.unions.separator=&b, +gui.playerdetails.player.lore.past.unions=&7Geçmiş birlikler\: &b{0} gui.playerdetails.player.lore.inactive=&7Son Aktiflik\: &b{0}/{1} days gui.playerdetails.kick.title=&fAt gui.playerdetails.promote.demote.title=&fYükselt/Düşür @@ -776,55 +775,53 @@ gui.languageselector.title=Diller - Şu Anki\: {0} gui.languageselector.language.title=&f{0} gui.languageselector.language.lore.left.click=&7Bunu diliniz olarak ayarlamak için sol tıklayın gui.languageselector.language.lore.translation.status=&7Çeviri durumu\: &b{0}% -gui.languageselector.language.lore.right.click=&7Çeviriye yardımcı olmak için sağ tıklayın gui.confirmation.title=Onayla gui.confirmation.confirm=&7Onaylamak için tıklayın gui.confirmation.return=&7Geri dönmek için tıklayın gui.not.supported=&cArayüz açılırken bir hata oluştu\! Devre dışı bırakılıyor... Doğru sürümü indirdiniz mi? -staff.member.verify.clan=&cBir yetkili birlikınızı doğrulamalıdır\! +staff.member.verify.union=&cBir yetkili birlikınızı doğrulamalıdır\! player.already.has.that.rank=&cOyuncu zaten bu rütbeye sahip\! -joined.clan.chat=&bBirlik sohbetine katıldınız -already.joined.clan.chat=&bBirlik sohbetine zaten katıldınız -left.clan.chat=&bBirlik sohbetinden ayrıldınız -muted.clan.chat=&bBirlik sohbetini kapattınız -unmuted.clan.chat=&bBirlik sohbetini açtınız +joined.union.chat=&bBirlik sohbetine katıldınız +already.joined.union.chat=&bBirlik sohbetine zaten katıldınız +left.union.chat=&bBirlik sohbetinden ayrıldınız +muted.union.chat=&bBirlik sohbetini kapattınız +unmuted.union.chat=&bBirlik sohbetini açtınız joined.ally.chat=&bMüttefik sohbetine katıldın left.ally.chat=&bMüttefik sohbetinden ayrıldın muted.ally.chat=&bMüttefik sohbetinin kapattınız unmuted.ally.chat=&bMüttefik sohbetinin açtınız already.joined.ally.chat=&bMüttefik sohbetine zaten katıldınız -player.already.in.this.clan=&cOyuncu zaten bu birlikda -your.clan.reached.max.alliances=&cBirlikınız maksimum müttefik sayısına ulaştı -other.clan.reached.max.alliances=&cDiğer birlik maksimum müttefik sayısına ulaştı -insert.clan.tag=&bBirlik etiketini girin (veya "{0}")\: -insert.clan.name=&bBirlik adını girin\: +player.already.in.this.union=&cOyuncu zaten bu birlikda +your.union.reached.max.alliances=&cBirlikınız maksimum müttefik sayısına ulaştı +other.union.reached.max.alliances=&cDiğer birlik maksimum müttefik sayısına ulaştı +insert.union.tag=&bBirlik etiketini girin (veya "{0}")\: +insert.union.name=&bBirlik adını girin\: insert.rank.name=&bRütbe adını girin (veya "{0}")\: -click.to.help.translating=&bÇeviriye yardımcı olması için bu bağlantıya tıklayın\:\n&r{0} -your.clan.must.have.members.to.verify=&cBirlikınızın doğrulanması için en az {0} üyesi olmalıdır\! +your.union.must.have.members.to.verify=&cBirlikınızın doğrulanması için en az {0} üyesi olmalıdır\! you.must.hold.a.banner=&cElinizde bir sancak olmalı\! -you.changed.clan.banner=&bBirlikınızın sancağını değiştirdiniz\! -your.clan.already.verified=&cBirlikınız zaten doğrulanmış\! +you.changed.union.banner=&bBirlikınızın sancağını değiştirdiniz\! +your.union.already.verified=&cBirlikınız zaten doğrulanmış\! # suppress inspection "TrailingSpacesInProperty" -clan.profile=\n&b%clan_name%&7 profil &8-------------------------------------------\n \n &7İsim\: &e[&8%clan_color_tag%&e] &b%clan_name%\n &7Açıklama\: &f%clan_description%\n &7Durum\: &f%clan_status%\n &7Liderler\: %clan_leaders%\n &7Aktif üyeler\: &f%clan_online_count%&7/&f%clan_size%\n &7KDR\: &e%clan_kdr%\n &7Toplam Öldürme\: &8[Rakip\:&f%clan_rival_kills% &8Müttefik\:&f%clan_ally_kills% &8Nötr\:&f%clan_neutral_kills% &8Sivil\:&f%clan_civilian_kills%&8]\n &7Ölme\: &f%clan_deaths%\n &7Müttefikler\: &f%clan_allies%\n &7Rakipler\: &f%clan_rivals%\n &7Kuruluş\: &f%clan_founded%\n &7Son Aktiflik\: &f%clan_inactive_days%&7/&f%clan_max_inactive_days% gün\n -player.lookup.clanname=&e[&8%clan_color_tag%&e] &b%clan_name% +union.profile=\n&b%union_name%&7 profil &8-------------------------------------------\n \n &7İsim\: &e[&8%union_color_tag%&e] &b%union_name%\n &7Açıklama\: &f%union_description%\n &7Durum\: &f%union_status%\n &7Aktif üyeler\: &f%union_online_count%&7/&f%union_size%\n &7KDR\: &e%union_kdr%\n &7Toplam Öldürme\: &8[Rakip\:&f%union_rival_kills% &8Müttefik\:&f%union_ally_kills% &8Nötr\:&f%union_neutral_kills% &8Sivil\:&f%union_civilian_kills%&8]\n &7Ölme\: &f%union_deaths%\n &7Müttefikler\: &f%union_allies%\n &7Rakipler\: &f%union_rivals%\n &7Kuruluş\: &f%union_founded%\n &7Son Aktiflik\: &f%union_inactive_days%&7/&f%union_max_inactive_days% gün\n +player.lookup.unionname=&e[&8%union_color_tag%&e] &b%union_name% # suppress inspection "TrailingSpacesInProperty" player.lookup.killtype=&7Öldürme türü\: %player_kill_type%\n -player.lookup=\n&b%player_name%&7 profili &8-------------------------------------------\n \n &7Birlik\: &f%clan_name%\n &7Rütbe\: &f%player_rank%\n &7Durum\: &f%player_status%\n &7KDR\: &e%player_kdr%\n &7Toplam Öldürme\: &8[Rakip\:&f%player_rival_kills% &8Müttefik\:&7%player_ally_kills% &8Nötr\:&f%player_neutral_kills% &8Sivil\:&f%player_civilian_kills%&8]\n &7Ölme\: &f%player_deaths%\n &7Katılma Tarihi\: &f%player_join_date%\n &7Son Görülme\: &f%player_last_seen%\n &7Geçmiş Birlikler\: &f%player_past_clans%\n &7Son Aktiflik\: &f%player_inactive_days%&7/&f%player_max_inactive_days% gün\n %kill_type_line% +player.lookup=\n&b%player_name%&7 profili &8-------------------------------------------\n \n &7Birlik\: &f%union_name%\n &7Durum\: &f%player_status%\n &7KDR\: &e%player_kdr%\n &7Toplam Öldürme\: &8[Rakip\:&f%player_rival_kills% &8Müttefik\:&7%player_ally_kills% &8Nötr\:&f%player_neutral_kills% &8Sivil\:&f%player_civilian_kills%&8]\n &7Ölme\: &f%player_deaths%\n &7Katılma Tarihi\: &f%player_join_date%\n &7Son Görülme\: &f%player_last_seen%\n &7Geçmiş Birlikler\: &f%player_past_unions%\n &7Son Aktiflik\: &f%player_inactive_days%&7/&f%player_max_inactive_days% gün\n %kill_type_line% economy.disabled=&cEkonomi devre dışı bırakıldı\! has.been.purged={0} ''ın verileri temizlendi accepted.invitation=&b{0} adlı birlikın davetini kabul ettiniz denied.invitation=&c{0} adlı birlikın davetini reddettiniz -must.be.in.clan.to.pvp=&cSiz ve {0}, savaşmak için bir birlik üyesi olmalısınız\! -clans.not.at.war.pvp.denied=&cBirlikınız {0} ile savaşta değil\! +must.be.in.union.to.pvp=&cSiz ve {0}, savaşmak için bir birlik üyesi olmalısınız\! +unions.not.at.war.pvp.denied=&cBirlikınız {0} ile savaşta değil\! cannot.attack.civilians=&cSivillere saldıramazsın\! -cannot.attack.clan.member=&cBirlik üyelerine saldıramazsın\! +cannot.attack.union.member=&cBirlik üyelerine saldıramazsın\! cannot.attack.ally=&cBir müttefiğe saldıramazsın\! cannot.send.discord.message={0} adlı kişiye mesaj gönderemezsiniz. Sen o birlikın üyesi değilsin\! discordhook.is.disabled=&cDiscord entegrasyonu devre dışı veya kullanılamıyor\! -your.clan.doesnt.have.any.linked.player=Birlikınızın bağlı oyuncusu yok -your.clan.doesnt.have.minimum.linked.player=Birlikınızın minimum bağlı oyuncusu yok -your.clan.is.not.on.the.whitelist=Birlikınız beyaz listede değil -your.clan.already.has.channel=Birlikınızın zaten bir discord kanalı var +your.union.doesnt.have.any.linked.player=Birlikınızın bağlı oyuncusu yok +your.union.doesnt.have.minimum.linked.player=Birlikınızın minimum bağlı oyuncusu yok +your.union.is.not.on.the.whitelist=Birlikınız beyaz listede değil +your.union.already.has.channel=Birlikınızın zaten bir discord kanalı var discord.reached.category.limit=Discord kategori sınırına ulaştı\! discord.reached.channels.limit=Discord kanal sınırına ulaştı\! discord.created.successfully=&bDiscord kanalı başarıyla oluşturuldu\! @@ -834,19 +831,19 @@ cannot.kick.last.leader=&cSon lideri atamazsın\! cannot.disband.permanent=&cBu birlikı dağıtamazsınız. Kalıcı durumu vardır. you.can.only.set.base.in.your.land=&cSadece kendi toprağınızda ev belirleyebilirsiniz\! only.leaders.can.create.lands=&cSadece liderler arazi oluşturabilir\! -only.one.land.per.clan=&cBirlikınızın zaten bir arazisi var\! -only.clan.members.can.create.lands=&cSadece birlik üyeleri arazi oluşturabilir\! +only.one.land.per.union=&cBirlikınızın zaten bir arazisi var\! +only.union.members.can.create.lands=&cSadece birlik üyeleri arazi oluşturabilir\! land.allowed.all.actions=&bArtık tüm eylemlere izin veriliyor\! land.blocked.all.actions=&bTüm eylemler artık engellendi\! land.allowed.action=&bİzin verilen eylem\! land.blocked.action=&bEngellenen eylem\! you.do.not.own.lands=&cAraziniz yok\! land.sharing.disabled=&cArazi paylaşımı devre dışı bırakıldı\! -clan.chat.disabled=&cBirlik sohbeti kapatıldı\! +union.chat.disabled=&cBirlik sohbeti kapatıldı\! ally.chat.disabled=&cMüttefik sohbeti kapatıldı\! war.expired={0} ile olan savaşın süresi doldu\! you.cant.start.war.online.members.difference=Savaş başlatamazsınız. Bir birlikın diğerinden daha fazla çevrimiçi üyesi var. invitedplayer.invite.off=Bu oyuncu birlik davetlerini devre dışı bıraktı user.hasnt.played.before=&cBu kullanıcı daha önce oynamadı -clan.list.balance.header=\n{0}&7Toplam bakiye &8-----------------------\n \n&8Toplam birlik sayısı\: &7{1}\n\n&8\#&7. &8Birlik &7- &8Bakiye -clan.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5}₺ +union.list.balance.header=\n{0}&7Toplam bakiye &8-----------------------\n \n&8Toplam birlik sayısı\: &7{1}\n\n&8\#&7. &8Birlik &7- &8Bakiye +union.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5}₺ diff --git a/src/main/resources/messages_uk_UA.properties b/src/main/resources/messages_uk_UA.properties index 1fc48bed..f05b591f 100644 --- a/src/main/resources/messages_uk_UA.properties +++ b/src/main/resources/messages_uk_UA.properties @@ -66,7 +66,7 @@ admin.command=admin mod.command=mod promote.command=promote demote.command=demote -clanff.command=clanff +unionff.command=unionff ff.command=ff resign.command=resign disband.command=disband @@ -106,7 +106,7 @@ acf-core.parameter.tag=tag acf-core.parameter.name=name acf-core.parameter.description=description acf-core.parameter.player=гравець -acf-core.parameter.clan=союз +acf-core.parameter.union=союз acf-core.parameter.type=тип acf-core.parameter.order=порядок acf-core.parameter.help=сторінка або ключові слова @@ -149,8 +149,8 @@ command.description.ff.allow=Дозволяє дружній вогонь для command.description.ff.auto=Встановлює дружній вогонь для себе по замовчуванню command.description.globalff.allow=Встановлює глобально дозволений дружній вогонь command.description.globalff.auto=Встановлює глобальний дружній вогонь по замовчуванню -command.description.clanff.allow=Дозволяє дружній вогонь у вашому союзі -command.description.clanff.block=Забороняє дружній вогонь у вашому союзі +command.description.unionff.allow=Дозволяє дружній вогонь у вашому союзі +command.description.unionff.block=Забороняє дружній вогонь у вашому союзі command.description.description=Встановлює опис вашого союзу command.description.ban=Забороняє гравцю використовувати команди союзу command.description.unban=Розблоковує використання команд союзу гравцю @@ -178,7 +178,7 @@ command.description.untrust=Не довіряти учаснику command.description.resign=Вийти з вашого союзу command.description.help=Показати довідку або найти в довідці command.description.ally.add=Додати союзника -command.description.clan=Відкриває GUI +command.description.union=Відкриває GUI command.description.disband=Розпустити ваш союз command.description.mod.disband=Розпустити союз command.description.mod.kick=Вигнати гравця з союзу @@ -234,7 +234,7 @@ command.description.mod.locale=Встановити мову гравця home-menu=/{0} home{1} - Телепорт до бази союзу home-set-menu=/{0} home set{1} - Встановлює базу союзу home-clear-menu=/{0} home clear{1} - Видаляє базу союзу -clan=Союз +union=Союз allies=Союзники alliances=alliances coords=coords @@ -244,7 +244,7 @@ coords.upper=Координати world=Світ kdr=В/С members=Учасники -clans.lower=союзи +unions.lower=союзи rival=Суперник civilian=Цивільний neutral=Нейтральний @@ -288,9 +288,9 @@ nokillsfound=Немає вбивств promoted.to.leader={0} був підвищений до лідера denied.demotion={0} відхилив пониження {1}. Рішення не було прийнято. membership.invitation={0} відхилив запрошення в союз -joined.the.clan={0} приєднався до союзу +joined.the.union={0} приєднався до союзу signed.off.request.cancelled={0} погодився. Запит на {1} скасовано. -clan.deletion={0} відмовив у видаленні союзу. Рішення не було прийнято. +union.deletion={0} відмовив у видаленні союзу. Рішення не було прийнято. rename.refused={0} відмовив у перейменуванні союзу. Рішення не було прийнято. has.been.disbanded=Союз {0} розпущений denied.the.promotion={0} відмовив у підвищенні {1}. Рішення не було прийнято. @@ -326,9 +326,9 @@ mysql.connection.failed=Помилка з’єднання з MySQL sqlite.connection.successful=З''єднання з SQLite встановлено sqlite.connection.failed= Не вдалося підключити SQLite purging.player.data=очищення даних гравця\: {0} -purging.clan=Видалення союзу\: {0} -clan.players=Гравців в союзі\: {0} -clans=Союзи\: {0} +purging.union=Видалення союзу\: {0} +union.players=Гравців в союзі\: {0} +unions=Союзи\: {0} banned=Вам заборонено використовувати союзові команди nothing.more.to.see=Більше нічого побачити nothing.to.vote=Нічого приймати або відмовляти @@ -341,78 +341,78 @@ bulletin.board.header=&8* &e{0} &fдошка оголошень bulletin.board.message={0}\: &f{1} has.been.disbanded.rivalry.ended={0} був розформований. Суперництво закінчилося. has.been.disbanded.alliance.ended={0} був розформований. Союз закінчився. -clan.disbanded=Союз розформований +union.disbanded=Союз розформований 1.color.day=1 {0}день many.color.days={0}{1} днів insufficient.permissions=Недостатньо дозволів -clan.is.not.verified=Союз не підтверджений -player.not.a.member.of.any.clan=Гравець не є учасником жодного союзу -not.a.member.of.any.clan=Ви не є учасником жодного союзу +union.is.not.verified=Союз не підтверджений +player.not.a.member.of.any.union=Гравець не є учасником жодного союзу +not.a.member.of.any.union=Ви не є учасником жодного союзу minimum.to.make.alliance=Ваш союз має мати принаймні {0} гравців, щоб створювати союзи -cannot.be.same.clan=&cВи маєте ввести союз, що відрізняється від вашого\! -other.clan.not.verified=&cІнший союз не підтверджений\! -your.clans.are.not.allies=Ваші союзи не є союзниками +cannot.be.same.union=&cВи маєте ввести союз, що відрізняється від вашого\! +other.union.not.verified=&cІнший союз не підтверджений\! +your.unions.are.not.allies=Ваші союзи не є союзниками has.broken.the.alliance={0} розірвав союз з {1} at.least.one.leader.accept.the.alliance=Принаймні один лідер з союзників має бути онлайн, щоб прийняти союз leaders.have.been.asked.for.an.alliance=Лідери союзу {0} запрошені до союзу -your.clans.are.already.allies=Ваші союзи вже є союзниками -your.clan.cannot.create.rivals=Ваш союз не може мати суперників +your.unions.are.already.allies=Ваші союзи вже є союзниками +your.union.cannot.create.rivals=Ваш союз не може мати суперників min.players.rivalries=Ваш союз має мати принаймні {0} гравців, щоб ворогувати this.player.is.already.banned=Цей гравець вже заблокований player.added.to.banned.list=Гравця додано в список заблокованих you.banned=Вам заблокований доступ до команд союзу -clan.wide.friendly.fire.blocked=Дружній вогонь у союзі заборонений -clan.wide.friendly.fire.is.allowed=Дружній вогонь у союзі дозволений +union.wide.friendly.fire.blocked=Дружній вогонь у союзі заборонений +union.wide.friendly.fire.is.allowed=Дружній вогонь у союзі дозволений you.are.the.only.member.online=Ви єдиний учасник в мережі -your.clan.color.tag.cannot.be.longer.than.characters=&cКольоровий теґ вашого союзу не може бути довшим за {0} символів -your.clan.tag.cannot.be.longer.than.characters=&cТег вашого союзу не може бути довшим за {0} символів -your.clan.tag.must.be.longer.than.characters=&cТег вашого союзу повинен бути довшим за {0} символів +your.union.color.tag.cannot.be.longer.than.characters=&cКольоровий теґ вашого союзу не може бути довшим за {0} символів +your.union.tag.cannot.be.longer.than.characters=&cТег вашого союзу не може бути довшим за {0} символів +your.union.tag.must.be.longer.than.characters=&cТег вашого союзу повинен бути довшим за {0} символів your.tag.cannot.contain.the.following.colors=&cВаш тег не може містити наступні кольори\: {0} your.tag.doesnt.meet.the.requirements=&cВаш тег не відповідає вимогам. your.tag.cannot.contain.color.codes=&cВаш тег не може містити коди кольорів -your.clan.tag.can.only.contain.letters.numbers.and.color.codes=&cТег вашого союзу може містити лише латинські літери, цифри та коди кольору +your.union.tag.can.only.contain.letters.numbers.and.color.codes=&cТег вашого союзу може містити лише латинські літери, цифри та коди кольору you.cannot.set.colored.ranks=Ви не можете встановлювати кольорові звання -your.clan.name.cannot.be.longer.than.characters=Теґ вашого союзу не може бути довшим за {0} символів -your.clan.name.must.be.longer.than.characters=Ім''я вашого союзу повинне бути довшим за {0} символів -your.clan.name.cannot.contain.color.codes=Ім''я союзу не може містити коди кольору +your.union.name.cannot.be.longer.than.characters=Теґ вашого союзу не може бути довшим за {0} символів +your.union.name.must.be.longer.than.characters=Ім''я вашого союзу повинне бути довшим за {0} символів +your.union.name.cannot.contain.color.codes=Ім''я союзу не може містити коди кольору that.tag.name.is.disallowed=&cЦей тег заборонений you.must.first.resign=Спершу вам необхідно вийти з {0} -clan.with.this.tag.already.exists=Союз з таким теґом вже існує -get.your.clan.verified.to.access.advanced.features=Отримайте підтвердження союзу, щоб отримати доступ до додаткових функцій -clan.created=Союз {0} створено +union.with.this.tag.already.exists=Союз з таким теґом вже існує +get.your.union.verified.to.access.advanced.features=Отримайте підтвердження союзу, щоб отримати доступ до додаткових функцій +union.created=Союз {0} створено not.enough.leaders.online.to.vote.on.demotion=Недостатньо лідерів в онлайні для голосування за пониження demotion.vote.has.been.requested.from.all.leaders=Голоси за пониження надійшли від усіх лідерів -player.is.not.a.leader.of.your.clan=Гравець не є лідером вашого союзу +player.is.not.a.leader.of.your.union=Гравець не є лідером вашого союзу player.is.not.a.leader=Гравець не є лідером -clan.has.been.disbanded=Союз {0} розпущений -clan.disband.vote.has.been.requested.from.all.leaders=Голоси за розпуск союзу надійшли від усіх лідерів -friendy.fire.is.now.managed.by.your.clan=Дружній вогонь тепер керується твоїм союзом +union.has.been.disbanded=Союз {0} розпущений +union.disband.vote.has.been.requested.from.all.leaders=Голоси за розпуск союзу надійшли від усіх лідерів +friendy.fire.is.now.managed.by.your.union=Дружній вогонь тепер керується твоїм союзом personal.friendly.fire.is.set.to.allowed=Особистий дружній вогонь\: дозволений -global.friendy.fire.is.now.managed.by.each.clan=Глобальний дружній вогонь тепер керується кожним союзом -global.friendy.fire.is.already.being.managed.by.each.clan=Глобальний дружній вогонь вже керується кожним союзом +global.friendy.fire.is.now.managed.by.each.union=Глобальний дружній вогонь тепер керується кожним союзом +global.friendy.fire.is.already.being.managed.by.each.union=Глобальний дружній вогонь вже керується кожним союзом global.friendly.fire.is.set.to.allowed=Глобальний параметр "дружній вогонь" дозволений global.friendly.fire.is.already.being.allowed=Глобальний параметр "дружній вогонь" уже дозволено -the.player.doesn.t.not.have.the.permissions.to.join.clans=Гравець не має прав для вступу до союзу +the.player.doesn.t.not.have.the.permissions.to.join.unions=Гравець не має прав для вступу до союзу you.cannot.invite.yourself=Ви не можете запросити себе you.did.not.answer.in.time=Ви не відповіли вчасно, скасування... -this.player.is.banned.from.using.clan.commands=Цьому гравцю заборонено використовувати команди союзу -the.player.is.already.member.of.another.clan=Гравець вже є учасником іншого союзу +this.player.is.banned.from.using.union.commands=Цьому гравцю заборонено використовувати команди союзу +the.player.is.already.member.of.another.union=Гравець вже є учасником іншого союзу has.been.asked.to.join={0} запрошено приєднатися до {1} you.cannot.kick.yourself=Ви не можете вигнати себе -the.player.is.not.a.member.of.your.clan=Гравець не є учасником вашого союзу +the.player.is.not.a.member.of.your.union=Гравець не є учасником вашого союзу you.cannot.kick.another.leader=Ви не можете вигнати іншого лідера has.been.kicked.by={0} був вигнаний гравцем {1} -no.clans.have.been.created=Ніяких союзів не створено -total.clans=Усього союзів\: +no.unions.have.been.created=Ніяких союзів не створено +total.unions=Усього союзів\: legend=Легенда\: kill.type.civilian=Тип убивства\: {0}Цивільний no.player.data.found=Дані гравця не знайдено -clan.0=Союз\: {0} +union.0=Союз\: {0} status.0=Статус\: {0} rank.0=Звання\: {0} kdr.0=В/С\: {0} inactive.0=Неактивно\: {0} -clan.commands=союзові команди +union.commands=союзові команди you.can.only.modify.the.color.and.case.of.the.tag=Ви можете змінювати колір і регістр теґу locale.has.been.changed=&cВаша мова була змінена locale.is.prohibited=&cВибір мови на сервері заборонений. @@ -424,11 +424,11 @@ leaders.0=Лідери\: {0} allies.0=Союзники\: {0} rivals.0=Суперники\: {0} other.player.must.be.online=&cГравець повинен бути в мережі\! -the.player.does.not.have.the.permissions.to.lead.a.clan=Гравець не має прав стати лідером союзу +the.player.does.not.have.the.permissions.to.lead.a.union=Гравець не має прав стати лідером союзу you.cannot.promote.yourself=Ви не можете підвищити себе the.player.is.already.a.leader=Гравець уже є лідером configuration.reloaded=Конфігурацію перезавантажено -last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.clan=Останній лідер не може покинути союз. Ви маєте назначити іншого лідера або розпустити союз +last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.union=Останній лідер не може покинути союз. Ви маєте назначити іншого лідера або розпустити союз 0.has.resigned={0} покинув союз you.cannot.trust.yourself=Ви не можете встановити статус довіри самому собі leaders.are.already.trusted=Лідери вже мають довірений статус @@ -436,23 +436,23 @@ this.player.is.already.trusted=Цей гравець вже має довіре has.been.given.trusted.status.by={0} отримав статус довіри від {1} this.player.is.not.banned=Цього гравця не заблоковано player.removed.from.the.banned.list=Гравець вилучений зі списку заблокованих -you.have.been.unbanned.from.clan.commands=Вам розблоковано доступ до союзових команд +you.have.been.unbanned.from.union.commands=Вам розблоковано доступ до союзових команд you.cannot.untrust.yourself=Ви не можете встановити статус "не довірений" собі leaders.cannot.be.untrusted=Лідери не можуть бути не довіреними this.player.is.already.untrusted=Цей гравець вже не довірений has.been.given.untrusted.status.by={0} Отримав статус "не довірений" від {1} -the.clan.does.not.exist=Цього союзу не існує -the.clan.is.already.verified=Союз підтверджено -the.clan.has.been.verified=Союз був підтверджений -clan.0.has.been.verified=Цей союз {0} вже підтверджений\! -total.clan.players.0=Всього гравців у союзі\: {0} +the.union.does.not.exist=Цього союзу не існує +the.union.is.already.verified=Союз підтверджено +the.union.has.been.verified=Союз був підтверджений +union.0.has.been.verified=Цей союз {0} вже підтверджений\! +total.union.players.0=Всього гравців у союзі\: {0} proposing.war={0} пропонує розпочати війну з {1} you.can.only.start.war.with.rivals=Ви можете почати війну тільки з суперниками leaders.have.been.asked.to.accept.the.war.request=Лідери {0} отримали запит про початок війни leaders.asked.to.end.rivalry={0} Лідери отримали запит про закінчення війни proposing.to.end.the.war={0} Пропонує закінчення війни з {1} -clans.already.at.war=Ваші союзи вже знаходяться в стані війни -clans.not.at.war=Ваші союзи не воюють +unions.already.at.war=Ваші союзи вже знаходяться в стані війни +unions.not.at.war=Ваші союзи не воюють you.are.at.war={0} Воює з {1} denied.war.req={0} відхилив запит до війни, надісланий союзом {1} you.are.no.longer.at.war={0} Більше не воюють з {1} @@ -480,12 +480,12 @@ diamond=діамант gold=золото wood=деревина server.announce=Оголошення серверу -clan.announce=Оголошення союзу +union.announce=Оголошення союзу leader.announce=Оголошення лідера hunger=Голод stone=камінь iron=залізо -the.clan.cannot.be.rivaled=Цей союз не може бути суперником +the.union.cannot.be.rivaled=Цей союз не може бути суперником bboff=Дошка оголошень вимкнена bbon=Дошка оголошень увімкнута inviteon=Запрошення ввімкнено @@ -509,30 +509,30 @@ waiting.for.teleport.stand.still.for.0.seconds=Зачекайте на теле on=on off=off player.rank.changed=Звання було встановлено -your.clans.are.already.rivals=Ваші союзи вже є суперниками +your.unions.are.already.rivals=Ваші союзи вже є суперниками cleared.bb=Дошка оголошень очищена -clan.balance=Баланс союзу\: {0} -clan.admin.balance=Баланс {0}\: {1} -bb.clan.deposit={0} було внесено гравцем {1} -player.clan.deposit=Ви внесли {0} -bb.clan.withdraw={0} було знято гравцем {1} -bb.clan.take={0} було взято гравцем {1} -bb.clan.give={0} було видано гравцем {1} -bb.clan.set={0} було встановлено гравцем {1} -player.clan.withdraw=Ви зняли {0} -clan.admin.take=Ви взяли {0} з банку {1} -clan.admin.give=Ви віддали {0} до банку {1} -clan.admin.set=Ви встановили баланс союзу {0} на {1} -clan.admin.bank.not.enough.money=Банк союзу {0} має недостатньо грошей на балансі\! -clan.bank.not.enough.money=Ваш банк союзу немає достатньо грошей -your.clans.are.not.rivals=Ваші союзи не є суперниками -the.clan.members.reached.limit=Ваш союз досягнув ліміт учасників -this.clan.has.reached.the.member.limit=%bЦей союз досяг ліміту учасників +union.balance=Баланс союзу\: {0} +union.admin.balance=Баланс {0}\: {1} +bb.union.deposit={0} було внесено гравцем {1} +player.union.deposit=Ви внесли {0} +bb.union.withdraw={0} було знято гравцем {1} +bb.union.take={0} було взято гравцем {1} +bb.union.give={0} було видано гравцем {1} +bb.union.set={0} було встановлено гравцем {1} +player.union.withdraw=Ви зняли {0} +union.admin.take=Ви взяли {0} з банку {1} +union.admin.give=Ви віддали {0} до банку {1} +union.admin.set=Ви встановили баланс союзу {0} на {1} +union.admin.bank.not.enough.money=Банк союзу {0} має недостатньо грошей на балансі\! +union.bank.not.enough.money=Ваш банк союзу немає достатньо грошей +your.unions.are.not.rivals=Ваші союзи не є суперниками +the.union.members.reached.limit=Ваш союз досягнув ліміт учасників +this.union.has.reached.the.member.limit=%bЦей союз досяг ліміту учасників you.have.reseted.your.kdr=Ви скинули свої В/С you.have.reseted.0.kdr=Ви скинули В/С гравця {0} you.have.reseted.kdr.of.all.players=Ви скинули В/С всіх гравців -you.have.successfully.renamed.your.clan=&bВи успішно перейменували свій союз на {0} -you.have.successfully.renamed.the.clan=&bВи успішно перейменували союз на {0} +you.have.successfully.renamed.your.union=&bВи успішно перейменували свій союз на {0} +you.have.successfully.renamed.the.union=&bВи успішно перейменували союз на {0} you.have.toggled.permanent.status=Ви змінили постійний статус для {0} permanent.status.enabled={0} Увімкнув постійний статус вашого союзу permanent.status.disabled={0} Вимкнув постійний статус вашого союзу @@ -556,11 +556,11 @@ bb.one.hour=1 година bb.days= \ дні bb.one.day=1 день player.purged=Дані гравця успішно очищені -your.clan.description.must.be.longer.than=Ваш опис має бути більше ніж {0} символів -your.clan.description.cannot.be.longer.than=Опис вашого союзу не може бути довшим за {0} символів +your.union.description.must.be.longer.than=Ваш опис має бути більше ніж {0} символів +your.union.description.cannot.be.longer.than=Опис вашого союзу не може бути довшим за {0} символів description.changed=Ви успішно змінили опис вашого союзу no.description=Опис відсутній -the.player.must.wait.0.before.joining.your.clan.again=Цей гравець повинен почекати {0} хвилин перед тим як знову приєдналися до союзу +the.player.must.wait.0.before.joining.your.union.again=Цей гравець повинен почекати {0} хвилин перед тим як знову приєдналися до союзу disabled.command=Disabled command rank.displayname.updated=Відображуване ім''я звання оновлено\! rank.setdefault=Звання союзу за замовчуванням встановлено на {0} @@ -573,18 +573,18 @@ rank.created=Звання створено permission.0.added.to.rank.1=Дозвіл {0} додано до звання {1} permission.0.removed.from.rank.1=Дозвіл {0} видалено зі звання {1} rank.0.deleted=Звання {0} видалено -clans.ranks=Звання союзу\: +unions.ranks=Звання союзу\: ranks.list.item={0}\# {1} ({2}) no.ranks=Жодного звання не створено rank.no.permissions=Це звання немає ніяких дозволів player.unassigned.from.rank=Гравець видалений зі звання you.must.be.0.or.have.the.permission.1.to.use.this=Ви повинні бути {0} або ваш лідер повинен дати вашому званню дозвіл {1} на використання цього -deposit.not.allowed=Депозит не дозволений, використайте /%clan %toggle %deposit, щоб дозволити -withdraw.not.allowed=Зняття грошей не дозволене, використайте /%clan %toggle %withdraw, щоб дозволити +deposit.not.allowed=Депозит не дозволений, використайте /%union %toggle %deposit, щоб дозволити +withdraw.not.allowed=Зняття грошей не дозволене, використайте /%union %toggle %withdraw, щоб дозволити resign.request.cancelled=Запит на вихід скасовано disband.request.cancelled=Запит на розпущення союзу скасовано resetkdr.request.cancelled=Запит на скидання В/С скасовано -clan.create.request.cancelled=Запит на створення союзу скасовано +union.create.request.cancelled=Запит на створення союзу скасовано rank.create.request.cancelled=Запит на створення звання скасовано promotion.vote.has.been.requested.from.all.leaders=Голоси за підвищення надійшли від усіх лідерів rename.vote.has.been.requested.from.all.leaders=&bГолоси усіх лідерів були відправленні, голосування за перейменування закінчене @@ -601,11 +601,10 @@ gui.lore.no.permission=&cУ вас немає прав, щоб бачити це gui.main.title={0} - Меню союзу gui.main.languageselector.title=&fЗмінити мову gui.main.languageselector.lore.left.click=&7ЛКМ, щоб вибрати вашу мову -gui.main.languageselector.lore.right.click=&7ПКМ, щоб допомогти з перекладом gui.main.other.commands.title=&fІнші команди gui.main.other.commands.lore=&7ЛКМ, щоб переглянути всі команди союзу -gui.main.clan.list.title=&fСписок союзів -gui.main.clan.list.lore=&7ЛКМ, щоб переглянути список союзів +gui.main.union.list.title=&fСписок союзів +gui.main.union.list.lore=&7ЛКМ, щоб переглянути список союзів gui.main.reset.kdr.title=&fСкинути В/С gui.main.reset.kdr.lore=&7ЛКМ, щоб скинути свої В/С gui.main.leaderboard.title=&fТаблиця лідерів @@ -613,8 +612,8 @@ gui.main.leaderboard.lore=&7ЛКМ, щоб переглянути таблицю gui.main.staff.title=&fПанель адміністратора gui.main.staff.lore=&7ЛКМ, щоб відкрити панель адміністратора gui.staff.title=Панель адміністратора -gui.staff.clan.list.lore.left.click=&7ЛКМ, щоб переглянути всі союзи -gui.staff.clan.list.lore.right.click=&7ПКМ, щоб переглянути всі непідтверджені союзи +gui.staff.union.list.lore.left.click=&7ЛКМ, щоб переглянути всі союзи +gui.staff.union.list.lore.right.click=&7ПКМ, щоб переглянути всі непідтверджені союзи gui.player.list.title=Список гравців gui.staff.player.list.title=&f Список гравців gui.staff.player.list.lore.left.click=&7ЛКМ, щоб побачити всіх гравців @@ -624,8 +623,8 @@ gui.staff.global.ff.lore.status=&7Статус\: &b{0} gui.staff.global.ff.lore.toggle=&7ЛКМ, щоб змінити статус дружнього вогню gui.staff.reload.title=&fПерезавантажити gui.staff.reload.lore=&7ЛКМ, щоб перезавантажити плагін -gui.staff.clanlist.unverified.title=Не підтверджених союзів - всього\: {0} -gui.staff.clanlist.toplace.title=Виберіть новий союз {0} +gui.staff.unionlist.unverified.title=Не підтверджених союзів - всього\: {0} +gui.staff.unionlist.toplace.title=Виберіть новий союз {0} gui.warning.title=Увага gui.warning.no.permission.title=&fНемає прав gui.warning.no.permission.plugin.lore=&7У вас немає прав, щоб робити це\! @@ -634,20 +633,20 @@ gui.warning.no.permission.rank.lore=&7Ви маєте бути {0}, або ва gui.warning.not.verified.title=&fНе підтверджений gui.warning.not.verified.lore=&7Ваш союз має бути підтвердженим\! gui.allies.title=Союзники -gui.allies.clan.lore=&7ПКМ, щоб видалити цього союзника +gui.allies.union.lore=&7ПКМ, щоб видалити цього союзника gui.allies.add.title=&fДобавити союзника gui.add.ally.title=Добавити союзника -gui.add.ally.clan.lore=&7ЛКМ, щоб вступити в союз з цим союзом +gui.add.ally.union.lore=&7ЛКМ, щоб вступити в союз з цим союзом gui.rivals.title=Суперники -gui.rivals.clan.lore=&7ПКМ, щоб видалити цього суперника +gui.rivals.union.lore=&7ПКМ, щоб видалити цього суперника gui.rivals.add.title=&fДобавити суперника gui.add.rival.title=Добавити суперника -gui.add.rival.clan.lore=&7ЛКМ, щоб добавити суперника -gui.clanlist.title=Союзів - Загалом\: {0} -gui.clanlist.clan.title=&fСоюз\: [{0}&f] {1} -gui.clanlist.clan.lore.position=&b\#{0} -gui.clanlist.clan.lore.kdr=&7KDR\: &b{0} -gui.clanlist.clan.lore.members=&7Учасників\: &b{0} +gui.add.rival.union.lore=&7ЛКМ, щоб добавити суперника +gui.unionlist.title=Союзів - Загалом\: {0} +gui.unionlist.union.title=&fСоюз\: [{0}&f] {1} +gui.unionlist.union.lore.position=&b\#{0} +gui.unionlist.union.lore.kdr=&7KDR\: &b{0} +gui.unionlist.union.lore.members=&7Учасників\: &b{0} gui.coords.title=Координати gui.coords.player.lore.distance=&7Відстань\: &b{0} gui.coords.player.lore.coords=&7Координати\: &b{0} {1} {2} @@ -677,83 +676,83 @@ gui.permissions.permission.lore=&7ПКМ, щоб видалити цей доз gui.add.permission.title=Додати дозвіл gui.add.permission.permission.title=&f{0} gui.add.permission.permission.lore=&7ЛКМ, щоб додати цей дозвіл званню -gui.clandetails.title=[{0}] {1} -gui.clandetails.free.agent.title=&fБез союзу -gui.clandetails.free.agent.create.clan.price.lore=&7Ціна\: &b{0} -gui.clandetails.free.agent.create.clan.lore=&7ЛКМ, щоб створити союз -gui.clandetails.clan.title=&f[{0}&f] {1} -gui.clandetails.clan.lore.description=&7Опис\: &b{0} -gui.clandetails.clan.lore.status=&7Статус\: &b{0} -gui.clandetails.clan.lore.leaders=&7Лідери\: &b{0} -gui.clandetails.clan.lore.online.members=&7Учасників в мережі\: &b{0}/{1} -gui.clandetails.clan.lore.kdr=&7KDR\: &b{0} -gui.clandetails.clan.lore.kill.totals=&7Вбивст загалом\: &b[Суперників\:{0} Нейтральних\:{1} Цивільних\:{2}] -gui.clandetails.clan.lore.deaths=&7Смертей\: &b{0} +gui.uniondetails.title=[{0}] {1} +gui.uniondetails.free.agent.title=&fБез союзу +gui.uniondetails.free.agent.create.union.price.lore=&7Ціна\: &b{0} +gui.uniondetails.free.agent.create.union.lore=&7ЛКМ, щоб створити союз +gui.uniondetails.union.title=&f[{0}&f] {1} +gui.uniondetails.union.lore.description=&7Опис\: &b{0} +gui.uniondetails.union.lore.status=&7Статус\: &b{0} +gui.uniondetails.union.lore.leaders=&7Лідери\: &b{0} +gui.uniondetails.union.lore.online.members=&7Учасників в мережі\: &b{0}/{1} +gui.uniondetails.union.lore.kdr=&7KDR\: &b{0} +gui.uniondetails.union.lore.kill.totals=&7Вбивст загалом\: &b[Суперників\:{0} Нейтральних\:{1} Цивільних\:{2}] +gui.uniondetails.union.lore.deaths=&7Смертей\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.allies.separator=&b, +gui.uniondetails.union.lore.allies.separator=&b, # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.rivals.separator=&b, -gui.clandetails.clan.lore.allies=&7Союзники\: &b{0} -gui.clandetails.clan.lore.rivals=&7Суперники\: &b{0} -gui.clandetails.clan.lore.founded=&7Засновано\: &b{0} -gui.clandetails.clan.lore.inactive=&7Бездіяльний\: &b{0}/{1} днів -gui.clandetails.allies.title=&fСоюзники -gui.clandetails.allies.lore=&7ЛКМ, щоб побачити своїх союзників або додати більше -gui.clandetails.rivals.title=&fСуперники -gui.clandetails.rivals.lore=&7ЛКМ, щоб побачити своїх суперників або додати більше -gui.clandetails.roster.title=&fСписок -gui.clandetails.roster.lore=&7ЛКМ, щоб побачити учасників вашого союзу або запросити більше -gui.staffclandetails.roster.lore=&7ЛКМ, щоб побачити учасників союзу -gui.clandetails.coords.title=&fКоординати -gui.clandetails.coords.lore=&7ЛКМ, щоб побачити координати учасників вашого союзу -gui.clandetails.home.title=&fБаза союзу -gui.clandetails.home.lore.teleport.price=&7Ціна телепортування\: &b{0} -gui.clandetails.home.lore.teleport=&7ЛКМ, щоб телепортуватись на базу союзу -gui.staffclandetails.home.lore.teleport=&7ЛКМ, щоб телепортуватись до цієї бази союзу -gui.clandetails.home.lore.clear=&7Викиньте предмет, щоб видалити базу союзу -gui.clandetails.home.lore.set.price=&7Ціна встановлення\: &b{0} -gui.clandetails.home.lore.set=&7ПКМ, щоб встановити базу союзу -gui.staffclandetails.home.lore.set=&7ПКМ, щоб встановити базу для цього союзу -gui.clandetails.regroup.title=&fСкликати -gui.clandetails.regroup.lore.price=&7Ціна\: &b{0} -gui.clandetails.regroup.lore.home=&7ЛКМ, щоб скликати учасників вашого союзу на базу -gui.clandetails.regroup.lore.me=&7ПКМ, щоб скликати учасників союзу до себе -gui.clandetails.ff.title=&7Дружній вогонь -gui.clandetails.ff.personal.lore=&7Особистий\: &b{0} -gui.clandetails.ff.clan.lore=&7Союз\: &b{0} -gui.clandetails.ff.personal.toggle.lore=&7ПКМ, щоб Вкл/викл дружній вогонь -gui.clandetails.ff.clan.toggle.lore=&7ПКМ, щоб Вкл/викл дружній вогонь вашого союзу -gui.clandetails.bank.title=&fБанк -gui.clandetails.bank.balance.lore=&7Баланс\: &b{0} -gui.clandetails.bank.withdraw.status.lore=&7Зняття\: &b{0} -gui.clandetails.bank.deposit.status.lore=&7Депозит\: &b{0} -gui.clandetails.bank.withdraw.toggle.lore=&7Викиньте предмет, щоб перемкнути статус зняття -gui.clandetails.bank.deposit.toggle.lore=&7ПКМ, щоб змінити статус депозиту -gui.clandetails.rank.title=&fЗвання -gui.clandetails.rank.lore=&7ЛКМ, щоб побачити звання союзу та відредагувати їх -gui.clandetails.verified.title=&fПідтверджений -gui.clandetails.not.verified.title=&fНе підтверджений -gui.clandetails.verify.price.lore=&7Ціна\: &b{0} -gui.clandetails.not.verified.lore=&fЛКМ, щоб підтвердити ваш союз -gui.staffclandetails.not.verified.lore=&fЛКМ, щоб підтвердити цей союз -gui.clandetails.resign.title=&fВийти -gui.clandetails.resign.lore=&7ЛКМ, щоб вийти з вашого союзу -gui.clandetails.disband.title=&fРозпустити -gui.clandetails.disband.lore=&fВикиньте предмет, щоб розпустити ваш союз -gui.staffclandetails.disband.lore=&fЛКМ, щоб розпустити цей союз -gui.clandetails.chat.title=&fЧат -gui.clandetails.chat.clan.chat.lore=&7/{0} [message] - &bВідправляє повідомлення в союзовий чат -gui.clandetails.chat.clan.join.leave.lore=&7/{0} {1}/{2} - &bПриєднатись/покинути союзовий чат -gui.clandetails.chat.ally.chat.lore=&7/{0} [message] - &bВідправляє повідомлення до чату союзників -gui.clandetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bПриєднатись/покинути чат союзників -gui.clandetails.chat.clan.status.lore=&7Союз\: &b{0} -gui.clandetails.chat.ally.status.lore=&7Союзник\: &b{0} -gui.clandetails.chat.clan.toggle.lore=&7ЛКМ, щоб змінити статус союзового чату -gui.clandetails.chat.ally.toggle.lore=&7ПКМ, щоб змінити статус чату для союзників +gui.uniondetails.union.lore.rivals.separator=&b, +gui.uniondetails.union.lore.allies=&7Союзники\: &b{0} +gui.uniondetails.union.lore.rivals=&7Суперники\: &b{0} +gui.uniondetails.union.lore.founded=&7Засновано\: &b{0} +gui.uniondetails.union.lore.inactive=&7Бездіяльний\: &b{0}/{1} днів +gui.uniondetails.allies.title=&fСоюзники +gui.uniondetails.allies.lore=&7ЛКМ, щоб побачити своїх союзників або додати більше +gui.uniondetails.rivals.title=&fСуперники +gui.uniondetails.rivals.lore=&7ЛКМ, щоб побачити своїх суперників або додати більше +gui.uniondetails.roster.title=&fСписок +gui.uniondetails.roster.lore=&7ЛКМ, щоб побачити учасників вашого союзу або запросити більше +gui.staffuniondetails.roster.lore=&7ЛКМ, щоб побачити учасників союзу +gui.uniondetails.coords.title=&fКоординати +gui.uniondetails.coords.lore=&7ЛКМ, щоб побачити координати учасників вашого союзу +gui.uniondetails.home.title=&fБаза союзу +gui.uniondetails.home.lore.teleport.price=&7Ціна телепортування\: &b{0} +gui.uniondetails.home.lore.teleport=&7ЛКМ, щоб телепортуватись на базу союзу +gui.staffuniondetails.home.lore.teleport=&7ЛКМ, щоб телепортуватись до цієї бази союзу +gui.uniondetails.home.lore.clear=&7Викиньте предмет, щоб видалити базу союзу +gui.uniondetails.home.lore.set.price=&7Ціна встановлення\: &b{0} +gui.uniondetails.home.lore.set=&7ПКМ, щоб встановити базу союзу +gui.staffuniondetails.home.lore.set=&7ПКМ, щоб встановити базу для цього союзу +gui.uniondetails.regroup.title=&fСкликати +gui.uniondetails.regroup.lore.price=&7Ціна\: &b{0} +gui.uniondetails.regroup.lore.home=&7ЛКМ, щоб скликати учасників вашого союзу на базу +gui.uniondetails.regroup.lore.me=&7ПКМ, щоб скликати учасників союзу до себе +gui.uniondetails.ff.title=&7Дружній вогонь +gui.uniondetails.ff.personal.lore=&7Особистий\: &b{0} +gui.uniondetails.ff.union.lore=&7Союз\: &b{0} +gui.uniondetails.ff.personal.toggle.lore=&7ПКМ, щоб Вкл/викл дружній вогонь +gui.uniondetails.ff.union.toggle.lore=&7ПКМ, щоб Вкл/викл дружній вогонь вашого союзу +gui.uniondetails.bank.title=&fБанк +gui.uniondetails.bank.balance.lore=&7Баланс\: &b{0} +gui.uniondetails.bank.withdraw.status.lore=&7Зняття\: &b{0} +gui.uniondetails.bank.deposit.status.lore=&7Депозит\: &b{0} +gui.uniondetails.bank.withdraw.toggle.lore=&7Викиньте предмет, щоб перемкнути статус зняття +gui.uniondetails.bank.deposit.toggle.lore=&7ПКМ, щоб змінити статус депозиту +gui.uniondetails.rank.title=&fЗвання +gui.uniondetails.rank.lore=&7ЛКМ, щоб побачити звання союзу та відредагувати їх +gui.uniondetails.verified.title=&fПідтверджений +gui.uniondetails.not.verified.title=&fНе підтверджений +gui.uniondetails.verify.price.lore=&7Ціна\: &b{0} +gui.uniondetails.not.verified.lore=&fЛКМ, щоб підтвердити ваш союз +gui.staffuniondetails.not.verified.lore=&fЛКМ, щоб підтвердити цей союз +gui.uniondetails.resign.title=&fВийти +gui.uniondetails.resign.lore=&7ЛКМ, щоб вийти з вашого союзу +gui.uniondetails.disband.title=&fРозпустити +gui.uniondetails.disband.lore=&fВикиньте предмет, щоб розпустити ваш союз +gui.staffuniondetails.disband.lore=&fЛКМ, щоб розпустити цей союз +gui.uniondetails.chat.title=&fЧат +gui.uniondetails.chat.union.chat.lore=&7/{0} [message] - &bВідправляє повідомлення в союзовий чат +gui.uniondetails.chat.union.join.leave.lore=&7/{0} {1}/{2} - &bПриєднатись/покинути союзовий чат +gui.uniondetails.chat.ally.chat.lore=&7/{0} [message] - &bВідправляє повідомлення до чату союзників +gui.uniondetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bПриєднатись/покинути чат союзників +gui.uniondetails.chat.union.status.lore=&7Союз\: &b{0} +gui.uniondetails.chat.ally.status.lore=&7Союзник\: &b{0} +gui.uniondetails.chat.union.toggle.lore=&7ЛКМ, щоб змінити статус союзового чату +gui.uniondetails.chat.ally.toggle.lore=&7ПКМ, щоб змінити статус чату для союзників gui.playerdetails.title={0} gui.playerdetails.player.title=&f{0} -gui.playerdetails.player.lore.noclan=&7Союз\: &bнемає -gui.playerdetails.player.lore.clan=&7Союз\: &b[{0}&b] {1} +gui.playerdetails.player.lore.nounion=&7Союз\: &bнемає +gui.playerdetails.player.lore.union=&7Союз\: &b[{0}&b] {1} gui.playerdetails.player.lore.rank=&7Звання\: &b{0} gui.playerdetails.player.lore.status=&7Статус\: &b{0} gui.playerdetails.player.lore.kdr=&7KDR\: &b{0} @@ -762,8 +761,8 @@ gui.playerdetails.player.lore.deaths=&7Смертей\: &b{0} gui.playerdetails.player.lore.join.date=&7Дата вступу\: &b{0} gui.playerdetails.player.lore.last.seen=&7Востаннє в мережі\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.playerdetails.player.lore.past.clans.separator=&b, -gui.playerdetails.player.lore.past.clans=&7Минулі союзи\: &b{0} +gui.playerdetails.player.lore.past.unions.separator=&b, +gui.playerdetails.player.lore.past.unions=&7Минулі союзи\: &b{0} gui.playerdetails.player.lore.inactive=&7Бездіяльний\: &b{0}/{1} днів gui.playerdetails.kick.title=&fВигнати gui.playerdetails.promote.demote.title=&fПідвищити/понизити @@ -787,55 +786,53 @@ gui.languageselector.title=Мови - Поточна\: {0} gui.languageselector.language.title=&f{0} gui.languageselector.language.lore.left.click=&7ЛКМ, щоб встановити цю мову gui.languageselector.language.lore.translation.status=&7Стан перекладу\: &b{0}% -gui.languageselector.language.lore.right.click=&7ПКМ, щоб допомогти з перекладом gui.confirmation.title=Підтвердження gui.confirmation.confirm=&7Натисність, щоб підтвердити gui.confirmation.return=&7Натисність, щоб повернутись gui.not.supported=&cВиникла помилка під час відкриття GUI\! Відключаємо... Ви встановили правильну версію? -staff.member.verify.clan=&cАдміністратор повинен підтвердити ваш союз\! +staff.member.verify.union=&cАдміністратор повинен підтвердити ваш союз\! player.already.has.that.rank=&cГравець вже має це звання\! -joined.clan.chat=&bВи приєднались до союзового чату -already.joined.clan.chat=&bВи вже приєднались до союзового чату -left.clan.chat=&bВи покинули союзовий чат -muted.clan.chat=&bВи вимкнули союзовий чат -unmuted.clan.chat=&bВи увімкнули союзовий чат +joined.union.chat=&bВи приєднались до союзового чату +already.joined.union.chat=&bВи вже приєднались до союзового чату +left.union.chat=&bВи покинули союзовий чат +muted.union.chat=&bВи вимкнули союзовий чат +unmuted.union.chat=&bВи увімкнули союзовий чат joined.ally.chat=&bВи приєднались до чату союзників left.ally.chat=&bВи покинули чат союзників muted.ally.chat=&bВи вимкнули чат союзників unmuted.ally.chat=&bВи увімкнули чат союзників already.joined.ally.chat=&bВи вже приєднались до чату союзників -player.already.in.this.clan=&cГравець вже знаходиться в цьому союзі -your.clan.reached.max.alliances=&cВаш союз досягнув максимальної кількості союзників -other.clan.reached.max.alliances=&cІнший союз досягнув максимальної кількості союзників -insert.clan.tag=&bВведіть теґ союзу (або "{0}")\: -insert.clan.name=&bВведіть назву союзу\: +player.already.in.this.union=&cГравець вже знаходиться в цьому союзі +your.union.reached.max.alliances=&cВаш союз досягнув максимальної кількості союзників +other.union.reached.max.alliances=&cІнший союз досягнув максимальної кількості союзників +insert.union.tag=&bВведіть теґ союзу (або "{0}")\: +insert.union.name=&bВведіть назву союзу\: insert.rank.name=&bВведіть назву звання (або "{0}")\: -click.to.help.translating=&bНатисність на це посилання, щоб допомогти перекласти\:\n&r{0} -your.clan.must.have.members.to.verify=&cВаш союз повинен мати щонайменше {0} учасників, щоб бути підтвердженим\! +your.union.must.have.members.to.verify=&cВаш союз повинен мати щонайменше {0} учасників, щоб бути підтвердженим\! you.must.hold.a.banner=&cВи повинні мати стяг в руці\! -you.changed.clan.banner=&bВи змінили стяг вашого союзу\! -your.clan.already.verified=&Ваш союз вже підтверджено\! +you.changed.union.banner=&bВи змінили стяг вашого союзу\! +your.union.already.verified=&Ваш союз вже підтверджено\! # suppress inspection "TrailingSpacesInProperty" -clan.profile=\n&bПрофіль союзу %clan_name%&7 &8-------------------------------------------\n \n &7Ім''я\: &e[&8%clan_color_tag%&e] &b%clan_name%\n &7Опис\: &f%clan_description%\n &7Статус\: &f%clan_status%\n &7Лідери\: %clan_leaders%\n &7Учасників в мережі\: &f%clan_online_count%&7/&f%clan_size%\n &7В/С\: &e%clan_kdr%\n &7Вбивств загалом\: &8[Суперників\:&f%clan_rival_kills% &8Союзників\:&f%clan_ally_kills% &8Нейтральних\:&f%clan_neutral_kills% &8Цивільних\:&f%clan_civilian_kills%&8]\n &7Смертей\: &f%clan_deaths%\n &7Союзників\: &f%clan_allies%\n &7Суперників\: &f%clan_rivals%\n &7Засновано\: &f%clan_founded%\n &7Бездіяльний\: &f%clan_inactive_days%&7/&f%clan_max_inactive_days% днів -player.lookup.clanname=&e[&8%clan_color_tag%&e] &b%clan_name% +union.profile=\n&bПрофіль союзу %union_name%&7 &8-------------------------------------------\n \n &7Ім''я\: &e[&8%union_color_tag%&e] &b%union_name%\n &7Опис\: &f%union_description%\n &7Статус\: &f%union_status%\n &7Учасників в мережі\: &f%union_online_count%&7/&f%union_size%\n &7В/С\: &e%union_kdr%\n &7Вбивств загалом\: &8[Суперників\:&f%union_rival_kills% &8Союзників\:&f%union_ally_kills% &8Нейтральних\:&f%union_neutral_kills% &8Цивільних\:&f%union_civilian_kills%&8]\n &7Смертей\: &f%union_deaths%\n &7Союзників\: &f%union_allies%\n &7Суперників\: &f%union_rivals%\n &7Засновано\: &f%union_founded%\n &7Бездіяльний\: &f%union_inactive_days%&7/&f%union_max_inactive_days% днів +player.lookup.unionname=&e[&8%union_color_tag%&e] &b%union_name% # suppress inspection "TrailingSpacesInProperty" player.lookup.killtype=&7Тип вбивства\: %player_kill_type%\n -player.lookup=\n&bІнформація про гравця %player_name%&7 &8-------------------------------------------\n \n &7Союз\: &f%clan_name%\n &7Звання\: &f%player_rank%\n &7Статус\: &f%player_status%\n &7В/С\: &e%player_kdr%\n &7Вбивст загалом\: &8[Суперників\:&f%player_rival_kills% &8Союзників\:&7%player_ally_kills% &8Нейтральних\:&f%player_neutral_kills% &8Цивільних\:&f%player_civilian_kills%&8]\n &7Смертей\: &f%player_deaths%\n &7Дата вступу\: &f%player_join_date%\n &7Востанє в мережі\: &f%player_last_seen%\n &7Минулі союзи\: &f%player_past_clans%\n &7Бездіяльний\: &f%player_inactive_days%&7/&f%player_max_inactive_days% днів\n %kill_type_line% +player.lookup=\n&bІнформація про гравця %player_name%&7 &8-------------------------------------------\n \n &7Союз\: &f%union_name%\n &7Статус\: &f%player_status%\n &7В/С\: &e%player_kdr%\n &7Вбивст загалом\: &8[Суперників\:&f%player_rival_kills% &8Союзників\:&7%player_ally_kills% &8Нейтральних\:&f%player_neutral_kills% &8Цивільних\:&f%player_civilian_kills%&8]\n &7Смертей\: &f%player_deaths%\n &7Дата вступу\: &f%player_join_date%\n &7Востанє в мережі\: &f%player_last_seen%\n &7Минулі союзи\: &f%player_past_unions%\n &7Бездіяльний\: &f%player_inactive_days%&7/&f%player_max_inactive_days% днів\n %kill_type_line% economy.disabled=&cЕкономіка вимкнена\! has.been.purged=Дані {0} очищені accepted.invitation=&bВи прийняли запрошення від {0} denied.invitation=&cВи відхилили запрошення від {0} -must.be.in.clan.to.pvp=&cВи та {0} маєте бути учасниками союзу, щоб битись\! -clans.not.at.war.pvp.denied=&cВаш союз не у війні з {0}\! +must.be.in.union.to.pvp=&cВи та {0} маєте бути учасниками союзу, щоб битись\! +unions.not.at.war.pvp.denied=&cВаш союз не у війні з {0}\! cannot.attack.civilians=&cВи не можете нападати на цивільних\! -cannot.attack.clan.member=&cВи не можете нападати на інших учасників союзу\! +cannot.attack.union.member=&cВи не можете нападати на інших учасників союзу\! cannot.attack.ally=&cВи не можете нападати на союзника\! cannot.send.discord.message=Ви не можете надсилати повідомлення до {0}. Ви не є членом цього союзу\! discordhook.is.disabled=&cІнтеграція з Діскордом вимкнена або недоступна\! -your.clan.doesnt.have.any.linked.player=У вашого союзу немає прив''язаних гравців -your.clan.doesnt.have.minimum.linked.player=У вашого союзу немає мінімальної к-сті прив''язаних гравців -your.clan.is.not.on.the.whitelist=Вашого союзу немає в білому списку -your.clan.already.has.channel=Ваш союз вже має свій Діскорд канал +your.union.doesnt.have.any.linked.player=У вашого союзу немає прив''язаних гравців +your.union.doesnt.have.minimum.linked.player=У вашого союзу немає мінімальної к-сті прив''язаних гравців +your.union.is.not.on.the.whitelist=Вашого союзу немає в білому списку +your.union.already.has.channel=Ваш союз вже має свій Діскорд канал discord.reached.category.limit=Діскорд досяг ліміту категорій\! discord.reached.channels.limit=Діскорд досяг ліміту каналів\! discord.created.successfully=&bКанал для Діскорду успішно створено\! @@ -845,19 +842,19 @@ cannot.kick.last.leader=&cВи не можете вигнати останньо cannot.disband.permanent=&cВи не можете розпустити цей союз. Він має постійний статус. you.can.only.set.base.in.your.land=&cВи можете встановити базу тільки на своїй території\! only.leaders.can.create.lands=&cТільки лідери можуть створити території\! -only.one.land.per.clan=&cВаш союз вже має територію\! -only.clan.members.can.create.lands=&cТільки учасники союзу можуть створити території\! +only.one.land.per.union=&cВаш союз вже має територію\! +only.union.members.can.create.lands=&cТільки учасники союзу можуть створити території\! land.allowed.all.actions=&bВсі дії тепер дозволені\! land.blocked.all.actions=&bВсі дії тепер заблоковано\! land.allowed.action=&bДозволена дія\! land.blocked.action=&bЗаблокована дія\! you.do.not.own.lands=&cВи не володієте територією\! land.sharing.disabled=&cПоширення землі відключено\! -clan.chat.disabled=&cЧат союзу вимкнено\! +union.chat.disabled=&cЧат союзу вимкнено\! ally.chat.disabled=&cЧат союзників вимкнено\! war.expired=Війна з {0} минула\! you.cant.start.war.online.members.difference=Ви не можете почати війну. Один з союзів має більше гравців в мережі ніж інший. invitedplayer.invite.off=Цей гравець відключив запрошення до союзу. user.hasnt.played.before=&cЦей користувач не грав раніше -clan.list.balance.header={0} &7Топ балансу &8-----------------------\n \n&8Всього союзів\: &7{1}\n \n&8\#&7. &8Союз &7- &8Баланс -clan.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} +union.list.balance.header={0} &7Топ балансу &8-----------------------\n \n&8Всього союзів\: &7{1}\n \n&8\#&7. &8Союз &7- &8Баланс +union.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} diff --git a/src/main/resources/messages_vi_VN.properties b/src/main/resources/messages_vi_VN.properties index cca523d3..e4bf1b15 100644 --- a/src/main/resources/messages_vi_VN.properties +++ b/src/main/resources/messages_vi_VN.properties @@ -65,7 +65,7 @@ admin.command=quản trị viên mod.command=người điều hành promote.command=thăng chức demote.command=hạ chức -clanff.command=clanff +unionff.command=unionff ff.command=ff resign.command=từ chức disband.command=giải tán @@ -103,7 +103,7 @@ acf-core.parameter.tag=thẻ acf-core.parameter.name=tên acf-core.parameter.description=mô tả acf-core.parameter.player=người chơi -acf-core.parameter.clan=liên minh +acf-core.parameter.union=liên minh acf-core.parameter.type=loại acf-core.parameter.order=đặt đơn acf-core.parameter.help=trang hoặc mã @@ -144,8 +144,8 @@ command.description.ff.allow=Thay đổi chế độ tấn công thành kích ho command.description.ff.auto=Thay đổi chế độ tấn công thành tự động command.description.globalff.allow=Thay đổi chế độ tấn công người chơi cho cả liên minh thành kích hoạt command.description.globalff.auto=Thay đổi chế độ tấn công người chơi cho cả liên minh thành tự động -command.description.clanff.allow=Thay đổi chế độ tấn công người chơi cho cả liên minh thành kích hoạt -command.description.clanff.block=Thay đổi chế độ tấn công người chơi cho cả liên minh thành tắt +command.description.unionff.allow=Thay đổi chế độ tấn công người chơi cho cả liên minh thành kích hoạt +command.description.unionff.block=Thay đổi chế độ tấn công người chơi cho cả liên minh thành tắt command.description.description=Đặt tiêu đề cho liên minh của bạn command.description.ban=Chặn người chơi khỏi liên minh từ lệnh liên minh command.description.unban=Gỡ chặn người chơi khỏi liên minh từ lệnh liên minh @@ -169,7 +169,7 @@ command.description.untrust=Bỏ tin cậy một thành viên command.description.resign=Từ chức từ liên minh của bạn command.description.help=Hiện thị trợ giúp này hoặc tìm trong trợ giúp command.description.ally.add=Thêm một đồng minh -command.description.clan=Mở GUI +command.description.union=Mở GUI command.description.disband=Giải tán liên minh của bạn command.description.mod.disband=Giải tán một liên minh command.description.mod.kick=Đuổi mot thành viên nào đó từ liên minh của bạn @@ -206,14 +206,14 @@ command.description.rank.permissions.remove=xóa ủy quyền cho 1 mức hạng command.description.rename=đổi tên liên minh của bạn command.description.mod.rename=đổi tên liên minh command.description.mod.locale=đặt ngôn ngữ của người chơi -clan=liên minh +union=liên minh alliances=đồng minh coords=tọa độ name=Tên distance=Khoảng cách world=Thế giới members=Thành viên -clans.lower=liên minh +unions.lower=liên minh days=ngày rivalries=cạnhtranh online=Trực tuyến @@ -250,7 +250,7 @@ nokillsfound=Không tìm thấy kẻ giết promoted.to.leader={0} đã được thăng chức lên lãnh đạo denied.demotion={0} đã từ chối hạ chức của {1}. Sự đồng thuận không thành công. membership.invitation={0} đã từ chối lời mời tuyển thành viên -joined.the.clan={0} đã gia nhập liên minh\n +joined.the.union={0} đã gia nhập liên minh\n signed.off.request.cancelled={0} đã thoát khỏi server. {1} lời mời đã bị huỷ. demoted.back.to.member={0} đã bị hạ cấp trở thành thành viên peace.agreement.denied=Làm hoà với {0} đã bị từ chối @@ -280,37 +280,37 @@ mysql.connection.successful=Kết nối MySQL thành công mysql.connection.failed=Kết nối MySQL thất bại sqlite.connection.successful=Kết nối SQLite thành công sqlite.connection.failed= Kết nối SQLite thất bại -clan.players=Số thành viên trong liên minh\: {0} -clans=Liên minh\: {0} +union.players=Số thành viên trong liên minh\: {0} +unions=Liên minh\: {0} banned=Bạn đã bị cấm sử dụng lệnh Liên minh has.voted.to.deny={0} đã vote từ chối voted.to.accept={0} đã vote chấp nhận has.been.disbanded.rivalry.ended={0} đã bị giải tán. Chiến tranh đã kết thúc. has.been.disbanded.alliance.ended={0} đã bị giải tán. Liên minh đã kết thúc. -clan.disbanded=Liên minh đã giải tán +union.disbanded=Liên minh đã giải tán this.player.is.already.banned=Người chơi này đã bị cấm player.is.not.a.leader=Bạn không phải là chủ liên minh -clan.disband.vote.has.been.requested.from.all.leaders=Bỏ phiếu giải tán Liên minh đã được yêu cầu từ tất cả các thủ lĩnh -friendy.fire.is.now.managed.by.your.clan=Friendy-fire hiện do liên minh của bạn quản lý +union.disband.vote.has.been.requested.from.all.leaders=Bỏ phiếu giải tán Liên minh đã được yêu cầu từ tất cả các thủ lĩnh +friendy.fire.is.now.managed.by.your.union=Friendy-fire hiện do liên minh của bạn quản lý personal.friendly.fire.is.set.to.allowed=Lửa thân thiện với cá nhân được đặt ở mức cho phép you.cannot.invite.yourself=Bạn không thể kick chính mình you.did.not.answer.in.time=Bạn đã không trả lời kịp thời, đang hủy ... -this.player.is.banned.from.using.clan.commands=Người chơi này bị cấm sử dụng lệnh Liên minh -the.player.is.already.member.of.another.clan=Người chơi này đã có liên minh +this.player.is.banned.from.using.union.commands=Người chơi này bị cấm sử dụng lệnh Liên minh +the.player.is.already.member.of.another.union=Người chơi này đã có liên minh has.been.asked.to.join={0} đã được yêu cầu tham gia {1} you.cannot.kick.yourself=Bạn không được quyền kịch người đó -the.player.is.not.a.member.of.your.clan=Người chơi này không phải thành viên liên minh bạn +the.player.is.not.a.member.of.your.union=Người chơi này không phải thành viên liên minh bạn you.cannot.kick.another.leader=Bạn không thể kich chủ liên minh has.been.kicked.by={0} Bạn bị kick bởi {1} -no.clans.have.been.created=Không có liên minh nào được tạo ra -total.clans=Tổng số liên minh\: +no.unions.have.been.created=Không có liên minh nào được tạo ra +total.unions=Tổng số liên minh\: legend=Truyền thuyết\: kill.type.civilian=Loại giết\: {0} Dân thường no.player.data.found=Người chơi này không có dữ liệu status.0=Trạng thái\: {0} rank.0=Chức vụ\: {0} inactive.0=Không hoạt động\:{0} -clan.commands=Lệnh của liên minh +union.commands=Lệnh của liên minh you.can.only.modify.the.color.and.case.of.the.tag=Bạn chỉ có thể sửa đổi màu sắc và kiểu chữ của thẻ tag.changed.to.0=Thẻ đã được đổi sang {0} 0.tag.changed.to.1=Thay đổi thành công thẻ {0} sang {1} @@ -320,7 +320,7 @@ allies.0=Đồng Minh\:{0} rivals.0=Đối thủ\: {0} the.player.is.already.a.leader=Người chơi đã là chủ liên minh configuration.reloaded=reload thành công -last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.clan=Bạn là chủ liên minh duy nhất.Bạn cần đổi chủ liên minh cho người khác +last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.union=Bạn là chủ liên minh duy nhất.Bạn cần đổi chủ liên minh cho người khác 0.has.resigned={0} Đã từ chức you.cannot.trust.yourself=Bạn không thể tin tưởng chính mình leaders.are.already.trusted=Chủ liên minh đã được tin tưởng @@ -328,15 +328,15 @@ this.player.is.already.trusted=Người chơi đã được tin tưởng has.been.given.trusted.status.by={0} đã được cấp trạng thái đáng tin cậy bởi {1} this.player.is.not.banned=Người chơi này không bị cấm player.removed.from.the.banned.list=Người chơi đã được xóa khỏi danh sách ban của liên minh -you.have.been.unbanned.from.clan.commands=Bạn đã được bỏ cấm khỏi các lệnh của liên minh +you.have.been.unbanned.from.union.commands=Bạn đã được bỏ cấm khỏi các lệnh của liên minh you.cannot.untrust.yourself=Bạn không thể tự bỏ tin tưởng bản thân leaders.cannot.be.untrusted=Chủ liên minh không thể bỏ tin tưởng this.player.is.already.untrusted=Người chơi đã được bỏ tin tưởng rồi has.been.given.untrusted.status.by={0} đã được đưa ra trạng thái không đáng tin cậy bởi{1} -the.clan.does.not.exist=Liên minh không tồn tại -the.clan.is.already.verified=Liên minh đã được xác thực -the.clan.has.been.verified=Liên minh đã được xác minh thành công -clans.already.at.war=Liên minh của bạn đã ở trong trận chiến +the.union.does.not.exist=Liên minh không tồn tại +the.union.is.already.verified=Liên minh đã được xác thực +the.union.has.been.verified=Liên minh đã được xác minh thành công +unions.already.at.war=Liên minh của bạn đã ở trong trận chiến start=bắt đầu end=kết thúc add=thêm @@ -354,11 +354,11 @@ iron=sắt on=bật off=tắt player.rank.changed=Chức vụ đã được đặt -your.clans.are.already.rivals=Liên minh của ban đã là đối thủ +your.unions.are.already.rivals=Liên minh của ban đã là đối thủ cleared.bb=Đã xóa bảng thông báo -clan.balance=Quỹ liên minh\:{0} -player.clan.deposit=Số tiền bạn gửi vô quỹ liên minh\: {0} -player.clan.withdraw=Bạn đã rút\: {0} +union.balance=Quỹ liên minh\:{0} +player.union.deposit=Số tiền bạn gửi vô quỹ liên minh\: {0} +player.union.withdraw=Bạn đã rút\: {0} resign.confirmation=Bạn có chắc chắn muốn từ chức không? {0} resign.success=Bạn đã từ chức thành công khỏi liên minh của mình allowed=cho phép diff --git a/src/main/resources/messages_zh_CN.properties b/src/main/resources/messages_zh_CN.properties index a4c75ae5..0cacb4f9 100644 --- a/src/main/resources/messages_zh_CN.properties +++ b/src/main/resources/messages_zh_CN.properties @@ -66,7 +66,7 @@ admin.command=管理员 mod.command=助理 promote.command=提升 demote.command=降级 -clanff.command=clanff +unionff.command=unionff ff.command=友军伤害 resign.command=离开 disband.command=解散 @@ -106,7 +106,7 @@ acf-core.parameter.tag=标签 acf-core.parameter.name=名称 acf-core.parameter.description=description acf-core.parameter.player=玩家 -acf-core.parameter.clan=联盟 +acf-core.parameter.union=联盟 acf-core.parameter.type=类型 acf-core.parameter.order=顺序 acf-core.parameter.help=页码或关键词 @@ -149,8 +149,8 @@ command.description.ff.allow=将友军伤害设置为允许 command.description.ff.auto=将友军伤害设置为自动 command.description.globalff.allow=将全体友军伤害设置为允许 command.description.globalff.auto=将全体友军伤害设置为自动 -command.description.clanff.allow=将你的联盟友军伤害设置为允许 -command.description.clanff.block=将你的联盟友军伤害设置为禁止 +command.description.unionff.allow=将你的联盟友军伤害设置为允许 +command.description.unionff.block=将你的联盟友军伤害设置为禁止 command.description.description=设置你的联盟描述 command.description.ban=使用联盟命令禁足玩家 command.description.unban=使用联盟命令解除玩家禁足 @@ -178,7 +178,7 @@ command.description.untrust=取消信任一名成员 command.description.resign=离开你的联盟 command.description.help=显示此帮助页面或在页面内搜索 command.description.ally.add=添加盟友 -command.description.clan=打开GUI +command.description.union=打开GUI command.description.disband=解散你的联盟 command.description.mod.disband=解散联盟 command.description.mod.kick=将玩家从联盟中踢出 @@ -234,7 +234,7 @@ command.description.mod.locale=设置玩家语言 home-menu=/{0} home{1} - 传送至联盟基地 home-set-menu=/{0} home set{1} - 设置联盟基地 home-clear-menu=/{0} home clear{1} - 清除联盟基地 -clan=联盟 +union=联盟 allies=联盟 alliances=联盟 coords=坐标 @@ -244,7 +244,7 @@ coords.upper=坐标 world=世界 kdr=KD members=成员 -clans.lower=联盟 +unions.lower=联盟 rival=敌对 civilian=平民 neutral=中立 @@ -288,9 +288,9 @@ nokillsfound=无击杀 promoted.to.leader={0} 被提升为老大 denied.demotion={0} 拒绝了对 {1} 的降级. 未达成共识. membership.invitation={0} 拒绝了邀请 -joined.the.clan={0} 加入了联盟 +joined.the.union={0} 加入了联盟 signed.off.request.cancelled={0} 已经下线. {1} 请求取消. -clan.deletion={0} 拒绝了联盟删除. 未达成共识. +union.deletion={0} 拒绝了联盟删除. 未达成共识. rename.refused={0} 拒绝了联盟改名，共识失败。 has.been.disbanded=联盟 {0} 已经解散 denied.the.promotion={0} 拒绝了对 {1} 的提升. 未达成共识. @@ -326,9 +326,9 @@ mysql.connection.failed=MySQL 连接成功 sqlite.connection.successful=SQLite 连接成功 sqlite.connection.failed= SQLite 连接失败 purging.player.data=正在清除玩家数据\: {0} -purging.clan=正在清除联盟\: {0} -clan.players=联盟玩家\: {0} -clans=联盟\: {0} +purging.union=正在清除联盟\: {0} +union.players=联盟玩家\: {0} +unions=联盟\: {0} banned=你被禁止使用联盟命令 nothing.more.to.see=没有更多 nothing.to.vote=&c没有待处理请求 @@ -341,78 +341,78 @@ bulletin.board.header=&8* &e{0} &f公告栏 bulletin.board.message={0}\: &f{1} has.been.disbanded.rivalry.ended={0} 解散了. 敌对终结了. has.been.disbanded.alliance.ended={0} 解散了. 联盟终结了. -clan.disbanded=联盟已解散 +union.disbanded=联盟已解散 1.color.day=1 {0}天 many.color.days={0}{1} 天 insufficient.permissions=权限不足 -clan.is.not.verified=联盟未验证 -player.not.a.member.of.any.clan=&c此玩家不是任何联盟成员 -not.a.member.of.any.clan=你不是任何联盟的成员 +union.is.not.verified=联盟未验证 +player.not.a.member.of.any.union=&c此玩家不是任何联盟成员 +not.a.member.of.any.union=你不是任何联盟的成员 minimum.to.make.alliance=你的联盟至少要有 {0} 名玩家才能建立联盟 -cannot.be.same.clan=&c你必须输入一个非自己的联盟名称 -other.clan.not.verified=&c另一联盟未通过验证 -your.clans.are.not.allies=你的联盟不是联盟 +cannot.be.same.union=&c你必须输入一个非自己的联盟名称 +other.union.not.verified=&c另一联盟未通过验证 +your.unions.are.not.allies=你的联盟不是联盟 has.broken.the.alliance={0} 停止了与 {1} 的联盟 at.least.one.leader.accept.the.alliance=至少一个老大在线才能接受联盟 leaders.have.been.asked.for.an.alliance={0} 老大请求联盟 -your.clans.are.already.allies=你的联盟已经联盟 -your.clan.cannot.create.rivals=你的联盟不能创建敌对联盟 +your.unions.are.already.allies=你的联盟已经联盟 +your.union.cannot.create.rivals=你的联盟不能创建敌对联盟 min.players.rivalries=你的联盟至少要有 {0} 名玩家才能建立敌对 this.player.is.already.banned=这个玩家已经被封禁 player.added.to.banned.list=玩家添加至封禁列表 you.banned=你被禁止使用联盟命令 -clan.wide.friendly.fire.blocked=联盟友军伤害已经禁止 -clan.wide.friendly.fire.is.allowed=联盟友军伤害已经启用 +union.wide.friendly.fire.blocked=联盟友军伤害已经禁止 +union.wide.friendly.fire.is.allowed=联盟友军伤害已经启用 you.are.the.only.member.online=你是唯一在线的成员 -your.clan.color.tag.cannot.be.longer.than.characters=&c你的联盟名称不能超过 {0} 个字符 -your.clan.tag.cannot.be.longer.than.characters=&c联盟标签不可长于 {0} 个字符 -your.clan.tag.must.be.longer.than.characters=&c联盟标签必须长于 {0} 个字符 +your.union.color.tag.cannot.be.longer.than.characters=&c你的联盟名称不能超过 {0} 个字符 +your.union.tag.cannot.be.longer.than.characters=&c联盟标签不可长于 {0} 个字符 +your.union.tag.must.be.longer.than.characters=&c联盟标签必须长于 {0} 个字符 your.tag.cannot.contain.the.following.colors=&c联盟标签不能包含下列颜色：{0} your.tag.doesnt.meet.the.requirements=&c你的标签不符合要求。 your.tag.cannot.contain.color.codes=&c你的标签不能包含颜色字符 -your.clan.tag.can.only.contain.letters.numbers.and.color.codes=&c你的联盟标签应当只包含字符、数字与颜色代码 +your.union.tag.can.only.contain.letters.numbers.and.color.codes=&c你的联盟标签应当只包含字符、数字与颜色代码 you.cannot.set.colored.ranks=您不能设置彩色的等级头衔名称 -your.clan.name.cannot.be.longer.than.characters=你的联盟的名称不能超过 {0} 字符 -your.clan.name.must.be.longer.than.characters=你的联盟的名称必须超过 {0} 字符 -your.clan.name.cannot.contain.color.codes=联盟的名称不能含有颜色 +your.union.name.cannot.be.longer.than.characters=你的联盟的名称不能超过 {0} 字符 +your.union.name.must.be.longer.than.characters=你的联盟的名称必须超过 {0} 字符 +your.union.name.cannot.contain.color.codes=联盟的名称不能含有颜色 that.tag.name.is.disallowed=&c不允许设置该类标签名称 you.must.first.resign=你必须先离开 {0} -clan.with.this.tag.already.exists=此标签的联盟已经存在 -get.your.clan.verified.to.access.advanced.features=验证你的联盟以使用高级功能 -clan.created=联盟 {0} 创建了 +union.with.this.tag.already.exists=此标签的联盟已经存在 +get.your.union.verified.to.access.advanced.features=验证你的联盟以使用高级功能 +union.created=联盟 {0} 创建了 not.enough.leaders.online.to.vote.on.demotion=没有足够的在线领袖对此降级投票 demotion.vote.has.been.requested.from.all.leaders=所有老大都要求降级 -player.is.not.a.leader.of.your.clan=这个玩家不是你的联盟的老大 +player.is.not.a.leader.of.your.union=这个玩家不是你的联盟的老大 player.is.not.a.leader=该玩家不是领袖 -clan.has.been.disbanded=联盟 {0} 已经解散 -clan.disband.vote.has.been.requested.from.all.leaders=所有老大都要求解散联盟 -friendy.fire.is.now.managed.by.your.clan=友军伤害现在由您的联盟管理 +union.has.been.disbanded=联盟 {0} 已经解散 +union.disband.vote.has.been.requested.from.all.leaders=所有老大都要求解散联盟 +friendy.fire.is.now.managed.by.your.union=友军伤害现在由您的联盟管理 personal.friendly.fire.is.set.to.allowed=个人的友军伤害已经开启 -global.friendy.fire.is.now.managed.by.each.clan=全局的友军伤害现在由各个联盟管理 -global.friendy.fire.is.already.being.managed.by.each.clan=全局的友军伤害已经由各个联盟管理了 +global.friendy.fire.is.now.managed.by.each.union=全局的友军伤害现在由各个联盟管理 +global.friendy.fire.is.already.being.managed.by.each.union=全局的友军伤害已经由各个联盟管理了 global.friendly.fire.is.set.to.allowed=全局的友军伤害已经启用 global.friendly.fire.is.already.being.allowed=全局的友军伤害已经启用了 -the.player.doesn.t.not.have.the.permissions.to.join.clans=玩家没有加入联盟的权限 +the.player.doesn.t.not.have.the.permissions.to.join.unions=玩家没有加入联盟的权限 you.cannot.invite.yourself=你不能邀请你自己 you.did.not.answer.in.time=未在指定时间内输入, 取消操作... -this.player.is.banned.from.using.clan.commands=此玩家被禁止使用此命令 -the.player.is.already.member.of.another.clan=此玩家已经是其他联盟的成员了 +this.player.is.banned.from.using.union.commands=此玩家被禁止使用此命令 +the.player.is.already.member.of.another.union=此玩家已经是其他联盟的成员了 has.been.asked.to.join={0} 已经被请求加入 {1} 了 you.cannot.kick.yourself=你不能踢出你自己 -the.player.is.not.a.member.of.your.clan=此玩家不是你的联盟的成员 +the.player.is.not.a.member.of.your.union=此玩家不是你的联盟的成员 you.cannot.kick.another.leader=你不能踢出另一个老大 has.been.kicked.by={0} 已经被 {1} 踢出了 -no.clans.have.been.created=没有联盟被创建 -total.clans=总联盟\: +no.unions.have.been.created=没有联盟被创建 +total.unions=总联盟\: legend=说明\: kill.type.civilian=击杀种类\: {0}平民 no.player.data.found=没有找到玩家数据 -clan.0=联盟\: {0} +union.0=联盟\: {0} status.0=状态\: {0} rank.0=称号\: {0} kdr.0=KD\: {0} inactive.0=不活跃\: {0} -clan.commands=联盟命令 +union.commands=联盟命令 you.can.only.modify.the.color.and.case.of.the.tag=你只能更改标签的颜色和大小写 locale.has.been.changed=&c语言已切换 locale.is.prohibited=&c服务器未开放语言选择功能. @@ -424,11 +424,11 @@ leaders.0=老大\: {0} allies.0=联盟\: {0} rivals.0=敌对\: {0} other.player.must.be.online=&c玩家必须在线\! -the.player.does.not.have.the.permissions.to.lead.a.clan=玩家没有做老大的权限 +the.player.does.not.have.the.permissions.to.lead.a.union=玩家没有做老大的权限 you.cannot.promote.yourself=你不能提升你自己 the.player.is.already.a.leader=玩家已经是老大了 configuration.reloaded=配置已重载 by 754503921 -last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.clan=最后一位领袖不能辞职, 你必须指定另一个领袖或者选择解散此联盟 +last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.union=最后一位领袖不能辞职, 你必须指定另一个领袖或者选择解散此联盟 0.has.resigned={0} 已经离职 you.cannot.trust.yourself=你不能信任你自己 leaders.are.already.trusted=老大已经被信任 @@ -436,23 +436,23 @@ this.player.is.already.trusted=此玩家已经被信任 has.been.given.trusted.status.by={0} 已经被 {1} 信任了 this.player.is.not.banned=此玩家未被封禁 player.removed.from.the.banned.list=玩家从封禁名单中移除 -you.have.been.unbanned.from.clan.commands=你被使用联盟命令解禁了 +you.have.been.unbanned.from.union.commands=你被使用联盟命令解禁了 you.cannot.untrust.yourself=你不能不信任你自己 leaders.cannot.be.untrusted=老大不能被取消信任 this.player.is.already.untrusted=此玩家已经不被信任了 has.been.given.untrusted.status.by={0} 已经被 {1} 不信任了 -the.clan.does.not.exist=此联盟不存在 -the.clan.is.already.verified=此联盟已经验证了 -the.clan.has.been.verified=此联盟已经验证 -clan.0.has.been.verified=联盟 {0} 已经被验证\! -total.clan.players.0=总联盟玩家\: {0} +the.union.does.not.exist=此联盟不存在 +the.union.is.already.verified=此联盟已经验证了 +the.union.has.been.verified=此联盟已经验证 +union.0.has.been.verified=联盟 {0} 已经被验证\! +total.union.players.0=总联盟玩家\: {0} proposing.war={0} 正在请求与 {1} 的战争 you.can.only.start.war.with.rivals=你只能和敌对联盟展开战争 leaders.have.been.asked.to.accept.the.war.request={0} 老大已经被请求接受战争请求 leaders.asked.to.end.rivalry={0} 老大已经被请求接受停战请求 proposing.to.end.the.war={0} 正在请求与 {1} 停战 -clans.already.at.war=你的联盟已经处于战争中了 -clans.not.at.war=你的联盟没有处于战争中 +unions.already.at.war=你的联盟已经处于战争中了 +unions.not.at.war=你的联盟没有处于战争中 you.are.at.war={0} 现在与 {1} 开战 denied.war.req={0} 拒绝了 {1} 发送的开战请求 you.are.no.longer.at.war={0} 不再与 {1} 战争了 @@ -480,12 +480,12 @@ diamond=钻石 gold=金 wood=木 server.announce=服务器公告 -clan.announce=联盟公告 +union.announce=联盟公告 leader.announce=老大公告 hunger=饥饿 stone=石 iron=铁 -the.clan.cannot.be.rivaled=这个联盟不能敌对 +the.union.cannot.be.rivaled=这个联盟不能敌对 bboff=公告板已关闭 bbon=公告板已开启 inviteon=邀请已开启 @@ -509,30 +509,30 @@ waiting.for.teleport.stand.still.for.0.seconds=等待传送于 {0} 秒内开始 on=开 off=关 player.rank.changed=称号被设置为 -your.clans.are.already.rivals=你的联盟已经是敌对了 +your.unions.are.already.rivals=你的联盟已经是敌对了 cleared.bb=清空了公告板 -clan.balance=联盟经济\: {0} -clan.admin.balance={0} 的账户金额\: {1} -bb.clan.deposit={0} 被玩家 {1} 存入 -player.clan.deposit=你存入了 {0} -bb.clan.withdraw={0} 被 {1} 取出 -bb.clan.take={0} 被 {1} 拿走 -bb.clan.give={1} 给予了 {0} -bb.clan.set={1} 将经济设置为了 {0} -player.clan.withdraw=你取出了 {0} -clan.admin.take=你成功从玩家 {1} 的银行拿出了 {0} -clan.admin.give=你成功向玩家 {1} 的银行内存入 {0} -clan.admin.set=你成功将玩家 {0} 的银行余额设置为 {1} -clan.admin.bank.not.enough.money=玩家 {0} 银行余额不足\! -clan.bank.not.enough.money=你的联盟银行资金不足 -your.clans.are.not.rivals=你的联盟不是敌对 -the.clan.members.reached.limit=你的联盟已达到成员上限 -this.clan.has.reached.the.member.limit=&b此联盟已达到成员限制 +union.balance=联盟经济\: {0} +union.admin.balance={0} 的账户金额\: {1} +bb.union.deposit={0} 被玩家 {1} 存入 +player.union.deposit=你存入了 {0} +bb.union.withdraw={0} 被 {1} 取出 +bb.union.take={0} 被 {1} 拿走 +bb.union.give={1} 给予了 {0} +bb.union.set={1} 将经济设置为了 {0} +player.union.withdraw=你取出了 {0} +union.admin.take=你成功从玩家 {1} 的银行拿出了 {0} +union.admin.give=你成功向玩家 {1} 的银行内存入 {0} +union.admin.set=你成功将玩家 {0} 的银行余额设置为 {1} +union.admin.bank.not.enough.money=玩家 {0} 银行余额不足\! +union.bank.not.enough.money=你的联盟银行资金不足 +your.unions.are.not.rivals=你的联盟不是敌对 +the.union.members.reached.limit=你的联盟已达到成员上限 +this.union.has.reached.the.member.limit=&b此联盟已达到成员限制 you.have.reseted.your.kdr=您已经重置您的 KD 比 you.have.reseted.0.kdr=您已经重置 {0} 的 KD 比 you.have.reseted.kdr.of.all.players=您已重置所有玩家的 KD 比 -you.have.successfully.renamed.your.clan=&b你已成功将联盟改名为 {0} -you.have.successfully.renamed.the.clan=&b你已成功将联盟改名为 {0} +you.have.successfully.renamed.your.union=&b你已成功将联盟改名为 {0} +you.have.successfully.renamed.the.union=&b你已成功将联盟改名为 {0} you.have.toggled.permanent.status=你已将联盟永久状态切换至了 {0} permanent.status.enabled=你的联盟的永久状态已被 {0} 启用 permanent.status.disabled=你的联盟的永久状态已被 {0} 禁用 @@ -556,11 +556,11 @@ bb.one.hour=一小时 bb.days= \ 天 bb.one.day=一天 player.purged=玩家已成功升级 -your.clan.description.must.be.longer.than=你的联盟的标签必须超过 {0} 个字符长度 -your.clan.description.cannot.be.longer.than=你的联盟的标签不能超过 {0} 个字符长度 +your.union.description.must.be.longer.than=你的联盟的标签必须超过 {0} 个字符长度 +your.union.description.cannot.be.longer.than=你的联盟的标签不能超过 {0} 个字符长度 description.changed=你已成功修改联盟的描述 no.description=无描述 -the.player.must.wait.0.before.joining.your.clan.again=此玩家必须等待 {0} 分钟才能再次加入你的联盟 +the.player.must.wait.0.before.joining.your.union.again=此玩家必须等待 {0} 分钟才能再次加入你的联盟 disabled.command=已禁用命令 rank.displayname.updated=等级头衔显示名称已更新\! rank.setdefault=联盟的默认等级头衔已设置为 {0} @@ -573,18 +573,18 @@ rank.created=等级头衔已创建 permission.0.added.to.rank.1=权限 {0} 已添加至等级 {1} permission.0.removed.from.rank.1=权限 {0} 已从等级 {1} 移除 rank.0.deleted=等级 {0} 已删除 -clans.ranks=联盟等级\: +unions.ranks=联盟等级\: ranks.list.item={0}\# {1} ({2}) no.ranks=无可用等级 rank.no.permissions=此等级无任何权限 player.unassigned.from.rank=玩家已从此等级中解除分配 you.must.be.0.or.have.the.permission.1.to.use.this=你必须是等级 {0}, 或者联盟的领袖必须给予你所在的等级权限 {1} 才能使用这个 -deposit.not.allowed=存款已被禁止, 请使用 /%clan %toggle %deposit 以允许存款 -withdraw.not.allowed=取款已被禁止, 请使用 /%clan %toggle %withdraw 以允许取款 +deposit.not.allowed=存款已被禁止, 请使用 /%union %toggle %deposit 以允许存款 +withdraw.not.allowed=取款已被禁止, 请使用 /%union %toggle %withdraw 以允许取款 resign.request.cancelled=请求已取消 disband.request.cancelled=待处理的请求已取消 resetkdr.request.cancelled=KD 比重置请求已取消 -clan.create.request.cancelled=联盟创建请求已取消 +union.create.request.cancelled=联盟创建请求已取消 rank.create.request.cancelled=等级创建请求已取消 promotion.vote.has.been.requested.from.all.leaders=升职投票已发送给所有领袖 rename.vote.has.been.requested.from.all.leaders=&b所有领袖已请求进行改名投票 @@ -601,11 +601,10 @@ gui.lore.no.permission=&c您无权执行此操作. gui.main.title={0} - 联盟菜单 gui.main.languageselector.title=&f选择你的语言 gui.main.languageselector.lore.left.click=&7左键单击选择你的语言 -gui.main.languageselector.lore.right.click=&7右键点击以打开翻译界面 gui.main.other.commands.title=&f其他命令 gui.main.other.commands.lore=&7左键点击查看所有联盟命令 -gui.main.clan.list.title=&f联盟列表 -gui.main.clan.list.lore=&7左键点击查看所有联盟 +gui.main.union.list.title=&f联盟列表 +gui.main.union.list.lore=&7左键点击查看所有联盟 gui.main.reset.kdr.title=&f重置 KD 比 gui.main.reset.kdr.lore=&7左键单击重置你的 KDR gui.main.leaderboard.title=&f排行榜 @@ -613,8 +612,8 @@ gui.main.leaderboard.lore=&7左键点击查看排行榜 gui.main.staff.title=&f工作人员 gui.main.staff.lore=&7左键打开工作人员菜单 gui.staff.title=工作人员 -gui.staff.clan.list.lore.left.click=&7左键点击查看所有联盟 -gui.staff.clan.list.lore.right.click=&7右键查看所有未验证的联盟 +gui.staff.union.list.lore.left.click=&7左键点击查看所有联盟 +gui.staff.union.list.lore.right.click=&7右键查看所有未验证的联盟 gui.player.list.title=玩家列表 gui.staff.player.list.title=&f玩家列表 gui.staff.player.list.lore.left.click=&7左键点击查看所有玩家 @@ -624,8 +623,8 @@ gui.staff.global.ff.lore.status=&7状态\: &b{0} gui.staff.global.ff.lore.toggle=&7左键单击切换你的友军伤害 gui.staff.reload.title=&f重新加载 gui.staff.reload.lore=&7左键点击重载插件 -gui.staff.clanlist.unverified.title=未验证的联盟 - 总计数\: {0} -gui.staff.clanlist.toplace.title=选择 {0} 的新联盟 +gui.staff.unionlist.unverified.title=未验证的联盟 - 总计数\: {0} +gui.staff.unionlist.toplace.title=选择 {0} 的新联盟 gui.warning.title=警告 gui.warning.no.permission.title=&f没有权限 gui.warning.no.permission.plugin.lore=&7你没有这样做的权限！ @@ -634,20 +633,20 @@ gui.warning.no.permission.rank.lore=&7你必须是等级 {0}, 或者联盟的领 gui.warning.not.verified.title=&f未验证 gui.warning.not.verified.lore=&7你的联盟必须经过验证\! gui.allies.title=联盟 -gui.allies.clan.lore=&7右键删除此联盟 +gui.allies.union.lore=&7右键删除此联盟 gui.allies.add.title=&f添加盟友 gui.add.ally.title=添加盟友 -gui.add.ally.clan.lore=&7左键单击将此联盟设置为盟友 +gui.add.ally.union.lore=&7左键单击将此联盟设置为盟友 gui.rivals.title=敌对 -gui.rivals.clan.lore=&7右键删除此敌对联盟 +gui.rivals.union.lore=&7右键删除此敌对联盟 gui.rivals.add.title=&7添加敌对联盟 gui.add.rival.title=添加敌对关系 -gui.add.rival.clan.lore=&7左键单击将此联盟设置为敌对联盟 -gui.clanlist.title=联盟列表 - 总计\: {0} -gui.clanlist.clan.title=&f联盟\: [{0}&f] {1} -gui.clanlist.clan.lore.position=&b\#{0} -gui.clanlist.clan.lore.kdr=&7KD 比\: &b{0} -gui.clanlist.clan.lore.members=&7成员\: &b{0} +gui.add.rival.union.lore=&7左键单击将此联盟设置为敌对联盟 +gui.unionlist.title=联盟列表 - 总计\: {0} +gui.unionlist.union.title=&f联盟\: [{0}&f] {1} +gui.unionlist.union.lore.position=&b\#{0} +gui.unionlist.union.lore.kdr=&7KD 比\: &b{0} +gui.unionlist.union.lore.members=&7成员\: &b{0} gui.coords.title=坐标 gui.coords.player.lore.distance=&7距离\: &b{0} gui.coords.player.lore.coords=&7坐标\: &b{0} {1} {2} @@ -677,83 +676,83 @@ gui.permissions.permission.lore=&7右键点击从等级中删除此权限 gui.add.permission.title=添加权限 gui.add.permission.permission.title=&f{0} gui.add.permission.permission.lore=&7左键单击可将此权限添加到该等级 -gui.clandetails.title=[{0}] {1} -gui.clandetails.free.agent.title=&f自由支配 -gui.clandetails.free.agent.create.clan.price.lore=&7价格\: &b{0} -gui.clandetails.free.agent.create.clan.lore=&7左键单击创建联盟 -gui.clandetails.clan.title=&f[{0}&f] {1} -gui.clandetails.clan.lore.description=&7描述\: &b{0} -gui.clandetails.clan.lore.status=&7状态\: &b{0} -gui.clandetails.clan.lore.leaders=&7领袖\: {0} -gui.clandetails.clan.lore.online.members=&7在线成员\: &b{0}/{1} -gui.clandetails.clan.lore.kdr=&7KD 比\: &b{0} -gui.clandetails.clan.lore.kill.totals=&7总击杀数\: &b[敌对\:{0} 中立\:{1} 友好\:{2}] -gui.clandetails.clan.lore.deaths=&死亡次数\: {0} +gui.uniondetails.title=[{0}] {1} +gui.uniondetails.free.agent.title=&f自由支配 +gui.uniondetails.free.agent.create.union.price.lore=&7价格\: &b{0} +gui.uniondetails.free.agent.create.union.lore=&7左键单击创建联盟 +gui.uniondetails.union.title=&f[{0}&f] {1} +gui.uniondetails.union.lore.description=&7描述\: &b{0} +gui.uniondetails.union.lore.status=&7状态\: &b{0} +gui.uniondetails.union.lore.leaders=&7领袖\: {0} +gui.uniondetails.union.lore.online.members=&7在线成员\: &b{0}/{1} +gui.uniondetails.union.lore.kdr=&7KD 比\: &b{0} +gui.uniondetails.union.lore.kill.totals=&7总击杀数\: &b[敌对\:{0} 中立\:{1} 友好\:{2}] +gui.uniondetails.union.lore.deaths=&死亡次数\: {0} # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.allies.separator=&b、 +gui.uniondetails.union.lore.allies.separator=&b、 # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.rivals.separator=&b、 -gui.clandetails.clan.lore.allies=&7联盟\: &b{0} -gui.clandetails.clan.lore.rivals=&7敌对联盟\: &b{0} -gui.clandetails.clan.lore.founded=&7成立\: &b{0} -gui.clandetails.clan.lore.inactive=&7不活跃\: &b{0}/{1} 天 -gui.clandetails.allies.title=&f盟友 -gui.clandetails.allies.lore=&7左键点击查看联盟的盟友或添加更多 -gui.clandetails.rivals.title=&f敌对联盟 -gui.clandetails.rivals.lore=&7左键点击查看联盟的敌人或添加更多 -gui.clandetails.roster.title=&f名单 -gui.clandetails.roster.lore=&7左键点击查看你的联盟成员或邀请更多成员 -gui.staffclandetails.roster.lore=&7左键点击查看所有联盟成员 -gui.clandetails.coords.title=&f坐标 -gui.clandetails.coords.lore=&7显示你联盟成员的坐标 -gui.clandetails.home.title=&f家 -gui.clandetails.home.lore.teleport.price=&7传送价格\: &b{0} -gui.clandetails.home.lore.teleport=&7左键点击传送到你的联盟家中 -gui.staffclandetails.home.lore.teleport=&7左键点击传送到此联盟家中 -gui.clandetails.home.lore.clear=&7丢出物品(默认按 Q) 以清理你联盟的家 -gui.clandetails.home.lore.set.price=&7设置价格\: &b{0} -gui.clandetails.home.lore.set=&7右键点击设置你的联盟家 -gui.staffclandetails.home.lore.set=&7右键点击设置此联盟的家 -gui.clandetails.regroup.title=&f召集 -gui.clandetails.regroup.lore.price=&7价格\: &b{0} -gui.clandetails.regroup.lore.home=&7左键点击召唤你的联盟成员至联盟的家 -gui.clandetails.regroup.lore.me=&7左键点击召唤你的联盟成员至你的位置 -gui.clandetails.ff.title=&f友军伤害 -gui.clandetails.ff.personal.lore=&7个人\: &b{0} -gui.clandetails.ff.clan.lore=&7联盟\: &b{0} -gui.clandetails.ff.personal.toggle.lore=&7左键单击切换你的友军伤害 -gui.clandetails.ff.clan.toggle.lore=&7右键单击切换你联盟的友军伤害 -gui.clandetails.bank.title=&f银行 -gui.clandetails.bank.balance.lore=&7存款\: &b{0} -gui.clandetails.bank.withdraw.status.lore=&7取出\: &b{0} -gui.clandetails.bank.deposit.status.lore=&7存入\: &b{0} -gui.clandetails.bank.withdraw.toggle.lore=&7丢出物品 (默认按 Q) 以切换取出状态 -gui.clandetails.bank.deposit.toggle.lore=&7右键点击切换存入状态 -gui.clandetails.rank.title=&f等级 -gui.clandetails.rank.lore=&7左键点击查看该联盟排名并编 -gui.clandetails.verified.title=&f已验证 -gui.clandetails.not.verified.title=&f未验证 -gui.clandetails.verify.price.lore=&7价格\: &b{0} -gui.clandetails.not.verified.lore=&7左键单击以验证联盟 -gui.staffclandetails.not.verified.lore=&7左键单击以验证该联盟 -gui.clandetails.resign.title=&f重新注册 -gui.clandetails.resign.lore=&7左键单击以离开你的联盟 -gui.clandetails.disband.title=&f解散 -gui.clandetails.disband.lore=&7丢出物品 (默认按 Q) 以解散你的联盟 -gui.staffclandetails.disband.lore=&7左键单击解散联盟 -gui.clandetails.chat.title=&f聊天 -gui.clandetails.chat.clan.chat.lore=&7/{0} [message] - &b发送一条消息到联盟聊天栏 -gui.clandetails.chat.clan.join.leave.lore=&7/{0} {1}/{2} - &b加入/离开联盟聊天室 -gui.clandetails.chat.ally.chat.lore=&7/{0} [message] - &b发送一条消息到盟军聊天栏 -gui.clandetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &b加入/离开盟军聊天室 -gui.clandetails.chat.clan.status.lore=&7联盟\: &b{0} -gui.clandetails.chat.ally.status.lore=&7联盟\: &b{0} -gui.clandetails.chat.clan.toggle.lore=&7左键单击切换联盟聊天状态 -gui.clandetails.chat.ally.toggle.lore=&7右键单击切换盟军聊天状态 +gui.uniondetails.union.lore.rivals.separator=&b、 +gui.uniondetails.union.lore.allies=&7联盟\: &b{0} +gui.uniondetails.union.lore.rivals=&7敌对联盟\: &b{0} +gui.uniondetails.union.lore.founded=&7成立\: &b{0} +gui.uniondetails.union.lore.inactive=&7不活跃\: &b{0}/{1} 天 +gui.uniondetails.allies.title=&f盟友 +gui.uniondetails.allies.lore=&7左键点击查看联盟的盟友或添加更多 +gui.uniondetails.rivals.title=&f敌对联盟 +gui.uniondetails.rivals.lore=&7左键点击查看联盟的敌人或添加更多 +gui.uniondetails.roster.title=&f名单 +gui.uniondetails.roster.lore=&7左键点击查看你的联盟成员或邀请更多成员 +gui.staffuniondetails.roster.lore=&7左键点击查看所有联盟成员 +gui.uniondetails.coords.title=&f坐标 +gui.uniondetails.coords.lore=&7显示你联盟成员的坐标 +gui.uniondetails.home.title=&f家 +gui.uniondetails.home.lore.teleport.price=&7传送价格\: &b{0} +gui.uniondetails.home.lore.teleport=&7左键点击传送到你的联盟家中 +gui.staffuniondetails.home.lore.teleport=&7左键点击传送到此联盟家中 +gui.uniondetails.home.lore.clear=&7丢出物品(默认按 Q) 以清理你联盟的家 +gui.uniondetails.home.lore.set.price=&7设置价格\: &b{0} +gui.uniondetails.home.lore.set=&7右键点击设置你的联盟家 +gui.staffuniondetails.home.lore.set=&7右键点击设置此联盟的家 +gui.uniondetails.regroup.title=&f召集 +gui.uniondetails.regroup.lore.price=&7价格\: &b{0} +gui.uniondetails.regroup.lore.home=&7左键点击召唤你的联盟成员至联盟的家 +gui.uniondetails.regroup.lore.me=&7左键点击召唤你的联盟成员至你的位置 +gui.uniondetails.ff.title=&f友军伤害 +gui.uniondetails.ff.personal.lore=&7个人\: &b{0} +gui.uniondetails.ff.union.lore=&7联盟\: &b{0} +gui.uniondetails.ff.personal.toggle.lore=&7左键单击切换你的友军伤害 +gui.uniondetails.ff.union.toggle.lore=&7右键单击切换你联盟的友军伤害 +gui.uniondetails.bank.title=&f银行 +gui.uniondetails.bank.balance.lore=&7存款\: &b{0} +gui.uniondetails.bank.withdraw.status.lore=&7取出\: &b{0} +gui.uniondetails.bank.deposit.status.lore=&7存入\: &b{0} +gui.uniondetails.bank.withdraw.toggle.lore=&7丢出物品 (默认按 Q) 以切换取出状态 +gui.uniondetails.bank.deposit.toggle.lore=&7右键点击切换存入状态 +gui.uniondetails.rank.title=&f等级 +gui.uniondetails.rank.lore=&7左键点击查看该联盟排名并编 +gui.uniondetails.verified.title=&f已验证 +gui.uniondetails.not.verified.title=&f未验证 +gui.uniondetails.verify.price.lore=&7价格\: &b{0} +gui.uniondetails.not.verified.lore=&7左键单击以验证联盟 +gui.staffuniondetails.not.verified.lore=&7左键单击以验证该联盟 +gui.uniondetails.resign.title=&f重新注册 +gui.uniondetails.resign.lore=&7左键单击以离开你的联盟 +gui.uniondetails.disband.title=&f解散 +gui.uniondetails.disband.lore=&7丢出物品 (默认按 Q) 以解散你的联盟 +gui.staffuniondetails.disband.lore=&7左键单击解散联盟 +gui.uniondetails.chat.title=&f聊天 +gui.uniondetails.chat.union.chat.lore=&7/{0} [message] - &b发送一条消息到联盟聊天栏 +gui.uniondetails.chat.union.join.leave.lore=&7/{0} {1}/{2} - &b加入/离开联盟聊天室 +gui.uniondetails.chat.ally.chat.lore=&7/{0} [message] - &b发送一条消息到盟军聊天栏 +gui.uniondetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &b加入/离开盟军聊天室 +gui.uniondetails.chat.union.status.lore=&7联盟\: &b{0} +gui.uniondetails.chat.ally.status.lore=&7联盟\: &b{0} +gui.uniondetails.chat.union.toggle.lore=&7左键单击切换联盟聊天状态 +gui.uniondetails.chat.ally.toggle.lore=&7右键单击切换盟军聊天状态 gui.playerdetails.title={0} gui.playerdetails.player.title=&f{0} -gui.playerdetails.player.lore.noclan=&7联盟\: &b无 -gui.playerdetails.player.lore.clan=&7联盟\: &b[{0}&b] {1} +gui.playerdetails.player.lore.nounion=&7联盟\: &b无 +gui.playerdetails.player.lore.union=&7联盟\: &b[{0}&b] {1} gui.playerdetails.player.lore.rank=&7等级\: &b{0} gui.playerdetails.player.lore.status=&7状态\: &b{0} gui.playerdetails.player.lore.kdr=&7KD 比\: &b{0} @@ -762,8 +761,8 @@ gui.playerdetails.player.lore.deaths=&死亡次数\: {0} gui.playerdetails.player.lore.join.date=&7加入日期\: &b{0} gui.playerdetails.player.lore.last.seen=&7最后上线\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.playerdetails.player.lore.past.clans.separator=&b、 -gui.playerdetails.player.lore.past.clans=&7上一联盟\: &b{0} +gui.playerdetails.player.lore.past.unions.separator=&b、 +gui.playerdetails.player.lore.past.unions=&7上一联盟\: &b{0} gui.playerdetails.player.lore.inactive=&7不活跃\: &b{0}/{1} 天 gui.playerdetails.kick.title=&f踢出 gui.playerdetails.promote.demote.title=&f升级/降级 @@ -787,55 +786,53 @@ gui.languageselector.title=语言 - 当前： {0} gui.languageselector.language.title=&f{0} gui.languageselector.language.lore.left.click=&7左键点击选择你的语言 gui.languageselector.language.lore.translation.status=&7翻译状态： &b{0}% -gui.languageselector.language.lore.right.click=&7右键点击以打开翻译界面 gui.confirmation.title=确认 gui.confirmation.confirm=&7点击这里确认 gui.confirmation.return=&7点击返回 gui.not.supported=&c打开GUI时发生错误！已禁用GUI！请检查你是否使用了正确的版本！ -staff.member.verify.clan=&c联盟需要得到管理成员的验证！ +staff.member.verify.union=&c联盟需要得到管理成员的验证！ player.already.has.that.rank=&c玩家已经有了这个等级！ -joined.clan.chat=&b你已加入联盟聊天 -already.joined.clan.chat=&b你已经加入到联盟聊天 -left.clan.chat=&b你离开了联盟聊天 -muted.clan.chat=&b你已屏蔽联盟聊天 -unmuted.clan.chat=&b你已解除屏蔽联盟聊天 +joined.union.chat=&b你已加入联盟聊天 +already.joined.union.chat=&b你已经加入到联盟聊天 +left.union.chat=&b你离开了联盟聊天 +muted.union.chat=&b你已屏蔽联盟聊天 +unmuted.union.chat=&b你已解除屏蔽联盟聊天 joined.ally.chat=&b你已经加入了盟友聊天 left.ally.chat=&b你已退出盟友聊天 muted.ally.chat=&b你已屏蔽盟友聊天 unmuted.ally.chat=&b你已解除屏蔽盟友聊天 already.joined.ally.chat=&b你已经加入到盟友聊天 -player.already.in.this.clan=&c该玩家已经加入这个联盟 -your.clan.reached.max.alliances=&c你联盟的盟友数量已经达到最大 -other.clan.reached.max.alliances=&c另一个联盟的盟友数量已经达到最大 -insert.clan.tag=&b输入联盟标签 (或"{0})： -insert.clan.name=&b输入联盟名称： +player.already.in.this.union=&c该玩家已经加入这个联盟 +your.union.reached.max.alliances=&c你联盟的盟友数量已经达到最大 +other.union.reached.max.alliances=&c另一个联盟的盟友数量已经达到最大 +insert.union.tag=&b输入联盟标签 (或"{0})： +insert.union.name=&b输入联盟名称： insert.rank.name=&b输入等级名称 (或"{0})： -click.to.help.translating=&b点击此链接来帮助翻译：\n&r{0} -your.clan.must.have.members.to.verify=&c你的联盟必须至少有 {0} 个成员才能被验证！ +your.union.must.have.members.to.verify=&c你的联盟必须至少有 {0} 个成员才能被验证！ you.must.hold.a.banner=&c你的手中必须有一个旗帜！ -you.changed.clan.banner=&b你更改了你联盟的旗帜！ -your.clan.already.verified=&这个联盟已被验证\! +you.changed.union.banner=&b你更改了你联盟的旗帜！ +your.union.already.verified=&这个联盟已被验证\! # suppress inspection "TrailingSpacesInProperty" -clan.profile=\n&b%clan_name%&7 信息&8--------------------------------------------------------------------\n \n &7名称\: &e[&8%clan_color_tag%&e] &b%clan_name%\n &7描述\: &f%clan_description%\n &7状态\: &f%clan_status%\n &7宗主\: %clan_leaders%\n &7在线成员\: &f%clan_online_count%&7/&f%clan_size%\n &7K/D比\: &e%clan_kdr%\n &7击杀总计\: &8[敌对\:&f%clan_rival_kills% &8盟友\:&f%clan_ally_kills% &8中立\:&f%clan_neutral_kills% &8无辜\:&f%clan_civilian_kills%&8]\n &7死亡\: &f%clan_deaths%\n &7盟友\: &f%clan_allies%\n &7敌对\: &f%clan_rivals%\n &7已建立\: &f%clan_founded%\n &7沉寂时间\: &f%clan_inactive_days%&7/&f%clan_max_inactive_days% 天\n -player.lookup.clanname=&e[&8%clan_color_tag%&e] &b%clan_name% +union.profile=\n&b%union_name%&7 信息&8--------------------------------------------------------------------\n \n &7名称\: &e[&8%union_color_tag%&e] &b%union_name%\n &7描述\: &f%union_description%\n &7状态\: &f%union_status%\n &7在线成员\: &f%union_online_count%&7/&f%union_size%\n &7K/D比\: &e%union_kdr%\n &7击杀总计\: &8[敌对\:&f%union_rival_kills% &8盟友\:&f%union_ally_kills% &8中立\:&f%union_neutral_kills% &8无辜\:&f%union_civilian_kills%&8]\n &7死亡\: &f%union_deaths%\n &7盟友\: &f%union_allies%\n &7敌对\: &f%union_rivals%\n &7已建立\: &f%union_founded%\n &7沉寂时间\: &f%union_inactive_days%&7/&f%union_max_inactive_days% 天\n +player.lookup.unionname=&e[&8%union_color_tag%&e] &b%union_name% # suppress inspection "TrailingSpacesInProperty" player.lookup.killtype=&7击杀类型\: %player_kill_type%\n -player.lookup=\n&b%player_name%&7''s 玩家信息 &8--------------------------------------------------------------------\n \n &7隶属联盟\: &f%clan_name%\n &7等级\: &f%player_rank%\n &7状态\: &f%player_status%\n &7K/D比\: &e%player_kdr%\n &7击杀总计\: &8[敌对\:&f%player_rival_kills% &8盟友\:&7%player_ally_kills% &8中立\:&f%player_neutral_kills% &8无辜\:&f%player_civilian_kills%&8]\n &7死亡\: &f%player_deaths%\n &7加入时间\: &f%player_join_date%\n &7上次在线\: &f%player_last_seen%\n &7上一联盟\: &f%player_past_clans%\n &7沉寂时间\: &f%player_inactive_days%&7/&f%player_max_inactive_days% 天\n %kill_type_line% +player.lookup=\n&b%player_name%&7''s 玩家信息 &8--------------------------------------------------------------------\n \n &7隶属联盟\: &f%union_name%\n &7状态\: &f%player_status%\n &7K/D比\: &e%player_kdr%\n &7击杀总计\: &8[敌对\:&f%player_rival_kills% &8盟友\:&7%player_ally_kills% &8中立\:&f%player_neutral_kills% &8无辜\:&f%player_civilian_kills%&8]\n &7死亡\: &f%player_deaths%\n &7加入时间\: &f%player_join_date%\n &7上次在线\: &f%player_last_seen%\n &7上一联盟\: &f%player_past_unions%\n &7沉寂时间\: &f%player_inactive_days%&7/&f%player_max_inactive_days% 天\n %kill_type_line% economy.disabled=&c经济已禁用！ has.been.purged={0} 的数据已被清除 accepted.invitation=&b你已接受了 {0} 的邀请 denied.invitation=&c你拒绝了 {0} 的邀请 -must.be.in.clan.to.pvp=&c你和 {0} 必须是联盟成员才能进行PVP！ -clans.not.at.war.pvp.denied=&c你的联盟和 {0} 没有处于战争状态！ +must.be.in.union.to.pvp=&c你和 {0} 必须是联盟成员才能进行PVP！ +unions.not.at.war.pvp.denied=&c你的联盟和 {0} 没有处于战争状态！ cannot.attack.civilians=&c你不能攻击无辜平民！ -cannot.attack.clan.member=&c你不能攻击另一个联盟成员！ +cannot.attack.union.member=&c你不能攻击另一个联盟成员！ cannot.attack.ally=&c你不能攻击盟友！ cannot.send.discord.message=你不能向 {0} 发送消息，因为你不是那个联盟的成员！ discordhook.is.disabled=&cDiscord 群功能已被禁用或不可用\! -your.clan.doesnt.have.any.linked.player=你的联盟没有任何已关联的玩家 -your.clan.doesnt.have.minimum.linked.player=你的联盟没有最小关联玩家数 -your.clan.is.not.on.the.whitelist=你的联盟未在白名单上 -your.clan.already.has.channel=你的联盟已有 Disocrd 群频道 +your.union.doesnt.have.any.linked.player=你的联盟没有任何已关联的玩家 +your.union.doesnt.have.minimum.linked.player=你的联盟没有最小关联玩家数 +your.union.is.not.on.the.whitelist=你的联盟未在白名单上 +your.union.already.has.channel=你的联盟已有 Disocrd 群频道 discord.reached.category.limit=Discord 群已经到达了可设置的类别上限\! discord.reached.channels.limit=Discord 群已到达了频道数量限制\! discord.created.successfully=&bDiscord 频道已成功创建\! @@ -845,19 +842,19 @@ cannot.kick.last.leader=&你不能踢出前任宗主\! cannot.disband.permanent=&c你不能解散这个联盟，因为它是永久的。 you.can.only.set.base.in.your.land=&c你只能在自己的地盘上设置家\! only.leaders.can.create.lands=&c只有联盟的宗主可以创建地盘！ -only.one.land.per.clan=&c你的联盟已经有了一块地盘！ -only.clan.members.can.create.lands=&c只有联盟成员可以创建地盘！ +only.one.land.per.union=&c你的联盟已经有了一块地盘！ +only.union.members.can.create.lands=&c只有联盟成员可以创建地盘！ land.allowed.all.actions=&b现在所有操作均被允许\! land.blocked.all.actions=&b现在所有操作均被禁止\! land.allowed.action=&b允许操作！ land.blocked.action=&b禁止操作！ you.do.not.own.lands=&c你没有地盘！ land.sharing.disabled=&c地盘分享已禁用！ -clan.chat.disabled=&c联盟聊天已禁用！ +union.chat.disabled=&c联盟聊天已禁用！ ally.chat.disabled=&c盟友聊天已禁用！ war.expired=与 {0} 的战争已超时！ you.cant.start.war.online.members.difference=你不能开始战争，因为一个联盟的在线成员比另一个联盟多。 invitedplayer.invite.off=此玩家已禁用联盟邀请 user.hasnt.played.before=&c此用户不存在 -clan.list.balance.header=\n{0} &7金钱排行榜 &8--------------------------------\n \n&8总联盟： &7{1}\n \n&8\#&7. &8联盟 &7- &8金钱 -clan.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} +union.list.balance.header=\n{0} &7金钱排行榜 &8--------------------------------\n \n&8总联盟： &7{1}\n \n&8\#&7. &8联盟 &7- &8金钱 +union.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} diff --git a/src/main/resources/messages_zh_TW.properties b/src/main/resources/messages_zh_TW.properties index b4a584bc..a15fc790 100644 --- a/src/main/resources/messages_zh_TW.properties +++ b/src/main/resources/messages_zh_TW.properties @@ -66,7 +66,7 @@ admin.command=管理員 mod.command=mod promote.command=promote demote.command=demote -clanff.command=clanff +unionff.command=unionff ff.command=友軍傷害 resign.command=resign disband.command=解散 @@ -106,7 +106,7 @@ acf-core.parameter.tag=tag acf-core.parameter.name=類別 acf-core.parameter.description=description acf-core.parameter.player=玩家 -acf-core.parameter.clan=聯盟 +acf-core.parameter.union=聯盟 acf-core.parameter.type=類別 acf-core.parameter.order=順序 acf-core.parameter.help=頁數或關鍵字 @@ -149,8 +149,8 @@ command.description.ff.allow=將友軍傷害設定為允許 command.description.ff.auto=將你的個人友軍傷害設定為自動 command.description.globalff.allow=將全域友軍傷害設定為允許 command.description.globalff.auto=將全域友軍傷害設定為自動 -command.description.clanff.allow=將你的聯盟友軍傷害設定為允許 -command.description.clanff.block=將你的聯盟友軍傷害設定為禁止 +command.description.unionff.allow=將你的聯盟友軍傷害設定為允許 +command.description.unionff.block=將你的聯盟友軍傷害設定為禁止 command.description.description=設定你的聯盟描述 command.description.ban=禁止玩家使用聯盟指令 command.description.unban=解除玩家對聯盟指令的封鎖 @@ -178,7 +178,7 @@ command.description.untrust=取消信任成員 command.description.resign=向你的聯盟退職 command.description.help=顯示幫助頁面或在頁面搜尋 command.description.ally.add=添加盟友 -command.description.clan=打開功能選單 +command.description.union=打開功能選單 command.description.disband=解散你的聯盟 command.description.mod.disband=解散聯盟 command.description.mod.kick=將玩家踢出聯盟 @@ -234,7 +234,7 @@ command.description.mod.locale=設定玩家語言 home-menu=/{0} home{1} - 傳送到聯盟總部 home-set-menu=/{0} home set{1} - 設定聯盟總部 home-clear-menu=/{0} home clear{1} - 取消聯盟總部 -clan=聯盟 +union=聯盟 allies=盟友 alliances=聯盟 coords=coords @@ -244,7 +244,7 @@ coords.upper=座標 world=世界 kdr=戰損比 members=成員 -clans.lower=聯盟 +unions.lower=聯盟 rival=敵對 civilian=平民 neutral=中立 @@ -288,9 +288,9 @@ nokillsfound=未找到擊殺記錄 promoted.to.leader={0} 已升職為領袖 denied.demotion={0} 拒絕了 {1} 的降職請求. 未達成共識. membership.invitation={0} 已拒絕聯盟邀請 -joined.the.clan={0} 已加入聯盟 +joined.the.union={0} 已加入聯盟 signed.off.request.cancelled={0} 已登出. {1} 請求已取消. -clan.deletion={0} 拒絕了聯盟刪除請求. 未達成共識. +union.deletion={0} 拒絕了聯盟刪除請求. 未達成共識. rename.refused={0} 拒絕了聯盟改名請求. 未達成共識. has.been.disbanded=聯盟 {0} 已被解散 denied.the.promotion={0} 拒絕了 {1} 的晉升請求. 未達成共識. @@ -326,9 +326,9 @@ mysql.connection.failed=MySQL 連接失敗 sqlite.connection.successful=SQLite 連接成功 sqlite.connection.failed= SQLite 連接失敗 purging.player.data=清除玩家數據\: {0} -purging.clan=清除聯盟\: {0} -clan.players=聯盟成員\: {0} -clans=聯盟\: {0} +purging.union=清除聯盟\: {0} +union.players=聯盟成員\: {0} +unions=聯盟\: {0} banned=你已被禁止使用聯盟指令 nothing.more.to.see=沒有其他內容可查看 nothing.to.vote=&c沒有任何可以接受或拒絕的項目 @@ -341,78 +341,78 @@ bulletin.board.header=&8* &e{0} &f告示板 bulletin.board.message={0}\: &f{1} has.been.disbanded.rivalry.ended={0} 已被解散. 敵對關係已結束. has.been.disbanded.alliance.ended={0} 已被解散. 結盟已結束. -clan.disbanded=聯盟解散 +union.disbanded=聯盟解散 1.color.day=1 {0}天 many.color.days={0}{1} 天 insufficient.permissions=權限不足 -clan.is.not.verified=聯盟未經驗證 -player.not.a.member.of.any.clan=&c該玩家不屬於任何聯盟 -not.a.member.of.any.clan=你不屬於任何聯盟 +union.is.not.verified=聯盟未經驗證 +player.not.a.member.of.any.union=&c該玩家不屬於任何聯盟 +not.a.member.of.any.union=你不屬於任何聯盟 minimum.to.make.alliance=你的聯盟必須至少有 {0} 名成員才能建立結盟關係 -cannot.be.same.clan=&c你必須輸入一個與你不同的聯盟！ -other.clan.not.verified=&c另一個聯盟未經驗證！ -your.clans.are.not.allies=你的聯盟不是盟友 +cannot.be.same.union=&c你必須輸入一個與你不同的聯盟！ +other.union.not.verified=&c另一個聯盟未經驗證！ +your.unions.are.not.allies=你的聯盟不是盟友 has.broken.the.alliance={0} 已經與 {1} 解除聯盟 at.least.one.leader.accept.the.alliance=至少要有一位盟友的領袖上線才能接受結盟 leaders.have.been.asked.for.an.alliance=已向 {0} 位領袖提出聯盟請求 -your.clans.are.already.allies=你的聯盟已經是盟友 -your.clan.cannot.create.rivals=你的聯盟無法建立敵對 +your.unions.are.already.allies=你的聯盟已經是盟友 +your.union.cannot.create.rivals=你的聯盟無法建立敵對 min.players.rivalries=你的聯盟必須至少有 {0} 名成員才能建立敵對關係 this.player.is.already.banned=該玩家已被封禁 player.added.to.banned.list=玩家已被加入封禁名單 you.banned=你已被禁止使用聯盟指令 -clan.wide.friendly.fire.blocked=聯盟範圍內的友軍傷害已被禁止 -clan.wide.friendly.fire.is.allowed=聯盟範圍內的友軍傷害已啟用 +union.wide.friendly.fire.blocked=聯盟範圍內的友軍傷害已被禁止 +union.wide.friendly.fire.is.allowed=聯盟範圍內的友軍傷害已啟用 you.are.the.only.member.online=你是唯一上線的成員 -your.clan.color.tag.cannot.be.longer.than.characters=&c你的聯盟顏色標籤不能超過 {0} 個字符 -your.clan.tag.cannot.be.longer.than.characters=&c你的聯盟標籤不能超過 {0} 個字符 -your.clan.tag.must.be.longer.than.characters=&c你的聯盟標籤必須超過 {0} 個字符 +your.union.color.tag.cannot.be.longer.than.characters=&c你的聯盟顏色標籤不能超過 {0} 個字符 +your.union.tag.cannot.be.longer.than.characters=&c你的聯盟標籤不能超過 {0} 個字符 +your.union.tag.must.be.longer.than.characters=&c你的聯盟標籤必須超過 {0} 個字符 your.tag.cannot.contain.the.following.colors=&c你的標籤不能包含以下顏色\: {0} your.tag.doesnt.meet.the.requirements=&c你的標籤不符合要求. your.tag.cannot.contain.color.codes=&c你的標籤不能包含顏色代碼 -your.clan.tag.can.only.contain.letters.numbers.and.color.codes=&c你的聯盟標籤僅能包含字母、數字和顏色代碼 +your.union.tag.can.only.contain.letters.numbers.and.color.codes=&c你的聯盟標籤僅能包含字母、數字和顏色代碼 you.cannot.set.colored.ranks=你無法設定顏色職位 -your.clan.name.cannot.be.longer.than.characters=你的聯盟名稱不能超過 {0} 個字符 -your.clan.name.must.be.longer.than.characters=你的聯盟名稱必須超過 {0} 個字符 -your.clan.name.cannot.contain.color.codes=你的聯盟名稱不能包含顏色代碼 +your.union.name.cannot.be.longer.than.characters=你的聯盟名稱不能超過 {0} 個字符 +your.union.name.must.be.longer.than.characters=你的聯盟名稱必須超過 {0} 個字符 +your.union.name.cannot.contain.color.codes=你的聯盟名稱不能包含顏色代碼 that.tag.name.is.disallowed=&c該標籤名稱不被允許 you.must.first.resign=你必須先退職 {0} -clan.with.this.tag.already.exists=帶有此標籤的聯盟已經存在 -get.your.clan.verified.to.access.advanced.features=將你的聯盟進行驗證以訪問更高級的功能 -clan.created=聯盟 {0} 已創建 +union.with.this.tag.already.exists=帶有此標籤的聯盟已經存在 +get.your.union.verified.to.access.advanced.features=將你的聯盟進行驗證以訪問更高級的功能 +union.created=聯盟 {0} 已創建 not.enough.leaders.online.to.vote.on.demotion=線上領袖人數不足, 無法對此降職進行投票 demotion.vote.has.been.requested.from.all.leaders=已向所有領袖請求降職投票 -player.is.not.a.leader.of.your.clan=玩家不是你聯盟領袖 +player.is.not.a.leader.of.your.union=玩家不是你聯盟領袖 player.is.not.a.leader=該玩家不是領袖 -clan.has.been.disbanded=聯盟 {0} 已被解散 -clan.disband.vote.has.been.requested.from.all.leaders=已向所有領袖請求解散聯盟投票 -friendy.fire.is.now.managed.by.your.clan=攻擊盟友現在由你的聯盟管理 +union.has.been.disbanded=聯盟 {0} 已被解散 +union.disband.vote.has.been.requested.from.all.leaders=已向所有領袖請求解散聯盟投票 +friendy.fire.is.now.managed.by.your.union=攻擊盟友現在由你的聯盟管理 personal.friendly.fire.is.set.to.allowed=個人攻擊盟友設定為允許 -global.friendy.fire.is.now.managed.by.each.clan=全域攻擊盟友現在由每個聯盟管理 -global.friendy.fire.is.already.being.managed.by.each.clan=全域攻擊盟友已經是由各聯盟管理 +global.friendy.fire.is.now.managed.by.each.union=全域攻擊盟友現在由每個聯盟管理 +global.friendy.fire.is.already.being.managed.by.each.union=全域攻擊盟友已經是由各聯盟管理 global.friendly.fire.is.set.to.allowed=全域攻擊盟友設定為允許 global.friendly.fire.is.already.being.allowed=全域攻擊盟友已經允許 -the.player.doesn.t.not.have.the.permissions.to.join.clans=該玩家沒有加入聯盟的權限 +the.player.doesn.t.not.have.the.permissions.to.join.unions=該玩家沒有加入聯盟的權限 you.cannot.invite.yourself=你不能邀請自己 you.did.not.answer.in.time=您沒有及時回答, 正在取消... -this.player.is.banned.from.using.clan.commands=該玩家被禁止使用聯盟命令 -the.player.is.already.member.of.another.clan=該玩家已經是另一個聯盟的成員 +this.player.is.banned.from.using.union.commands=該玩家被禁止使用聯盟命令 +the.player.is.already.member.of.another.union=該玩家已經是另一個聯盟的成員 has.been.asked.to.join={0} 已被邀請加入 {1} you.cannot.kick.yourself=你不能踢出自己 -the.player.is.not.a.member.of.your.clan=該玩家不是你的聯盟成員 +the.player.is.not.a.member.of.your.union=該玩家不是你的聯盟成員 you.cannot.kick.another.leader=你不能踢出其他領袖 has.been.kicked.by={0} 已被 {1} 踢出 -no.clans.have.been.created=尚未創建任何聯盟 -total.clans=聯盟總數\: +no.unions.have.been.created=尚未創建任何聯盟 +total.unions=聯盟總數\: legend=圖示\: kill.type.civilian=擊殺型態\: {0}平民 no.player.data.found=未找到玩家數據 -clan.0=聯盟\: {0} +union.0=聯盟\: {0} status.0=狀態\: {0} rank.0=階級\: {0} kdr.0=戰損比\: {0} inactive.0=不活躍\: {0} -clan.commands=聯盟指令 +union.commands=聯盟指令 you.can.only.modify.the.color.and.case.of.the.tag=你只能修改標籤的顏色和大小寫 locale.has.been.changed=&c你的語言已更改 locale.is.prohibited=&c伺服器上禁止選擇語言. @@ -424,11 +424,11 @@ leaders.0=領袖\: {0} allies.0=盟友\: {0} rivals.0=敵人\: {0} other.player.must.be.online=&c玩家必須上線\! -the.player.does.not.have.the.permissions.to.lead.a.clan=該玩家沒有領導聯盟的權限 +the.player.does.not.have.the.permissions.to.lead.a.union=該玩家沒有領導聯盟的權限 you.cannot.promote.yourself=你不能給自己升職 the.player.is.already.a.leader=該玩家已經是領袖 configuration.reloaded=設定已重新載入 -last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.clan=最後的領袖無法退職. 你必須指派另一位領袖或解散聯盟 +last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.union=最後的領袖無法退職. 你必須指派另一位領袖或解散聯盟 0.has.resigned={0} 已退職 you.cannot.trust.yourself=你無法信任自己 leaders.are.already.trusted=領袖已經被信任 @@ -436,23 +436,23 @@ this.player.is.already.trusted=該玩家已經被信任 has.been.given.trusted.status.by={0} 已被 {1} 設定為可信任狀態 this.player.is.not.banned=該玩家未被封禁 player.removed.from.the.banned.list=玩家已從封禁名單中移除 -you.have.been.unbanned.from.clan.commands=你已被解除禁止使用聯盟指令 +you.have.been.unbanned.from.union.commands=你已被解除禁止使用聯盟指令 you.cannot.untrust.yourself=你無法取消對自己的信任 leaders.cannot.be.untrusted=領袖無法被取消信任 this.player.is.already.untrusted=該玩家已經不被信任 has.been.given.untrusted.status.by={0} 已被 {1} 設定為不受信任狀態 -the.clan.does.not.exist=該聯盟不存在 -the.clan.is.already.verified=該聯盟已經驗證 -the.clan.has.been.verified=該聯盟已經驗證 -clan.0.has.been.verified=聯盟 {0} 已經驗證！ -total.clan.players.0=總聯盟成員數\: {0} +the.union.does.not.exist=該聯盟不存在 +the.union.is.already.verified=該聯盟已經驗證 +the.union.has.been.verified=該聯盟已經驗證 +union.0.has.been.verified=聯盟 {0} 已經驗證！ +total.union.players.0=總聯盟成員數\: {0} proposing.war={0} 正在提議與 {1} 開戰 you.can.only.start.war.with.rivals=你只能與敵對的聯盟開戰 leaders.have.been.asked.to.accept.the.war.request=已向 {0} 位領袖發出接受開戰請求的請求 leaders.asked.to.end.rivalry=已向 {0} 位領袖發出結束戰爭的請求 proposing.to.end.the.war={0} 正在提議與 {1} 結束戰爭 -clans.already.at.war=你的聯盟已經處於戰爭狀態 -clans.not.at.war=你的聯盟並未處於戰爭狀態 +unions.already.at.war=你的聯盟已經處於戰爭狀態 +unions.not.at.war=你的聯盟並未處於戰爭狀態 you.are.at.war={0} 現在與 {1} 開戰 denied.war.req={0} 拒絕了 {1} 發出的戰爭請求 you.are.no.longer.at.war={0} 不再與 {1} 開戰 @@ -480,12 +480,12 @@ diamond=鑽石 gold=金 wood=木 server.announce=伺服器公告 -clan.announce=聯盟公告 +union.announce=聯盟公告 leader.announce=領袖公告 hunger=飢餓 stone=石頭 iron=鐵 -the.clan.cannot.be.rivaled=不能敵對這個聯盟 +the.union.cannot.be.rivaled=不能敵對這個聯盟 bboff=告示板停用 bbon=告示板啟用 inviteon=邀請啟用 @@ -509,30 +509,30 @@ waiting.for.teleport.stand.still.for.0.seconds=不要移動, {0} 秒後傳送 on=啟用 off=停用 player.rank.changed=職位已設定 -your.clans.are.already.rivals=你的聯盟已經是敵對關係 +your.unions.are.already.rivals=你的聯盟已經是敵對關係 cleared.bb=已清除告示板 -clan.balance=聯盟餘額\: {0} -clan.admin.balance={0} 的餘額\: {1} -bb.clan.deposit={0} 已由 {1} 存入 -player.clan.deposit=你存入了 {0} -bb.clan.withdraw={0} 已由 {1} 提取 -bb.clan.take={0} 已被 {1} 取走 -bb.clan.give={0} 已由 {1} 提供 -bb.clan.set={0} 已由 {1} 設定 -player.clan.withdraw=你提取了 {0} -clan.admin.take=你從 {1} 的銀行取出了 {0} -clan.admin.give=你已向 {1} 的銀行存入了 {0} 美元 -clan.admin.set=你已將 {0} 的銀行餘額設定為 {1} -clan.admin.bank.not.enough.money={0} 的銀行餘額不足！ -clan.bank.not.enough.money=你的聯盟銀行餘額不足 -your.clans.are.not.rivals=你的聯盟並不是敵對關係 -the.clan.members.reached.limit=你的聯盟已達到成員上限 -this.clan.has.reached.the.member.limit=&b該聯盟已達到成員上限 +union.balance=聯盟餘額\: {0} +union.admin.balance={0} 的餘額\: {1} +bb.union.deposit={0} 已由 {1} 存入 +player.union.deposit=你存入了 {0} +bb.union.withdraw={0} 已由 {1} 提取 +bb.union.take={0} 已被 {1} 取走 +bb.union.give={0} 已由 {1} 提供 +bb.union.set={0} 已由 {1} 設定 +player.union.withdraw=你提取了 {0} +union.admin.take=你從 {1} 的銀行取出了 {0} +union.admin.give=你已向 {1} 的銀行存入了 {0} 美元 +union.admin.set=你已將 {0} 的銀行餘額設定為 {1} +union.admin.bank.not.enough.money={0} 的銀行餘額不足！ +union.bank.not.enough.money=你的聯盟銀行餘額不足 +your.unions.are.not.rivals=你的聯盟並不是敵對關係 +the.union.members.reached.limit=你的聯盟已達到成員上限 +this.union.has.reached.the.member.limit=&b該聯盟已達到成員上限 you.have.reseted.your.kdr=你已重設你的戰損比 you.have.reseted.0.kdr=你已重設了 {0} 的戰損比 you.have.reseted.kdr.of.all.players=你已重設所有玩家的戰損比 -you.have.successfully.renamed.your.clan=&b你已成功將你的聯盟改名為 {0} -you.have.successfully.renamed.the.clan=&b你已成功將該聯盟改名為 {0} +you.have.successfully.renamed.your.union=&b你已成功將你的聯盟改名為 {0} +you.have.successfully.renamed.the.union=&b你已成功將該聯盟改名為 {0} you.have.toggled.permanent.status=你已切換 {0} 的永久狀態 permanent.status.enabled=你的聯盟的永久狀態已由 {0} 啟用 permanent.status.disabled=你的聯盟的永久狀態已由 {0} 禁用 @@ -556,11 +556,11 @@ bb.one.hour=1 小時 bb.days= \ 天 bb.one.day=1 天 player.purged=該玩家已成功清除 -your.clan.description.must.be.longer.than=你的聯盟描述必須超過 {0} 個字符 -your.clan.description.cannot.be.longer.than=你的聯盟描述不能超過 {0} 個字符 +your.union.description.must.be.longer.than=你的聯盟描述必須超過 {0} 個字符 +your.union.description.cannot.be.longer.than=你的聯盟描述不能超過 {0} 個字符 description.changed=你已成功更改聯盟的描述 no.description=沒有描述 -the.player.must.wait.0.before.joining.your.clan.again=該玩家必須等待 {0} 分鐘才能再次加入你的聯盟 +the.player.must.wait.0.before.joining.your.union.again=該玩家必須等待 {0} 分鐘才能再次加入你的聯盟 disabled.command=命令已禁用 rank.displayname.updated=職位的顯示名稱已更新\! rank.setdefault=聯盟的默認職位現在已設定為 {0} @@ -573,18 +573,18 @@ rank.created=職位已創建 permission.0.added.to.rank.1=權限 {0} 已添加至職位 {1} permission.0.removed.from.rank.1=權限 {0} 已從職位 {1} 移除 rank.0.deleted=職位 {0} 已刪除 -clans.ranks=聯盟的職位\: +unions.ranks=聯盟的職位\: ranks.list.item={0}\# {1} ({2}) no.ranks=未創建任何職位 rank.no.permissions=該職位沒有任何權限 player.unassigned.from.rank=玩家已被解除該職位 you.must.be.0.or.have.the.permission.1.to.use.this=你必須是 {0}, 或你的領袖必須給予你的職位權限 {1} 才能使用此功能 -deposit.not.allowed=存款不被允許, 請使用 /%clan %toggle %deposit 以啟用該功能 -withdraw.not.allowed=提取不被允許, 請使用 /%clan %toggle %withdraw 以啟用該功能 +deposit.not.allowed=存款不被允許, 請使用 /%union %toggle %deposit 以啟用該功能 +withdraw.not.allowed=提取不被允許, 請使用 /%union %toggle %withdraw 以啟用該功能 resign.request.cancelled=退職請求已取消 disband.request.cancelled=解散請求已取消 resetkdr.request.cancelled=戰損比重設請求已取消 -clan.create.request.cancelled=聯盟創建請求已取消 +union.create.request.cancelled=聯盟創建請求已取消 rank.create.request.cancelled=職位創建請求已取消 promotion.vote.has.been.requested.from.all.leaders=已向所有領袖請求晉升投票 rename.vote.has.been.requested.from.all.leaders=&b已向所有領袖請求改名投票 @@ -601,11 +601,10 @@ gui.lore.no.permission=&c你沒有權限查看此內容！ gui.main.title={0} - 聯盟選單 gui.main.languageselector.title=&f選擇你的語言 gui.main.languageselector.lore.left.click=&7左鍵點擊 選擇你的語言 -gui.main.languageselector.lore.right.click=&7右鍵點擊 協助翻譯 gui.main.other.commands.title=&f其他命令 gui.main.other.commands.lore=&7左鍵點擊 查看所有聯盟命令 -gui.main.clan.list.title=&f聯盟列表 -gui.main.clan.list.lore=&7左鍵點擊 查看聯盟列表 +gui.main.union.list.title=&f聯盟列表 +gui.main.union.list.lore=&7左鍵點擊 查看聯盟列表 gui.main.reset.kdr.title=&f重設戰損比 gui.main.reset.kdr.lore=&7左鍵點擊 重設你的戰損比 gui.main.leaderboard.title=&f排行榜 @@ -613,8 +612,8 @@ gui.main.leaderboard.lore=&7左鍵點擊 查看排行榜 gui.main.staff.title=&f幹部 gui.main.staff.lore=&7左鍵點擊 打開幹部選單 gui.staff.title=幹部 -gui.staff.clan.list.lore.left.click=&7左鍵點擊 查看所有聯盟 -gui.staff.clan.list.lore.right.click=&7右鍵點擊 查看所有未驗證的聯盟 +gui.staff.union.list.lore.left.click=&7左鍵點擊 查看所有聯盟 +gui.staff.union.list.lore.right.click=&7右鍵點擊 查看所有未驗證的聯盟 gui.player.list.title=玩家列表 gui.staff.player.list.title=&f玩家列表 gui.staff.player.list.lore.left.click=&7左鍵點擊 查看所有玩家 @@ -624,8 +623,8 @@ gui.staff.global.ff.lore.status=&7狀態\: &b{0} gui.staff.global.ff.lore.toggle=&7左鍵點擊 切換友軍傷害狀態 gui.staff.reload.title=&f重新載入 gui.staff.reload.lore=&7左鍵點擊 重新載入插件 -gui.staff.clanlist.unverified.title=未驗證的聯盟 - 總數\: {0} -gui.staff.clanlist.toplace.title=選擇 {0} 的新聯盟 +gui.staff.unionlist.unverified.title=未驗證的聯盟 - 總數\: {0} +gui.staff.unionlist.toplace.title=選擇 {0} 的新聯盟 gui.warning.title=警告 gui.warning.no.permission.title=&f沒有權限 gui.warning.no.permission.plugin.lore=&7你沒有權限執行此操作\! @@ -634,20 +633,20 @@ gui.warning.no.permission.rank.lore=&7你必須是 {0}, 或你的領袖必須給 gui.warning.not.verified.title=&f未驗證 gui.warning.not.verified.lore=&7你的聯盟必須通過驗證\! gui.allies.title=盟友 -gui.allies.clan.lore=&7右鍵點擊 移除這個盟友 +gui.allies.union.lore=&7右鍵點擊 移除這個盟友 gui.allies.add.title=&f添加盟友 gui.add.ally.title=添加盟友 -gui.add.ally.clan.lore=&7左鍵點擊 結盟這個聯盟 +gui.add.ally.union.lore=&7左鍵點擊 結盟這個聯盟 gui.rivals.title=敵對 -gui.rivals.clan.lore=&7右鍵點擊 移除這個敵對者 +gui.rivals.union.lore=&7右鍵點擊 移除這個敵對者 gui.rivals.add.title=&f新增一名敵對者 gui.add.rival.title=新增一名敵對者 -gui.add.rival.clan.lore=&7左鍵點擊 將這個聯盟設為敵對 -gui.clanlist.title=聯盟 - 總數\: {0} -gui.clanlist.clan.title=&f聯盟\: [{0}&f] {1} -gui.clanlist.clan.lore.position=&b\#{0} -gui.clanlist.clan.lore.kdr=&7戰損比\: &b{0} -gui.clanlist.clan.lore.members=&7成員\: &b{0} +gui.add.rival.union.lore=&7左鍵點擊 將這個聯盟設為敵對 +gui.unionlist.title=聯盟 - 總數\: {0} +gui.unionlist.union.title=&f聯盟\: [{0}&f] {1} +gui.unionlist.union.lore.position=&b\#{0} +gui.unionlist.union.lore.kdr=&7戰損比\: &b{0} +gui.unionlist.union.lore.members=&7成員\: &b{0} gui.coords.title=座標 gui.coords.player.lore.distance=&7距離\: &b{0} gui.coords.player.lore.coords=&7座標\: &b{0} {1} {2} @@ -677,83 +676,83 @@ gui.permissions.permission.lore=&7右鍵點擊 從該職位移除此權限 gui.add.permission.title=添加權限 gui.add.permission.permission.title=&f{0} gui.add.permission.permission.lore=&7左鍵點擊 將此權限添加至該職位 -gui.clandetails.title=[{0}] {1} -gui.clandetails.free.agent.title=&f自由玩家 -gui.clandetails.free.agent.create.clan.price.lore=&7價格\: &b{0} -gui.clandetails.free.agent.create.clan.lore=&7左鍵點擊 創建聯盟 -gui.clandetails.clan.title=&f[{0}&f] {1} -gui.clandetails.clan.lore.description=&7描述\: &b{0} -gui.clandetails.clan.lore.status=&7狀態\: &b{0} -gui.clandetails.clan.lore.leaders=&7領袖\: &b{0} -gui.clandetails.clan.lore.online.members=&7上線成員\: &b{0}/{1} -gui.clandetails.clan.lore.kdr=&7戰損比\: &b{0} -gui.clandetails.clan.lore.kill.totals=&7擊殺\: &b[敵對\:{0} 中立\:{1} 平民\:{2}] -gui.clandetails.clan.lore.deaths=&7死亡\: &b{0} +gui.uniondetails.title=[{0}] {1} +gui.uniondetails.free.agent.title=&f自由玩家 +gui.uniondetails.free.agent.create.union.price.lore=&7價格\: &b{0} +gui.uniondetails.free.agent.create.union.lore=&7左鍵點擊 創建聯盟 +gui.uniondetails.union.title=&f[{0}&f] {1} +gui.uniondetails.union.lore.description=&7描述\: &b{0} +gui.uniondetails.union.lore.status=&7狀態\: &b{0} +gui.uniondetails.union.lore.leaders=&7領袖\: &b{0} +gui.uniondetails.union.lore.online.members=&7上線成員\: &b{0}/{1} +gui.uniondetails.union.lore.kdr=&7戰損比\: &b{0} +gui.uniondetails.union.lore.kill.totals=&7擊殺\: &b[敵對\:{0} 中立\:{1} 平民\:{2}] +gui.uniondetails.union.lore.deaths=&7死亡\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.allies.separator=&b, +gui.uniondetails.union.lore.allies.separator=&b, # suppress inspection "TrailingSpacesInProperty" -gui.clandetails.clan.lore.rivals.separator=&b, -gui.clandetails.clan.lore.allies=&7盟友\: &b{0} -gui.clandetails.clan.lore.rivals=&7敵對\: &b{0} -gui.clandetails.clan.lore.founded=&7創建時間\: &b{0} -gui.clandetails.clan.lore.inactive=&7不活躍\: &b{0}/{1} 天 -gui.clandetails.allies.title=&f盟友 -gui.clandetails.allies.lore=&7左鍵點擊 查看你的盟友或添加更多 -gui.clandetails.rivals.title=&f敵對者 -gui.clandetails.rivals.lore=&7左鍵點擊 查看你的敵對者或添加更多 -gui.clandetails.roster.title=&f成員名單 -gui.clandetails.roster.lore=&7左鍵點擊 查看你聯盟的成員或邀請更多 -gui.staffclandetails.roster.lore=&7左鍵點擊 查看聯盟的成員 -gui.clandetails.coords.title=&f座標 -gui.clandetails.coords.lore=&7左鍵點擊 查看你聯盟成員的座標 -gui.clandetails.home.title=&f總部 -gui.clandetails.home.lore.teleport.price=&7傳送價格\: &b{0} -gui.clandetails.home.lore.teleport=&7左鍵點擊 傳送至你的聯盟總部 -gui.staffclandetails.home.lore.teleport=&7左鍵點擊 傳送至這個聯盟的總部 -gui.clandetails.home.lore.clear=&7丟棄這個物品以取消你的聯盟總部 -gui.clandetails.home.lore.set.price=&7設定價格\: &b{0} -gui.clandetails.home.lore.set=&7右鍵點擊 設定你的聯盟總部 -gui.staffclandetails.home.lore.set=&7右鍵點擊 設定這個聯盟總部 -gui.clandetails.regroup.title=&f集合 -gui.clandetails.regroup.lore.price=&7價格\: &b{0} -gui.clandetails.regroup.lore.home=&7左鍵點擊 在聯盟總部集合你的成員 -gui.clandetails.regroup.lore.me=&7右鍵點擊 在你的位置集合你的聯盟成員 -gui.clandetails.ff.title=&f盟友傷害 -gui.clandetails.ff.personal.lore=&7個人\: &b{0} -gui.clandetails.ff.clan.lore=&7聯盟\: &b{0} -gui.clandetails.ff.personal.toggle.lore=&7左鍵點擊 切換你是否造成盟友傷害 -gui.clandetails.ff.clan.toggle.lore=&7右鍵點擊 切換聯盟是否造成盟友傷害 -gui.clandetails.bank.title=&f銀行 -gui.clandetails.bank.balance.lore=&7結餘\: &b{0} -gui.clandetails.bank.withdraw.status.lore=&7提款\: &b{0} -gui.clandetails.bank.deposit.status.lore=&7存款\: &b{0} -gui.clandetails.bank.withdraw.toggle.lore=&7丟棄這個物品來切換提款開放狀態 -gui.clandetails.bank.deposit.toggle.lore=&7右鍵點擊 切換存款開放狀態 -gui.clandetails.rank.title=&f職位 -gui.clandetails.rank.lore=&7左鍵點擊 檢視/編輯聯盟職位 -gui.clandetails.verified.title=&f已驗證 -gui.clandetails.not.verified.title=&f未驗證 -gui.clandetails.verify.price.lore=&7價格\: &b{0} -gui.clandetails.not.verified.lore=&7左鍵點擊 驗證你的聯盟 -gui.staffclandetails.not.verified.lore=&7左鍵點擊 驗證這個聯盟 -gui.clandetails.resign.title=&f退職 -gui.clandetails.resign.lore=&7左鍵點擊 向你的聯盟退職 -gui.clandetails.disband.title=&f解散 -gui.clandetails.disband.lore=&7丟棄這個物品來解散聯盟 -gui.staffclandetails.disband.lore=&7左鍵點擊 解散這個聯盟 -gui.clandetails.chat.title=&f頻道 -gui.clandetails.chat.clan.chat.lore=&7/{0} [訊息] - &b發送訊息到聯盟頻道 -gui.clandetails.chat.clan.join.leave.lore=&7/{0} {1}/{2} - &b加入/退出 聯盟頻道 -gui.clandetails.chat.ally.chat.lore=&7/{0} [訊息] - &b發送訊息到盟友頻道 -gui.clandetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &b加入/退出 盟友頻道 -gui.clandetails.chat.clan.status.lore=&7聯盟\: &b{0} -gui.clandetails.chat.ally.status.lore=&7盟友\: &b{0} -gui.clandetails.chat.clan.toggle.lore=&7左鍵點擊 切換聯盟頻道接收狀態 -gui.clandetails.chat.ally.toggle.lore=&7右鍵點擊 切換盟友頻道接收狀態 +gui.uniondetails.union.lore.rivals.separator=&b, +gui.uniondetails.union.lore.allies=&7盟友\: &b{0} +gui.uniondetails.union.lore.rivals=&7敵對\: &b{0} +gui.uniondetails.union.lore.founded=&7創建時間\: &b{0} +gui.uniondetails.union.lore.inactive=&7不活躍\: &b{0}/{1} 天 +gui.uniondetails.allies.title=&f盟友 +gui.uniondetails.allies.lore=&7左鍵點擊 查看你的盟友或添加更多 +gui.uniondetails.rivals.title=&f敵對者 +gui.uniondetails.rivals.lore=&7左鍵點擊 查看你的敵對者或添加更多 +gui.uniondetails.roster.title=&f成員名單 +gui.uniondetails.roster.lore=&7左鍵點擊 查看你聯盟的成員或邀請更多 +gui.staffuniondetails.roster.lore=&7左鍵點擊 查看聯盟的成員 +gui.uniondetails.coords.title=&f座標 +gui.uniondetails.coords.lore=&7左鍵點擊 查看你聯盟成員的座標 +gui.uniondetails.home.title=&f總部 +gui.uniondetails.home.lore.teleport.price=&7傳送價格\: &b{0} +gui.uniondetails.home.lore.teleport=&7左鍵點擊 傳送至你的聯盟總部 +gui.staffuniondetails.home.lore.teleport=&7左鍵點擊 傳送至這個聯盟的總部 +gui.uniondetails.home.lore.clear=&7丟棄這個物品以取消你的聯盟總部 +gui.uniondetails.home.lore.set.price=&7設定價格\: &b{0} +gui.uniondetails.home.lore.set=&7右鍵點擊 設定你的聯盟總部 +gui.staffuniondetails.home.lore.set=&7右鍵點擊 設定這個聯盟總部 +gui.uniondetails.regroup.title=&f集合 +gui.uniondetails.regroup.lore.price=&7價格\: &b{0} +gui.uniondetails.regroup.lore.home=&7左鍵點擊 在聯盟總部集合你的成員 +gui.uniondetails.regroup.lore.me=&7右鍵點擊 在你的位置集合你的聯盟成員 +gui.uniondetails.ff.title=&f盟友傷害 +gui.uniondetails.ff.personal.lore=&7個人\: &b{0} +gui.uniondetails.ff.union.lore=&7聯盟\: &b{0} +gui.uniondetails.ff.personal.toggle.lore=&7左鍵點擊 切換你是否造成盟友傷害 +gui.uniondetails.ff.union.toggle.lore=&7右鍵點擊 切換聯盟是否造成盟友傷害 +gui.uniondetails.bank.title=&f銀行 +gui.uniondetails.bank.balance.lore=&7結餘\: &b{0} +gui.uniondetails.bank.withdraw.status.lore=&7提款\: &b{0} +gui.uniondetails.bank.deposit.status.lore=&7存款\: &b{0} +gui.uniondetails.bank.withdraw.toggle.lore=&7丟棄這個物品來切換提款開放狀態 +gui.uniondetails.bank.deposit.toggle.lore=&7右鍵點擊 切換存款開放狀態 +gui.uniondetails.rank.title=&f職位 +gui.uniondetails.rank.lore=&7左鍵點擊 檢視/編輯聯盟職位 +gui.uniondetails.verified.title=&f已驗證 +gui.uniondetails.not.verified.title=&f未驗證 +gui.uniondetails.verify.price.lore=&7價格\: &b{0} +gui.uniondetails.not.verified.lore=&7左鍵點擊 驗證你的聯盟 +gui.staffuniondetails.not.verified.lore=&7左鍵點擊 驗證這個聯盟 +gui.uniondetails.resign.title=&f退職 +gui.uniondetails.resign.lore=&7左鍵點擊 向你的聯盟退職 +gui.uniondetails.disband.title=&f解散 +gui.uniondetails.disband.lore=&7丟棄這個物品來解散聯盟 +gui.staffuniondetails.disband.lore=&7左鍵點擊 解散這個聯盟 +gui.uniondetails.chat.title=&f頻道 +gui.uniondetails.chat.union.chat.lore=&7/{0} [訊息] - &b發送訊息到聯盟頻道 +gui.uniondetails.chat.union.join.leave.lore=&7/{0} {1}/{2} - &b加入/退出 聯盟頻道 +gui.uniondetails.chat.ally.chat.lore=&7/{0} [訊息] - &b發送訊息到盟友頻道 +gui.uniondetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &b加入/退出 盟友頻道 +gui.uniondetails.chat.union.status.lore=&7聯盟\: &b{0} +gui.uniondetails.chat.ally.status.lore=&7盟友\: &b{0} +gui.uniondetails.chat.union.toggle.lore=&7左鍵點擊 切換聯盟頻道接收狀態 +gui.uniondetails.chat.ally.toggle.lore=&7右鍵點擊 切換盟友頻道接收狀態 gui.playerdetails.title={0} gui.playerdetails.player.title=&f{0} -gui.playerdetails.player.lore.noclan=&7聯盟\: &b無 -gui.playerdetails.player.lore.clan=&7聯盟\: &b[{0}&b] {1} +gui.playerdetails.player.lore.nounion=&7聯盟\: &b無 +gui.playerdetails.player.lore.union=&7聯盟\: &b[{0}&b] {1} gui.playerdetails.player.lore.rank=&7職位\: &b{0} gui.playerdetails.player.lore.status=&7狀態\: &b{0} gui.playerdetails.player.lore.kdr=&7戰損比\: &b{0} @@ -762,8 +761,8 @@ gui.playerdetails.player.lore.deaths=&7死亡\: &b{0} gui.playerdetails.player.lore.join.date=&7加入時間\: &b{0} gui.playerdetails.player.lore.last.seen=&7最後上線\: &b{0} # suppress inspection "TrailingSpacesInProperty" -gui.playerdetails.player.lore.past.clans.separator=&b, -gui.playerdetails.player.lore.past.clans=&7過往聯盟\: &b{0} +gui.playerdetails.player.lore.past.unions.separator=&b, +gui.playerdetails.player.lore.past.unions=&7過往聯盟\: &b{0} gui.playerdetails.player.lore.inactive=&7不活躍\: &b{0}/{1} 天 gui.playerdetails.kick.title=&f踢出 gui.playerdetails.promote.demote.title=&f升職/降職 @@ -787,55 +786,53 @@ gui.languageselector.title=語言 - 當前\: {0} gui.languageselector.language.title=&f{0} gui.languageselector.language.lore.left.click=&7左鍵點擊 設定為你的語言 gui.languageselector.language.lore.translation.status=&7翻譯進度\: &b{0}% -gui.languageselector.language.lore.right.click=&7右鍵點擊 協助翻譯 gui.confirmation.title=確認 gui.confirmation.confirm=&7點擊確認 gui.confirmation.return=&7點擊返回 gui.not.supported=&c開啟功能界面發生錯誤\! 關閉界面... 版本是否正確? -staff.member.verify.clan=&c幹部成員必須驗證你的聯盟\! +staff.member.verify.union=&c幹部成員必須驗證你的聯盟\! player.already.has.that.rank=&c玩家已經在這個職位上\! -joined.clan.chat=&b你加入了聯盟頻道 -already.joined.clan.chat=&b你已經加入聯盟頻道 -left.clan.chat=&b你退出了聯盟頻道 -muted.clan.chat=&b你靜音聯盟頻道 -unmuted.clan.chat=&b你解除聯盟頻道靜音 +joined.union.chat=&b你加入了聯盟頻道 +already.joined.union.chat=&b你已經加入聯盟頻道 +left.union.chat=&b你退出了聯盟頻道 +muted.union.chat=&b你靜音聯盟頻道 +unmuted.union.chat=&b你解除聯盟頻道靜音 joined.ally.chat=&b你加入了盟友頻道 left.ally.chat=&b你退出了盟友頻道 muted.ally.chat=&b你將盟友頻道靜音 unmuted.ally.chat=&b你解除盟友頻道靜音 already.joined.ally.chat=&b你已經加入盟友頻道 -player.already.in.this.clan=&c玩家已經加入這個聯盟 -your.clan.reached.max.alliances=&c你的聯盟已達到盟友的數量限制 -other.clan.reached.max.alliances=&c對方聯盟已達到盟友的數量限制 -insert.clan.tag=&b輸入聯盟標籤 (or "{0}")\: -insert.clan.name=&b輸入聯盟名稱\: +player.already.in.this.union=&c玩家已經加入這個聯盟 +your.union.reached.max.alliances=&c你的聯盟已達到盟友的數量限制 +other.union.reached.max.alliances=&c對方聯盟已達到盟友的數量限制 +insert.union.tag=&b輸入聯盟標籤 (or "{0}")\: +insert.union.name=&b輸入聯盟名稱\: insert.rank.name=&b輸入職位名稱 (or "{0}")\: -click.to.help.translating=&b點擊這裡協助翻譯\:\n&r{0} -your.clan.must.have.members.to.verify=&c你的聯盟必須至少有 {0} 個成員才能驗證\! +your.union.must.have.members.to.verify=&c你的聯盟必須至少有 {0} 個成員才能驗證\! you.must.hold.a.banner=&c你手上必須拿著旗幟\! -you.changed.clan.banner=&b你已改變你的聯盟旗幟\! -your.clan.already.verified=&c你的聯盟已經驗證\! +you.changed.union.banner=&b你已改變你的聯盟旗幟\! +your.union.already.verified=&c你的聯盟已經驗證\! # suppress inspection "TrailingSpacesInProperty" -clan.profile=\n&b%clan_name%&7 資訊 &8-------------------------------------------\n \n &7名稱\: &e[&8%clan_color_tag%&e] &b%clan_name%\n &7描述\: &f%clan_description%\n &7狀態\: &f%clan_status%\n &7領袖\: %clan_leaders%\n &7線上成員\: &f%clan_online_count%&7/&f%clan_size%\n &7戰損比\: &e%clan_kdr%\n &7總擊殺\: &8[Rival\:&f%clan_rival_kills% &8Ally\:&f%clan_ally_kills% &8Neutral\:&f%clan_neutral_kills% &8Civilian\:&f%clan_civilian_kills%&8]\n &7死亡\: &f%clan_deaths%\n &7盟友\: &f%clan_allies%\n &7敵對\: &f%clan_rivals%\n &7創建時間\: &f%clan_founded%\n &7不活躍\: &f%clan_inactive_days%&7/&f%clan_max_inactive_days% 天\n -player.lookup.clanname=&e[&8%clan_color_tag%&e] &b%clan_name% +union.profile=\n&b%union_name%&7 資訊 &8-------------------------------------------\n \n &7名稱\: &e[&8%union_color_tag%&e] &b%union_name%\n &7描述\: &f%union_description%\n &7狀態\: &f%union_status%\n &7線上成員\: &f%union_online_count%&7/&f%union_size%\n &7戰損比\: &e%union_kdr%\n &7總擊殺\: &8[Rival\:&f%union_rival_kills% &8Ally\:&f%union_ally_kills% &8Neutral\:&f%union_neutral_kills% &8Civilian\:&f%union_civilian_kills%&8]\n &7死亡\: &f%union_deaths%\n &7盟友\: &f%union_allies%\n &7敵對\: &f%union_rivals%\n &7創建時間\: &f%union_founded%\n &7不活躍\: &f%union_inactive_days%&7/&f%union_max_inactive_days% 天\n +player.lookup.unionname=&e[&8%union_color_tag%&e] &b%union_name% # suppress inspection "TrailingSpacesInProperty" player.lookup.killtype=&7擊殺方式\: %player_kill_type%\n -player.lookup=\n&b%player_name%&7 玩家資訊 &8-------------------------------------------\n \n &7聯盟\: &f%clan_name%\n &7職位\: &f%player_rank%\n &7狀態\: &f%player_status%\n &7戰損比\: &e%player_kdr%\n &7擊殺數\: &8[敵對\:&f%player_rival_kills% &8盟友\:&7%player_ally_kills% &8中立\:&f%player_neutral_kills% &8平民\:&f%player_civilian_kills%&8]\n &7死亡\: &f%player_deaths%\n &7加入時間\: &f%player_join_date%\n &7最後上線\: &f%player_last_seen%\n &7過往聯盟\: &f%player_past_clans%\n &7不活躍\: &f%player_inactive_days%&7/&f%player_max_inactive_days% 天\n %kill_type_line% +player.lookup=\n&b%player_name%&7 玩家資訊 &8-------------------------------------------\n \n &7聯盟\: &f%union_name%\n &7狀態\: &f%player_status%\n &7戰損比\: &e%player_kdr%\n &7擊殺數\: &8[敵對\:&f%player_rival_kills% &8盟友\:&7%player_ally_kills% &8中立\:&f%player_neutral_kills% &8平民\:&f%player_civilian_kills%&8]\n &7死亡\: &f%player_deaths%\n &7加入時間\: &f%player_join_date%\n &7最後上線\: &f%player_last_seen%\n &7過往聯盟\: &f%player_past_unions%\n &7不活躍\: &f%player_inactive_days%&7/&f%player_max_inactive_days% 天\n %kill_type_line% economy.disabled=&c經濟功能停用\! has.been.purged={0} 的資料已清除 accepted.invitation=&b你接受了 {0} 的邀請 denied.invitation=&c你拒絕了 {0} 的邀請 -must.be.in.clan.to.pvp=&c你與 {0} 必須是聯盟成員才能 PvP\! -clans.not.at.war.pvp.denied=&c你的聯盟沒有與 {0} 開戰\! +must.be.in.union.to.pvp=&c你與 {0} 必須是聯盟成員才能 PvP\! +unions.not.at.war.pvp.denied=&c你的聯盟沒有與 {0} 開戰\! cannot.attack.civilians=&c你不能攻擊平民\! -cannot.attack.clan.member=&c你不能攻擊聯盟成員\! +cannot.attack.union.member=&c你不能攻擊聯盟成員\! cannot.attack.ally=&c你不能攻擊盟友\! cannot.send.discord.message=你不能傳送訊息給 {0}. 你不是那個的聯盟成員\! discordhook.is.disabled=&cDiscord 整合停用或無法使用\! -your.clan.doesnt.have.any.linked.player=你的聯盟沒有任何連結玩家 -your.clan.doesnt.have.minimum.linked.player=你的聯盟沒有最低連結玩家 -your.clan.is.not.on.the.whitelist=你的聯盟不在白名單裡 -your.clan.already.has.channel=你的聯盟已經有 Discord 頻道l +your.union.doesnt.have.any.linked.player=你的聯盟沒有任何連結玩家 +your.union.doesnt.have.minimum.linked.player=你的聯盟沒有最低連結玩家 +your.union.is.not.on.the.whitelist=你的聯盟不在白名單裡 +your.union.already.has.channel=你的聯盟已經有 Discord 頻道l discord.reached.category.limit=Discord 已達到類別上限\! discord.reached.channels.limit=Discord 已達到頻道上限\! discord.created.successfully=&bDiscord 頻道建立成功\! @@ -845,19 +842,19 @@ cannot.kick.last.leader=&c你不能踢出唯一的領袖\! cannot.disband.permanent=&c你不能解散這個聯盟. 這個聯盟有永久狀態. you.can.only.set.base.in.your.land=&c你只能在你的領土裡設總部\! only.leaders.can.create.lands=&c只有領袖可以建立領土\! -only.one.land.per.clan=&c你的聯盟已經有領土了\! -only.clan.members.can.create.lands=&c只有聯盟成員可以建立領土\! +only.one.land.per.union=&c你的聯盟已經有領土了\! +only.union.members.can.create.lands=&c只有聯盟成員可以建立領土\! land.allowed.all.actions=&b允許所有動作\! land.blocked.all.actions=&b禁止所有動作\! land.allowed.action=&b允許動作\! land.blocked.action=&b禁止動作\! you.do.not.own.lands=&c你沒有領土\! land.sharing.disabled=&c領土分享關閉\! -clan.chat.disabled=&c聯盟訊息關閉\! +union.chat.disabled=&c聯盟訊息關閉\! ally.chat.disabled=&c盟友訊息關閉\! war.expired=與 {0} 的戰爭已經到期\! you.cant.start.war.online.members.difference=你不能開戰. 雙方聯盟線上玩家不平衡. invitedplayer.invite.off=玩家關閉聯盟邀請 user.hasnt.played.before=&c這個玩家不存在 -clan.list.balance.header=\n{0} &7最高結餘 &8-----------------------\n \n&8所有聯盟\: &7{1}\n \n&8\#&7. &8聯盟 &7- &8結餘 -clan.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} +union.list.balance.header=\n{0} &7最高結餘 &8-----------------------\n \n&8所有聯盟\: &7{1}\n \n&8\#&7. &8聯盟 &7- &8結餘 +union.list.balance.line=&f{0}. {1}{2}{3}&b{4} &7- &e{5} diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index da057b39..372c45eb 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -17,15 +17,42 @@ authors: - Phaed - RoinujNosde website: https://github.com/true-og/Unions-OG +commands: + clan: + description: Tells the player to use /union instead + usage: /union + clans: + description: Tells the player to use /union instead + usage: /union + factions: + description: Tells the player to use /union instead + usage: /union + guilds: + description: Tells the player to use /union instead + usage: /union + party: + description: Tells the player to use /union instead + usage: /union + tribe: + description: Tells the player to use /union instead + usage: /union + nation: + description: Tells the player to use /union instead + usage: /union + crew: + description: Tells the player to use /union instead + usage: /union + squad: + description: Tells the player to use /union instead + usage: /union + gang: + description: Tells the player to use /union instead + usage: /union permissions: unionsog.admin.reload: description: Can reload configuration unionsog.admin.purge: description: Can purge a player - unionsog.admin.promote: - description: Can promote players to union leaders - unionsog.admin.demote: - description: Can demote union leaders to normal players unionsog.admin.permanent: description: Can toggle union permanent status unionsog.admin.all-seeing-eye: @@ -48,6 +75,8 @@ permissions: description: Can kick any player unionsog.mod.globalff: description: Can turn off global friendly fire protection + unionsog.mod.home: + description: Can set any union's home unionsog.mod.hometp: description: Can teleport to all union homes unionsog.mod.bypass: @@ -116,35 +145,41 @@ permissions: description: Can reset his kdr unionsog.vip.teleport-delay: description: Bypasses the teleport delay - unionsog.leader.create: + unionsog.member.create: description: Can create unions - unionsog.leader.home-set: - description: Can set home base - unionsog.leader.regroup.home: - description: Can tp entire union to homebase - unionsog.leader.regroup.me: - description: Can tp their entire union to themself - unionsog.leader.ally: - description: Can ally his union with other unions - unionsog.leader.rival: + unionsog.member.ally-set: + description: Can add and remove his union's allies + default: true + unionsog.member.rival: description: Can start a rivalry with another union - unionsog.leader.modtag: + unionsog.member.modtag: description: Can modify his union's tag children: - unionsog.leader.color: true - unionsog.leader.color: + unionsog.member.color: true + unionsog.member.color: description: Can set his union's color - unionsog.leader.description: + unionsog.member.description: description: Can modify his union's description - unionsog.leader.bb-clear: + unionsog.member.bb-clear: description: Can clear his union's bb - unionsog.leader.setbanner: + unionsog.member.setbanner: description: Can set his union's banner - unionsog.leader.discord.create: - description: Can create discord channel for his union - unionsog.leader.rename: + unionsog.member.rename: description: Can rename his union's name - default: false + unionsog.member.disband: + description: Can propose disbanding his union + unionsog.member.vote: + description: Can vote on his union's proposals + unionsog.member.war: + description: Can propose a war and answer war requests + unionsog.member.home-set: + description: Can propose moving his union's home base + unionsog.member.regroup.home: + description: Can tp entire union to homebase + unionsog.member.regroup.me: + description: Can tp their entire union to themself + unionsog.member.discord.create: + description: Can create discord channel for his union unionsog.member.land: description: Can use land commands unionsog.member.kills: @@ -171,53 +206,15 @@ permissions: description: Can open the staff gui unionsog.mod.locale: description: Can set players language - unionsog.leader.invite: + unionsog.member.invite: description: Can invite players into his union - unionsog.leader.kick: - description: Can kick players form his tea, - unionsog.leader.promote: - description: Can promote players to union leaders - unionsog.leader.promotable: - description: Can be promoted to union leader - unionsog.leader.demote: - description: Can demote union leaders to normal players - unionsog.leader.ff: + unionsog.member.kick: + description: Can kick players from his union + unionsog.member.union-ff: description: Can toggle his union's friendly fire - unionsog.leader.disband: - description: Can disband his own union - unionsog.leader.settrust: - description: Can set trust levels for members - unionsog.leader.war: - description: Can start wars - unionsog.leader.coloredrank: - description: Can set colored ranks default: true - unionsog.leader.coloredtag: + unionsog.member.coloredtag: description: Can use color codes in tags - unionsog.leader.rank.list: - description: Can list the ranks - unionsog.leader.rank.create: - description: Can create a new rank - unionsog.leader.rank.assign: - description: Can assign a rank to a user - unionsog.leader.rank.unassign: - description: Can unassign a player from a rank - unionsog.leader.rank.delete: - description: Can delete a rank - unionsog.leader.rank.permissions.available: - description: Can list the available permissions - unionsog.leader.rank.permissions.list: - description: Can list the permissions of a rank - unionsog.leader.rank.permissions.add: - description: Can add permissions to a rank - unionsog.leader.rank.permissions.remove: - description: Can remove permissions from a rank - unionsog.leader.rank.setdisplayname: - description: Can set the rank displayname - unionsog.leader.rank.setdefault: - description: Can set the default rank - unionsog.leader.rank.removedefault: - description: Can remove the default rank unionsog.member.bank: description: Can use banks unionsog.admin.*: @@ -227,8 +224,6 @@ permissions: unionsog.admin.reload: true unionsog.admin.all-seeing-eye: true unionsog.admin.resetkdr: true - unionsog.admin.demote: true - unionsog.admin.promote: true unionsog.admin.permanent: true unionsog.admin.bank.status: true unionsog.admin.bank.take: true @@ -309,44 +304,26 @@ permissions: unionsog.member.kills: true unionsog.member.bank: true unionsog.member.chat.color: true - unionsog.leader.*: - description: Permissions for those who can be union leaders - default: true - children: - unionsog.leader.create: true - unionsog.leader.ally: true - unionsog.leader.rival: true - unionsog.leader.modtag: true - unionsog.leader.color: true - unionsog.leader.cape: true - unionsog.leader.invite: true - unionsog.leader.kick: true - unionsog.leader.promote: true - unionsog.leader.promotable: true - unionsog.leader.demote: true - unionsog.leader.ff: true - unionsog.leader.withdraw-toggle: true - unionsog.leader.deposit-toggle: true - unionsog.leader.disband: true - unionsog.leader.settrust: true - unionsog.leader.war: true - unionsog.leader.home-set: true - unionsog.leader.regroup.home: true - unionsog.leader.regroup.me: true - unionsog.leader.setrank: true - unionsog.leader.coloredtag: true - unionsog.leader.coloredrank: true - unionsog.leader.bb-clear: true - unionsog.leader.rank.setdisplayname: true - unionsog.leader.rank.setdefault: true - unionsog.leader.rank.removedefault: true - unionsog.leader.rank.list: true - unionsog.leader.rank.create: true - unionsog.leader.rank.assign: true - unionsog.leader.rank.unassign: true - unionsog.leader.rank.delete: true - unionsog.leader.rank.permissions.available: true - unionsog.leader.rank.permissions.add: true - unionsog.leader.rank.permissions.remove: true - unionsog.leader.rank.permissions.list: true - unionsog.leader.discord.create: true + unionsog.member.rename: true + unionsog.member.disband: true + unionsog.member.vote: true + unionsog.member.war: true + unionsog.member.home-set: true + unionsog.member.regroup.home: true + unionsog.member.regroup.me: true + unionsog.member.discord.create: true + unionsog.member.create: true + unionsog.member.ally-set: true + unionsog.member.rival: true + unionsog.member.modtag: true + unionsog.member.color: true + unionsog.member.cape: true + unionsog.member.invite: true + unionsog.member.kick: true + unionsog.member.union-ff: true + unionsog.member.withdraw-toggle: true + unionsog.member.deposit-toggle: true + unionsog.member.coloredtag: true + unionsog.member.bb-clear: true + unionsog.member.setbanner: true + unionsog.member.description: true diff --git a/src/test/java/net/trueog/unionsog/migrations/legacy/LegacyUnionsDatabaseMigrationDatabaseTest.java b/src/test/java/net/trueog/unionsog/migrations/legacy/LegacyUnionsDatabaseMigrationDatabaseTest.java index 6db1b076..c8bd05af 100644 --- a/src/test/java/net/trueog/unionsog/migrations/legacy/LegacyUnionsDatabaseMigrationDatabaseTest.java +++ b/src/test/java/net/trueog/unionsog/migrations/legacy/LegacyUnionsDatabaseMigrationDatabaseTest.java @@ -22,7 +22,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; class LegacyUnionsDatabaseMigrationDatabaseTest { - private static final String RANKS_JSON = "{\"ranks\":[],\"defaultRank\":null}"; private Connection connection; @BeforeEach @@ -48,19 +47,19 @@ class LegacyUnionsDatabaseMigrationDatabaseTest { final UUID firstUnion = UUID.fromString("11111111-1111-1111-1111-111111111111"); final UUID secondUnion = UUID.fromString("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"); - final UUID leader = UUID.fromString("11111111-2222-3333-4444-555555555555"); + final UUID founder = UUID.fromString("11111111-2222-3333-4444-555555555555"); final UUID member = UUID.fromString("22222222-3333-4444-5555-666666666666"); final UUID orphan = UUID.fromString("33333333-4444-5555-6666-777777777777"); final UUID missingUnion = UUID.fromString("ffffffff-ffff-ffff-ffff-ffffffffffff"); - insertLegacyUnion(firstUnion, "Alpha Union", "&4Alpha-Tag", leader, "First description", "Legacy|MOTD", + insertLegacyUnion(firstUnion, "Alpha Union", "&4Alpha-Tag", founder, "First description", "Legacy|MOTD", "dark_red", "default,world,-12.5,64,23.25,90,10"); insertLegacyUnion(secondUnion, "Second Union", "Alpha Tag", null, null, null, "yellow", null); - insertLegacyPlayer(leader, firstUnion); + insertLegacyPlayer(founder, firstUnion); insertLegacyPlayer(member, secondUnion); insertLegacyPlayer(orphan, missingUnion); - final Map playerNames = Map.of(leader, "Alice", orphan, "Orphan"); + final Map playerNames = Map.of(founder, "Alice", orphan, "Orphan"); final LegacyUnionsDatabaseMigration.Result result = migration(playerNames).migrate(); assertFalse(result.alreadyApplied()); @@ -69,7 +68,6 @@ class LegacyUnionsDatabaseMigrationDatabaseTest { assertEquals(1, result.placeholderNames()); assertEquals(1, result.adjustedTags()); assertEquals(1, result.orphanedMemberships()); - assertEquals(1, result.unionsWithoutLeaders()); try (PreparedStatement statement = connection.prepareStatement( "SELECT `color_tag`, `description`, `packed_bb`, `flags`, `balance` FROM `sc_clans` WHERE `tag` = ?;")) @@ -94,9 +92,9 @@ class LegacyUnionsDatabaseMigrationDatabaseTest { } assertEquals(1, countRows("sc_clans", "`tag` = 'alphatagaaaaaaaa'")); - assertPlayer(leader, "Alice", "alphatag", true, true); - assertPlayer(member, "2222222233334444", "alphatagaaaaaaaa", false, false); - assertPlayer(orphan, "Orphan", "", false, false); + assertPlayer(founder, "Alice", "alphatag"); + assertPlayer(member, "2222222233334444", "alphatagaaaaaaaa"); + assertPlayer(orphan, "Orphan", ""); assertEquals(1, countRows("sc_unionsog_migrations", null)); final LegacyUnionsDatabaseMigration.Result repeated = migration(playerNames).migrate(); @@ -162,7 +160,7 @@ class LegacyUnionsDatabaseMigrationDatabaseTest { final LegacyUnionsDatabaseMigrationRunner.MigrationStartupException failure = assertThrows( LegacyUnionsDatabaseMigrationRunner.MigrationStartupException.class, - () -> LegacyUnionsDatabaseMigrationRunner.migrateOrThrow(connection, "sc_", RANKS_JSON, uuid -> null)); + () -> LegacyUnionsDatabaseMigrationRunner.migrateOrThrow(connection, "sc_", uuid -> null)); assertTrue(failure.getMessage().contains("Plugin startup was aborted")); assertTrue(failure.getCause() instanceof SQLException); @@ -171,7 +169,7 @@ class LegacyUnionsDatabaseMigrationDatabaseTest { private LegacyUnionsDatabaseMigration migration(Map playerNames) { - return new LegacyUnionsDatabaseMigration(connection, "sc_", RANKS_JSON, playerNames::get); + return new LegacyUnionsDatabaseMigration(connection, "sc_", playerNames::get); } @@ -298,7 +296,7 @@ class LegacyUnionsDatabaseMigrationDatabaseTest { } - private void assertPlayer(UUID uuid, String name, String tag, boolean leader, boolean trusted) throws SQLException { + private void assertPlayer(UUID uuid, String name, String tag) throws SQLException { try (PreparedStatement statement = connection .prepareStatement("SELECT `name`, `tag`, `leader`, `trusted` FROM `sc_players` WHERE `uuid` = ?;")) @@ -310,8 +308,9 @@ class LegacyUnionsDatabaseMigrationDatabaseTest { assertTrue(row.next()); assertEquals(name, row.getString("name")); assertEquals(tag, row.getString("tag")); - assertEquals(leader, row.getBoolean("leader")); - assertEquals(trusted, row.getBoolean("trusted")); + // Unions have no leaders, so the retained column keeps its default. + assertFalse(row.getBoolean("leader")); + assertTrue(row.getBoolean("trusted")); } diff --git a/wiki/README.md b/wiki/README.md index a64ff74b..7abb24b4 100644 --- a/wiki/README.md +++ b/wiki/README.md @@ -6,6 +6,19 @@ description: Welcome to the Unions-OG Wiki! Here you will find a complete set of documentation including installation, configuration, permissions and usage for Unions-OG. +> **Note:** this wiki documents Unions-OG, not upstream SimpleClans. Unions are +> flat — there are no leaders and no ranks, every member holds the same powers, +> and disbanding a union, moving its home, or starting a war each need a vote of +> half the membership. See [Proposals and Voting](commands-and-permissions/proposals-and-voting.md) +> for how those votes work. + +Start here: + +* [Commands](commands-and-permissions/commands.md) — every command, grouped by who can run it +* [Permissions](commands-and-permissions/permissions.md) — every `unionsog.*` node +* [Proposals and Voting](commands-and-permissions/proposals-and-voting.md) — how unions decide +* [Configuration](how-to-setup/configuration.md) — every option in `config.yml` + ## Support `1) The Wiki` @@ -20,4 +33,6 @@ If the wiki does not have your answer, feel free to join [the discord](https://d `Issue Tracker` -If you believe you have found a bug in the plugin, feel free to make an issue on the [issue tracker!](https://github.com/RoinujNosde/SimpleClans/issues) Bugs will be looked into and addressed at the earliest opportunity. +If you believe you have found a bug in Unions-OG, feel free to make an issue on the [Unions-OG issue tracker!](https://github.com/true-og/Unions-OG/issues) Bugs will be looked into and addressed at the earliest opportunity. + +Bugs in inherited behavior that also occur in unmodified SimpleClans belong on the [upstream issue tracker](https://github.com/RoinujNosde/SimpleClans/issues) instead. diff --git a/wiki/SUMMARY.md b/wiki/SUMMARY.md index fb226766..94e17f4b 100644 --- a/wiki/SUMMARY.md +++ b/wiki/SUMMARY.md @@ -2,28 +2,25 @@ * [Introduction](README.md) * [Discord Support](https://discord.gg/CkNwgdE) -* [Bugs and Suggestions](https://github.com/RoinujNosde/SimpleClans/issues) +* [Bugs and Suggestions](https://github.com/true-og/Unions-OG/issues) ## How to Setup * [Configuration](how-to-setup/configuration.md) * [Translation](how-to-setup/translation.md) -* [Member Fee](how-to-setup/member-fee.md) -* [Clan Upkeep](how-to-setup/clan-upkeep.md) -* [Clan Below Player's Name](how-to-setup/clan-below-players-name.md) -* [Clan on Tablist](how-to-setup/clan-on-tablist.md) +* [Union Below Player's Name](how-to-setup/union-below-players-name.md) +* [Union on Tablist](how-to-setup/union-on-tablist.md) ## Commands and Permissions * [Commands](commands-and-permissions/commands.md) * [Permissions](commands-and-permissions/permissions.md) -* [Clan Alliances and Rivalries](commands-and-permissions/aliances-and-rivalries.md) -* [Ranks with Permissions](commands-and-permissions/ranks-with-permissions.md) +* [Proposals and Voting](commands-and-permissions/proposals-and-voting.md) +* [Union Alliances and Rivalries](commands-and-permissions/alliances-and-rivalries.md) ## Other * [Known issues](other/known-issues.md) -* [SimpleClans API Example](other/simpleclans-api.md) +* [Unions-OG API Example](other/unions-og-api.md) * [PlaceholderAPI Support](other/placeholderapi-support.md) * [Land Claims Plugins](other/land-claims.md) - diff --git a/wiki/commands-and-permissions/aliances-and-rivalries.md b/wiki/commands-and-permissions/aliances-and-rivalries.md deleted file mode 100644 index b0bc73c9..00000000 --- a/wiki/commands-and-permissions/aliances-and-rivalries.md +++ /dev/null @@ -1,33 +0,0 @@ ---- -description: null ---- - -# Clan Alliances and Rivalries - -Any clan leader can send an request to start an alliance with any other clan with `/clan ally add`. If the request is accepted by a leader of the second clan, the alliance is formed. The alliance can be broken by any leader of either clan at any time with `/clan ally remove`, no one needs to accept the removal of an alliance. - -Clan rivalries can be started by any clan at any time, no request is needed, rivalries are automatically formed once a clan leader decides he wants one by using `/clan rival add`. If someone has pissed you off and you want them as rivals, their permission is not needed. To break a clan rivalry on the other hand, you need the acceptance of the other clan, you must use `/clan rival remove` to send the other clan a request, once one of their leaders accept the rivalry is broken. - -You can view a list of all clans and their allies with the `/clan alliances` command, or their rivals with the `/clan rivalries` command. - -## Commands - -| Commands | Description | -| :--- | :--- | -| `/clan ally add [tag]` | Send an request to start an alliance \(acceptance is required\) | -| `/clan ally remove [tag]` | Remove alliance \(no acceptance is required\) | -| `/clan rival add [tag]` | Starting a rivalry \(no acceptance is required\) | -| `/clan rival remove [tag]` | Remove a rivalry \(acceptance is required\) | -| `/clan alliances` | List all clans and their allies | -| `/clan rivalries` | List all clans and their rivals | - -## Permissions - -| Permission | Description | -| :--- | :--- | -| `simpleclans.member.ally` | Can use ally chat | -| `simpleclans.leader.ally` | Can ally his clan with other simpleclans | -| `simpleclans.leader.rival` | Can start a rivalry with another clan | -| `simpleclans.anyone.alliances` | Can view alliances by clan | -| `simpleclans.anyone.rivalries` | Can view rivalries by clan | - diff --git a/wiki/commands-and-permissions/alliances-and-rivalries.md b/wiki/commands-and-permissions/alliances-and-rivalries.md new file mode 100644 index 00000000..48e01634 --- /dev/null +++ b/wiki/commands-and-permissions/alliances-and-rivalries.md @@ -0,0 +1,47 @@ +--- +description: null +--- + +# Union Alliances and Rivalries + +Any member can send a request to start an alliance with another union using +`/union ally add`. The alliance forms when any member of the second union +accepts. Either side can break it at any time with `/union ally remove`; no +acceptance is needed to end an alliance. + +Rivalries can be started by any union at any time, with no request needed. +`/union rival add` forms the rivalry immediately, so the other union's consent +is not required. Ending one does need their agreement: `/union rival remove` +sends a request, and the rivalry ends when any member of the other union +accepts. + +Declaring **war** on a rival is different from either. It affects the whole +union, so it needs a vote of your own members rather than the target's +consent. See [Proposals and Voting](proposals-and-voting.md). + +You can view every union and its allies with `/union alliances`, or its rivals +with `/union rivalries`. + +## Commands + +| Command | Description | +| :--- | :--- | +| `/union ally add [tag]` | Sends a request to start an alliance \(acceptance required\) | +| `/union ally remove [tag]` | Removes an alliance \(no acceptance required\) | +| `/union rival add [tag]` | Starts a rivalry \(no acceptance required\) | +| `/union rival remove [tag]` | Ends a rivalry \(acceptance required\) | +| `/union war start [tag]` | Proposes declaring war on a rival \(union vote required\) | +| `/union war end [tag]` | Proposes ending a war \(the other union accepts\) | +| `/union alliances` | Lists all unions and their allies | +| `/union rivalries` | Lists all unions and their rivals | + +## Permissions + +| Permission | Description | +| :--- | :--- | +| `unionsog.member.ally` | Can use ally chat | +| `unionsog.member.ally-set` | Can add and remove their union's allies | +| `unionsog.member.rival` | Can start and end a rivalry with another union | +| `unionsog.member.war` | Can propose a war and answer war requests | +| `unionsog.anyone.alliances` | Can view alliances by union | +| `unionsog.anyone.rivalries` | Can view rivalries by union | diff --git a/wiki/commands-and-permissions/commands.md b/wiki/commands-and-permissions/commands.md index 3647ac15..5537bde3 100644 --- a/wiki/commands-and-permissions/commands.md +++ b/wiki/commands-and-permissions/commands.md @@ -8,110 +8,156 @@ description: null > > Optional arguments are marked with `[argument]` +`/union` is the primary command, with `/unions` as its only alias. + +Words other servers use for the same thing — `/clan`, `/clans`, `/factions`, +`/guilds`, `/party`, `/tribe`, `/nation`, `/crew`, `/squad` and `/gang` — are +registered as signposts: running one tells the player to use `/union` +instead, carrying their arguments over, and does nothing else. `/f`, +`/faction` and `/guild` are redirected by Utilities-OG rather than by this +plugin. + ## Anyone Commands -| Command | Description | Verified only | | | | | | -| :--- | :--- | :--- | :--- | :--- | :--- | :--- | :--- | -| `/union` | Opens the GUI or shows the help | No | | | | | | -| `/union help` | Shows the plugin's commands | No | | | | | | -| `/union create [tag] [name]` | Creates a new union | No | | | | | | -| `/accept` | Accepts a request | No | | | | | | -| `/deny` | Denies a request | No | | | | | | -| `/more` | Shows more information | No | | | | | | -| `/union leaderboard` | Shows the leaderboard | No | | | | | | -| \`/union list \[name | size | kdr | founded | active\] \[asc | desc\]\` | Lists all unions | No | -| `/union rivalries` | Shows all union rivalries | No | | | | | | -| `/union alliances` | Shows all union alliances | No | | | | | | -| `/union lookup [player]` | Looks up your or another player's info | No | | | | | | -| `/union profile [tag]` | Shows another union's profile | Yes\* | | | | | | -| `/union roster [tag]` | Shows another union's roster | Yes\* | | | | | | -| \`/union ff \(allow | auto\)\` | Toggles personal friendly fire | No | | | | | -| `/union resetkdr` | Resets your KDR | No | | | | | | +| Command | Description | +| :--- | :--- | +| `/union` | Opens the GUI or shows the help | +| `/union help` | Shows the plugin's commands | +| `/union create [tag] [name]` | Creates a new union | +| `/accept` | Accepts a request | +| `/deny` | Denies a request | +| `/more` | Shows more information | +| `/union leaderboard` | Shows the leaderboard | +| `/union list [name\|size\|kdr\|founded\|active] [asc\|desc]` | Lists all unions | +| `/union list balance` | Lists unions by balance | +| `/union rivalries` | Shows all union rivalries | +| `/union alliances` | Shows all union alliances | +| `/union lookup [player]` | Looks up your or another player's info | +| `/union profile [tag]` | Shows a union's profile | +| `/union roster [tag]` | Shows a union's roster | +| `/union locale (language)` | Sets your language | +| `/union ff (allow\|auto)` | Toggles personal friendly fire | +| `/union toggle invite` | Toggles whether you receive union invites | +| `/union resetkdr` | Resets your KDR | -\\* The target union +## Member Commands -## Members Commands +Unions are flat. Every member may run every union command, apart from the +three that need a vote of the membership. -### General Commands +### General -| Command | Description | Verified only | -| :--- | :--- | :--- | -| `/union kills [player]` | Shows your or another player's kill counts | Yes | -| `/union toggle` | Toggles personal settings | Yes | -| `/union mostkilled` | Shows server-wide most killed counts | Yes | -| `/union resign` | Resigns from the union | No | -| `/union fee check` | Checks if the fee is enabled and how much it costs | Yes | -| `/union vitals` | Shows your union's vitals | Yes | -| `/union stats` | Shows your union's stats | Yes | -| `/union profile` | Shows your union's profile | Yes | -| `/union roster` | Shows your union's roster | Yes | -| `/union coords` | Shows your union's coords | Yes | +| Command | Description | +| :--- | :--- | +| `/union kills [player]` | Shows your or another player's kill counts | +| `/union mostkilled` | Shows server-wide most killed counts | +| `/union resign` | Resigns from the union | +| `/union vitals` | Shows your union's vitals | +| `/union stats` | Shows your union's stats | +| `/union coords` | Shows your union's coords | +| `/union bb` | Shows your union's bulletin board | +| `/union bb add (message)` | Posts to the bulletin board | +| `/union bb clear` | Clears the bulletin board | +| `/union toggle bb` | Toggles the bulletin board on login | +| `/union toggle tag` | Hides or shows your union tag | -### Chat Commands +### Running the union -| Command | Description | Verified only | | | -| :--- | :--- | :--- | :--- | :--- | -| `/. (message)` | Sends a message to your union's chat | No | | | -| \`/. \[join | leave | mute\]\` | Joins/leaves/mutes your union's chat | No | -| `/ally (message)` | Sends a message to the ally chat | No | | | -| \`/ally \[join | leave | mute\]\` | Joins/leaves/mutes the ally chat | No | +| Command | Description | +| :--- | :--- | +| `/union rename (name)` | Renames the union | +| `/union description (description)` | Sets the union's description | +| `/union color (color)` | Sets the union's color | +| `/union setbanner` | Sets the union's banner | +| `/union invite (player)` | Invites a player | +| `/union kick (player)` | Kicks a member | +| `/union unionff (allow\|block)` | Toggles union-wide friendly fire | +| `/union home` | Teleports to the union's home | +| `/union home clear` | Clears the union's home | +| `/union regroup me` | Regroups members to your location | +| `/union regroup home` | Regroups members to the union's home | +| `/union ally (add\|remove) (tag)` | Adds or removes an ally | +| `/union rival (add\|remove) (tag)` | Adds or removes a rival | +| `/union war end (tag)` | Proposes ending a war | +| `/union discord create` | Creates a Discord channel for the union | +| `/union land ...` | Manages permissions inside your claimed land | -## Leaders Commands +### Needs a vote -| Command | Description | Verified only | | -| :--- | :--- | :--- | :--- | -| `/union description (description)` | Modifies the union's description | Yes | | -| `/union invite (player)` | Invites a player | No | | -| `/union kick (player)` | Kicks a player from the union | No | | -| `/union trust (player)` | Sets a member as trusted | No | | -| `/union untrust (player)` | Sets a member as untrusted | No | | -| `/union promote (member)` | Promotes a member to leader | No | | -| `/union demote (leader)` | Demotes a leader to member | No | | -| `/union setbanner` | Sets the union's banner | Yes | | -| `/union color (color)` | Sets your union's color | | | -| \`/union clanff \(allow | block\)\` | Toggles union's friendly fire | No | -| \`/union war \(start | end\) \(tag\)\` | Starts or ends a war | Yes | -| \`/union rival \(add | remove\) \(tag\)\` | Adds or removes a rival | Yes | -| \`/union ally \(add | remove\) \(tag\)\` | Adds or removes an ally | Yes | -| `/union verify` | Verifies your union | No | | -| `/union disband` | Disbands your union | No | | -| `/union fee set (amount)` | Sets the union's member fee | No | | -| `/union regroup me` | Regroups your union members to your location | Yes | | -| `/union regroup home` | Regroups your union members to your union's home | Yes | | -| `/union home` | Teleports to your union's home | Yes | | -| `/union home clear` | Clears your union's home | Yes | | -| `/union home set` | Sets your union's home | Yes | | -| `/union rank create` | Creates a rank | Yes | | -| `/union rank setdisplayname (rank) (displayname)` | Sets the display name of the rank \(it can contain colors and multiple words\) | Yes | | -| `/union rank assign (player) (rank)` | Assigns a user to a rank | Yes | | -| `/union rank unassign (player)` | Unassigns a user from a rank | Yes | | -| `/union rank delete (rank)` | Deletes a rank | Yes | | -| `/union rank list` | Lists the union's ranks | Yes | | -| `/union rank permissions` | Lists the available permissions for ranks | Yes | | -| `/union rank permissions (rank)` | Lists the rank's permissions | Yes | | -| `/union rank permissions add (rank) (permission)` | Adds a permission to the rank | Yes | | -| `/union rank permissions remove (rank) (permission)` | Removes a permission from the rank | Yes | | +These open a proposal instead of taking effect immediately. See +[Proposals and Voting](proposals-and-voting.md). + +| Command | Description | +| :--- | :--- | +| `/union disband` | Proposes disbanding the union | +| `/union home set` | Proposes moving the union's home | +| `/union war start (tag)` | Proposes declaring war on a rival | +| `/union vote` | Shows the open proposal and its tally | +| `/union vote (yes\|no)` | Casts your vote | + +### Chat + +| Command | Description | +| :--- | :--- | +| `/u (message)` | Sends a message to your union's chat | +| `/u [join\|leave\|mute]` | Joins, leaves or mutes your union's chat | +| `/ally (message)` | Sends a message to the ally chat | +| `/ally [join\|leave\|mute]` | Joins, leaves or mutes the ally chat | + +### Bank + +> Union bank accounts are under development and these commands are currently +> disabled. When they are enabled, disbanding a union splits its balance +> evenly between all members. + +| Command | Description | +| :--- | :--- | +| `/union bank status` | Shows the union's balance | +| `/union bank deposit (amount\|all)` | Deposits into the union bank | +| `/union bank withdraw (amount\|all)` | Withdraws from the union bank | ## Mod Commands -| Command | Description | | -| :--- | :--- | :--- | -| `/union place (player) (new union)` | Places a player in a union | | -| `/union home set (tag)` | Sets a union's home | | -| `/union home tp (tag)` | Teleports to a union's home | | -| `/union ban (player)` | Bans a player from union commands | | -| `/union unban (player)` | Unbans a player from union commands | | -| \`/union globalff \(allow | auto\)\` | Toggles the global friendly-fire status | -| `/union verify (tag)` | Verifies a union | | -| `/union disband (tag)` | Disbands a union | | +| Command | Description | +| :--- | :--- | +| `/union mod place (player) (union)` | Places a player in a union | +| `/union mod rename (union) (name)` | Renames a union | +| `/union mod kick (player)` | Kicks a player from their union | +| `/union mod disband (union)` | Disbands a union, bypassing the vote | +| `/union mod home set (tag)` | Sets a union's home | +| `/union mod home tp (tag)` | Teleports to a union's home | +| `/union mod ban (player)` | Bans a player from union commands | +| `/union mod unban (player)` | Unbans a player from union commands | +| `/union mod globalff (allow\|auto)` | Toggles the global friendly-fire status | +| `/union mod modtag (union) (tag)` | Changes a union's tag | +| `/union mod locale (player) (language)` | Sets a player's language | +| `/union mod bb display (union)` | Shows a union's bulletin board | +| `/union mod bb add (union) (message)` | Posts to a union's bulletin board | +| `/union mod bb clear (union)` | Clears a union's bulletin board | ## Admin Commands | Command | Description | | :--- | :--- | -| `/union reload` | Reloads the plugin and its configuration \(some features may need a server restart\) | -| `/union purge` | Purges a player's data | -| `/union resetkdr everyone` | Resets everyone's KDR | -| `/union resetkdr (player)` | Resets a player's KDR | -| `/union admin demote (player)` | Demotes a leader from any union | -| `/union admin promote (player)` | Promotes a member from any union | +| `/union admin reload` | Reloads the plugin and its configuration \(some features may need a server restart\) | +| `/union admin purge (player)` | Purges a player's data | +| `/union admin permanent (union)` | Toggles a union's permanent status | +| `/union admin resetkdr (player)` | Resets a player's KDR | +| `/union admin resetkdr everyone` | Resets everyone's KDR | +| `/union admin bank status (union)` | Shows a union's balance | +| `/union admin bank give (union) (amount)` | Gives money to a union | +| `/union admin bank take (union) (amount)` | Takes money from a union | +| `/union admin bank set (union) (amount)` | Sets a union's balance | + +## Removed commands + +These upstream SimpleClans commands do not exist in Unions-OG. + +| Command | Reason | +| :--- | :--- | +| `/clan promote`, `/clan demote` | Unions have no leaders | +| `/clan admin promote`, `/clan admin demote` | Unions have no leaders | +| `/clan rank ...` | Ranks were removed | +| `/clan trust`, `/clan untrust` | Trust levels were removed | +| `/clan verify`, `/clan mod verify` | Unions are always treated as verified | +| `/clan fee ...` | Member fees were removed | diff --git a/wiki/commands-and-permissions/permissions.md b/wiki/commands-and-permissions/permissions.md index 10ae01cb..1d920c64 100644 --- a/wiki/commands-and-permissions/permissions.md +++ b/wiki/commands-and-permissions/permissions.md @@ -4,134 +4,147 @@ description: null # Permissions -## SuperPerms Nodes \(Some auto added\) +All Unions-OG permissions live under `unionsog.*`. -These super permission nodes are a quick way to setup SimpleClans, some are automatically given \(See Auto Added\). If you wish to setup individual permissions to groups you will need to deny these auto added super permission nodes and setup permissions one by one after. +> [!IMPORTANT] +> Unions are flat. There is no `unionsog.leader.*` tree, and no rank, +> promotion or demotion nodes. Everything a member can do inside their union +> lives under `unionsog.member.*`. + +## Node groups \(some auto added\) + +These group nodes are the quick way to set Unions-OG up. If you want to grant +permissions individually, deny the group node and add the individual nodes +instead. + +| Permission | Default | Description | +| :--- | :--- | :--- | +| `unionsog.anyone.*` | everyone | Permissions for anyone | +| `unionsog.member.*` | everyone | Permissions for those who can be union members | +| `unionsog.member.land.*` | off | Permissions for allowing/blocking actions in claimed land | +| `unionsog.mod.*` | operators | Permissions for moderators | +| `unionsog.admin.*` | operators | Permissions for admins | + +## Individual nodes + +You do not need to add these if you already granted the group nodes above. +They are listed so you can toggle individual permissions off. + +### Anyone nodes | Permission | Description | | :--- | :--- | -| `simpleclans.anyone.*` \(Auto added\) | Permissions for anyone | -| `simpleclans.member.*` \(Auto added\) | Permissions for those who can be clan members | -| `simpleclans.leader.*` \(Auto added\) | Permissions for those who can be clan leaders | -| `simpleclans.mod.*` \(Auto added to OPS\) | Permissions for moderators | -| `simpleclans.admin.*` \(Auto added to OPS\) | Permissions for admins | +| `unionsog.anyone.alliances` | Can view alliances by union | +| `unionsog.anyone.invite-toggle` | Can toggle union invites on/off | +| `unionsog.anyone.leaderboard` | Can view the leaderboard | +| `unionsog.anyone.list` | Can list unions | +| `unionsog.anyone.list.balance` | Can list unions by balance | +| `unionsog.anyone.locale` | Can set their language | +| `unionsog.anyone.lookup` | Can look up a player's info | +| `unionsog.anyone.profile` | Can view a union's profile | +| `unionsog.anyone.rivalries` | Can view rivalries by union | +| `unionsog.anyone.roster` | Can view a union's member list | -## Individual Nodes - -\(You don't need to add these as they are all included if you've already added the node groups \(above\). They are only included here as reference in case you want to toggle a couple of them off individually. Then you can just drop those in, set to false, along with the node groups.\) - -### Anyone Nodes +### Member nodes | Permission | Description | | :--- | :--- | -| `simpleclans.anyone.alliances` | Can view alliances by clan | -| `simpleclans.anyone.leaderboard` | Can view the leaderboard | -| `simpleclans.anyone.list` | Can list simpleclans | -| `simpleclans.anyone.lookup` | Can lookup a player's info | -| `simpleclans.anyone.profile` | Can view a clan's profile | -| `simpleclans.anyone.rivalries` | Can view rivalries by clan | -| `simpleclans.anyone.roster` | Can view a clan's member list | +| `unionsog.member.can-join` | Can join unions | +| `unionsog.member.create` | Can create unions | +| `unionsog.member.resign` | Can resign from their union | +| `unionsog.member.rename` | Can rename their union | +| `unionsog.member.description` | Can modify their union's description | +| `unionsog.member.color` | Can set their union's color | +| `unionsog.member.modtag` | Can modify their union's tag | +| `unionsog.member.coloredtag` | Can use color codes in tags | +| `unionsog.member.setbanner` | Can set their union's banner | +| `unionsog.member.invite` | Can invite players into their union | +| `unionsog.member.kick` | Can kick members from their union | +| `unionsog.member.ally-set` | Can add and remove their union's allies | +| `unionsog.member.rival` | Can start and end a rivalry with another union | +| `unionsog.member.union-ff` | Can toggle their union's friendly fire | +| `unionsog.member.ff` | Can toggle their own friendly fire | +| `unionsog.member.home` | Can teleport to the home base | +| `unionsog.member.home-set` | Can propose moving the home base, and clear it | +| `unionsog.member.regroup.home` | Can regroup the union to the home base | +| `unionsog.member.regroup.me` | Can regroup the union to themself | +| `unionsog.member.discord.create` | Can create a Discord channel for their union | +| `unionsog.member.land` | Can use land commands | +| `unionsog.member.bank` | Can use union banks | +| `unionsog.member.bb` | Can view their union's bulletin board | +| `unionsog.member.bb-add` | Can post to the bulletin board | +| `unionsog.member.bb-clear` | Can clear the bulletin board | +| `unionsog.member.bb-toggle` | Can toggle the bulletin board on login | +| `unionsog.member.chat` | Can use union chat | +| `unionsog.member.chat.color` | Can use colors in chat | +| `unionsog.member.chat.format` | Can use formats in chat \(off by default\) | +| `unionsog.member.ally` | Can use ally chat | +| `unionsog.member.coords` | Can view their union's coords | +| `unionsog.member.kills` | Can view their and others' kills | +| `unionsog.member.lookup` | Can view their own player info | +| `unionsog.member.profile` | Can view their own union's profile | +| `unionsog.member.roster` | Can view their own union's member list | +| `unionsog.member.stats` | Can view their union's stats | +| `unionsog.member.vitals` | Can view their union's vitals | +| `unionsog.member.tag-toggle` | Can hide their own union tag | -### Member Nodes +#### Voting nodes + +See [Proposals and Voting](proposals-and-voting.md). | Permission | Description | | :--- | :--- | -| `simpleclans.member.abstain` | Can abstain | -| `simpleclans.member.accept` | Can accept | -| `simpleclans.member.ally` | Can use ally chat | -| `simpleclans.member.chat` | Can use clan chat | -| `simpleclans.member.bank` | Can use the clan bank | -| `simpleclans.member.bb-add` | Can add to his clan's bulletin board | -| `simpleclans.member.bb-toggle` | Can toggle the bulletin board on/off | -| `simpleclans.member.bb` | Can view his clan's bulletin board | -| `simpleclans.member.can-join` | Can join clans | -| `simpleclans.member.coords` | Can view his clan's coords | -| `simpleclans.member.deny` | Can deny | -| `simpleclans.member.ff` | Can toggle his own friendly fire | -| `simpleclans.member.home` | Can tp to home base | -| `simpleclans.member.kills` | Can view his and other's kills | -| `simpleclans.member.lookup` | Can view his own player info | -| `simpleclans.member.profile` | Can view his own clan's profile | -| `simpleclans.member.resign` | Can resign from his clan | -| `simpleclans.member.roster` | Can view his own clan's member list | -| `simpleclans.member.stats` | Can view his clan stats | -| `simpleclans.member.vitals` | Can view his clan's vitals | -| `simpleclans.member.toggle.bb` | Can toggle bb on/off | -| `simpleclans.member.tag-toggle` | Can hide/show their clan tag | -| `simpleclans.member.fee-check` | Allows the member to check how much is the fee and if it's enabled | -| `simpleclans.member.bypass-fee` | Can bypass the member fee | +| `unionsog.member.vote` | Can vote on their union's proposals | +| `unionsog.member.disband` | Can propose disbanding their union | +| `unionsog.member.war` | Can propose a war and answer war requests | -### Leader Nodes +### Mod nodes | Permission | Description | | :--- | :--- | -| `simpleclans.leader.fee` | allows the user to toggle the fee and set its value | -| `simpleclans.leader.ally` | Can ally his clan with other clans | -| `simpleclans.leader.create` | Can create clans | -| `simpleclans.leader.verify` | Can verify their clan | -| `simpleclans.leader.demote` | Can demote clan leaders to normal players | -| `simpleclans.leader.disband` | Can disband his own clan | -| `simpleclans.leader.ff` | Can toggle his clan's friendly fire | -| `simpleclans.leader.home-set` | Can set home base | -| `simpleclans.leader.regroup.me` | Can teleport the entire clan to themself | -| `simpleclans.leader.regroup.home` | Can teleport the entire clan to homebase | -| `simpleclans.leader.invite` | Can invite players into his clan | -| `simpleclans.leader.kick` | Can kick players form his clan | -| `simpleclans.leader.color` | Can set his clan's color | -| `simpleclans.leader.description` | Can modify their clan's description | -| `simpleclans.leader.coloredrank` | Can use color codes in rank display names | -| `simpleclans.leader.promotable` | Can be promoted to clan leader | -| `simpleclans.leader.promote` | Can promote players to clan leaders | -| `simpleclans.leader.rank.assign` | Can assign a rank to a user | -| `simpleclans.leader.rank.unassign` | Can unassign a player from a rank | -| `simpleclans.leader.rank.create` | Can create a new rank | -| `simpleclans.leader.rank.delete` | Can delete a new rank | -| `simpleclans.leader.rank.list` | Can list all the ranks | -| `simpleclans.leader.rank.setdisplayname` | Can set the display name of the rank | -| `simpleclans.leader.rank.permissions.add` | Can add permissions to a rank | -| `simpleclans.leader.rank.permissions.available` | Can list all available permissions | -| `simpleclans.leader.rank.permissions.list` | Can list the rank's permissions | -| `simpleclans.leader.rank.permissions.remove` | Can remove permissions from a rank | -| `simpleclans.leader.rival` | Can start a rivalry with another clan | -| `simpleclans.leader.settrust` | Can set trust levels for members | -| `simpleclans.leader.war` | Can start wars | -| `simpleclans.leader.setbanner` | Can set his clan's banner | -| `simpleclans.leader.withdraw-toggle:` | Can toggle clan bank withdraw | -| `simpleclans.leader.deposit-toggle:` | Can toggle clan bank deposit | -| `simpleclans.leader.bb-clear` | Clan clear their clan's bb | +| `unionsog.mod.ban` | Can ban and unban players from the entire plugin | +| `unionsog.mod.bypass` | Can bypass restrictions | +| `unionsog.mod.disband` | Can disband any union, bypassing the vote | +| `unionsog.mod.kick` | Can kick any player | +| `unionsog.mod.rename` | Can rename any union | +| `unionsog.mod.modtag` | Can change any union's tag | +| `unionsog.mod.globalff` | Can turn off global friendly fire protection | +| `unionsog.mod.home` | Can set any union's home | +| `unionsog.mod.hometp` | Can teleport to any union's home | +| `unionsog.mod.keep-items` | Can keep items when teleporting home | +| `unionsog.mod.mostkilled` | Can view most killed counts | +| `unionsog.mod.nopvpinwar` | Can bypass PvP in wars | +| `unionsog.mod.place` | Can manually place players in unions | +| `unionsog.mod.locale` | Can set players' language | +| `unionsog.mod.staffgui` | Can open the staff GUI | +| `unionsog.mod.bb` | Can view any union's bulletin board | +| `unionsog.mod.bb-add` | Can post to any union's bulletin board | +| `unionsog.mod.bb-clear` | Can clear any union's bulletin board | -### Mod Nodes +### Admin nodes | Permission | Description | | :--- | :--- | -| `simpleclans.mod.ban` | Can ban players from the entire plugin | -| `simpleclans.mod.bypass` | Can bypass restrictions | -| `simpleclans.mod.disband` | Can disband any clan | -| `simpleclans.mod.globalff` | Can turn off global friendly fire protection | -| `simpleclans.mod.home` | Can set other clan's home | -| `simpleclans.mod.hometp` | Can teleport to all clans homes | -| `simpleclans.mod.staffgui` | Can open the staff GUI | -| `simpleclans.mod.place` | Can manually place players in clans | -| `simpleclans.mod.keep-items` | Can keep items when teleporting home | -| `simpleclans.mod.mostkilled` | Can view his and other's clans mostkilled | -| `simpleclans.mod.nopvpinwar` | Can bypass PvP in wars | -| `simpleclans.mod.unban` | Can unban players from the entire plugin | -| `simpleclans.mod.verify` | Can verify clans | +| `unionsog.admin.reload` | Can reload the configuration | +| `unionsog.admin.purge` | Can purge a player | +| `unionsog.admin.permanent` | Can toggle a union's permanent status | +| `unionsog.admin.resetkdr` | Can reset a player's or everyone's KDR | +| `unionsog.admin.all-seeing-eye` | Can see all union chats | +| `unionsog.admin.bank.status` | Can check a union's balance | +| `unionsog.admin.bank.give` | Can give money to a union | +| `unionsog.admin.bank.take` | Can take money from a union | +| `unionsog.admin.bank.set` | Can set a union's balance | -### Admin Nodes +### Other nodes | Permission | Description | | :--- | :--- | -| `simpleclans.admin.resetkdr` | Can reset a player's or everyone's KDR | -| `simpleclans.admin.purge` | Can purge a player | -| `simpleclans.admin.demote` | Can demote a player back to member | -| `simpleclans.admin.promote` | Can promote players to clan leaders | -| `simpleclans.admin.all-seeing-eye` | Can see all clan chats | -| `simpleclans.admin.reload` | Can reload configuration | +| `unionsog.other.kdr-exempt` | The player's KDR is not affected on killing/dying \(see Known Issues\). Off by default | +| `unionsog.vip.resetkdr` | Can reset their own KDR | +| `unionsog.vip.teleport-delay` | Bypasses the teleport delay | -### Other Nodes +## Removed nodes -| Permission | Node | -| :--- | :--- | -| `simpleclans.other.kdr-exempt` | The player's KDR is not affected on killing/dying \(check Known Issues\) | -| `simpleclans.vip.resetkdr` | Can reset their KDR | +The upstream nodes for leaders, ranks, trust, verification and member fees no +longer exist. If your permission plugin still grants `simpleclans.*` or +`unionsog.leader.*` nodes, they are inert and can be deleted. diff --git a/wiki/commands-and-permissions/proposals-and-voting.md b/wiki/commands-and-permissions/proposals-and-voting.md new file mode 100644 index 00000000..8c3f0fbe --- /dev/null +++ b/wiki/commands-and-permissions/proposals-and-voting.md @@ -0,0 +1,69 @@ +--- +description: How unions decide things that need the whole membership to agree. +--- + +# Proposals and Voting + +Unions in Unions-OG are flat: there are no leaders and no ranks, so nobody can +make a decision on the union's behalf. Three actions are important enough that +they need the membership's consent instead, and those open a **proposal**. + +| Action | Command that opens the proposal | +| :--- | :--- | +| Disbanding the union | `/union disband` | +| Moving the union's home | `/union home set` | +| Declaring war on a rival | `/union war start (tag)` | + +Everything else a union can do is available to any member immediately. + +## How a proposal is decided + +- The member who opens a proposal automatically votes in favour. +- A proposal **passes** as soon as half the union's members, rounded up, have + voted yes. In a five-member union that is three votes; in a six-member union + it is also three. +- A proposal is **rejected** as soon as so many members have voted no that the + yes threshold can no longer be reached. There is no need to wait for the + remaining votes. +- A proposal **expires** after 7 days if neither side reaches its threshold. +- A union can only have one proposal open at a time. The next one cannot be + opened until the current one finishes. +- Members who leave the union have their votes discarded, so nobody can hold a + proposal open by resigning. + +Because a passing proposal takes effect immediately, a single-member union +disbands as soon as that member confirms. + +## Voting + +Votes are stored in the database, so members do **not** have to be online when +a proposal opens. A member who is away can vote the next time they log in, and +the proposal waits for them until it expires. + +| Command | Description | +| :--- | :--- | +| `/union vote` | Shows the open proposal, what it would do, and the running tally | +| `/union vote yes` | Votes in favour | +| `/union vote no` | Votes against | + +Members can also vote from the GUI. Open `/union`, click the **Union vote** +book, and choose the green or red wool. The vote screen is presented once +automatically when a member logs in with a proposal they have not voted on +yet; it is not shown again on later logins, so the GUI button or the command +is how to come back to it. + +## Permissions + +| Permission | Description | +| :--- | :--- | +| `unionsog.member.vote` | Can vote on the union's proposals | +| `unionsog.member.disband` | Can propose disbanding the union | +| `unionsog.member.home-set` | Can propose moving the union's home | +| `unionsog.member.war` | Can propose a war and answer war requests | + +All four are granted by default through `unionsog.member.*`. + +## Staff override + +`/union mod disband (union)` disbands a union immediately, without a vote, for +anyone holding `unionsog.mod.disband`. diff --git a/wiki/commands-and-permissions/ranks-with-permissions.md b/wiki/commands-and-permissions/ranks-with-permissions.md deleted file mode 100644 index 75e81f33..00000000 --- a/wiki/commands-and-permissions/ranks-with-permissions.md +++ /dev/null @@ -1,83 +0,0 @@ ---- -description: null ---- - -# Ranks with Permissions - -## How does it work? - -Leaders have the ability to create ranks and give them permissions to perform several actions inside the clan. Unlike `/clan trust`, ranks with permissions allows leaders to have a finer control of who can do what. Ex.: A rank can handle invites \(`invite` permission\), another takes care of moderation \(`kick` permission\), etc - -## Suggested ranks - -| Ranks | Description | Permission | -| :--- | :--- | :---: | -| **Coleader** | Helps take care of the clan | `all` | -| **Treasurer** | Manages the clan's bank account | `bank.balance`, `bank.deposit`, `bank.withdraw` | -| **Ambassador** | Manages the clan's relations with other clans | `ally.chat`, `ally.add`, `ally.remove`, `rival.add`, `rival.remove`, `war.end`, `war.start` | -| **Recruit** | A member in trial | `stats`, `kills`, `mostkilled`, `rank.list` | - -## Ranks Commands - -| Command | Description | -| :--- | :--- | -| `/clan rank create` | Creates a rank with this name | -| `/clan rank setdisplayname [rank] [displayname]` | Sets the display name of the rank \(it can be more than one word and colored\) | -| `/clan rank assign (player) (rank)` | Assigns a user to a rank | -| `/clan rank unassign (player)` | Unassigns a user from a rank | -| `/clan rank delete (rank)` | Deletes a rank | -| `/clan rank list` | Lists the clan's ranks | -| `/clan rank permissions` | Lists the available permissions for ranks | -| `/clan rank permissions (rank)` | Lists the rank's permissions | -| `/clan rank permissions add (rank) (permission)` | Adds a permission to the rank | -| `/clan rank permissions remove (rank) (permission)` | Removes a permission from the rank | - -## Available permissions for ranks - -A player can view those permissions in-game using `/clan rank permissions` - -| Rank Permission | Description | -| :--- | :--- | -| `ally.add` | can add an ally | -| `ally.remove` | can remove an ally | -| `ally.chat` | can use ally chat | -| `bank.balance` | can view the bank balance | -| `bank.deposit` | can deposit money | -| `bank.withdraw` | can withdraw money | -| `bb.add` | can add a message to bb | -| `bb.clear` | can clear the bb | -| `coords` | can view the clan's coords | -| `fee.enable` | can enable the member fee | -| `fee.set` | can change the fee value | -| `home.regroup` | can regroup the clan | -| `home.set` | can set the clan home | -| `home.tp` | can tp to the clan home | -| `invite` | can invite someone to the clan | -| `kick` | can kick someone from the clan | -| `color` | can change the clan color | -| `rank.displayname` | can modify a rank's display name | -| `rank.list` | can list the ranks | -| `rival.add` | can add a rival | -| `rival.remove` | can remove a rival | -| `war.end` | can end a war | -| `war.start` | can start a war | -| `vitals` | can view the clan's vitals | -| `stats` | can view the clan's stats | -| `kills` | can view his or other's kills | -| `mostkilled` | can view the mostkilled | -| `description` | can change the clan's description | - -## Permissions to use the rank commands - -| Permission | Description | -| :--- | :--- | -| `simpleclans.leader.rank.assign` | Can assign a rank to a user | -| `simpleclans.leader.rank.unassign` | Can unassign a player from a rank | -| `simpleclans.leader.rank.create` | Can create a new rank | -| `simpleclans.leader.rank.delete` | Can delete a new rank | -| `simpleclans.leader.rank.list` | Can list all the ranks | -| `simpleclans.leader.rank.setdisplayname` | Can set the display name of the rank | -| `simpleclans.leader.rank.permissions.add` | Can add permissions to a rank | -| `simpleclans.leader.rank.permissions.available` | Can list all available permissions | -| `simpleclans.leader.rank.permissions.list` | Can list the rank's permissions | -| `simpleclans.leader.rank.permissions.remove` | Can remove permissions from a rank | diff --git a/wiki/how-to-setup/clan-upkeep.md b/wiki/how-to-setup/clan-upkeep.md deleted file mode 100644 index 96aeb9ec..00000000 --- a/wiki/how-to-setup/clan-upkeep.md +++ /dev/null @@ -1,35 +0,0 @@ ---- -description: null ---- - -# Clan Upkeep - -## How does it work? - -If enabled, clans will have to pay an amount everyday to keep their clans. The value will be collected at `1:30am`. At `12am`, if the clan doesn't have enough money to pay it, a wan will be sent to the clan's BB. The amount can be fixed or based on the clan size. - -Ex. fee based on the clan size: - -```text -upkeep base = 20.0 -clan size = 10 -final upkeep = 200.0 -``` - -## Configuring - -* `upkeep` - The base upkeep. -* `upkeep-enabled` - Enable or disable the feature. -* `multiply-upkeep-by-clan-size` - This works as explained above -* `charge-upkeep-only-if-member-fee-enabled` - Enable upkeep if [member fee](https://github.com/RoinujNosde/SimpleClans/wiki/Member-Fee) is enabled. - -### Exemple - -```yaml -economy: - upkeep: 200.0 - upkeep-enabled: false - multiply-upkeep-by-clan-size: false - charge-upkeep-only-if-member-fee-enabled: true -``` - diff --git a/wiki/how-to-setup/configuration.md b/wiki/how-to-setup/configuration.md index 3c01e75f..a8af3cd8 100644 --- a/wiki/how-to-setup/configuration.md +++ b/wiki/how-to-setup/configuration.md @@ -4,43 +4,91 @@ description: null # Configuration -[The main configuration file for SimpleClans can be found here.](https://github.com/RoinujNosde/SimpleClans/blob/master/src/main/resources/config.yml) +This page lists every option in `config.yml` as the plugin ships it. Each +section shows the option names followed by the shipped defaults. + +> [!NOTE] +> Options for ranks, promotion, demotion, leaders, member fees and upkeep no +> longer exist. If you are upgrading from SimpleClans or an older Unions-OG, +> those keys are ignored and can be deleted. + +## Safe Civilians + +* `safe-civilians` + +### Example + +```yaml +safe-civilians: false +``` + +## Tags Format + +* `default-color` +* `max-length` +* `min-length` +* `bracket` + * `color` + * `left` + * `right` +* `separator` + * `color` + * `char` + +### Example + +```yaml +tag: + default-color: '8' + max-length: 5 + min-length: 2 + bracket: + color: '8' + left: '' + right: '' + separator: + color: '8' + char: ' .' +``` ## General Settings -* `enable-gui` - Enables the GUI. -* `disable-messages` - This will disable broadcasts from the plugin such as "Clan created", "Clan disbanded", etc. -* `tameable-mobs-sharing` - -* `teleport-blocks` - -* `teleport-home-on-spawn` - Players will be teleported to their clan's home when they respawn. -* `drop-items-on-clan-home` - -* `keep-items-on-clan-home` - -* `item-list` - -* `show-debug-info` - -* `mchat-integration` - -* `enable-auto-groups` - -* `chat-compatibility-mode` - -* `rival-limit-percent` - -* `use-colorcode-from-prefix-for-name` - -* `display-chat-tags` - -* `unrivable-clans` - -* `show-unverified-on-list` - -* `blacklisted-worlds` - -* `banned-players` - -* `disallowed-tags` - -* `language` - -* `language-per-player` - -* `disallowed-tag-colors` - -* `server-name` - -* `new-clan-verification-required` - -* `allow-regroup-command` - -* `allow-reset-kdr` - -* `rejoin-cooldown` - -* `rejoin-cooldown-enabled` - -* `min-to-verify` - The clan must have this amount of members to get verified \(moderators can bypass this\) -* `ranking-type` - Valid options: ORDINAL and DENSE - * `DENSE`: if players have the same KDR, they will have the same rank position. Ex.: 12234 - * `ORDINAL`: Every player will have a different rank position. Ex.: 12345 +* `enable-gui` +* `disable-messages` +* `tameable-mobs-sharing` +* `teleport-blocks` +* `teleport-home-on-spawn` +* `drop-items-on-union-home` +* `keep-items-on-union-home` +* `item-list` +* `show-debug-info` +* `enable-auto-groups` +* `chat-compatibility-mode` +* `rival-limit-percent` +* `use-colorcode-from-prefix-for-name` +* `accept-other-alphabets-letters-on-tag` +* `display-chat-tags` +* `global-friendly-fire` +* `unrivable-unions` +* `blacklisted-worlds` +* `banned-players` +* `disallowed-tags` +* `language` +* `user-language-selector` +* `disallowed-tag-colors` +* `server-name` +* `allow-regroup-command` +* `allow-reset-kdr` +* `rejoin-cooldown` +* `rejoin-cooldown-enabled` +* `ranking-type` +* `list-default-order-by` +* `lore-length` +* `past-unions-limit` +* `username-regex` +* `tag-regex` +* `date-time-pattern` +* `bungee-servers` ### Example @@ -51,104 +99,111 @@ settings: tameable-mobs-sharing: false teleport-blocks: false teleport-home-on-spawn: false - drop-items-on-clan-home: false - keep-items-on-clan-home: false + drop-items-on-union-home: false + keep-items-on-union-home: false item-list: [] show-debug-info: false - mchat-integration: true enable-auto-groups: false chat-compatibility-mode: true rival-limit-percent: 50 use-colorcode-from-prefix-for-name: true + accept-other-alphabets-letters-on-tag: false display-chat-tags: true - unrivable-clans: + global-friendly-fire: false + unrivable-unions: - admin - staff - mod - show-unverified-on-list: false blacklisted-worlds: [] banned-players: [] disallowed-tags: - vip - - clan + - union language: en - language-per-player: false + user-language-selector: true disallowed-tag-colors: - '4' - server-name: '&4SimpleClans' - new-clan-verification-required: false + - 'k' + server-name: '&4Unions-OG' allow-regroup-command: true allow-reset-kdr: false rejoin-cooldown: 60 rejoin-cooldown-enabled: false - min-to-verify: 1 - ranking-type: DENSE + ranking-type: "DENSE" + list-default-order-by: size + lore-length: 36 + past-unions-limit: 10 + username-regex: '(\.|\*){0,1}[a-zA-Z0-9_$]{1,16}' + tag-regex: '' + date-time-pattern: 'HH:mm - dd/MM/yyyy' + bungee-servers: [] ``` -## Tags Format +## War and Protection -### Example - -* `default-color` - -* `max-length` - -* `bracket` - - * `color` - - * `leader-color` - - * `left` - - * `right` - -* `min-length` - -* `separator` - - * `color` - - * `leader-color` - - * `char` - - -```yaml -tag: - default-color: '8' - max-length: 5 - bracket: - color: '8' - leader-color: '4' - left: '' - right: '' - min-length: 2 - separator: - color: '8' - leader-color: '4' - char: ' .' -``` - -## General Commands - -* `more` - -* `ally` - -* `clan` - -* `accept` - -* `deny` - -* `global` - -* `clan_chat` - -* `force-priority` - +* `war-enabled` +* `land-sharing` +* `protection-providers` +* `listeners` + * `priority` + * `ignored-list` + * `PLACE` + * `BREAK` +* `set-base-only-in-land` +* `war-normal-expiration-time` +* `war-disconnect-expiration-time` +* `edit-all-lands` +* `land-creation` + * `only-one-per-union` +* `war-actions` + * `CONTAINER` + * `INTERACT` + * `BREAK` + * `PLACE` + * `DAMAGE` + * `INTERACT_ENTITY` +* `war-start` + * `members-online-max-difference` ### Example ```yaml -commands: - more: more - ally: ally - clan: clan - accept: accept - deny: deny - global: global - clan_chat: "." - force-priority: true +war-and-protection: + war-enabled: false + land-sharing: true + protection-providers: + - WorldGuardProvider + - GriefPreventionProvider + listeners: + priority: HIGHEST + ignored-list: + PLACE: + - "PLAYER_HEAD" + BREAK: + - "EMERALD_BLOCK" + set-base-only-in-land: false + war-normal-expiration-time: 0 + war-disconnect-expiration-time: 0 + edit-all-lands: false + land-creation: + only-one-per-union: false + war-actions: + CONTAINER: true + INTERACT: true + BREAK: true + PLACE: true + DAMAGE: true + INTERACT_ENTITY: true + war-start: + members-online-max-difference: 5 ``` ## KDR Grinding Prevention -* `enable-max-kills` - -* `max-kills-per-victim` - -* `enable-kill-delay` - -* `delay-between-kills` - +* `enable-max-kills` +* `max-kills-per-victim` +* `enable-kill-delay` +* `delay-between-kills` ### Example @@ -160,70 +215,56 @@ kdr-grinding-prevention: delay-between-kills: 5 ``` -## List Commands +## General Commands -* `size` - -* `kdr` - -* `name` - -* `founded` - -* `active` - -* `asc` - -* `desc` - -* `default` - +* `more` +* `ally` +* `union` +* `accept` +* `deny` +* `global` +* `union_chat` +* `force-priority` ### Example ```yaml -list: - size: size - kdr: kdr - name: name - founded: founded - active: active - asc: asc - desc: desc - default: kdr +commands: + more: more + ally: ally + union: union + accept: accept + deny: deny + global: global + union_chat: u + force-priority: true ``` ## Economy -* `creation-price` - -* `purchase-clan-create` - -* `verification-price` - -* `purchase-clan-verify` - -* `invite-price` - -* `purchase-clan-invite` - -* `home-teleport-price` - -* `purchase-home-teleport` - -* `home-teleport-set-price` - -* `purchase-home-teleport-set` - -* `home-regroup-price` - -* `purchase-home-regroup` - -* `unique-tax-on-regroup` - -* `issuer-pays-regroup` - -* `money-per-kill` - -* `money-per-kill-kdr-multipier` - -* `purchase-reset-kdr` - -* `reset-kdr-price` - -* `purchase-member-fee-set` - -* `member-fee-set-price` - -* `member-fee-enabled` - -* `max-member-fee` - -* `upkeep` - -* `upkeep-enabled` - -* `multiply-upkeep-by-clan-size` - -* `charge-upkeep-only-if-member-fee-enabled` - +* `creation-price` +* `purchase-union-create` +* `invite-price` +* `purchase-union-invite` +* `home-teleport-price` +* `purchase-home-teleport` +* `home-teleport-set-price` +* `purchase-home-teleport-set` +* `home-regroup-price` +* `purchase-home-regroup` +* `unique-tax-on-regroup` +* `issuer-pays-regroup` +* `bank-log` + * `enable` ### Example ```yaml economy: creation-price: 100.0 - purchase-clan-create: false - verification-price: 1000.0 - purchase-clan-verify: false + purchase-union-create: false invite-price: 20.0 - purchase-clan-invite: false + purchase-union-invite: false home-teleport-price: 5.0 purchase-home-teleport: false home-teleport-set-price: 5.0 @@ -232,26 +273,17 @@ economy: purchase-home-regroup: false unique-tax-on-regroup: true issuer-pays-regroup: true - money-per-kill: false - money-per-kill-kdr-multipier: 10 - purchase-reset-kdr: true - reset-kdr-price: 10000.0 - purchase-member-fee-set: false - member-fee-set-price: 1000.0 - member-fee-enabled: false - max-member-fee: 200.0 - upkeep: 200.0 - upkeep-enabled: false - multiply-upkeep-by-clan-size: false - charge-upkeep-only-if-member-fee-enabled: true + bank-log: + enable: true ``` ## Kill Weights -* `rival` - -* `civilian` - -* `neutral` - -* `deny-same-ip-kills` - +* `rival` +* `civilian` +* `neutral` +* `ally` +* `deny-same-ip-kills` ### Example @@ -260,128 +292,99 @@ kill-weights: rival: 2.0 civilian: 0.0 neutral: 1.0 + ally: -1.0 deny-same-ip-kills: false ``` -## Clan Settings +## Union Settings -* `homebase-teleport-wait-secs` - -* `homebase-can-be-set-only-once` - -* `min-size-to-set-rival` - -* `max-length` - -* `max-description-length` - -* `min-description-length` - -* `max-members` - -* `confirmation-for-promote` - -* `trust-members-by-default` - -* `confirmation-for-demote` - -* `percentage-online-to-demote` - -* `ff-on-by-default` - -* `min-length` - -* `min-size-to-set-ally` - +* `homebase-teleport-wait-secs` +* `homebase-can-be-set-only-once` +* `min-size-to-set-rival` +* `max-length` +* `max-description-length` +* `min-description-length` +* `max-members` +* `trust-members-by-default` +* `ff-on-by-default` +* `min-length` +* `max-alliances` +* `min-size-to-set-ally` ### Example ```yaml -clan: - homebase-teleport-wait-secs: 10 +union: + homebase-teleport-wait-secs: 5 homebase-can-be-set-only-once: true min-size-to-set-rival: 3 max-length: 25 max-description-length: 120 min-description-length: 10 max-members: 25 - confirmation-for-promote: false - trust-members-by-default: false - confirmation-for-demote: false - percentage-online-to-demote: 100.0 + trust-members-by-default: true ff-on-by-default: false min-length: 2 + max-alliances: -1 min-size-to-set-ally: 3 -``` -## Tasks - -* `collect-upkeep` - - * `hour` - - * `minute` - -* `collect-upkeep-warning` - - * `hour` - - * `minute` - -* `collect-fee` - - * `hour` - - * `minute` - - -### Example - -```yaml -tasks: - collect-upkeep: - hour: 1 - minute: 30 - collect-upkeep-warning: - hour: 12 - minute: 0 - collect-fee: - hour: 1 - minute: 0 ``` ## Page -* `untrusted-color` - -* `clan-name-color` - -* `subtitle-color` - -* `headings-color` - -* `trusted-color` - -* `leader-color` - -* `separator` - -* `size` - +* `untrusted-color` +* `union-name-color` +* `subtitle-color` +* `headings-color` +* `trusted-color` +* `separator` +* `size` +* `help-size` ### Example ```yaml page: untrusted-color: '8' - clan-name-color: b + union-name-color: b subtitle-color: '7' headings-color: '8' trusted-color: f - leader-color: '4' separator: '-' size: 100 + help-size: 10 ``` -## Clan Chat +## Union Chat -* `enable` - -* `tag-based-clan-chat` - -* `announcement-color` - -* `format` - -* `rank` - -* `leader-color:` - -* `trusted-color` - -* `member-color` - +* `enable` +* `tag-based-union-chat` +* `announcement-color` +* `format` +* `spy-format` +* `trusted-color` +* `member-color` +* `listener-priority` ### Example ```yaml -clanchat: +unionchat: enable: true - tag-based-clan-chat: false + tag-based-union-chat: false announcement-color: e - format: "&b[%clan%&b] &4<%nick-color%%player%&4> %rank%: &b%message%" - rank: "&f[%rank%&f]" - leader-color: '4' + format: "&b[%union%&b] &4<%nick-color%%player%&4>: &b%message%" + spy-format: "&8[Spy] [&bC&8] <%clean-tag%&8> <%nick-color%*&8%player%>&8: %message%" trusted-color: 'f' member-color: '7' + listener-priority: LOW ``` ## Request -* `message-color` - -* `ask-frequency-secs` - -* `max-asks-per-request` - +* `message-color` +* `ask-frequency-secs` +* `max-asks-per-request` ### Example @@ -394,83 +397,116 @@ request: ## Bulletin Board -* `color` - -* `accent-color` - -* `show-on-login` - -* `size` - -* `login-size` - +* `prefix` +* `show-on-login` +* `size` +* `login-size` ### Example ```yaml bb: - color: e - accent-color: '8' - show-on-login: true + prefix: "&8* &e" + show-on-login: false size: 6 login-size: 6 ``` ## Ally Chat -* `enable` - -* `format` - -* `rank` - -* `leader-color` - -* `trusted-color` - -* `member-color` - +* `enable` +* `format` +* `spy-format` +* `trusted-color` +* `member-color` ### Example ```yaml allychat: enable: true - format: "&b[Ally Chat] &4<%clan%&4> <%nick-color%%player%&4> %rank%: &b%message%" - rank: "&f[%rank%&f]" - leader-color: '4' + format: "&b[Ally Chat] &4<%union%&4> <%nick-color%%player%&4>: &b%message%" + spy-format: "&8[Spy] [&cA&8] <%clean-tag%&8> <%nick-color%*&8%player%>&8: %message%" trusted-color: 'f' member-color: '7' ``` +## Discord Chat + +* `enable` +* `auto-creation` +* `discord-format` +* `format` +* `spy-format` +* `min-linked-players-to-create` +* `text` + * `category-format` + * `category-ids` + * `whitelist` + * `unions-limit` + +### Example + +```yaml +discordchat: + enable: false + auto-creation: true + discord-format: "%player% » %message%" + format: "&b[&9D&b] &b[%union%&b] &4<%nick-color%%player%&4>: &b%message%" + spy-format: "&8[Spy] [&9D&8] <%clean-tag%&8> <%nick-color%*&8%player%>&8: %message%" + min-linked-players-to-create: 3 + text: + category-format: "SC - TextChannels" + category-ids: [] + whitelist: [] + unions-limit: 100 +``` + ## Purge Data -* `inactive-player-data-days` - -* `inactive-clan-days` - -* `unverified-clan-days` - +* `inactive-player-data-days` +* `inactive-union-days` ### Example ```yaml purge: inactive-player-data-days: 30 - inactive-clan-days: 7 - unverified-clan-days: 2 + inactive-union-days: 7 ``` ## mySQL Settings -* `username` - -* `host` - -* `port` - -* `enable` - -* `password` - -* `database` - +* `username` +* `host` +* `port` +* `enable` +* `password` +* `database` +* `table_prefix` +* `migrate-legacy-unions-database` ### Example ```yaml mysql: - username: '' + username: '^{MARIADB_USER}' host: localhost port: 3306 - enable: false - password: '' - database: '' + enable: true + password: '^{MARIADB_PASSWORD}' + database: 'unions' + table_prefix: 'sc_' + # One-time, source-read-only import from the legacy unions schema. + # The clans, players, and kills + # destination tables must be empty and use InnoDB. + migrate-legacy-unions-database: false ``` ## Permissions -* `auto-group-groupname` - +* `auto-group-groupname` +* `YourClanNameHere` ### Example @@ -483,10 +519,10 @@ permissions: ## Performance -* `save-periodically` - The plugin will save its data periodically as opposed to right away, **RECOMMENDED** to set it true. -* `save-interval` - The interval **in minutes** in which changes are written to the database. -* `use-threads` - The plugin will not use the main thread to connect with the database if this is true, **RECOMMENDED** to set it true. -* `use-bungeecord` - +* `save-periodically` +* `save-interval` +* `use-threads` +* `use-bungeecord` ### Example @@ -497,13 +533,3 @@ performance: use-threads: true use-bungeecord: false ``` - -## Safe Civilians - -* `safe-civilians` - Civilians are safe from PvP, even civilian vs civilian combat is disabled - -### Example - -```yaml -safe-civilians: false -``` diff --git a/wiki/how-to-setup/member-fee.md b/wiki/how-to-setup/member-fee.md deleted file mode 100644 index e24ad9c0..00000000 --- a/wiki/how-to-setup/member-fee.md +++ /dev/null @@ -1,42 +0,0 @@ ---- -description: null ---- - -# Member Fee - -## How does it work? - -If enabled by the server and the clan, at `1am` a fee \(set by the leader\) is collected from the non-leaders. A member that doesn't have enough money to pay it will be automatically kicked from the clan. The collected fee is added to the clan bank. - -## Configuration - -* `member-fee-enabled` - Enables or disables the feature. -* `max-member-fee` - Limits the fee, so leaders may not abuse the members. -* `purchase-member-fee-set` - Enable this to charge the value below everytime a leader changes the fee value. -* `member-fee-set-price` - Value to charge for changes on the fee value - -### Example - -```yaml -economy: - member-fee-enabled: false - max-member-fee: 200.0 - purchase-member-fee-set: false - member-fee-set-price: 1000.0 -``` - -## Permissions - -| Permission | Description | -| :--- | :--- | -| `simpleclans.leader.fee` | Allows the user to toggle the fee and set its value | -| `simpleclans.member.fee-check` | allows the member to check how much is the fee and if it's enabled | - -## Commands - -| Permission | Description | Permission | -| :--- | :--- | :--- | -| `/clan toggle fee` | Enables/disables the fee | `simpleclans.leader.fee` | -| `/clan fee set [amount]` | Sets the fee value | `simpleclans.leader.fee` | -| `/clan fee check` | Checks the status of the fee | `simpleclans.member.fee-check` | - diff --git a/wiki/how-to-setup/translation.md b/wiki/how-to-setup/translation.md index c09789f0..28c6ce78 100644 --- a/wiki/how-to-setup/translation.md +++ b/wiki/how-to-setup/translation.md @@ -18,7 +18,7 @@ description: null 1. If there isn't one for your language, copy "messages.properties" instead and rename it with your language code appended. For example, if your language is Russian: `messages_ru_RU.properties` 3. Edit the messages and save; 4. Change `language` in config.yml to your language code; -5. Reload the plugin using /clan reload. +5. Reload the plugin using `/union admin reload`. ### A little trick @@ -26,9 +26,12 @@ If you like the current translation, but want to change only a few lines: 1. Cop > **Note**: Please note that your custom `messages.properties` does not automatically update when new messages are added. -## Share your translations! +## Sharing translations -SimpleClans has a project on [Crowdin](https://crowdin.com/project/simpleclans). There you can translate the messages and suggest corrections! - -> **Note**: if you have an old `language.yml` file for SimpleClans that you translated to your language, [open an issue here](https://github.com/RoinujNosde/SimpleClans/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc), I will convert the file and add it to the plugin. +Unions-OG maintains its own message bundles, which have diverged from upstream +SimpleClans: this fork adds keys of its own \(proposals and voting, for +example\) and renames the `clan.*` keys to `union.*`. Upstream translations +therefore no longer drop in unchanged. +If you have translated a bundle for this fork, open a pull request on the +[Unions-OG repository](https://github.com/true-og/Unions-OG). diff --git a/wiki/how-to-setup/clan-below-players-name.md b/wiki/how-to-setup/union-below-players-name.md similarity index 74% rename from wiki/how-to-setup/clan-below-players-name.md rename to wiki/how-to-setup/union-below-players-name.md index 93dff041..cf12bf7e 100644 --- a/wiki/how-to-setup/clan-below-players-name.md +++ b/wiki/how-to-setup/union-below-players-name.md @@ -2,7 +2,7 @@ description: null --- -# Clan Below Player's Name +# Union Below Player's Name ## Plugins needed @@ -11,7 +11,10 @@ description: null ## Step by step -1. Open TAB's config and edit the Groups section adding `%simpleclans_clan_color_tag%` to `belowname`: +1. Open TAB's config and edit the Groups section adding `%simpleunions_clan_color_tag%` to `belowname`: + +> Placeholder **names** keep their upstream `clan` spelling, so +> `%simpleclans_clan_color_tag%` works identically. {% code title="Example:" %} ```yaml @@ -22,7 +25,7 @@ _OTHER_: tagsuffix: "%afk%" customtabname: "%essentialsnick%" customtagname: "%essentialsnick%" - belowname: "&l&b[ %simpleclans_clan_color_tag% &l&b]" + belowname: "&l&b[ %simpleunions_clan_color_tag% &l&b]" ``` {% endcode %} @@ -34,3 +37,5 @@ _OTHER_: ![](../.gitbook/assets/clans-below-name.png) +> The screenshot predates the Unions-OG rebrand. + diff --git a/wiki/how-to-setup/clan-on-tablist.md b/wiki/how-to-setup/union-on-tablist.md similarity index 72% rename from wiki/how-to-setup/clan-on-tablist.md rename to wiki/how-to-setup/union-on-tablist.md index 5e09dd89..579f1e72 100644 --- a/wiki/how-to-setup/clan-on-tablist.md +++ b/wiki/how-to-setup/union-on-tablist.md @@ -2,7 +2,7 @@ description: null --- -# Clan on Tablist +# Union on Tablist ## Plugins needed @@ -11,14 +11,17 @@ description: null ## Step by step -1. Open PlayerListPlus config and edit the formats adding `%simpleclans_clan_color_tag%`: +1. Open PlayerListPlus config and edit the formats adding `%simpleunions_clan_color_tag%`: + +> Placeholder **names** keep their upstream `clan` spelling, so +> `%simpleclans_clan_color_tag%` works identically. {% code title="Example:" %} ```yaml slot-items: # This slot items will shows all players PLAYERS: - format: "%simpleclans_clan_color_tag%&c.$displayname" + format: "%simpleunions_clan_color_tag%&c.$displayname" type: PLAYER_LIST hidevanished: true ping: true @@ -32,3 +35,5 @@ slot-items: ![](../.gitbook/assets/clans-tablist.png) +> The screenshot predates the Unions-OG rebrand. + diff --git a/wiki/other/known-issues.md b/wiki/other/known-issues.md index fdaa3552..59034849 100644 --- a/wiki/other/known-issues.md +++ b/wiki/other/known-issues.md @@ -24,5 +24,5 @@ collation-server=utf8mb4_unicode_ci Players report that their KDR is not changing. -**Solution:** deny the permission `simpleclans.other.kdr-exempt`. In some permission plugins, just add a `-` before the node. Others accept the `false` value. +**Solution:** deny the permission `unionsog.other.kdr-exempt`. In some permission plugins, just add a `-` before the node. Others accept the `false` value. diff --git a/wiki/other/land-claims.md b/wiki/other/land-claims.md index 76573dad..1d315eae 100644 --- a/wiki/other/land-claims.md +++ b/wiki/other/land-claims.md @@ -6,8 +6,10 @@ description: null ## Configuration -* `enable-auto-groups` - -* `auto-group-groupname`- +* `enable-auto-groups` - whether Unions-OG adds each member to a + `union_` permission group +* `auto-group-groupname` - whether the union tag is also added as a bare + `group.` permission ### Exemple @@ -16,21 +18,21 @@ settings: enable-auto-groups: false permissions: auto-group-groupname: true - YourClanNameHere: + YourUnionTagHere: - test.permission ``` ## GriefPrevention -You can replace `` with ANY clan tag \(ally, rival, etc\) +You can replace `` with ANY union tag \(ally, rival, etc\) | Command | Description | | :--- | :--- | -| `/Trust group.` | Gives the Clan members permission to edit in your claim | -| `/AccessTrust group.` | Gives the Clan members permission to use your buttons, levers, and beds | -| `/ContainerTrust group.` | Gives the Clan members permission to use your buttons, levers, beds, crafting gear, containers, and animals | -| `/PermissionTrust group.` | Gives the Clan members permission to share their permission level with others | -| `/UnTrust group.` | Revokes any permissions granted to a Clan in your claim | +| `/Trust group.` | Gives the Union members permission to edit in your claim | +| `/AccessTrust group.` | Gives the Union members permission to use your buttons, levers, and beds | +| `/ContainerTrust group.` | Gives the Union members permission to use your buttons, levers, beds, crafting gear, containers, and animals | +| `/PermissionTrust group.` | Gives the Union members permission to share their permission level with others | +| `/UnTrust group.` | Revokes any permissions granted to a union in your claim | ## Note diff --git a/wiki/other/placeholderapi-support.md b/wiki/other/placeholderapi-support.md index 53482ad1..6f4ee2fa 100644 --- a/wiki/other/placeholderapi-support.md +++ b/wiki/other/placeholderapi-support.md @@ -13,86 +13,93 @@ Union aliases are accepted under either identifier. For example, `%simpleclans_i ## Available placeholders -| Placeholder | Result | Description | | -| :--- | :--- | :--- | :--- | -| %simpleclans\_neutral\_kills% | INTEGER | | | -| %simpleclans\_rival\_kills% | INTEGER | | | -| %simpleclans\_civilian\_kills% | INTEGER | | | -| %simpleclans\_total\_kills% | INTEGER | | | -| %simpleclans\_weighted\_kills% | INTEGER | | | -| %simpleclans\_deaths% | INTEGER | | | -| %simpleclans\_kdr% | FLOAT | | | -| %simpleclans\_in\_clan% | BOOLEAN \(YES/NO\) | | | -| %simpleclans\_is\_leader% | BOOLEAN \(YES/NO\) | | | -| %simpleclans\_is\_trusted% | BOOLEAN \(YES/NO\) | | | -| %simpleclans\_is\_member% | BOOLEAN \(YES/NO\) | | | -| %simpleclans\_is\_bb\_enabled% | BOOLEAN \(YES/NO\) | | | -| %simpleclans\_is\_usechatshortcut% | BOOLEAN \(YES/NO\) | | | -| %simpleclans\_is\_allychat% | BOOLEAN \(YES/NO\) | | | -| %simpleclans\_is\_clanchat% | BOOLEAN \(YES/NO\) | | | -| %simpleclans\_is\_globalchat% | BOOLEAN \(YES/NO\) | | | -| %simpleclans\_is\_cape\_enabled% | BOOLEAN \(YES/NO\) | | | -| %simpleclans\_is\_tag\_enabled% | BOOLEAN \(YES/NO\) | | | -| %simpleclans\_is\_friendlyfire\_on% | BOOLEAN \(YES/NO\) | | | -| %simpleclans\_is\_muted% | BOOLEAN \(YES/NO\) | | | -| %simpleclans\_is\_mutedally% | BOOLEAN \(YES/NO\) | | | -| %simpleclans\_join\_date% | DATE | Month, Day, Year, Hour | | -| %simpleclans\_inactive\_days% | INTEGER | | | -| %simpleclans\_lastseen% | INTEGER | | | -| %simpleclans\_lastseendays% | INTEGER | | | -| %simpleclans\_tag% | STRING | lowerscored Clan tag without color | | -| %simpleclans\_tag\_label% | STRING | Clan tag with correct mayus, color and at the end &c | | -| %simpleclans\_rank% | STRING | | | -| %simpleclans\_rank\_displayname% | STRING | | | -| %simpleclans\_clanchat\_player\_color% | | | | -| %simpleclans\_allychat\_player\_color% | | | | -| %simpleclans\_clan\_total\_neutral% | INTEGER | | | -| %simpleclans\_clan\_total\_civilian% | INTEGER | | | -| %simpleclans\_clan\_total\_rival% | INTEGER | | | -| %simpleclans\_clan\_total\_kills% | INTEGER | | | -| %simpleclans\_clan\_total\_deaths% | INTEGER | | | -| %simpleclans\_clan\_total\_kdr% | FLOAT | | | -| %simpleclans\_clan\_average\_wk% | INTEGER | | | -| %simpleclans\_clan\_leader\_size% | INTEGER | | | -| %simpleclans\_clan\_balance% | INTEGER | | | -| %simpleclans\_clan\_allow\_withdraw% | BOOLEAN \(YES/NO\) | | | -| %simpleclans\_clan\_allow\_deposit% | BOOLEAN \(YES/NO\) | | | -| %simpleclans\_clan\_size% | INTEGER | | | -| %simpleclans\_clan\_name% | STRING | | | -| %simpleclans\_clan\_color\_tag% | | | | -| %simpleclans\_clan\_tag% | | | | -| %simpleclans\_clan\_founded% | | | | -| %simpleclans\_clan\_friendly\_fire% | | | | -| %simpleclans\_clan\_is\_unrivable% | | | | -| %simpleclans\_clan\_is\_anyonline% | | | | -| %simpleclans\_clan\_is\_verified% | | | | -| %simpleclans\_clan\_capeurl% | | | | -| %simpleclans\_clan\_inactivedays% | | | | -| %simpleclans\_clan\_onlinemembers\_count% | | | | -| %simpleclans\_clan\_allies\_count% | | | | -| %simpleclans\_clan\_rivals\_count% | | | | -| %simpleclanstopclans\_\#\_clan\_total\_neutral% | | | | -| %simpleclanstopclans\_\#\_clan\_total\_civilian% | | | | -| %simpleclanstopclans\_\#\_clan\_total\_rival% | | | | -| %simpleclanstopclans\_\#\_clan\_total\_kills% | | | | -| %simpleclanstopclans\_\#\_clan\_total\_deaths% | | | | -| %simpleclanstopclans\_\#\_clan\_total\_kdr% | | | | -| %simpleclanstopclans\_\#\_clan\_average\_wk% | | | | -| %simpleclanstopclans\_\#\_clan\_leader\_size% | | | | -| %simpleclanstopclans\_\#\_clan\_balance% | | | | -| %simpleclanstopclans\_\#\_clan\_allow\_withdraw% | | | | -| %simpleclanstopclans\_\#\_clan\_allow\_deposit% | | | | -| %simpleclanstopclans\_\#\_clan\_size% | | | | -| %simpleclanstopclans\_\#\_clan\_name% | | | | -| %simpleclanstopclans\_\#\_clan\_color\_tag% | | | | -| %simpleclanstopclans\_\#\_clan\_tag% | | | | -| %simpleclanstopclans\_\#\_clan\_founded% | | | | -| %simpleclanstopclans\_\#\_clan\_friendly\_fire% | | | | -| %simpleclanstopclans\_\#\_clan\_is\_unrivable% | | | | -| %simpleclanstopclans\_\#\_clan\_is\_anyonline% | | | | -| %simpleclanstopclans\_\#\_clan\_is\_verified% | | | | -| %simpleclanstopclans\_\#\_clan\_capeurl% | | | | -| %simpleclanstopclans\_\#\_clan\_inactivedays% | | | | -| %simpleclanstopclans\_\#\_clan\_onlinemembers\_count% | | | | -| %simpleclanstopclans\_\#\_clan\_allies\_count% | | | | -| %simpleclanstopclans\_\#\_clan\_rivals\_count% | | | | +> Placeholder **names** deliberately keep their upstream `clan` spelling so +> existing setups keep working. `%simpleclans_clan_name%`, +> `%simpleunions_clan_name%` and `%simpleunions_union_name%` are all the same +> value. + +### Player placeholders + +| Placeholder | Result | +| :--- | :--- | +| `%simpleunions_name%` | STRING | +| `%simpleunions_clean_name%` | STRING | +| `%simpleunions_tag%` | STRING | +| `%simpleunions_tag_label%` | STRING | +| `%simpleunions_in_clan%` | BOOLEAN | +| `%simpleunions_is_member%` | BOOLEAN | +| `%simpleunions_is_trusted%` | BOOLEAN | +| `%simpleunions_neutral_kills%` | INTEGER | +| `%simpleunions_rival_kills%` | INTEGER | +| `%simpleunions_civilian_kills%` | INTEGER | +| `%simpleunions_ally_kills%` | INTEGER | +| `%simpleunions_total_kills%` | INTEGER | +| `%simpleunions_weighted_kills%` | INTEGER | +| `%simpleunions_deaths%` | INTEGER | +| `%simpleunions_kdr%` | FLOAT | +| `%simpleunions_join_date%` | DATE | +| `%simpleunions_inactive_days%` | INTEGER | +| `%simpleunions_lastseen%` | INTEGER | +| `%simpleunions_lastseendays%` | INTEGER | +| `%simpleunions_is_bb_enabled%` | BOOLEAN | +| `%simpleunions_is_tag_enabled%` | BOOLEAN | +| `%simpleunions_is_invite_enabled%` | BOOLEAN | +| `%simpleunions_is_friendlyfire_on%` | BOOLEAN | +| `%simpleunions_is_muted%` | BOOLEAN | +| `%simpleunions_is_mutedally%` | BOOLEAN | +| `%simpleunions_clanchat_player_color%` | STRING | +| `%simpleunions_allychat_player_color%` | STRING | +| `%simpleunions_topplayers_position%` | INTEGER | + +### Union placeholders + +Prefix these with `clan_` or `union_`, for example +`%simpleunions_union_name%`. + +| Placeholder | Result | +| :--- | :--- | +| `name` | STRING | +| `tag` | STRING | +| `color_tag` | STRING | +| `bracket_tag` | STRING | +| `color` | STRING | +| `size` | INTEGER | +| `onlinemembers_count` | INTEGER | +| `allies_count` | INTEGER | +| `rivals_count` | INTEGER | +| `founded` | DATE | +| `inactivedays` | INTEGER | +| `friendly_fire` | BOOLEAN | +| `is_anyonline` | BOOLEAN | +| `is_unrivable` | BOOLEAN | +| `is_permanent` | BOOLEAN | +| `balance` | INTEGER | +| `balance_formatted` | STRING | +| `allow_deposit` | BOOLEAN | +| `allow_withdraw` | BOOLEAN | +| `total_kills` | INTEGER | +| `total_neutral` | INTEGER | +| `total_civilian` | INTEGER | +| `total_rival` | INTEGER | +| `total_ally` | INTEGER | +| `total_deaths` | INTEGER | +| `total_kdr` | FLOAT | +| `average_wk` | INTEGER | +| `topclans_position` | INTEGER | + +### Leaderboard placeholders + +`%simpleunions_topplayers_#_%` and +`%simpleunions_topunions_#_union_%`, where `#` is the +position. The legacy `topclans` spelling also works. + +### Relational placeholders + +`%rel_simpleunions_color%` colours a player's name by their relationship to +the viewer, using the `color.same_clan`, `color.rival` and `color.ally` +settings in PlaceholderAPI's config. + +## Removed placeholders + +`is_leader`, `leader_size`, `rank`, `rank_displayname` and `has_rank` no longer +exist, because unions have no leaders or ranks. diff --git a/wiki/other/simpleclans-api.md b/wiki/other/simpleclans-api.md deleted file mode 100644 index cccba0db..00000000 --- a/wiki/other/simpleclans-api.md +++ /dev/null @@ -1,61 +0,0 @@ ---- -description: null ---- - -# SimpleClans API Example - -You can hook into SimpleClans plugin like so: - -```java -private SimpleClans sc; - -public void onEnable() -{ - Plugin plug = getServer().getPluginManager().getPlugin("SimpleClans"); - - if (plug != null) - { - sc = ((SimpleClans) plug); - } -} -``` - -```java -public void doClanStuff(Player player) -{ - // get a player's clan - - if (sc != null) - { - ClanPlayer cp = sc.getClanManager().getClanPlayer(player.getUniqueId()); - - if (cp != null) - { - Clan clan = cp.getClan(); - } - else - { - // player is not in a clan - } - } - - // get a clan from a clan tag - - if (sc != null) - { - Clan clan = sc.getClanManager().getClan("staff"); - - if (clan != null) - { - // clan exists - } - } -} -``` - -Every player has a **ClanPlayer** object which holds all his information, including his clan, and can be used to perform various operations on the player. - -The **Clan** object holds all the information for a clan and can be used to perform various operations on the clan. - -The **ClanManager** holds all the **Clans** and **ClanPlayers** and contains methods that allow you to retrieve them. - diff --git a/wiki/other/unions-og-api.md b/wiki/other/unions-og-api.md new file mode 100644 index 00000000..b80bb6f2 --- /dev/null +++ b/wiki/other/unions-og-api.md @@ -0,0 +1,89 @@ +--- +description: null +--- + +# Unions-OG API Example + +You can hook into Unions-OG like so: + +```java +private UnionsOG unions; + +public void onEnable() +{ + Plugin plug = getServer().getPluginManager().getPlugin("Unions-OG"); + + if (plug != null) + { + unions = ((UnionsOG) plug); + } +} +``` + +```java +public void doUnionStuff(Player player) +{ + // get a player's union + + if (unions != null) + { + UnionPlayer up = unions.getUnionManager().getUnionPlayer(player.getUniqueId()); + + if (up != null) + { + Union union = up.getUnion(); + } + else + { + // player is not in a union + } + } + + // get a union from a union tag + + if (unions != null) + { + Union union = unions.getUnionManager().getUnion("staff"); + + if (union != null) + { + // union exists + } + } +} +``` + +Every player has a **UnionPlayer** object which holds all their information, +including their union, and can be used to perform various operations on the +player. + +The **Union** object holds all the information for a union and can be used to +perform various operations on the union. + +The **UnionManager** holds all the **Unions** and **UnionPlayers** and contains +methods that allow you to retrieve them. + +The **ProposalManager** holds the open **Proposal** for each union. Use it to +read what a union is currently voting on, or to open a proposal of your own. + +## Renamed from upstream + +If you are porting code written against SimpleClans, the types were renamed: + +| SimpleClans | Unions-OG | +| :--- | :--- | +| `SimpleClans` | `UnionsOG` | +| `Clan` | `Union` | +| `ClanPlayer` | `UnionPlayer` | +| `ClanManager` | `UnionManager` | +| `getClanManager()` | `getUnionManager()` | +| `getClanPlayer(...)` | `getUnionPlayer(...)` | +| `getClan(...)` | `getUnion(...)` | +| `CreateClanEvent`, `DisbandClanEvent` | `CreateUnionEvent`, `DisbandUnionEvent` | + +The `Rank`, `RankPermission` and `PermissionLevel` types, the promotion and +demotion events, and every leader-related method \(`isLeader`, `getLeaders`, +`promote`, `demote`\) were removed along with those features. + +Database identifiers are unchanged: the table prefix is still `sc_` and the +union table is still `clans`.