From b11f03a529ed3ae4ae25bff3121b3324c8f6ea9f Mon Sep 17 00:00:00 2001 From: dmccoystephenson Date: Tue, 23 Aug 2022 17:12:54 -0600 Subject: [PATCH 01/24] Added a permission for the map command. --- src/main/java/dansplugins/factionsystem/MedievalFactions.java | 2 -- .../java/dansplugins/factionsystem/commands/MapCommand.java | 4 ++++ src/main/resources/plugin.yml | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/dansplugins/factionsystem/MedievalFactions.java b/src/main/java/dansplugins/factionsystem/MedievalFactions.java index 0b3fa6601..10088c325 100644 --- a/src/main/java/dansplugins/factionsystem/MedievalFactions.java +++ b/src/main/java/dansplugins/factionsystem/MedievalFactions.java @@ -58,8 +58,6 @@ public class MedievalFactions extends PonderBukkitPlugin { private final LockService lockService = new LockService(persistentData, configService.getLocaleService(), persistentData.getBlockChecker(), ephemeralData); private final TerritoryOwnerNotifier territoryOwnerNotifier = new TerritoryOwnerNotifier(configService.getLocaleService(), configService, actionBarService); - - /** * This runs when the server starts. */ diff --git a/src/main/java/dansplugins/factionsystem/commands/MapCommand.java b/src/main/java/dansplugins/factionsystem/commands/MapCommand.java index 40a3c7265..065ab9cdb 100644 --- a/src/main/java/dansplugins/factionsystem/commands/MapCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/MapCommand.java @@ -42,6 +42,10 @@ public MapCommand(LocaleService localeService, PersistentData persistentData, Ep */ @Override public void execute(Player player, String[] args, String key) { + final String permission = "mf.map"; + if (!(checkPermissions(player, permission))) { + return; + } final Chunk center = player.getLocation().getChunk(); // Needs to be Odd. int map_width = 53; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index b8a40f369..c72d978a7 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -107,6 +107,8 @@ permissions: default: true mf.flags: default: true + mf.map: + default: true mf.bypass: default: op mf.config: From aa56e29f44668d7b0613cafcc9f95d158712a137 Mon Sep 17 00:00:00 2001 From: VoChiDanh Date: Wed, 24 Aug 2022 11:57:50 +0700 Subject: [PATCH 02/24] complete the messages at the commands (p6) --- .../factionsystem/commands/LawsCommand.java | 21 +++-- .../factionsystem/commands/LeaveCommand.java | 12 ++- .../factionsystem/commands/ListCommand.java | 7 +- .../factionsystem/commands/LockCommand.java | 7 +- .../commands/MakePeaceCommand.java | 38 ++++++--- .../commands/MembersCommand.java | 80 ++++++++++++++----- .../factionsystem/commands/PowerCommand.java | 24 ++++-- .../factionsystem/commands/PrefixCommand.java | 7 +- .../commands/PromoteCommand.java | 33 +++++--- .../commands/RemoveLawCommand.java | 10 ++- .../factionsystem/commands/RenameCommand.java | 18 ++++- .../commands/RevokeAccessCommand.java | 19 +++-- .../commands/SetHomeCommand.java | 10 ++- .../factionsystem/commands/StatsCommand.java | 18 ++++- .../commands/SwearFealtyCommand.java | 21 +++-- .../commands/TransferCommand.java | 24 ++++-- .../commands/UnclaimCommand.java | 15 +++- .../commands/UnclaimallCommand.java | 24 ++++-- .../factionsystem/commands/UnlockCommand.java | 7 +- .../commands/VassalizeCommand.java | 27 +++++-- .../factionsystem/commands/WhoCommand.java | 11 ++- .../commands/abs/SubCommand.java | 6 +- src/main/resources/language.yml | 79 ++++++++++++++++++ 23 files changed, 402 insertions(+), 116 deletions(-) diff --git a/src/main/java/dansplugins/factionsystem/commands/LawsCommand.java b/src/main/java/dansplugins/factionsystem/commands/LawsCommand.java index ece1949da..aea0514ea 100644 --- a/src/main/java/dansplugins/factionsystem/commands/LawsCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/LawsCommand.java @@ -11,9 +11,12 @@ import dansplugins.factionsystem.objects.domain.Faction; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; +import dansplugins.factionsystem.services.PlayerService; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import java.util.Objects; import java.util.stream.IntStream; /** @@ -42,30 +45,38 @@ public void execute(Player player, String[] args, String key) { if (args.length == 0) { target = getPlayerFaction(player); if (target == null) { - player.sendMessage(translate("&c" + getText("MustBeInFaction"))); + new PlayerService().sendMessageType(player, "&c" + getText("AlertMustBeInFactionToUseCommand") + , "AlertMustBeInFactionToUseCommand", false); return; } if (target.getNumLaws() == 0) { - player.sendMessage(translate("&c" + getText("AlertNoLaws"))); + new PlayerService().sendMessageType(player, "&c" + getText("AlertNoLaws") + , "AlertNoLaws", false); return; } } else { target = getFaction(String.join(" ", args)); if (target == null) { - player.sendMessage(translate("&c" + getText("FactionNotFound"))); + new PlayerService().sendMessageType(player, "&c" + getText("FactionNotFound"), + Objects.requireNonNull(new MessageService().getLanguage().getString("FactionNotFound")) + .replaceAll("#faction#", String.join(" ", args)), true); return; } if (target.getNumLaws() == 0) { - player.sendMessage(translate("&c" + getText("FactionDoesNotHaveLaws"))); + new PlayerService().sendMessageType(player, "&c" + getText("FactionDoesNotHaveLaws") + , "FactionDoesNotHaveLaws", false); return; } } - player.sendMessage(translate("&b" + getText("LawsTitle", target.getName()))); + new PlayerService().sendMessageType(player,"&b" + getText("LawsTitle", target.getName()) + , Objects.requireNonNull(new MessageService().getLanguage().getString("LawsTitle")) + .replaceAll("#name#", target.getName()), true); IntStream.range(0, target.getNumLaws()) .mapToObj(i -> translate("&b" + (i + 1) + ". " + target.getLaws().get(i))) .forEach(player::sendMessage); } + /** * Method to execute the command. * diff --git a/src/main/java/dansplugins/factionsystem/commands/LeaveCommand.java b/src/main/java/dansplugins/factionsystem/commands/LeaveCommand.java index 378ef02fc..42d0b4eb9 100644 --- a/src/main/java/dansplugins/factionsystem/commands/LeaveCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/LeaveCommand.java @@ -11,11 +11,15 @@ import dansplugins.factionsystem.integrators.DynmapIntegrator; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; +import dansplugins.factionsystem.services.PlayerService; import dansplugins.factionsystem.utils.Logger; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import java.util.Objects; + /** * @author Callum Johnson */ @@ -55,8 +59,12 @@ public void execute(Player player, String[] args, String key) { if (faction.isOfficer(player.getUniqueId())) faction.removeOfficer(player.getUniqueId()); // Remove Officer. ephemeralData.getPlayersInFactionChat().remove(player.getUniqueId()); // Remove from Faction Chat. faction.removeMember(player.getUniqueId()); - player.sendMessage(translate("&b" + getText("AlertLeftFaction"))); - messageFaction(faction, translate("&a" + player.getName() + " has left " + faction.getName())); + new PlayerService().sendMessageType(player, "&b" + getText("AlertLeftFaction") + , "AlertLeftFaction", false); + messageFaction(faction, translate("&a" + player.getName() + " has left " + faction.getName()), + Objects.requireNonNull(new MessageService().getLanguage().getString("AlertLeftFactionTeam")) + .replaceAll("#name#", player.getName()) + .replaceAll("#faction#", faction.getName())); } diff --git a/src/main/java/dansplugins/factionsystem/commands/ListCommand.java b/src/main/java/dansplugins/factionsystem/commands/ListCommand.java index 31b26e3e1..700f36b6a 100644 --- a/src/main/java/dansplugins/factionsystem/commands/ListCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/ListCommand.java @@ -11,6 +11,7 @@ import dansplugins.factionsystem.objects.domain.Faction; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.PlayerService; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -52,10 +53,12 @@ public void execute(CommandSender sender, String[] args, String key) { final String permission = "mf.list"; if (!(checkPermissions(sender, permission))) return; if (persistentData.getNumFactions() == 0) { - sender.sendMessage(translate("&b" + getText("CurrentlyNoFactions"))); + new PlayerService().sendMessageType(sender, "&b" + getText("CurrentlyNoFactions") + , "CurrentlyNoFactions", false); return; } - sender.sendMessage(translate("&b&l" + getText("FactionsTitle"))); + new PlayerService().sendMessageType(sender, "&b&l" + getText("FactionsTitle") + , "FactionsTitle", false); List sortedFactionList = persistentData.getSortedListOfFactions(); sender.sendMessage(ChatColor.AQUA + localeService.get("ListLegend")); sender.sendMessage(ChatColor.AQUA + "-----"); diff --git a/src/main/java/dansplugins/factionsystem/commands/LockCommand.java b/src/main/java/dansplugins/factionsystem/commands/LockCommand.java index 809831f6d..83b007e17 100644 --- a/src/main/java/dansplugins/factionsystem/commands/LockCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/LockCommand.java @@ -10,6 +10,7 @@ import dansplugins.factionsystem.integrators.DynmapIntegrator; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.PlayerService; import dansplugins.factionsystem.utils.RelationChecker; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -45,13 +46,15 @@ public void execute(Player player, String[] args, String key) { } if (args.length >= 1 && safeEquals(args[0], "cancel")) { if (ephemeralData.getLockingPlayers().remove(player.getUniqueId())) { // Remove them - player.sendMessage(translate("&c" + getText("LockingCancelled"))); + new PlayerService().sendMessageType(player, "&c" + getText("LockingCancelled"), + "LockingCancelled", false); return; } } ephemeralData.getLockingPlayers().add(player.getUniqueId()); ephemeralData.getUnlockingPlayers().remove(player.getUniqueId()); - player.sendMessage(translate("&a" + getText("RightClickLock"))); + new PlayerService().sendMessageType(player, "&a" + getText("RightClickLock") + , "RightClickLock", false); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/MakePeaceCommand.java b/src/main/java/dansplugins/factionsystem/commands/MakePeaceCommand.java index 647e9edfe..338c2498a 100644 --- a/src/main/java/dansplugins/factionsystem/commands/MakePeaceCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/MakePeaceCommand.java @@ -12,10 +12,14 @@ import dansplugins.factionsystem.objects.domain.Faction; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; +import dansplugins.factionsystem.services.PlayerService; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import java.util.Objects; + /** * @author Callum Johnson */ @@ -39,35 +43,48 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.makepeace"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - player.sendMessage(translate("&c" + getText("UsageMakePeace"))); + new PlayerService().sendMessageType(player, + "&c" + getText("UsageMakePeace") + , "UsageMakePeace", false); return; } final Faction target = getFaction(String.join(" ", args)); if (target == null) { - player.sendMessage(translate("&c" + getText("FactionNotFound"))); + new PlayerService().sendMessageType(player, "&c" + getText("FactionNotFound"), + Objects.requireNonNull(new MessageService().getLanguage().getString("FactionNotFound")) + .replaceAll("#faction#", String.join(" ", args)), true); return; } if (target == faction) { - player.sendMessage(translate("&c" + getText("CannotMakePeaceWithSelf"))); + new PlayerService().sendMessageType(player, "&c" + getText("CannotMakePeaceWithSelf") + , "CannotMakePeaceWithSelf", false); return; } if (faction.isTruceRequested(target.getName())) { - player.sendMessage(translate("&c" + getText("AlertAlreadyRequestedPeace"))); + new PlayerService().sendMessageType(player, "&c" + getText("AlertAlreadyRequestedPeace") + , "AlertAlreadyRequestedPeace", false); return; } if (!faction.isEnemy(target.getName())) { - player.sendMessage(translate("&c" + getText("FactionNotEnemy"))); + new PlayerService().sendMessageType(player, "&c" + getText("FactionNotEnemy") + , "FactionNotEnemy", false); return; } faction.requestTruce(target.getName()); - player.sendMessage(translate("&a" + getText("AttemptedPeace", target.getName()))); + new PlayerService().sendMessageType(player, "&a" + getText("AttemptedPeace", target.getName()) + , Objects.requireNonNull(new MessageService().getLanguage().getString("AttemptedPeace")) + .replaceAll("#name#", target.getName()), + true); messageFaction(target, - translate("&a" + getText("HasAttemptedToMakePeaceWith", faction.getName(), target.getName()))); + translate("&a" + getText("HasAttemptedToMakePeaceWith", faction.getName(), target.getName())), + Objects.requireNonNull(new MessageService().getLanguage().getString("HasAttemptedToMakePeaceWith")) + .replaceAll("#f1#", faction.getName()) + .replaceAll("#f2#", target.getName())); if (faction.isTruceRequested(target.getName()) && target.isTruceRequested(faction.getName())) { FactionWarEndEvent warEndEvent = new FactionWarEndEvent(this.faction, target); Bukkit.getPluginManager().callEvent(warEndEvent); if (!warEndEvent.isCancelled()) { - // remove requests in case war breaks out again and they need to make peace again + // remove requests in case war breaks out again, and they need to make peace again faction.removeRequestedTruce(target.getName()); target.removeRequestedTruce(faction.getName()); @@ -78,7 +95,10 @@ public void execute(Player player, String[] args, String key) { // TODO: set active flag in war to false // Notify - messageServer(translate("&a" + getText("AlertNowAtPeaceWith", faction.getName(), target.getName()))); + messageServer("&a" + getText("AlertNowAtPeaceWith", faction.getName(), target.getName()), + Objects.requireNonNull(new MessageService().getLanguage().getString("AlertNowAtPeaceWith")) + .replaceAll("#p1#", faction.getName()) + .replaceAll("#p2#", target.getName())); } } diff --git a/src/main/java/dansplugins/factionsystem/commands/MembersCommand.java b/src/main/java/dansplugins/factionsystem/commands/MembersCommand.java index 2113f9b50..09d81c68b 100644 --- a/src/main/java/dansplugins/factionsystem/commands/MembersCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/MembersCommand.java @@ -4,6 +4,7 @@ */ package dansplugins.factionsystem.commands; +import dansplugins.factionsystem.MedievalFactions; import dansplugins.factionsystem.commands.abs.SubCommand; import dansplugins.factionsystem.data.EphemeralData; import dansplugins.factionsystem.data.PersistentData; @@ -11,10 +12,14 @@ import dansplugins.factionsystem.objects.domain.Faction; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; +import dansplugins.factionsystem.services.PlayerService; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import java.util.Objects; + /** * @author Callum Johnson */ @@ -52,39 +57,72 @@ public void execute(CommandSender sender, String[] args, String key) { final Faction faction; if (args.length == 0) { if (!(sender instanceof Player)) { - sender.sendMessage(translate(getText("OnlyPlayersCanUseCommand"))); + new PlayerService().sendMessageType(sender, getText("OnlyPlayersCanUseCommand") + , "OnlyPlayersCanUseCommand", false); return; } faction = getPlayerFaction(sender); if (faction == null) { - sender.sendMessage(translate("&c" + getText("AlertMustBeInFactionToUseCommand"))); + new PlayerService().sendMessageType(sender, getText("AlertMustBeInFactionToUseCommand") + , "AlertMustBeInFactionToUseCommand", false); return; } } else { faction = getFaction(String.join(" ", args)); if (faction == null) { - sender.sendMessage(translate("&c" + getText("FactionNameNotRecognized"))); + new PlayerService().sendMessageType(sender, "&c" + getText("FactionNameNotRecognized"), + Objects.requireNonNull(new MessageService().getLanguage().getString("FactionNotFound")) + .replaceAll("#faction#", String.join(" ", args + )), true); return; } } // send Faction Members - sender.sendMessage(translate("&b----------\n" + getText("MembersOf", faction.getName()))); - sender.sendMessage(translate("&b----------\n")); - faction.getMemberList().stream() - .map(Bukkit::getOfflinePlayer) - .map(player -> { - String rank = ""; - String color = "&a"; - if (faction.isOfficer(player.getUniqueId())) { - rank = "*"; - color = "&b"; - } - if (faction.isOwner(player.getUniqueId())) { - rank = "**"; - color = "&c"; - } - return translate("&f" + player.getName() + color + rank); - }).forEach(sender::sendMessage); - sender.sendMessage(translate("&b----------\n")); + if (!new MedievalFactions().USE_NEW_LANGUAGE_FILE) { + sender.sendMessage(translate("&b----------\n" + getText("MembersOf", faction.getName()))); + sender.sendMessage(translate("&b----------\n")); + faction.getMemberList().stream() + .map(Bukkit::getOfflinePlayer) + .map(player -> { + String rank = ""; + String color = "&a"; + if (faction.isOfficer(player.getUniqueId())) { + rank = "*"; + color = "&b"; + } + if (faction.isOwner(player.getUniqueId())) { + rank = "**"; + color = "&c"; + } + return translate("&f" + player.getName() + color + rank); + }).forEach(sender::sendMessage); + sender.sendMessage(translate("&b----------\n")); + } else { + new PlayerService().sendMessageType(sender, "", Objects.requireNonNull(new MessageService().getLanguage().getString("MembersFaction.Title")) + .replaceAll("#faction#", faction.getName()) + , true); + faction.getMemberList().stream() + .map(Bukkit::getOfflinePlayer) + .map(player -> { + String rank = new MessageService().getLanguage().getString("MembersFaction.Member.Rank"); + String color = new MessageService().getLanguage().getString("MembersFaction.Member.Color"); + if (faction.isOfficer(player.getUniqueId())) { + rank = new MessageService().getLanguage().getString("MembersFaction.Officer.Rank"); + color = new MessageService().getLanguage().getString("MembersFaction.Officer.Color"); + } + if (faction.isOwner(player.getUniqueId())) { + rank = new MessageService().getLanguage().getString("MembersFaction.Owner.Rank"); + color = new MessageService().getLanguage().getString("MembersFaction.Owner.Color"); + } + return new PlayerService().colorize(Objects.requireNonNull(new MessageService().getLanguage().getString("MembersFaction.Message")) + .replaceAll("#color#", Objects.requireNonNull(color)) + .replaceAll("#rank#", Objects.requireNonNull(rank)) + .replaceAll("#name#", Objects.requireNonNull(player.getName()))); + }).forEach(sender::sendMessage); + new PlayerService().sendMessageType(sender, "", Objects.requireNonNull(new MessageService().getLanguage().getString("MembersFaction.SubTitle")) + .replaceAll("#faction#", faction.getName()) + , true); + + } } } \ No newline at end of file diff --git a/src/main/java/dansplugins/factionsystem/commands/PowerCommand.java b/src/main/java/dansplugins/factionsystem/commands/PowerCommand.java index 38f481ee8..76e0b1e22 100644 --- a/src/main/java/dansplugins/factionsystem/commands/PowerCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/PowerCommand.java @@ -11,10 +11,13 @@ import dansplugins.factionsystem.objects.domain.PowerRecord; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; +import dansplugins.factionsystem.services.PlayerService; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import preponderous.ponder.minecraft.bukkit.tools.UUIDChecker; +import java.util.Objects; import java.util.UUID; /** @@ -54,22 +57,31 @@ public void execute(CommandSender sender, String[] args, String key) { final PowerRecord record; if (args.length == 0) { if (!(sender instanceof Player)) { - sender.sendMessage(translate(getText("OnlyPlayersCanUseCommand"))); + new PlayerService().sendMessageType(sender, getText("OnlyPlayersCanUseCommand") + , "OnlyPlayersCanUseCommand", false); return; } record = persistentData.getPlayersPowerRecord(((Player) sender).getUniqueId()); - sender.sendMessage(translate("&b" + - getText("AlertCurrentPowerLevel", record.getPower(), record.maxPower()))); + new PlayerService().sendMessageType(sender, "&b" + + getText("AlertCurrentPowerLevel", record.getPower(), record.maxPower()) + , Objects.requireNonNull(new MessageService().getLanguage().getString("AlertCurrentPowerLevel")) + .replaceAll("#power#", String.valueOf(record.getPower())) + .replaceAll("#max#", String.valueOf(record.maxPower())), true); return; } UUIDChecker uuidChecker = new UUIDChecker(); final UUID target = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (target == null) { - sender.sendMessage(translate("&c" + getText("PlayerNotFound"))); + new PlayerService().sendMessageType(sender, "&c" + getText("PlayerNotFound"), + Objects.requireNonNull(new MessageService().getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); return; } record = persistentData.getPlayersPowerRecord(target); - sender.sendMessage(translate("&b" + - getText("CurrentPowerLevel", args[0], record.getPower(), record.maxPower()))); + new PlayerService().sendMessageType(sender, "&b" + + getText("CurrentPowerLevel", args[0], record.getPower(), record.maxPower()) + , Objects.requireNonNull(new MessageService().getLanguage().getString("CurrentPowerLevel")) + .replaceAll("#power#", String.valueOf(record.getPower())) + .replaceAll("#max#", String.valueOf(record.maxPower())) + .replaceAll("#name#", args[0]), true); } } \ No newline at end of file diff --git a/src/main/java/dansplugins/factionsystem/commands/PrefixCommand.java b/src/main/java/dansplugins/factionsystem/commands/PrefixCommand.java index b6e2aaa6b..79e8b2df6 100644 --- a/src/main/java/dansplugins/factionsystem/commands/PrefixCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/PrefixCommand.java @@ -10,6 +10,7 @@ import dansplugins.factionsystem.integrators.DynmapIntegrator; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.PlayerService; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -37,11 +38,13 @@ public void execute(Player player, String[] args, String key) { if (!(checkPermissions(player, permission))) return; final String newPrefix = String.join(" ", args); if (persistentData.isPrefixTaken(newPrefix)) { - player.sendMessage(translate("&c" + getText("PrefixTaken"))); + new PlayerService().sendMessageType(player, "&c" + getText("PrefixTaken") + , "PrefixTaken", false); return; } faction.setPrefix(newPrefix); - player.sendMessage(translate("&a" + getText("PrefixSet"))); + new PlayerService().sendMessageType(player, "&c" + getText("PrefixSet") + , "PrefixSet", false); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/PromoteCommand.java b/src/main/java/dansplugins/factionsystem/commands/PromoteCommand.java index f90398a75..bc840af46 100644 --- a/src/main/java/dansplugins/factionsystem/commands/PromoteCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/PromoteCommand.java @@ -10,12 +10,15 @@ import dansplugins.factionsystem.integrators.DynmapIntegrator; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; +import dansplugins.factionsystem.services.PlayerService; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import preponderous.ponder.minecraft.bukkit.tools.UUIDChecker; +import java.util.Objects; import java.util.UUID; /** @@ -40,44 +43,52 @@ public PromoteCommand(LocaleService localeService, PersistentData persistentData public void execute(Player player, String[] args, String key) { final String permission = "mf.promote"; if (!(checkPermissions(player, permission))) return; - if (args.length <= 0) { - player.sendMessage(translate("&c" + getText("UsagePromote"))); + if (args.length == 0) { + new PlayerService().sendMessageType(player, "&c" + getText("UsagePromote") + , "UsagePromote", false); return; } UUIDChecker uuidChecker = new UUIDChecker(); final UUID targetUUID = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (targetUUID == null) { - player.sendMessage(translate("&c" + getText("PlayerNotFound"))); + new PlayerService().sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(new MessageService().getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); return; } OfflinePlayer target = Bukkit.getOfflinePlayer(targetUUID); if (!target.hasPlayedBefore()) { target = Bukkit.getPlayer(args[0]); if (target == null) { - player.sendMessage(translate("&c" + getText("PlayerNotFound"))); + new PlayerService().sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(new MessageService().getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); return; } } if (!faction.isMember(targetUUID)) { - player.sendMessage(translate("&c" + getText("PlayerIsNotMemberOfFaction"))); + new PlayerService().sendMessageType(player, "&c" + getText("PlayerIsNotMemberOfFaction") + , "PlayerIsNotMemberOfFaction", false); return; } if (faction.isOfficer(targetUUID)) { - player.sendMessage(translate("&c" + getText("PlayerAlreadyOfficer"))); + new PlayerService().sendMessageType(player, "&c" + getText("PlayerAlreadyOfficer") + , "PlayerAlreadyOfficer", false); return; } if (targetUUID == player.getUniqueId()) { - player.sendMessage(translate("&c" + getText("CannotPromoteSelf"))); + new PlayerService().sendMessageType(player, "&c" + getText("CannotPromoteSelf") + , "CannotPromoteSelf", false); return; } if (faction.addOfficer(targetUUID)) { - player.sendMessage(translate("&a" + getText("PlayerPromoted"))); + new PlayerService().sendMessageType(player, "&a" + getText("PlayerPromoted") + , "PlayerPromoted", false); if (target.isOnline() && target.getPlayer() != null) { - target.getPlayer().sendMessage(translate("&a" + getText("PromotedToOfficer"))); + new PlayerService().sendMessageType(target.getPlayer(), "&a" + getText("PromotedToOfficer") + , "PromotedToOfficer", false); } } else { - player.sendMessage(translate("&c" + - getText("PlayerCantBePromotedBecauseOfLimit", faction.calculateMaxOfficers()))); + new PlayerService().sendMessageType(player, "&c" + + getText("PlayerCantBePromotedBecauseOfLimit", faction.calculateMaxOfficers()) + , Objects.requireNonNull(new MessageService().getLanguage().getString("PlayerCantBePromotedBecauseOfLimit")) + .replaceAll("#number#", String.valueOf(faction.calculateMaxOfficers())), true); } } diff --git a/src/main/java/dansplugins/factionsystem/commands/RemoveLawCommand.java b/src/main/java/dansplugins/factionsystem/commands/RemoveLawCommand.java index 23f297064..1d429bbae 100644 --- a/src/main/java/dansplugins/factionsystem/commands/RemoveLawCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/RemoveLawCommand.java @@ -10,6 +10,7 @@ import dansplugins.factionsystem.integrators.DynmapIntegrator; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.PlayerService; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -36,15 +37,18 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.removelaw"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - player.sendMessage(translate("&c" + getText("UsageRemoveLaw"))); + new PlayerService().sendMessageType(player, "&c" + getText("UsageRemoveLaw") + , "UsageRemoveLaw", false); return; } final int lawToRemove = getIntSafe(args[0], 0) - 1; if (lawToRemove < 0) { - player.sendMessage(translate("&c" + getText("UsageRemoveLaw"))); + new PlayerService().sendMessageType(player, "&c" + getText("UsageRemoveLaw") + , "UsageRemoveLaw", false); return; } - if (faction.removeLaw(lawToRemove)) player.sendMessage(translate("&a" + getText("LawRemoved"))); + if (faction.removeLaw(lawToRemove)) new PlayerService().sendMessageType(player, "&a" + getText("LawRemoved") + , "LawRemoved", false); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/RenameCommand.java b/src/main/java/dansplugins/factionsystem/commands/RenameCommand.java index 2170f38c9..bbe0d0316 100644 --- a/src/main/java/dansplugins/factionsystem/commands/RenameCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/RenameCommand.java @@ -12,12 +12,16 @@ import dansplugins.factionsystem.integrators.DynmapIntegrator; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; +import dansplugins.factionsystem.services.PlayerService; import dansplugins.factionsystem.utils.Logger; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; +import java.util.Objects; + /** * @author Callum Johnson */ @@ -45,18 +49,23 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.rename"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - player.sendMessage(translate("&c" + getText("UsageRename"))); + new PlayerService().sendMessageType(player, "&c" + getText("UsageRename") + , "UsageRename", false); return; } final String newName = String.join(" ", args).trim(); final FileConfiguration config = medievalFactions.getConfig(); if (newName.length() > config.getInt("factionMaxNameLength")) { - player.sendMessage(translate("&c" + getText("FactionNameTooLong"))); + new PlayerService().sendMessageType(player, "&c" + getText("FactionNameTooLong"), + Objects.requireNonNull(new MessageService().getLanguage().getString("FactionNameTooLong")) + .replaceAll("#name#", newName), true); return; } final String oldName = faction.getName(); if (getFaction(newName) != null) { - player.sendMessage(translate("&c" + getText("FactionAlreadyExists"))); + new PlayerService().sendMessageType(player, "&c" + getText("FactionAlreadyExists"), + Objects.requireNonNull(new MessageService().getLanguage().getString("FactionAlreadyExists")) + .replaceAll("#name#", newName), true); return; } final FactionRenameEvent renameEvent = new FactionRenameEvent(faction, oldName, newName); @@ -68,7 +77,8 @@ public void execute(Player player, String[] args, String key) { // change name faction.setName(newName); - player.sendMessage(translate("&a" + getText("FactionNameChanged"))); + new PlayerService().sendMessageType(player, "&a" + getText("FactionNameChanged") + , "FactionNameChanged", false); persistentData.updateFactionReferencesDueToNameChange(oldName, newName); diff --git a/src/main/java/dansplugins/factionsystem/commands/RevokeAccessCommand.java b/src/main/java/dansplugins/factionsystem/commands/RevokeAccessCommand.java index b3f6c2b41..a30bde654 100644 --- a/src/main/java/dansplugins/factionsystem/commands/RevokeAccessCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/RevokeAccessCommand.java @@ -10,10 +10,13 @@ import dansplugins.factionsystem.integrators.DynmapIntegrator; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; +import dansplugins.factionsystem.services.PlayerService; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import preponderous.ponder.minecraft.bukkit.tools.UUIDChecker; +import java.util.Objects; import java.util.UUID; /** @@ -39,32 +42,36 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.revokeaccess"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - player.sendMessage(translate("&c" + getText("UsageRevokeAccess"))); + new PlayerService().sendMessageType(player, "&c" + getText("UsageRevokeAccess") + , "UsageRevokeAccess", false); return; } if (args[0].equalsIgnoreCase("cancel")) { ephemeralData.getPlayersRevokingAccess().remove(player.getUniqueId()); - player.sendMessage(translate("&a" + getText("Cancelled"))); + new PlayerService().sendMessageType(player, "&c" + getText("Cancelled"), "Cancelled", false); return; } if (ephemeralData.getPlayersRevokingAccess().containsKey(player.getUniqueId())) { - player.sendMessage(translate("&c" + getText("AlreadyEnteredRevokeAccess"))); + new PlayerService().sendMessageType(player, "&c" + getText("AlreadyEnteredRevokeAccess") + , "AlreadyEnteredRevokeAccess", false); return; } UUIDChecker uuidChecker = new UUIDChecker(); final UUID targetUUID = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (targetUUID == null) { - player.sendMessage(translate("&c" + getText("PlayerNotFound"))); + new PlayerService().sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(new MessageService().getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); return; } if (targetUUID == player.getUniqueId()) { - player.sendMessage(translate("&c" + getText("CannotRevokeAccessFromSelf"))); + new PlayerService().sendMessageType(player, "&c" + getText("CannotRevokeAccessFromSelf") + , "CannotRevokeAccessFromSelf", false); return; } ephemeralData.getPlayersRevokingAccess().put( player.getUniqueId(), targetUUID ); - player.sendMessage(translate("&a" + getText("RightClickRevokeAccess"))); + new PlayerService().sendMessageType(player, "&a" + getText("RightClickRevokeAccess") + , "RightClickRevokeAccess", false); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/SetHomeCommand.java b/src/main/java/dansplugins/factionsystem/commands/SetHomeCommand.java index 8e50c685b..baebf16d5 100644 --- a/src/main/java/dansplugins/factionsystem/commands/SetHomeCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/SetHomeCommand.java @@ -11,6 +11,7 @@ import dansplugins.factionsystem.objects.domain.ClaimedChunk; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.PlayerService; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -37,16 +38,19 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.sethome"; if (!(checkPermissions(player, permission))) return; if (!chunkDataAccessor.isClaimed(player.getLocation().getChunk())) { - player.sendMessage(translate("&c" + getText("LandIsNotClaimed"))); + new PlayerService().sendMessageType(player, "&c" + getText("LandIsNotClaimed") + , "LandIsNotClaimed", false); return; } ClaimedChunk chunk = chunkDataAccessor.getClaimedChunk(player.getLocation().getChunk()); if (chunk == null || !chunk.getHolder().equalsIgnoreCase(faction.getName())) { - player.sendMessage(translate("&c" + getText("CannotSetFactionHomeInWilderness"))); + new PlayerService().sendMessageType(player, "&c" + getText("CannotSetFactionHomeInWilderness"), + "CannotSetFactionHomeInWilderness", false); return; } faction.setFactionHome(player.getLocation()); - player.sendMessage(translate("&a" + getText("FactionHomeSet"))); + new PlayerService().sendMessageType(player, "&a" + getText("FactionHomeSet"), + "FactionHomeSet", false); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/StatsCommand.java b/src/main/java/dansplugins/factionsystem/commands/StatsCommand.java index f575f5b0a..48cd71f72 100644 --- a/src/main/java/dansplugins/factionsystem/commands/StatsCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/StatsCommand.java @@ -4,12 +4,15 @@ */ package dansplugins.factionsystem.commands; +import dansplugins.factionsystem.MedievalFactions; import dansplugins.factionsystem.commands.abs.SubCommand; import dansplugins.factionsystem.data.EphemeralData; import dansplugins.factionsystem.data.PersistentData; import dansplugins.factionsystem.integrators.DynmapIntegrator; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; +import dansplugins.factionsystem.services.PlayerService; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -31,7 +34,18 @@ public void execute(Player player, String[] args, String key) { @Override public void execute(CommandSender sender, String[] args, String key) { - sender.sendMessage(ChatColor.AQUA + "=== Medieval Factions Stats ==="); - sender.sendMessage(ChatColor.AQUA + "Number of factions: " + persistentData.getNumFactions()); + if (!new MedievalFactions().USE_NEW_LANGUAGE_FILE) { + sender.sendMessage(ChatColor.AQUA + "=== Medieval Factions Stats ==="); + sender.sendMessage(ChatColor.AQUA + "Number of factions: " + persistentData.getNumFactions()); + } else { + new MessageService().getLanguage().getStringList("StatsFaction") + .forEach(s -> { + if (s.contains("#faction#")) { + s = s.replaceAll("#faction#", String.valueOf(persistentData.getNumFactions())); + } + s = new PlayerService().colorize(s); + new PlayerService().sendMessageType(sender, "", s, true); + }); + } } } \ No newline at end of file diff --git a/src/main/java/dansplugins/factionsystem/commands/SwearFealtyCommand.java b/src/main/java/dansplugins/factionsystem/commands/SwearFealtyCommand.java index d631a74d9..0eddcff29 100644 --- a/src/main/java/dansplugins/factionsystem/commands/SwearFealtyCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/SwearFealtyCommand.java @@ -11,9 +11,13 @@ import dansplugins.factionsystem.objects.domain.Faction; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; +import dansplugins.factionsystem.services.PlayerService; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import java.util.Objects; + /** * @author Callum Johnson */ @@ -37,16 +41,19 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.swearfealty"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - player.sendMessage(translate("&c" + getText("UsageSwearFealty"))); + new PlayerService().sendMessageType(player, "&c" + getText("UsageSwearFealty") + , "UsageSwearFealty", false); return; } final Faction target = getFaction(String.join(" ", args)); if (target == null) { - player.sendMessage(translate("&c" + getText("FactionNotFound"))); + new PlayerService().sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(new MessageService().getLanguage().getString("FactionNotFound")) + .replaceAll("#faction#", String.join(" ", args)), true); return; } if (!target.hasBeenOfferedVassalization(faction.getName())) { - player.sendMessage(translate("&c" + getText("AlertNotOfferedVassalizationBy"))); + new PlayerService().sendMessageType(player, "&c" + getText("AlertNotOfferedVassalizationBy") + , "AlertNotOfferedVassalizationBy", false); return; } // set vassal @@ -57,10 +64,14 @@ public void execute(Player player, String[] args, String key) { faction.setLiege(target.getName()); // inform target faction that they have a new vassal - messageFaction(target, translate("&a" + getText("AlertFactionHasNewVassal", faction.getName()))); + messageFaction(target, translate("&a" + getText("AlertFactionHasNewVassal", faction.getName())) + , Objects.requireNonNull(new MessageService().getLanguage().getString("AlertFactionHasNewVassal")) + .replaceAll("#name#", faction.getName())); // inform players faction that they have a new liege - messageFaction(faction, translate("&a" + getText("AlertFactionHasBeenVassalized", target.getName()))); + messageFaction(faction, translate("&a" + getText("AlertFactionHasBeenVassalized", target.getName())) + , Objects.requireNonNull(new MessageService().getLanguage().getString("AlertFactionHasBeenVassalized")) + .replaceAll("#name#", target.getName())); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/TransferCommand.java b/src/main/java/dansplugins/factionsystem/commands/TransferCommand.java index e5ef3e4f3..5286ad8c0 100644 --- a/src/main/java/dansplugins/factionsystem/commands/TransferCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/TransferCommand.java @@ -10,12 +10,15 @@ import dansplugins.factionsystem.integrators.DynmapIntegrator; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; +import dansplugins.factionsystem.services.PlayerService; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import preponderous.ponder.minecraft.bukkit.tools.UUIDChecker; +import java.util.Objects; import java.util.UUID; /** @@ -39,29 +42,32 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.transfer"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - player.sendMessage(translate("&c" + getText("UsageTransfer"))); + new PlayerService().sendMessageType(player, "&c" + getText("UsageTransfer") + , "UsageTransfer", false); return; } UUIDChecker uuidChecker = new UUIDChecker(); final UUID targetUUID = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (targetUUID == null) { - player.sendMessage(translate("&c" + getText("PlayerNotFound"))); + new PlayerService().sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(new MessageService().getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); return; } OfflinePlayer target = Bukkit.getOfflinePlayer(targetUUID); if (!target.hasPlayedBefore()) { target = Bukkit.getPlayer(args[0]); if (target == null) { - player.sendMessage(translate("&c" + getText("PlayerNotFound"))); + new PlayerService().sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(new MessageService().getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); return; } } if (!faction.isMember(targetUUID)) { - player.sendMessage(translate("&c" + getText("PlayerIsNotInYourFaction"))); + new PlayerService().sendMessageType(player, "&c" + getText("PlayerIsNotInYourFaction") + , "PlayerIsNotInYourFaction", false); return; } if (targetUUID.equals(player.getUniqueId())) { - player.sendMessage(translate("&c" + getText("CannotTransferToSelf"))); + new PlayerService().sendMessageType(player, "&c" + getText("CannotTransferToSelf") + , "CannotTransferToSelf", false); return; } @@ -69,9 +75,13 @@ public void execute(Player player, String[] args, String key) { // set owner faction.setOwner(targetUUID); - player.sendMessage(translate("&b" + getText("OwnerShipTransferredTo", args[0]))); + new PlayerService().sendMessageType(player, "&b" + getText("OwnerShipTransferredTo", args[0]) + , Objects.requireNonNull(new MessageService().getLanguage().getString("OwnerShipTransferredTo")) + .replaceAll("#name#", args[0]), true); if (target.isOnline() && target.getPlayer() != null) { // Message if we can :) - target.getPlayer().sendMessage(translate("&a" + getText("OwnershipTransferred", faction.getName()))); + new PlayerService().sendMessageType(target.getPlayer(), "&a" + getText("OwnershipTransferred", faction.getName()), + Objects.requireNonNull(new MessageService().getLanguage().getString("'OwnershipTransferred")) + .replaceAll("#name#", faction.getName()), true); } } diff --git a/src/main/java/dansplugins/factionsystem/commands/UnclaimCommand.java b/src/main/java/dansplugins/factionsystem/commands/UnclaimCommand.java index a684afb36..6141ddf25 100644 --- a/src/main/java/dansplugins/factionsystem/commands/UnclaimCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/UnclaimCommand.java @@ -10,9 +10,13 @@ import dansplugins.factionsystem.integrators.DynmapIntegrator; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; +import dansplugins.factionsystem.services.PlayerService; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import java.util.Objects; + /** * @author Callum Johnson */ @@ -39,24 +43,27 @@ public void execute(Player player, String[] args, String key) { if ((boolean) faction.getFlags().getFlag("mustBeOfficerToManageLand")) { // officer or owner rank required if (!faction.isOfficer(player.getUniqueId()) && !faction.isOwner(player.getUniqueId()) && !isPlayerBypassing) { - player.sendMessage(translate("&c" + "You're not able to claim land at this time.")); + new PlayerService().sendMessageType(player, "&c" + "You're not able to claim land at this time." + , "NotAbleToClaim", false); return; } } if (args.length == 0) { chunkDataAccessor.removeChunkAtPlayerLocation(player, faction); dynmapIntegrator.updateClaims(); - player.sendMessage("Unclaimed your current claim."); + new PlayerService().sendMessageType(player, "&aUnclaimed your current claim." + , "UnClaimed", false); return; } // https://github.com/dmccoystephenson/Medieval-Factions/issues/836 int radius = getIntSafe(args[0], 1); if (radius <= 0) { radius = 1; - player.sendMessage("Your radius wasn't properly recognised, defaulting to 1."); } chunkDataAccessor.radiusUnclaimAtLocation(radius, player, faction); - player.sendMessage("Unclaimed radius of " + radius + " claims around you!"); + new PlayerService().sendMessageType(player, "Unclaimed radius of " + radius + " claims around you!" + , Objects.requireNonNull(new MessageService().getLanguage().getString("UnClaimedRadius")) + .replaceAll("#number#", String.valueOf(radius)), true); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/UnclaimallCommand.java b/src/main/java/dansplugins/factionsystem/commands/UnclaimallCommand.java index be6dc9ef9..a979cf068 100644 --- a/src/main/java/dansplugins/factionsystem/commands/UnclaimallCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/UnclaimallCommand.java @@ -11,9 +11,13 @@ import dansplugins.factionsystem.objects.domain.Faction; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; +import dansplugins.factionsystem.services.PlayerService; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import java.util.Objects; + /** * @author Callum Johnson */ @@ -50,35 +54,43 @@ public void execute(CommandSender sender, String[] args, String key) { if (args.length == 0) { // Self if (!(sender instanceof Player)) { - sender.sendMessage(translate(getText("OnlyPlayersCanUseCommand"))); + new PlayerService().sendMessageType(sender, getText("OnlyPlayersCanUseCommand") + , "OnlyPlayersCanUseCommand", false); return; } if (!(checkPermissions(sender, "mf.unclaimall"))) return; faction = getPlayerFaction(sender); if (faction == null) { - sender.sendMessage(translate("&c" + getText("AlertMustBeInFactionToUseCommand"))); + new PlayerService().sendMessageType(sender, "&c" + getText("AlertMustBeInFactionToUseCommand"), + "AlertMustBeInFactionToUseCommand", false); return; } if (!faction.isOwner(((Player) sender).getUniqueId())) { - sender.sendMessage(translate("&c" + getText("AlertMustBeOwnerToUseCommand"))); + new PlayerService().sendMessageType(sender, "&c" + getText("AlertMustBeOwnerToUseCommand"), + "AlertMustBeOwnerToUseCommand", false); return; } } else { if (!(checkPermissions(sender, "mf.unclaimall.others", "mf.admin"))) return; faction = getFaction(String.join(" ", args)); if (faction == null) { - sender.sendMessage(translate("&c" + getText("FactionNotFound"))); + new PlayerService().sendMessageType(sender, "&c" + getText("FactionNotFound"), + Objects.requireNonNull(new MessageService().getLanguage().getString("FactionNotFound")) + .replaceAll("#faction#", String.join(" ", args)), true); return; } } // remove faction home faction.setFactionHome(null); - messageFaction(faction, translate("&c" + getText("AlertFactionHomeRemoved"))); + messageFaction(faction, translate("&c" + getText("AlertFactionHomeRemoved")) + , new MessageService().getLanguage().getString("AlertFactionHomeRemoved")); // remove claimed chunks chunkDataAccessor.removeAllClaimedChunks(faction.getName()); dynmapIntegrator.updateClaims(); - sender.sendMessage(translate("&a" + getText("AllLandUnclaimedFrom", faction.getName()))); + new PlayerService().sendMessageType(sender, "&a" + getText("AllLandUnclaimedFrom", faction.getName()) + , Objects.requireNonNull(new MessageService().getLanguage().getString("AllLandUnclaimedFrom")) + .replaceAll("#name#", faction.getName()), false); // remove locks associated with this faction persistentData.removeAllLocks(faction.getName()); diff --git a/src/main/java/dansplugins/factionsystem/commands/UnlockCommand.java b/src/main/java/dansplugins/factionsystem/commands/UnlockCommand.java index 2db19a6aa..8f70fec98 100644 --- a/src/main/java/dansplugins/factionsystem/commands/UnlockCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/UnlockCommand.java @@ -10,6 +10,7 @@ import dansplugins.factionsystem.integrators.DynmapIntegrator; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.PlayerService; import dansplugins.factionsystem.utils.RelationChecker; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -44,7 +45,8 @@ public void execute(Player player, String[] args, String key) { if (args.length != 0 && args[0].equalsIgnoreCase("cancel")) { ephemeralData.getUnlockingPlayers().remove(player.getUniqueId()); ephemeralData.getForcefullyUnlockingPlayers().remove(player.getUniqueId()); // just in case the player tries to cancel a forceful unlock without using the force command - player.sendMessage(translate("&c" + getText("AlertUnlockingCancelled"))); + new PlayerService().sendMessageType(player, "&c" + getText("AlertUnlockingCancelled") + , "AlertUnlockingCancelled", false); return; } if (!ephemeralData.getUnlockingPlayers().contains(player.getUniqueId())) { @@ -53,7 +55,8 @@ public void execute(Player player, String[] args, String key) { ephemeralData.getLockingPlayers().remove(player.getUniqueId()); // inform them they need to right click the block that they want to lock or type /mf lock cancel to cancel it - player.sendMessage(translate("&a" + getText("RightClickUnlock"))); + new PlayerService().sendMessageType(player, "&a" + getText("RightClickUnlock") + , "RightClickUnlock", false); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/VassalizeCommand.java b/src/main/java/dansplugins/factionsystem/commands/VassalizeCommand.java index 469c8bb88..53121aa10 100644 --- a/src/main/java/dansplugins/factionsystem/commands/VassalizeCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/VassalizeCommand.java @@ -11,10 +11,14 @@ import dansplugins.factionsystem.objects.domain.Faction; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; +import dansplugins.factionsystem.services.PlayerService; import dansplugins.factionsystem.utils.Logger; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import java.util.Objects; + /** * @author Callum Johnson */ @@ -40,27 +44,32 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.vassalize"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - player.sendMessage(translate("&c" + getText("UsageVassalize"))); + new PlayerService().sendMessageType(player, "&c" + getText("UsageVassalize") + , "UsageVassalize", false); return; } final Faction target = getFaction(String.join(" ", args)); if (target == null) { - player.sendMessage(translate("&c" + getText("FactionNotFound"))); + new PlayerService().sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(new MessageService().getLanguage().getString("FactionNotFound")) + .replaceAll("#faction#", String.join(" ", args)), true); return; } // make sure player isn't trying to vassalize their own faction if (faction.getName().equalsIgnoreCase(target.getName())) { - player.sendMessage(translate("&c" + getText("CannotVassalizeSelf"))); + new PlayerService().sendMessageType(player, "&c" + getText("CannotVassalizeSelf") + , "CannotVassalizeSelf", false); return; } // make sure player isn't trying to vassalize their liege if (target.getName().equalsIgnoreCase(faction.getLiege())) { - player.sendMessage(translate("&c" + getText("CannotVassalizeLiege"))); + new PlayerService().sendMessageType(player, "&c" + getText("CannotVassalizeLiege") + , "CannotVassalizeLiege", false); return; } // make sure player isn't trying to vassalize a vassal if (target.hasLiege()) { - player.sendMessage(translate("&c" + getText("CannotVassalizeVassal"))); + new PlayerService().sendMessageType(player, "&c" + getText("CannotVassalizeVassal") + , "CannotVassalizeVassal", false); return; } // make sure this vassalization won't result in a vassalization loop @@ -74,10 +83,14 @@ public void execute(Player player, String[] args, String key) { // inform all players in that faction that they are trying to be vassalized messageFaction(target, translate("&a" + - getText("AlertAttemptedVassalization", faction.getName(), faction.getName()))); + getText("AlertAttemptedVassalization", faction.getName(), faction.getName())) + , Objects.requireNonNull(new MessageService().getLanguage().getString("AlertAttemptedVassalization")) + .replaceAll("#name#", faction.getName())); // inform all players in players faction that a vassalization offer was sent - messageFaction(faction, translate("&a" + getText("AlertFactionAttemptedToVassalize", target.getName()))); + messageFaction(faction, translate("&a" + getText("AlertFactionAttemptedToVassalize", target.getName())) + , Objects.requireNonNull(new MessageService().getLanguage().getString("AlertFactionAttemptedToVassalize")) + .replaceAll("#name#", target.getName())); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/WhoCommand.java b/src/main/java/dansplugins/factionsystem/commands/WhoCommand.java index f0da57c18..d3a129195 100644 --- a/src/main/java/dansplugins/factionsystem/commands/WhoCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/WhoCommand.java @@ -11,11 +11,14 @@ import dansplugins.factionsystem.objects.domain.Faction; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; +import dansplugins.factionsystem.services.PlayerService; import dansplugins.factionsystem.utils.extended.Messenger; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import preponderous.ponder.minecraft.bukkit.tools.UUIDChecker; +import java.util.Objects; import java.util.UUID; /** @@ -41,18 +44,20 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.who"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - player.sendMessage(translate("&c" + getText("UsageWho"))); + new PlayerService().sendMessageType(player, "&c" + getText("UsageWho") + , "UsageWho", false); return; } UUIDChecker uuidChecker = new UUIDChecker(); final UUID targetUUID = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (targetUUID == null) { - player.sendMessage(translate("&c" + getText("PlayerNotFound"))); + new PlayerService().sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(new MessageService().getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); return; } final Faction temp = getPlayerFaction(targetUUID); if (temp == null) { - player.sendMessage(translate("&c" + getText("PlayerIsNotInAFaction"))); + new PlayerService().sendMessageType(player, "&c" + getText("PlayerIsNotInAFaction") + , "PlayerIsNotInAFaction", false); return; } messenger.sendFactionInfo(player, temp, diff --git a/src/main/java/dansplugins/factionsystem/commands/abs/SubCommand.java b/src/main/java/dansplugins/factionsystem/commands/abs/SubCommand.java index c0bfd5f22..f80fa8763 100644 --- a/src/main/java/dansplugins/factionsystem/commands/abs/SubCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/abs/SubCommand.java @@ -4,7 +4,6 @@ */ package dansplugins.factionsystem.commands.abs; -import dansplugins.factionsystem.MedievalFactions; import dansplugins.factionsystem.data.EphemeralData; import dansplugins.factionsystem.data.PersistentData; import dansplugins.factionsystem.integrators.DynmapIntegrator; @@ -197,9 +196,8 @@ public boolean isCommand(String name) { public boolean checkPermissions(CommandSender sender, String... permission) { boolean has = false; for (String perm : permission) { - if (has = sender.hasPermission(perm)) { - break; - } + has = sender.hasPermission(perm); + break; } if (!has) { new PlayerService().sendMessageType(sender, translate("&c" + getText("PermissionNeeded", permission[0])), Objects.requireNonNull(new MessageService().getLanguage().getString("PermissionNeeded")).replaceAll("#permission#", permission[0]), true); diff --git a/src/main/resources/language.yml b/src/main/resources/language.yml index a27ea2cc7..068c55ca6 100644 --- a/src/main/resources/language.yml +++ b/src/main/resources/language.yml @@ -115,6 +115,85 @@ CannotKickOwner: "&cYou can't kick the owner." CannotKickSelf: "&cYou can't kick yourself." HasBeenKickedFrom: "&a#name# has been kicked from #faction#" AlertKicked: "You have been kicked from your faction by #name#." +AlertNoLaws: "&cYour faction doesn't have any laws." +FactionDoesNotHaveLaws: "That faction doesn't have any laws." +LawsTitle: "&a== Laws of #name# ==" +AlertLeftFaction: "&cYou left your faction." +AlertLeftFactionTeam: "&c#name# has left #facton#." +CurrentlyNoFactions: "&cThere are currently no factions." +FactionsTitle: "&a== Factions ==" +LockingCancelled: "&cLocking cancelled." +RightClickLock: "&aRight click a chest or door to lock it. (Type /mf lock cancel to cancel)" +UsageMakePeace: "&cUsage: /mf makepeace (faction-name)" +CannotMakePeaceWithSelf: "&cYou can't make peace with your own faction." +AlertAlreadyRequestedPeace: "&cYou've already requested peace with this faction." +FactionNotEnemy: "&cThat faction is not your enemy." +AttemptedPeace: "&aAttempted to make peace with #name#" +HasAttemptedToMakePeaceWith: "&a#f1# has attempted to make peace with #f2#." +AlertCurrentPowerLevel: "&aYour current power level is #power#/#max#." +CurrentPowerLevel: "&a#name# current power level is #power#/#max#." +PrefixSet: "&aPrefix set." +PrefixTaken: "&cThis prefix has already been taken." +UsagePromote: "&cUsage: /mf promote (player-name)" +PlayerIsNotMemberOfFaction: "&cThat player isn't a member of your faction." +PlayerAlreadyOfficer: "&cPlayer is already an officer." +CannotPromoteSelf: "&cYou cannot promote yourself." +PlayerPromoted: "&aPlayer promoted." +PromotedToOfficer: "&aYou have been promoted to officer status in your faction." +PlayerCantBePromotedBecauseOfLimit: "&cPlayer can't be promoted because you have reached your limit. Limit: #number#" +UsageRemoveLaw: "&cUsage: /mf removelaw (number)" +LawRemoved: "&aLaw removed." +UsageRename: "&cUsage: /mf rename (newName)" +FactionNameChanged: "&cFaction name changed." +UsageRevokeAccess: "&cUsage: /mf revokeaccess (player-name)" +AlreadyEnteredRevokeAccess: "&cYou have already entered this command. Type '/mf revokeaccess cancel' to cancel." +CannotRevokeAccessFromSelf: "&cYou cannot revoke access from yourself." +RightClickRevokeAccess: "&aRight click a locked block to revoke this player's access to it. Type '/mf revokeaccess cancel' to cancel." +LandIsNotClaimed: "&cThis land isn't claimed." +CannotSetFactionHomeInWilderness: "&cYou can't set your faction home on land your faction hasn't claimed." +FactionHomeSet: "&aFaction home set." +UsageSwearFealty: "&cUsage: /mf swearfealty (faction-name)" +AlertNotOfferedVassalizationBy: "&cYou haven't been offered vassalization by this faction." +AlertFactionHasBeenVassalized: "&aYour faction has been vassalized and has a new liege: #name#" +AlertFactionHasNewVassal: "&aYour faction has a new vassal: #name#" +UsageTransfer: "&cUsage: /mf transfer (player-name)" +PlayerIsNotInYourFaction: "&cThat player isn't in your faction." +CannotTransferToSelf: "&cYou can't transfer ownership of your faction to yourself." +OwnerShipTransferredTo: "&aOwnership transferred to #name#" +OwnershipTransferred: "&aOwnership of #name# has been transferred to you." +AlertMustBeOwnerToUseCommand: "&cYou need to be the owner of a faction to use this command." +AlertFactionHomeRemoved: "&cYour faction home has been removed." +AllLandUnclaimedFrom: "&aAll land unclaimed from #name#." +NotAbleToClaim: "&cYou're not able to claim land at this time." +UnClaimed: "&aUnclaimed your current claim." +UnClaimedRadius: "&aUnclaimed radius of #number# claims around you!." +AlertUnlockingCancelled: "&cUnlocking cancelled." +RightClickUnlock: "&aRight click a chest or door to unlock it. (Type /mf unlock cancel to cancel)" +UsageVassalize: "&cUsage: /mf vassalize (faction-name)" +CannotVassalizeSelf: "&cYou can't vassalize your own faction." +CannotVassalizeLiege: "&cYou can't vassalize your liege." +CannotVassalizeVassal: "&cYou can't vassalize a faction who already has a liege." +AlertAttemptedVassalization: "&a#name# has attempted to vassalize your faction. If you are the owner, type '/mf swearfealty #name#' to accept." +AlertFactionAttemptedToVassalize: "&cYour faction has attempted to vassalize #name#." +UsageWho: "&cUsage: /mf who (player-name)" +PlayerIsNotInAFaction: "&cThat player isn't in a faction." +StatsFaction: + - "&a=== Medieval Factions Stats ===" + - "&aNumber of factions: #faction#" +MembersFaction: + Title: "&b---------- &aMembers of #faction# &b----------" + SubTitle: "&b---------- &aMembers of #faction# &b----------" + Message: "&f#color##rank# - #name#" + Rank: + Owner: + Rank: "***" + Color: "&c" + Officer: + Rank: "**" + Color: "&b" + Member: + Rank: "*" + Color: "&a" DuelHelp: - "&bSub-commands:" - "&b/mf duel challenge (player) (time limit in seconds)" From c2dd629fd24e36c8bf3b10170568d5e8a2cbd6e8 Mon Sep 17 00:00:00 2001 From: VoChiDanh Date: Wed, 24 Aug 2022 22:01:24 +0700 Subject: [PATCH 03/24] I have a few class file that I think I'll finish, I'll continue tomorrow (p7) --- .../factionsystem/data/PersistentData.java | 62 ++++++++++------ .../eventhandlers/InteractionHandler.java | 19 ++--- .../eventhandlers/MoveHandler.java | 3 +- .../objects/helper/FactionFlags.java | 10 +-- .../services/CommandService.java | 20 ++++-- .../factionsystem/services/GateService.java | 72 ++++++++++++------- .../utils/extended/Messenger.java | 6 +- src/main/resources/language.yml | 54 +++++++++++++- 8 files changed, 179 insertions(+), 67 deletions(-) diff --git a/src/main/java/dansplugins/factionsystem/data/PersistentData.java b/src/main/java/dansplugins/factionsystem/data/PersistentData.java index 2901269cb..1b5521605 100644 --- a/src/main/java/dansplugins/factionsystem/data/PersistentData.java +++ b/src/main/java/dansplugins/factionsystem/data/PersistentData.java @@ -17,6 +17,8 @@ import dansplugins.factionsystem.objects.domain.*; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; +import dansplugins.factionsystem.services.PlayerService; import dansplugins.factionsystem.utils.InteractionAccessChecker; import dansplugins.factionsystem.utils.Logger; import dansplugins.factionsystem.utils.extended.BlockChecker; @@ -29,6 +31,7 @@ import java.io.*; import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; import java.time.ZonedDateTime; import java.util.*; import java.util.stream.Collectors; @@ -56,7 +59,7 @@ public class PersistentData { private final ArrayList powerRecords = new ArrayList<>(); private final ArrayList activityRecords = new ArrayList<>(); private final ArrayList lockedBlocks = new ArrayList<>(); - private final HashSet wars = new HashSet<>(); + final HashSet wars = new HashSet<>(); private final ChunkDataAccessor chunkDataAccessor = new ChunkDataAccessor(); private final LocalStorageService localStorageService = new LocalStorageService(this); @@ -433,7 +436,8 @@ public boolean isBlockInGate(Block block, Player player) { for (Faction faction : factions) { for (Gate gate : faction.getGates()) { if (gate.hasBlock(block)) { - player.sendMessage(ChatColor.RED + String.format(localeService.get("BlockIsPartOfGateMustRemoveGate"), gate.getName())); + new PlayerService().sendMessageType(player, ChatColor.RED + String.format(localeService.get("BlockIsPartOfGateMustRemoveGate"), gate.getName()) + , Objects.requireNonNull(new MessageService().getLanguage().getString("BlockIsPartOfGateMustRemoveGate")).replaceAll("#name#", gate.getName()), true); return true; } } @@ -463,7 +467,9 @@ public void initiatePowerIncreaseForAllPlayers() { private void initiatePowerIncrease(PowerRecord powerRecord) { if (powerRecord.getPower() < powerRecord.maxPower() && Objects.requireNonNull(getServer().getPlayer(powerRecord.getPlayerUUID())).isOnline()) { powerRecord.increasePower(); - Objects.requireNonNull(getServer().getPlayer(powerRecord.getPlayerUUID())).sendMessage(ChatColor.GREEN + String.format(localeService.get("AlertPowerLevelIncreasedBy"), configService.getInt("powerIncreaseAmount"))); + new PlayerService().sendMessageType(getServer().getPlayer(powerRecord.getPlayerUUID()), ChatColor.GREEN + String.format(localeService.get("AlertPowerLevelIncreasedBy"), configService.getInt("powerIncreaseAmount")) + , Objects.requireNonNull(new MessageService().getLanguage().getString("AlertPowerLevelIncreasedBy")) + .replaceAll("#number#", String.valueOf(configService.getInt("powerIncreaseAmount"))), true); } } @@ -476,7 +482,7 @@ public void disbandAllZeroPowerFactions() { } for (String factionName : factionsToDisband) { - messenger.sendAllPlayersInFactionMessage(getFaction(factionName), ChatColor.RED + localeService.get("AlertDisbandmentDueToZeroPower")); + messenger.sendAllPlayersInFactionMessage(getFaction(factionName), new PlayerService().getMessageType(ChatColor.RED + localeService.get("AlertDisbandmentDueToZeroPower"), new MessageService().getLanguage().getString("AlertDisbandmentDueToZeroPower"))); removeFaction(factionName); System.out.printf((localeService.get("DisbandmentDueToZeroPower")) + "%n", factionName); } @@ -631,7 +637,9 @@ public void radiusClaimAtLocation(int depth, Player claimant, Location location, // check if depth is valid if (depth < 0 || depth > maxClaimRadius) { - claimant.sendMessage(ChatColor.RED + String.format(localeService.get("RadiusRequirement"), maxClaimRadius)); + new PlayerService().sendMessageType(claimant, ChatColor.RED + String.format(localeService.get("RadiusRequirement"), maxClaimRadius), + Objects.requireNonNull(new MessageService().getLanguage().getString("RadiusRequirement")) + .replaceAll("#number#", String.valueOf(maxClaimRadius)), true); return; } @@ -702,10 +710,12 @@ public void removeChunkAtPlayerLocation(Player player, Faction playersFaction) { ClaimedChunk chunk = isChunkClaimed(playerCoords[0], playerCoords[1], Objects.requireNonNull(player.getLocation().getWorld()).getName()); if (chunk != null) { removeChunk(chunk, player, getFaction(chunk.getHolder())); - player.sendMessage(ChatColor.GREEN + localeService.get("LandClaimedUsingAdminBypass")); + new PlayerService().sendMessageType(player, ChatColor.GREEN + localeService.get("LandClaimedUsingAdminBypass") + , "LandClaimedUsingAdminBypass", false); return; } - player.sendMessage(ChatColor.RED + localeService.get("LandNotCurrentlyClaimed")); + new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("LandNotCurrentlyClaimed") + , "LandNotCurrentlyClaimed", false); return; } @@ -718,13 +728,15 @@ public void removeChunkAtPlayerLocation(Player player, Faction playersFaction) { // ensure that the chunk is claimed by the player's faction. if (!chunk.getHolder().equalsIgnoreCase(playersFaction.getName())) { - player.sendMessage(ChatColor.RED + String.format(localeService.get("LandClaimedBy"), chunk.getHolder())); + new PlayerService().sendMessageType(player, ChatColor.RED + String.format(localeService.get("LandClaimedBy"), chunk.getHolder()) + , Objects.requireNonNull(new MessageService().getLanguage().getString("LandClaimedBy")).replaceAll("#player#", chunk.getHolder()), true); return; } // initiate removal removeChunk(chunk, player, playersFaction); - player.sendMessage(ChatColor.GREEN + localeService.get("LandUnclaimed")); + new PlayerService().sendMessageType(player, ChatColor.GREEN + localeService.get("LandUnclaimed"), + "LandUnclaimed", false); } /** @@ -826,7 +838,8 @@ public void informPlayerIfTheirLandIsInDanger(Player player) { Faction faction = getPlayersFaction(player.getUniqueId()); if (faction != null) { if (isFactionExceedingTheirDemesneLimit(faction)) { - player.sendMessage(ChatColor.RED + localeService.get("AlertMoreClaimedChunksThanPower")); + new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("AlertMoreClaimedChunksThanPower") + , "AlertMoreClaimedChunksThanPower", false); } } } @@ -944,7 +957,8 @@ private void claimChunkAtLocation(Player claimant, double[] chunkCoords, World w if (configService.getBoolean("limitLand")) { // if at demesne limit if (!(getChunksClaimedByFaction(claimantsFaction.getName()) < claimantsFaction.getCumulativePowerLevel())) { - claimant.sendMessage(ChatColor.RED + localeService.get("AlertReachedDemesne")); + new PlayerService().sendMessageType(claimant, ChatColor.RED + localeService.get("AlertReachedDemesne") + , "AlertReachedDemesne", false); return; } } @@ -957,20 +971,23 @@ private void claimChunkAtLocation(Player claimant, double[] chunkCoords, World w // if holder is player's faction if (targetFaction.getName().equalsIgnoreCase(claimantsFaction.getName()) && !claimantsFaction.getAutoClaimStatus()) { - claimant.sendMessage(ChatColor.RED + localeService.get("LandAlreadyClaimedByYourFaction")); + new PlayerService().sendMessageType(claimant, ChatColor.RED + localeService.get("LandAlreadyClaimedByYourFaction") + , "LandAlreadyClaimedByYourFaction", false); return; } // if not at war with target faction if (!claimantsFaction.isEnemy(targetFaction.getName())) { - claimant.sendMessage(ChatColor.RED + "You must be at war with a faction to conquer land from them."); + new PlayerService().sendMessageType(claimant, ChatColor.RED + "You must be at war with a faction to conquer land from them." + , "IsNotEnemy", false); return; } // surrounded chunk protection check if (configService.getBoolean("surroundedChunksProtected")) { if (isClaimedChunkSurroundedByChunksClaimedBySameFaction(chunk)) { - claimant.sendMessage(ChatColor.RED + localeService.get("SurroundedChunkProtected")); + new PlayerService().sendMessageType(claimant, ChatColor.RED + localeService.get("SurroundedChunkProtected"), + "SurroundedChunkProtected", false); return; } } @@ -980,7 +997,8 @@ private void claimChunkAtLocation(Player claimant, double[] chunkCoords, World w // if target faction does not have more land than their demesne limit if (!(targetFactionsCumulativePowerLevel < chunksClaimedByTargetFaction)) { - claimant.sendMessage(ChatColor.RED + localeService.get("TargetFactionNotOverClaiming")); + new PlayerService().sendMessageType(claimant, ChatColor.RED + localeService.get("TargetFactionNotOverClaiming") + , "TargetFactionNotOverClaiming", false); return; } @@ -997,9 +1015,12 @@ private void claimChunkAtLocation(Player claimant, double[] chunkCoords, World w Chunk toClaim = world.getChunkAt((int) chunkCoords[0], (int) chunkCoords[1]); addClaimedChunk(toClaim, claimantsFaction, claimant.getWorld()); - claimant.sendMessage(ChatColor.GREEN + String.format(localeService.get("AlertLandConqueredFromAnotherFaction"), targetFaction.getName(), getChunksClaimedByFaction(claimantsFaction.getName()), claimantsFaction.getCumulativePowerLevel())); + new PlayerService().sendMessageType(claimant, ChatColor.GREEN + String.format(localeService.get("AlertLandConqueredFromAnotherFaction"), targetFaction.getName(), getChunksClaimedByFaction(claimantsFaction.getName()), claimantsFaction.getCumulativePowerLevel()) + , Objects.requireNonNull(new MessageService().getLanguage().getString("AlertLandConqueredFromAnotherFaction")).replaceAll("#name", targetFaction.getName()).replaceAll("#number#", String.valueOf(getChunksClaimedByFaction(claimantsFaction.getName()))).replaceAll("#max#", String.valueOf(claimantsFaction.getCumulativePowerLevel())), true); - messenger.sendAllPlayersInFactionMessage(targetFaction, ChatColor.RED + String.format(localeService.get("AlertLandConqueredFromYourFaction"), claimantsFaction.getName())); + messenger.sendAllPlayersInFactionMessage(targetFaction, new PlayerService() + .getMessageType(ChatColor.RED + String.format(localeService.get("AlertLandConqueredFromYourFaction"), claimantsFaction.getName()) + , Objects.requireNonNull(new MessageService().getLanguage().getString("AlertLandConqueredFromYourFaction")).replaceAll("#number#", claimantsFaction.getName()))); } } else { Chunk toClaim = world.getChunkAt((int) chunkCoords[0], (int) chunkCoords[1]); @@ -1008,7 +1029,8 @@ private void claimChunkAtLocation(Player claimant, double[] chunkCoords, World w if (!claimEvent.isCancelled()) { // chunk not already claimed addClaimedChunk(toClaim, claimantsFaction, claimant.getWorld()); - claimant.sendMessage(ChatColor.GREEN + String.format(localeService.get("AlertLandClaimed"), getChunksClaimedByFaction(claimantsFaction.getName()), claimantsFaction.getCumulativePowerLevel())); + new PlayerService().sendMessageType(claimant, ChatColor.GREEN + String.format(localeService.get("AlertLandClaimed"), getChunksClaimedByFaction(claimantsFaction.getName()), claimantsFaction.getCumulativePowerLevel()) + , Objects.requireNonNull(new MessageService().getLanguage().getString("AlertLandClaimed")).replaceAll("#number#", String.valueOf(getChunksClaimedByFaction(claimantsFaction.getName()))).replaceAll("#max#", String.valueOf(claimantsFaction.getCumulativePowerLevel())), true); } } } @@ -1102,7 +1124,7 @@ private void removeChunk(ClaimedChunk chunkToRemove, Player unclaimingPlayer, Fa && chunkToRemove.getWorldName().equalsIgnoreCase(Objects.requireNonNull(unclaimingPlayer.getLocation().getWorld()).getName())) { // remove faction home holdingFaction.setFactionHome(null); - messenger.sendAllPlayersInFactionMessage(holdingFaction, ChatColor.RED + localeService.get("AlertFactionHomeRemoved")); + messenger.sendAllPlayersInFactionMessage(holdingFaction, new PlayerService().getMessageType(ChatColor.RED + localeService.get("AlertFactionHomeRemoved"), new MessageService().getLanguage().getString("AlertFactionHomeRemoved"))); } } @@ -1393,7 +1415,7 @@ private void saveWars() { private void writeOutFiles(File file, List> saveData) { try { file.createNewFile(); - OutputStreamWriter outputStreamWriter = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8); + OutputStreamWriter outputStreamWriter = new OutputStreamWriter(Files.newOutputStream(file.toPath()), StandardCharsets.UTF_8); outputStreamWriter.write(gson.toJson(saveData)); outputStreamWriter.close(); } catch (IOException e) { diff --git a/src/main/java/dansplugins/factionsystem/eventhandlers/InteractionHandler.java b/src/main/java/dansplugins/factionsystem/eventhandlers/InteractionHandler.java index b65c21869..5361c6c07 100644 --- a/src/main/java/dansplugins/factionsystem/eventhandlers/InteractionHandler.java +++ b/src/main/java/dansplugins/factionsystem/eventhandlers/InteractionHandler.java @@ -9,9 +9,7 @@ import dansplugins.factionsystem.data.PersistentData; import dansplugins.factionsystem.objects.domain.ClaimedChunk; import dansplugins.factionsystem.objects.domain.LockedBlock; -import dansplugins.factionsystem.services.GateService; -import dansplugins.factionsystem.services.LocaleService; -import dansplugins.factionsystem.services.LockService; +import dansplugins.factionsystem.services.*; import dansplugins.factionsystem.utils.InteractionAccessChecker; import dansplugins.factionsystem.utils.extended.BlockChecker; import org.bukkit.ChatColor; @@ -83,7 +81,8 @@ public void handle(BlockBreakEvent event) { boolean isOwner = persistentData.getLockedBlock(block).getOwner().equals(player.getUniqueId()); if (!isOwner) { event.setCancelled(true); - player.sendMessage(ChatColor.RED + localeService.get("AlertNonOwnership")); + new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("AlertNonOwnership") + , "AlertNonOwnership", false); return; } @@ -125,7 +124,8 @@ public void handle(BlockPlaceEvent event) { if (blockChecker.isChest(event.getBlock())) { boolean isNextToNonOwnedLockedChest = blockChecker.isNextToNonOwnedLockedChest(event.getPlayer(), event.getBlock()); if (isNextToNonOwnedLockedChest) { - player.sendMessage(ChatColor.RED + localeService.get("CannotPlaceChestsNextToUnownedLockedChests")); + new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("CannotPlaceChestsNextToUnownedLockedChests") + , "CannotPlaceChestsNextToUnownedLockedChests", false); event.setCancelled(true); return; } @@ -168,7 +168,8 @@ public void handle(BlockPlaceEvent event) { boolean isUnderOrAboveNonOwnedLockedChest = blockChecker.isUnderOrAboveNonOwnedLockedChest(event.getPlayer(), event.getBlock()); if (isNextToNonOwnedLockedChest || isUnderOrAboveNonOwnedLockedChest) { event.setCancelled(true); - player.sendMessage(ChatColor.RED + localeService.get("CannotPlaceHoppersNextToUnownedLockedChests")); + new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("CannotPlaceHoppersNextToUnownedLockedChests") + , "CannotPlaceHoppersNextToUnownedLockedChests", false); } } } @@ -197,7 +198,9 @@ public void handle(PlayerInteractEvent event) { if (!playerHasAccess && !isPlayerBypassing) { UUIDChecker uuidChecker = new UUIDChecker(); String owner = uuidChecker.findPlayerNameBasedOnUUID(lockedBlock.getOwner()); - player.sendMessage(ChatColor.RED + String.format(localeService.get("LockedBy"), owner)); + new PlayerService().sendMessageType(player, ChatColor.RED + String.format(localeService.get("LockedBy"), owner) + , Objects.requireNonNull(new MessageService().getLanguage().getString("LockedBy")) + .replaceAll("#name#", owner), true); event.setCancelled(true); return; } @@ -225,7 +228,7 @@ public void handle(PlayerInteractEvent event) { } else { if (isPlayerUsingAnAccessCommand(player)) { - player.sendMessage(ChatColor.RED + localeService.get("BlockIsNotLocked")); + new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("BlockIsNotLocked"), "BlockIsNotLocked", false); } } diff --git a/src/main/java/dansplugins/factionsystem/eventhandlers/MoveHandler.java b/src/main/java/dansplugins/factionsystem/eventhandlers/MoveHandler.java index 8418801dd..af9e9b26c 100644 --- a/src/main/java/dansplugins/factionsystem/eventhandlers/MoveHandler.java +++ b/src/main/java/dansplugins/factionsystem/eventhandlers/MoveHandler.java @@ -10,6 +10,7 @@ import dansplugins.factionsystem.objects.domain.ClaimedChunk; import dansplugins.factionsystem.objects.domain.Faction; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.PlayerService; import dansplugins.factionsystem.utils.TerritoryOwnerNotifier; import org.bukkit.ChatColor; import org.bukkit.entity.Player; @@ -97,7 +98,7 @@ private void initiateAutoclaimCheck(Player player) { if (notAtDemesneLimit(playersFaction)) { scheduleClaiming(player, playersFaction); } else { - player.sendMessage(ChatColor.RED + localeService.get("AlertReachedDemesne")); + new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("AlertReachedDemesne"), "AlertReachedDemesne", false); } } } diff --git a/src/main/java/dansplugins/factionsystem/objects/helper/FactionFlags.java b/src/main/java/dansplugins/factionsystem/objects/helper/FactionFlags.java index 02de78751..aaed46562 100644 --- a/src/main/java/dansplugins/factionsystem/objects/helper/FactionFlags.java +++ b/src/main/java/dansplugins/factionsystem/objects/helper/FactionFlags.java @@ -9,6 +9,7 @@ import dansplugins.factionsystem.integrators.FiefsIntegrator; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.PlayerService; import dansplugins.factionsystem.utils.ColorConversion; import dansplugins.factionsystem.utils.Logger; import org.bukkit.ChatColor; @@ -126,22 +127,23 @@ public void sendFlagList(Player player) { public void setFlag(String flag, String value, Player player) { if (flag.equals("neutral") && !configService.getBoolean("allowNeutrality")) { - player.sendMessage(ChatColor.RED + "" + localeService.get("NeutralityDisabled")); + new PlayerService().sendMessageType(player, ChatColor.RED + "" + localeService.get("NeutralityDisabled") + , "NeutralityDisabled", false); return; } if (flag.equals("prefixColor") && !configService.getBoolean("factionsCanSetPrefixColors")) { - player.sendMessage("Players can't set prefix colors."); + new PlayerService().sendMessageType(player, "&cPlayers can't set prefix colors.", "CannotSetPrefix", false); return; } if (flag.equals("prefixColor") && (!configService.getBoolean("playersChatWithPrefixes"))) { - player.sendMessage(ChatColor.RED + "" + localeService.get("PrefixesDisabled")); + new PlayerService().sendMessageType(player, ChatColor.RED + "" + localeService.get("PrefixesDisabled"), "PrefixesDisabled", false); return; } if (flag.equals("fiefsEnabled") && !fiefsIntegrator.isFiefsPresent()) { - player.sendMessage("Fiefs either isn't enabled or present."); + new PlayerService().sendMessageType(player, "&cFiefs either isn't enabled or present.", "FiefsNotEnable", false); return; } diff --git a/src/main/java/dansplugins/factionsystem/services/CommandService.java b/src/main/java/dansplugins/factionsystem/services/CommandService.java index 0cf0ae4a0..8825d9290 100644 --- a/src/main/java/dansplugins/factionsystem/services/CommandService.java +++ b/src/main/java/dansplugins/factionsystem/services/CommandService.java @@ -103,11 +103,19 @@ public boolean interpretCommand(CommandSender sender, String label, String[] arg // no arguments check if (args.length == 0) { // send plugin information - sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("MedievalFactionsTitle"), medievalFactions.getVersion())); - sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("DeveloperList"), "DanTheTechMan, Pasarus, Caibinus, Callum, Richardhyy, Mitras2, Kaonami")); - sender.sendMessage(ChatColor.AQUA + localeService.get("WikiLink")); - sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("CurrentLanguageID"), configService.getString("languageid"))); - sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("SupportedLanguageIDList"), localeService.getSupportedLanguageIDsSeparatedByCommas())); + if (!medievalFactions.USE_NEW_LANGUAGE_FILE) { + sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("MedievalFactionsTitle"), medievalFactions.getVersion())); + sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("DeveloperList"), new MedievalFactions().getDescription().getAuthors())); + sender.sendMessage(ChatColor.AQUA + localeService.get("WikiLink")); + sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("CurrentLanguageID"), configService.getString("languageid"))); + sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("SupportedLanguageIDList"), localeService.getSupportedLanguageIDsSeparatedByCommas())); + } else { + new MessageService().getLanguage().getStringList("PluginInfo") + .forEach(s -> { + s = s.replaceAll("#version#", medievalFactions.getVersion()).replaceAll("#dev#", medievalFactions.getDescription().getAuthors().toString()); + new PlayerService().sendMessageType(sender, s, s, true); + }); + } return true; } @@ -121,7 +129,7 @@ public boolean interpretCommand(CommandSender sender, String label, String[] arg } } - sender.sendMessage(ChatColor.RED + localeService.get("CommandNotRecognized")); + new PlayerService().sendMessageType(sender, ChatColor.RED + localeService.get("CommandNotRecognized"), "CommandNotRecognized", false); } return false; } diff --git a/src/main/java/dansplugins/factionsystem/services/GateService.java b/src/main/java/dansplugins/factionsystem/services/GateService.java index b6f3b6a41..565e9dac6 100644 --- a/src/main/java/dansplugins/factionsystem/services/GateService.java +++ b/src/main/java/dansplugins/factionsystem/services/GateService.java @@ -17,6 +17,8 @@ import org.bukkit.event.block.BlockRedstoneEvent; import org.bukkit.event.player.PlayerInteractEvent; +import java.util.Objects; + /** * @author Caibinus */ @@ -56,7 +58,8 @@ public void handlePotentialGateInteraction(Block clickedBlock, Player player, Pl g.openGate(); } else { event.setCancelled(true); - player.sendMessage(ChatColor.RED + String.format(localeService.get("PleaseWaitGate"), g.getStatus())); + new PlayerService().sendMessageType(player, ChatColor.RED + String.format(localeService.get("PleaseWaitGate"), g.getStatus()) + , Objects.requireNonNull(new MessageService().getLanguage().getString("PleaseWaitGate")).replaceAll("#status#", g.getStatus()), true); return; } } else { @@ -64,7 +67,8 @@ public void handlePotentialGateInteraction(Block clickedBlock, Player player, Pl g.closeGate(); } else { event.setCancelled(true); - player.sendMessage(ChatColor.RED + String.format(localeService.get("PleaseWaitGate"), g.getStatus())); + new PlayerService().sendMessageType(player, ChatColor.RED + String.format(localeService.get("PleaseWaitGate"), g.getStatus()) + , Objects.requireNonNull(new MessageService().getLanguage().getString("PleaseWaitGate")).replaceAll("#status#", g.getStatus()), true); return; } } @@ -100,18 +104,19 @@ public void handlePotentialGateInteraction(Block block, BlockRedstoneEvent event public void handleCreatingGate(Block clickedBlock, Player player, PlayerInteractEvent event) { if (!persistentData.getChunkDataAccessor().isClaimed(clickedBlock.getChunk())) { - player.sendMessage(ChatColor.RED + localeService.get("CanOnlyCreateGatesInClaimedTerritory")); + new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("CanOnlyCreateGatesInClaimedTerritory"), "CanOnlyCreateGatesInClaimedTerritory", false); return; } else { ClaimedChunk claimedChunk = persistentData.getChunkDataAccessor().getClaimedChunk(clickedBlock.getChunk()); if (claimedChunk != null) { if (!persistentData.getFaction(claimedChunk.getHolder()).isMember(player.getUniqueId())) { - player.sendMessage(ChatColor.RED + localeService.get("AlertMustBeMemberToCreateGate")); + new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("AlertMustBeMemberToCreateGate"), "AlertMustBeMemberToCreateGate", false); + return; } else { if (!persistentData.getFaction(claimedChunk.getHolder()).isOwner(player.getUniqueId()) && !persistentData.getFaction(claimedChunk.getHolder()).isOfficer(player.getUniqueId())) { - player.sendMessage(ChatColor.RED + localeService.get("AlertMustBeOwnerOrOfficerToCreateGate")); + new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("AlertMustBeOwnerOrOfficerToCreateGate"), "AlertMustBeOwnerOrOfficerToCreateGate", false); return; } } @@ -123,19 +128,25 @@ public void handleCreatingGate(Block clickedBlock, Player player, PlayerInteract if (ephemeralData.getCreatingGatePlayers().containsKey(event.getPlayer().getUniqueId()) && ephemeralData.getCreatingGatePlayers().get(event.getPlayer().getUniqueId()).getCoord1() == null) { Gate.ErrorCodeAddCoord e = ephemeralData.getCreatingGatePlayers().get(event.getPlayer().getUniqueId()).addCoord(clickedBlock); if (e.equals(Gate.ErrorCodeAddCoord.None)) { - event.getPlayer().sendMessage(ChatColor.GREEN + localeService.get("Point1PlacementSuccessful")); - event.getPlayer().sendMessage(ChatColor.YELLOW + localeService.get("ClickToPlaceSecondCorner")); + new PlayerService().sendMessageType(event.getPlayer(), ChatColor.GREEN + localeService.get("Point1PlacementSuccessful") + , "Point1PlacementSuccessful", false); + new PlayerService().sendMessageType(event.getPlayer(), ChatColor.YELLOW + localeService.get("ClickToPlaceSecondCorner") + , "ClickToPlaceSecondCorner", false); } else if (e.equals(Gate.ErrorCodeAddCoord.MaterialMismatch)) { - event.getPlayer().sendMessage(ChatColor.RED + localeService.get("MaterialsMismatch1")); + new PlayerService().sendMessageType(event.getPlayer(), ChatColor.RED + localeService.get("MaterialsMismatch1") + , "MaterialsMismatch1", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } else if (e.equals(Gate.ErrorCodeAddCoord.WorldMismatch)) { - event.getPlayer().sendMessage(ChatColor.RED + localeService.get("WorldsMismatch1")); + new PlayerService().sendMessageType(event.getPlayer(), ChatColor.RED + localeService.get("WorldsMismatch1") + , "WorldsMismatch1", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } else if (e.equals(Gate.ErrorCodeAddCoord.NoCuboids)) { - event.getPlayer().sendMessage(ChatColor.RED + localeService.get("CuboidDisallowed1")); + new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("CuboidDisallowed1") + , "CuboidDisallowed1", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } else { - event.getPlayer().sendMessage(ChatColor.RED + localeService.get("CancelledGatePlacement1")); + new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("CancelledGatePlacement1") + , "CancelledGatePlacement1", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } } else if (ephemeralData.getCreatingGatePlayers().containsKey(event.getPlayer().getUniqueId()) && ephemeralData.getCreatingGatePlayers().get(event.getPlayer().getUniqueId()).getCoord1() != null @@ -144,22 +155,29 @@ public void handleCreatingGate(Block clickedBlock, Player player, PlayerInteract if (!ephemeralData.getCreatingGatePlayers().get(event.getPlayer().getUniqueId()).getCoord1().equals(clickedBlock)) { Gate.ErrorCodeAddCoord e = ephemeralData.getCreatingGatePlayers().get(event.getPlayer().getUniqueId()).addCoord(clickedBlock); if (e.equals(Gate.ErrorCodeAddCoord.None)) { - event.getPlayer().sendMessage(ChatColor.GREEN + localeService.get("Point2PlacedSuccessfully")); - event.getPlayer().sendMessage(ChatColor.YELLOW + "Click on the trigger block..."); + new PlayerService().sendMessageType(event.getPlayer(), ChatColor.GREEN + localeService.get("Point2PlacementSuccessful") + , "Point2PlacementSuccessful", false); + new PlayerService().sendMessageType(event.getPlayer(), ChatColor.YELLOW + "Click on the trigger block..." + , "ClickTBlock", false); } else if (e.equals(Gate.ErrorCodeAddCoord.MaterialMismatch)) { - event.getPlayer().sendMessage(ChatColor.RED + localeService.get("MaterialsMismatch2")); + new PlayerService().sendMessageType(event.getPlayer(), ChatColor.RED + localeService.get("MaterialsMismatch2") + , "MaterialsMismatch2", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } else if (e.equals(Gate.ErrorCodeAddCoord.WorldMismatch)) { - event.getPlayer().sendMessage(ChatColor.RED + localeService.get("WorldsMismatch2")); + new PlayerService().sendMessageType(event.getPlayer(), ChatColor.RED + localeService.get("WorldsMismatch2") + , "WorldsMismatch2", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } else if (e.equals(Gate.ErrorCodeAddCoord.NoCuboids)) { - event.getPlayer().sendMessage(ChatColor.RED + localeService.get("CuboidDisallowed2")); + new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("CuboidDisallowed2") + , "CuboidDisallowed2", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } else if (e.equals(Gate.ErrorCodeAddCoord.LessThanThreeHigh)) { - event.getPlayer().sendMessage(ChatColor.RED + localeService.get("ThreeBlockRequirement")); + new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("ThreeBlockRequirement") + , "ThreeBlockRequirement", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } else { - event.getPlayer().sendMessage(ChatColor.RED + localeService.get("CancelledGatePlacement2")); + new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("CancelledGatePlacement2") + , "CancelledGatePlacement2", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } } @@ -174,23 +192,29 @@ public void handleCreatingGate(Block clickedBlock, Player player, PlayerInteract Faction faction = persistentData.getFaction(claim.getHolder()); faction.addGate(ephemeralData.getCreatingGatePlayers().get(event.getPlayer().getUniqueId())); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); - event.getPlayer().sendMessage(ChatColor.GREEN + "Creating Gate 4/4: Trigger successfully linked."); - event.getPlayer().sendMessage(ChatColor.GREEN + localeService.get("GateCreated")); + new PlayerService().sendMessageType(event.getPlayer(), ChatColor.GREEN + "Creating Gate 4/4: Trigger successfully linked." + , "Point4TriggeredSuccessfully", false); + new PlayerService().sendMessageType(event.getPlayer(), ChatColor.GREEN + localeService.get("GateCreated") + , "GateCreated", false); } else { - event.getPlayer().sendMessage(ChatColor.RED + localeService.get("CancelledGatePlacementErrorLinking")); + new PlayerService().sendMessageType(event.getPlayer(), ChatColor.RED + localeService.get("CancelledGatePlacementErrorLinking") + , "CancelledGatePlacementErrorLinking", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } } else { - event.getPlayer().sendMessage(ChatColor.RED + "Error: Can only use triggers in claimed territory."); + new PlayerService().sendMessageType(event.getPlayer(), ChatColor.RED + "Error: Can only use triggers in claimed territory." + , "CanOnlyTrigger", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } } else { - event.getPlayer().sendMessage(ChatColor.RED + "Trigger block was not powerable. Cancelled gate placement."); + new PlayerService().sendMessageType(event.getPlayer(), ChatColor.RED + "Trigger block was not powerable. Cancelled gate placement." + , "TriggerBlockNotPowerable", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } } } else { - player.sendMessage(ChatColor.RED + localeService.get("PermissionGate")); + new PlayerService().sendMessageType(event.getPlayer(), ChatColor.RED + localeService.get("PermissionGate") + , Objects.requireNonNull(new MessageService().getLanguage().getString("PermissionNeeded")).replaceAll("#permission#", "mf.gate"), true); } } } diff --git a/src/main/java/dansplugins/factionsystem/utils/extended/Messenger.java b/src/main/java/dansplugins/factionsystem/utils/extended/Messenger.java index 71f3fc4c6..347cb1cd1 100644 --- a/src/main/java/dansplugins/factionsystem/utils/extended/Messenger.java +++ b/src/main/java/dansplugins/factionsystem/utils/extended/Messenger.java @@ -7,6 +7,7 @@ import dansplugins.factionsystem.integrators.FiefsIntegrator; import dansplugins.factionsystem.objects.domain.Faction; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.PlayerService; import dansplugins.fiefs.externalapi.FI_Fief; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; @@ -92,10 +93,9 @@ public void sendAllPlayersInFactionMessage(Faction faction, String message) { for (UUID member : members) { try { Player target = getServer().getPlayer(member); - if (target == null) { - continue; + if (target != null) { + target.sendMessage(new PlayerService().colorize(message)); } - target.sendMessage(message); } catch (Exception ignored) { } diff --git a/src/main/resources/language.yml b/src/main/resources/language.yml index 068c55ca6..21246573c 100644 --- a/src/main/resources/language.yml +++ b/src/main/resources/language.yml @@ -162,7 +162,6 @@ CannotTransferToSelf: "&cYou can't transfer ownership of your faction to yoursel OwnerShipTransferredTo: "&aOwnership transferred to #name#" OwnershipTransferred: "&aOwnership of #name# has been transferred to you." AlertMustBeOwnerToUseCommand: "&cYou need to be the owner of a faction to use this command." -AlertFactionHomeRemoved: "&cYour faction home has been removed." AllLandUnclaimedFrom: "&aAll land unclaimed from #name#." NotAbleToClaim: "&cYou're not able to claim land at this time." UnClaimed: "&aUnclaimed your current claim." @@ -177,6 +176,59 @@ AlertAttemptedVassalization: "&a#name# has attempted to vassalize your faction. AlertFactionAttemptedToVassalize: "&cYour faction has attempted to vassalize #name#." UsageWho: "&cUsage: /mf who (player-name)" PlayerIsNotInAFaction: "&cThat player isn't in a faction." +BlockIsPartOfGateMustRemoveGate: "&cThis block is part of gate #name#. You must remove the gate first." +AlertPowerLevelIncreasedBy: "&eYou feel stronger. Your power has increased by #amount#." +AlertDisbandmentDueToZeroPower: "&cYour faction has been disbanded due to its cumulative power reaching zero." +RadiusRequirement: "&cRadius must be between 0 and #number#." +LandClaimedUsingAdminBypass: "&aLand unclaimed using admin bypass." +LandNotCurrentlyClaimed: "&cThis land is not currently claimed." +LandUnclaimed: "&aLand unclaimed." +AlertMoreClaimedChunksThanPower: "&cYour faction has more claimed chunks than power. Your land can be conquered." +AlertReachedDemesne: "&cYou have reached your demesne limit. Invite more players to increase this." +LandAlreadyClaimedByYourFaction: "&cThis land is already claimed by your faction." +IsNotEnemy: "&cYou must be at war with a faction to conquer land from them." +SurroundedChunkProtected: "&cTarget faction has claimed the chunks to the north, east, south and west of this chunk. It cannot be conquered." +TargetFactionNotOverClaiming: "&cTarget faction does not have more land than their demesne limit." +AlertLandConqueredFromAnotherFaction: "&aLand conquered from #name#. Demesne Size: #number#/#max#" +AlertLandConqueredFromYourFaction: "&c#number# has conquered land from your faction." +AlertLandClaimed: "&aLand claimed. Demesne Size: #number#/#max#" +AlertFactionHomeRemoved: "&cYour faction home has been removed." +AlertNonOwnership: "&cYou don't own this." +CannotPlaceChestsNextToUnownedLockedChests: "&cYou can't place chests next to locked chests you don't own." +CannotPlaceHoppersNextToUnownedLockedChests: "&cYou can't place hoppers next to, under or above locked chests you don't own." +LockedBy: "&cLocked by #name#" +BlockIsNotLocked: "&cThat block isn't locked." +NeutralityDisabled: "&cNeutrality is currently disabled." +CannotSetPrefix: "&cYou can't set prefix colors." +PrefixesDisabled: "&cPrefixes are currently disabled." +FiefsNotEnable: "&cFiefs either isn't enabled or present." +CommandNotRecognized: "&cMedieval Factions doesn't recognize that command." +PleaseWaitGate: "&aThis gate is #status#, please wait." +CanOnlyCreateGatesInClaimedTerritory: "&cYou can only create gates in claimed territory." +AlertMustBeMemberToCreateGate: "&cYou must be a member of this faction to create a gate." +AlertMustBeOwnerOrOfficerToCreateGate: "&cYou must be a faction owner or officer to create a gate." +Point1PlacementSuccessful: "&aCreating Gate 1/4: Point 1 placed successfully." +Point2PlacedSuccessfully: "&aCreating Gate 2/4: Point 2 placed successfully." +Point4TriggeredSuccessfully: "&aCreating Gate 4/4: Trigger successfully linked." +ClickToPlaceSecondCorner: "&aClick to place the second corner..." +MaterialsMismatch1: "&cError placing point 1: Materials mismatch." +MaterialsMismatch2: "&cError placing point 2: Materials mismatch." +WorldsMismatch1: "&cError placing point 1: Worlds mismatch." +WorldsMismatch2: "&cError placing point 2: Worlds mismatch." +CuboidDisallowed1: "&cError placing point 1: You cannot place a cuboid." +CuboidDisallowed2: "&cError placing point 2: You cannot place a cuboid." +CancelledGatePlacement1: "&cError placing point 1. Cancelled gate placement." +CancelledGatePlacement2: "&cError placing point 2. Cancelled gate placement." +ThreeBlockRequirement: "&cError placing point 2: Gate must be 3 blocks or taller." +ClickTBlock: "&eClick on the trigger block..." +GateCreated: "&aGate successfully created." +CancelledGatePlacementErrorLinking: "&cError linking to lever. Cancelled gate placement." +CanOnlyTrigger: "&cError: Can only use triggers in claimed territory." +TriggerBlockNotPowerable: "&cTrigger block was not powerable. Cancelled gate placement." +PluginInfo: + - "&b== Medieval Factions #version# ==" + - "&bDevelopers: #dev#" + - "&bWiki: https://github.com/dmccoystephenson/Medieval-Factions/wiki" StatsFaction: - "&a=== Medieval Factions Stats ===" - "&aNumber of factions: #faction#" From e3a07d2c51c5af48a5308ef8f036ea14c2dac994 Mon Sep 17 00:00:00 2001 From: Jack Caycedo <85153425+jackcayc924@users.noreply.github.com> Date: Wed, 24 Aug 2022 09:37:39 -0700 Subject: [PATCH 04/24] TabCompletion Added --- .../factionsystem/MedievalFactions.java | 8 + .../commands/abs/TabCompleterBase.java | 588 ++++++++++++++++++ 2 files changed, 596 insertions(+) create mode 100644 src/main/java/dansplugins/factionsystem/commands/abs/TabCompleterBase.java diff --git a/src/main/java/dansplugins/factionsystem/MedievalFactions.java b/src/main/java/dansplugins/factionsystem/MedievalFactions.java index 10088c325..72d655b47 100644 --- a/src/main/java/dansplugins/factionsystem/MedievalFactions.java +++ b/src/main/java/dansplugins/factionsystem/MedievalFactions.java @@ -4,6 +4,8 @@ */ package dansplugins.factionsystem; +import dansplugins.factionsystem.commands.AddLawCommand; +import dansplugins.factionsystem.commands.abs.TabCompleterBase; import dansplugins.factionsystem.data.EphemeralData; import dansplugins.factionsystem.data.PersistentData; import dansplugins.factionsystem.eventhandlers.*; @@ -58,6 +60,7 @@ public class MedievalFactions extends PonderBukkitPlugin { private final LockService lockService = new LockService(persistentData, configService.getLocaleService(), persistentData.getBlockChecker(), ephemeralData); private final TerritoryOwnerNotifier territoryOwnerNotifier = new TerritoryOwnerNotifier(configService.getLocaleService(), configService, actionBarService); + /** * This runs when the server starts. */ @@ -69,6 +72,11 @@ public void onEnable() { registerEventHandlers(); handleIntegrations(); makeSureEveryPlayerExperiencesPowerDecay(); + + this.getCommand("mf").setTabCompleter(new TabCompleterBase(persistentData, configService)); + this.getCommand("f").setTabCompleter(new TabCompleterBase(persistentData, configService)); + this.getCommand("medievalfactions").setTabCompleter(new TabCompleterBase(persistentData, configService)); + this.getCommand("factions").setTabCompleter(new TabCompleterBase(persistentData, configService)); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/abs/TabCompleterBase.java b/src/main/java/dansplugins/factionsystem/commands/abs/TabCompleterBase.java new file mode 100644 index 000000000..f4494d301 --- /dev/null +++ b/src/main/java/dansplugins/factionsystem/commands/abs/TabCompleterBase.java @@ -0,0 +1,588 @@ +package dansplugins.factionsystem.commands.abs; + +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import java.util.stream.Stream; + +import dansplugins.factionsystem.data.PersistentData; +import dansplugins.factionsystem.objects.domain.Faction; +import dansplugins.factionsystem.services.ConfigService; +import org.bukkit.Bukkit; +import org.bukkit.OfflinePlayer; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.command.TabCompleter; +import org.bukkit.entity.Player; + +import javax.annotation.Nullable; + +public class TabCompleterBase implements TabCompleter { + + PersistentData persistentData; + ConfigService configService; + public TabCompleterBase(PersistentData persistentData, ConfigService configService) + { + this.persistentData = persistentData; + this.configService = configService; + } + public List getOnlinePlayers(String partialName) { + return filterStartingWith(partialName, Bukkit.getOnlinePlayers().stream().map(OfflinePlayer::getName)); + } + + public String joinArgsBeyond(int index, String delim, String[] args) { + ++index; + String[] data = new String[args.length - index]; + System.arraycopy(args, index, data, 0, data.length); + return String.join(delim, data); + } + + public List filterStartingWith(String prefix, Stream stream) { + return (List)stream.filter((s) -> { + return s != null && !s.isEmpty() && s.toLowerCase().startsWith(prefix.toLowerCase()); + }).collect(Collectors.toList()); + } + + public List filterStartingWith(String prefix, Collection strings) { + return filterStartingWith(prefix, strings.stream()); + } + + public List tackOnBeginningAndEndQuotes(List targetedList) + { + final List changed = new ArrayList<>(); + for(String string : targetedList) + { + String changedString = '"' + string + '"'; + changed.add(changedString); + } + + return changed; + } + + public String removeBeginningAndEndQuotes(String targetedString) + { + return targetedString.replace("\"", ""); + } + + List argsLength1 = new ArrayList(); + + @Override + public List onTabComplete(CommandSender sender, Command command, String alias, String[] args) + { + final List factionsAllowedtoAlly = new ArrayList<>(); + final List factionsAllowedtoWar = new ArrayList<>(); + final List officersInFaction = new ArrayList<>(); + final List membersInFaction = new ArrayList<>(); + final List factionNames = new ArrayList<>(); + List result = new ArrayList(); + + if(sender instanceof Player) + { + Player player = (Player) sender; + if(argsLength1.isEmpty()) + { + argsLength1.addAll(Arrays.asList( + "addlaw", + "ally", + "autoclaim", + "breakalliance", + "bypass", + "chat", + "checkaccess", + "checkclaim", + "claim", + "config", + "create", + "declareindependence", + "declarewar", + "demote", + "desc", + "disband", + "duel", + "editlaw", + "flags", + "force", + "gate", + "grantaccess", + "grantindependence", + "help", + "home", + "info", + "invite", + "invoke", + "join", + "kick", + "laws", + "leave", + "list", + "lock", + "makepeace", + "map", + "members", + "power", + "prefix", + "promote", + "removelaw", + "rename", // here I intentionally left out resetpowerlevels, since its an important command you wouldn't want to accidentally use. + "revokeaccess", + "sethome", + "stats", + "swearfealty", + "transfer", + "unclaimall", + "unclaim", + "unlock", + "vassalize", + "version", + "" + + )); + } + if(args.length == 1) + { + for(String a : argsLength1) + { + if(a.toLowerCase().startsWith(args[0].toLowerCase())) + { + result.add(a); + } + } + return result; + } + if(args.length == 2) + { + if(args[0].equalsIgnoreCase("ally")) + { + if(persistentData.isInFaction(player.getUniqueId())) + { + Faction playerFaction = persistentData.getPlayersFaction(player.getUniqueId()); + ArrayList playerAllies = playerFaction.getAllies(); + for(Faction faction : persistentData.getFactions()) + { + if(!playerAllies.contains(faction.getName()) && !faction.getName().equals(playerFaction.getName())) + { + factionsAllowedtoAlly.add(faction.getName()); + } + } + return filterStartingWith(args[1], factionsAllowedtoAlly); + } + } + if(args[0].equalsIgnoreCase("breakalliance")) + { + if(persistentData.isInFaction(player.getUniqueId())) + { + Faction playerFaction = persistentData.getPlayersFaction(player.getUniqueId()); + return filterStartingWith(args[1], playerFaction.getAllies()); + } + } + if(args[0].equalsIgnoreCase("checkaccess")) + { + return filterStartingWith(args[1], Collections.singletonList("cancel")); + } + if(args[0].equalsIgnoreCase("config") && sender.hasPermission("mf.admin") || args[0].equalsIgnoreCase("config") && sender.hasPermission("mf.config")) + { + return filterStartingWith(args[1], Arrays.asList("get", "show", "set")); + } + if(args[0].equalsIgnoreCase("declarewar")) + { + if(persistentData.isInFaction(player.getUniqueId())) + { + Faction playerFaction = persistentData.getPlayersFaction(player.getUniqueId()); + ArrayList playerEnemies = playerFaction.getEnemyFactions(); + ArrayList playerAllies = playerFaction.getAllies(); + for(Faction faction : persistentData.getFactions()) + { + // If the faction is not an ally and they are not already enemied to them + if(!playerAllies.contains(faction.getName()) && !playerEnemies.contains(faction.getName()) && !faction.getName().equalsIgnoreCase(playerFaction.getName())) + { + factionsAllowedtoWar.add(faction.getName()); + } + } + return filterStartingWith(args[1], tackOnBeginningAndEndQuotes(factionsAllowedtoWar)); + } + } + if(args[0].equalsIgnoreCase("demote")) + { + if(persistentData.isInFaction(player.getUniqueId())) + { + Faction playerFaction = persistentData.getPlayersFaction(player.getUniqueId()); + for(UUID uuid : playerFaction.getOfficerList()) + { + Player officer = Bukkit.getPlayer(uuid); + if(officer != null) + { + officersInFaction.add(officer.getName()); + } + } + return filterStartingWith(args[1], officersInFaction); + } + } + if(args[0].equalsIgnoreCase("disband")) + { + if(sender.hasPermission("mf.admin") || sender.hasPermission("mf.disband.others")) + { + persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); + return filterStartingWith(args[1], factionNames); + } + } + if(args[0].equalsIgnoreCase("duel")) + { + return filterStartingWith(args[1], Arrays.asList("challenge", "accept", "cancel")); + } + if(args[0].equalsIgnoreCase("editlaw")) + { + if(persistentData.isInFaction(player.getUniqueId())) + { + Faction playerFaction = persistentData.getPlayersFaction(player.getUniqueId()); + if(playerFaction.getNumLaws() != 0) + { + ArrayList numbers = new ArrayList<>(); + for(int i = 1; i < playerFaction.getNumLaws() + 1; i++) + { + numbers.add(Integer.toString(i)); + } + return filterStartingWith(args[1], numbers); + } + } + } + if(args[0].equalsIgnoreCase("flags")) + { + return filterStartingWith(args[1], Arrays.asList("set", "show")); + } + if(args[0].equalsIgnoreCase("force")) + { + if(sender.hasPermission("mf.force.*")) // /mf force + { + return filterStartingWith(args[1], Arrays.asList("save", "load", "peace", "demote", "join", "kick", "power", "renounce", "transfer", "removevassal", "rename", "bonuspower", "unlock", "create", "claim", "flag")); + } + } + if(args[0].equalsIgnoreCase("gate")) + { + return filterStartingWith(args[1], Arrays.asList("create", "name", "list", "remove", "cancel")); + } + if(args[0].equalsIgnoreCase("grantaccess")) + { + return filterStartingWith(args[1], getOnlinePlayers(args[1])); + } + if(args[0].equalsIgnoreCase("grantindependence")) + { + if(persistentData.isInFaction(player.getUniqueId())) + { + Faction faction = persistentData.getPlayersFaction(player.getUniqueId()); + return filterStartingWith(args[1], faction.getVassals()); + } + } + if(args[0].equalsIgnoreCase("help")) + { + return filterStartingWith(args[1], IntStream.range(1, 7).mapToObj(String::valueOf)); + } + if(args[0].equalsIgnoreCase("info")) + { + persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); + return filterStartingWith(args[1], factionNames); + } + if(args[0].equalsIgnoreCase("invite")) + { + return filterStartingWith(args[1], getOnlinePlayers(args[1])); + } + if(args[0].equalsIgnoreCase("invoke")) + { + if(persistentData.isInFaction(player.getUniqueId())) + { + Faction faction = persistentData.getPlayersFaction(player.getUniqueId()); + ArrayList allies = faction.getAllies(); + return filterStartingWith(args[1], tackOnBeginningAndEndQuotes(allies)); + } + } + if(args[0].equalsIgnoreCase("invite")) + { + return filterStartingWith(args[1], getOnlinePlayers(args[1])); + } + if(args[0].equalsIgnoreCase("join")) + { + persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); + return filterStartingWith(args[1], factionNames); + } + if(args[0].equalsIgnoreCase("kick")) + { + if(persistentData.isInFaction(player.getUniqueId())) + { + Faction faction = persistentData.getPlayersFaction(player.getUniqueId()); + for(UUID uuid : faction.getMemberList()) + { + Player member = Bukkit.getPlayer(uuid); + if(member != null) + { + membersInFaction.add(member.getName()); + } + } + return filterStartingWith(args[1], membersInFaction); + } + } + if(args[0].equalsIgnoreCase("lock")) + { + return filterStartingWith(args[1], Collections.singletonList("cancel")); + } + if(args[0].equalsIgnoreCase("makepeace")) + { + if(persistentData.isInFaction(player.getUniqueId())) + { + Faction faction = persistentData.getPlayersFaction(player.getUniqueId()); + ArrayList enemies = faction.getEnemyFactions(); + return filterStartingWith(args[1], tackOnBeginningAndEndQuotes(enemies)); + } + } + if(args[0].equalsIgnoreCase("members")) + { + persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); + return filterStartingWith(args[1], factionNames); + } + if(args[0].equalsIgnoreCase("power")) + { + return filterStartingWith(args[1], getOnlinePlayers(args[1])); + } + if(args[0].equalsIgnoreCase("promote")) + { + if(persistentData.isInFaction(player.getUniqueId())) + { + Faction faction = persistentData.getPlayersFaction(player.getUniqueId()); + for(UUID uuid : faction.getMemberList()) + { + Player member = Bukkit.getPlayer(uuid); + if(member != null) + { + if(!faction.getOfficerList().contains(uuid)) + { + membersInFaction.add(member.getName()); + } + } + } + return filterStartingWith(args[1], membersInFaction); + } + } + if(args[0].equalsIgnoreCase("removelaw")) + { + if(persistentData.isInFaction(player.getUniqueId())) + { + Faction playerFaction = persistentData.getPlayersFaction(player.getUniqueId()); + if(playerFaction.getNumLaws() != 0) + { + ArrayList numbers = new ArrayList<>(); + for(int i = 1; i < playerFaction.getNumLaws() + 1; i++) + { + numbers.add(Integer.toString(i)); + } + return filterStartingWith(args[1], numbers); + } + } + } + if(args[0].equalsIgnoreCase("revokeaccess")) + { + List addCancelString = getOnlinePlayers(args[1]); + addCancelString.add("cancel"); + return filterStartingWith(args[1], addCancelString); + } + if(args[0].equalsIgnoreCase("swearfealty")) + { + persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); + return filterStartingWith(args[1], factionNames); + } + if(args[0].equalsIgnoreCase("transfer")) + { + if(persistentData.isInFaction(player.getUniqueId())) + { + Faction faction = persistentData.getPlayersFaction(player.getUniqueId()); + for(UUID uuid : faction.getMemberList()) + { + Player member = Bukkit.getPlayer(uuid); + if(member != null) + { + membersInFaction.add(member.getName()); + } + } + return filterStartingWith(args[1], membersInFaction); + } + } + if(args[0].equalsIgnoreCase("unlock")) + { + return filterStartingWith(args[1], Collections.singletonList("cancel")); + } + if(args[0].equalsIgnoreCase("vassalize")) + { + if(persistentData.isInFaction(player.getUniqueId())) + { + Faction playerFaction = persistentData.getPlayersFaction(player.getUniqueId()); + ArrayList vassalizeableFactions = new ArrayList<>(); + for(Faction faction : persistentData.getFactions()) + { + if(!playerFaction.getVassals().contains(faction.getName())) + { + vassalizeableFactions.add(faction.getName()); + } + } + return filterStartingWith(args[1], vassalizeableFactions); + } + } + if(args[0].equalsIgnoreCase("who")) + { + return filterStartingWith(args[1], getOnlinePlayers(args[1])); + } + } + + if(args.length == 3) + { + if(args[0].equalsIgnoreCase("config") && sender.hasPermission("mf.admin") || args[0].equalsIgnoreCase("config") && sender.hasPermission("mf.config")) + { + if(args[1].equalsIgnoreCase("show")) + { + return filterStartingWith(args[2], Arrays.asList("1", "2")); + } + if(args[1].equalsIgnoreCase("get")) + { + return filterStartingWith(args[2], Arrays.asList("1", "2")); + } + if(args[1].equalsIgnoreCase("set")) + { + return filterStartingWith(args[2], configService.getStringConfigOptions()); + } + } + if(args[0].equalsIgnoreCase("duel")) + { + if(args[1].equalsIgnoreCase("challenge")) + { + return filterStartingWith(args[2], getOnlinePlayers(args[2])); + } + } + if(args[0].equalsIgnoreCase("flags")) + { + if(args[1].equalsIgnoreCase("set")) + { + if(persistentData.isInFaction(player.getUniqueId())) + { + Faction faction = persistentData.getPlayersFaction(player.getUniqueId()); + return filterStartingWith(args[2], faction.getFlags().getFlagNamesList()); + } + } + } + if(args[0].equalsIgnoreCase("force")) + { + if(args[1].equalsIgnoreCase("peace")) + { + persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); + return filterStartingWith(args[2], tackOnBeginningAndEndQuotes(factionNames)); + } + if(args[1].equalsIgnoreCase("demote")) + { + return filterStartingWith(args[2], getOnlinePlayers(args[2])); + } + if(args[1].equalsIgnoreCase("join")) + { + return filterStartingWith(args[2], tackOnBeginningAndEndQuotes(getOnlinePlayers(args[2]))); + } + if(args[1].equalsIgnoreCase("kick")) + { + return filterStartingWith(args[2], getOnlinePlayers(args[2])); + } + if(args[1].equalsIgnoreCase("power")) + { + return filterStartingWith(args[2], tackOnBeginningAndEndQuotes(getOnlinePlayers(args[2]))); + } + if(args[1].equalsIgnoreCase("renounce")) + { + if(persistentData.isInFaction(player.getUniqueId())) + { + persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); + return filterStartingWith(args[2], tackOnBeginningAndEndQuotes(factionNames)); + } + } + if(args[1].equalsIgnoreCase("transfer")) + { + if(persistentData.isInFaction(player.getUniqueId())) + { + persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); + return filterStartingWith(args[2], tackOnBeginningAndEndQuotes(factionNames)); + } + } + if(args[1].equalsIgnoreCase("removevassal")) + { + persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); + return filterStartingWith(args[2], tackOnBeginningAndEndQuotes(factionNames)); + } + if(args[1].equalsIgnoreCase("rename")) + { + persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); + return filterStartingWith(args[2], tackOnBeginningAndEndQuotes(factionNames)); + } + if(args[1].equalsIgnoreCase("bonuspower")) + { + persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); + return filterStartingWith(args[2], tackOnBeginningAndEndQuotes(factionNames)); + } + if(args[1].equalsIgnoreCase("unlock")) + { + return filterStartingWith(args[2], Collections.singletonList("cancel")); + } + if(args[1].equalsIgnoreCase("claim")) + { + persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); + return filterStartingWith(args[2], tackOnBeginningAndEndQuotes(factionNames)); + } + if(args[1].equalsIgnoreCase("flag")) + { + persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); + return filterStartingWith(args[2], tackOnBeginningAndEndQuotes(factionNames)); + } + } + if(args[0].equalsIgnoreCase("invoke")) + { + if(persistentData.isInFaction(player.getUniqueId())) + { + Faction faction = persistentData.getPlayersFaction(player.getUniqueId()); + ArrayList enemies = faction.getEnemyFactions(); + return filterStartingWith(args[1], tackOnBeginningAndEndQuotes(enemies)); + } + } + } + + if(args.length == 4) + { + if(args[0].equalsIgnoreCase("force")) + { + if(args[1].equalsIgnoreCase("peace")) + { + persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); + return filterStartingWith(args[3], tackOnBeginningAndEndQuotes(factionNames)); + } + if(args[1].equalsIgnoreCase("join")) + { + persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); + return filterStartingWith(args[3], tackOnBeginningAndEndQuotes(factionNames)); + } + if(args[1].equalsIgnoreCase("transfer")) + { + persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); + return filterStartingWith(args[3], tackOnBeginningAndEndQuotes(getOnlinePlayers(args[2]))); + } + if(args[1].equalsIgnoreCase("removevassal")) + { + if(persistentData.getFaction(removeBeginningAndEndQuotes(args[2])) != null) + { + Faction faction = persistentData.getFaction(removeBeginningAndEndQuotes(args[2])); + return filterStartingWith(args[3], tackOnBeginningAndEndQuotes(faction.getVassals())); + } + } + if(args[1].equalsIgnoreCase("flag")) + { + if(persistentData.getFaction(removeBeginningAndEndQuotes(args[2])) != null) + { + Faction faction = persistentData.getFaction(removeBeginningAndEndQuotes(args[2])); + return filterStartingWith(args[3], faction.getFlags().getFlagNamesList()); + } + } + } + } + } + + return null; + } +} From c6cf343aa120d18935858bac7b9effa6c8917433 Mon Sep 17 00:00:00 2001 From: Jack Caycedo <85153425+jackcayc924@users.noreply.github.com> Date: Wed, 24 Aug 2022 10:58:20 -0700 Subject: [PATCH 05/24] Update plugin.yml --- src/main/resources/plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index c72d978a7..5c081e4fd 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: MedievalFactions version: '@version@' -authors: [DanTheTechMan, Pasarus, Caibinus, Callum, Richardhyy, Mitras2, Kaonami, GoodLucky777, Elafir, Deej, VoChiDanh, alyphen] +authors: [DanTheTechMan, Pasarus, Caibinus, Callum, Richardhyy, Mitras2, Kaonami, GoodLucky777, Elafir, Deej, VoChiDanh, alyphen, JackAttack924] main: dansplugins.factionsystem.MedievalFactions api-version: 1.13 softdepend: [dynmap, PlaceholderAPI, Fiefs] From c34d670a2f147cfbd8b4e91f2de7adf47f874627 Mon Sep 17 00:00:00 2001 From: VoChiDanh Date: Thu, 25 Aug 2022 08:43:09 +0700 Subject: [PATCH 06/24] Change by request (p8) --- .../factionsystem/MedievalFactions.java | 25 +-- .../factionsystem/commands/AddLawCommand.java | 8 +- .../factionsystem/commands/AllyCommand.java | 24 +-- .../commands/AutoClaimCommand.java | 7 +- .../commands/BreakAllianceCommand.java | 20 +- .../factionsystem/commands/BypassCommand.java | 7 +- .../factionsystem/commands/ChatCommand.java | 7 +- .../commands/CheckAccessCommand.java | 11 +- .../commands/CheckClaimCommand.java | 8 +- .../factionsystem/commands/ClaimCommand.java | 9 +- .../factionsystem/commands/ConfigCommand.java | 7 +- .../factionsystem/commands/CreateCommand.java | 22 +- .../commands/DeclareIndependenceCommand.java | 10 +- .../commands/DeclareWarCommand.java | 30 +-- .../factionsystem/commands/DemoteCommand.java | 20 +- .../factionsystem/commands/DescCommand.java | 10 +- .../commands/DisbandCommand.java | 18 +- .../factionsystem/commands/DuelCommand.java | 52 ++--- .../commands/EditLawCommand.java | 9 +- .../factionsystem/commands/FlagsCommand.java | 14 +- .../factionsystem/commands/ForceCommand.java | 9 +- .../factionsystem/commands/GateCommand.java | 54 ++--- .../commands/GrantAccessCommand.java | 20 +- .../commands/GrantIndependenceCommand.java | 12 +- .../factionsystem/commands/HelpCommand.java | 6 +- .../factionsystem/commands/HomeCommand.java | 13 +- .../factionsystem/commands/InfoCommand.java | 12 +- .../factionsystem/commands/InviteCommand.java | 24 +-- .../factionsystem/commands/InvokeCommand.java | 22 +- .../factionsystem/commands/JoinCommand.java | 14 +- .../factionsystem/commands/KickCommand.java | 20 +- .../factionsystem/commands/LawsCommand.java | 18 +- .../factionsystem/commands/LeaveCommand.java | 8 +- .../factionsystem/commands/ListCommand.java | 9 +- .../factionsystem/commands/LockCommand.java | 9 +- .../commands/MakePeaceCommand.java | 24 +-- .../factionsystem/commands/MapCommand.java | 6 +- .../commands/MembersCommand.java | 30 +-- .../factionsystem/commands/PowerCommand.java | 18 +- .../factionsystem/commands/PrefixCommand.java | 9 +- .../commands/PromoteCommand.java | 24 +-- .../commands/RemoveLawCommand.java | 11 +- .../factionsystem/commands/RenameCommand.java | 16 +- .../commands/ResetPowerLevelsCommand.java | 6 +- .../commands/RevokeAccessCommand.java | 16 +- .../commands/SetHomeCommand.java | 11 +- .../factionsystem/commands/StatsCommand.java | 10 +- .../commands/SwearFealtyCommand.java | 14 +- .../commands/TransferCommand.java | 22 +- .../commands/UnclaimCommand.java | 12 +- .../commands/UnclaimallCommand.java | 20 +- .../factionsystem/commands/UnlockCommand.java | 9 +- .../commands/VassalizeCommand.java | 18 +- .../commands/VersionCommand.java | 6 +- .../factionsystem/commands/WhoCommand.java | 10 +- .../commands/abs/SubCommand.java | 34 ++-- .../factionsystem/data/PersistentData.java | 64 +++--- .../eventhandlers/InteractionHandler.java | 18 +- .../eventhandlers/MoveHandler.java | 6 +- .../integrators/CurrenciesIntegrator.java | 2 +- .../factionsystem/objects/domain/Faction.java | 17 +- .../objects/helper/FactionFlags.java | 16 +- .../placeholders/PlaceholderAPI.java | 6 +- .../services/CommandService.java | 123 ++++++------ .../factionsystem/services/ConfigService.java | 188 +++++++++--------- .../factionsystem/services/GateService.java | 60 +++--- .../services/MessageService.java | 13 +- .../factionsystem/services/PlayerService.java | 24 ++- .../utils/extended/Messenger.java | 6 +- 69 files changed, 751 insertions(+), 686 deletions(-) diff --git a/src/main/java/dansplugins/factionsystem/MedievalFactions.java b/src/main/java/dansplugins/factionsystem/MedievalFactions.java index 35b20429f..a6b748b3e 100644 --- a/src/main/java/dansplugins/factionsystem/MedievalFactions.java +++ b/src/main/java/dansplugins/factionsystem/MedievalFactions.java @@ -39,26 +39,27 @@ */ public class MedievalFactions extends PonderBukkitPlugin { - private MedievalFactions medievalFactions; private final String pluginVersion = "v" + getDescription().getVersion(); private final ActionBarService actionBarService = new ActionBarService(); private final ConfigService configService = new ConfigService(this); - public boolean USE_NEW_LANGUAGE_FILE = configService.getBoolean("useNewLanguageFile"); private final EphemeralData ephemeralData = new EphemeralData(); private final Logger logger = new Logger(this); private final FiefsIntegrator fiefsIntegrator = new FiefsIntegrator(this); - private final Messenger messenger = new Messenger(configService.getLocaleService(), fiefsIntegrator); private final CurrenciesIntegrator currenciesIntegrator = new CurrenciesIntegrator(); - private final PersistentData persistentData = new PersistentData(configService.getLocaleService(), configService, this, messenger, ephemeralData, logger, fiefsIntegrator, currenciesIntegrator); + private final PlayerTeleporter playerTeleporter = new PlayerTeleporter(logger); + private final TerritoryOwnerNotifier territoryOwnerNotifier = new TerritoryOwnerNotifier(configService.getLocaleService(), configService, actionBarService); + public boolean USE_NEW_LANGUAGE_FILE = configService.getBoolean("useNewLanguageFile"); + private MedievalFactions medievalFactions; + private final MessageService messageService = new MessageService(medievalFactions); + private final PlayerService playerService = new PlayerService(medievalFactions, messageService); + private final Messenger messenger = new Messenger(configService.getLocaleService(), fiefsIntegrator, playerService); + private final PersistentData persistentData = new PersistentData(configService.getLocaleService(), configService, this, messenger, ephemeralData, logger, fiefsIntegrator, currenciesIntegrator, playerService, messageService); private final WarFactory warFactory = new WarFactory(persistentData); - private final MessageService messageService = new MessageService(); private final RelationChecker relationChecker = new RelationChecker(persistentData); - private final GateService gateService = new GateService(persistentData, configService.getLocaleService(), ephemeralData); + private final GateService gateService = new GateService(persistentData, configService.getLocaleService(), ephemeralData, playerService, messageService); private final LockService lockService = new LockService(persistentData, configService.getLocaleService(), persistentData.getBlockChecker(), ephemeralData); - private final PlayerTeleporter playerTeleporter = new PlayerTeleporter(logger); private final Scheduler scheduler = new Scheduler(logger, configService.getLocaleService(), this, persistentData, configService, playerTeleporter); - private final CommandService commandService = new CommandService(configService.getLocaleService(), this, configService, persistentData, ephemeralData, persistentData.getChunkDataAccessor(), persistentData.getDynmapIntegrator(), warFactory, logger, scheduler, messenger, relationChecker, fiefsIntegrator, currenciesIntegrator); - private final TerritoryOwnerNotifier territoryOwnerNotifier = new TerritoryOwnerNotifier(configService.getLocaleService(), configService, actionBarService); + private final CommandService commandService = new CommandService(configService.getLocaleService(), this, configService, persistentData, ephemeralData, persistentData.getChunkDataAccessor(), persistentData.getDynmapIntegrator(), warFactory, logger, scheduler, messenger, relationChecker, fiefsIntegrator, currenciesIntegrator, playerService, messageService); public MedievalFactions getMedievalFactions() { return medievalFactions; @@ -206,9 +207,9 @@ private ArrayList initializeListeners() { new DamageHandler(logger, persistentData, ephemeralData, configService.getLocaleService(), configService, relationChecker), new DeathHandler(configService, persistentData, configService.getLocaleService()), new EffectHandler(ephemeralData, this, relationChecker), - new InteractionHandler(persistentData, persistentData.getInteractionAccessChecker(), configService.getLocaleService(), persistentData.getBlockChecker(), this, lockService, ephemeralData, gateService), + new InteractionHandler(persistentData, persistentData.getInteractionAccessChecker(), configService.getLocaleService(), persistentData.getBlockChecker(), this, lockService, ephemeralData, gateService, playerService, messageService), new JoinHandler(persistentData, configService.getLocaleService(), configService, logger, messenger, territoryOwnerNotifier), - new MoveHandler(persistentData, territoryOwnerNotifier, configService.getLocaleService(), this, persistentData.getDynmapIntegrator()), + new MoveHandler(persistentData, territoryOwnerNotifier, configService.getLocaleService(), this, persistentData.getDynmapIntegrator(), playerService), new QuitHandler(ephemeralData, persistentData, actionBarService), new SpawnHandler(configService, persistentData) )); @@ -237,7 +238,7 @@ private void handleDynmapIntegration() { private void handlePlaceholdersIntegration() { if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) { - new PlaceholderAPI(this, persistentData).register(); + new PlaceholderAPI(this, persistentData, configService).register(); } } } \ No newline at end of file diff --git a/src/main/java/dansplugins/factionsystem/commands/AddLawCommand.java b/src/main/java/dansplugins/factionsystem/commands/AddLawCommand.java index ddefbef8a..218aeafcf 100644 --- a/src/main/java/dansplugins/factionsystem/commands/AddLawCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/AddLawCommand.java @@ -25,10 +25,10 @@ public class AddLawCommand extends SubCommand { /** * Constructor to initialise a Command. */ - public AddLawCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public AddLawCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ LOCALE_PREFIX + "CMDAddLaw", "AL", "addlaw" - }, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService); + }, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService); } /** @@ -47,13 +47,13 @@ public void execute(Player player, String[] args, String key) { // check if they have provided any strings beyond "addlaw" if (args.length == 0) { - new PlayerService().sendMessageType(player, translate("&c" + getText("UsageAddLaw")), "UsageAddLaw", false); + playerService.sendMessageType(player, translate("&c" + getText("UsageAddLaw")), "UsageAddLaw", false); return; } // add the law and send a success message. faction.addLaw(String.join(" ", args)); - new PlayerService().sendMessageType(player, "&a" + getText("LawAdded"), Objects.requireNonNull(new MessageService().getLanguage().getString("LawAdded")) + playerService.sendMessageType(player, "&a" + getText("LawAdded"), Objects.requireNonNull(messageService.getLanguage().getString("LawAdded")) .replaceAll("#law#", String.join(" ", args)), true); } diff --git a/src/main/java/dansplugins/factionsystem/commands/AllyCommand.java b/src/main/java/dansplugins/factionsystem/commands/AllyCommand.java index e725b3728..898c7e018 100644 --- a/src/main/java/dansplugins/factionsystem/commands/AllyCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/AllyCommand.java @@ -26,10 +26,10 @@ public class AllyCommand extends SubCommand { /** * Constructor to initialise a Command. */ - public AllyCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public AllyCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "ally", LOCALE_PREFIX + "CmdAlly" - }, true, true, true, false, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService); + }, true, true, true, false, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService); } /** @@ -48,7 +48,7 @@ public void execute(Player player, String[] args, String key) { } if (args.length == 0) { - new PlayerService().sendMessageType(player, "&c" + getText("UsageAlly"), "UsageAlly", false); + playerService.sendMessageType(player, "&c" + getText("UsageAlly"), "UsageAlly", false); return; } @@ -57,30 +57,30 @@ public void execute(Player player, String[] args, String key) { // the faction needs to exist to ally if (otherFaction == null) { - new PlayerService().sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(new MessageService().getLanguage().getString("FactionNotFound")) + playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) .replaceAll("#faction#", String.join(" ", args)), true); return; } // the faction can't be itself if (otherFaction == faction) { - new PlayerService().sendMessageType(player, "&c" + getText("CannotAllyWithSelf"), "CannotAllyWithSelf", false); + playerService.sendMessageType(player, "&c" + getText("CannotAllyWithSelf"), "CannotAllyWithSelf", false); return; } // no need to allow them to ally if they're already allies if (faction.isAlly(otherFaction.getName())) { - new PlayerService().sendMessageType(player, "&c" + getText("FactionAlreadyAlly"), "FactionAlreadyAlly", false); + playerService.sendMessageType(player, "&c" + getText("FactionAlreadyAlly"), "FactionAlreadyAlly", false); return; } if (faction.isEnemy(otherFaction.getName())) { - new PlayerService().sendMessageType(player, "&cThat faction is currently at war with your faction.", "FactionIsEnemy", false); + playerService.sendMessageType(player, "&cThat faction is currently at war with your faction.", "FactionIsEnemy", false); return; } if (faction.isRequestedAlly(otherFaction.getName())) { - new PlayerService().sendMessageType(player, "&c" + getText("AlertAlreadyRequestedAlliance"), "AlertAlreadyRequestedAlliance", false); + playerService.sendMessageType(player, "&c" + getText("AlertAlreadyRequestedAlliance"), "AlertAlreadyRequestedAlliance", false); return; } @@ -90,7 +90,7 @@ public void execute(Player player, String[] args, String key) { messageFaction( faction, translate("&a" + getText("AlertAttemptedAlliance", faction.getName(), otherFaction.getName())), - Objects.requireNonNull(new MessageService().getLanguage().getString("AlertAttemptedAlliance")) + Objects.requireNonNull(messageService.getLanguage().getString("AlertAttemptedAlliance")) .replaceAll("#faction_a#", faction.getName()) .replaceAll("#faction_b#", otherFaction.getName()) ); @@ -98,7 +98,7 @@ public void execute(Player player, String[] args, String key) { messageFaction( otherFaction, translate("&a" + getText("AlertAttemptedAlliance", faction.getName(), otherFaction.getName())), - Objects.requireNonNull(new MessageService().getLanguage().getString("AlertAttemptedAlliance")) + Objects.requireNonNull(messageService.getLanguage().getString("AlertAttemptedAlliance")) .replaceAll("#faction_a#", faction.getName()) .replaceAll("#faction_b#", otherFaction.getName()) ); @@ -109,10 +109,10 @@ public void execute(Player player, String[] args, String key) { faction.addAlly(otherFaction.getName()); otherFaction.addAlly(faction.getName()); // message player's faction - messageFaction(faction, translate("&a" + getText("AlertNowAlliedWith", otherFaction.getName())), Objects.requireNonNull(new MessageService().getLanguage().getString("AlertNowAlliedWith")).replaceAll("#faction#", otherFaction.getName())); + messageFaction(faction, translate("&a" + getText("AlertNowAlliedWith", otherFaction.getName())), Objects.requireNonNull(messageService.getLanguage().getString("AlertNowAlliedWith")).replaceAll("#faction#", otherFaction.getName())); // message target faction - messageFaction(otherFaction, translate("&a" + getText("AlertNowAlliedWith", faction.getName())), Objects.requireNonNull(new MessageService().getLanguage().getString("AlertNowAlliedWith")).replaceAll("#faction#", faction.getName())); + messageFaction(otherFaction, translate("&a" + getText("AlertNowAlliedWith", faction.getName())), Objects.requireNonNull(messageService.getLanguage().getString("AlertNowAlliedWith")).replaceAll("#faction#", faction.getName())); // remove alliance requests faction.removeAllianceRequest(otherFaction.getName()); diff --git a/src/main/java/dansplugins/factionsystem/commands/AutoClaimCommand.java b/src/main/java/dansplugins/factionsystem/commands/AutoClaimCommand.java index 10159249b..f79db9a6d 100644 --- a/src/main/java/dansplugins/factionsystem/commands/AutoClaimCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/AutoClaimCommand.java @@ -10,6 +10,7 @@ import dansplugins.factionsystem.integrators.DynmapIntegrator; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; import dansplugins.factionsystem.services.PlayerService; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -22,10 +23,10 @@ public class AutoClaimCommand extends SubCommand { /** * Constructor to initialise a Command. */ - public AutoClaimCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public AutoClaimCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "AC", "AUTOCLAIM", LOCALE_PREFIX + "CmdAutoClaim" - }, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService); + }, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService); } /** @@ -43,7 +44,7 @@ public void execute(Player player, String[] args, String key) { } faction.toggleAutoClaim(); - new PlayerService().sendMessageType(player, "&b" + getText("AutoclaimToggled"), "AutoclaimToggled", false); + playerService.sendMessageType(player, "&b" + getText("AutoclaimToggled"), "AutoclaimToggled", false); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/BreakAllianceCommand.java b/src/main/java/dansplugins/factionsystem/commands/BreakAllianceCommand.java index 58f75e19c..3ab8464e1 100644 --- a/src/main/java/dansplugins/factionsystem/commands/BreakAllianceCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/BreakAllianceCommand.java @@ -26,10 +26,10 @@ public class BreakAllianceCommand extends SubCommand { /** * Constructor to initialise a Command. */ - public BreakAllianceCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public BreakAllianceCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "breakalliance", "ba", LOCALE_PREFIX + "CmdBreakAlliance" - }, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService); + }, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService); } /** @@ -47,26 +47,26 @@ public void execute(Player player, String[] args, String key) { } if (args.length == 0) { - new PlayerService().sendMessageType(player, "&c" + getText("UsageBreakAlliance"), "UsageBreakAlliance", false); + playerService.sendMessageType(player, "&c" + getText("UsageBreakAlliance"), "UsageBreakAlliance", false); return; } final Faction otherFaction = getFaction(String.join(" ", args)); if (otherFaction == null) { - new PlayerService().sendMessageType(player, "&c" + getText("FactionNotFound"), - Objects.requireNonNull(new MessageService().getLanguage().getString("FactionNotFound")) + playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), + Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) .replaceAll("#faction#", String.join(" ", args)), true); return; } if (otherFaction == faction) { - new PlayerService().sendMessageType(player, "&c" + getText("CannotBreakAllianceWithSelf"), "CannotBreakAllianceWithSelf", false); + playerService.sendMessageType(player, "&c" + getText("CannotBreakAllianceWithSelf"), "CannotBreakAllianceWithSelf", false); return; } if (!faction.isAlly(otherFaction.getName())) { - new PlayerService().sendMessageType(player, "&c" + getText("AlertNotAllied", otherFaction.getName()), - Objects.requireNonNull(new MessageService().getLanguage().getString("AlertNotAllied")) + playerService.sendMessageType(player, "&c" + getText("AlertNotAllied", otherFaction.getName()), + Objects.requireNonNull(messageService.getLanguage().getString("AlertNotAllied")) .replaceAll("#faction#", otherFaction.getName()), true); return; } @@ -74,10 +74,10 @@ public void execute(Player player, String[] args, String key) { faction.removeAlly(otherFaction.getName()); otherFaction.removeAlly(faction.getName()); messageFaction(faction, translate("&c" + getText("AllianceBrokenWith", otherFaction.getName())) - , Objects.requireNonNull(new MessageService().getLanguage().getString("AllianceBrokenWith")) + , Objects.requireNonNull(messageService.getLanguage().getString("AllianceBrokenWith")) .replaceAll("#faction#", otherFaction.getName())); messageFaction(otherFaction, translate("&c" + getText("AlertAllianceHasBeenBroken", faction.getName())), - Objects.requireNonNull(new MessageService().getLanguage().getString("AlertAllianceHasBeenBroken")) + Objects.requireNonNull(messageService.getLanguage().getString("AlertAllianceHasBeenBroken")) .replaceAll("#faction#", faction.getName())); } diff --git a/src/main/java/dansplugins/factionsystem/commands/BypassCommand.java b/src/main/java/dansplugins/factionsystem/commands/BypassCommand.java index 623139d63..96776980c 100644 --- a/src/main/java/dansplugins/factionsystem/commands/BypassCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/BypassCommand.java @@ -10,6 +10,7 @@ import dansplugins.factionsystem.integrators.DynmapIntegrator; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; import dansplugins.factionsystem.services.PlayerService; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -22,10 +23,10 @@ public class BypassCommand extends SubCommand { /** * Constructor to initialise a Command. */ - public BypassCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public BypassCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "bypass", "Locale_CmdBypass" - }, true, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + }, true, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); } /** @@ -50,7 +51,7 @@ public void execute(Player player, String[] args, String key) { } else { ephemeralData.getAdminsBypassingProtections().add(player.getUniqueId()); } - new PlayerService().sendMessageType(player, "&a" + getText(path), path, false); + playerService.sendMessageType(player, "&a" + getText(path), path, false); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/ChatCommand.java b/src/main/java/dansplugins/factionsystem/commands/ChatCommand.java index 26584d30a..3e1907c7a 100644 --- a/src/main/java/dansplugins/factionsystem/commands/ChatCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/ChatCommand.java @@ -10,6 +10,7 @@ import dansplugins.factionsystem.integrators.DynmapIntegrator; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; import dansplugins.factionsystem.services.PlayerService; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -19,10 +20,10 @@ */ public class ChatCommand extends SubCommand { - public ChatCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public ChatCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "chat", LOCALE_PREFIX + "CmdChat" - }, true, true, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + }, true, true, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); } /** @@ -48,7 +49,7 @@ public void execute(Player player, String[] args, String key) { } else { ephemeralData.getPlayersInFactionChat().add(player.getUniqueId()); } - new PlayerService().sendMessageType(player, "&c" + getText(path), path, false); + playerService.sendMessageType(player, "&c" + getText(path), path, false); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/CheckAccessCommand.java b/src/main/java/dansplugins/factionsystem/commands/CheckAccessCommand.java index 1a436ddaa..ff97b65b3 100644 --- a/src/main/java/dansplugins/factionsystem/commands/CheckAccessCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/CheckAccessCommand.java @@ -10,6 +10,7 @@ import dansplugins.factionsystem.integrators.DynmapIntegrator; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; import dansplugins.factionsystem.services.PlayerService; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -19,10 +20,10 @@ */ public class CheckAccessCommand extends SubCommand { - public CheckAccessCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public CheckAccessCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "ca", "checkaccess", LOCALE_PREFIX + "CmdCheckAccess" - }, true, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + }, true, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); } /** @@ -47,13 +48,13 @@ public void execute(Player player, String[] args, String key) { if (cancel && contains) { ephemeralData.getPlayersCheckingAccess().remove(player.getUniqueId()); - new PlayerService().sendMessageType(player, "&c" + getText("Cancelled"), "Cancelled", false); + playerService.sendMessageType(player, "&c" + getText("Cancelled"), "Cancelled", false); } else { if (contains) { - new PlayerService().sendMessageType(player, "&c" + getText("AlreadyEnteredCheckAccess"), "AlreadyEnteredCheckAccess", false); + playerService.sendMessageType(player, "&c" + getText("AlreadyEnteredCheckAccess"), "AlreadyEnteredCheckAccess", false); } else { ephemeralData.getPlayersCheckingAccess().add(player.getUniqueId()); - new PlayerService().sendMessageType(player, "&a" + getText("RightClickCheckAccess"), "RightClickCheckAccess", false); + playerService.sendMessageType(player, "&a" + getText("RightClickCheckAccess"), "RightClickCheckAccess", false); } } } diff --git a/src/main/java/dansplugins/factionsystem/commands/CheckClaimCommand.java b/src/main/java/dansplugins/factionsystem/commands/CheckClaimCommand.java index 4a379b30b..e739e6958 100644 --- a/src/main/java/dansplugins/factionsystem/commands/CheckClaimCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/CheckClaimCommand.java @@ -22,8 +22,8 @@ */ public class CheckClaimCommand extends SubCommand { - public CheckClaimCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { - super(new String[]{"checkclaim", "cc", LOCALE_PREFIX + "CmdCheckClaim"}, true, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + public CheckClaimCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { + super(new String[]{"checkclaim", "cc", LOCALE_PREFIX + "CmdCheckClaim"}, true, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); } /** @@ -43,9 +43,9 @@ public void execute(Player player, String[] args, String key) { final String result = chunkDataAccessor.checkOwnershipAtPlayerLocation(player); if (result.equals("unclaimed")) { - new PlayerService().sendMessageType(player, "&a" + getText("LandIsUnclaimed"), "LandIsUnclaimed", false); + playerService.sendMessageType(player, "&a" + getText("LandIsUnclaimed"), "LandIsUnclaimed", false); } else { - new PlayerService().sendMessageType(player, "&c" + getText("LandClaimedBy"), Objects.requireNonNull(new MessageService().getLanguage().getString("LandClaimedBy")) + playerService.sendMessageType(player, "&c" + getText("LandClaimedBy"), Objects.requireNonNull(messageService.getLanguage().getString("LandClaimedBy")) .replaceAll("#player#", result), true); } } diff --git a/src/main/java/dansplugins/factionsystem/commands/ClaimCommand.java b/src/main/java/dansplugins/factionsystem/commands/ClaimCommand.java index 64fb4fc45..1fb8c934f 100644 --- a/src/main/java/dansplugins/factionsystem/commands/ClaimCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/ClaimCommand.java @@ -10,6 +10,7 @@ import dansplugins.factionsystem.integrators.DynmapIntegrator; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; import dansplugins.factionsystem.services.PlayerService; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -19,10 +20,10 @@ */ public class ClaimCommand extends SubCommand { - public ClaimCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public ClaimCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "Claim", LOCALE_PREFIX + "CmdClaim" - }, true, true, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + }, true, true, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); } /** @@ -37,7 +38,7 @@ public void execute(Player player, String[] args, String key) { if ((boolean) faction.getFlags().getFlag("mustBeOfficerToManageLand")) { // officer or owner rank required if (!faction.isOfficer(player.getUniqueId()) && !faction.isOwner(player.getUniqueId())) { - new PlayerService().sendMessageType(player, "&a" + getText("AlertMustBeOfficerOrOwnerToClaimLand"), "AlertMustBeOfficerOrOwnerToClaimLand", false); + playerService.sendMessageType(player, "&a" + getText("AlertMustBeOfficerOrOwnerToClaimLand"), "AlertMustBeOfficerOrOwnerToClaimLand", false); return; } } @@ -46,7 +47,7 @@ public void execute(Player player, String[] args, String key) { int depth = getIntSafe(args[0], -1); if (depth <= 0) { - new PlayerService().sendMessageType(player, "&a" + getText("UsageClaimRadius"), "UsageClaimRadius", false); + playerService.sendMessageType(player, "&a" + getText("UsageClaimRadius"), "UsageClaimRadius", false); } else { chunkDataAccessor.radiusClaimAtLocation(depth, player, player.getLocation(), faction); } diff --git a/src/main/java/dansplugins/factionsystem/commands/ConfigCommand.java b/src/main/java/dansplugins/factionsystem/commands/ConfigCommand.java index 0c183c73d..b0d1a7ff4 100644 --- a/src/main/java/dansplugins/factionsystem/commands/ConfigCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/ConfigCommand.java @@ -12,6 +12,7 @@ import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; import dansplugins.factionsystem.services.MessageService; +import dansplugins.factionsystem.services.PlayerService; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -22,10 +23,10 @@ public class ConfigCommand extends SubCommand { private final MedievalFactions medievalFactions; - public ConfigCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, MedievalFactions medievalFactions) { + public ConfigCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, MedievalFactions medievalFactions, PlayerService playerService, MessageService messageService) { super(new String[]{ "config", LOCALE_PREFIX + "CmdConfig" - }, false, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + }, false, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); this.medievalFactions = medievalFactions; } @@ -94,7 +95,7 @@ public void execute(CommandSender sender, String[] args, String key) { } } else if (reload) { medievalFactions.reloadConfig(); - new MessageService().reloadLanguage(); + messageService.reloadLanguage(); sender.sendMessage(ChatColor.GREEN + "Config reloaded."); } else { sender.sendMessage(translate("&c" + getText("ValidSubCommandsShowSet"))); diff --git a/src/main/java/dansplugins/factionsystem/commands/CreateCommand.java b/src/main/java/dansplugins/factionsystem/commands/CreateCommand.java index 8e813b1d0..72f2c2072 100644 --- a/src/main/java/dansplugins/factionsystem/commands/CreateCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/CreateCommand.java @@ -34,10 +34,10 @@ public class CreateCommand extends SubCommand { private final Logger logger; private final MedievalFactions medievalFactions; - public CreateCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, FiefsIntegrator fiefsIntegrator, CurrenciesIntegrator currenciesIntegrator, Logger logger, MedievalFactions medievalFactions) { + public CreateCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, FiefsIntegrator fiefsIntegrator, CurrenciesIntegrator currenciesIntegrator, Logger logger, MedievalFactions medievalFactions, PlayerService playerService, MessageService messageService) { super(new String[]{ LOCALE_PREFIX + "CmdCreate", "Create" - }, true, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + }, true, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); this.fiefsIntegrator = fiefsIntegrator; this.currenciesIntegrator = currenciesIntegrator; this.logger = logger; @@ -60,13 +60,13 @@ public void execute(Player player, String[] args, String key) { this.faction = getPlayerFaction(player); if (this.faction != null) { - new PlayerService().sendMessageType(player, "&c" + getText("AlreadyInFaction"), + playerService.sendMessageType(player, "&c" + getText("AlreadyInFaction"), "AlreadyInFaction", false); return; } if (args.length == 0) { - new PlayerService().sendMessageType(player, "&c" + getText("UsageCreate"), + playerService.sendMessageType(player, "&c" + getText("UsageCreate"), "UsageCreate", false); return; } @@ -76,20 +76,20 @@ public void execute(Player player, String[] args, String key) { final FileConfiguration config = configService.getConfig(); if (factionName.length() > config.getInt("factionMaxNameLength")) { - new PlayerService().sendMessageType(player, "&c" + getText("FactionNameTooLong"), - Objects.requireNonNull(new MessageService().getLanguage().getString("FactionNameTooLong")) + playerService.sendMessageType(player, "&c" + getText("FactionNameTooLong"), + Objects.requireNonNull(messageService.getLanguage().getString("FactionNameTooLong")) .replaceAll("#name#", factionName), true); return; } if (persistentData.getFaction(factionName) != null) { - new PlayerService().sendMessageType(player, "&c" + getText("FactionAlreadyExists"), - Objects.requireNonNull(new MessageService().getLanguage().getString("FactionAlreadyExists")) + playerService.sendMessageType(player, "&c" + getText("FactionAlreadyExists"), + Objects.requireNonNull(messageService.getLanguage().getString("FactionAlreadyExists")) .replaceAll("#name#", factionName), true); return; } - this.faction = new Faction(factionName, player.getUniqueId(), configService, localeService, fiefsIntegrator, currenciesIntegrator, dynmapIntegrator, logger, persistentData, medievalFactions); + this.faction = new Faction(factionName, player.getUniqueId(), configService, localeService, fiefsIntegrator, currenciesIntegrator, dynmapIntegrator, logger, persistentData, medievalFactions, playerService); this.faction.addMember(player.getUniqueId()); @@ -97,8 +97,8 @@ public void execute(Player player, String[] args, String key) { Bukkit.getPluginManager().callEvent(createEvent); if (!createEvent.isCancelled()) { persistentData.addFaction(this.faction); - new PlayerService().sendMessageType(player, "&a" + getText("FactionCreated"), - Objects.requireNonNull(new MessageService().getLanguage().getString("FactionCreated")) + playerService.sendMessageType(player, "&a" + getText("FactionCreated"), + Objects.requireNonNull(messageService.getLanguage().getString("FactionCreated")) .replaceAll("#name#", factionName), true); } } diff --git a/src/main/java/dansplugins/factionsystem/commands/DeclareIndependenceCommand.java b/src/main/java/dansplugins/factionsystem/commands/DeclareIndependenceCommand.java index f46bff7ac..286d51154 100644 --- a/src/main/java/dansplugins/factionsystem/commands/DeclareIndependenceCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/DeclareIndependenceCommand.java @@ -25,8 +25,8 @@ */ public class DeclareIndependenceCommand extends SubCommand { - public DeclareIndependenceCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { - super(new String[]{"declareindependence", "di", LOCALE_PREFIX + "CmdDeclareIndependence"}, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService); + public DeclareIndependenceCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { + super(new String[]{"declareindependence", "di", LOCALE_PREFIX + "CmdDeclareIndependence"}, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService); } /** @@ -44,13 +44,13 @@ public void execute(Player player, String[] args, String key) { } if (!(this.faction.hasLiege()) || this.faction.getLiege() == null) { - new PlayerService().sendMessageType(player, "&c" + getText("NotAVassalOfAFaction"), "NotAVassalOfAFaction", false); + playerService.sendMessageType(player, "&c" + getText("NotAVassalOfAFaction"), "NotAVassalOfAFaction", false); return; } final Faction liege = getFaction(this.faction.getLiege()); if (liege == null) { - new PlayerService().sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(new MessageService().getLanguage().getString("FactionNotFound")).replaceAll("#faction#", String.join(" ", args)), true); + playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")).replaceAll("#faction#", String.join(" ", args)), true); return; } @@ -74,7 +74,7 @@ public void execute(Player player, String[] args, String key) { } } } - messageServer("&c" + getText("HasDeclaredIndependence", faction.getName(), liege.getName()), Objects.requireNonNull(new MessageService().getLanguage().getString("HasDeclaredIndependence")).replaceAll("#faction_a#", faction.getName()).replaceAll("#faction_b#", liege.getName())); + messageServer("&c" + getText("HasDeclaredIndependence", faction.getName(), liege.getName()), Objects.requireNonNull(messageService.getLanguage().getString("HasDeclaredIndependence")).replaceAll("#faction_a#", faction.getName()).replaceAll("#faction_b#", liege.getName())); } diff --git a/src/main/java/dansplugins/factionsystem/commands/DeclareWarCommand.java b/src/main/java/dansplugins/factionsystem/commands/DeclareWarCommand.java index 1b4abd2c3..6656f5b27 100644 --- a/src/main/java/dansplugins/factionsystem/commands/DeclareWarCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/DeclareWarCommand.java @@ -29,10 +29,10 @@ public class DeclareWarCommand extends SubCommand { private final WarFactory warFactory; - public DeclareWarCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, WarFactory warFactory) { + public DeclareWarCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, WarFactory warFactory, PlayerService playerService, MessageService messageService) { super(new String[]{ "declarewar", "dw", LOCALE_PREFIX + "CmdDeclareWar" - }, true, true, true, false, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService); + }, true, true, true, false, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService); this.warFactory = warFactory; } @@ -51,7 +51,7 @@ public void execute(Player player, String[] args, String key) { } if (args.length == 0) { - new PlayerService().sendMessageType(player, "&c" + "Usage: /mf declarewar \"faction\"", + playerService.sendMessageType(player, "&c" + "Usage: /mf declarewar \"faction\"", "UsageDeclareWar", false); return; } @@ -60,7 +60,7 @@ public void execute(Player player, String[] args, String key) { List doubleQuoteArgs = argumentParser.getArgumentsInsideDoubleQuotes(args); if (doubleQuoteArgs.size() == 0) { - new PlayerService().sendMessageType(player, "&c" + "Usage: /mf declarewar \"faction\" (quotation marks are required)", + playerService.sendMessageType(player, "&c" + "Usage: /mf declarewar \"faction\" (quotation marks are required)", "UsageDeclareWar", false); return; } @@ -69,27 +69,27 @@ public void execute(Player player, String[] args, String key) { final Faction opponent = getFaction(factionName); if (opponent == null) { - new PlayerService().sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(new MessageService().getLanguage().getString("FactionNotFound")) + playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) .replaceAll("#faction#", String.join(" ", args)), true); return; } if (opponent == faction) { - new PlayerService().sendMessageType(player, "&c" + getText("CannotDeclareWarOnYourself") + playerService.sendMessageType(player, "&c" + getText("CannotDeclareWarOnYourself") , "CannotDeclareWarOnYourself", false); return; } if (faction.isEnemy(opponent.getName())) { - new PlayerService().sendMessageType(player, "&c" + getText("CannotDeclareWarOnYourself") - , Objects.requireNonNull(new MessageService().getLanguage().getString("AlertAlreadyAtWarWith")).replaceAll("#faction#", opponent.getName()), true); + playerService.sendMessageType(player, "&c" + getText("CannotDeclareWarOnYourself") + , Objects.requireNonNull(messageService.getLanguage().getString("AlertAlreadyAtWarWith")).replaceAll("#faction#", opponent.getName()), true); return; } if (faction.hasLiege() && opponent.hasLiege()) { if (faction.isVassal(opponent.getName())) { - new PlayerService().sendMessageType(player, "&c" + getText("CannotDeclareWarOnVassal") + playerService.sendMessageType(player, "&c" + getText("CannotDeclareWarOnVassal") , "CannotDeclareWarOnVassal", false); return; } @@ -98,33 +98,33 @@ public void execute(Player player, String[] args, String key) { final Faction enemyLiege = getFaction(opponent.getLiege()); if (enemyLiege.calculateCumulativePowerLevelWithoutVassalContribution() < enemyLiege.getMaximumCumulativePowerLevel() / 2) { - new PlayerService().sendMessageType(player, "&c" + getText("CannotDeclareWarIfLiegeNotWeakened") + playerService.sendMessageType(player, "&c" + getText("CannotDeclareWarIfLiegeNotWeakened") , "CannotDeclareWarIfLiegeNotWeakened", false); } } } if (faction.isLiege(opponent.getName())) { - new PlayerService().sendMessageType(player, "&c" + getText("CannotDeclareWarOnLiege") + playerService.sendMessageType(player, "&c" + getText("CannotDeclareWarOnLiege") , "CannotDeclareWarOnLiege", false); return; } if (faction.isAlly(opponent.getName())) { - new PlayerService().sendMessageType(player, "&c" + getText("CannotDeclareWarOnAlly") + playerService.sendMessageType(player, "&c" + getText("CannotDeclareWarOnAlly") , "CannotDeclareWarOnAlly", false); return; } if (configService.getBoolean("allowNeutrality") && ((boolean) opponent.getFlags().getFlag("neutral"))) { - new PlayerService().sendMessageType(player, "&c" + getText("CannotDeclareWarOnNeutralFaction") + playerService.sendMessageType(player, "&c" + getText("CannotDeclareWarOnNeutralFaction") , "CannotDeclareWarOnNeutralFaction", false); return; } if (configService.getBoolean("allowNeutrality") && ((boolean) faction.getFlags().getFlag("neutral"))) { - new PlayerService().sendMessageType(player, "&c" + getText("CannotDeclareWarIfNeutralFaction") + playerService.sendMessageType(player, "&c" + getText("CannotDeclareWarIfNeutralFaction") , "CannotDeclareWarIfNeutralFaction", false); return; } @@ -136,7 +136,7 @@ public void execute(Player player, String[] args, String key) { faction.addEnemy(opponent.getName()); opponent.addEnemy(faction.getName()); warFactory.createWar(faction, opponent); - messageServer("&c" + getText("HasDeclaredWarAgainst", faction.getName(), opponent.getName()), Objects.requireNonNull(new MessageService().getLanguage().getString("HasDeclaredWarAgainst")) + messageServer("&c" + getText("HasDeclaredWarAgainst", faction.getName(), opponent.getName()), Objects.requireNonNull(messageService.getLanguage().getString("HasDeclaredWarAgainst")) .replaceAll("#f_a#", faction.getName()) .replaceAll("#f_b#", opponent.getName())); diff --git a/src/main/java/dansplugins/factionsystem/commands/DemoteCommand.java b/src/main/java/dansplugins/factionsystem/commands/DemoteCommand.java index 163da60e1..e966ce496 100644 --- a/src/main/java/dansplugins/factionsystem/commands/DemoteCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/DemoteCommand.java @@ -25,10 +25,10 @@ */ public class DemoteCommand extends SubCommand { - public DemoteCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public DemoteCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "demote", LOCALE_PREFIX + "CmdDemote" - }, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService); + }, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService); } /** @@ -46,7 +46,7 @@ public void execute(Player player, String[] args, String key) { } if (args.length == 0) { - new PlayerService().sendMessageType(player, "&c" + getText("UsageDemote") + playerService.sendMessageType(player, "&c" + getText("UsageDemote") , "UsageDemote", false); return; } @@ -59,20 +59,20 @@ public void execute(Player player, String[] args, String key) { } if (playerToBeDemoted == null) { - new PlayerService().sendMessageType(player, "&c" + getText("PlayerByNameNotFound") - , Objects.requireNonNull(new MessageService().getLanguage().getString("PlayerByNameNotFound")) + playerService.sendMessageType(player, "&c" + getText("PlayerByNameNotFound") + , Objects.requireNonNull(messageService.getLanguage().getString("PlayerByNameNotFound")) .replaceAll("#name#", args[0]), true); return; } if (playerToBeDemoted.getUniqueId() == player.getUniqueId()) { - new PlayerService().sendMessageType(player, "&c" + getText("CannotDemoteSelf") + playerService.sendMessageType(player, "&c" + getText("CannotDemoteSelf") , "CannotDemoteSelf", false); return; } if (!this.faction.isOfficer(playerToBeDemoted.getUniqueId())) { - new PlayerService().sendMessageType(player, "&c" + getText("PlayerIsNotOfficerOfFaction") + playerService.sendMessageType(player, "&c" + getText("PlayerIsNotOfficerOfFaction") , "PlayerIsNotOfficerOfFaction", false); return; } @@ -80,11 +80,11 @@ public void execute(Player player, String[] args, String key) { faction.removeOfficer(playerToBeDemoted.getUniqueId()); if (playerToBeDemoted.isOnline()) { - new PlayerService().sendMessageType(player, "&c" + getText("AlertDemotion") + playerService.sendMessageType(player, "&c" + getText("AlertDemotion") , "AlertDemotion", false); } - new PlayerService().sendMessageType(player, "&c" + getText("PlayerDemoted") - , Objects.requireNonNull(new MessageService().getLanguage().getString("PlayerDemoted")) + playerService.sendMessageType(player, "&c" + getText("PlayerDemoted") + , Objects.requireNonNull(messageService.getLanguage().getString("PlayerDemoted")) .replaceAll("#name#", playerToBeDemoted.getName()), true); } diff --git a/src/main/java/dansplugins/factionsystem/commands/DescCommand.java b/src/main/java/dansplugins/factionsystem/commands/DescCommand.java index 3140074ef..007b0c0a0 100644 --- a/src/main/java/dansplugins/factionsystem/commands/DescCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/DescCommand.java @@ -22,10 +22,10 @@ */ public class DescCommand extends SubCommand { - public DescCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public DescCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "Desc", "Description", LOCALE_PREFIX + "CmdDesc" - }, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService); + }, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService); } /** @@ -43,14 +43,14 @@ public void execute(Player player, String[] args, String key) { } if (args.length == 0) { - new PlayerService().sendMessageType(player, "&c" + getText("UsageDesc") + playerService.sendMessageType(player, "&c" + getText("UsageDesc") , "UsageDesc", false); return; } faction.setDescription(String.join(" ", args)); - new PlayerService().sendMessageType(player, "&c" + getText("DescriptionSet") - , Objects.requireNonNull(new MessageService().getLanguage().getString("Description")) + playerService.sendMessageType(player, "&c" + getText("DescriptionSet") + , Objects.requireNonNull(messageService.getLanguage().getString("Description")) .replaceAll("#desc#", String.join(" ", args)), true); } diff --git a/src/main/java/dansplugins/factionsystem/commands/DisbandCommand.java b/src/main/java/dansplugins/factionsystem/commands/DisbandCommand.java index e7c209355..26536b810 100644 --- a/src/main/java/dansplugins/factionsystem/commands/DisbandCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/DisbandCommand.java @@ -29,10 +29,10 @@ public class DisbandCommand extends SubCommand { private final Logger logger; - public DisbandCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, Logger logger) { + public DisbandCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, Logger logger, PlayerService playerService, MessageService messageService) { super(new String[]{ "disband", LOCALE_PREFIX + "CmdDisband" - }, false, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + }, false, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); this.logger = logger; } @@ -65,14 +65,14 @@ public void execute(CommandSender sender, String[] args, String key) { if (!new MedievalFactions().USE_NEW_LANGUAGE_FILE) { sender.sendMessage(translate(getText("OnlyPlayersCanUseCommand"))); } else { - new PlayerService().sendConsoleMessage(sender.getServer().getConsoleSender(), "OnlyPlayersCanUseCommand", true); + playerService.sendConsoleMessage(sender.getServer().getConsoleSender(), "OnlyPlayersCanUseCommand", true); } return; } disband = getPlayerFaction(sender); self = true; if (disband.getPopulation() != 1) { - new PlayerService().sendMessageType(sender, "&c" + getText("AlertMustKickAllPlayers") + playerService.sendMessageType(sender, "&c" + getText("AlertMustKickAllPlayers") , "AlertMustKickAllPlayers", false); return; } @@ -82,19 +82,19 @@ public void execute(CommandSender sender, String[] args, String key) { self = false; } if (disband == null) { - new PlayerService().sendMessageType(sender, "&c" + getText("FactionNotFound") - , Objects.requireNonNull(new MessageService().getLanguage().getString("FactionNotFound")) + playerService.sendMessageType(sender, "&c" + getText("FactionNotFound") + , Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) .replaceAll("#faction#", String.join(" ", args)), true); return; } final int factionIndex = persistentData.getFactionIndexOf(disband); if (self) { - new PlayerService().sendMessageType(sender, "&c" + getText("FactionSuccessfullyDisbanded") + playerService.sendMessageType(sender, "&c" + getText("FactionSuccessfullyDisbanded") , "FactionSuccessfullyDisbanded", false); ephemeralData.getPlayersInFactionChat().remove(((Player) sender).getUniqueId()); } else { - new PlayerService().sendMessageType(sender, "&c" + getText("SuccessfulDisbandment", disband.getName()) - , Objects.requireNonNull(new MessageService().getLanguage().getString("SuccessfulDisbandment")).replaceAll("#faction#", disband.getName()), true); + playerService.sendMessageType(sender, "&c" + getText("SuccessfulDisbandment", disband.getName()) + , Objects.requireNonNull(messageService.getLanguage().getString("SuccessfulDisbandment")).replaceAll("#faction#", disband.getName()), true); } removeFaction(factionIndex, self ? ((OfflinePlayer) sender) : null); } diff --git a/src/main/java/dansplugins/factionsystem/commands/DuelCommand.java b/src/main/java/dansplugins/factionsystem/commands/DuelCommand.java index a5acc485e..530f17c29 100644 --- a/src/main/java/dansplugins/factionsystem/commands/DuelCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/DuelCommand.java @@ -27,8 +27,8 @@ public class DuelCommand extends SubCommand { private final MedievalFactions medievalFactions; - public DuelCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, MedievalFactions medievalFactions) { - super(new String[]{"dl", "duel", LOCALE_PREFIX + "CmdDuel"}, true, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + public DuelCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, MedievalFactions medievalFactions, PlayerService playerService, MessageService messageService) { + super(new String[]{"dl", "duel", LOCALE_PREFIX + "CmdDuel"}, true, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); this.medievalFactions = medievalFactions; } @@ -47,26 +47,26 @@ public void execute(Player player, String[] args, String key) { sendHelp(player); return; } - if (safeEquals(args[0], new PlayerService().getMessageType(getText("CmdDuelChallenge"), new MessageService().getLanguage().getString("Alias. CmdDuelChallenge")), "challenge")) { + if (safeEquals(args[0], playerService.getMessageType(getText("CmdDuelChallenge"), messageService.getLanguage().getString("Alias. CmdDuelChallenge")), "challenge")) { if (!(args.length >= 2)) { sendHelp(player); return; } if (player.getName().equals(args[1])) { - new PlayerService().sendMessageType(player, "&c" + getText("CannotDuelSelf"), "CannotDuelSelf", false); + playerService.sendMessageType(player, "&c" + getText("CannotDuelSelf"), "CannotDuelSelf", false); return; } if (isDuelling(player)) { - new PlayerService().sendMessageType(player, "&c" + getText("AlertAlreadyDuelingSomeone"), "AlertAlreadyDuelingSomeone", false); + playerService.sendMessageType(player, "&c" + getText("AlertAlreadyDuelingSomeone"), "AlertAlreadyDuelingSomeone", false); return; } Player target = Bukkit.getPlayer(args[1]); if (target == null) { - new PlayerService().sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(new MessageService().getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[1]), true); + playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[1]), true); return; } if (isDuelling(target)) { - new PlayerService().sendMessageType(player, "&c" + getText("PlayerAlreadyDueling", target.getName()), Objects.requireNonNull(new MessageService().getLanguage().getString("PlayerAlreadyDueling")).replaceAll("#name#", args[1]), true); + playerService.sendMessageType(player, "&c" + getText("PlayerAlreadyDueling", target.getName()), Objects.requireNonNull(messageService.getLanguage().getString("PlayerAlreadyDueling")).replaceAll("#name#", args[1]), true); return; } int timeLimit = 120; // Time limit in seconds. TODO: Make config option. @@ -74,10 +74,10 @@ public void execute(Player player, String[] args, String key) { timeLimit = getIntSafe(args[2], 120); } inviteDuel(player, target, timeLimit); - new PlayerService().sendMessageType(player, "&b" + getText("AlertChallengeIssued", target.getName()), Objects.requireNonNull(new MessageService().getLanguage().getString("AlertChallengeIssued")).replaceAll("#name#", target.getName()), true); - } else if (safeEquals(args[0], new PlayerService().getMessageType(getText("CmdDuelAccept"), new MessageService().getLanguage().getString("Alias.CmdDuelAccept")), "accept")) { + playerService.sendMessageType(player, "&b" + getText("AlertChallengeIssued", target.getName()), Objects.requireNonNull(messageService.getLanguage().getString("AlertChallengeIssued")).replaceAll("#name#", target.getName()), true); + } else if (safeEquals(args[0], playerService.getMessageType(getText("CmdDuelAccept"), messageService.getLanguage().getString("Alias.CmdDuelAccept")), "accept")) { if (isDuelling(player)) { - new PlayerService().sendMessageType(player, "&c" + getText("AlertAlreadyDuelingSomeone"), "AlertAlreadyDuelingSomeone", false); + playerService.sendMessageType(player, "&c" + getText("AlertAlreadyDuelingSomeone"), "AlertAlreadyDuelingSomeone", false); return; } final Duel duel; @@ -85,50 +85,50 @@ public void execute(Player player, String[] args, String key) { if (args.length >= 2) { final Player target = Bukkit.getPlayer(args[2]); if (target == null) { - new PlayerService().sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(new MessageService().getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[1]), true); + playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[1]), true); return; } duel = ephemeralData.getDuel(player, target); notChallenged = getText("AlertNotBeenChallengedByPlayer", target.getName()); - notChallenged2 = Objects.requireNonNull(new MessageService().getLanguage().getString("AlertNotBeenChallengedByPlayer")).replaceAll("#name#", target.getName()); + notChallenged2 = Objects.requireNonNull(messageService.getLanguage().getString("AlertNotBeenChallengedByPlayer")).replaceAll("#name#", target.getName()); alreadyDueling = getText("AlertAlreadyDuelingPlayer", target.getName()); - alreadyDueling2 = Objects.requireNonNull(new MessageService().getLanguage().getString("AlertAlreadyDuelingPlayer")).replaceAll("#name#", target.getName()); + alreadyDueling2 = Objects.requireNonNull(messageService.getLanguage().getString("AlertAlreadyDuelingPlayer")).replaceAll("#name#", target.getName()); } else { duel = getDuel(player); notChallenged = getText("AlertNotBeenChallenged"); alreadyDueling = getText("AlertAlreadyDueling"); - notChallenged2 = new MessageService().getLanguage().getString("AlertNotBeenChallenged"); - alreadyDueling2 = new MessageService().getLanguage().getString("AlertAlreadyDueling"); + notChallenged2 = messageService.getLanguage().getString("AlertNotBeenChallenged"); + alreadyDueling2 = messageService.getLanguage().getString("AlertAlreadyDueling"); } if (duel == null) { - new PlayerService().sendMessageType(player, "&c" + notChallenged, notChallenged2, true); + playerService.sendMessageType(player, "&c" + notChallenged, notChallenged2, true); return; } if (duel.getStatus().equals(DuelState.DUELLING)) { - new PlayerService().sendMessageType(player, "&c" + alreadyDueling, alreadyDueling2, true); + playerService.sendMessageType(player, "&c" + alreadyDueling, alreadyDueling2, true); return; } if (!(duel.isChallenged(player))) { - new PlayerService().sendMessageType(player, "&c" + notChallenged, notChallenged2, true); + playerService.sendMessageType(player, "&c" + notChallenged, notChallenged2, true); return; } duel.acceptDuel(); - } else if (safeEquals(args[0], new PlayerService().getMessageType(getText("CmdDuelCancel"), new MessageService().getLanguage().getString("Alias.CmdDuelCancel")), "cancel")) { + } else if (safeEquals(args[0], playerService.getMessageType(getText("CmdDuelCancel"), messageService.getLanguage().getString("Alias.CmdDuelCancel")), "cancel")) { if (!isDuelling(player)) { - new PlayerService().sendMessageType(player, "&c" + getText("AlertNoPendingChallenges"), "AlertNoPendingChallenges", false); + playerService.sendMessageType(player, "&c" + getText("AlertNoPendingChallenges"), "AlertNoPendingChallenges", false); return; } final Duel duel = getDuel(player); if (duel == null) { - new PlayerService().sendMessageType(player, "&c" + getText("AlertNoPendingChallenges"), "AlertNoPendingChallenges", false); + playerService.sendMessageType(player, "&c" + getText("AlertNoPendingChallenges"), "AlertNoPendingChallenges", false); return; } if (duel.getStatus().equals(DuelState.DUELLING)) { - new PlayerService().sendMessageType(player, "c" + getText("CannotCancelActiveDuel"), "CannotCancelActiveDuel", false); + playerService.sendMessageType(player, "c" + getText("CannotCancelActiveDuel"), "CannotCancelActiveDuel", false); return; } ephemeralData.getDuelingPlayers().remove(duel); - new PlayerService().sendMessageType(player, "&b" + getText("DuelChallengeCancelled"), "DuelChallengeCancelled", false); + playerService.sendMessageType(player, "&b" + getText("DuelChallengeCancelled"), "DuelChallengeCancelled", false); } else { sendHelp(player); } @@ -153,7 +153,7 @@ private void sendHelp(CommandSender sender) { sender.sendMessage("&b" + getText("HelpDuelAccept")); sender.sendMessage("&b" + getText("HelpDuelCancel")); } else { - new PlayerService().sendListMessage(sender, new MessageService().getLanguage().getStringList("DuelHelp")); + playerService.sendListMessage(sender, messageService.getLanguage().getStringList("DuelHelp")); } } @@ -166,8 +166,8 @@ private boolean isDuelling(Player player) { } private void inviteDuel(Player player, Player target, int limit) { - new PlayerService().sendMessageType(target, "&a" + getText("AlertChallengedToDuelPlusHowTo", player.getName()), - Objects.requireNonNull(new MessageService().getLanguage().getString("AlertChallengedToDuelPlusHowTo")) + playerService.sendMessageType(target, "&a" + getText("AlertChallengedToDuelPlusHowTo", player.getName()), + Objects.requireNonNull(messageService.getLanguage().getString("AlertChallengedToDuelPlusHowTo")) .replaceAll("#name#", player.getName()), true); ephemeralData.getDuelingPlayers().add(new Duel(medievalFactions, ephemeralData, player, target, limit)); } diff --git a/src/main/java/dansplugins/factionsystem/commands/EditLawCommand.java b/src/main/java/dansplugins/factionsystem/commands/EditLawCommand.java index 1809885b8..e0000f9c8 100644 --- a/src/main/java/dansplugins/factionsystem/commands/EditLawCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/EditLawCommand.java @@ -10,6 +10,7 @@ import dansplugins.factionsystem.integrators.DynmapIntegrator; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; import dansplugins.factionsystem.services.PlayerService; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -19,8 +20,8 @@ */ public class EditLawCommand extends SubCommand { - public EditLawCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { - super(new String[]{"EditLaw", "EL", LOCALE_PREFIX + "CmdEditLaw"}, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService); + public EditLawCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { + super(new String[]{"EditLaw", "EL", LOCALE_PREFIX + "CmdEditLaw"}, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService); } /** @@ -36,14 +37,14 @@ public void execute(Player player, String[] args, String key) { if (!(checkPermissions(player, permission))) return; final int lawToEdit = getIntSafe(args[0], 0) - 1; if (lawToEdit < 0 || lawToEdit >= faction.getLaws().size()) { - new PlayerService().sendMessageType(player, "&c" + getText("UsageEditLaw"), "UsageEditLaw", false); + playerService.sendMessageType(player, "&c" + getText("UsageEditLaw"), "UsageEditLaw", false); return; } String[] arguments = new String[args.length - 1]; System.arraycopy(args, 1, arguments, 0, arguments.length); final String editedLaw = String.join(" ", arguments); if (faction.editLaw(lawToEdit, editedLaw)) { - new PlayerService().sendMessageType(player, "&a" + getText("LawEdited"), "LawEdited", false); + playerService.sendMessageType(player, "&a" + getText("LawEdited"), "LawEdited", false); } } diff --git a/src/main/java/dansplugins/factionsystem/commands/FlagsCommand.java b/src/main/java/dansplugins/factionsystem/commands/FlagsCommand.java index d3e9bef20..06102ce83 100644 --- a/src/main/java/dansplugins/factionsystem/commands/FlagsCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/FlagsCommand.java @@ -21,8 +21,8 @@ */ public class FlagsCommand extends SubCommand { - public FlagsCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { - super(new String[]{"flags", LOCALE_PREFIX + "CmdFlags"}, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService); + public FlagsCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { + super(new String[]{"flags", LOCALE_PREFIX + "CmdFlags"}, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService); } /** @@ -40,19 +40,19 @@ public void execute(Player player, String[] args, String key) { } if (args.length == 0) { - new PlayerService().sendMessageType(player, "&c" + getText("ValidSubCommandsShowSet"), "ValidSubCommandsShowSet", false); + playerService.sendMessageType(player, "&c" + getText("ValidSubCommandsShowSet"), "ValidSubCommandsShowSet", false); return; } final Faction playersFaction = getPlayerFaction(player); - final boolean show = safeEquals(args[0], "get", "show", new PlayerService().getMessageType(getText("CmdFlagsShow"), new MessageService().getLanguage().getString("Alias.CmdFlagsShow"))); - final boolean set = safeEquals(args[0], "set", new PlayerService().getMessageType(getText("CmdFlagsSet"), new MessageService().getLanguage().getString("Alias.CmdFlagsSet"))); + final boolean show = safeEquals(args[0], "get", "show", playerService.getMessageType(getText("CmdFlagsShow"), messageService.getLanguage().getString("Alias.CmdFlagsShow"))); + final boolean set = safeEquals(args[0], "set", playerService.getMessageType(getText("CmdFlagsSet"), messageService.getLanguage().getString("Alias.CmdFlagsSet"))); if (show) { playersFaction.getFlags().sendFlagList(player); } else if (set) { if (args.length < 3) { - new PlayerService().sendMessageType(player, "&c" + getText("UsageFlagsSet"), "UsageFlagsSet", false); + playerService.sendMessageType(player, "&c" + getText("UsageFlagsSet"), "UsageFlagsSet", false); } else { final StringBuilder builder = new StringBuilder(); // Send the flag_argument as one String for (int i = 2; i < args.length; i++) builder.append(args[i]).append(" "); @@ -60,7 +60,7 @@ public void execute(Player player, String[] args, String key) { } } else { - new PlayerService().sendMessageType(player, "&c" + getText("ValidSubCommandsShowSet"), "ValidSubCommandsShowSet", false); + playerService.sendMessageType(player, "&c" + getText("ValidSubCommandsShowSet"), "ValidSubCommandsShowSet", false); } } diff --git a/src/main/java/dansplugins/factionsystem/commands/ForceCommand.java b/src/main/java/dansplugins/factionsystem/commands/ForceCommand.java index eb9715f75..58ad44804 100644 --- a/src/main/java/dansplugins/factionsystem/commands/ForceCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/ForceCommand.java @@ -17,6 +17,7 @@ import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; import dansplugins.factionsystem.services.MessageService; +import dansplugins.factionsystem.services.PlayerService; import dansplugins.factionsystem.utils.Logger; import dansplugins.fiefs.utils.UUIDChecker; import org.bukkit.Bukkit; @@ -45,10 +46,10 @@ public class ForceCommand extends SubCommand { private final ArgumentParser argumentParser = new ArgumentParser(); private final UUIDChecker uuidChecker = new UUIDChecker(); - public ForceCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, MedievalFactions medievalFactions, Logger logger, FiefsIntegrator fiefsIntegrator, CurrenciesIntegrator currenciesIntegrator) { + public ForceCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, MedievalFactions medievalFactions, Logger logger, FiefsIntegrator fiefsIntegrator, CurrenciesIntegrator currenciesIntegrator, PlayerService playerService, MessageService messageService) { super(new String[]{ "Force", LOCALE_PREFIX + "CmdForce" - }, false, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + }, false, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); this.medievalFactions = medievalFactions; this.logger = logger; this.fiefsIntegrator = fiefsIntegrator; @@ -152,7 +153,7 @@ private void forcePeace(CommandSender sender, String[] args) { // announce peace to all players on server. messageServer("&a" + getText("AlertNowAtPeaceWith", former.getName(), latter.getName()), - Objects.requireNonNull(new MessageService().getLanguage().getString("AlertNowAtPeaceWith")) + Objects.requireNonNull(messageService.getLanguage().getString("AlertNowAtPeaceWith")) .replaceAll("#p1#", former.getName()) .replaceAll("#p2#", latter.getName()) ); @@ -556,7 +557,7 @@ public void forceCreate(CommandSender sender, String[] args) { return; } - this.faction = new Faction(configService, localeService, fiefsIntegrator, currenciesIntegrator, dynmapIntegrator, logger, persistentData, medievalFactions, newFactionName); + this.faction = new Faction(configService, localeService, fiefsIntegrator, currenciesIntegrator, dynmapIntegrator, logger, persistentData, medievalFactions, playerService, newFactionName); FactionCreateEvent createEvent = new FactionCreateEvent(this.faction, player); Bukkit.getPluginManager().callEvent(createEvent); if (!createEvent.isCancelled()) { diff --git a/src/main/java/dansplugins/factionsystem/commands/GateCommand.java b/src/main/java/dansplugins/factionsystem/commands/GateCommand.java index 954e98c47..43fa51131 100644 --- a/src/main/java/dansplugins/factionsystem/commands/GateCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/GateCommand.java @@ -28,10 +28,10 @@ public class GateCommand extends SubCommand { private final MedievalFactions medievalFactions; - public GateCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, MedievalFactions medievalFactions) { + public GateCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, MedievalFactions medievalFactions, PlayerService playerService, MessageService messageService) { super(new String[]{ "gate", "gt", LOCALE_PREFIX + "CmdGate" - }, true, true, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + }, true, true, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); this.medievalFactions = medievalFactions; } @@ -54,25 +54,25 @@ public void execute(Player player, String[] args, String key) { player.sendMessage(translate("&b" + getText("HelpGateRemove"))); player.sendMessage(translate("&b" + getText("HelpGateCancel"))); } else { - new PlayerService().sendListMessage(player, new MessageService().getLanguage().getStringList("GateHelp")); + playerService.sendListMessage(player, messageService.getLanguage().getStringList("GateHelp")); } return; } - if (safeEquals(args[0], "cancel", new PlayerService().getMessageType(getText("CmdGateCancel"), new MessageService().getLanguage().getString("Alias.CmdGateCancel")))) { + if (safeEquals(args[0], "cancel", playerService.getMessageType(getText("CmdGateCancel"), messageService.getLanguage().getString("Alias.CmdGateCancel")))) { // Cancel Logic if (ephemeralData.getCreatingGatePlayers().remove(player.getUniqueId()) != null) { - new PlayerService().sendMessageType(player, "&c" + getText("CreatingGateCancelled"), "CreatingGateCancelled", false); + playerService.sendMessageType(player, "&c" + getText("CreatingGateCancelled"), "CreatingGateCancelled", false); return; } } - if (safeEquals(args[0], "create", new PlayerService().getMessageType(getText("CmdGateCreate"), new MessageService().getLanguage().getString("Alias.CmdGateCreate")))) { + if (safeEquals(args[0], "create", playerService.getMessageType(getText("CmdGateCreate"), messageService.getLanguage().getString("Alias.CmdGateCreate")))) { // Create Logic if (ephemeralData.getCreatingGatePlayers().containsKey(player.getUniqueId())) { - new PlayerService().sendMessageType(player, "&c" + getText("AlertAlreadyCreatingGate"), "AlertAlreadyCreatingGate", false); + playerService.sendMessageType(player, "&c" + getText("AlertAlreadyCreatingGate"), "AlertAlreadyCreatingGate", false); return; } if (!faction.isOfficer(player.getUniqueId()) && !faction.isOwner(player.getUniqueId())) { - new PlayerService().sendMessageType(player, "&c" + getText("AlertMustBeOwnerOrOfficerToUseCommand"), "AlertMustBeOwnerOrOfficerToUseCommand", false); + playerService.sendMessageType(player, "&c" + getText("AlertMustBeOwnerOrOfficerToUseCommand"), "AlertMustBeOwnerOrOfficerToUseCommand", false); return; } final String gateName; @@ -81,63 +81,63 @@ public void execute(Player player, String[] args, String key) { System.arraycopy(args, 1, arguments, 0, arguments.length); gateName = String.join(" ", arguments); } else { - gateName = new PlayerService().getMessageType("Unnamed Gate", new MessageService().getLanguage().getString("UnnamedGate")); + gateName = playerService.getMessageType("Unnamed Gate", messageService.getLanguage().getString("UnnamedGate")); } startCreatingGate(player, gateName); - new PlayerService().sendMessageType(player, "&b" + getText("CreatingGateClickWithHoe"), "CreatingGateClickWithHoe", false); + playerService.sendMessageType(player, "&b" + getText("CreatingGateClickWithHoe"), "CreatingGateClickWithHoe", false); return; } - if (safeEquals(args[0], "list", new PlayerService().getMessageType(getText("CmdGateList"), new MessageService().getLanguage().getString("Alias.CmdGateList")))) { + if (safeEquals(args[0], "list", playerService.getMessageType(getText("CmdGateList"), messageService.getLanguage().getString("Alias.CmdGateList")))) { // List logic if (faction.getGates().size() > 0) { - new PlayerService().sendMessageType(player, "&bFaction Gates", "FactionGate", false); + playerService.sendMessageType(player, "&bFaction Gates", "FactionGate", false); for (Gate gate : faction.getGates()) { - new PlayerService().sendMessageType(player, "&b" + String.format("%s: %s", gate.getName(), gate.coordsToString()), - Objects.requireNonNull(new MessageService().getLanguage().getString("GateLocation")) + playerService.sendMessageType(player, "&b" + String.format("%s: %s", gate.getName(), gate.coordsToString()), + Objects.requireNonNull(messageService.getLanguage().getString("GateLocation")) .replaceAll("#name#", gate.getName()) .replaceAll("#location#", gate.coordsToString()), true); } } else { - new PlayerService().sendMessageType(player, "&c" + getText("AlertNoGatesDefined"), "AlertNoGatesDefined", false); + playerService.sendMessageType(player, "&c" + getText("AlertNoGatesDefined"), "AlertNoGatesDefined", false); } return; } - final boolean remove = safeEquals(args[0], "remove", new PlayerService().getMessageType(getText("CmdGateRemove"), new MessageService().getLanguage().getString("Alias.CmdGateRemove"))); - final boolean rename = safeEquals(args[0], "name", new PlayerService().getMessageType(getText("CmdGateName"), new MessageService().getLanguage().getString("Alias.CmdGateName"))); + final boolean remove = safeEquals(args[0], "remove", playerService.getMessageType(getText("CmdGateRemove"), messageService.getLanguage().getString("Alias.CmdGateRemove"))); + final boolean rename = safeEquals(args[0], "name", playerService.getMessageType(getText("CmdGateName"), messageService.getLanguage().getString("Alias.CmdGateName"))); if (rename || remove) { final Block targetBlock = player.getTargetBlock(null, 16); if (targetBlock.getType().equals(Material.AIR)) { - new PlayerService().sendMessageType(player, "&c" + getText("NoBlockDetectedToCheckForGate") + playerService.sendMessageType(player, "&c" + getText("NoBlockDetectedToCheckForGate") , "NoBlockDetectedToCheckForGate", false); return; } if (!persistentData.isGateBlock(targetBlock)) { - new PlayerService().sendMessageType(player, "&c" + getText("TargetBlockNotPartOfGate") + playerService.sendMessageType(player, "&c" + getText("TargetBlockNotPartOfGate") , "TargetBlockNotPartOfGate", false); return; } final Gate gate = persistentData.getGate(targetBlock); if (gate == null) { - new PlayerService().sendMessageType(player, "&c" + getText("TargetBlockNotPartOfGate") + playerService.sendMessageType(player, "&c" + getText("TargetBlockNotPartOfGate") , "TargetBlockNotPartOfGate", false); return; } final Faction gateFaction = persistentData.getGateFaction(gate); if (gateFaction == null) { - new PlayerService().sendMessageType(player, "&c" + getText("ErrorCouldNotFindGatesFaction", gate.getName()) - , Objects.requireNonNull(new MessageService().getLanguage().getString("ErrorCouldNotFindGatesFaction")) + playerService.sendMessageType(player, "&c" + getText("ErrorCouldNotFindGatesFaction", gate.getName()) + , Objects.requireNonNull(messageService.getLanguage().getString("ErrorCouldNotFindGatesFaction")) .replaceAll("#name#", gate.getName()) , true); return; } if (!gateFaction.isOfficer(player.getUniqueId()) && !gateFaction.isOwner(player.getUniqueId())) { - new PlayerService().sendMessageType(player, "&c" + getText("AlertMustBeOwnerOrOfficerToUseCommand"), "AlertMustBeOwnerOrOfficerToUseCommand", false); + playerService.sendMessageType(player, "&c" + getText("AlertMustBeOwnerOrOfficerToUseCommand"), "AlertMustBeOwnerOrOfficerToUseCommand", false); return; } if (remove) { gateFaction.removeGate(gate); - new PlayerService().sendMessageType(player, "&b" + getText("RemovedGate", gate.getName()) - , Objects.requireNonNull(new MessageService().getLanguage().getString("RemovedGate")) + playerService.sendMessageType(player, "&b" + getText("RemovedGate", gate.getName()) + , Objects.requireNonNull(messageService.getLanguage().getString("RemovedGate")) .replaceAll("#name#", gate.getName()) , true); } @@ -145,8 +145,8 @@ public void execute(Player player, String[] args, String key) { String[] arguments = new String[args.length - 1]; System.arraycopy(args, 1, arguments, 0, arguments.length); gate.setName(String.join(" ", arguments)); - new PlayerService().sendMessageType(player, "&b" + getText("AlertChangedGateName", gate.getName()) - , Objects.requireNonNull(new MessageService().getLanguage().getString("AlertChangedGateName")) + playerService.sendMessageType(player, "&b" + getText("AlertChangedGateName", gate.getName()) + , Objects.requireNonNull(messageService.getLanguage().getString("AlertChangedGateName")) .replaceAll("#name#", gate.getName()) , true); } diff --git a/src/main/java/dansplugins/factionsystem/commands/GrantAccessCommand.java b/src/main/java/dansplugins/factionsystem/commands/GrantAccessCommand.java index 7ec1505eb..680e1c907 100644 --- a/src/main/java/dansplugins/factionsystem/commands/GrantAccessCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/GrantAccessCommand.java @@ -24,10 +24,10 @@ */ public class GrantAccessCommand extends SubCommand { - public GrantAccessCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public GrantAccessCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "grantaccess", "ga", LOCALE_PREFIX + "CmdGrantAccess" - }, true, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + }, true, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); } /** @@ -40,34 +40,34 @@ public GrantAccessCommand(LocaleService localeService, PersistentData persistent @Override public void execute(Player player, String[] args, String key) { if (args.length == 0) { - new PlayerService().sendMessageType(player, "&c" + getText("UsageGrantAccess"), + playerService.sendMessageType(player, "&c" + getText("UsageGrantAccess"), "UsageGrantAccess", false); return; } if (args[0].equalsIgnoreCase("cancel")) { - new PlayerService().sendMessageType(player, "&c" + getText("CommandCancelled"), "CommandCancelled", false); + playerService.sendMessageType(player, "&c" + getText("CommandCancelled"), "CommandCancelled", false); return; } if (ephemeralData.getPlayersGrantingAccess().containsKey(player.getUniqueId())) { - new PlayerService().sendMessageType(player, "&c" + getText("AlertAlreadyGrantingAccess") + playerService.sendMessageType(player, "&c" + getText("AlertAlreadyGrantingAccess") , "AlertAlreadyGrantingAccess", false); return; } UUIDChecker uuidChecker = new UUIDChecker(); final UUID targetUUID = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (targetUUID == null) { - new PlayerService().sendMessageType(player, "&c" + getText("PlayerNotFound") - , Objects.requireNonNull(new MessageService().getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); + playerService.sendMessageType(player, "&c" + getText("PlayerNotFound") + , Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); return; } if (targetUUID == player.getUniqueId()) { - new PlayerService().sendMessageType(player, "&c" + getText("CannotGrantAccessToSelf") + playerService.sendMessageType(player, "&c" + getText("CannotGrantAccessToSelf") , "CannotGrantAccessToSelf", false); return; } ephemeralData.getPlayersGrantingAccess().put(player.getUniqueId(), targetUUID); - new PlayerService().sendMessageType(player,"&a" + getText("RightClickGrantAccess", args[0]) - , Objects.requireNonNull(new MessageService().getLanguage().getString("RightClickGrantAccess")).replaceAll("#name#", args[0]), true); + playerService.sendMessageType(player, "&a" + getText("RightClickGrantAccess", args[0]) + , Objects.requireNonNull(messageService.getLanguage().getString("RightClickGrantAccess")).replaceAll("#name#", args[0]), true); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/GrantIndependenceCommand.java b/src/main/java/dansplugins/factionsystem/commands/GrantIndependenceCommand.java index 78bdb8de9..fb6de1fb7 100644 --- a/src/main/java/dansplugins/factionsystem/commands/GrantIndependenceCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/GrantIndependenceCommand.java @@ -23,10 +23,10 @@ */ public class GrantIndependenceCommand extends SubCommand { - public GrantIndependenceCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public GrantIndependenceCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "GrantIndependence", "GI", LOCALE_PREFIX + "CmdGrantIndependence" - }, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService); + }, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService); } /** @@ -45,8 +45,8 @@ public void execute(Player player, String[] args, String key) { } final Faction target = getFaction(String.join(" ", args)); if (target == null) { - new PlayerService().sendMessageType(player, "&c" + getText("FactionNotFound") - , Objects.requireNonNull(new MessageService().getLanguage().getString("FactionNotFound")).replaceAll("#faction#", String.join(" ", args)) + playerService.sendMessageType(player, "&c" + getText("FactionNotFound") + , Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")).replaceAll("#faction#", String.join(" ", args)) , true); return; } @@ -58,11 +58,11 @@ public void execute(Player player, String[] args, String key) { this.faction.removeVassal(target.getName()); // inform all players in that faction that they are now independent messageFaction(target, translate("&a" + getText("AlertGrantedIndependence", faction.getName())), - Objects.requireNonNull(new MessageService().getLanguage().getString("AlertGrantedIndependence")) + Objects.requireNonNull(messageService.getLanguage().getString("AlertGrantedIndependence")) .replaceAll("#name#", faction.getName())); // inform all players in players faction that a vassal was granted independence messageFaction(faction, translate("&a" + getText("AlertNoLongerVassalFaction", target.getName())) - , Objects.requireNonNull(new MessageService().getLanguage().getString("AlertNoLongerVassalFaction")) + , Objects.requireNonNull(messageService.getLanguage().getString("AlertNoLongerVassalFaction")) .replaceAll("#name#", target.getName())); } diff --git a/src/main/java/dansplugins/factionsystem/commands/HelpCommand.java b/src/main/java/dansplugins/factionsystem/commands/HelpCommand.java index 8e53962be..2821173d5 100644 --- a/src/main/java/dansplugins/factionsystem/commands/HelpCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/HelpCommand.java @@ -10,6 +10,8 @@ import dansplugins.factionsystem.integrators.DynmapIntegrator; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; +import dansplugins.factionsystem.services.PlayerService; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -24,10 +26,10 @@ public class HelpCommand extends SubCommand { private static final int LAST_PAGE = 7; private final HashMap> helpPages = new HashMap<>(); - public HelpCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public HelpCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "help", LOCALE_PREFIX + "CmdHelp" - }, false, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + }, false, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); // there should be 9 commands per page helpPages.put(1, Arrays.asList("Help", "List", "Info", "Members", "Join", "Leave", "Create", "Invite", "Desc")); diff --git a/src/main/java/dansplugins/factionsystem/commands/HomeCommand.java b/src/main/java/dansplugins/factionsystem/commands/HomeCommand.java index e66290cbf..434a6687b 100644 --- a/src/main/java/dansplugins/factionsystem/commands/HomeCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/HomeCommand.java @@ -11,6 +11,7 @@ import dansplugins.factionsystem.objects.domain.ClaimedChunk; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; import dansplugins.factionsystem.services.PlayerService; import dansplugins.factionsystem.utils.extended.Scheduler; import org.bukkit.Chunk; @@ -23,10 +24,10 @@ public class HomeCommand extends SubCommand { private final Scheduler scheduler; - public HomeCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, Scheduler scheduler) { + public HomeCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, Scheduler scheduler, PlayerService playerService, MessageService messageService) { super(new String[]{ "home", LOCALE_PREFIX + "CmdHome" - }, true, true, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + }, true, true, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); this.scheduler = scheduler; } @@ -41,24 +42,24 @@ public HomeCommand(LocaleService localeService, PersistentData persistentData, E public void execute(Player player, String[] args, String key) { if (!(checkPermissions(player, "mf.home"))) return; if (faction.getFactionHome() == null) { - new PlayerService().sendMessageType(player, "&c" + getText("FactionHomeNotSetYet") + playerService.sendMessageType(player, "&c" + getText("FactionHomeNotSetYet") , "FactionHomeNotSetYet", false); return; } final Chunk home_chunk; if (!chunkDataAccessor.isClaimed(home_chunk = faction.getFactionHome().getChunk())) { - new PlayerService().sendMessageType(player, "&c" + getText("HomeIsInUnclaimedChunk") + playerService.sendMessageType(player, "&c" + getText("HomeIsInUnclaimedChunk") , "HomeIsInUnclaimedChunk", false); return; } ClaimedChunk chunk = chunkDataAccessor.getClaimedChunk(home_chunk); if (chunk == null || chunk.getHolder() == null) { - new PlayerService().sendMessageType(player, "&c" + getText("HomeIsInUnclaimedChunk") + playerService.sendMessageType(player, "&c" + getText("HomeIsInUnclaimedChunk") , "HomeIsInUnclaimedChunk", false); return; } if (!chunk.getHolder().equalsIgnoreCase(faction.getName())) { - new PlayerService().sendMessageType(player, "&c" + getText("HomeClaimedByAnotherFaction") + playerService.sendMessageType(player, "&c" + getText("HomeClaimedByAnotherFaction") , "HomeClaimedByAnotherFaction", false); return; } diff --git a/src/main/java/dansplugins/factionsystem/commands/InfoCommand.java b/src/main/java/dansplugins/factionsystem/commands/InfoCommand.java index 82fb5723e..0b129a098 100644 --- a/src/main/java/dansplugins/factionsystem/commands/InfoCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/InfoCommand.java @@ -25,10 +25,10 @@ public class InfoCommand extends SubCommand { private final Messenger messenger; - public InfoCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, Messenger messenger) { + public InfoCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, Messenger messenger, PlayerService playerService, MessageService messageService) { super(new String[]{ "info", LOCALE_PREFIX + "CmdInfo" - }, false, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + }, false, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); this.messenger = messenger; } @@ -58,21 +58,21 @@ public void execute(CommandSender sender, String[] args, String key) { final Faction target; if (args.length == 0) { if (!(sender instanceof Player)) { - new PlayerService().sendMessageType(sender, getText("OnlyPlayersCanUseCommand") + playerService.sendMessageType(sender, getText("OnlyPlayersCanUseCommand") , "OnlyPlayersCanUseCommand", false); return; } target = getPlayerFaction(sender); if (target == null) { - new PlayerService().sendMessageType(sender, "&c" + getText("AlertMustBeInFactionToUseCommand") + playerService.sendMessageType(sender, "&c" + getText("AlertMustBeInFactionToUseCommand") , "AlertMustBeInFactionToUseCommand", false); return; } } else { target = getFaction(String.join(" ", args)); if (target == null) { - new PlayerService().sendMessageType(sender, "&c" + getText("FactionNotFound") - , Objects.requireNonNull(new MessageService().getLanguage().getString("FactionNotFound")) + playerService.sendMessageType(sender, "&c" + getText("FactionNotFound") + , Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) .replaceAll("#faction#", String.join(" ", args)), true); return; } diff --git a/src/main/java/dansplugins/factionsystem/commands/InviteCommand.java b/src/main/java/dansplugins/factionsystem/commands/InviteCommand.java index ae632d538..588e39f88 100644 --- a/src/main/java/dansplugins/factionsystem/commands/InviteCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/InviteCommand.java @@ -31,10 +31,10 @@ public class InviteCommand extends SubCommand { private final MedievalFactions medievalFactions; - public InviteCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, MedievalFactions medievalFactions) { + public InviteCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, MedievalFactions medievalFactions, PlayerService playerService, MessageService messageService) { super(new String[]{ "invite", LOCALE_PREFIX + "CmdInvite" - }, true, true, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + }, true, true, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); this.medievalFactions = medievalFactions; } @@ -56,7 +56,7 @@ public void execute(Player player, String[] args, String key) { if ((boolean) faction.getFlags().getFlag("mustBeOfficerToInviteOthers")) { // officer or owner rank required if (!faction.isOfficer(player.getUniqueId()) && !faction.isOwner(player.getUniqueId())) { - new PlayerService().sendMessageType(player, "&c" + getText("AlertMustBeOwnerOrOfficerToUseCommand") + playerService.sendMessageType(player, "&c" + getText("AlertMustBeOwnerOrOfficerToUseCommand") , "AlertMustBeOwnerOrOfficerToUseCommand", false); return; } @@ -64,8 +64,8 @@ public void execute(Player player, String[] args, String key) { UUIDChecker uuidChecker = new UUIDChecker(); final UUID playerUUID = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (playerUUID == null) { - new PlayerService().sendMessageType(player, "&c" + getText("PlayerNotFound") - , Objects.requireNonNull(new MessageService().getLanguage().getString("PlayerNotFound")) + playerService.sendMessageType(player, "&c" + getText("PlayerNotFound") + , Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")) .replaceAll("#name#", args[0]) , true); return; @@ -74,24 +74,24 @@ public void execute(Player player, String[] args, String key) { if (!target.hasPlayedBefore()) { target = Bukkit.getPlayer(args[0]); if (target == null) { - new PlayerService().sendMessageType(player, "&c" + getText("PlayerNotFound") - , Objects.requireNonNull(new MessageService().getLanguage().getString("PlayerNotFound")) + playerService.sendMessageType(player, "&c" + getText("PlayerNotFound") + , Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")) .replaceAll("#name#", args[0]) , true); return; } } if (persistentData.isInFaction(playerUUID)) { - new PlayerService().sendMessageType(player, "&c" + getText("PlayerAlreadyInFaction") + playerService.sendMessageType(player, "&c" + getText("PlayerAlreadyInFaction") , "PlayerAlreadyInFaction", false); return; } faction.invite(playerUUID); player.sendMessage(ChatColor.GREEN + localeService.get("InvitationSent")); if (target.isOnline() && target.getPlayer() != null) { - new PlayerService().sendMessageType(target.getPlayer(), + playerService.sendMessageType(target.getPlayer(), "&a" + getText("AlertBeenInvited", faction.getName(), faction.getName()) - , Objects.requireNonNull(new MessageService().getLanguage().getString("AlertBeenInvited")).replaceAll("#name#", faction.getName()), + , Objects.requireNonNull(messageService.getLanguage().getString("AlertBeenInvited")).replaceAll("#name#", faction.getName()), true ); } @@ -102,9 +102,9 @@ public void execute(Player player, String[] args, String key) { getServer().getScheduler().runTaskLater(medievalFactions, () -> { faction.uninvite(playerUUID); if (tmp.isOnline() && tmp.getPlayer() != null) { - new PlayerService().sendMessageType(player, + playerService.sendMessageType(player, "&c" + getText("InvitationExpired", faction.getName()), - Objects.requireNonNull(new MessageService().getLanguage().getString("InvitationExpired")) + Objects.requireNonNull(messageService.getLanguage().getString("InvitationExpired")) .replaceAll("#name#", faction.getName()), true ); diff --git a/src/main/java/dansplugins/factionsystem/commands/InvokeCommand.java b/src/main/java/dansplugins/factionsystem/commands/InvokeCommand.java index 4311fd179..a28e3f00e 100644 --- a/src/main/java/dansplugins/factionsystem/commands/InvokeCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/InvokeCommand.java @@ -28,8 +28,8 @@ */ public class InvokeCommand extends SubCommand { - public InvokeCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { - super(new String[]{"invoke", LOCALE_PREFIX + "CmdInvoke"}, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService); + public InvokeCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { + super(new String[]{"invoke", LOCALE_PREFIX + "CmdInvoke"}, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService); } /** @@ -56,23 +56,23 @@ public void execute(Player player, String[] args, String key) { final Faction invokee = getFaction(argumentsInsideDoubleQuotes.get(0)); final Faction warringFaction = getFaction(argumentsInsideDoubleQuotes.get(1)); if (invokee == null || warringFaction == null) { - new PlayerService().sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(new MessageService().getLanguage().getString("FactionNotFound")).replaceAll("#faction#", argumentsInsideDoubleQuotes.get(0)), true); - new PlayerService().sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(new MessageService().getLanguage().getString("FactionNotFound")).replaceAll("#faction#", argumentsInsideDoubleQuotes.get(1)), true); + playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")).replaceAll("#faction#", argumentsInsideDoubleQuotes.get(0)), true); + playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")).replaceAll("#faction#", argumentsInsideDoubleQuotes.get(1)), true); return; } if (!this.faction.isAlly(invokee.getName()) && !this.faction.isVassal(invokee.getName())) { - new PlayerService().sendMessageType(player, "&c" + getText("NotAnAllyOrVassal", invokee.getName()), Objects.requireNonNull(new MessageService().getLanguage().getString("NotAnAllyOrVassal")).replaceAll("#name#", invokee.getName()), true); + playerService.sendMessageType(player, "&c" + getText("NotAnAllyOrVassal", invokee.getName()), Objects.requireNonNull(messageService.getLanguage().getString("NotAnAllyOrVassal")).replaceAll("#name#", invokee.getName()), true); return; } if (!this.faction.isEnemy(warringFaction.getName())) { - new PlayerService().sendMessageType(player, "&c" + getText("NotAtWarWith", warringFaction.getName()) - , new MessageService().getLanguage().getString("NotAtWarWith").replaceAll("#name#", warringFaction.getName()) + playerService.sendMessageType(player, "&c" + getText("NotAtWarWith", warringFaction.getName()) + , messageService.getLanguage().getString("NotAtWarWith").replaceAll("#name#", warringFaction.getName()) , true); return; } if (configService.getBoolean("allowNeutrality") && ((boolean) invokee.getFlags().getFlag("neutral"))) { - new PlayerService().sendMessageType(player, "&c" + getText("CannotBringNeutralFactionIntoWar") + playerService.sendMessageType(player, "&c" + getText("CannotBringNeutralFactionIntoWar") , "CannotBringNeutralFactionIntoWar", false); return; } @@ -83,13 +83,13 @@ public void execute(Player player, String[] args, String key) { warringFaction.addEnemy(invokee.getName()); messageFaction(invokee, // Message ally faction - "&c" + getText("AlertCalledToWar1", faction.getName(), warringFaction.getName()), Objects.requireNonNull(new MessageService().getLanguage().getString("AlertCalledToWar1")).replaceAll("#f1#", faction.getName()).replaceAll("#f2#", warringFaction.getName())); + "&c" + getText("AlertCalledToWar1", faction.getName(), warringFaction.getName()), Objects.requireNonNull(messageService.getLanguage().getString("AlertCalledToWar1")).replaceAll("#f1#", faction.getName()).replaceAll("#f2#", warringFaction.getName())); messageFaction(warringFaction, // Message warring faction - "&c" + getText("AlertCalledToWar2", faction.getName(), invokee.getName()), Objects.requireNonNull(new MessageService().getLanguage().getString("AlertCalledToWar2")).replaceAll("#f1#", faction.getName()).replaceAll("#f2#", invokee.getName())); + "&c" + getText("AlertCalledToWar2", faction.getName(), invokee.getName()), Objects.requireNonNull(messageService.getLanguage().getString("AlertCalledToWar2")).replaceAll("#f1#", faction.getName()).replaceAll("#f2#", invokee.getName())); messageFaction(this.faction, // Message player faction - "&a" + getText("AlertCalledToWar3", invokee.getName(), warringFaction.getName()), Objects.requireNonNull(new MessageService().getLanguage().getString("AlertCalledToWar3")).replaceAll("#f1#", faction.getName()).replaceAll("#f2#", warringFaction.getName())); + "&a" + getText("AlertCalledToWar3", invokee.getName(), warringFaction.getName()), Objects.requireNonNull(messageService.getLanguage().getString("AlertCalledToWar3")).replaceAll("#f1#", faction.getName()).replaceAll("#f2#", warringFaction.getName())); } } diff --git a/src/main/java/dansplugins/factionsystem/commands/JoinCommand.java b/src/main/java/dansplugins/factionsystem/commands/JoinCommand.java index e349aaa84..1328446f0 100644 --- a/src/main/java/dansplugins/factionsystem/commands/JoinCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/JoinCommand.java @@ -27,10 +27,10 @@ public class JoinCommand extends SubCommand { private final Logger logger; - public JoinCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, Logger logger) { + public JoinCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, Logger logger, PlayerService playerService, MessageService messageService) { super(new String[]{ "join", LOCALE_PREFIX + "CmdJoin" - }, true, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + }, true, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); this.logger = logger; } @@ -46,22 +46,22 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.join"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - new PlayerService().sendMessageType(player, "&c" + getText("UsageJoin"), "UsageJoin", false); + playerService.sendMessageType(player, "&c" + getText("UsageJoin"), "UsageJoin", false); return; } if (persistentData.isInFaction(player.getUniqueId())) { - new PlayerService().sendMessageType(player, "&c" + getText("AlertAlreadyInFaction") + playerService.sendMessageType(player, "&c" + getText("AlertAlreadyInFaction") , "AlertAlreadyInFaction", false); return; } final Faction target = getFaction(String.join(" ", args)); if (target == null) { - new PlayerService().sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(new MessageService().getLanguage().getString("FactionNotFound")) + playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) .replaceAll("#faction#", String.join(" ", args)), true); return; } if (!target.isInvited(player.getUniqueId())) { - new PlayerService().sendMessageType(player, "&cYou are not invited to this faction." + playerService.sendMessageType(player, "&cYou are not invited to this faction." , "NotInvite", false); return; } @@ -72,7 +72,7 @@ public void execute(Player player, String[] args, String key) { return; } messageFaction(target, "&a" + getText("HasJoined", player.getName(), target.getName()) - , Objects.requireNonNull(new MessageService().getLanguage().getString("HasJoined")) + , Objects.requireNonNull(messageService.getLanguage().getString("HasJoined")) .replaceAll("#name#", player.getName()) .replaceAll("#faction#", target.getName())); target.addMember(player.getUniqueId()); diff --git a/src/main/java/dansplugins/factionsystem/commands/KickCommand.java b/src/main/java/dansplugins/factionsystem/commands/KickCommand.java index bc4c8bd1c..2c8468b7b 100644 --- a/src/main/java/dansplugins/factionsystem/commands/KickCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/KickCommand.java @@ -29,10 +29,10 @@ public class KickCommand extends SubCommand { private final Logger logger; - public KickCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, Logger logger) { + public KickCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, Logger logger, PlayerService playerService, MessageService messageService) { super(new String[]{ "kick", LOCALE_PREFIX + "CmdKick" - }, true, true, true, false, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService); + }, true, true, true, false, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService); this.logger = logger; } @@ -48,31 +48,31 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.kick"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - new PlayerService().sendMessageType(player, "&c" + getText("UsageKick") + playerService.sendMessageType(player, "&c" + getText("UsageKick") , "UsageKick", false); return; } UUIDChecker uuidChecker = new UUIDChecker(); final UUID targetUUID = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (targetUUID == null) { - new PlayerService().sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(new MessageService().getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); + playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); return; } OfflinePlayer target = Bukkit.getOfflinePlayer(targetUUID); if (!target.hasPlayedBefore()) { target = Bukkit.getPlayer(args[0]); if (target == null) { - new PlayerService().sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(new MessageService().getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); + playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); return; } } if (target.getUniqueId().equals(player.getUniqueId())) { - new PlayerService().sendMessageType(player, "&c" + getText("CannotKickSelf") + playerService.sendMessageType(player, "&c" + getText("CannotKickSelf") , "CannotKickSelf", false); return; } if (this.faction.isOwner(targetUUID)) { - new PlayerService().sendMessageType(player, "&c" + getText("CannotKickOwner") + playerService.sendMessageType(player, "&c" + getText("CannotKickOwner") , "CannotKickOwner", false); return; } @@ -88,12 +88,12 @@ public void execute(Player player, String[] args, String key) { ephemeralData.getPlayersInFactionChat().remove(targetUUID); faction.removeMember(targetUUID); messageFaction(faction, "&c" + getText("HasBeenKickedFrom", target.getName(), faction.getName()), - Objects.requireNonNull(new MessageService().getLanguage().getString("HasBeenKickedFrom")) + Objects.requireNonNull(messageService.getLanguage().getString("HasBeenKickedFrom")) .replaceAll("#name#", args[0]) .replaceAll("#faction#", faction.getName())); if (target.isOnline() && target.getPlayer() != null) { - new PlayerService().sendMessageType(player, "&c" + getText("AlertKicked", player.getName()) - , Objects.requireNonNull(new MessageService().getLanguage().getString("AlertKicked")) + playerService.sendMessageType(player, "&c" + getText("AlertKicked", player.getName()) + , Objects.requireNonNull(messageService.getLanguage().getString("AlertKicked")) .replaceAll("#name#", player.getName()), true); } } diff --git a/src/main/java/dansplugins/factionsystem/commands/LawsCommand.java b/src/main/java/dansplugins/factionsystem/commands/LawsCommand.java index aea0514ea..98d456ddc 100644 --- a/src/main/java/dansplugins/factionsystem/commands/LawsCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/LawsCommand.java @@ -24,10 +24,10 @@ */ public class LawsCommand extends SubCommand { - public LawsCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public LawsCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "laws", LOCALE_PREFIX + "CmdLaws" - }, true, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + }, true, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); } /** @@ -45,31 +45,31 @@ public void execute(Player player, String[] args, String key) { if (args.length == 0) { target = getPlayerFaction(player); if (target == null) { - new PlayerService().sendMessageType(player, "&c" + getText("AlertMustBeInFactionToUseCommand") + playerService.sendMessageType(player, "&c" + getText("AlertMustBeInFactionToUseCommand") , "AlertMustBeInFactionToUseCommand", false); return; } if (target.getNumLaws() == 0) { - new PlayerService().sendMessageType(player, "&c" + getText("AlertNoLaws") + playerService.sendMessageType(player, "&c" + getText("AlertNoLaws") , "AlertNoLaws", false); return; } } else { target = getFaction(String.join(" ", args)); if (target == null) { - new PlayerService().sendMessageType(player, "&c" + getText("FactionNotFound"), - Objects.requireNonNull(new MessageService().getLanguage().getString("FactionNotFound")) + playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), + Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) .replaceAll("#faction#", String.join(" ", args)), true); return; } if (target.getNumLaws() == 0) { - new PlayerService().sendMessageType(player, "&c" + getText("FactionDoesNotHaveLaws") + playerService.sendMessageType(player, "&c" + getText("FactionDoesNotHaveLaws") , "FactionDoesNotHaveLaws", false); return; } } - new PlayerService().sendMessageType(player,"&b" + getText("LawsTitle", target.getName()) - , Objects.requireNonNull(new MessageService().getLanguage().getString("LawsTitle")) + playerService.sendMessageType(player, "&b" + getText("LawsTitle", target.getName()) + , Objects.requireNonNull(messageService.getLanguage().getString("LawsTitle")) .replaceAll("#name#", target.getName()), true); IntStream.range(0, target.getNumLaws()) .mapToObj(i -> translate("&b" + (i + 1) + ". " + target.getLaws().get(i))) diff --git a/src/main/java/dansplugins/factionsystem/commands/LeaveCommand.java b/src/main/java/dansplugins/factionsystem/commands/LeaveCommand.java index 42d0b4eb9..3cecd7d4e 100644 --- a/src/main/java/dansplugins/factionsystem/commands/LeaveCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/LeaveCommand.java @@ -27,8 +27,8 @@ public class LeaveCommand extends SubCommand { private final Logger logger; private final DisbandCommand disbandCommand; - public LeaveCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, Logger logger, DisbandCommand disbandCommand) { - super(new String[]{"leave", LOCALE_PREFIX + "CmdLeave"}, true, true, false, false, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService); + public LeaveCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, Logger logger, DisbandCommand disbandCommand, PlayerService playerService, MessageService messageService) { + super(new String[]{"leave", LOCALE_PREFIX + "CmdLeave"}, true, true, false, false, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService); this.logger = logger; this.disbandCommand = disbandCommand; } @@ -59,10 +59,10 @@ public void execute(Player player, String[] args, String key) { if (faction.isOfficer(player.getUniqueId())) faction.removeOfficer(player.getUniqueId()); // Remove Officer. ephemeralData.getPlayersInFactionChat().remove(player.getUniqueId()); // Remove from Faction Chat. faction.removeMember(player.getUniqueId()); - new PlayerService().sendMessageType(player, "&b" + getText("AlertLeftFaction") + playerService.sendMessageType(player, "&b" + getText("AlertLeftFaction") , "AlertLeftFaction", false); messageFaction(faction, translate("&a" + player.getName() + " has left " + faction.getName()), - Objects.requireNonNull(new MessageService().getLanguage().getString("AlertLeftFactionTeam")) + Objects.requireNonNull(messageService.getLanguage().getString("AlertLeftFactionTeam")) .replaceAll("#name#", player.getName()) .replaceAll("#faction#", faction.getName())); diff --git a/src/main/java/dansplugins/factionsystem/commands/ListCommand.java b/src/main/java/dansplugins/factionsystem/commands/ListCommand.java index 700f36b6a..6a36c3378 100644 --- a/src/main/java/dansplugins/factionsystem/commands/ListCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/ListCommand.java @@ -11,6 +11,7 @@ import dansplugins.factionsystem.objects.domain.Faction; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; import dansplugins.factionsystem.services.PlayerService; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; @@ -23,10 +24,10 @@ */ public class ListCommand extends SubCommand { - public ListCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public ListCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "list", LOCALE_PREFIX + "CmdList" - }, false, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + }, false, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); } /** @@ -53,11 +54,11 @@ public void execute(CommandSender sender, String[] args, String key) { final String permission = "mf.list"; if (!(checkPermissions(sender, permission))) return; if (persistentData.getNumFactions() == 0) { - new PlayerService().sendMessageType(sender, "&b" + getText("CurrentlyNoFactions") + playerService.sendMessageType(sender, "&b" + getText("CurrentlyNoFactions") , "CurrentlyNoFactions", false); return; } - new PlayerService().sendMessageType(sender, "&b&l" + getText("FactionsTitle") + playerService.sendMessageType(sender, "&b&l" + getText("FactionsTitle") , "FactionsTitle", false); List sortedFactionList = persistentData.getSortedListOfFactions(); sender.sendMessage(ChatColor.AQUA + localeService.get("ListLegend")); diff --git a/src/main/java/dansplugins/factionsystem/commands/LockCommand.java b/src/main/java/dansplugins/factionsystem/commands/LockCommand.java index 83b007e17..6dceb66d8 100644 --- a/src/main/java/dansplugins/factionsystem/commands/LockCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/LockCommand.java @@ -10,6 +10,7 @@ import dansplugins.factionsystem.integrators.DynmapIntegrator; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; import dansplugins.factionsystem.services.PlayerService; import dansplugins.factionsystem.utils.RelationChecker; import org.bukkit.command.CommandSender; @@ -21,10 +22,10 @@ public class LockCommand extends SubCommand { private final RelationChecker relationChecker; - public LockCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, RelationChecker relationChecker) { + public LockCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, RelationChecker relationChecker, PlayerService playerService, MessageService messageService) { super(new String[]{ "lock", LOCALE_PREFIX + "CmdLock" - }, true, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + }, true, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); this.relationChecker = relationChecker; } @@ -46,14 +47,14 @@ public void execute(Player player, String[] args, String key) { } if (args.length >= 1 && safeEquals(args[0], "cancel")) { if (ephemeralData.getLockingPlayers().remove(player.getUniqueId())) { // Remove them - new PlayerService().sendMessageType(player, "&c" + getText("LockingCancelled"), + playerService.sendMessageType(player, "&c" + getText("LockingCancelled"), "LockingCancelled", false); return; } } ephemeralData.getLockingPlayers().add(player.getUniqueId()); ephemeralData.getUnlockingPlayers().remove(player.getUniqueId()); - new PlayerService().sendMessageType(player, "&a" + getText("RightClickLock") + playerService.sendMessageType(player, "&a" + getText("RightClickLock") , "RightClickLock", false); } diff --git a/src/main/java/dansplugins/factionsystem/commands/MakePeaceCommand.java b/src/main/java/dansplugins/factionsystem/commands/MakePeaceCommand.java index 338c2498a..967ede787 100644 --- a/src/main/java/dansplugins/factionsystem/commands/MakePeaceCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/MakePeaceCommand.java @@ -25,10 +25,10 @@ */ public class MakePeaceCommand extends SubCommand { - public MakePeaceCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public MakePeaceCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "makepeace", "mp", LOCALE_PREFIX + "CmdMakePeace" - }, true, true, true, false, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService); + }, true, true, true, false, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService); } /** @@ -43,41 +43,41 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.makepeace"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - new PlayerService().sendMessageType(player, + playerService.sendMessageType(player, "&c" + getText("UsageMakePeace") , "UsageMakePeace", false); return; } final Faction target = getFaction(String.join(" ", args)); if (target == null) { - new PlayerService().sendMessageType(player, "&c" + getText("FactionNotFound"), - Objects.requireNonNull(new MessageService().getLanguage().getString("FactionNotFound")) + playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), + Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) .replaceAll("#faction#", String.join(" ", args)), true); return; } if (target == faction) { - new PlayerService().sendMessageType(player, "&c" + getText("CannotMakePeaceWithSelf") + playerService.sendMessageType(player, "&c" + getText("CannotMakePeaceWithSelf") , "CannotMakePeaceWithSelf", false); return; } if (faction.isTruceRequested(target.getName())) { - new PlayerService().sendMessageType(player, "&c" + getText("AlertAlreadyRequestedPeace") + playerService.sendMessageType(player, "&c" + getText("AlertAlreadyRequestedPeace") , "AlertAlreadyRequestedPeace", false); return; } if (!faction.isEnemy(target.getName())) { - new PlayerService().sendMessageType(player, "&c" + getText("FactionNotEnemy") + playerService.sendMessageType(player, "&c" + getText("FactionNotEnemy") , "FactionNotEnemy", false); return; } faction.requestTruce(target.getName()); - new PlayerService().sendMessageType(player, "&a" + getText("AttemptedPeace", target.getName()) - , Objects.requireNonNull(new MessageService().getLanguage().getString("AttemptedPeace")) + playerService.sendMessageType(player, "&a" + getText("AttemptedPeace", target.getName()) + , Objects.requireNonNull(messageService.getLanguage().getString("AttemptedPeace")) .replaceAll("#name#", target.getName()), true); messageFaction(target, translate("&a" + getText("HasAttemptedToMakePeaceWith", faction.getName(), target.getName())), - Objects.requireNonNull(new MessageService().getLanguage().getString("HasAttemptedToMakePeaceWith")) + Objects.requireNonNull(messageService.getLanguage().getString("HasAttemptedToMakePeaceWith")) .replaceAll("#f1#", faction.getName()) .replaceAll("#f2#", target.getName())); if (faction.isTruceRequested(target.getName()) && target.isTruceRequested(faction.getName())) { @@ -96,7 +96,7 @@ public void execute(Player player, String[] args, String key) { // Notify messageServer("&a" + getText("AlertNowAtPeaceWith", faction.getName(), target.getName()), - Objects.requireNonNull(new MessageService().getLanguage().getString("AlertNowAtPeaceWith")) + Objects.requireNonNull(messageService.getLanguage().getString("AlertNowAtPeaceWith")) .replaceAll("#p1#", faction.getName()) .replaceAll("#p2#", target.getName())); } diff --git a/src/main/java/dansplugins/factionsystem/commands/MapCommand.java b/src/main/java/dansplugins/factionsystem/commands/MapCommand.java index 065ab9cdb..993db32bf 100644 --- a/src/main/java/dansplugins/factionsystem/commands/MapCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/MapCommand.java @@ -13,6 +13,8 @@ import dansplugins.factionsystem.objects.domain.Faction; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; +import dansplugins.factionsystem.services.PlayerService; import org.bukkit.Chunk; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -27,10 +29,10 @@ public class MapCommand extends SubCommand { private final char[] map_keys = "\\/#$%=&^ABCDEFGHJKLMNOPQRSTUVWXYZ0123456789abcdeghjmnopqrsuvwxyz?".toCharArray(); - public MapCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public MapCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "map", "showmap", "displaymap" - }, true, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + }, true, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/MembersCommand.java b/src/main/java/dansplugins/factionsystem/commands/MembersCommand.java index 09d81c68b..9ac325892 100644 --- a/src/main/java/dansplugins/factionsystem/commands/MembersCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/MembersCommand.java @@ -25,10 +25,10 @@ */ public class MembersCommand extends SubCommand { - public MembersCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public MembersCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "members", LOCALE_PREFIX + "CmdMembers" - }, false, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + }, false, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); } /** @@ -57,21 +57,21 @@ public void execute(CommandSender sender, String[] args, String key) { final Faction faction; if (args.length == 0) { if (!(sender instanceof Player)) { - new PlayerService().sendMessageType(sender, getText("OnlyPlayersCanUseCommand") + playerService.sendMessageType(sender, getText("OnlyPlayersCanUseCommand") , "OnlyPlayersCanUseCommand", false); return; } faction = getPlayerFaction(sender); if (faction == null) { - new PlayerService().sendMessageType(sender, getText("AlertMustBeInFactionToUseCommand") + playerService.sendMessageType(sender, getText("AlertMustBeInFactionToUseCommand") , "AlertMustBeInFactionToUseCommand", false); return; } } else { faction = getFaction(String.join(" ", args)); if (faction == null) { - new PlayerService().sendMessageType(sender, "&c" + getText("FactionNameNotRecognized"), - Objects.requireNonNull(new MessageService().getLanguage().getString("FactionNotFound")) + playerService.sendMessageType(sender, "&c" + getText("FactionNameNotRecognized"), + Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) .replaceAll("#faction#", String.join(" ", args )), true); return; @@ -98,28 +98,28 @@ public void execute(CommandSender sender, String[] args, String key) { }).forEach(sender::sendMessage); sender.sendMessage(translate("&b----------\n")); } else { - new PlayerService().sendMessageType(sender, "", Objects.requireNonNull(new MessageService().getLanguage().getString("MembersFaction.Title")) + playerService.sendMessageType(sender, "", Objects.requireNonNull(messageService.getLanguage().getString("MembersFaction.Title")) .replaceAll("#faction#", faction.getName()) , true); faction.getMemberList().stream() .map(Bukkit::getOfflinePlayer) .map(player -> { - String rank = new MessageService().getLanguage().getString("MembersFaction.Member.Rank"); - String color = new MessageService().getLanguage().getString("MembersFaction.Member.Color"); + String rank = messageService.getLanguage().getString("MembersFaction.Member.Rank"); + String color = messageService.getLanguage().getString("MembersFaction.Member.Color"); if (faction.isOfficer(player.getUniqueId())) { - rank = new MessageService().getLanguage().getString("MembersFaction.Officer.Rank"); - color = new MessageService().getLanguage().getString("MembersFaction.Officer.Color"); + rank = messageService.getLanguage().getString("MembersFaction.Officer.Rank"); + color = messageService.getLanguage().getString("MembersFaction.Officer.Color"); } if (faction.isOwner(player.getUniqueId())) { - rank = new MessageService().getLanguage().getString("MembersFaction.Owner.Rank"); - color = new MessageService().getLanguage().getString("MembersFaction.Owner.Color"); + rank = messageService.getLanguage().getString("MembersFaction.Owner.Rank"); + color = messageService.getLanguage().getString("MembersFaction.Owner.Color"); } - return new PlayerService().colorize(Objects.requireNonNull(new MessageService().getLanguage().getString("MembersFaction.Message")) + return playerService.colorize(Objects.requireNonNull(messageService.getLanguage().getString("MembersFaction.Message")) .replaceAll("#color#", Objects.requireNonNull(color)) .replaceAll("#rank#", Objects.requireNonNull(rank)) .replaceAll("#name#", Objects.requireNonNull(player.getName()))); }).forEach(sender::sendMessage); - new PlayerService().sendMessageType(sender, "", Objects.requireNonNull(new MessageService().getLanguage().getString("MembersFaction.SubTitle")) + playerService.sendMessageType(sender, "", Objects.requireNonNull(messageService.getLanguage().getString("MembersFaction.SubTitle")) .replaceAll("#faction#", faction.getName()) , true); diff --git a/src/main/java/dansplugins/factionsystem/commands/PowerCommand.java b/src/main/java/dansplugins/factionsystem/commands/PowerCommand.java index 76e0b1e22..00b09216f 100644 --- a/src/main/java/dansplugins/factionsystem/commands/PowerCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/PowerCommand.java @@ -25,10 +25,10 @@ */ public class PowerCommand extends SubCommand { - public PowerCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public PowerCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "power", LOCALE_PREFIX + "CmdPower" - }, false, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + }, false, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); } /** @@ -57,14 +57,14 @@ public void execute(CommandSender sender, String[] args, String key) { final PowerRecord record; if (args.length == 0) { if (!(sender instanceof Player)) { - new PlayerService().sendMessageType(sender, getText("OnlyPlayersCanUseCommand") + playerService.sendMessageType(sender, getText("OnlyPlayersCanUseCommand") , "OnlyPlayersCanUseCommand", false); return; } record = persistentData.getPlayersPowerRecord(((Player) sender).getUniqueId()); - new PlayerService().sendMessageType(sender, "&b" + + playerService.sendMessageType(sender, "&b" + getText("AlertCurrentPowerLevel", record.getPower(), record.maxPower()) - , Objects.requireNonNull(new MessageService().getLanguage().getString("AlertCurrentPowerLevel")) + , Objects.requireNonNull(messageService.getLanguage().getString("AlertCurrentPowerLevel")) .replaceAll("#power#", String.valueOf(record.getPower())) .replaceAll("#max#", String.valueOf(record.maxPower())), true); return; @@ -72,14 +72,14 @@ record = persistentData.getPlayersPowerRecord(((Player) sender).getUniqueId()); UUIDChecker uuidChecker = new UUIDChecker(); final UUID target = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (target == null) { - new PlayerService().sendMessageType(sender, "&c" + getText("PlayerNotFound"), - Objects.requireNonNull(new MessageService().getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); + playerService.sendMessageType(sender, "&c" + getText("PlayerNotFound"), + Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); return; } record = persistentData.getPlayersPowerRecord(target); - new PlayerService().sendMessageType(sender, "&b" + + playerService.sendMessageType(sender, "&b" + getText("CurrentPowerLevel", args[0], record.getPower(), record.maxPower()) - , Objects.requireNonNull(new MessageService().getLanguage().getString("CurrentPowerLevel")) + , Objects.requireNonNull(messageService.getLanguage().getString("CurrentPowerLevel")) .replaceAll("#power#", String.valueOf(record.getPower())) .replaceAll("#max#", String.valueOf(record.maxPower())) .replaceAll("#name#", args[0]), true); diff --git a/src/main/java/dansplugins/factionsystem/commands/PrefixCommand.java b/src/main/java/dansplugins/factionsystem/commands/PrefixCommand.java index 79e8b2df6..10e8262b5 100644 --- a/src/main/java/dansplugins/factionsystem/commands/PrefixCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/PrefixCommand.java @@ -10,6 +10,7 @@ import dansplugins.factionsystem.integrators.DynmapIntegrator; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; import dansplugins.factionsystem.services.PlayerService; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -19,10 +20,10 @@ */ public class PrefixCommand extends SubCommand { - public PrefixCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public PrefixCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "prefix", LOCALE_PREFIX + "CmdPrefix" - }, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService); + }, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService); } /** @@ -38,12 +39,12 @@ public void execute(Player player, String[] args, String key) { if (!(checkPermissions(player, permission))) return; final String newPrefix = String.join(" ", args); if (persistentData.isPrefixTaken(newPrefix)) { - new PlayerService().sendMessageType(player, "&c" + getText("PrefixTaken") + playerService.sendMessageType(player, "&c" + getText("PrefixTaken") , "PrefixTaken", false); return; } faction.setPrefix(newPrefix); - new PlayerService().sendMessageType(player, "&c" + getText("PrefixSet") + playerService.sendMessageType(player, "&c" + getText("PrefixSet") , "PrefixSet", false); } diff --git a/src/main/java/dansplugins/factionsystem/commands/PromoteCommand.java b/src/main/java/dansplugins/factionsystem/commands/PromoteCommand.java index bc840af46..dbde7792b 100644 --- a/src/main/java/dansplugins/factionsystem/commands/PromoteCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/PromoteCommand.java @@ -26,10 +26,10 @@ */ public class PromoteCommand extends SubCommand { - public PromoteCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public PromoteCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "promote", LOCALE_PREFIX + "CmdPromote" - }, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService); + }, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService); } /** @@ -44,50 +44,50 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.promote"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - new PlayerService().sendMessageType(player, "&c" + getText("UsagePromote") + playerService.sendMessageType(player, "&c" + getText("UsagePromote") , "UsagePromote", false); return; } UUIDChecker uuidChecker = new UUIDChecker(); final UUID targetUUID = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (targetUUID == null) { - new PlayerService().sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(new MessageService().getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); + playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); return; } OfflinePlayer target = Bukkit.getOfflinePlayer(targetUUID); if (!target.hasPlayedBefore()) { target = Bukkit.getPlayer(args[0]); if (target == null) { - new PlayerService().sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(new MessageService().getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); + playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); return; } } if (!faction.isMember(targetUUID)) { - new PlayerService().sendMessageType(player, "&c" + getText("PlayerIsNotMemberOfFaction") + playerService.sendMessageType(player, "&c" + getText("PlayerIsNotMemberOfFaction") , "PlayerIsNotMemberOfFaction", false); return; } if (faction.isOfficer(targetUUID)) { - new PlayerService().sendMessageType(player, "&c" + getText("PlayerAlreadyOfficer") + playerService.sendMessageType(player, "&c" + getText("PlayerAlreadyOfficer") , "PlayerAlreadyOfficer", false); return; } if (targetUUID == player.getUniqueId()) { - new PlayerService().sendMessageType(player, "&c" + getText("CannotPromoteSelf") + playerService.sendMessageType(player, "&c" + getText("CannotPromoteSelf") , "CannotPromoteSelf", false); return; } if (faction.addOfficer(targetUUID)) { - new PlayerService().sendMessageType(player, "&a" + getText("PlayerPromoted") + playerService.sendMessageType(player, "&a" + getText("PlayerPromoted") , "PlayerPromoted", false); if (target.isOnline() && target.getPlayer() != null) { - new PlayerService().sendMessageType(target.getPlayer(), "&a" + getText("PromotedToOfficer") + playerService.sendMessageType(target.getPlayer(), "&a" + getText("PromotedToOfficer") , "PromotedToOfficer", false); } } else { - new PlayerService().sendMessageType(player, "&c" + + playerService.sendMessageType(player, "&c" + getText("PlayerCantBePromotedBecauseOfLimit", faction.calculateMaxOfficers()) - , Objects.requireNonNull(new MessageService().getLanguage().getString("PlayerCantBePromotedBecauseOfLimit")) + , Objects.requireNonNull(messageService.getLanguage().getString("PlayerCantBePromotedBecauseOfLimit")) .replaceAll("#number#", String.valueOf(faction.calculateMaxOfficers())), true); } } diff --git a/src/main/java/dansplugins/factionsystem/commands/RemoveLawCommand.java b/src/main/java/dansplugins/factionsystem/commands/RemoveLawCommand.java index 1d429bbae..6c652dece 100644 --- a/src/main/java/dansplugins/factionsystem/commands/RemoveLawCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/RemoveLawCommand.java @@ -10,6 +10,7 @@ import dansplugins.factionsystem.integrators.DynmapIntegrator; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; import dansplugins.factionsystem.services.PlayerService; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -19,10 +20,10 @@ */ public class RemoveLawCommand extends SubCommand { - public RemoveLawCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public RemoveLawCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "removelaw", LOCALE_PREFIX + "CmdRemoveLaw" - }, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService); + }, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService); } /** @@ -37,17 +38,17 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.removelaw"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - new PlayerService().sendMessageType(player, "&c" + getText("UsageRemoveLaw") + playerService.sendMessageType(player, "&c" + getText("UsageRemoveLaw") , "UsageRemoveLaw", false); return; } final int lawToRemove = getIntSafe(args[0], 0) - 1; if (lawToRemove < 0) { - new PlayerService().sendMessageType(player, "&c" + getText("UsageRemoveLaw") + playerService.sendMessageType(player, "&c" + getText("UsageRemoveLaw") , "UsageRemoveLaw", false); return; } - if (faction.removeLaw(lawToRemove)) new PlayerService().sendMessageType(player, "&a" + getText("LawRemoved") + if (faction.removeLaw(lawToRemove)) playerService.sendMessageType(player, "&a" + getText("LawRemoved") , "LawRemoved", false); } diff --git a/src/main/java/dansplugins/factionsystem/commands/RenameCommand.java b/src/main/java/dansplugins/factionsystem/commands/RenameCommand.java index bbe0d0316..3d2851642 100644 --- a/src/main/java/dansplugins/factionsystem/commands/RenameCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/RenameCommand.java @@ -29,10 +29,10 @@ public class RenameCommand extends SubCommand { private final MedievalFactions medievalFactions; private final Logger logger; - public RenameCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, MedievalFactions medievalFactions, Logger logger) { + public RenameCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, MedievalFactions medievalFactions, Logger logger, PlayerService playerService, MessageService messageService) { super(new String[]{ "rename" - }, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService); + }, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService); this.medievalFactions = medievalFactions; this.logger = logger; } @@ -49,22 +49,22 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.rename"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - new PlayerService().sendMessageType(player, "&c" + getText("UsageRename") + playerService.sendMessageType(player, "&c" + getText("UsageRename") , "UsageRename", false); return; } final String newName = String.join(" ", args).trim(); final FileConfiguration config = medievalFactions.getConfig(); if (newName.length() > config.getInt("factionMaxNameLength")) { - new PlayerService().sendMessageType(player, "&c" + getText("FactionNameTooLong"), - Objects.requireNonNull(new MessageService().getLanguage().getString("FactionNameTooLong")) + playerService.sendMessageType(player, "&c" + getText("FactionNameTooLong"), + Objects.requireNonNull(messageService.getLanguage().getString("FactionNameTooLong")) .replaceAll("#name#", newName), true); return; } final String oldName = faction.getName(); if (getFaction(newName) != null) { - new PlayerService().sendMessageType(player, "&c" + getText("FactionAlreadyExists"), - Objects.requireNonNull(new MessageService().getLanguage().getString("FactionAlreadyExists")) + playerService.sendMessageType(player, "&c" + getText("FactionAlreadyExists"), + Objects.requireNonNull(messageService.getLanguage().getString("FactionAlreadyExists")) .replaceAll("#name#", newName), true); return; } @@ -77,7 +77,7 @@ public void execute(Player player, String[] args, String key) { // change name faction.setName(newName); - new PlayerService().sendMessageType(player, "&a" + getText("FactionNameChanged") + playerService.sendMessageType(player, "&a" + getText("FactionNameChanged") , "FactionNameChanged", false); persistentData.updateFactionReferencesDueToNameChange(oldName, newName); diff --git a/src/main/java/dansplugins/factionsystem/commands/ResetPowerLevelsCommand.java b/src/main/java/dansplugins/factionsystem/commands/ResetPowerLevelsCommand.java index 15027c975..96fa4c4da 100644 --- a/src/main/java/dansplugins/factionsystem/commands/ResetPowerLevelsCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/ResetPowerLevelsCommand.java @@ -10,6 +10,8 @@ import dansplugins.factionsystem.integrators.DynmapIntegrator; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; +import dansplugins.factionsystem.services.PlayerService; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -18,10 +20,10 @@ */ public class ResetPowerLevelsCommand extends SubCommand { - public ResetPowerLevelsCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public ResetPowerLevelsCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "resetpowerlevels", LOCALE_PREFIX + "CmdResetPowerLevels", "rpl" - }, false, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + }, false, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/RevokeAccessCommand.java b/src/main/java/dansplugins/factionsystem/commands/RevokeAccessCommand.java index a30bde654..f6aa516f1 100644 --- a/src/main/java/dansplugins/factionsystem/commands/RevokeAccessCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/RevokeAccessCommand.java @@ -24,10 +24,10 @@ */ public class RevokeAccessCommand extends SubCommand { - public RevokeAccessCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public RevokeAccessCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "ra", "revokeaccess", LOCALE_PREFIX + "CmdRevokeAccess" - }, true, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + }, true, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); } /** @@ -42,35 +42,35 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.revokeaccess"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - new PlayerService().sendMessageType(player, "&c" + getText("UsageRevokeAccess") + playerService.sendMessageType(player, "&c" + getText("UsageRevokeAccess") , "UsageRevokeAccess", false); return; } if (args[0].equalsIgnoreCase("cancel")) { ephemeralData.getPlayersRevokingAccess().remove(player.getUniqueId()); - new PlayerService().sendMessageType(player, "&c" + getText("Cancelled"), "Cancelled", false); + playerService.sendMessageType(player, "&c" + getText("Cancelled"), "Cancelled", false); return; } if (ephemeralData.getPlayersRevokingAccess().containsKey(player.getUniqueId())) { - new PlayerService().sendMessageType(player, "&c" + getText("AlreadyEnteredRevokeAccess") + playerService.sendMessageType(player, "&c" + getText("AlreadyEnteredRevokeAccess") , "AlreadyEnteredRevokeAccess", false); return; } UUIDChecker uuidChecker = new UUIDChecker(); final UUID targetUUID = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (targetUUID == null) { - new PlayerService().sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(new MessageService().getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); + playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); return; } if (targetUUID == player.getUniqueId()) { - new PlayerService().sendMessageType(player, "&c" + getText("CannotRevokeAccessFromSelf") + playerService.sendMessageType(player, "&c" + getText("CannotRevokeAccessFromSelf") , "CannotRevokeAccessFromSelf", false); return; } ephemeralData.getPlayersRevokingAccess().put( player.getUniqueId(), targetUUID ); - new PlayerService().sendMessageType(player, "&a" + getText("RightClickRevokeAccess") + playerService.sendMessageType(player, "&a" + getText("RightClickRevokeAccess") , "RightClickRevokeAccess", false); } diff --git a/src/main/java/dansplugins/factionsystem/commands/SetHomeCommand.java b/src/main/java/dansplugins/factionsystem/commands/SetHomeCommand.java index baebf16d5..b1cd2e32f 100644 --- a/src/main/java/dansplugins/factionsystem/commands/SetHomeCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/SetHomeCommand.java @@ -11,6 +11,7 @@ import dansplugins.factionsystem.objects.domain.ClaimedChunk; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; import dansplugins.factionsystem.services.PlayerService; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -20,10 +21,10 @@ */ public class SetHomeCommand extends SubCommand { - public SetHomeCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public SetHomeCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "sethome", "sh", LOCALE_PREFIX + "CmdSetHome" - }, true, true, true, false, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService); + }, true, true, true, false, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService); } /** @@ -38,18 +39,18 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.sethome"; if (!(checkPermissions(player, permission))) return; if (!chunkDataAccessor.isClaimed(player.getLocation().getChunk())) { - new PlayerService().sendMessageType(player, "&c" + getText("LandIsNotClaimed") + playerService.sendMessageType(player, "&c" + getText("LandIsNotClaimed") , "LandIsNotClaimed", false); return; } ClaimedChunk chunk = chunkDataAccessor.getClaimedChunk(player.getLocation().getChunk()); if (chunk == null || !chunk.getHolder().equalsIgnoreCase(faction.getName())) { - new PlayerService().sendMessageType(player, "&c" + getText("CannotSetFactionHomeInWilderness"), + playerService.sendMessageType(player, "&c" + getText("CannotSetFactionHomeInWilderness"), "CannotSetFactionHomeInWilderness", false); return; } faction.setFactionHome(player.getLocation()); - new PlayerService().sendMessageType(player, "&a" + getText("FactionHomeSet"), + playerService.sendMessageType(player, "&a" + getText("FactionHomeSet"), "FactionHomeSet", false); } diff --git a/src/main/java/dansplugins/factionsystem/commands/StatsCommand.java b/src/main/java/dansplugins/factionsystem/commands/StatsCommand.java index 48cd71f72..024104703 100644 --- a/src/main/java/dansplugins/factionsystem/commands/StatsCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/StatsCommand.java @@ -21,10 +21,10 @@ * @author Callum Johnson */ public class StatsCommand extends SubCommand { - public StatsCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public StatsCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "stats", LOCALE_PREFIX + "CmdStats" - }, false, false, false, false, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService); + }, false, false, false, false, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService); } @Override @@ -38,13 +38,13 @@ public void execute(CommandSender sender, String[] args, String key) { sender.sendMessage(ChatColor.AQUA + "=== Medieval Factions Stats ==="); sender.sendMessage(ChatColor.AQUA + "Number of factions: " + persistentData.getNumFactions()); } else { - new MessageService().getLanguage().getStringList("StatsFaction") + messageService.getLanguage().getStringList("StatsFaction") .forEach(s -> { if (s.contains("#faction#")) { s = s.replaceAll("#faction#", String.valueOf(persistentData.getNumFactions())); } - s = new PlayerService().colorize(s); - new PlayerService().sendMessageType(sender, "", s, true); + s = playerService.colorize(s); + playerService.sendMessageType(sender, "", s, true); }); } } diff --git a/src/main/java/dansplugins/factionsystem/commands/SwearFealtyCommand.java b/src/main/java/dansplugins/factionsystem/commands/SwearFealtyCommand.java index 0eddcff29..ba5f21754 100644 --- a/src/main/java/dansplugins/factionsystem/commands/SwearFealtyCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/SwearFealtyCommand.java @@ -23,10 +23,10 @@ */ public class SwearFealtyCommand extends SubCommand { - public SwearFealtyCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public SwearFealtyCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "swearfealty", LOCALE_PREFIX + "CmdSwearFealty", "sf" - }, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService); + }, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService); } /** @@ -41,18 +41,18 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.swearfealty"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - new PlayerService().sendMessageType(player, "&c" + getText("UsageSwearFealty") + playerService.sendMessageType(player, "&c" + getText("UsageSwearFealty") , "UsageSwearFealty", false); return; } final Faction target = getFaction(String.join(" ", args)); if (target == null) { - new PlayerService().sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(new MessageService().getLanguage().getString("FactionNotFound")) + playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) .replaceAll("#faction#", String.join(" ", args)), true); return; } if (!target.hasBeenOfferedVassalization(faction.getName())) { - new PlayerService().sendMessageType(player, "&c" + getText("AlertNotOfferedVassalizationBy") + playerService.sendMessageType(player, "&c" + getText("AlertNotOfferedVassalizationBy") , "AlertNotOfferedVassalizationBy", false); return; } @@ -65,12 +65,12 @@ public void execute(Player player, String[] args, String key) { // inform target faction that they have a new vassal messageFaction(target, translate("&a" + getText("AlertFactionHasNewVassal", faction.getName())) - , Objects.requireNonNull(new MessageService().getLanguage().getString("AlertFactionHasNewVassal")) + , Objects.requireNonNull(messageService.getLanguage().getString("AlertFactionHasNewVassal")) .replaceAll("#name#", faction.getName())); // inform players faction that they have a new liege messageFaction(faction, translate("&a" + getText("AlertFactionHasBeenVassalized", target.getName())) - , Objects.requireNonNull(new MessageService().getLanguage().getString("AlertFactionHasBeenVassalized")) + , Objects.requireNonNull(messageService.getLanguage().getString("AlertFactionHasBeenVassalized")) .replaceAll("#name#", target.getName())); } diff --git a/src/main/java/dansplugins/factionsystem/commands/TransferCommand.java b/src/main/java/dansplugins/factionsystem/commands/TransferCommand.java index 5286ad8c0..860327bba 100644 --- a/src/main/java/dansplugins/factionsystem/commands/TransferCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/TransferCommand.java @@ -26,8 +26,8 @@ */ public class TransferCommand extends SubCommand { - public TransferCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { - super(new String[]{"transfer", LOCALE_PREFIX + "CmdTransfer"}, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService); + public TransferCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { + super(new String[]{"transfer", LOCALE_PREFIX + "CmdTransfer"}, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService); } /** @@ -42,31 +42,31 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.transfer"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - new PlayerService().sendMessageType(player, "&c" + getText("UsageTransfer") + playerService.sendMessageType(player, "&c" + getText("UsageTransfer") , "UsageTransfer", false); return; } UUIDChecker uuidChecker = new UUIDChecker(); final UUID targetUUID = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (targetUUID == null) { - new PlayerService().sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(new MessageService().getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); + playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); return; } OfflinePlayer target = Bukkit.getOfflinePlayer(targetUUID); if (!target.hasPlayedBefore()) { target = Bukkit.getPlayer(args[0]); if (target == null) { - new PlayerService().sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(new MessageService().getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); + playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); return; } } if (!faction.isMember(targetUUID)) { - new PlayerService().sendMessageType(player, "&c" + getText("PlayerIsNotInYourFaction") + playerService.sendMessageType(player, "&c" + getText("PlayerIsNotInYourFaction") , "PlayerIsNotInYourFaction", false); return; } if (targetUUID.equals(player.getUniqueId())) { - new PlayerService().sendMessageType(player, "&c" + getText("CannotTransferToSelf") + playerService.sendMessageType(player, "&c" + getText("CannotTransferToSelf") , "CannotTransferToSelf", false); return; } @@ -75,12 +75,12 @@ public void execute(Player player, String[] args, String key) { // set owner faction.setOwner(targetUUID); - new PlayerService().sendMessageType(player, "&b" + getText("OwnerShipTransferredTo", args[0]) - , Objects.requireNonNull(new MessageService().getLanguage().getString("OwnerShipTransferredTo")) + playerService.sendMessageType(player, "&b" + getText("OwnerShipTransferredTo", args[0]) + , Objects.requireNonNull(messageService.getLanguage().getString("OwnerShipTransferredTo")) .replaceAll("#name#", args[0]), true); if (target.isOnline() && target.getPlayer() != null) { // Message if we can :) - new PlayerService().sendMessageType(target.getPlayer(), "&a" + getText("OwnershipTransferred", faction.getName()), - Objects.requireNonNull(new MessageService().getLanguage().getString("'OwnershipTransferred")) + playerService.sendMessageType(target.getPlayer(), "&a" + getText("OwnershipTransferred", faction.getName()), + Objects.requireNonNull(messageService.getLanguage().getString("'OwnershipTransferred")) .replaceAll("#name#", faction.getName()), true); } } diff --git a/src/main/java/dansplugins/factionsystem/commands/UnclaimCommand.java b/src/main/java/dansplugins/factionsystem/commands/UnclaimCommand.java index 6141ddf25..1abc8b269 100644 --- a/src/main/java/dansplugins/factionsystem/commands/UnclaimCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/UnclaimCommand.java @@ -22,10 +22,10 @@ */ public class UnclaimCommand extends SubCommand { - public UnclaimCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public UnclaimCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "unclaim", LOCALE_PREFIX + "CmdUnclaim" - }, true, true, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + }, true, true, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); } /** @@ -43,7 +43,7 @@ public void execute(Player player, String[] args, String key) { if ((boolean) faction.getFlags().getFlag("mustBeOfficerToManageLand")) { // officer or owner rank required if (!faction.isOfficer(player.getUniqueId()) && !faction.isOwner(player.getUniqueId()) && !isPlayerBypassing) { - new PlayerService().sendMessageType(player, "&c" + "You're not able to claim land at this time." + playerService.sendMessageType(player, "&c" + "You're not able to claim land at this time." , "NotAbleToClaim", false); return; } @@ -51,7 +51,7 @@ public void execute(Player player, String[] args, String key) { if (args.length == 0) { chunkDataAccessor.removeChunkAtPlayerLocation(player, faction); dynmapIntegrator.updateClaims(); - new PlayerService().sendMessageType(player, "&aUnclaimed your current claim." + playerService.sendMessageType(player, "&aUnclaimed your current claim." , "UnClaimed", false); return; } @@ -61,8 +61,8 @@ public void execute(Player player, String[] args, String key) { radius = 1; } chunkDataAccessor.radiusUnclaimAtLocation(radius, player, faction); - new PlayerService().sendMessageType(player, "Unclaimed radius of " + radius + " claims around you!" - , Objects.requireNonNull(new MessageService().getLanguage().getString("UnClaimedRadius")) + playerService.sendMessageType(player, "Unclaimed radius of " + radius + " claims around you!" + , Objects.requireNonNull(messageService.getLanguage().getString("UnClaimedRadius")) .replaceAll("#number#", String.valueOf(radius)), true); } diff --git a/src/main/java/dansplugins/factionsystem/commands/UnclaimallCommand.java b/src/main/java/dansplugins/factionsystem/commands/UnclaimallCommand.java index a979cf068..980e9e05e 100644 --- a/src/main/java/dansplugins/factionsystem/commands/UnclaimallCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/UnclaimallCommand.java @@ -23,10 +23,10 @@ */ public class UnclaimallCommand extends SubCommand { - public UnclaimallCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public UnclaimallCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { super(new String[]{ "unclaimall", "ua", LOCALE_PREFIX + "CmdUnclaimall" - }, false, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + }, false, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); } /** @@ -54,19 +54,19 @@ public void execute(CommandSender sender, String[] args, String key) { if (args.length == 0) { // Self if (!(sender instanceof Player)) { - new PlayerService().sendMessageType(sender, getText("OnlyPlayersCanUseCommand") + playerService.sendMessageType(sender, getText("OnlyPlayersCanUseCommand") , "OnlyPlayersCanUseCommand", false); return; } if (!(checkPermissions(sender, "mf.unclaimall"))) return; faction = getPlayerFaction(sender); if (faction == null) { - new PlayerService().sendMessageType(sender, "&c" + getText("AlertMustBeInFactionToUseCommand"), + playerService.sendMessageType(sender, "&c" + getText("AlertMustBeInFactionToUseCommand"), "AlertMustBeInFactionToUseCommand", false); return; } if (!faction.isOwner(((Player) sender).getUniqueId())) { - new PlayerService().sendMessageType(sender, "&c" + getText("AlertMustBeOwnerToUseCommand"), + playerService.sendMessageType(sender, "&c" + getText("AlertMustBeOwnerToUseCommand"), "AlertMustBeOwnerToUseCommand", false); return; } @@ -74,8 +74,8 @@ public void execute(CommandSender sender, String[] args, String key) { if (!(checkPermissions(sender, "mf.unclaimall.others", "mf.admin"))) return; faction = getFaction(String.join(" ", args)); if (faction == null) { - new PlayerService().sendMessageType(sender, "&c" + getText("FactionNotFound"), - Objects.requireNonNull(new MessageService().getLanguage().getString("FactionNotFound")) + playerService.sendMessageType(sender, "&c" + getText("FactionNotFound"), + Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) .replaceAll("#faction#", String.join(" ", args)), true); return; } @@ -83,13 +83,13 @@ public void execute(CommandSender sender, String[] args, String key) { // remove faction home faction.setFactionHome(null); messageFaction(faction, translate("&c" + getText("AlertFactionHomeRemoved")) - , new MessageService().getLanguage().getString("AlertFactionHomeRemoved")); + , messageService.getLanguage().getString("AlertFactionHomeRemoved")); // remove claimed chunks chunkDataAccessor.removeAllClaimedChunks(faction.getName()); dynmapIntegrator.updateClaims(); - new PlayerService().sendMessageType(sender, "&a" + getText("AllLandUnclaimedFrom", faction.getName()) - , Objects.requireNonNull(new MessageService().getLanguage().getString("AllLandUnclaimedFrom")) + playerService.sendMessageType(sender, "&a" + getText("AllLandUnclaimedFrom", faction.getName()) + , Objects.requireNonNull(messageService.getLanguage().getString("AllLandUnclaimedFrom")) .replaceAll("#name#", faction.getName()), false); // remove locks associated with this faction diff --git a/src/main/java/dansplugins/factionsystem/commands/UnlockCommand.java b/src/main/java/dansplugins/factionsystem/commands/UnlockCommand.java index 8f70fec98..11221fce3 100644 --- a/src/main/java/dansplugins/factionsystem/commands/UnlockCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/UnlockCommand.java @@ -10,6 +10,7 @@ import dansplugins.factionsystem.integrators.DynmapIntegrator; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; import dansplugins.factionsystem.services.PlayerService; import dansplugins.factionsystem.utils.RelationChecker; import org.bukkit.command.CommandSender; @@ -21,8 +22,8 @@ public class UnlockCommand extends SubCommand { private final RelationChecker relationChecker; - public UnlockCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, RelationChecker relationChecker) { - super(new String[]{"unlock", LOCALE_PREFIX + "CmdUnlock"}, true, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + public UnlockCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, RelationChecker relationChecker, PlayerService playerService, MessageService messageService) { + super(new String[]{"unlock", LOCALE_PREFIX + "CmdUnlock"}, true, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); this.relationChecker = relationChecker; } @@ -45,7 +46,7 @@ public void execute(Player player, String[] args, String key) { if (args.length != 0 && args[0].equalsIgnoreCase("cancel")) { ephemeralData.getUnlockingPlayers().remove(player.getUniqueId()); ephemeralData.getForcefullyUnlockingPlayers().remove(player.getUniqueId()); // just in case the player tries to cancel a forceful unlock without using the force command - new PlayerService().sendMessageType(player, "&c" + getText("AlertUnlockingCancelled") + playerService.sendMessageType(player, "&c" + getText("AlertUnlockingCancelled") , "AlertUnlockingCancelled", false); return; } @@ -55,7 +56,7 @@ public void execute(Player player, String[] args, String key) { ephemeralData.getLockingPlayers().remove(player.getUniqueId()); // inform them they need to right click the block that they want to lock or type /mf lock cancel to cancel it - new PlayerService().sendMessageType(player, "&a" + getText("RightClickUnlock") + playerService.sendMessageType(player, "&a" + getText("RightClickUnlock") , "RightClickUnlock", false); } diff --git a/src/main/java/dansplugins/factionsystem/commands/VassalizeCommand.java b/src/main/java/dansplugins/factionsystem/commands/VassalizeCommand.java index 53121aa10..7e6da4119 100644 --- a/src/main/java/dansplugins/factionsystem/commands/VassalizeCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/VassalizeCommand.java @@ -25,10 +25,10 @@ public class VassalizeCommand extends SubCommand { private final Logger logger; - public VassalizeCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, Logger logger) { + public VassalizeCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, Logger logger, PlayerService playerService, MessageService messageService) { super(new String[]{ "Vassalize", LOCALE_PREFIX + "CmdVassalize" - }, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService); + }, true, true, false, true, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService); this.logger = logger; } @@ -44,31 +44,31 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.vassalize"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - new PlayerService().sendMessageType(player, "&c" + getText("UsageVassalize") + playerService.sendMessageType(player, "&c" + getText("UsageVassalize") , "UsageVassalize", false); return; } final Faction target = getFaction(String.join(" ", args)); if (target == null) { - new PlayerService().sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(new MessageService().getLanguage().getString("FactionNotFound")) + playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) .replaceAll("#faction#", String.join(" ", args)), true); return; } // make sure player isn't trying to vassalize their own faction if (faction.getName().equalsIgnoreCase(target.getName())) { - new PlayerService().sendMessageType(player, "&c" + getText("CannotVassalizeSelf") + playerService.sendMessageType(player, "&c" + getText("CannotVassalizeSelf") , "CannotVassalizeSelf", false); return; } // make sure player isn't trying to vassalize their liege if (target.getName().equalsIgnoreCase(faction.getLiege())) { - new PlayerService().sendMessageType(player, "&c" + getText("CannotVassalizeLiege") + playerService.sendMessageType(player, "&c" + getText("CannotVassalizeLiege") , "CannotVassalizeLiege", false); return; } // make sure player isn't trying to vassalize a vassal if (target.hasLiege()) { - new PlayerService().sendMessageType(player, "&c" + getText("CannotVassalizeVassal") + playerService.sendMessageType(player, "&c" + getText("CannotVassalizeVassal") , "CannotVassalizeVassal", false); return; } @@ -84,12 +84,12 @@ public void execute(Player player, String[] args, String key) { // inform all players in that faction that they are trying to be vassalized messageFaction(target, translate("&a" + getText("AlertAttemptedVassalization", faction.getName(), faction.getName())) - , Objects.requireNonNull(new MessageService().getLanguage().getString("AlertAttemptedVassalization")) + , Objects.requireNonNull(messageService.getLanguage().getString("AlertAttemptedVassalization")) .replaceAll("#name#", faction.getName())); // inform all players in players faction that a vassalization offer was sent messageFaction(faction, translate("&a" + getText("AlertFactionAttemptedToVassalize", target.getName())) - , Objects.requireNonNull(new MessageService().getLanguage().getString("AlertFactionAttemptedToVassalize")) + , Objects.requireNonNull(messageService.getLanguage().getString("AlertFactionAttemptedToVassalize")) .replaceAll("#name#", target.getName())); } diff --git a/src/main/java/dansplugins/factionsystem/commands/VersionCommand.java b/src/main/java/dansplugins/factionsystem/commands/VersionCommand.java index 4d1c2af5f..86e5e9183 100644 --- a/src/main/java/dansplugins/factionsystem/commands/VersionCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/VersionCommand.java @@ -11,6 +11,8 @@ import dansplugins.factionsystem.integrators.DynmapIntegrator; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; +import dansplugins.factionsystem.services.PlayerService; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -20,10 +22,10 @@ public class VersionCommand extends SubCommand { private final MedievalFactions medievalFactions; - public VersionCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, MedievalFactions medievalFactions) { + public VersionCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, MedievalFactions medievalFactions, PlayerService playerService, MessageService messageService) { super(new String[]{ "version", LOCALE_PREFIX + "CmdVersion" - }, false, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + }, false, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); this.medievalFactions = medievalFactions; } diff --git a/src/main/java/dansplugins/factionsystem/commands/WhoCommand.java b/src/main/java/dansplugins/factionsystem/commands/WhoCommand.java index d3a129195..49fdacbfe 100644 --- a/src/main/java/dansplugins/factionsystem/commands/WhoCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/WhoCommand.java @@ -27,8 +27,8 @@ public class WhoCommand extends SubCommand { private final Messenger messenger; - public WhoCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, Messenger messenger) { - super(new String[]{"Who", LOCALE_PREFIX + "CmdWho"}, true, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + public WhoCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, Messenger messenger, PlayerService playerService, MessageService messageService) { + super(new String[]{"Who", LOCALE_PREFIX + "CmdWho"}, true, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); this.messenger = messenger; } @@ -44,19 +44,19 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.who"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - new PlayerService().sendMessageType(player, "&c" + getText("UsageWho") + playerService.sendMessageType(player, "&c" + getText("UsageWho") , "UsageWho", false); return; } UUIDChecker uuidChecker = new UUIDChecker(); final UUID targetUUID = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (targetUUID == null) { - new PlayerService().sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(new MessageService().getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); + playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); return; } final Faction temp = getPlayerFaction(targetUUID); if (temp == null) { - new PlayerService().sendMessageType(player, "&c" + getText("PlayerIsNotInAFaction") + playerService.sendMessageType(player, "&c" + getText("PlayerIsNotInAFaction") , "PlayerIsNotInAFaction", false); return; } diff --git a/src/main/java/dansplugins/factionsystem/commands/abs/SubCommand.java b/src/main/java/dansplugins/factionsystem/commands/abs/SubCommand.java index f80fa8763..618cc939b 100644 --- a/src/main/java/dansplugins/factionsystem/commands/abs/SubCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/abs/SubCommand.java @@ -34,6 +34,8 @@ public abstract class SubCommand implements ColorTranslator { protected final PersistentData.ChunkDataAccessor chunkDataAccessor; protected final DynmapIntegrator dynmapIntegrator; protected final ConfigService configService; + protected final PlayerService playerService; + protected final MessageService messageService; private final boolean playerCommand; private final boolean requiresFaction; private final boolean requiresOfficer; @@ -56,7 +58,7 @@ public abstract class SubCommand implements ColorTranslator { * @param dynmapIntegrator * @param configService */ - public SubCommand(String[] names, boolean playerCommand, boolean requiresFaction, boolean requiresOfficer, boolean requiresOwner, LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService) { + public SubCommand(String[] names, boolean playerCommand, boolean requiresFaction, boolean requiresOfficer, boolean requiresOwner, LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { this.localeService = localeService; this.persistentData = persistentData; this.ephemeralData = ephemeralData; @@ -68,6 +70,8 @@ public SubCommand(String[] names, boolean playerCommand, boolean requiresFaction this.requiresFaction = requiresFaction; this.requiresOfficer = requiresOfficer; this.requiresOwner = requiresOwner; + this.playerService = playerService; + this.messageService = messageService; } /** @@ -83,8 +87,8 @@ public SubCommand(String[] names, boolean playerCommand, boolean requiresFaction * @param chunkDataAccessor * @param dynmapIntegrator */ - public SubCommand(String[] names, boolean playerCommand, boolean requiresFaction, PersistentData persistentData, LocaleService localeService, EphemeralData ephemeralData, ConfigService configService, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator) { - this(names, playerCommand, requiresFaction, false, false, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService); + public SubCommand(String[] names, boolean playerCommand, boolean requiresFaction, PersistentData persistentData, LocaleService localeService, EphemeralData ephemeralData, ConfigService configService, PlayerService playerService, MessageService messageService, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator) { + this(names, playerCommand, requiresFaction, false, false, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService); } /** @@ -99,8 +103,8 @@ public SubCommand(String[] names, boolean playerCommand, boolean requiresFaction * @param chunkDataAccessor * @param dynmapIntegrator */ - public SubCommand(String[] names, boolean playerCommand, PersistentData persistentData, LocaleService localeService, EphemeralData ephemeralData, ConfigService configService, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator) { - this(names, playerCommand, false, persistentData, localeService, ephemeralData, configService, chunkDataAccessor, dynmapIntegrator); + public SubCommand(String[] names, boolean playerCommand, PersistentData persistentData, LocaleService localeService, EphemeralData ephemeralData, ConfigService configService, PlayerService playerService, MessageService messageService, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator) { + this(names, playerCommand, false, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); } protected void loadCommandNames(String[] names) { @@ -200,7 +204,7 @@ public boolean checkPermissions(CommandSender sender, String... permission) { break; } if (!has) { - new PlayerService().sendMessageType(sender, translate("&c" + getText("PermissionNeeded", permission[0])), Objects.requireNonNull(new MessageService().getLanguage().getString("PermissionNeeded")).replaceAll("#permission#", permission[0]), true); + playerService.sendMessageType(sender, translate("&c" + getText("PermissionNeeded", permission[0])), Objects.requireNonNull(messageService.getLanguage().getString("PermissionNeeded")).replaceAll("#permission#", permission[0]), true); } return has; } @@ -274,22 +278,22 @@ protected Faction getFaction(String name) { /** * Method to send an entire Faction a message. * - * @param faction to send a message to. - * @param old_message old message to send to the Faction. - * @param new_message new message to send to the Faction. + * @param faction to send a message to. + * @param oldmessage old message to send to the Faction. + * @param newmessage new message to send to the Faction. */ - protected void messageFaction(Faction faction, String old_message, String new_message) { - faction.getMemberList().stream().map(Bukkit::getOfflinePlayer).filter(OfflinePlayer::isOnline).map(OfflinePlayer::getPlayer).filter(Objects::nonNull).forEach(player -> new PlayerService().sendMessageType(player, old_message, new_message, true)); + protected void messageFaction(Faction faction, String oldmessage, String newmessage) { + faction.getMemberList().stream().map(Bukkit::getOfflinePlayer).filter(OfflinePlayer::isOnline).map(OfflinePlayer::getPlayer).filter(Objects::nonNull).forEach(player -> playerService.sendMessageType(player, oldmessage, newmessage, true)); } /** * Method to send the entire Server a message. * - * @param old_message old message to send to the players. - * @param new_message old message to send to the players. + * @param oldmessage old message to send to the players. + * @param newmessage old message to send to the players. */ - protected void messageServer(String old_message, String new_message) { - Bukkit.getOnlinePlayers().forEach(player -> new PlayerService().sendMessageType(player, old_message, new_message, true)); + protected void messageServer(String oldmessage, String newmessage) { + Bukkit.getOnlinePlayers().forEach(player -> playerService.sendMessageType(player, oldmessage, newmessage, true)); } /** diff --git a/src/main/java/dansplugins/factionsystem/data/PersistentData.java b/src/main/java/dansplugins/factionsystem/data/PersistentData.java index 1b5521605..093e43f2e 100644 --- a/src/main/java/dansplugins/factionsystem/data/PersistentData.java +++ b/src/main/java/dansplugins/factionsystem/data/PersistentData.java @@ -43,31 +43,30 @@ * @author Daniel McCoy Stephenson */ public class PersistentData { + final HashSet wars = new HashSet<>(); private final LocaleService localeService; private final ConfigService configService; private final MedievalFactions medievalFactions; + private final PlayerService playerService; + private final MessageService messageService; private final Messenger messenger; private final EphemeralData ephemeralData; private final Logger logger; private final FiefsIntegrator fiefsIntegrator; private final CurrenciesIntegrator currenciesIntegrator; - private final InteractionAccessChecker interactionAccessChecker; - private final ArrayList factions = new ArrayList<>(); private final ArrayList claimedChunks = new ArrayList<>(); private final ArrayList powerRecords = new ArrayList<>(); private final ArrayList activityRecords = new ArrayList<>(); private final ArrayList lockedBlocks = new ArrayList<>(); - final HashSet wars = new HashSet<>(); - private final ChunkDataAccessor chunkDataAccessor = new ChunkDataAccessor(); private final LocalStorageService localStorageService = new LocalStorageService(this); private final DynmapIntegrator dynmapIntegrator; private final BlockChecker blockChecker; - public PersistentData(LocaleService localeService, ConfigService configService, MedievalFactions medievalFactions, Messenger messenger, EphemeralData ephemeralData, Logger logger, FiefsIntegrator fiefsIntegrator, CurrenciesIntegrator currenciesIntegrator) { + public PersistentData(LocaleService localeService, ConfigService configService, MedievalFactions medievalFactions, Messenger messenger, EphemeralData ephemeralData, Logger logger, FiefsIntegrator fiefsIntegrator, CurrenciesIntegrator currenciesIntegrator, PlayerService playerService, MessageService messageService) { this.localeService = localeService; this.configService = configService; this.medievalFactions = medievalFactions; @@ -76,7 +75,8 @@ public PersistentData(LocaleService localeService, ConfigService configService, this.logger = logger; this.fiefsIntegrator = fiefsIntegrator; this.currenciesIntegrator = currenciesIntegrator; - + this.playerService = playerService; + this.messageService = messageService; interactionAccessChecker = new InteractionAccessChecker(this, configService, ephemeralData, logger); dynmapIntegrator = new DynmapIntegrator(logger, configService.getLocaleService(), medievalFactions, this); // TODO: resolve circular dependency blockChecker = new BlockChecker(this); // TODO: resolve circular dependency @@ -436,8 +436,8 @@ public boolean isBlockInGate(Block block, Player player) { for (Faction faction : factions) { for (Gate gate : faction.getGates()) { if (gate.hasBlock(block)) { - new PlayerService().sendMessageType(player, ChatColor.RED + String.format(localeService.get("BlockIsPartOfGateMustRemoveGate"), gate.getName()) - , Objects.requireNonNull(new MessageService().getLanguage().getString("BlockIsPartOfGateMustRemoveGate")).replaceAll("#name#", gate.getName()), true); + playerService.sendMessageType(player, ChatColor.RED + String.format(localeService.get("BlockIsPartOfGateMustRemoveGate"), gate.getName()) + , Objects.requireNonNull(messageService.getLanguage().getString("BlockIsPartOfGateMustRemoveGate")).replaceAll("#name#", gate.getName()), true); return true; } } @@ -467,8 +467,8 @@ public void initiatePowerIncreaseForAllPlayers() { private void initiatePowerIncrease(PowerRecord powerRecord) { if (powerRecord.getPower() < powerRecord.maxPower() && Objects.requireNonNull(getServer().getPlayer(powerRecord.getPlayerUUID())).isOnline()) { powerRecord.increasePower(); - new PlayerService().sendMessageType(getServer().getPlayer(powerRecord.getPlayerUUID()), ChatColor.GREEN + String.format(localeService.get("AlertPowerLevelIncreasedBy"), configService.getInt("powerIncreaseAmount")) - , Objects.requireNonNull(new MessageService().getLanguage().getString("AlertPowerLevelIncreasedBy")) + playerService.sendMessageType(getServer().getPlayer(powerRecord.getPlayerUUID()), ChatColor.GREEN + String.format(localeService.get("AlertPowerLevelIncreasedBy"), configService.getInt("powerIncreaseAmount")) + , Objects.requireNonNull(messageService.getLanguage().getString("AlertPowerLevelIncreasedBy")) .replaceAll("#number#", String.valueOf(configService.getInt("powerIncreaseAmount"))), true); } } @@ -482,7 +482,7 @@ public void disbandAllZeroPowerFactions() { } for (String factionName : factionsToDisband) { - messenger.sendAllPlayersInFactionMessage(getFaction(factionName), new PlayerService().getMessageType(ChatColor.RED + localeService.get("AlertDisbandmentDueToZeroPower"), new MessageService().getLanguage().getString("AlertDisbandmentDueToZeroPower"))); + messenger.sendAllPlayersInFactionMessage(getFaction(factionName), playerService.getMessageType(ChatColor.RED + localeService.get("AlertDisbandmentDueToZeroPower"), messageService.getLanguage().getString("AlertDisbandmentDueToZeroPower"))); removeFaction(factionName); System.out.printf((localeService.get("DisbandmentDueToZeroPower")) + "%n", factionName); } @@ -637,8 +637,8 @@ public void radiusClaimAtLocation(int depth, Player claimant, Location location, // check if depth is valid if (depth < 0 || depth > maxClaimRadius) { - new PlayerService().sendMessageType(claimant, ChatColor.RED + String.format(localeService.get("RadiusRequirement"), maxClaimRadius), - Objects.requireNonNull(new MessageService().getLanguage().getString("RadiusRequirement")) + playerService.sendMessageType(claimant, ChatColor.RED + String.format(localeService.get("RadiusRequirement"), maxClaimRadius), + Objects.requireNonNull(messageService.getLanguage().getString("RadiusRequirement")) .replaceAll("#number#", String.valueOf(maxClaimRadius)), true); return; } @@ -710,11 +710,11 @@ public void removeChunkAtPlayerLocation(Player player, Faction playersFaction) { ClaimedChunk chunk = isChunkClaimed(playerCoords[0], playerCoords[1], Objects.requireNonNull(player.getLocation().getWorld()).getName()); if (chunk != null) { removeChunk(chunk, player, getFaction(chunk.getHolder())); - new PlayerService().sendMessageType(player, ChatColor.GREEN + localeService.get("LandClaimedUsingAdminBypass") + playerService.sendMessageType(player, ChatColor.GREEN + localeService.get("LandClaimedUsingAdminBypass") , "LandClaimedUsingAdminBypass", false); return; } - new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("LandNotCurrentlyClaimed") + playerService.sendMessageType(player, ChatColor.RED + localeService.get("LandNotCurrentlyClaimed") , "LandNotCurrentlyClaimed", false); return; } @@ -728,14 +728,14 @@ public void removeChunkAtPlayerLocation(Player player, Faction playersFaction) { // ensure that the chunk is claimed by the player's faction. if (!chunk.getHolder().equalsIgnoreCase(playersFaction.getName())) { - new PlayerService().sendMessageType(player, ChatColor.RED + String.format(localeService.get("LandClaimedBy"), chunk.getHolder()) - , Objects.requireNonNull(new MessageService().getLanguage().getString("LandClaimedBy")).replaceAll("#player#", chunk.getHolder()), true); + playerService.sendMessageType(player, ChatColor.RED + String.format(localeService.get("LandClaimedBy"), chunk.getHolder()) + , Objects.requireNonNull(messageService.getLanguage().getString("LandClaimedBy")).replaceAll("#player#", chunk.getHolder()), true); return; } // initiate removal removeChunk(chunk, player, playersFaction); - new PlayerService().sendMessageType(player, ChatColor.GREEN + localeService.get("LandUnclaimed"), + playerService.sendMessageType(player, ChatColor.GREEN + localeService.get("LandUnclaimed"), "LandUnclaimed", false); } @@ -838,7 +838,7 @@ public void informPlayerIfTheirLandIsInDanger(Player player) { Faction faction = getPlayersFaction(player.getUniqueId()); if (faction != null) { if (isFactionExceedingTheirDemesneLimit(faction)) { - new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("AlertMoreClaimedChunksThanPower") + playerService.sendMessageType(player, ChatColor.RED + localeService.get("AlertMoreClaimedChunksThanPower") , "AlertMoreClaimedChunksThanPower", false); } } @@ -957,7 +957,7 @@ private void claimChunkAtLocation(Player claimant, double[] chunkCoords, World w if (configService.getBoolean("limitLand")) { // if at demesne limit if (!(getChunksClaimedByFaction(claimantsFaction.getName()) < claimantsFaction.getCumulativePowerLevel())) { - new PlayerService().sendMessageType(claimant, ChatColor.RED + localeService.get("AlertReachedDemesne") + playerService.sendMessageType(claimant, ChatColor.RED + localeService.get("AlertReachedDemesne") , "AlertReachedDemesne", false); return; } @@ -971,14 +971,14 @@ private void claimChunkAtLocation(Player claimant, double[] chunkCoords, World w // if holder is player's faction if (targetFaction.getName().equalsIgnoreCase(claimantsFaction.getName()) && !claimantsFaction.getAutoClaimStatus()) { - new PlayerService().sendMessageType(claimant, ChatColor.RED + localeService.get("LandAlreadyClaimedByYourFaction") + playerService.sendMessageType(claimant, ChatColor.RED + localeService.get("LandAlreadyClaimedByYourFaction") , "LandAlreadyClaimedByYourFaction", false); return; } // if not at war with target faction if (!claimantsFaction.isEnemy(targetFaction.getName())) { - new PlayerService().sendMessageType(claimant, ChatColor.RED + "You must be at war with a faction to conquer land from them." + playerService.sendMessageType(claimant, ChatColor.RED + "You must be at war with a faction to conquer land from them." , "IsNotEnemy", false); return; } @@ -986,7 +986,7 @@ private void claimChunkAtLocation(Player claimant, double[] chunkCoords, World w // surrounded chunk protection check if (configService.getBoolean("surroundedChunksProtected")) { if (isClaimedChunkSurroundedByChunksClaimedBySameFaction(chunk)) { - new PlayerService().sendMessageType(claimant, ChatColor.RED + localeService.get("SurroundedChunkProtected"), + playerService.sendMessageType(claimant, ChatColor.RED + localeService.get("SurroundedChunkProtected"), "SurroundedChunkProtected", false); return; } @@ -997,7 +997,7 @@ private void claimChunkAtLocation(Player claimant, double[] chunkCoords, World w // if target faction does not have more land than their demesne limit if (!(targetFactionsCumulativePowerLevel < chunksClaimedByTargetFaction)) { - new PlayerService().sendMessageType(claimant, ChatColor.RED + localeService.get("TargetFactionNotOverClaiming") + playerService.sendMessageType(claimant, ChatColor.RED + localeService.get("TargetFactionNotOverClaiming") , "TargetFactionNotOverClaiming", false); return; } @@ -1015,12 +1015,12 @@ private void claimChunkAtLocation(Player claimant, double[] chunkCoords, World w Chunk toClaim = world.getChunkAt((int) chunkCoords[0], (int) chunkCoords[1]); addClaimedChunk(toClaim, claimantsFaction, claimant.getWorld()); - new PlayerService().sendMessageType(claimant, ChatColor.GREEN + String.format(localeService.get("AlertLandConqueredFromAnotherFaction"), targetFaction.getName(), getChunksClaimedByFaction(claimantsFaction.getName()), claimantsFaction.getCumulativePowerLevel()) - , Objects.requireNonNull(new MessageService().getLanguage().getString("AlertLandConqueredFromAnotherFaction")).replaceAll("#name", targetFaction.getName()).replaceAll("#number#", String.valueOf(getChunksClaimedByFaction(claimantsFaction.getName()))).replaceAll("#max#", String.valueOf(claimantsFaction.getCumulativePowerLevel())), true); + playerService.sendMessageType(claimant, ChatColor.GREEN + String.format(localeService.get("AlertLandConqueredFromAnotherFaction"), targetFaction.getName(), getChunksClaimedByFaction(claimantsFaction.getName()), claimantsFaction.getCumulativePowerLevel()) + , Objects.requireNonNull(messageService.getLanguage().getString("AlertLandConqueredFromAnotherFaction")).replaceAll("#name", targetFaction.getName()).replaceAll("#number#", String.valueOf(getChunksClaimedByFaction(claimantsFaction.getName()))).replaceAll("#max#", String.valueOf(claimantsFaction.getCumulativePowerLevel())), true); - messenger.sendAllPlayersInFactionMessage(targetFaction, new PlayerService() + messenger.sendAllPlayersInFactionMessage(targetFaction, playerService .getMessageType(ChatColor.RED + String.format(localeService.get("AlertLandConqueredFromYourFaction"), claimantsFaction.getName()) - , Objects.requireNonNull(new MessageService().getLanguage().getString("AlertLandConqueredFromYourFaction")).replaceAll("#number#", claimantsFaction.getName()))); + , Objects.requireNonNull(messageService.getLanguage().getString("AlertLandConqueredFromYourFaction")).replaceAll("#number#", claimantsFaction.getName()))); } } else { Chunk toClaim = world.getChunkAt((int) chunkCoords[0], (int) chunkCoords[1]); @@ -1029,8 +1029,8 @@ private void claimChunkAtLocation(Player claimant, double[] chunkCoords, World w if (!claimEvent.isCancelled()) { // chunk not already claimed addClaimedChunk(toClaim, claimantsFaction, claimant.getWorld()); - new PlayerService().sendMessageType(claimant, ChatColor.GREEN + String.format(localeService.get("AlertLandClaimed"), getChunksClaimedByFaction(claimantsFaction.getName()), claimantsFaction.getCumulativePowerLevel()) - , Objects.requireNonNull(new MessageService().getLanguage().getString("AlertLandClaimed")).replaceAll("#number#", String.valueOf(getChunksClaimedByFaction(claimantsFaction.getName()))).replaceAll("#max#", String.valueOf(claimantsFaction.getCumulativePowerLevel())), true); + playerService.sendMessageType(claimant, ChatColor.GREEN + String.format(localeService.get("AlertLandClaimed"), getChunksClaimedByFaction(claimantsFaction.getName()), claimantsFaction.getCumulativePowerLevel()) + , Objects.requireNonNull(messageService.getLanguage().getString("AlertLandClaimed")).replaceAll("#number#", String.valueOf(getChunksClaimedByFaction(claimantsFaction.getName()))).replaceAll("#max#", String.valueOf(claimantsFaction.getCumulativePowerLevel())), true); } } } @@ -1124,7 +1124,7 @@ private void removeChunk(ClaimedChunk chunkToRemove, Player unclaimingPlayer, Fa && chunkToRemove.getWorldName().equalsIgnoreCase(Objects.requireNonNull(unclaimingPlayer.getLocation().getWorld()).getName())) { // remove faction home holdingFaction.setFactionHome(null); - messenger.sendAllPlayersInFactionMessage(holdingFaction, new PlayerService().getMessageType(ChatColor.RED + localeService.get("AlertFactionHomeRemoved"), new MessageService().getLanguage().getString("AlertFactionHomeRemoved"))); + messenger.sendAllPlayersInFactionMessage(holdingFaction, playerService.getMessageType(ChatColor.RED + localeService.get("AlertFactionHomeRemoved"), messageService.getLanguage().getString("AlertFactionHomeRemoved"))); } } @@ -1429,7 +1429,7 @@ private void loadFactions() { ArrayList> data = loadDataFromFilename(FILE_PATH + FACTIONS_FILE_NAME); for (Map factionData : data) { - Faction newFaction = new Faction(factionData, configService, localeService, fiefsIntegrator, currenciesIntegrator, dynmapIntegrator, logger, persistentData, medievalFactions); + Faction newFaction = new Faction(factionData, configService, localeService, fiefsIntegrator, currenciesIntegrator, dynmapIntegrator, logger, persistentData, medievalFactions, playerService); factions.add(newFaction); } } diff --git a/src/main/java/dansplugins/factionsystem/eventhandlers/InteractionHandler.java b/src/main/java/dansplugins/factionsystem/eventhandlers/InteractionHandler.java index 5361c6c07..6158f0a2d 100644 --- a/src/main/java/dansplugins/factionsystem/eventhandlers/InteractionHandler.java +++ b/src/main/java/dansplugins/factionsystem/eventhandlers/InteractionHandler.java @@ -43,6 +43,8 @@ public class InteractionHandler implements Listener { private final PersistentData persistentData; private final InteractionAccessChecker interactionAccessChecker; + private final PlayerService playerService; + private final MessageService messageService; private final LocaleService localeService; private final BlockChecker blockChecker; private final MedievalFactions medievalFactions; @@ -50,7 +52,7 @@ public class InteractionHandler implements Listener { private final EphemeralData ephemeralData; private final GateService gateService; - public InteractionHandler(PersistentData persistentData, InteractionAccessChecker interactionAccessChecker, LocaleService localeService, BlockChecker blockChecker, MedievalFactions medievalFactions, LockService lockService, EphemeralData ephemeralData, GateService gateService) { + public InteractionHandler(PersistentData persistentData, InteractionAccessChecker interactionAccessChecker, LocaleService localeService, BlockChecker blockChecker, MedievalFactions medievalFactions, LockService lockService, EphemeralData ephemeralData, GateService gateService, PlayerService playerService, MessageService messageService) { this.persistentData = persistentData; this.interactionAccessChecker = interactionAccessChecker; this.localeService = localeService; @@ -59,6 +61,8 @@ public InteractionHandler(PersistentData persistentData, InteractionAccessChecke this.lockService = lockService; this.ephemeralData = ephemeralData; this.gateService = gateService; + this.playerService = playerService; + this.messageService = messageService; } @EventHandler() @@ -81,7 +85,7 @@ public void handle(BlockBreakEvent event) { boolean isOwner = persistentData.getLockedBlock(block).getOwner().equals(player.getUniqueId()); if (!isOwner) { event.setCancelled(true); - new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("AlertNonOwnership") + playerService.sendMessageType(player, ChatColor.RED + localeService.get("AlertNonOwnership") , "AlertNonOwnership", false); return; } @@ -124,7 +128,7 @@ public void handle(BlockPlaceEvent event) { if (blockChecker.isChest(event.getBlock())) { boolean isNextToNonOwnedLockedChest = blockChecker.isNextToNonOwnedLockedChest(event.getPlayer(), event.getBlock()); if (isNextToNonOwnedLockedChest) { - new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("CannotPlaceChestsNextToUnownedLockedChests") + playerService.sendMessageType(player, ChatColor.RED + localeService.get("CannotPlaceChestsNextToUnownedLockedChests") , "CannotPlaceChestsNextToUnownedLockedChests", false); event.setCancelled(true); return; @@ -168,7 +172,7 @@ public void handle(BlockPlaceEvent event) { boolean isUnderOrAboveNonOwnedLockedChest = blockChecker.isUnderOrAboveNonOwnedLockedChest(event.getPlayer(), event.getBlock()); if (isNextToNonOwnedLockedChest || isUnderOrAboveNonOwnedLockedChest) { event.setCancelled(true); - new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("CannotPlaceHoppersNextToUnownedLockedChests") + playerService.sendMessageType(player, ChatColor.RED + localeService.get("CannotPlaceHoppersNextToUnownedLockedChests") , "CannotPlaceHoppersNextToUnownedLockedChests", false); } } @@ -198,8 +202,8 @@ public void handle(PlayerInteractEvent event) { if (!playerHasAccess && !isPlayerBypassing) { UUIDChecker uuidChecker = new UUIDChecker(); String owner = uuidChecker.findPlayerNameBasedOnUUID(lockedBlock.getOwner()); - new PlayerService().sendMessageType(player, ChatColor.RED + String.format(localeService.get("LockedBy"), owner) - , Objects.requireNonNull(new MessageService().getLanguage().getString("LockedBy")) + playerService.sendMessageType(player, ChatColor.RED + String.format(localeService.get("LockedBy"), owner) + , Objects.requireNonNull(messageService.getLanguage().getString("LockedBy")) .replaceAll("#name#", owner), true); event.setCancelled(true); return; @@ -228,7 +232,7 @@ public void handle(PlayerInteractEvent event) { } else { if (isPlayerUsingAnAccessCommand(player)) { - new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("BlockIsNotLocked"), "BlockIsNotLocked", false); + playerService.sendMessageType(player, ChatColor.RED + localeService.get("BlockIsNotLocked"), "BlockIsNotLocked", false); } } diff --git a/src/main/java/dansplugins/factionsystem/eventhandlers/MoveHandler.java b/src/main/java/dansplugins/factionsystem/eventhandlers/MoveHandler.java index af9e9b26c..0e1f4a543 100644 --- a/src/main/java/dansplugins/factionsystem/eventhandlers/MoveHandler.java +++ b/src/main/java/dansplugins/factionsystem/eventhandlers/MoveHandler.java @@ -32,13 +32,15 @@ public class MoveHandler implements Listener { private final LocaleService localeService; private final MedievalFactions medievalFactions; private final DynmapIntegrator dynmapIntegrator; + private final PlayerService playerService; - public MoveHandler(PersistentData persistentData, TerritoryOwnerNotifier territoryOwnerNotifier, LocaleService localeService, MedievalFactions medievalFactions, DynmapIntegrator dynmapIntegrator) { + public MoveHandler(PersistentData persistentData, TerritoryOwnerNotifier territoryOwnerNotifier, LocaleService localeService, MedievalFactions medievalFactions, DynmapIntegrator dynmapIntegrator, PlayerService playerService) { this.persistentData = persistentData; this.territoryOwnerNotifier = territoryOwnerNotifier; this.localeService = localeService; this.medievalFactions = medievalFactions; this.dynmapIntegrator = dynmapIntegrator; + this.playerService = playerService; } @EventHandler() @@ -98,7 +100,7 @@ private void initiateAutoclaimCheck(Player player) { if (notAtDemesneLimit(playersFaction)) { scheduleClaiming(player, playersFaction); } else { - new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("AlertReachedDemesne"), "AlertReachedDemesne", false); + playerService.sendMessageType(player, ChatColor.RED + localeService.get("AlertReachedDemesne"), "AlertReachedDemesne", false); } } } diff --git a/src/main/java/dansplugins/factionsystem/integrators/CurrenciesIntegrator.java b/src/main/java/dansplugins/factionsystem/integrators/CurrenciesIntegrator.java index 321933c31..33d5d25f7 100644 --- a/src/main/java/dansplugins/factionsystem/integrators/CurrenciesIntegrator.java +++ b/src/main/java/dansplugins/factionsystem/integrators/CurrenciesIntegrator.java @@ -11,7 +11,7 @@ */ public class CurrenciesIntegrator { - public boolean isCurrenciesPresent() { + public boolean isCurrenciesNotPresent() { return Bukkit.getServer().getPluginManager().getPlugin("Currencies") == null; } } \ No newline at end of file diff --git a/src/main/java/dansplugins/factionsystem/objects/domain/Faction.java b/src/main/java/dansplugins/factionsystem/objects/domain/Faction.java index 3749e1778..5c1588aea 100644 --- a/src/main/java/dansplugins/factionsystem/objects/domain/Faction.java +++ b/src/main/java/dansplugins/factionsystem/objects/domain/Faction.java @@ -17,6 +17,7 @@ import dansplugins.factionsystem.objects.inherited.specification.Feudal; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.PlayerService; import dansplugins.factionsystem.utils.Logger; import org.bukkit.Location; import org.bukkit.World; @@ -41,6 +42,7 @@ public class Faction extends Nation implements Feudal, Savable { private final Logger logger; private final PersistentData persistentData; private final MedievalFactions medievalFactions; + private final PlayerService playerService; private final ArrayList gates = new ArrayList<>(); private final FactionFlags flags; @@ -52,7 +54,7 @@ public class Faction extends Nation implements Feudal, Savable { private int bonusPower = 0; private boolean autoclaim = false; - public Faction(String initialName, UUID creator, ConfigService configService, LocaleService localeService, FiefsIntegrator fiefsIntegrator, CurrenciesIntegrator currenciesIntegrator, DynmapIntegrator dynmapIntegrator, Logger logger, PersistentData persistentData, MedievalFactions medievalFactions) { + public Faction(String initialName, UUID creator, ConfigService configService, LocaleService localeService, FiefsIntegrator fiefsIntegrator, CurrenciesIntegrator currenciesIntegrator, DynmapIntegrator dynmapIntegrator, Logger logger, PersistentData persistentData, MedievalFactions medievalFactions, PlayerService playerService) { this.configService = configService; this.localeService = localeService; this.fiefsIntegrator = fiefsIntegrator; @@ -61,14 +63,15 @@ public Faction(String initialName, UUID creator, ConfigService configService, Lo this.logger = logger; this.persistentData = persistentData; this.medievalFactions = medievalFactions; + this.playerService = playerService; setName(initialName); setOwner(creator); prefix = initialName; - flags = new FactionFlags(configService, localeService, fiefsIntegrator, currenciesIntegrator, dynmapIntegrator, logger); + flags = new FactionFlags(configService, localeService, fiefsIntegrator, currenciesIntegrator, dynmapIntegrator, logger, this.playerService); flags.initializeFlagValues(); } - public Faction(ConfigService configService, LocaleService localeService, FiefsIntegrator fiefsIntegrator, CurrenciesIntegrator currenciesIntegrator, DynmapIntegrator dynmapIntegrator, Logger logger, PersistentData persistentData, MedievalFactions medievalFactions, String initialName) { + public Faction(ConfigService configService, LocaleService localeService, FiefsIntegrator fiefsIntegrator, CurrenciesIntegrator currenciesIntegrator, DynmapIntegrator dynmapIntegrator, Logger logger, PersistentData persistentData, MedievalFactions medievalFactions, PlayerService playerService, String initialName) { this.configService = configService; this.localeService = localeService; this.fiefsIntegrator = fiefsIntegrator; @@ -77,13 +80,14 @@ public Faction(ConfigService configService, LocaleService localeService, FiefsIn this.logger = logger; this.persistentData = persistentData; this.medievalFactions = medievalFactions; + this.playerService = playerService; setName(initialName); prefix = initialName; - flags = new FactionFlags(configService, localeService, fiefsIntegrator, currenciesIntegrator, dynmapIntegrator, logger); + flags = new FactionFlags(configService, localeService, fiefsIntegrator, currenciesIntegrator, dynmapIntegrator, logger, this.playerService); flags.initializeFlagValues(); } - public Faction(Map data, ConfigService configService, LocaleService localeService, FiefsIntegrator fiefsIntegrator, CurrenciesIntegrator currenciesIntegrator, DynmapIntegrator dynmapIntegrator, Logger logger, PersistentData persistentData, MedievalFactions medievalFactions) { + public Faction(Map data, ConfigService configService, LocaleService localeService, FiefsIntegrator fiefsIntegrator, CurrenciesIntegrator currenciesIntegrator, DynmapIntegrator dynmapIntegrator, Logger logger, PersistentData persistentData, MedievalFactions medievalFactions, PlayerService playerService) { this.configService = configService; this.localeService = localeService; this.fiefsIntegrator = fiefsIntegrator; @@ -92,7 +96,8 @@ public Faction(Map data, ConfigService configService, LocaleServ this.logger = logger; this.persistentData = persistentData; this.medievalFactions = medievalFactions; - flags = new FactionFlags(configService, localeService, fiefsIntegrator, currenciesIntegrator, dynmapIntegrator, logger); + this.playerService = playerService; + flags = new FactionFlags(configService, localeService, fiefsIntegrator, currenciesIntegrator, dynmapIntegrator, logger, this.playerService); this.load(data); } diff --git a/src/main/java/dansplugins/factionsystem/objects/helper/FactionFlags.java b/src/main/java/dansplugins/factionsystem/objects/helper/FactionFlags.java index aaed46562..3b59d4bc0 100644 --- a/src/main/java/dansplugins/factionsystem/objects/helper/FactionFlags.java +++ b/src/main/java/dansplugins/factionsystem/objects/helper/FactionFlags.java @@ -33,6 +33,7 @@ public class FactionFlags { private final CurrenciesIntegrator currenciesIntegrator; private final DynmapIntegrator dynmapIntegrator; private final Logger logger; + private final PlayerService playerService; private final ArrayList flagNames = new ArrayList<>(); private HashMap integerValues = new HashMap<>(); @@ -40,13 +41,14 @@ public class FactionFlags { private HashMap doubleValues = new HashMap<>(); private HashMap stringValues = new HashMap<>(); - public FactionFlags(ConfigService configService, LocaleService localeService, FiefsIntegrator fiefsIntegrator, CurrenciesIntegrator currenciesIntegrator, DynmapIntegrator dynmapIntegrator, Logger logger) { + public FactionFlags(ConfigService configService, LocaleService localeService, FiefsIntegrator fiefsIntegrator, CurrenciesIntegrator currenciesIntegrator, DynmapIntegrator dynmapIntegrator, Logger logger, PlayerService playerService) { this.configService = configService; this.localeService = localeService; this.fiefsIntegrator = fiefsIntegrator; this.currenciesIntegrator = currenciesIntegrator; this.dynmapIntegrator = dynmapIntegrator; this.logger = logger; + this.playerService = playerService; initializeFlagNames(); } @@ -127,27 +129,27 @@ public void sendFlagList(Player player) { public void setFlag(String flag, String value, Player player) { if (flag.equals("neutral") && !configService.getBoolean("allowNeutrality")) { - new PlayerService().sendMessageType(player, ChatColor.RED + "" + localeService.get("NeutralityDisabled") + playerService.sendMessageType(player, ChatColor.RED + "" + localeService.get("NeutralityDisabled") , "NeutralityDisabled", false); return; } if (flag.equals("prefixColor") && !configService.getBoolean("factionsCanSetPrefixColors")) { - new PlayerService().sendMessageType(player, "&cPlayers can't set prefix colors.", "CannotSetPrefix", false); + playerService.sendMessageType(player, "&cPlayers can't set prefix colors.", "CannotSetPrefix", false); return; } if (flag.equals("prefixColor") && (!configService.getBoolean("playersChatWithPrefixes"))) { - new PlayerService().sendMessageType(player, ChatColor.RED + "" + localeService.get("PrefixesDisabled"), "PrefixesDisabled", false); + playerService.sendMessageType(player, ChatColor.RED + "" + localeService.get("PrefixesDisabled"), "PrefixesDisabled", false); return; } if (flag.equals("fiefsEnabled") && !fiefsIntegrator.isFiefsPresent()) { - new PlayerService().sendMessageType(player, "&cFiefs either isn't enabled or present.", "FiefsNotEnable", false); + playerService.sendMessageType(player, "&cFiefs either isn't enabled or present.", "FiefsNotEnable", false); return; } - if (flag.equals("officersCanMintCurrency") && currenciesIntegrator.isCurrenciesPresent()) { + if (flag.equals("officersCanMintCurrency") && currenciesIntegrator.isCurrenciesNotPresent()) { // TODO: add locale message return; } @@ -287,7 +289,7 @@ private String getFlagsSeparatedByCommas() { continue; } - if (flagName.equals("officersCanMintCurrency") && currenciesIntegrator.isCurrenciesPresent()) { + if (flagName.equals("officersCanMintCurrency") && currenciesIntegrator.isCurrenciesNotPresent()) { continue; } diff --git a/src/main/java/dansplugins/factionsystem/placeholders/PlaceholderAPI.java b/src/main/java/dansplugins/factionsystem/placeholders/PlaceholderAPI.java index e20f4ff28..2ddabdfa9 100644 --- a/src/main/java/dansplugins/factionsystem/placeholders/PlaceholderAPI.java +++ b/src/main/java/dansplugins/factionsystem/placeholders/PlaceholderAPI.java @@ -22,10 +22,12 @@ public class PlaceholderAPI extends PlaceholderExpansion { private final MedievalFactions medievalFactions; private final PersistentData persistentData; + private final ConfigService configService; - public PlaceholderAPI(MedievalFactions medievalFactions, PersistentData persistentData) { + public PlaceholderAPI(MedievalFactions medievalFactions, PersistentData persistentData, ConfigService configService) { this.medievalFactions = medievalFactions; this.persistentData = persistentData; + this.configService = configService; } @Override @@ -63,7 +65,7 @@ public String onPlaceholderRequest(Player player, @NotNull String id) { // Prerequisites. if (id.startsWith("faction_") && !hasFaction && !id.equalsIgnoreCase("faction_at_location")) { - return new MedievalFactions().getConfigService().getString("factionless"); // We don't want Faction-Specific Placeholders to return if they are Factionless! + return configService.getString("factionless"); // We don't want Faction-Specific Placeholders to return if they are Factionless! } // Faction-Specific. diff --git a/src/main/java/dansplugins/factionsystem/services/CommandService.java b/src/main/java/dansplugins/factionsystem/services/CommandService.java index 8825d9290..bb12a8587 100644 --- a/src/main/java/dansplugins/factionsystem/services/CommandService.java +++ b/src/main/java/dansplugins/factionsystem/services/CommandService.java @@ -31,68 +31,71 @@ public class CommandService { private final LocaleService localeService; private final MedievalFactions medievalFactions; private final ConfigService configService; - + private final PlayerService playerService; + private final MessageService messageService; private final Set subCommands = new HashSet<>(); - public CommandService(LocaleService localeService, MedievalFactions medievalFactions, ConfigService configService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, WarFactory warFactory, Logger logger, Scheduler scheduler, Messenger messenger, RelationChecker relationChecker, FiefsIntegrator fiefsIntegrator, CurrenciesIntegrator currenciesIntegrator) { + public CommandService(LocaleService localeService, MedievalFactions medievalFactions, ConfigService configService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, WarFactory warFactory, Logger logger, Scheduler scheduler, Messenger messenger, RelationChecker relationChecker, FiefsIntegrator fiefsIntegrator, CurrenciesIntegrator currenciesIntegrator, PlayerService playerService, MessageService messageService) { this.localeService = localeService; this.medievalFactions = medievalFactions; this.configService = configService; + this.playerService = playerService; + this.messageService = messageService; subCommands.addAll(Arrays.asList( - new AddLawCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new AllyCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new AutoClaimCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new BreakAllianceCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new BypassCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new ChatCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new CheckAccessCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new CheckClaimCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new ClaimCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new ConfigCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, medievalFactions), - new CreateCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, fiefsIntegrator, currenciesIntegrator, logger, medievalFactions), - new DeclareIndependenceCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new DeclareWarCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, warFactory), - new DemoteCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new DescCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new DisbandCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, logger), - new DuelCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, medievalFactions), - new EditLawCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new FlagsCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new ForceCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, medievalFactions, logger, fiefsIntegrator, currenciesIntegrator), - new GateCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, medievalFactions), - new GrantAccessCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new GrantIndependenceCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new HelpCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new HomeCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, scheduler), - new InfoCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, messenger), - new InviteCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, medievalFactions), - new InvokeCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new JoinCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, logger), - new KickCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, logger), - new LawsCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new LeaveCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, logger, new DisbandCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, logger)), - new ListCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new LockCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, relationChecker), - new MakePeaceCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new MembersCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new PowerCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new PrefixCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new PromoteCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new RemoveLawCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new RenameCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, medievalFactions, logger), - new ResetPowerLevelsCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new RevokeAccessCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new SetHomeCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new SwearFealtyCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new TransferCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new UnclaimallCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new UnclaimCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new UnlockCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, relationChecker), - new VassalizeCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, logger), - new VersionCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, medievalFactions), - new WhoCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, messenger), - new MapCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService), - new StatsCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService) + new AddLawCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new AllyCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new AutoClaimCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new BreakAllianceCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new BypassCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new ChatCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new CheckAccessCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new CheckClaimCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new ClaimCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new ConfigCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, medievalFactions, playerService, messageService), + new CreateCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, fiefsIntegrator, currenciesIntegrator, logger, medievalFactions, playerService, messageService), + new DeclareIndependenceCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new DeclareWarCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, warFactory, playerService, messageService), + new DemoteCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new DescCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new DisbandCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, logger, playerService, messageService), + new DuelCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, medievalFactions, playerService, messageService), + new EditLawCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new FlagsCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new ForceCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, medievalFactions, logger, fiefsIntegrator, currenciesIntegrator, playerService, messageService), + new GateCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, medievalFactions, playerService, messageService), + new GrantAccessCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new GrantIndependenceCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new HelpCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new HomeCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, scheduler, playerService, messageService), + new InfoCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, messenger, playerService, messageService), + new InviteCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, medievalFactions, playerService, messageService), + new InvokeCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new JoinCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, logger, playerService, messageService), + new KickCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, logger, playerService, messageService), + new LawsCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new LeaveCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, logger, new DisbandCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, logger, playerService, messageService), playerService, messageService), + new ListCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new LockCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, relationChecker, playerService, messageService), + new MakePeaceCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new MembersCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new PowerCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new PrefixCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new PromoteCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new RemoveLawCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new RenameCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, medievalFactions, logger, playerService, messageService), + new ResetPowerLevelsCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new RevokeAccessCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new SetHomeCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new SwearFealtyCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new TransferCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new UnclaimallCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new UnclaimCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new UnlockCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, relationChecker, playerService, messageService), + new VassalizeCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, logger, playerService, messageService), + new VersionCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, medievalFactions, playerService, messageService), + new WhoCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, messenger, playerService, messageService), + new MapCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new StatsCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService) )); } @@ -110,10 +113,10 @@ public boolean interpretCommand(CommandSender sender, String label, String[] arg sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("CurrentLanguageID"), configService.getString("languageid"))); sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("SupportedLanguageIDList"), localeService.getSupportedLanguageIDsSeparatedByCommas())); } else { - new MessageService().getLanguage().getStringList("PluginInfo") + messageService.getLanguage().getStringList("PluginInfo") .forEach(s -> { - s = s.replaceAll("#version#", medievalFactions.getVersion()).replaceAll("#dev#", medievalFactions.getDescription().getAuthors().toString()); - new PlayerService().sendMessageType(sender, s, s, true); + s = s.replace("#version#", medievalFactions.getVersion()).replace("#dev#", medievalFactions.getDescription().getAuthors().toString()); + playerService.sendMessageType(sender, s, s, true); }); } return true; @@ -129,7 +132,7 @@ public boolean interpretCommand(CommandSender sender, String label, String[] arg } } - new PlayerService().sendMessageType(sender, ChatColor.RED + localeService.get("CommandNotRecognized"), "CommandNotRecognized", false); + playerService.sendMessageType(sender, ChatColor.RED + localeService.get("CommandNotRecognized"), "CommandNotRecognized", false); } return false; } diff --git a/src/main/java/dansplugins/factionsystem/services/ConfigService.java b/src/main/java/dansplugins/factionsystem/services/ConfigService.java index e7d40108c..1e20ab347 100644 --- a/src/main/java/dansplugins/factionsystem/services/ConfigService.java +++ b/src/main/java/dansplugins/factionsystem/services/ConfigService.java @@ -25,149 +25,149 @@ public ConfigService(MedievalFactions medievalFactions) { public void handleVersionMismatch() { if (!getConfig().isString("version")) { - getConfig().addDefault("version", medievalFactions.getVersion()); + getConfig().set("version", medievalFactions.getVersion()); } else { getConfig().set("version", medievalFactions.getVersion()); } // add defaults if they don't exist if (!getConfig().isInt("initialMaxPowerLevel")) { - getConfig().addDefault("initialMaxPowerLevel", 20); + getConfig().set("initialMaxPowerLevel", 20); } if (!getConfig().isInt("initialPowerLevel")) { - getConfig().addDefault("initialPowerLevel", 5); + getConfig().set("initialPowerLevel", 5); } if (!getConfig().isBoolean("mobsSpawnInFactionTerritory")) { - getConfig().addDefault("mobsSpawnInFactionTerritory", false); + getConfig().set("mobsSpawnInFactionTerritory", false); } if (!getConfig().isInt("powerIncreaseAmount")) { - getConfig().addDefault("powerIncreaseAmount", 2); + getConfig().set("powerIncreaseAmount", 2); } if (!getConfig().isBoolean("laddersPlaceableInEnemyFactionTerritory")) { - getConfig().addDefault("laddersPlaceableInEnemyFactionTerritory", true); + getConfig().set("laddersPlaceableInEnemyFactionTerritory", true); } if (!getConfig().isInt("minutesBeforeInitialPowerIncrease")) { - getConfig().addDefault("minutesBeforeInitialPowerIncrease", 30); + getConfig().set("minutesBeforeInitialPowerIncrease", 30); } if (!getConfig().isInt("minutesBetweenPowerIncreases")) { - getConfig().addDefault("minutesBetweenPowerIncreases", 60); + getConfig().set("minutesBetweenPowerIncreases", 60); } if (!getConfig().isBoolean("warsRequiredForPVP")) { - getConfig().addDefault("warsRequiredForPVP", true); + getConfig().set("warsRequiredForPVP", true); } if (!getConfig().isDouble("factionOwnerMultiplier")) { - getConfig().addDefault("factionOwnerMultiplier", 2.0); + getConfig().set("factionOwnerMultiplier", 2.0); } if (!getConfig().isDouble("officerPerMemberCount")) { - getConfig().addDefault("officerPerMemberCount", 5); + getConfig().set("officerPerMemberCount", 5); } if (!getConfig().isDouble("factionOfficerMultiplier")) { - getConfig().addDefault("factionOfficerMultiplier", 1.5); + getConfig().set("factionOfficerMultiplier", 1.5); } if (!getConfig().isBoolean("powerDecreases")) { - getConfig().addDefault("powerDecreases", true); + getConfig().set("powerDecreases", true); } if (!getConfig().isInt("minutesBetweenPowerDecreases")) { - getConfig().addDefault("minutesBetweenPowerDecreases", 1440); + getConfig().set("minutesBetweenPowerDecreases", 1440); } if (!getConfig().isInt("minutesBeforePowerDecrease")) { - getConfig().addDefault("minutesBeforePowerDecrease", 20160); + getConfig().set("minutesBeforePowerDecrease", 20160); } if (!getConfig().isInt("powerDecreaseAmount")) { - getConfig().addDefault("powerDecreaseAmount", 1); + getConfig().set("powerDecreaseAmount", 1); } if (!getConfig().isInt("factionMaxNameLength")) { - getConfig().addDefault("factionMaxNameLength", 20); + getConfig().set("factionMaxNameLength", 20); } if (!getConfig().isInt("factionMaxNumberGates")) { - getConfig().addDefault("factionMaxNumberGates", 5); + getConfig().set("factionMaxNumberGates", 5); } if (!getConfig().isInt("factionMaxGateArea")) { - getConfig().addDefault("factionMaxGateArea", 64); + getConfig().set("factionMaxGateArea", 64); } if (!getConfig().isBoolean("surroundedChunksProtected")) { - getConfig().addDefault("surroundedChunksProtected", true); + getConfig().set("surroundedChunksProtected", true); } if (!getConfig().isBoolean("zeroPowerFactionsGetDisbanded")) { - getConfig().addDefault("zeroPowerFactionsGetDisbanded", false); + getConfig().set("zeroPowerFactionsGetDisbanded", false); } if (!getConfig().isDouble("vassalContributionPercentageMultiplier")) { - getConfig().addDefault("vassalContributionPercentageMultiplier", 0.75); + getConfig().set("vassalContributionPercentageMultiplier", 0.75); } if (!getConfig().isBoolean("nonMembersCanInteractWithDoors")) { - getConfig().addDefault("nonMembersCanInteractWithDoors", false); + getConfig().set("nonMembersCanInteractWithDoors", false); } if (!getConfig().isBoolean("playersChatWithPrefixes")) { - getConfig().addDefault("playersChatWithPrefixes", true); + getConfig().set("playersChatWithPrefixes", true); } if (!getConfig().isInt("maxClaimRadius")) { - getConfig().addDefault("maxClaimRadius", 3); + getConfig().set("maxClaimRadius", 3); } if (!getConfig().isString("languageid")) { - getConfig().addDefault("languageid", "en-us"); + getConfig().set("languageid", "en-us"); } if (!getConfig().isBoolean("chatSharedInVassalageTrees")) { - getConfig().addDefault("chatSharedInVassalageTrees", true); + getConfig().set("chatSharedInVassalageTrees", true); } if (!getConfig().isBoolean("allowAllyInteraction")) { - getConfig().addDefault("allowAllyInteraction", false); + getConfig().set("allowAllyInteraction", false); } if (!getConfig().isBoolean("allowVassalageTreeInteraction")) { - getConfig().addDefault("allowVassalageTreeInteraction", false); + getConfig().set("allowVassalageTreeInteraction", false); } if (!getConfig().isString("factionChatColor")) { - getConfig().addDefault("factionChatColor", "gold"); + getConfig().set("factionChatColor", "gold"); } if (!getConfig().isBoolean("territoryAlertPopUp")) { - getConfig().addDefault("territoryAlertPopUp", true); + getConfig().set("territoryAlertPopUp", true); } if (!getConfig().isBoolean("territoryIndicatorActionbar")) { - getConfig().addDefault("territoryIndicatorActionbar", true); + getConfig().set("territoryIndicatorActionbar", true); } if (!getConfig().isString("territoryAlertColor")) { - getConfig().addDefault("territoryAlertColor", "white"); + getConfig().set("territoryAlertColor", "white"); } if (!getConfig().isBoolean("randomFactionAssignment")) { - getConfig().addDefault("randomFactionAssignment", false); + getConfig().set("randomFactionAssignment", false); } if (!getConfig().isBoolean("allowNeutrality")) { - getConfig().addDefault("allowNeutrality", false); + getConfig().set("allowNeutrality", false); } if (!getConfig().isBoolean("showPrefixesInFactionChat")) { - getConfig().addDefault("showPrefixesInFactionChat", false); + getConfig().set("showPrefixesInFactionChat", false); } if (!getConfig().isBoolean("debugMode")) { - getConfig().addDefault("debugMode", false); + getConfig().set("debugMode", false); } if (!getConfig().isBoolean("factionProtectionsEnabled")) { - getConfig().addDefault("factionProtectionsEnabled", true); + getConfig().set("factionProtectionsEnabled", true); } if (!getConfig().isBoolean("limitLand")) { - getConfig().addDefault("limitLand", true); + getConfig().set("limitLand", true); } if (!getConfig().isBoolean("factionsCanSetPrefixColors")) { - getConfig().addDefault("factionsCanSetPrefixColors", true); + getConfig().set("factionsCanSetPrefixColors", true); } if (!getConfig().isBoolean("playersLosePowerOnDeath")) { - getConfig().addDefault("playersLosePowerOnDeath", true); + getConfig().set("playersLosePowerOnDeath", true); } if (!getConfig().isBoolean("bonusPowerEnabled")) { - getConfig().addDefault("bonusPowerEnabled", true); + getConfig().set("bonusPowerEnabled", true); } if (!getConfig().isBoolean("useNewLanguageFile")) { - getConfig().addDefault("useNewLanguageFile", false); + getConfig().set("useNewLanguageFile", false); } if (!getConfig().isDouble("powerLostOnDeath")) { - getConfig().addDefault("powerLostOnDeath", 1.0); + getConfig().set("powerLostOnDeath", 1.0); } if (!getConfig().isDouble("powerGainedOnKill")) { - getConfig().addDefault("powerGainedOnKill", 1.0); + getConfig().set("powerGainedOnKill", 1.0); } if (!getConfig().isInt("teleportDelay")) { - getConfig().addDefault("teleportDelay", 3); + getConfig().set("teleportDelay", 3); } if (!getConfig().isString("factionless")) { - getConfig().addDefault("factionless", "FactionLess"); + getConfig().set("factionless", "FactionLess"); } deleteOldConfigOptionsIfPresent(); @@ -264,53 +264,53 @@ public void setConfigOption(String option, String value, CommandSender sender) { } public void saveConfigDefaults() { - getConfig().addDefault("version", medievalFactions.getVersion()); - getConfig().addDefault("initialMaxPowerLevel", 20); - getConfig().addDefault("initialPowerLevel", 5); - getConfig().addDefault("powerIncreaseAmount", 2); - getConfig().addDefault("mobsSpawnInFactionTerritory", false); - getConfig().addDefault("laddersPlaceableInEnemyFactionTerritory", true); - getConfig().addDefault("minutesBeforeInitialPowerIncrease", 30); - getConfig().addDefault("minutesBetweenPowerIncreases", 60); - getConfig().addDefault("warsRequiredForPVP", true); - getConfig().addDefault("factionOwnerMultiplier", 2.0); - getConfig().addDefault("officerPerMemberCount", 5); - getConfig().addDefault("factionOfficerMultiplier", 1.5); - getConfig().addDefault("powerDecreases", true); - getConfig().addDefault("minutesBetweenPowerDecreases", 1440); - getConfig().addDefault("minutesBeforePowerDecrease", 20160); - getConfig().addDefault("powerDecreaseAmount", 1); - getConfig().addDefault("factionMaxNameLength", 20); - getConfig().addDefault("factionMaxNumberGates", 5); - getConfig().addDefault("factionMaxGateArea", 64); - getConfig().addDefault("surroundedChunksProtected", true); - getConfig().addDefault("zeroPowerFactionsGetDisbanded", false); - getConfig().addDefault("vassalContributionPercentageMultiplier", 0.75); - getConfig().addDefault("nonMembersCanInteractWithDoors", false); - getConfig().addDefault("playersChatWithPrefixes", true); - getConfig().addDefault("maxClaimRadius", 3); - getConfig().addDefault("languageid", "en-us"); - getConfig().addDefault("chatSharedInVassalageTrees", true); - getConfig().addDefault("allowAllyInteraction", false); - getConfig().addDefault("allowVassalageTreeInteraction", false); - getConfig().addDefault("factionChatColor", "gold"); - getConfig().addDefault("territoryAlertPopUp", true); - getConfig().addDefault("territoryAlertColor", "white"); - getConfig().addDefault("territoryIndicatorActionbar", true); - getConfig().addDefault("randomFactionAssignment", false); - getConfig().addDefault("allowNeutrality", false); - getConfig().addDefault("showPrefixesInFactionChat", false); - getConfig().addDefault("debugMode", false); - getConfig().addDefault("factionProtectionsEnabled", true); - getConfig().addDefault("limitLand", true); - getConfig().addDefault("factionsCanSetPrefixColors", true); - getConfig().addDefault("playersLosePowerOnDeath", true); - getConfig().addDefault("bonusPowerEnabled", true); - getConfig().addDefault("powerLostOnDeath", 1.0); - getConfig().addDefault("powerGainedOnKill", 1.0); - getConfig().addDefault("teleportDelay", 3); - getConfig().addDefault("factionless", "FactionLess"); - getConfig().addDefault("useNewLanguageFile", false); + getConfig().set("version", medievalFactions.getVersion()); + getConfig().set("initialMaxPowerLevel", 20); + getConfig().set("initialPowerLevel", 5); + getConfig().set("powerIncreaseAmount", 2); + getConfig().set("mobsSpawnInFactionTerritory", false); + getConfig().set("laddersPlaceableInEnemyFactionTerritory", true); + getConfig().set("minutesBeforeInitialPowerIncrease", 30); + getConfig().set("minutesBetweenPowerIncreases", 60); + getConfig().set("warsRequiredForPVP", true); + getConfig().set("factionOwnerMultiplier", 2.0); + getConfig().set("officerPerMemberCount", 5); + getConfig().set("factionOfficerMultiplier", 1.5); + getConfig().set("powerDecreases", true); + getConfig().set("minutesBetweenPowerDecreases", 1440); + getConfig().set("minutesBeforePowerDecrease", 20160); + getConfig().set("powerDecreaseAmount", 1); + getConfig().set("factionMaxNameLength", 20); + getConfig().set("factionMaxNumberGates", 5); + getConfig().set("factionMaxGateArea", 64); + getConfig().set("surroundedChunksProtected", true); + getConfig().set("zeroPowerFactionsGetDisbanded", false); + getConfig().set("vassalContributionPercentageMultiplier", 0.75); + getConfig().set("nonMembersCanInteractWithDoors", false); + getConfig().set("playersChatWithPrefixes", true); + getConfig().set("maxClaimRadius", 3); + getConfig().set("languageid", "en-us"); + getConfig().set("chatSharedInVassalageTrees", true); + getConfig().set("allowAllyInteraction", false); + getConfig().set("allowVassalageTreeInteraction", false); + getConfig().set("factionChatColor", "gold"); + getConfig().set("territoryAlertPopUp", true); + getConfig().set("territoryAlertColor", "white"); + getConfig().set("territoryIndicatorActionbar", true); + getConfig().set("randomFactionAssignment", false); + getConfig().set("allowNeutrality", false); + getConfig().set("showPrefixesInFactionChat", false); + getConfig().set("debugMode", false); + getConfig().set("factionProtectionsEnabled", true); + getConfig().set("limitLand", true); + getConfig().set("factionsCanSetPrefixColors", true); + getConfig().set("playersLosePowerOnDeath", true); + getConfig().set("bonusPowerEnabled", true); + getConfig().set("powerLostOnDeath", 1.0); + getConfig().set("powerGainedOnKill", 1.0); + getConfig().set("teleportDelay", 3); + getConfig().set("factionless", "FactionLess"); + getConfig().set("useNewLanguageFile", false); getConfig().options().copyDefaults(true); medievalFactions.saveConfig(); } diff --git a/src/main/java/dansplugins/factionsystem/services/GateService.java b/src/main/java/dansplugins/factionsystem/services/GateService.java index 565e9dac6..2f1aab3b1 100644 --- a/src/main/java/dansplugins/factionsystem/services/GateService.java +++ b/src/main/java/dansplugins/factionsystem/services/GateService.java @@ -26,11 +26,15 @@ public class GateService { private final PersistentData persistentData; private final LocaleService localeService; private final EphemeralData ephemeralData; + private final PlayerService playerService; + private final MessageService messageService; - public GateService(PersistentData persistentData, LocaleService localeService, EphemeralData ephemeralData) { + public GateService(PersistentData persistentData, LocaleService localeService, EphemeralData ephemeralData, PlayerService playerService, MessageService messageService) { this.persistentData = persistentData; this.localeService = localeService; this.ephemeralData = ephemeralData; + this.playerService = playerService; + this.messageService = messageService; } public void handlePotentialGateInteraction(Block clickedBlock, Player player, PlayerInteractEvent event) { @@ -58,8 +62,8 @@ public void handlePotentialGateInteraction(Block clickedBlock, Player player, Pl g.openGate(); } else { event.setCancelled(true); - new PlayerService().sendMessageType(player, ChatColor.RED + String.format(localeService.get("PleaseWaitGate"), g.getStatus()) - , Objects.requireNonNull(new MessageService().getLanguage().getString("PleaseWaitGate")).replaceAll("#status#", g.getStatus()), true); + playerService.sendMessageType(player, ChatColor.RED + String.format(localeService.get("PleaseWaitGate"), g.getStatus()) + , Objects.requireNonNull(messageService.getLanguage().getString("PleaseWaitGate")).replaceAll("#status#", g.getStatus()), true); return; } } else { @@ -67,8 +71,8 @@ public void handlePotentialGateInteraction(Block clickedBlock, Player player, Pl g.closeGate(); } else { event.setCancelled(true); - new PlayerService().sendMessageType(player, ChatColor.RED + String.format(localeService.get("PleaseWaitGate"), g.getStatus()) - , Objects.requireNonNull(new MessageService().getLanguage().getString("PleaseWaitGate")).replaceAll("#status#", g.getStatus()), true); + playerService.sendMessageType(player, ChatColor.RED + String.format(localeService.get("PleaseWaitGate"), g.getStatus()) + , Objects.requireNonNull(messageService.getLanguage().getString("PleaseWaitGate")).replaceAll("#status#", g.getStatus()), true); return; } } @@ -104,19 +108,19 @@ public void handlePotentialGateInteraction(Block block, BlockRedstoneEvent event public void handleCreatingGate(Block clickedBlock, Player player, PlayerInteractEvent event) { if (!persistentData.getChunkDataAccessor().isClaimed(clickedBlock.getChunk())) { - new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("CanOnlyCreateGatesInClaimedTerritory"), "CanOnlyCreateGatesInClaimedTerritory", false); + playerService.sendMessageType(player, ChatColor.RED + localeService.get("CanOnlyCreateGatesInClaimedTerritory"), "CanOnlyCreateGatesInClaimedTerritory", false); return; } else { ClaimedChunk claimedChunk = persistentData.getChunkDataAccessor().getClaimedChunk(clickedBlock.getChunk()); if (claimedChunk != null) { if (!persistentData.getFaction(claimedChunk.getHolder()).isMember(player.getUniqueId())) { - new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("AlertMustBeMemberToCreateGate"), "AlertMustBeMemberToCreateGate", false); + playerService.sendMessageType(player, ChatColor.RED + localeService.get("AlertMustBeMemberToCreateGate"), "AlertMustBeMemberToCreateGate", false); return; } else { if (!persistentData.getFaction(claimedChunk.getHolder()).isOwner(player.getUniqueId()) && !persistentData.getFaction(claimedChunk.getHolder()).isOfficer(player.getUniqueId())) { - new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("AlertMustBeOwnerOrOfficerToCreateGate"), "AlertMustBeOwnerOrOfficerToCreateGate", false); + playerService.sendMessageType(player, ChatColor.RED + localeService.get("AlertMustBeOwnerOrOfficerToCreateGate"), "AlertMustBeOwnerOrOfficerToCreateGate", false); return; } } @@ -128,24 +132,24 @@ public void handleCreatingGate(Block clickedBlock, Player player, PlayerInteract if (ephemeralData.getCreatingGatePlayers().containsKey(event.getPlayer().getUniqueId()) && ephemeralData.getCreatingGatePlayers().get(event.getPlayer().getUniqueId()).getCoord1() == null) { Gate.ErrorCodeAddCoord e = ephemeralData.getCreatingGatePlayers().get(event.getPlayer().getUniqueId()).addCoord(clickedBlock); if (e.equals(Gate.ErrorCodeAddCoord.None)) { - new PlayerService().sendMessageType(event.getPlayer(), ChatColor.GREEN + localeService.get("Point1PlacementSuccessful") + playerService.sendMessageType(event.getPlayer(), ChatColor.GREEN + localeService.get("Point1PlacementSuccessful") , "Point1PlacementSuccessful", false); - new PlayerService().sendMessageType(event.getPlayer(), ChatColor.YELLOW + localeService.get("ClickToPlaceSecondCorner") + playerService.sendMessageType(event.getPlayer(), ChatColor.YELLOW + localeService.get("ClickToPlaceSecondCorner") , "ClickToPlaceSecondCorner", false); } else if (e.equals(Gate.ErrorCodeAddCoord.MaterialMismatch)) { - new PlayerService().sendMessageType(event.getPlayer(), ChatColor.RED + localeService.get("MaterialsMismatch1") + playerService.sendMessageType(event.getPlayer(), ChatColor.RED + localeService.get("MaterialsMismatch1") , "MaterialsMismatch1", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } else if (e.equals(Gate.ErrorCodeAddCoord.WorldMismatch)) { - new PlayerService().sendMessageType(event.getPlayer(), ChatColor.RED + localeService.get("WorldsMismatch1") + playerService.sendMessageType(event.getPlayer(), ChatColor.RED + localeService.get("WorldsMismatch1") , "WorldsMismatch1", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } else if (e.equals(Gate.ErrorCodeAddCoord.NoCuboids)) { - new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("CuboidDisallowed1") + playerService.sendMessageType(player, ChatColor.RED + localeService.get("CuboidDisallowed1") , "CuboidDisallowed1", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } else { - new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("CancelledGatePlacement1") + playerService.sendMessageType(player, ChatColor.RED + localeService.get("CancelledGatePlacement1") , "CancelledGatePlacement1", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } @@ -155,28 +159,28 @@ public void handleCreatingGate(Block clickedBlock, Player player, PlayerInteract if (!ephemeralData.getCreatingGatePlayers().get(event.getPlayer().getUniqueId()).getCoord1().equals(clickedBlock)) { Gate.ErrorCodeAddCoord e = ephemeralData.getCreatingGatePlayers().get(event.getPlayer().getUniqueId()).addCoord(clickedBlock); if (e.equals(Gate.ErrorCodeAddCoord.None)) { - new PlayerService().sendMessageType(event.getPlayer(), ChatColor.GREEN + localeService.get("Point2PlacementSuccessful") + playerService.sendMessageType(event.getPlayer(), ChatColor.GREEN + localeService.get("Point2PlacementSuccessful") , "Point2PlacementSuccessful", false); - new PlayerService().sendMessageType(event.getPlayer(), ChatColor.YELLOW + "Click on the trigger block..." + playerService.sendMessageType(event.getPlayer(), ChatColor.YELLOW + "Click on the trigger block..." , "ClickTBlock", false); } else if (e.equals(Gate.ErrorCodeAddCoord.MaterialMismatch)) { - new PlayerService().sendMessageType(event.getPlayer(), ChatColor.RED + localeService.get("MaterialsMismatch2") + playerService.sendMessageType(event.getPlayer(), ChatColor.RED + localeService.get("MaterialsMismatch2") , "MaterialsMismatch2", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } else if (e.equals(Gate.ErrorCodeAddCoord.WorldMismatch)) { - new PlayerService().sendMessageType(event.getPlayer(), ChatColor.RED + localeService.get("WorldsMismatch2") + playerService.sendMessageType(event.getPlayer(), ChatColor.RED + localeService.get("WorldsMismatch2") , "WorldsMismatch2", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } else if (e.equals(Gate.ErrorCodeAddCoord.NoCuboids)) { - new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("CuboidDisallowed2") + playerService.sendMessageType(player, ChatColor.RED + localeService.get("CuboidDisallowed2") , "CuboidDisallowed2", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } else if (e.equals(Gate.ErrorCodeAddCoord.LessThanThreeHigh)) { - new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("ThreeBlockRequirement") + playerService.sendMessageType(player, ChatColor.RED + localeService.get("ThreeBlockRequirement") , "ThreeBlockRequirement", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } else { - new PlayerService().sendMessageType(player, ChatColor.RED + localeService.get("CancelledGatePlacement2") + playerService.sendMessageType(player, ChatColor.RED + localeService.get("CancelledGatePlacement2") , "CancelledGatePlacement2", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } @@ -192,29 +196,29 @@ public void handleCreatingGate(Block clickedBlock, Player player, PlayerInteract Faction faction = persistentData.getFaction(claim.getHolder()); faction.addGate(ephemeralData.getCreatingGatePlayers().get(event.getPlayer().getUniqueId())); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); - new PlayerService().sendMessageType(event.getPlayer(), ChatColor.GREEN + "Creating Gate 4/4: Trigger successfully linked." + playerService.sendMessageType(event.getPlayer(), ChatColor.GREEN + "Creating Gate 4/4: Trigger successfully linked." , "Point4TriggeredSuccessfully", false); - new PlayerService().sendMessageType(event.getPlayer(), ChatColor.GREEN + localeService.get("GateCreated") + playerService.sendMessageType(event.getPlayer(), ChatColor.GREEN + localeService.get("GateCreated") , "GateCreated", false); } else { - new PlayerService().sendMessageType(event.getPlayer(), ChatColor.RED + localeService.get("CancelledGatePlacementErrorLinking") + playerService.sendMessageType(event.getPlayer(), ChatColor.RED + localeService.get("CancelledGatePlacementErrorLinking") , "CancelledGatePlacementErrorLinking", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } } else { - new PlayerService().sendMessageType(event.getPlayer(), ChatColor.RED + "Error: Can only use triggers in claimed territory." + playerService.sendMessageType(event.getPlayer(), ChatColor.RED + "Error: Can only use triggers in claimed territory." , "CanOnlyTrigger", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } } else { - new PlayerService().sendMessageType(event.getPlayer(), ChatColor.RED + "Trigger block was not powerable. Cancelled gate placement." + playerService.sendMessageType(event.getPlayer(), ChatColor.RED + "Trigger block was not powerable. Cancelled gate placement." , "TriggerBlockNotPowerable", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } } } else { - new PlayerService().sendMessageType(event.getPlayer(), ChatColor.RED + localeService.get("PermissionGate") - , Objects.requireNonNull(new MessageService().getLanguage().getString("PermissionNeeded")).replaceAll("#permission#", "mf.gate"), true); + playerService.sendMessageType(event.getPlayer(), ChatColor.RED + localeService.get("PermissionGate") + , Objects.requireNonNull(messageService.getLanguage().getString("PermissionNeeded")).replaceAll("#permission#", "mf.gate"), true); } } } diff --git a/src/main/java/dansplugins/factionsystem/services/MessageService.java b/src/main/java/dansplugins/factionsystem/services/MessageService.java index 8829b6063..8e9472726 100644 --- a/src/main/java/dansplugins/factionsystem/services/MessageService.java +++ b/src/main/java/dansplugins/factionsystem/services/MessageService.java @@ -7,22 +7,27 @@ import java.io.File; import java.io.IOException; +import java.util.logging.Level; public class MessageService { - + private final MedievalFactions medievalFactions; private File languageFile; private FileConfiguration language; + public MessageService(MedievalFactions medievalFactions) { + this.medievalFactions = medievalFactions; + } + public void createLanguageFile() { - languageFile = new File(new MedievalFactions().getMedievalFactions().getDataFolder(), "language.yml"); - if (!languageFile.exists()) new MedievalFactions().getMedievalFactions().saveResource("language.yml", false); + languageFile = new File(medievalFactions.getMedievalFactions().getDataFolder(), "language.yml"); + if (!languageFile.exists()) medievalFactions.getMedievalFactions().saveResource("language.yml", false); language = new YamlConfiguration(); try { language.load(languageFile); } catch (IOException | InvalidConfigurationException e) { - e.printStackTrace(); + medievalFactions.getLogger().log(Level.WARNING, e.getCause().toString()); } } diff --git a/src/main/java/dansplugins/factionsystem/services/PlayerService.java b/src/main/java/dansplugins/factionsystem/services/PlayerService.java index b0d0685d4..03dc6236e 100644 --- a/src/main/java/dansplugins/factionsystem/services/PlayerService.java +++ b/src/main/java/dansplugins/factionsystem/services/PlayerService.java @@ -9,19 +9,27 @@ public class PlayerService { - public String getMessageType(String OldType, String NewType) { - if (new MedievalFactions().USE_NEW_LANGUAGE_FILE) { - return NewType; + private final MedievalFactions medievalFactions; + private final MessageService messageService; + + public PlayerService(MedievalFactions medievalFactions, MessageService messageService) { + this.medievalFactions = medievalFactions; + this.messageService = messageService; + } + + public String getMessageType(String oldtype, String newtype) { + if (medievalFactions.USE_NEW_LANGUAGE_FILE) { + return newtype; } else { - return OldType; + return oldtype; } } - public void sendMessageType(CommandSender sender, String OldType, String NewType, Boolean replace) { + public void sendMessageType(CommandSender sender, String oldtype, String newtype, Boolean replace) { if (!replace) { - sender.sendMessage(colorize(getMessageType(OldType, new MessageService().getLanguage().getString(NewType)))); + sender.sendMessage(colorize(getMessageType(oldtype, messageService.getLanguage().getString(newtype)))); } else { - sender.sendMessage(colorize(getMessageType(OldType, NewType))); + sender.sendMessage(colorize(getMessageType(oldtype, newtype))); } } @@ -33,7 +41,7 @@ public void sendConsoleMessage(ConsoleCommandSender c, String msg, Boolean messa if (!message) { c.sendMessage(colorize(msg)); } else { - c.sendMessage(colorize(new MessageService().getLanguage().getString(msg))); + c.sendMessage(colorize(messageService.getLanguage().getString(msg))); } } diff --git a/src/main/java/dansplugins/factionsystem/utils/extended/Messenger.java b/src/main/java/dansplugins/factionsystem/utils/extended/Messenger.java index 347cb1cd1..5d25f0790 100644 --- a/src/main/java/dansplugins/factionsystem/utils/extended/Messenger.java +++ b/src/main/java/dansplugins/factionsystem/utils/extended/Messenger.java @@ -25,10 +25,12 @@ public class Messenger extends preponderous.ponder.minecraft.bukkit.tools.Messenger { private final LocaleService localeService; private final FiefsIntegrator fiefsIntegrator; + private final PlayerService playerService; - public Messenger(LocaleService localeService, FiefsIntegrator fiefsIntegrator) { + public Messenger(LocaleService localeService, FiefsIntegrator fiefsIntegrator, PlayerService playerService) { this.localeService = localeService; this.fiefsIntegrator = fiefsIntegrator; + this.playerService = playerService; } public void sendFactionInfo(CommandSender sender, Faction faction, int power) { @@ -94,7 +96,7 @@ public void sendAllPlayersInFactionMessage(Faction faction, String message) { try { Player target = getServer().getPlayer(member); if (target != null) { - target.sendMessage(new PlayerService().colorize(message)); + target.sendMessage(playerService.colorize(message)); } } catch (Exception ignored) { From b7c27ff8ae1d1890ccd5450016a041c18c148beb Mon Sep 17 00:00:00 2001 From: VoChiDanh Date: Thu, 25 Aug 2022 08:48:27 +0700 Subject: [PATCH 07/24] a small change before making the rest of the classes (p8.5) --- .../dansplugins/factionsystem/commands/MembersCommand.java | 6 ++++-- .../dansplugins/factionsystem/services/CommandService.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/dansplugins/factionsystem/commands/MembersCommand.java b/src/main/java/dansplugins/factionsystem/commands/MembersCommand.java index 9ac325892..bf2aa8eb4 100644 --- a/src/main/java/dansplugins/factionsystem/commands/MembersCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/MembersCommand.java @@ -24,11 +24,13 @@ * @author Callum Johnson */ public class MembersCommand extends SubCommand { + private final MedievalFactions medievalFactions; - public MembersCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { + public MembersCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService, MedievalFactions medievalFactions) { super(new String[]{ "members", LOCALE_PREFIX + "CmdMembers" }, false, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); + this.medievalFactions = medievalFactions; } /** @@ -78,7 +80,7 @@ public void execute(CommandSender sender, String[] args, String key) { } } // send Faction Members - if (!new MedievalFactions().USE_NEW_LANGUAGE_FILE) { + if (!medievalFactions.USE_NEW_LANGUAGE_FILE) { sender.sendMessage(translate("&b----------\n" + getText("MembersOf", faction.getName()))); sender.sendMessage(translate("&b----------\n")); faction.getMemberList().stream() diff --git a/src/main/java/dansplugins/factionsystem/services/CommandService.java b/src/main/java/dansplugins/factionsystem/services/CommandService.java index bb12a8587..0e726f51e 100644 --- a/src/main/java/dansplugins/factionsystem/services/CommandService.java +++ b/src/main/java/dansplugins/factionsystem/services/CommandService.java @@ -77,7 +77,7 @@ public CommandService(LocaleService localeService, MedievalFactions medievalFact new ListCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), new LockCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, relationChecker, playerService, messageService), new MakePeaceCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), - new MembersCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), + new MembersCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService, medievalFactions), new PowerCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), new PrefixCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), new PromoteCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), From bc94440d457ec406693f984e9c696d7286fa7f9a Mon Sep 17 00:00:00 2001 From: VoChiDanh Date: Thu, 25 Aug 2022 10:27:00 +0700 Subject: [PATCH 08/24] reformat code, almost done converting files to yaml (except for debug messages to console) --- .../factionsystem/MedievalFactions.java | 6 +- .../factionsystem/services/LockService.java | 64 +- .../utils/extended/Messenger.java | 64 +- .../utils/extended/Scheduler.java | 37 +- src/main/resources/de.tsv | 1108 +++++++++-------- src/main/resources/en-us.tsv | 1100 ++++++++-------- src/main/resources/es.tsv | 1100 ++++++++-------- src/main/resources/language.yml | 30 +- src/main/resources/pt-br.tsv | 1100 ++++++++-------- src/main/resources/ru.tsv | 1100 ++++++++-------- src/main/resources/test.tsv | 1092 ++++++++-------- 11 files changed, 3435 insertions(+), 3366 deletions(-) diff --git a/src/main/java/dansplugins/factionsystem/MedievalFactions.java b/src/main/java/dansplugins/factionsystem/MedievalFactions.java index a6b748b3e..229ca05ff 100644 --- a/src/main/java/dansplugins/factionsystem/MedievalFactions.java +++ b/src/main/java/dansplugins/factionsystem/MedievalFactions.java @@ -52,13 +52,13 @@ public class MedievalFactions extends PonderBukkitPlugin { private MedievalFactions medievalFactions; private final MessageService messageService = new MessageService(medievalFactions); private final PlayerService playerService = new PlayerService(medievalFactions, messageService); - private final Messenger messenger = new Messenger(configService.getLocaleService(), fiefsIntegrator, playerService); + private final Messenger messenger = new Messenger(configService.getLocaleService(), fiefsIntegrator, playerService, messageService, medievalFactions); private final PersistentData persistentData = new PersistentData(configService.getLocaleService(), configService, this, messenger, ephemeralData, logger, fiefsIntegrator, currenciesIntegrator, playerService, messageService); private final WarFactory warFactory = new WarFactory(persistentData); private final RelationChecker relationChecker = new RelationChecker(persistentData); private final GateService gateService = new GateService(persistentData, configService.getLocaleService(), ephemeralData, playerService, messageService); - private final LockService lockService = new LockService(persistentData, configService.getLocaleService(), persistentData.getBlockChecker(), ephemeralData); - private final Scheduler scheduler = new Scheduler(logger, configService.getLocaleService(), this, persistentData, configService, playerTeleporter); + private final LockService lockService = new LockService(persistentData, configService.getLocaleService(), persistentData.getBlockChecker(), playerService, messageService, ephemeralData); + private final Scheduler scheduler = new Scheduler(logger, configService.getLocaleService(), this, persistentData, configService, playerTeleporter, playerService, messageService); private final CommandService commandService = new CommandService(configService.getLocaleService(), this, configService, persistentData, ephemeralData, persistentData.getChunkDataAccessor(), persistentData.getDynmapIntegrator(), warFactory, logger, scheduler, messenger, relationChecker, fiefsIntegrator, currenciesIntegrator, playerService, messageService); public MedievalFactions getMedievalFactions() { diff --git a/src/main/java/dansplugins/factionsystem/services/LockService.java b/src/main/java/dansplugins/factionsystem/services/LockService.java index 5624296b2..c1c15bc4e 100644 --- a/src/main/java/dansplugins/factionsystem/services/LockService.java +++ b/src/main/java/dansplugins/factionsystem/services/LockService.java @@ -28,12 +28,16 @@ public class LockService { private final PersistentData persistentData; private final LocaleService localeService; private final BlockChecker blockChecker; + private final PlayerService playerService; + private final MessageService messageService; private final EphemeralData ephemeralData; - public LockService(PersistentData persistentData, LocaleService localeService, BlockChecker blockChecker, EphemeralData ephemeralData) { + public LockService(PersistentData persistentData, LocaleService localeService, BlockChecker blockChecker, PlayerService playerService, MessageService messageService, EphemeralData ephemeralData) { this.persistentData = persistentData; this.localeService = localeService; this.blockChecker = blockChecker; + this.playerService = playerService; + this.messageService = messageService; this.ephemeralData = ephemeralData; } @@ -44,14 +48,14 @@ public void handleLockingBlock(PlayerInteractEvent event, Player player, Block c // if claimed by other faction if (!chunk.getHolder().equalsIgnoreCase(persistentData.getPlayersFaction(player.getUniqueId()).getName())) { - player.sendMessage(ChatColor.RED + localeService.get("CanOnlyLockInFactionTerritory")); + playerService.sendMessageType(player, ChatColor.RED + localeService.get("CanOnlyLockInFactionTerritory"), "CanOnlyLockInFactionTerritory", false); event.setCancelled(true); return; } // if already locked if (persistentData.isBlockLocked(clickedBlock)) { - player.sendMessage(ChatColor.RED + localeService.get("BlockAlreadyLocked")); + playerService.sendMessageType(player, ChatColor.RED + localeService.get("BlockAlreadyLocked"), "BlockAlreadyLocked", false); event.setCancelled(true); return; } @@ -94,7 +98,7 @@ public void handleLockingBlock(PlayerInteractEvent event, Player player, Block c persistentData.addLockedBlock(newLockedBlock2); } - player.sendMessage(ChatColor.GREEN + localeService.get("Locked")); + playerService.sendMessageType(player, ChatColor.GREEN + localeService.get("Locked"), "Locked", false); ephemeralData.getLockingPlayers().remove(player.getUniqueId()); } @@ -105,27 +109,25 @@ public void handleLockingBlock(PlayerInteractEvent event, Player player, Block c event.setCancelled(true); } else { - player.sendMessage(ChatColor.RED + localeService.get("CanOnlyLockSpecificBlocks")); + playerService.sendMessageType(player, ChatColor.RED + localeService.get("CanOnlyLockSpecificBlocks"), "CanOnlyLockSpecificBlocks", false); } } else { - player.sendMessage(ChatColor.RED + localeService.get("CanOnlyLockBlocksInClaimedTerritory")); + playerService.sendMessageType(player, ChatColor.RED + localeService.get("CanOnlyLockBlocksInClaimedTerritory"), "CanOnlyLockBlocksInClaimedTerritory", false); event.setCancelled(true); } } private void lock1x1Block(Player player, Block clickedBlock) { - LockedBlock block = new LockedBlock(player.getUniqueId(), persistentData.getPlayersFaction(player.getUniqueId()).getName(), - clickedBlock.getX(), clickedBlock.getY(), clickedBlock.getZ(), clickedBlock.getWorld().getName()); + LockedBlock block = new LockedBlock(player.getUniqueId(), persistentData.getPlayersFaction(player.getUniqueId()).getName(), clickedBlock.getX(), clickedBlock.getY(), clickedBlock.getZ(), clickedBlock.getWorld().getName()); persistentData.addLockedBlock(block); - player.sendMessage(ChatColor.GREEN + localeService.get("Locked")); + playerService.sendMessageType(player, ChatColor.GREEN + localeService.get("Locked"), "Locked", false); ephemeralData.getLockingPlayers().remove(player.getUniqueId()); } public void handleUnlockingBlock(PlayerInteractEvent event, Player player, Block clickedBlock) { // if locked if (persistentData.isBlockLocked(clickedBlock)) { - if (persistentData.getLockedBlock(clickedBlock).getOwner().equals(player.getUniqueId()) - || ephemeralData.getForcefullyUnlockingPlayers().contains(player.getUniqueId())) { + if (persistentData.getLockedBlock(clickedBlock).getOwner().equals(player.getUniqueId()) || ephemeralData.getForcefullyUnlockingPlayers().contains(player.getUniqueId())) { if (blockChecker.isChest(clickedBlock)) { InventoryHolder holder = ((Chest) clickedBlock.getState()).getInventory().getHolder(); @@ -139,14 +141,12 @@ public void handleUnlockingBlock(PlayerInteractEvent event, Player player, Block persistentData.removeLockedBlock(leftChest); persistentData.removeLockedBlock(rightChest); - player.sendMessage(ChatColor.GREEN + localeService.get("AlertUnlocked")); - ephemeralData.getUnlockingPlayers().remove(player.getUniqueId()); } else { // unlock single chest persistentData.removeLockedBlock(clickedBlock); - player.sendMessage(ChatColor.GREEN + localeService.get("AlertUnlocked")); - ephemeralData.getUnlockingPlayers().remove(player.getUniqueId()); } + playerService.sendMessageType(player, ChatColor.GREEN + localeService.get("AlertUnlocked"), "Unlocked", false); + ephemeralData.getUnlockingPlayers().remove(player.getUniqueId()); } // door multi-unlock @@ -162,7 +162,7 @@ public void handleUnlockingBlock(PlayerInteractEvent event, Player player, Block persistentData.removeLockedBlock(clickedBlock.getWorld().getBlockAt(clickedBlock.getX(), clickedBlock.getY() - 1, clickedBlock.getZ())); } - player.sendMessage(ChatColor.GREEN + localeService.get("AlertUnlocked")); + playerService.sendMessageType(player, ChatColor.GREEN + localeService.get("AlertUnlocked"), "Unlocked", false); ephemeralData.getUnlockingPlayers().remove(player.getUniqueId()); } @@ -170,7 +170,7 @@ public void handleUnlockingBlock(PlayerInteractEvent event, Player player, Block if (blockChecker.isGate(clickedBlock) || blockChecker.isBarrel(clickedBlock) || blockChecker.isTrapdoor(clickedBlock) || blockChecker.isFurnace(clickedBlock)) { persistentData.removeLockedBlock(clickedBlock); - player.sendMessage(ChatColor.GREEN + localeService.get("AlertUnlocked")); + playerService.sendMessageType(player, ChatColor.GREEN + localeService.get("AlertUnlocked"), "Unlocked", false); ephemeralData.getUnlockingPlayers().remove(player.getUniqueId()); } @@ -180,7 +180,7 @@ public void handleUnlockingBlock(PlayerInteractEvent event, Player player, Block event.setCancelled(true); } } else { - player.sendMessage(ChatColor.RED + localeService.get("BlockIsNotLocked")); + playerService.sendMessageType(player, ChatColor.RED + localeService.get("BlockIsNotLocked"), "BlockIsNotLocked", false); event.setCancelled(true); } } @@ -190,7 +190,7 @@ public void handleGrantingAccess(PlayerInteractEvent event, Block clickedBlock, // if not owner if (persistentData.getLockedBlock(clickedBlock).getOwner() != player.getUniqueId()) { - player.sendMessage(ChatColor.RED + localeService.get("NotTheOwnerOfThisBlock")); + playerService.sendMessageType(player, ChatColor.RED + localeService.get("NotTheOwnerOfThisBlock"), "NotTheOwnerOfThisBlock", false); return; } @@ -206,14 +206,12 @@ public void handleGrantingAccess(PlayerInteractEvent event, Block clickedBlock, persistentData.getLockedBlock(leftChest).addToAccessList(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId())); persistentData.getLockedBlock(rightChest).addToAccessList(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId())); - player.sendMessage(ChatColor.GREEN + String.format(localeService.get("AlertAccessGrantedTo"), uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId())))); - ephemeralData.getPlayersGrantingAccess().remove(player.getUniqueId()); } else { // if single chest // grant access to single chest persistentData.getLockedBlock(clickedBlock).addToAccessList(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId())); - player.sendMessage(ChatColor.GREEN + String.format(localeService.get("AlertAccessGrantedTo"), uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId())))); - ephemeralData.getPlayersGrantingAccess().remove(player.getUniqueId()); } + playerService.sendMessageType(player, ChatColor.GREEN + String.format(localeService.get("AlertAccessGrantedTo"), uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId()))), Objects.requireNonNull(messageService.getLanguage().getString("AlertAccessGrantedTo")).replace("#name#", uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId()))), true); + ephemeralData.getPlayersGrantingAccess().remove(player.getUniqueId()); } @@ -230,7 +228,7 @@ public void handleGrantingAccess(PlayerInteractEvent event, Block clickedBlock, persistentData.getLockedBlock(clickedBlock).addToAccessList(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId())); } - player.sendMessage(ChatColor.GREEN + String.format(localeService.get("AlertAccessGrantedTo"), uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId())))); + playerService.sendMessageType(player, ChatColor.GREEN + String.format(localeService.get("AlertAccessGrantedTo"), uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId()))), Objects.requireNonNull(messageService.getLanguage().getString("AlertAccessGrantedTo")).replace("#name#", uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId()))), true); ephemeralData.getPlayersGrantingAccess().remove(player.getUniqueId()); } @@ -238,7 +236,7 @@ public void handleGrantingAccess(PlayerInteractEvent event, Block clickedBlock, if (blockChecker.isGate(clickedBlock) || blockChecker.isBarrel(clickedBlock) || blockChecker.isTrapdoor(clickedBlock) || blockChecker.isFurnace(clickedBlock)) { persistentData.getLockedBlock(clickedBlock).addToAccessList(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId())); - player.sendMessage(ChatColor.GREEN + String.format(localeService.get("AlertAccessGrantedTo"), uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId())))); + playerService.sendMessageType(player, ChatColor.GREEN + String.format(localeService.get("AlertAccessGrantedTo"), uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId()))), Objects.requireNonNull(messageService.getLanguage().getString("AlertAccessGrantedTo")).replace("#name#", uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId()))), true); ephemeralData.getPlayersGrantingAccess().remove(player.getUniqueId()); } @@ -247,9 +245,9 @@ public void handleGrantingAccess(PlayerInteractEvent event, Block clickedBlock, public void handleCheckingAccess(PlayerInteractEvent event, LockedBlock lockedBlock, Player player) { UUIDChecker uuidChecker = new UUIDChecker(); - player.sendMessage(ChatColor.AQUA + localeService.get("FollowingPlayersHaveAccess")); + playerService.sendMessageType(player, ChatColor.AQUA + localeService.get("FollowingPlayersHaveAccess"), "FollowingPlayersHaveAccess", false); for (UUID playerUUID : lockedBlock.getAccessList()) { - player.sendMessage(ChatColor.AQUA + " - " + uuidChecker.findPlayerNameBasedOnUUID(playerUUID)); + playerService.sendMessageType(player, ChatColor.AQUA + " - " + uuidChecker.findPlayerNameBasedOnUUID(playerUUID), Objects.requireNonNull(messageService.getLanguage().getString("FPHAList")).replace("#name#", uuidChecker.findPlayerNameBasedOnUUID(playerUUID)), true); } ephemeralData.getPlayersCheckingAccess().remove(player.getUniqueId()); event.setCancelled(true); @@ -260,7 +258,7 @@ public void handleRevokingAccess(PlayerInteractEvent event, Block clickedBlock, // if not owner if (persistentData.getLockedBlock(clickedBlock).getOwner() != player.getUniqueId()) { - player.sendMessage(ChatColor.RED + localeService.get("NotTheOwnerOfThisBlock")); + playerService.sendMessageType(player, ChatColor.RED + localeService.get("NotTheOwnerOfThisBlock"), "NotTheOwnerOfThisBlock", false); return; } @@ -276,14 +274,12 @@ public void handleRevokingAccess(PlayerInteractEvent event, Block clickedBlock, persistentData.getLockedBlock(leftChest).removeFromAccessList(ephemeralData.getPlayersRevokingAccess().get(player.getUniqueId())); persistentData.getLockedBlock(rightChest).removeFromAccessList(ephemeralData.getPlayersRevokingAccess().get(player.getUniqueId())); - player.sendMessage(ChatColor.GREEN + String.format(localeService.get("AlertAccessRevokedFor"), uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersRevokingAccess().get(player.getUniqueId())))); - ephemeralData.getPlayersRevokingAccess().remove(player.getUniqueId()); } else { // if single chest // revoke access to single chest persistentData.getLockedBlock(clickedBlock).removeFromAccessList(ephemeralData.getPlayersRevokingAccess().get(player.getUniqueId())); - player.sendMessage(ChatColor.GREEN + String.format(localeService.get("AlertAccessRevokedFor"), uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersRevokingAccess().get(player.getUniqueId())))); - ephemeralData.getPlayersRevokingAccess().remove(player.getUniqueId()); } + playerService.sendMessageType(player, ChatColor.GREEN + String.format(localeService.get("AlertAccessRevokedFor"), uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersRevokingAccess().get(player.getUniqueId()))), Objects.requireNonNull(messageService.getLanguage().getString("AlertAccessRevokedFor")).replace("#name#", uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId()))), true); + ephemeralData.getPlayersRevokingAccess().remove(player.getUniqueId()); } @@ -300,7 +296,7 @@ public void handleRevokingAccess(PlayerInteractEvent event, Block clickedBlock, persistentData.getLockedBlock(clickedBlock).removeFromAccessList(ephemeralData.getPlayersRevokingAccess().get(player.getUniqueId())); } - player.sendMessage(ChatColor.GREEN + String.format(localeService.get("AlertAccessRevokedFor"), uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersRevokingAccess().get(player.getUniqueId())))); + playerService.sendMessageType(player, ChatColor.GREEN + String.format(localeService.get("AlertAccessRevokedFor"), uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersRevokingAccess().get(player.getUniqueId()))), Objects.requireNonNull(messageService.getLanguage().getString("AlertAccessRevokedFor")).replace("#name#", uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId()))), true); ephemeralData.getPlayersRevokingAccess().remove(player.getUniqueId()); } @@ -308,7 +304,7 @@ public void handleRevokingAccess(PlayerInteractEvent event, Block clickedBlock, if (blockChecker.isGate(clickedBlock) || blockChecker.isBarrel(clickedBlock) || blockChecker.isTrapdoor(clickedBlock) || blockChecker.isFurnace(clickedBlock)) { persistentData.getLockedBlock(clickedBlock).removeFromAccessList(ephemeralData.getPlayersRevokingAccess().get(player.getUniqueId())); - player.sendMessage(ChatColor.GREEN + String.format(localeService.get("AlertAccessRevokedFor"), uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersRevokingAccess().get(player.getUniqueId())))); + playerService.sendMessageType(player, ChatColor.GREEN + String.format(localeService.get("AlertAccessRevokedFor"), uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersRevokingAccess().get(player.getUniqueId()))), Objects.requireNonNull(messageService.getLanguage().getString("AlertAccessRevokedFor")).replace("#name#", uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId()))), true); ephemeralData.getPlayersRevokingAccess().remove(player.getUniqueId()); } diff --git a/src/main/java/dansplugins/factionsystem/utils/extended/Messenger.java b/src/main/java/dansplugins/factionsystem/utils/extended/Messenger.java index 5d25f0790..bb4e046a0 100644 --- a/src/main/java/dansplugins/factionsystem/utils/extended/Messenger.java +++ b/src/main/java/dansplugins/factionsystem/utils/extended/Messenger.java @@ -4,9 +4,11 @@ */ package dansplugins.factionsystem.utils.extended; +import dansplugins.factionsystem.MedievalFactions; import dansplugins.factionsystem.integrators.FiefsIntegrator; import dansplugins.factionsystem.objects.domain.Faction; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; import dansplugins.factionsystem.services.PlayerService; import dansplugins.fiefs.externalapi.FI_Fief; import org.bukkit.ChatColor; @@ -15,6 +17,7 @@ import preponderous.ponder.minecraft.bukkit.tools.UUIDChecker; import java.util.ArrayList; +import java.util.Objects; import java.util.UUID; import static org.bukkit.Bukkit.getServer; @@ -26,34 +29,56 @@ public class Messenger extends preponderous.ponder.minecraft.bukkit.tools.Messen private final LocaleService localeService; private final FiefsIntegrator fiefsIntegrator; private final PlayerService playerService; + private final MessageService messageService; + private final MedievalFactions medievalFactions; - public Messenger(LocaleService localeService, FiefsIntegrator fiefsIntegrator, PlayerService playerService) { + public Messenger(LocaleService localeService, FiefsIntegrator fiefsIntegrator, PlayerService playerService, MessageService messageService, MedievalFactions medievalFactions) { this.localeService = localeService; this.fiefsIntegrator = fiefsIntegrator; this.playerService = playerService; + this.messageService = messageService; + this.medievalFactions = medievalFactions; } public void sendFactionInfo(CommandSender sender, Faction faction, int power) { UUIDChecker uuidChecker = new UUIDChecker(); - sender.sendMessage(ChatColor.BOLD + "" + ChatColor.AQUA + String.format(localeService.get("FactionInfo"), faction.getName()) + "\n----------\n"); - sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("Name"), faction.getName()) + "\n"); - sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("Owner"), uuidChecker.findPlayerNameBasedOnUUID(faction.getOwner())) + "\n"); - sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("Description"), faction.getDescription()) + "\n"); - sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("Population"), faction.getMemberList().size()) + "\n"); + if (!medievalFactions.USE_NEW_LANGUAGE_FILE) { + sender.sendMessage(ChatColor.BOLD + "" + ChatColor.AQUA + String.format(localeService.get("FactionInfo"), faction.getName()) + "\n----------\n"); + sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("Name"), faction.getName()) + "\n"); + sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("Owner"), uuidChecker.findPlayerNameBasedOnUUID(faction.getOwner())) + "\n"); + sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("Description"), faction.getDescription()) + "\n"); + sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("Population"), faction.getMemberList().size()) + "\n"); + sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("AlliedWith"), faction.getAlliesSeparatedByCommas()) + "\n"); + sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("AtWarWith"), faction.getEnemiesSeparatedByCommas()) + "\n"); + sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("PowerLevel"), faction.getCumulativePowerLevel()) + "/" + faction.getMaximumCumulativePowerLevel() + "\n"); + sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("DemesneSize"), power, faction.getCumulativePowerLevel()) + "\n"); + sender.sendMessage(ChatColor.AQUA + "----------\n"); + } else { + messageService.getLanguage().getStringList("FactionInfo").forEach(s -> { + s = s.replaceAll("#faction#", faction.getName()) + .replaceAll("#name#", faction.getName()) + .replaceAll("#owner#", uuidChecker.findPlayerNameBasedOnUUID(faction.getOwner())) + .replaceAll("#desc#", faction.getDescription()) + .replaceAll("#pplt#", String.valueOf(faction.getPopulation())) + .replaceAll("#aw#", faction.getAlliesSeparatedByCommas()) + .replaceAll("#aww#", faction.getEnemiesSeparatedByCommas()) + .replaceAll("#pl#", String.valueOf(faction.getCumulativePowerLevel())) + .replaceAll("#pl_max#", String.valueOf(faction.getMaximumCumulativePowerLevel())) + .replaceAll("#number#", String.valueOf(power)) + .replaceAll("#max#", String.valueOf(faction.getCumulativePowerLevel())); + playerService.sendMessageType(sender, "", s, true); + }); + } sendLiegeInfoIfVassal(faction, sender); sendFiefsInfo(faction, sender); - sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("AlliedWith"), faction.getAlliesSeparatedByCommas()) + "\n"); - sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("AtWarWith"), faction.getEnemiesSeparatedByCommas()) + "\n"); - sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("PowerLevel"), faction.getCumulativePowerLevel()) + "/" + faction.getMaximumCumulativePowerLevel() + "\n"); - sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("DemesneSize"), power, faction.getCumulativePowerLevel()) + "\n"); sendLiegeInfoIfLiege(faction, sender); sendBonusPowerInfo(faction, sender); - sender.sendMessage(ChatColor.AQUA + "----------\n"); } private void sendBonusPowerInfo(Faction faction, CommandSender sender) { if (faction.getBonusPower() != 0) { - sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("BonusPower"), faction.getBonusPower())); + playerService.sendMessageType(sender, ChatColor.AQUA + String.format(localeService.get("BonusPower"), faction.getBonusPower()) + , Objects.requireNonNull(messageService.getLanguage().getString("BonusPower")).replaceAll("BonusPower", String.valueOf(faction.getBonusPower())), true); } } @@ -61,9 +86,11 @@ private void sendLiegeInfoIfLiege(Faction faction, CommandSender sender) { int vassalContribution = faction.calculateCumulativePowerLevelWithVassalContribution() - faction.calculateCumulativePowerLevelWithoutVassalContribution(); if (faction.isLiege()) { if (!faction.isWeakened()) { - sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("VassalContribution"), vassalContribution) + "\n"); + playerService.sendMessageType(sender, ChatColor.AQUA + String.format(localeService.get("VassalContribution"), vassalContribution) + "\n" + , Objects.requireNonNull(messageService.getLanguage().getString("VassalContribution")).replaceAll("#amount#", String.valueOf(vassalContribution)), true); } else { - sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("VassalContribution"), 0) + "\n"); + playerService.sendMessageType(sender, ChatColor.AQUA + String.format(localeService.get("VassalContribution"), 0) + "\n" + , Objects.requireNonNull(messageService.getLanguage().getString("VassalContribution")).replaceAll("#amount#", String.valueOf(0)), true); } } } @@ -76,17 +103,20 @@ private void sendFiefsInfo(Faction faction, CommandSender sender) { for (FI_Fief fief : fiefs) { fiefsSeparatedByCommas.append(fief.getName()); } - sender.sendMessage(ChatColor.AQUA + String.format("Fiefs: %s", fiefsSeparatedByCommas)); + playerService.sendMessageType(sender, ChatColor.AQUA + String.format("Fiefs: %s", fiefsSeparatedByCommas) + , Objects.requireNonNull(messageService.getLanguage().getString("Fiefs")).replaceAll("#fiefs#", String.valueOf(fiefsSeparatedByCommas)), true); } } } private void sendLiegeInfoIfVassal(Faction faction, CommandSender sender) { if (faction.hasLiege()) { - sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("Liege"), faction.getLiege()) + "\n"); + playerService.sendMessageType(sender, ChatColor.AQUA + String.format(localeService.get("Liege"), faction.getLiege()) + "\n" + , Objects.requireNonNull(messageService.getLanguage().getString("Liege")).replaceAll("#name#", faction.getLiege()), true); } if (faction.isLiege()) { - sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("Vassals"), faction.getVassalsSeparatedByCommas()) + "\n"); + playerService.sendMessageType(sender, ChatColor.AQUA + String.format(localeService.get("Vassals"), faction.getVassalsSeparatedByCommas()) + "\n" + , Objects.requireNonNull(messageService.getLanguage().getString("Vassals")).replaceAll("#name#", faction.getVassalsSeparatedByCommas()), true); } } diff --git a/src/main/java/dansplugins/factionsystem/utils/extended/Scheduler.java b/src/main/java/dansplugins/factionsystem/utils/extended/Scheduler.java index e5617dc1a..2b40c5387 100644 --- a/src/main/java/dansplugins/factionsystem/utils/extended/Scheduler.java +++ b/src/main/java/dansplugins/factionsystem/utils/extended/Scheduler.java @@ -9,6 +9,8 @@ import dansplugins.factionsystem.objects.domain.Faction; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; +import dansplugins.factionsystem.services.MessageService; +import dansplugins.factionsystem.services.PlayerService; import dansplugins.factionsystem.utils.Logger; import dansplugins.factionsystem.utils.PlayerTeleporter; import org.bukkit.Bukkit; @@ -17,6 +19,7 @@ import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; +import java.util.Objects; import java.util.Random; /** @@ -29,14 +32,18 @@ public class Scheduler { private final PersistentData persistentData; private final ConfigService configService; private final PlayerTeleporter playerTeleporter; + private final PlayerService playerService; + private final MessageService messageService; - public Scheduler(Logger logger, LocaleService localeService, MedievalFactions medievalFactions, PersistentData persistentData, ConfigService configService, PlayerTeleporter playerTeleporter) { + public Scheduler(Logger logger, LocaleService localeService, MedievalFactions medievalFactions, PersistentData persistentData, ConfigService configService, PlayerTeleporter playerTeleporter, PlayerService playerService, MessageService messageService) { this.logger = logger; this.localeService = localeService; this.medievalFactions = medievalFactions; this.persistentData = persistentData; this.configService = configService; this.playerTeleporter = playerTeleporter; + this.playerService = playerService; + this.messageService = messageService; } public void scheduleAutosave() { @@ -69,20 +76,17 @@ public void schedulePowerDecrease() { logger.debug(localeService.get("SchedulingPowerDecrease")); int delay = configService.getInt("minutesBetweenPowerDecreases") * 60; int secondsUntilRepeat = configService.getInt("minutesBetweenPowerDecreases") * 60; - Bukkit.getScheduler().scheduleSyncRepeatingTask(medievalFactions, new Runnable() { - @Override - public void run() { - logger.debug(String.format((localeService.get("AlertDecreasingThePowerOfInactivePlayers")) + "%n", configService.getInt("powerDecreaseAmount"), configService.getInt("minutesBeforePowerDecrease"), configService.getInt("minutesBetweenPowerDecreases"))); + Bukkit.getScheduler().scheduleSyncRepeatingTask(medievalFactions, () -> { + logger.debug(String.format((localeService.get("AlertDecreasingThePowerOfInactivePlayers")) + "%n", configService.getInt("powerDecreaseAmount"), configService.getInt("minutesBeforePowerDecrease"), configService.getInt("minutesBetweenPowerDecreases"))); - persistentData.decreasePowerForInactivePlayers(); + persistentData.decreasePowerForInactivePlayers(); - if (configService.getBoolean("zeroPowerFactionsGetDisbanded")) { - persistentData.disbandAllZeroPowerFactions(); - } + if (configService.getBoolean("zeroPowerFactionsGetDisbanded")) { + persistentData.disbandAllZeroPowerFactions(); + } - for (Player player : medievalFactions.getServer().getOnlinePlayers()) { - informPlayerIfTheirLandIsInDanger(player); - } + for (Player player : medievalFactions.getServer().getOnlinePlayers()) { + informPlayerIfTheirLandIsInDanger(player); } }, delay * 20L, secondsUntilRepeat * 20L); } @@ -91,7 +95,8 @@ private void informPlayerIfTheirLandIsInDanger(Player player) { Faction faction = persistentData.getPlayersFaction(player.getUniqueId()); if (faction != null) { if (isFactionExceedingTheirDemesneLimit(faction)) { - player.sendMessage(ChatColor.RED + localeService.get("AlertMoreClaimedChunksThanPower")); + playerService.sendMessageType(player, ChatColor.RED + localeService.get("AlertMoreClaimedChunksThanPower") + , "AlertMoreClaimedChunksThanPower", false); } } } @@ -102,7 +107,8 @@ private boolean isFactionExceedingTheirDemesneLimit(Faction faction) { public void scheduleTeleport(Player player, Location destinationLocation) { final int teleport_delay = configService.getInt("teleportDelay"); - player.sendMessage(ChatColor.AQUA + "Teleporting in " + teleport_delay + " seconds..."); + playerService.sendMessageType(player, ChatColor.AQUA + "Teleporting in " + teleport_delay + " seconds..." + , Objects.requireNonNull(messageService.getLanguage().getString("Teleport")).replaceAll("#time#", String.valueOf(teleport_delay)), true); DelayedTeleportTask delayedTeleportTask = new DelayedTeleportTask(player, destinationLocation); delayedTeleportTask.runTaskLater(medievalFactions, (long) teleport_delay * getRandomNumberBetween(15, 25)); } @@ -129,7 +135,8 @@ public void run() { if (playerHasNotMoved()) { teleportPlayer(); } else { - player.sendMessage(ChatColor.RED + "Teleport cancelled."); + playerService.sendMessageType(player, ChatColor.RED + "Teleport cancelled.", + "TeleportCancelled", false); } } diff --git a/src/main/resources/de.tsv b/src/main/resources/de.tsv index fc39632ae..09cd47452 100644 --- a/src/main/resources/de.tsv +++ b/src/main/resources/de.tsv @@ -1,551 +1,559 @@ -AcceptedChallengeDuelHasBegun Du hast die Herausforderung von %s angenommen, das Duell hat begonnen. -AlertAccessGrantedTo Zugriff auf %s gewährt -AlertAccessRevokedFor Zugriff für %s widerrufen -AlertAllianceHasBeenBroken %s hat deine Allianz deiner Fraktion gebrochen. -AlertAlreadyAtWarWith Deine Fraktion befindet sich bereits im Krieg mit%s. -AlertAlreadyCreatingGate Du erstellst bereits ein Gate. -AlertAlreadyDueling Du bist bereits in einem Duell -AlertAlreadyDuelingPlayer Du duellerist dich bereits mit %s -AlertAlreadyDuelingSomeone Du duellierst dich schon mit jemandem. -AlertAlreadyGrantingAccess Du gewährst bereits jemandem Zugriff. Gebe / mf grantaccess cancel ein, um dies abzubrechen. -AlertAlreadyInFaction Du bist schon in einer Fraktion, sorry. -AlertAlreadyRequestedAlliance Du hast bereits ein Bündnisangebot an diese Faction gesendet. -AlertAlreadyRequestedPeace Du hast bereits ein Friedensangebot an diese Faction gesendet. -AlertAttemptedAlliance %s hat versucht sich mit %s zu verbünden -AlertAttemptedVassalization %s hat versucht, deine Fraktion zu vassalisieren. Wenn du der Eigentümer bist, gebe '/mf swearfealty %s' ein, um zu akzeptieren. -AlertBeenInvited Du wurdest zu %s eingeladen. Gebe /mf join %s ein, um beizutreten. -AlertCalledToWar1 %s hat deine Fraktion in ihren Krieg mit %s gerufen. -AlertCalledToWar2 %s hat %s in den Krieg mit deiner Faction gerufen. -AlertCalledToWar3 Deine Fraktion hat %s in deinen Krieg mit %s gerufen. -AlertChallengedToDuel %s hat %s zu einem Duell herausgefordert. -AlertChallengedToDuelPlusHowTo %s hat dich zu einem Duell herausgefordert. Typ /mf duell akzeptieren, um zu beginnen. -AlertChallengeIssued Du hast %s zu einem Duell herausgefordert. -AlertChallengeWasAccepted %s hat deine Herausforderung angenommen, das Duell hat begonnen. -AlertChangedGateName Der Gate-Name wurde in '% s' geändert. -AlertCurrentPowerLevel Deine aktuelles Power Level ist% d /% d. -AlertDecreasingThePowerOfInactivePlayers Medieval Factions verringert die Power jedes Spielers um %d, wenn sie seit mehr als%d Minuten nicht mehr online waren. Dies geschieht alle %d Minuten. -AlertDemotion Du wurdest in deiner Fraktion zum Mitgliedsstatus herabgestuft. -AlertDisbandmentDueToZeroPower Deine Fraktion wurde aufgelöst, weil deine kumulative Power Null erreicht hat. -AlertFactionAttemptedToVassalize Deine Fraktion hat versucht, %s zu vassalisieren. -AlertFactionHasBeenVassalized Deine Fraktion wurde vassalisiert und hat einen neuen Lehnsherrn: %s -AlertFactionHasNewVassal Deine Fraktion hat einen neuen Vasallen: %s -AlertFactionHomeRemoved Dein Factionhome wurde entfernt. -AlertFactionIsWeakened Deine Faction hat weniger als die Häflte der Max-Power. Sie wird keinen Bonus Power von ihren, jetzt unabhängigen, Vasallen mehr bekommen. -AlertForcedDemotion Du wurdest in deiner Fraktion gewaltsam vom Offiziersstatus herabgestuft. -AlertForcedKick Du wurdest gewaltsam aus deiner Fraktion geworfen. -AlertForcedLoad Medieval Factions wurde zum Laden gezwungen. -AlertForcedSave Medieval Factions wurde gezwungen zu speichern. -AlertForcedToJoinFaction Du wurdest gezwungen, einer Fraktion beizutreten. -AlertGate Das ist das '%s' Tor. -AlertGrantedIndependence %s hat deiner Fraktion Unabhängigkeit gewährt. -AlertIncreasingThePowerOfEveryPlayer Medieval Factions erhöht die Power jedes Spielers um %d. Dies geschieht alle %d Minuten. -AlertJoinedFaction Du bist der Fraktion beigetreten. -AlertKicked Du wurdest von %s aus deiner Fraktion geworfen. -AlertLandClaimed Land beansprucht. Herrschaftsgröße: %d/%d -AlertLandConqueredFromAnotherFaction Land erobert von %s. Größe deiner Faction: %d%d -AlertLandConqueredFromYourFaction %s hat Land von deiner Fraktion erobert. -AlertLeftFaction Du hast deine Fraktion verlassen. -AlertLeftFactionAndItGotDeleted Du hast deine Faction verlassen. Sie wurde gelöscht, da sie nun keine Mitglieder mehr hat -AlertMoreClaimedChunksThanPower Deine Fraktion hat mehr geclaimte Chunks als Power. Dein Land kann erobert werden. -AlertMustBeAtWarToConquer Beide Fraktionen müssen sich im Krieg befinden, damit du Land erobern kannst. -AlertMustBeInFactionToUseCommand Du musst in einer Faction sein um diesen Command zu benutzen -AlertMustBeMemberToCreateGate Du musst Member der Faction sein um ein Gate zu erstellen -AlertMustBeOfficerOrOwnerToClaimLand Du musst entweder Vizeanführer- oder Anführer sein um Land zu claimen -AlertMustBeOwnerOrOfficerToCreateGate Du musst Faction Owner oder Vizeanführer sein um ein Gate zu erstellen -AlertMustBeOwnerOrOfficerToUseCommand Du musst Anführer oder Vizeanführer einer Faction sein um diesen Command zu benutzen -AlertMustBeOwnerToInvokeAlliance Du musst Anführer einer Faction sein um eine Allianz zu beschließen! -AlertMustBeOwnerToUseCommand Du musst Anführer einer Faction sein um diesen Command zu nutzen -AlertMustKickAllPlayers Du musst alle Spieler aus der Faction kicken, bevor du sie löschen kannst! -AlertNoGatesDefined Deine Faction hat keine eigenen Gates. -AlertNoLaws Deine Faction hat keine eigenen Regeln -AlertNoLongerVassalFaction %s ist nicht mehr Vasall deiner Faction -AlertNonOwnership Das gehört dir nicht! -AlertNoPendingChallenges Du hast keine anstehenden Herausforderungen, die du abbrechen kannst -AlertNotAllied Deine Faction ist in keinem Bündnis mit %s -AlertNotBeenChallenged Du hast keine ausstehenden Duellherausforderungen mehr -AlertNotBeenChallengedByPlayer Du wurdest nicht zu einem Duell mit %s herausgefordert -AlertNotInFaction Du bist in keiner Faction! -AlertNotInvitedToFaction Du bist nicht in diese Faction eingeladen worden. -AlertNotOfferedVassalizationBy Du hast kein Angebot um Vasall dieser Faction zu werden -AlertNowAlliedWith Dein Faction hat jetzt ein Bündnis mit %s -AlertNowAtPeaceWith %s steht nun wieder im Frieden mit %s. -AlertPlayerAlreadyOwner Dieser Spieler ist bereits der Anführer dieser Faction! -AlertPlayerNotInFaction Dieser Spieler ist nicht in dieser Faction -AlertPowerLevelDecreased Dein Powerlevel ist gesunken -AlertPowerLevelIncreasedBy Du fühlst dich wieder stärker. Dein Powerlevel ist auf %d gestiegen. -AlertReachedDemesne Du hast das Limit der Menge von Land erreicht. Lade mehr Spieler ein um dieses Limit anzuheben. -AlertUnlocked Entsperrt. -AlertUnlockingCancelled Entsperrung abgebrochen. -AllianceBrokenWith Die Allianz mit %s wurde gebrochen -AlliedWith Verbündet mit: %s -AllLandUnclaimed All dein Land wurde unclaimed -AllLandUnclaimedFrom Alles Land von %s wurde unclaimed -AlreadyEnteredCheckAccess Du hast diesen Command bereits durchgeführt. Tippe "/mf checkaccess cancel' um ihn abzubrechen -AlreadyEnteredRevokeAccess Du hast diesen Command bereits durchgeführt. Tippe /mf revokeacces cancel um ihn zurückzuziehen -AlreadyInFaction Sorry, du bist bereits in einer Faction. Verlasse sie um eine neue zu erstellen -ArgumentMustBeNumber Das Argument muss eine Zahl sein. -ArgumentsSingleQuotesRequirement Argumente müssen in einfachen Anführungszeichen angegeben werden. -AssignedToRandomFaction Du wurdest einer zufälligen Faction zugeordnet -AttemptedAlliance Bündnisangebot an %s gesendet -AttemptedPeace Friedensangebot an %s gesendet -AtWarWith Im Krieg mit. %s -AutoclaimToggled Autoclaim aktiviert. -BlockAlreadyLocked Dieser Block ist bereits gesichert -BlockIsNotLocked Dieser Block ist noch nicht gesichert -BlockIsPartOfGateMustRemoveGate Dieser Block ist Teil von Gate '%s'. Du musst zuerst das Gate removen! -BonusPower Bonus Power von Admins: %d -BooleanSet Boolean gesetzt -Cancelled Abgebrochen -CancelledGatePlacement1 Error beim Platzieren von Point 1. Gate Placement wurde abgebrochen -CancelledGatePlacement2 Error beim Platzieren von Point 2. Gate Placement abgebrochen -CancelledGatePlacementErrorLinking Fehler beim Verbinden mit Hebel. Gate Placement wurde gecancelled. -CannotAllyWithSelf Du kannst dich nicht mit deiner eigenen Faction verbünden. -CannotAttackFactionMember Du kannst niemanden aus deiner eigenen Faction angreifen. -CannotAttackNonWarringPlayer Du kannst keinen Spieler aus einer anderen Faction angreifen, wenn eure Factions nicht gegenseitig im Krieg stehen -CannotBreakAllianceWithSelf Du kannst keine Allianz mit deiner eigenen Faction brechen -CannotBringNeutralFactionIntoWar Du kannst keine neutralen Factions in den Krieg bringen -CannotCancelActiveDuel Du kannst kein aktives Duell abbrechen -CannotDeclareWarIfLiegeNotWeakened Sie können dieser Fraktion keinen Krieg erklären, da sie Vasallen sind, es sei denn, ihr Lehnsherr ist geschwächt. -CannotDeclareWarIfNeutralFaction Neutrale Factions können keinen Krieg erklären. -CannotDeclareWarOnAlly Du kannst keinem deiner Verbündeten den Krieg erklären -CannotDeclareWarOnLiege Du kannst keinen Krieg an deinen Lehnsherren erklären. Benutze stattdessen /mf declareindepence -CannotDeclareWarOnNeutralFaction Du kannst keinen Krieg an eine neutrale Faction erklären -CannotDeclareWarOnVassal Du kannst keinen Krieg an deinen eigenen Vasallen erklären -CannotDeclareWarOnYourself Du kannst dir nicht selbst den Krieg erklären -CannotDemoteSelf Du kannst dich nicht selbst degradieren -CannotDuelSelf Du kannst dich nicht mit dir selbst duellieren -CannotFindDynmap Dynmap wurde nicht gefunden -CannotForciblyKickOwner Du kannst nicht gewaltsam den Anführer aus seiner eigenen Faction kicken. Versuche die Faction zu löschen. -CannotGrantAccessToSelf Du kannst dir nicht selbst Zugriff gewähren -CannotKickOwner Du kannst nicht den Anführer kicken. -CannotKickSelf Du kannst dich nicht selbst kicken. -CannotMakePeaceWithSelf Du kannst nicht mit deiner eigenen Faction Frieden schließen. -CannotPlaceChestsNextToUnownedLockedChests Du kannst keine Truhe neben einer fremden, gelockten Truhe platzieren. -CannotPlaceHoppersNextToUnownedLockedChests Du kannst keine Trichter neben, unter oder über einer gelockten Kiste platzieren, die dir nicht gehört. -CannotPromoteSelf Du kannst dich nicht selbst befördern. -CannotRevokeAccessFromSelf Du kannst deinen eigenen Zugang nicht entfernen -CannotSetFactionHomeInWilderness Du kannst dein Faction-Home auf kein Land setzen, das nicht deiner Faction gehört -CannotSetVersion Version kann nicht eingestellt werden. -CannotTransferToSelf Du kannst die Ownerschaft deiner Faction nicht an dich selbst übergeben. -CannotVassalizeLiege Du kannst deinen eigenen Lehnsherren nicht vasallisieren. -CannotVassalizeSelf Du kannst deine eigene Faction nicht vassalieren. -CannotVassalizeVassal Du kannst eine Faction nicht vassalisieren, wenn sie bereits einen Lehnsherren hat -CanOnlyCreateGatesInClaimedTerritory Du kannst Gates nur auf, zu deiner Faction gehörendem, Territorium erstellen. -CanOnlyLockBlocksInClaimedTerritory Du kannst Blöcke nur auf Land deiner Faction locken. -CanOnlyLockInFactionTerritory Du kannst nur Dinge auf dem Land deiner eigenen Faction locken. -CanOnlyLockSpecificBlocks Du kannst nur Truhen, Türen, Fässer, Falltüren, Öfen, Ambosse und Gates locken. -ClaimedChunksLoaded Geclaimte chunks geladen. -ClaimedChunksSuccessfullyLoaded Geclaimte chunks wurden erfolgreich geladen. -ClickOnTriggerLever Klicke auf den Hebel -ClickToPlaceSecondCorner Klicke, um die zweite Ecke zu platzieren -CmdAddLaw addlaw -CmdAlly ally -CmdAutoClaim autoclaim -CmdBreakAlliance breakalliance -CmdBypass bypass -CmdChat chat -CmdCheckAccess checkacess -CmdCheckClaim checklaim -CmdClaim claim -CmdConfig config -CmdConfigSet set -CmdConfigShow show -CmdCreate create -CmdDeclareIndependence declearindependence -CmdDeclareWar declearwar -CmdDemote demote -CmdDesc desc -CmdDisband disband -CmdDuel duel -CmdDuelAccept accept -CmdDuelCancel cancel -CmdDuelChallenge challenge -CmdEditLaw editlaw -CmdFlags flags -CmdFlagsSet set -CmdFlagsShow show -CmdForce force -CmdForceBonusPower bonuspower -CmdForceClaim claim -CmdForceCreate create -CmdForceDemote demote -CmdForceFlag flag -CmdForceJoin join -CmdForceKick kick -CmdForceLoad load -CmdForcePeace peace -CmdForcePower power -CmdForceRename rename -CmdForceRenounce renounce -CmdForceSave save -CmdForceTransfer transfer -CmdForceUnlock unlock -CmdGate gate -CmdGateCancel cancel -CmdGateCreate create -CmdGateList list -CmdGateName name -CmdGateRemove remove -CmdGrantAccess grantaccess -CmdGrantIndependence grantindependence -CmdHelp help -CmdHome home -CmdInfo info -CmdInvite invite -CmdInvoke invoke -CmdJoin join -CmdKick kick -CmdLaws laws -CmdLeave leave -CmdList list -CmdLock lock -CmdMakePeace makepeace -CmdMembers members -CmdPower powers -CmdPrefix prefix -CmdPromote promote -CmdRemoveLaw removelaw -CmdRename rename -CmdResetPowerLevels resetpowerlevels -CmdRevokeAccess revokeaccess -CmdSetHome sethome -CmdSwearFealty swearfealty -CmdTransfer transfer -CmdUnclaim unclaim -CmdUnclaimall unclaimall -CmdUnlock unlock -CmdVassalize vassalize -CmdVersion version -CmdWho who -CommandCancelled Command abgebrochen. -CommandNotRecognized Medieval Faction erkennt diesen Command nicht an. -CommandsPage1 == Medieval Factions Seite 1/%d == -CommandsPage2 == Medieval Factions Seite 2/%d == -CommandsPage3 == Medieval Factions Seite 3/%d == -CommandsPage4 == Medieval Factions Seite 4/%d == -CommandsPage5 == Medieval Factions Seite 5/%d == -CommandsPage6 == Medieval Factions Seite 6/%d == -CommandsPage7 == Medieval Factions Seite 7/%d == -ConfigListPageOne ===== Konfigurationsliste Seite 1/2 ===== -ConfigListPageTwo ===== Konfigurationsliste Seite 2/2 ===== -CreatingGateCancelled Gate erstellen abgebrochen. -CreatingGateClickWithHoe Creating Gate. Klicke mit einer Goldhacke auf einen Block um den ersten Punkt auszuwählen -CuboidDisallowed1 Fehler beim Platzieren von Punkt 1: Du kannst keinen Quader platzieren. -CuboidDisallowed2 Fehler beim Platzieren von Punkt 2: Sie können keinen Quader platzieren. -CurrentLanguageID Current Language ID: %s -CurrentlyNoFactions Es gibt gerade keine Factions. -CurrentPowerLevel %s' derzeitiger Power Level ist %d/%d. -Defeated %s hat %s in einem Duell besiegt. -DemesneSize Herrschaftsgröße: %d/%d -Description Descrption -DescriptionSet Description gesetzt. -DesignatedFactionNotFound Eine der benannten Factions wurde nicht gefunden. -DesiredPowerMustBeANumber Gewünschter Power muss eine Zahl sein. -DeveloperList Entwickler: %s -DisbandmentDueToZeroPower %s wurde gelöscht, da der Powerlevel final 0 erreicht hat. -DoesntExist %s existiert nicht. -Done Done. -DoubleSet Double gesetzt. -DuelChallengeCancelled Duell Challenge abgebrochen. -DuelEndedInTie Das Duell von %s und %s ist in einem Unentschieden geendet. -DynmapIntegrationSuccessful Dynmap intergration wurde erfolgreich ausgeführt -ERROR ERROR -ErrorAddingAreaMarker Error beim setzen der Marker Area %s -ErrorChunkRemoval Ein Fehler ist während des Entfernens der geclaimten Chunks aufgetreten. -ErrorClaimedChunkRemoval Ein Fehler ist während des Entfernens der geclaimten Chunks aufgetreten. -ErrorCouldNotFindGatesFaction Error: Konnte Faction für gate '%s' nicht finden. -ErrorCouldNotLoadFactionGate Error: Konnte Faction Gate \n nicht laden. -ErrorCreatingMarkerSet Fehler beim Erstellen der Markierung. -ErrorIntegratingWithDynmap Fehler bei der Integration mit dynmap: -ErrorPlayerPowerRecordForUUIDNotFound ERROR: Die Poweraufzeichnung des Spielers für die uuid wurde nicht gefunden. Das kumulative Power Level konnte nicht abgerufen werden. -ErrorSettingAreaMarkerColor Fehler beim Setzen der Bereichsmarkierungsfarbe auf '%s'. -FactionAlreadyAlly Diese Fraktion ist bereits dein Verbündeter. -FactionAlreadyExists Sorry. Diese Faction existiert bereits. -FactionAndPlayerSingleQuotesRequirement Fraktion und Spieler müssen in einfachen Anführungszeichen angegeben werden. -FactionAndVassalSingleQuotesRequirement Fraktion und Vasall, die entfernt werden sollen, müssen in einfachen Anführungszeichen angegeben werden. -FactionCreated Faction erstellt. -FactionCurrentlyEnemyMustMakePeace Diese Faction ist im Moment dein Feind. Schließe zuerst Frieden, bevor du dich mit ihnen verbündest. -FactionDataLoadedSuccessfuly Faction Data wurde erfolgreich geladen. -FactionDoesNotExist Sorry, diese Faction existiert nicht -FactionDoesNotHaveLaws Diese Faction hat keine eigenen Gesetze. -FactionGates Faction Gates. -FactionHomeLoadError Ein Fehler ist beim Laden der Koordinaten des Faction-Homes aufgetreten. -FactionHomeNotSetYet Das Faction-Home wurde noch nicht gesetzt. -FactionHomeSet Faction Home gesetzt. -FactionInfo %s Fraktionsinfo -FactionIsNotVassal Diese Faction ist kein Vasall von dir. -FactionMustBeDesignatedInsideSingleQuotes Fraktion muss in einfachen Anführungszeichen angegeben werden. -FactionNameChanged Faction Name wurde geändert -FactionNameNotRecognized Dieser Factionnname ist nicht erkannt. -FactionNameTooLong Dieser Name ist zu lang. -FactionNotEnemy Diese Faction ist nicht dein Enemy. -FactionNotFound Diese Faction wurde nicht gefunden. -FactionsSuccessfullyLoaded Factions wurden erfolgreich geladen -FactionsTitle == Fraktionen == -FactionSuccessfullyDisbanded Fraktion erfolgreich aufgelöst. -FactionSuccessfullyLoaded Fraktion erfolgreich geladen. -FileLoadError Ein Fehler ist beim Laden des Files aufgetreten. -FollowingPlayersHaveAccess Auf diesen Block haben folgende Spieler Zugriff: -GateCreated Tor erfolgreich erstellt. -HasAttemptedToMakePeaceWith %s hat versucht, mit %s Frieden zu schließen. -HasBeenKickedFrom %s wurde aus Faction %s gekickt -HasDeclaredIndependence %s hat den Vasallenvertrag mit %s aufgekündigt! -HasDeclaredWarAgainst %s hat %s den Krieg erklärt. -HasJoined %s ist der Faction %s beigetreten -HelpAddLaw /mf addlaw - Addet ein Gesetz zu deiner Faction. -HelpAlly /mf ally - Sendet ein Bündnisangebot an eine fremde Faction. -HelpAutoclaim /mf autoclaim - Aktiviert Autoclaim - macht Landclaiming leichter. -HelpBreakAlliance /mf breakalliance - Bricht eine Allianz mit einer Faction. -HelpBypass /mf bypass – umgehungsschutz. -HelpChat /mf chat - Aktiviert den Faction Chat -HelpCheckAccess /mf checkaccess - Checkt wer Zugriff auf einen gelockten Block hat. -HelpCheckClaim /mf checkclaim - Checkt ob das Land geclaimt ist. -HelpClaim /mf claim - Claimt Land für deine Faction -HelpConfigSet /mf config set (option) (value) - Setzt einen Config Wert. -HelpConfigShow /mf config show - Zeigt die Werte in der Config an. -HelpCreate /mf create - Erstellt eine neue Faction. -HelpDeclareIndependence /mf declareindepence - Erklärt die Unabhängikeit zu deinem Lehnsherren. -HelpDeclareWar /mf declarewar - Erklärt einer anderen Faction den Krieg. -HelpDemote /mf demote - Degradiert einen Officer zum Member. -HelpDesc /mf desc - Setzt die Description deiner Faction. -HelpDisband /mf disband - Löscht deine Faction (Du musst Anführer sein um diese Aktion durchzuführen) -HelpDuelAccept /mf duel accept (Spieler) -HelpDuelCancel /mf duel cancel -HelpDuelChallenge /mf duel challenge (Spieler) (Zeitlimit in Sekunden) -HelpEditLaw /mf editlaw - Bearbeitet ein bereits existierendes Gesetz in deiner Faction. -HelpFlagsSet /mf flags set (Option) (Wert) - Setzt ein Fraktionsflag. -HelpFlagsShow /mf flags show - Zeigt die Faction Flags -HelpForce /mf force - Zwingt das Plugin eine bestimmte Aktion auszuführen -HelpForceBonusPower /mf force bonuspower 'Fraktion' 'Zahl' -HelpForceClaim /mf force claim 'Fraktionsname' -HelpForceCreate /mf force create 'Fraktionsname' -HelpForceDemote /mf force demote (Spieler) -HelpForceFlag /mf force flag 'fraktion' 'option' 'wert' -HelpForceJoin /mf force join 'Spieler' 'Fraktion' -HelpForceKick /mf force kick (Spieler) -HelpForceLoad /mf force load -HelpForcePeace /mf force peace 'fraktion1' 'fraktion2' -HelpForcePower /mf force power 'Spieler' 'Nummer' -HelpForceRemoveVassal /mf force removevassal 'Fraktion' 'Vasall' -HelpForceRename /mf force rename 'Fraktion' 'neuer Name' -HelpForceRenounce /mf force renounce (Spieler) -HelpForceSave /mf force save -HelpForceTransfer /mf force transfer 'Fraktion' 'Spieler' -HelpForceUnlock /mf force unlock -HelpGateCancel /mf gate cancel -HelpGateCreate /mf gate create (name) -HelpGateList /mf gate list -HelpGateName /mf gate name (name) -HelpGateRemove /mf gate remove -HelpGrantAccess /mf grantaccess - Gewähren Sie jemandem Zugriff auf einen gesperrten Block. -HelpGrantIndependence /mf grantacess - Gewährt jemandem Zugriff auf einen gelockten Block. -HelpHelp /mf grantindependence - Gewährt einer Vasall Faction Unabhängigkeit. -HelpHome /mf home - Teleportiert dich zu deinem Factiomhome. -HelpInfo /mf info - Zeigt die Information deiner oder einer fremden Faction an. -HelpInvite /mf invite - Invitet einen Spieler in deine Faction. -HelpInvoke /mf invoke ally enemy - Ruft eine verbündete Faction in den Krieg -HelpJoin /mf join - Joint einer Faction (Einladung benötigt) -HelpKick /mf kick - Kickt einen Spieler aus deiner Faction. -HelpLaws /mf laws - Zeigt die Gesetze deiner Faction an. -HelpLeave /Mf leave - Verlässt deine derzeitige Faction. -HelpList /mf list - Listet alle Factions auf dem Server. -HelpLock /mf lock - Verschließt eine Truhe oder eine Tür. -HelpMakePeace /mf makepeace - Sendet ein Friedensangebot an eine andere Faction. -HelpMap /mf map - Zeigt eine Map mit den Chunks nahe deiner Location -HelpMembers /mf members - Listet die Member deiner oder einer anderen Faction. -HelpPower /mf power - Checkt deinen Powerlevel -HelpPrefix /mf prefix - Setzt den Präfix deiner Faction. -HelpPromote /mf promote - Berfördert einen Player zum Officer. -HelpRemoveLaw /mf removelaw - Entfernt ein Gesetz aus deiner Faction. -HelpRename /mf rename - Benennt deine Fction um. -HelpResetPowerLevels /mf resetpowerlevels - Setzt den Factionpowerreword und die summierten Factionpowerlevel zurück. -HelpRevokeAccess /mf revokeaccess - Zieht den Zugriff eines bestimmten Spielers auf einen gelockten Block zurück -HelpSetHome /mv sethome - Setzt das home deiner Faction -HelpSwearFealty /mf swearfealty - Setzt deine Faction in Vasallenschaft zi ener anderen -HelpTransfer /mf transfer - Übergibt deine Faction an einen anderen Spieler. -HelpUnclaim /mf unclaim - Unclaimt Land deiner Faction. -HelpUnclaimall /mf unclaimall - Unclaimt all das Land deiner Faction. -HelpUnlock /mf unlock - Unlocket eine Truhe oder eine Tür. -HelpVassalize /mf vassalize - Sendet ein Vassalisierungsangebot an eine Faction. -HelpVersion /mf version - Checkt die Plugin Version. -HelpWho /mf who - Zeigt die Faction eines bestimmten Spielers an. -HomeClaimedByAnotherFaction Home wurde von einer anderen Faction geclaimt und ist somit nicht mehr nutzbar. -HomeIsInUnclaimedChunk Das Home befindet sich auf einem ungeclaimten Chunk und ist deshalb nicht verfügbar. -HourlySaveAlert Medieval Faction speichert gerade. Das passiert jede Stunde. -IntegerSet Integer gesetzt. -InvitationExpired Die Einladung von Faction %s ist abgelaufen. -InvitationSent Die Einladung wurde gesendet. -KeysLoaded Key geladen: %d -LandAlreadyClaimedBy Dieses Land ist bereits geclaimt durch -LandAlreadyClaimedByYourFaction Dieses Land ist bereits durch deine Faction geclaimt. -LandClaimedBy Dieses Land ist durch %s geclaimt. -LandClaimedUsingAdminBypass Land wurde durch den Adminmodus unclaimed. -LandIsNotClaimed Dieses Land ist nicht geclaimt. -LandIsUnclaimed Dieses Land ist frei. -LandNotCurrentlyClaimed Dieses Land ist im Moment nicht geclaimt. -LandUnclaimed Land unclaimed. -LawAdded Gesetz hinzugefügt. -LawEdited Gesetz bearbeitet. -LawRemoved Gesetz gelöscht. -LawsTitle Gesetze von %s -LeverSuccessfullyLinked Erstellen von Gate 4/4: Hebel erfolgreich verbunden. -Liege Liege: %s -ListLegend P: Macht, M: Mitglieder, L: Land -LoadingClaimedChunks Beanspruchte Blöcke werden geladen... -LoadingLockedBLocks Gesperrte Blöcke werden geladen... -LoadingPlayerPowerRecords Spielerleistungsaufzeichnungen werden geladen... -Locked Gesperrt. -LockedBlockSuccessfullyLoaded Gesperrter Block erfolgreich geladen. -LockedBy Gesperrt von %s -LockingCancelled Sperren abgebrochen. -LockRemovalError Beim Entfernen der Sperre ist ein Fehler aufgetreten. -MaterialsMismatch1 Fehler beim Platzieren von Punkt 1: Nicht übereinstimmende Materialien. -MaterialsMismatch2 Fehler beim Platzieren von Punkt 2: Nicht übereinstimmende Materialien. -MedievalFactionsStringRight Medieval-Factions-%s -MedievalFactionsTitle == Medieval Factions %s == -MembersOf Mitglieder von %s -MissingFactionGatesJSONCollection Gates konnten nicht geladen werden, da die Sammlung 'factionGates' nicht in der Fraktions-JSON-Datei vorhanden war. Führen Sie ein Upgrade von einer früheren Version durch? Standardeinstellung. -MovementDetectedTeleportCancelled Bewegung erfasst. Teleport wurde abgebrochen. -MustBeAtWarOrFactionMustBeInactive Muss sich mit der Zielfraktion im Krieg befinden oder die Zielfraktion muss inaktiv sein. -MustBeInFaction Sorry. Du musst in einer Faction sein um diesen Command zu benutzen. -MustBeOwner Sorry. Du musst der Anführer einer Faction sein um diesen Command zu benutzen. -MustOwnFactionOrBeOfficer Du musst entweder Anführer oder Officer einer Faction sein um diesen Command zu benutzen. -MustTransferOwnership Sorry. Du musst die Faction entweder abgeben oder jeden aus der Faction kicken um sie zu verlassen. -Name Name: %s -NameAlreadyTaken Dieser Name wird berets verwendet. -NeutralityDisabled Neutralität ist derzeit deaktiviert. -NoBlockDetectedToCheckForGate Es wurde kein Block erkannt, um nach dem Gate zu suchen. -NoFactionsDesignatedSingleQuotesRequired Keine Fraktionen benannt. Muss in einfachen Anführungszeichen angegeben werden. -NoLongerBypassingProtections Sie umgehen nicht mehr den Schutz von Medieval Factions. -NoLongerInFactionChat Du hast den Faction Chat verlassen. -NotAMemberOfAnyFaction Du hast keine Faction. -NotAnAlly %s ist kein Verbündeter von dir. -NotAnAllyOrVassal %s ist kein Vasall von dir. -NotAtWarWith Du bist nicht im Krieg mit %s. -NotAVassalOfAFaction Du bist nicht Vasall einer Faction. -NotEnoughArgumentsDesignatedSingleQuotesRequired Nicht genügend Argumente angegeben. Muss in einfachen Anführungszeichen angegeben werden. -NotTheOwnerOfThisBlock Du bist nicht Besitzer dieses Blocks -NotTheOwnerOfThisFaction Du bist nicht der Anführer dieser Faction. -NoVassalOrLiegeReferences Es gab keine Verweise auf Vasallen oder Lehnsherren, die mit dieser Fraktion verbunden waren. -NowBypassingProtections Du umgehst gerade Protections von Medieval Factions -NowSpeakingInFactionChat Du schreibst jetzt im Faction Chat -OnlyPlayersCanUseCommand Du musst ein Spieler sein um diesen Command zu exekutieren. -OnlyUseLeversInClaimedTerritory Fehler: Kann nur Hebel im beanspruchten Gebiet verwenden. -Owner Besitzer: %s -OwnershipTransferred Du wurdest zum Anführer der Faction %s ernannt. -OwnerShipTransferredTo Eigentum an %s übertragen -PermissionNeeded Sorry. Um diesen Command zu benutzen benötigst du die folgende Permission: %s -PlayerAlreadyDueling %s duelliert sich bereits mit jemand anderem. -PlayerAlreadyInFaction Dieser Spieler ist bereits in einer Faction, sorry. -PlayerAlreadyOfficer Dieser Spieler ist bereits ein Officer. -PlayerAndDesiredPowerSingleQuotesRequirement Spieler und gewünschte Kraft müssen in einfachen Anführungszeichen angegeben werden. -PlayerByNameNotFound Sorry. Der Spieler mit dem Namen %s wurde nicht gefunden. -PlayerCantBePromotedBecauseOfLimit Spieler kann nicht befördert werden, da du das Limit erreicht hast. Limit: %d -PlayerDemoted Spieler degradiert. -PlayerIsNotInAFaction Dieser Spieler ist kein Mitglied einer Faction. -PlayerIsNotInYourFaction Dieser Spieler ist nicht Mitglied deiner Faction. -PlayerIsNotMemberOfFaction Dieser Spieler ist kein Member deiner Faction. -PlayerIsNotOfficerOfFaction Dieser Spieler ist nicht Officier deiner Faction. -PlayerNotFound Spieler nicht gefunden. -PlayerPowerRecordsLoaded Spielerleistungsaufzeichnungen geladen. -PlayerPromoted Spieler wurde befördert. -PleaseWaitGate Dieses Tor ist %s, bitte warten. -PluginDisabled Medieval Factions plugin deaktiviert. -PluginDisabling Medieval Factions plugin deaktivieren .... -PluginEnabled Medieval Factions plugin aktiviert. -PluginEnabling Medieval Factions plugin aktivieren .... -PluginLoading Medieval Factions plugin wird geladen... -PluginSaving Medieval Factions plugin speichert... -Point1PlacementSuccessful Tor 1/4 erstellen: Punkt 1 erfolgreich platziert.' -Point2PlacedSuccessfully Gate 2/4 erstellen: Punkt 2 erfolgreich platziert. -Population Bevölkerung: %d -PowerHasDecayed Ihre Leistung ist seit Ihrer letzten Abmeldung um %d gesunken. Deine Macht ist jetzt %d. -PowerLevel Leistungsstufe: %s -PowerLevelHasBeenSetTo Die Leistungsstufe dieses Spielers wurde auf %d . eingestellt -PowerLevelHasIncreased Dein Powerlevel hat sich erhöht. -PowerLevelResetting Zurücksetzen der Leistungsstufe... -PrefixesDisabled Präfixes sind gerade disabled. -PrefixSet Präfix gesetzt. -PrefixTaken Dieser Präfix befindet sich bereits in Nutzung. -ProblemLoadingClaimedChunks Ein Problem ist beim Laden der geclaimten Chunks aufgetreten. -ProblemLoadingFactions Ein Problem ist beim Laden der Factions aufgetreten. -ProblemLoadingPowerRecords Ein Problem ist beim Laden der Spielerpowerrekorde entstanden. -PromotedToOfficer Du wurdest zum Officer deiner Faction befördert. -RadiusRequirement Der Radius muss zwischen 0 und %d liegen. -RemovedGate Tor '%s' entfernt. -ResettingIndividualPowerRecords Zurücksetzen einzelner Leistungsdatensätze. -RightClickCheckAccess Rechtsklicke einen gelockten Block um herauszufinden, wem er gehört. Tippe '/mf checkaccess cancel' um diese Aktion abzubrechen. -RightClickForceUnlock Rechtsklicke eine Truhe oder eine Tür um sie allmächtig zu unlocken (Tippe /mf force unlock cancel um abzubrechen) -RightClickGrantAccess Klicken Sie mit der rechten Maustaste auf eine Truhe oder Tür, um %s Zugriff zu gewähren. Geben Sie /mf grantaccess cancel ein, um dies abzubrechen. -RightClickLock Rechtsklicke eine Tür oder eine Truhe um sie zu locken (Tippe /Mf lock cancel um to cancel) -RightClickRevokeAccess Rechtsklicke einen gelockten Block um den Zugriff eines Spielers zu entfernen (Tippe /Mf revokeaccess cancel um die Aktion abzubrechen) -RightClickUnlock Rechtsklicke eine Truhe oder eine Tür um sie zu unlocken (Tippe /mf unlock cancel um abzubrechen) -SchedulingHourlyAutoSave Stündliches automatisches Speichern planen... -SchedulingPowerDecrease Leistungsabnahme planen... -SchedulingPowerIncrease Leistungserhöhung planen... -SingleQuotesAlliedWarring Alliierte Fraktion und kriegerische Fraktion müssen in einfachen Anführungszeichen angegeben werden. -StringSet Zeichenfolge eingestellt. -SubCommands Unterbefehle: -SuccessFactionMemberRemoval Erfolg. Falls der Spieler in einer Faction war ist er kein Member mehr. -SuccessForceJoin Erfolg. Der Spieler wurde der Faction zugefügt. -SuccessfulDisbandment %s wurde erfolgreich gelöscht. -SuccessOfficerRemoval Falls der Spieler Officer in einer Faction war, wurde er erfolgreich degradiert. -SuccessReferencesRemoved referenzen wurden erfolgreich entfernt. -SupportedLanguageIDList Unterstützte Sprachen IDs: %s -SurroundedChunkProtected Die Zielfraktion hat die Brocken im Norden, Osten, Süden und Westen dieses Brockens beansprucht. Es kann nicht erobert werden. -TargetBlockNotPartOfGate Der Zielblock ist nicht Teil eines Gates. -TargetFactionNotOverClaiming Die Zielfraktion hat nicht mehr Land als ihre Herrschaftsgrenze. -TeleportingAlert Teleportieren in 3 Sekunden... -ThreeBlockRequirement Fehler beim Platzieren von Punkt 2: Tor muss 3 Blöcke oder höher sein. -TriggerBlockNotLever Triggerblock war kein Hebel. Gate-Platzierung storniert. -UsageAddLaw Verwendung: /mf addlaw (neues Gesetz) -UsageAlly Verwendung: /mf ally (Fraktionsname) -UsageBreakAlliance Verwendung: /mf breakalliance (Fraktionsname) -UsageClaimRadius Usage: /mf claim (radius) -UsageConfigSet Verwendung: /mf config set (Option) (Wert) -UsageConfigShow Verwendung: /mf config show ( 1 | 2 ) -UsageCreate Verwendung: /mf create [fraktionsname] -UsageDeclareWar Verwendung: /mf declarewar (Fraktionsname) -UsageDemote Verwendung: /mf demote (Spielername) -UsageDesc Verwendung: /mf desc (Beschreibung) -UsageEditLaw Verwendung: /mf editlaw (Nummer) (bearbeitetes Gesetz) -UsageFlagsSet Verwendung: /mf Flags set (Option) (Wert) -UsageForceBonusPower Verwendung: /mf force bonuspower 'faction' 'number' -UsageForceClaim Verwendung: /mf force claim 'Fraktionsname' -UsageForceCreate Verwendung: /mf force create 'factionName' -UsageForceDemote Verwendung: /mf force demote (Spieler) -UsageForceFlag Verwendung: /mf force flag 'fraktion' 'option' 'wert' -UsageForceJoin Verwendung: /mf force join 'player' 'faction' -UsageForceKick Verwendung: /mf force kick (Spieler) -UsageForcePeace Verwendung: /mf force peace 'faction-1' 'faction-2' -UsageForcePower Verwendung: /mf force power 'player' 'number' -UsageForceRemoveVassal /mf force removevassal 'faction-1' 'faction-2' -UsageForceRename Verwendung: /mf force rename 'faction' 'neuer Name' -UsageForceRenounce Verwendung: /mf force renounce 'faction' -UsageForceTransfer Verwendung: /mf force transfer 'factionName' 'player' -UsageGrantAccess Verwendung: /mf grantaccess (Spielername) -UsageGrantIndependence Verwendung: /mf grantindependence (Fraktionsname) -UsageInvite Verwendung: /mf invite (Spielername) -UsageInvoke Verwendung: /mf invoke '(Name der verbündeten Fraktion)' '(kriegsführende Fraktion)' -UsageJoin Verwendung: /mf join (fraktionsname) -UsageKick Verwendung: /mf kick (Spielername) -UsageMakePeace Verwendung: /mf makepeace (Fraktionsname) -UsagePrefix Verwendung: /mf prefix (neues Präfix) -UsagePromote Verwendung: /mf promote (Spielername) -UsageRemoveLaw Verwendung: /mf removelaw (Nummer) -UsageRename Verwendung: /mf rename (neuer Name) -UsageRevokeAccess Verwendung: /mf revokeaccess (Spielername) -UsageSwearFealty Verwendung: /mf swearfealty (Fraktionsname) -UsageTransfer Verwendung: /mf transfer (Spielername) -UsageVassalize Verwendung: /mf vassalize (Fraktionsname) -UsageWho Verwendung: /mf who (Spielername) -ValidSubCommandsShowSet Gültige Unterbefehle: show, set -VassalContribution Bonuskraft von Vasallen: %d -Vassals Vasallen: %s -WarningPlayerAlreadyStartedCreatingGate WARNUNG: Der Spieler hat bereits damit begonnen, das Tor zu erstellen. startCreatingGate()-Aufruf ignoriert. -WasntFound %s wurde nicht gefunden -WelcomeBackLastLogout Willkommen zurück %s. Du hast dich zuletzt vor %s ausgeloggt. -WikiLink Wiki: https://github.com/dmccoystephenson/Medieval-Factions/wiki -Wilderness Wildnis -WorldsMismatch1 Fehler beim Platzieren von Punkt 1: Welten-Mismatch. +AcceptedChallengeDuelHasBegun Du hast die Herausforderung von %s angenommen, das Duell hat begonnen. +AlertAccessGrantedTo Zugriff auf %s gewährt +AlertAccessRevokedFor Zugriff für %s widerrufen +AlertAllianceHasBeenBroken %s hat deine Allianz deiner Fraktion gebrochen. +AlertAlreadyAtWarWith Deine Fraktion befindet sich bereits im Krieg mit%s. +AlertAlreadyCreatingGate Du erstellst bereits ein Gate. +AlertAlreadyDueling Du bist bereits in einem Duell +AlertAlreadyDuelingPlayer Du duellerist dich bereits mit %s +AlertAlreadyDuelingSomeone Du duellierst dich schon mit jemandem. +AlertAlreadyGrantingAccess Du gewährst bereits jemandem Zugriff. Gebe / mf grantaccess cancel ein, um dies abzubrechen. +AlertAlreadyInFaction Du bist schon in einer Fraktion, sorry. +AlertAlreadyRequestedAlliance Du hast bereits ein Bündnisangebot an diese Faction gesendet. +AlertAlreadyRequestedPeace Du hast bereits ein Friedensangebot an diese Faction gesendet. +AlertAttemptedAlliance %s hat versucht sich mit %s zu verbünden +AlertAttemptedVassalization %s hat versucht, deine Fraktion zu vassalisieren. Wenn du der Eigentümer bist, gebe '/mf swearfealty %s' ein, um zu akzeptieren. +AlertBeenInvited Du wurdest zu %s eingeladen. Gebe /mf join %s ein, um beizutreten. +AlertCalledToWar1 %s hat deine Fraktion in ihren Krieg mit %s gerufen. +AlertCalledToWar2 %s hat %s in den Krieg mit deiner Faction gerufen. +AlertCalledToWar3 +Deine Fraktion hat %s in deinen Krieg mit %s gerufen. +AlertChallengedToDuel +%s hat %s zu einem Duell herausgefordert. +AlertChallengedToDuelPlusHowTo %s hat dich zu einem Duell herausgefordert. Typ /mf duell akzeptieren, um zu beginnen. + +AlertChallengeIssued +Du hast %s zu einem Duell herausgefordert. +AlertChallengeWasAccepted %s hat deine Herausforderung angenommen, das Duell hat begonnen. +AlertChangedGateName Der Gate-Name wurde in '% s' geändert. +AlertCurrentPowerLevel Deine aktuelles Power Level ist% d /% d. +AlertDecreasingThePowerOfInactivePlayers Medieval Factions verringert die Power jedes Spielers um %d, wenn sie seit mehr als%d Minuten nicht mehr online waren. Dies geschieht alle %d Minuten. +AlertDemotion Du wurdest in deiner Fraktion zum Mitgliedsstatus herabgestuft. +AlertDisbandmentDueToZeroPower Deine Fraktion wurde aufgelöst, weil deine kumulative Power Null erreicht hat. +AlertFactionAttemptedToVassalize Deine Fraktion hat versucht, %s zu vassalisieren. +AlertFactionHasBeenVassalized Deine Fraktion wurde vassalisiert und hat einen neuen Lehnsherrn: %s +AlertFactionHasNewVassal Deine Fraktion hat einen neuen Vasallen: %s +AlertFactionHomeRemoved Dein Factionhome wurde entfernt. +AlertFactionIsWeakened Deine Faction hat weniger als die Häflte der Max-Power. Sie wird keinen Bonus Power von ihren, jetzt unabhängigen, Vasallen mehr bekommen. +AlertForcedDemotion +Du wurdest in deiner Fraktion gewaltsam vom Offiziersstatus herabgestuft. +AlertForcedKick +Du wurdest gewaltsam aus deiner Fraktion geworfen. +AlertForcedLoad Medieval Factions wurde zum Laden gezwungen. +AlertForcedSave Medieval Factions wurde gezwungen zu speichern. +AlertForcedToJoinFaction Du wurdest gezwungen, einer Fraktion beizutreten. +AlertGate Das ist das '%s' Tor. +AlertGrantedIndependence %s hat deiner Fraktion Unabhängigkeit gewährt. +AlertIncreasingThePowerOfEveryPlayer +Medieval Factions erhöht die Power jedes Spielers um %d. Dies geschieht alle %d Minuten. +AlertJoinedFaction Du bist der Fraktion beigetreten. +AlertKicked Du wurdest von %s aus deiner Fraktion geworfen. +AlertLandClaimed Land beansprucht. Herrschaftsgröße: %d/%d +AlertLandConqueredFromAnotherFaction Land erobert von %s. Größe deiner Faction: %d%d +AlertLandConqueredFromYourFaction %s hat Land von deiner Fraktion erobert. +AlertLeftFaction Du hast deine Fraktion verlassen. +AlertLeftFactionAndItGotDeleted Du hast deine Faction verlassen. Sie wurde gelöscht, da sie nun keine Mitglieder mehr hat +AlertMoreClaimedChunksThanPower Deine Fraktion hat mehr geclaimte Chunks als Power. Dein Land kann erobert werden. +AlertMustBeAtWarToConquer Beide Fraktionen müssen sich im Krieg befinden, damit du Land erobern kannst. +AlertMustBeInFactionToUseCommand Du musst in einer Faction sein um diesen Command zu benutzen +AlertMustBeMemberToCreateGate Du musst Member der Faction sein um ein Gate zu erstellen +AlertMustBeOfficerOrOwnerToClaimLand Du musst entweder Vizeanführer- oder Anführer sein um Land zu claimen +AlertMustBeOwnerOrOfficerToCreateGate Du musst Faction Owner oder Vizeanführer sein um ein Gate zu erstellen +AlertMustBeOwnerOrOfficerToUseCommand Du musst Anführer oder Vizeanführer einer Faction sein um diesen Command zu benutzen +AlertMustBeOwnerToInvokeAlliance Du musst Anführer einer Faction sein um eine Allianz zu beschließen! +AlertMustBeOwnerToUseCommand Du musst Anführer einer Faction sein um diesen Command zu nutzen +AlertMustKickAllPlayers Du musst alle Spieler aus der Faction kicken, bevor du sie löschen kannst! +AlertNoGatesDefined Deine Faction hat keine eigenen Gates. +AlertNoLaws Deine Faction hat keine eigenen Regeln +AlertNoLongerVassalFaction %s ist nicht mehr Vasall deiner Faction +AlertNonOwnership Das gehört dir nicht! +AlertNoPendingChallenges Du hast keine anstehenden Herausforderungen, die du abbrechen kannst +AlertNotAllied Deine Faction ist in keinem Bündnis mit %s +AlertNotBeenChallenged Du hast keine ausstehenden Duellherausforderungen mehr +AlertNotBeenChallengedByPlayer Du wurdest nicht zu einem Duell mit %s herausgefordert +AlertNotInFaction Du bist in keiner Faction! +AlertNotInvitedToFaction Du bist nicht in diese Faction eingeladen worden. +AlertNotOfferedVassalizationBy Du hast kein Angebot um Vasall dieser Faction zu werden +AlertNowAlliedWith Dein Faction hat jetzt ein Bündnis mit %s +AlertNowAtPeaceWith %s steht nun wieder im Frieden mit %s. +AlertPlayerAlreadyOwner Dieser Spieler ist bereits der Anführer dieser Faction! +AlertPlayerNotInFaction Dieser Spieler ist nicht in dieser Faction +AlertPowerLevelDecreased Dein Powerlevel ist gesunken +AlertPowerLevelIncreasedBy Du fühlst dich wieder stärker. Dein Powerlevel ist auf %d gestiegen. +AlertReachedDemesne Du hast das Limit der Menge von Land erreicht. Lade mehr Spieler ein um dieses Limit anzuheben. +AlertUnlocked Entsperrt. +AlertUnlockingCancelled Entsperrung abgebrochen. +AllianceBrokenWith Die Allianz mit %s wurde gebrochen +AlliedWith Verbündet mit: %s +AllLandUnclaimed All dein Land wurde unclaimed +AllLandUnclaimedFrom Alles Land von %s wurde unclaimed +AlreadyEnteredCheckAccess Du hast diesen Command bereits durchgeführt. Tippe "/mf checkaccess cancel' um ihn abzubrechen +AlreadyEnteredRevokeAccess Du hast diesen Command bereits durchgeführt. Tippe /mf revokeacces cancel um ihn zurückzuziehen +AlreadyInFaction Sorry, du bist bereits in einer Faction. Verlasse sie um eine neue zu erstellen +ArgumentMustBeNumber Das Argument muss eine Zahl sein. +ArgumentsSingleQuotesRequirement Argumente müssen in einfachen Anführungszeichen angegeben werden. +AssignedToRandomFaction Du wurdest einer zufälligen Faction zugeordnet +AttemptedAlliance Bündnisangebot an %s gesendet +AttemptedPeace Friedensangebot an %s gesendet +AtWarWith Im Krieg mit. %s +AutoclaimToggled Autoclaim aktiviert. +BlockAlreadyLocked Dieser Block ist bereits gesichert +BlockIsNotLocked Dieser Block ist noch nicht gesichert +BlockIsPartOfGateMustRemoveGate Dieser Block ist Teil von Gate '%s'. Du musst zuerst das Gate removen! +BonusPower Bonus Power von Admins: %d +BooleanSet Boolean gesetzt +Cancelled Abgebrochen +CancelledGatePlacement1 Error beim Platzieren von Point 1. Gate Placement wurde abgebrochen +CancelledGatePlacement2 Error beim Platzieren von Point 2. Gate Placement abgebrochen +CancelledGatePlacementErrorLinking Fehler beim Verbinden mit Hebel. Gate Placement wurde gecancelled. +CannotAllyWithSelf Du kannst dich nicht mit deiner eigenen Faction verbünden. +CannotAttackFactionMember Du kannst niemanden aus deiner eigenen Faction angreifen. +CannotAttackNonWarringPlayer Du kannst keinen Spieler aus einer anderen Faction angreifen, wenn eure Factions nicht gegenseitig im Krieg stehen +CannotBreakAllianceWithSelf Du kannst keine Allianz mit deiner eigenen Faction brechen +CannotBringNeutralFactionIntoWar Du kannst keine neutralen Factions in den Krieg bringen +CannotCancelActiveDuel Du kannst kein aktives Duell abbrechen +CannotDeclareWarIfLiegeNotWeakened Sie können dieser Fraktion keinen Krieg erklären, da sie Vasallen sind, es sei denn, ihr Lehnsherr ist geschwächt. +CannotDeclareWarIfNeutralFaction Neutrale Factions können keinen Krieg erklären. +CannotDeclareWarOnAlly Du kannst keinem deiner Verbündeten den Krieg erklären +CannotDeclareWarOnLiege Du kannst keinen Krieg an deinen Lehnsherren erklären. Benutze stattdessen /mf declareindepence +CannotDeclareWarOnNeutralFaction Du kannst keinen Krieg an eine neutrale Faction erklären +CannotDeclareWarOnVassal Du kannst keinen Krieg an deinen eigenen Vasallen erklären +CannotDeclareWarOnYourself Du kannst dir nicht selbst den Krieg erklären +CannotDemoteSelf Du kannst dich nicht selbst degradieren +CannotDuelSelf Du kannst dich nicht mit dir selbst duellieren +CannotFindDynmap Dynmap wurde nicht gefunden +CannotForciblyKickOwner Du kannst nicht gewaltsam den Anführer aus seiner eigenen Faction kicken. Versuche die Faction zu löschen. +CannotGrantAccessToSelf Du kannst dir nicht selbst Zugriff gewähren +CannotKickOwner Du kannst nicht den Anführer kicken. +CannotKickSelf Du kannst dich nicht selbst kicken. +CannotMakePeaceWithSelf Du kannst nicht mit deiner eigenen Faction Frieden schließen. +CannotPlaceChestsNextToUnownedLockedChests Du kannst keine Truhe neben einer fremden, gelockten Truhe platzieren. +CannotPlaceHoppersNextToUnownedLockedChests Du kannst keine Trichter neben, unter oder über einer gelockten Kiste platzieren, die dir nicht gehört. +CannotPromoteSelf Du kannst dich nicht selbst befördern. +CannotRevokeAccessFromSelf Du kannst deinen eigenen Zugang nicht entfernen +CannotSetFactionHomeInWilderness Du kannst dein Faction-Home auf kein Land setzen, das nicht deiner Faction gehört +CannotSetVersion Version kann nicht eingestellt werden. +CannotTransferToSelf Du kannst die Ownerschaft deiner Faction nicht an dich selbst übergeben. +CannotVassalizeLiege Du kannst deinen eigenen Lehnsherren nicht vasallisieren. +CannotVassalizeSelf Du kannst deine eigene Faction nicht vassalieren. +CannotVassalizeVassal Du kannst eine Faction nicht vassalisieren, wenn sie bereits einen Lehnsherren hat +CanOnlyCreateGatesInClaimedTerritory Du kannst Gates nur auf, zu deiner Faction gehörendem, Territorium erstellen. +CanOnlyLockBlocksInClaimedTerritory Du kannst Blöcke nur auf Land deiner Faction locken. +CanOnlyLockInFactionTerritory Du kannst nur Dinge auf dem Land deiner eigenen Faction locken. +CanOnlyLockSpecificBlocks Du kannst nur Truhen, Türen, Fässer, Falltüren, Öfen, Ambosse und Gates locken. +ClaimedChunksLoaded Geclaimte chunks geladen. +ClaimedChunksSuccessfullyLoaded Geclaimte chunks wurden erfolgreich geladen. +ClickOnTriggerLever Klicke auf den Hebel +ClickToPlaceSecondCorner Klicke, um die zweite Ecke zu platzieren +CmdAddLaw addlaw +CmdAlly ally +CmdAutoClaim autoclaim +CmdBreakAlliance breakalliance +CmdBypass bypass +CmdChat chat +CmdCheckAccess checkacess +CmdCheckClaim checklaim +CmdClaim claim +CmdConfig config +CmdConfigSet set +CmdConfigShow show +CmdCreate create +CmdDeclareIndependence declearindependence +CmdDeclareWar declearwar +CmdDemote demote +CmdDesc desc +CmdDisband disband +CmdDuel duel +CmdDuelAccept accept +CmdDuelCancel cancel +CmdDuelChallenge challenge +CmdEditLaw editlaw +CmdFlags flags +CmdFlagsSet set +CmdFlagsShow show +CmdForce force +CmdForceBonusPower bonuspower +CmdForceClaim claim +CmdForceCreate create +CmdForceDemote demote +CmdForceFlag flag +CmdForceJoin join +CmdForceKick kick +CmdForceLoad load +CmdForcePeace peace +CmdForcePower power +CmdForceRename rename +CmdForceRenounce renounce +CmdForceSave save +CmdForceTransfer transfer +CmdForceUnlock unlock +CmdGate gate +CmdGateCancel cancel +CmdGateCreate create +CmdGateList list +CmdGateName name +CmdGateRemove remove +CmdGrantAccess grantaccess +CmdGrantIndependence grantindependence +CmdHelp help +CmdHome home +CmdInfo info +CmdInvite invite +CmdInvoke invoke +CmdJoin join +CmdKick kick +CmdLaws laws +CmdLeave leave +CmdList list +CmdLock lock +CmdMakePeace makepeace +CmdMembers members +CmdPower powers +CmdPrefix prefix +CmdPromote promote +CmdRemoveLaw removelaw +CmdRename rename +CmdResetPowerLevels resetpowerlevels +CmdRevokeAccess revokeaccess +CmdSetHome sethome +CmdSwearFealty swearfealty +CmdTransfer transfer +CmdUnclaim unclaim +CmdUnclaimall unclaimall +CmdUnlock unlock +CmdVassalize vassalize +CmdVersion version +CmdWho who +CommandCancelled Command abgebrochen. +CommandNotRecognized Medieval Faction erkennt diesen Command nicht an. +CommandsPage1 == Medieval Factions Seite 1/%d == +CommandsPage2 == Medieval Factions Seite 2/%d == +CommandsPage3 == Medieval Factions Seite 3/%d == +CommandsPage4 == Medieval Factions Seite 4/%d == +CommandsPage5 == Medieval Factions Seite 5/%d == +CommandsPage6 == Medieval Factions Seite 6/%d == +CommandsPage7 == Medieval Factions Seite 7/%d == +ConfigListPageOne ===== Konfigurationsliste Seite 1/2 ===== +ConfigListPageTwo ===== Konfigurationsliste Seite 2/2 ===== +CreatingGateCancelled Gate erstellen abgebrochen. +CreatingGateClickWithHoe Creating Gate. Klicke mit einer Goldhacke auf einen Block um den ersten Punkt auszuwählen +CuboidDisallowed1 Fehler beim Platzieren von Punkt 1: Du kannst keinen Quader platzieren. +CuboidDisallowed2 Fehler beim Platzieren von Punkt 2: Sie können keinen Quader platzieren. +CurrentLanguageID Current Language ID: %s +CurrentlyNoFactions Es gibt gerade keine Factions. +CurrentPowerLevel %s' derzeitiger Power Level ist %d/%d. +Defeated %s hat %s in einem Duell besiegt. +DemesneSize Herrschaftsgröße: %d/%d +Description Descrption +DescriptionSet Description gesetzt. +DesignatedFactionNotFound Eine der benannten Factions wurde nicht gefunden. +DesiredPowerMustBeANumber Gewünschter Power muss eine Zahl sein. +DeveloperList Entwickler: %s +DisbandmentDueToZeroPower %s wurde gelöscht, da der Powerlevel final 0 erreicht hat. +DoesntExist %s existiert nicht. +Done Done. +DoubleSet Double gesetzt. +DuelChallengeCancelled Duell Challenge abgebrochen. +DuelEndedInTie Das Duell von %s und %s ist in einem Unentschieden geendet. +DynmapIntegrationSuccessful Dynmap intergration wurde erfolgreich ausgeführt +ERROR ERROR +ErrorAddingAreaMarker Error beim setzen der Marker Area %s +ErrorChunkRemoval Ein Fehler ist während des Entfernens der geclaimten Chunks aufgetreten. +ErrorClaimedChunkRemoval Ein Fehler ist während des Entfernens der geclaimten Chunks aufgetreten. +ErrorCouldNotFindGatesFaction Error: Konnte Faction für gate '%s' nicht finden. +ErrorCouldNotLoadFactionGate Error: Konnte Faction Gate \n nicht laden. +ErrorCreatingMarkerSet Fehler beim Erstellen der Markierung. +ErrorIntegratingWithDynmap Fehler bei der Integration mit dynmap: +ErrorPlayerPowerRecordForUUIDNotFound ERROR: Die Poweraufzeichnung des Spielers für die uuid wurde nicht gefunden. Das kumulative Power Level konnte nicht abgerufen werden. +ErrorSettingAreaMarkerColor Fehler beim Setzen der Bereichsmarkierungsfarbe auf '%s'. +FactionAlreadyAlly Diese Fraktion ist bereits dein Verbündeter. +FactionAlreadyExists Sorry. Diese Faction existiert bereits. +FactionAndPlayerSingleQuotesRequirement Fraktion und Spieler müssen in einfachen Anführungszeichen angegeben werden. +FactionAndVassalSingleQuotesRequirement Fraktion und Vasall, die entfernt werden sollen, müssen in einfachen Anführungszeichen angegeben werden. + +FactionCreated Faction erstellt. +FactionCurrentlyEnemyMustMakePeace Diese Faction ist im Moment dein Feind. Schließe zuerst Frieden, bevor du dich mit ihnen verbündest. +FactionDataLoadedSuccessfuly Faction Data wurde erfolgreich geladen. +FactionDoesNotExist Sorry, diese Faction existiert nicht +FactionDoesNotHaveLaws Diese Faction hat keine eigenen Gesetze. +FactionGates Faction Gates. +FactionHomeLoadError Ein Fehler ist beim Laden der Koordinaten des Faction-Homes aufgetreten. +FactionHomeNotSetYet Das Faction-Home wurde noch nicht gesetzt. +FactionHomeSet Faction Home gesetzt. +FactionInfo %s Fraktionsinfo +FactionIsNotVassal Diese Faction ist kein Vasall von dir. +FactionMustBeDesignatedInsideSingleQuotes Fraktion muss in einfachen Anführungszeichen angegeben werden. +FactionNameChanged Faction Name wurde geändert +FactionNameNotRecognized Dieser Factionnname ist nicht erkannt. +FactionNameTooLong Dieser Name ist zu lang. +FactionNotEnemy Diese Faction ist nicht dein Enemy. +FactionNotFound Diese Faction wurde nicht gefunden. +FactionsSuccessfullyLoaded Factions wurden erfolgreich geladen +FactionsTitle == Fraktionen == +FactionSuccessfullyDisbanded Fraktion erfolgreich aufgelöst. +FactionSuccessfullyLoaded Fraktion erfolgreich geladen. +FileLoadError Ein Fehler ist beim Laden des Files aufgetreten. +FollowingPlayersHaveAccess Auf diesen Block haben folgende Spieler Zugriff: +GateCreated Tor erfolgreich erstellt. +HasAttemptedToMakePeaceWith %s hat versucht, mit %s Frieden zu schließen. +HasBeenKickedFrom %s wurde aus Faction %s gekickt +HasDeclaredIndependence %s hat den Vasallenvertrag mit %s aufgekündigt! +HasDeclaredWarAgainst %s hat %s den Krieg erklärt. +HasJoined %s ist der Faction %s beigetreten +HelpAddLaw /mf addlaw - Addet ein Gesetz zu deiner Faction. +HelpAlly /mf ally - Sendet ein Bündnisangebot an eine fremde Faction. +HelpAutoclaim /mf autoclaim - Aktiviert Autoclaim - macht Landclaiming leichter. +HelpBreakAlliance /mf breakalliance - Bricht eine Allianz mit einer Faction. +HelpBypass /mf bypass – umgehungsschutz. +HelpChat /mf chat - Aktiviert den Faction Chat +HelpCheckAccess /mf checkaccess - Checkt wer Zugriff auf einen gelockten Block hat. +HelpCheckClaim /mf checkclaim - Checkt ob das Land geclaimt ist. +HelpClaim /mf claim - Claimt Land für deine Faction +HelpConfigSet /mf config set (option) (value) - Setzt einen Config Wert. +HelpConfigShow /mf config show - Zeigt die Werte in der Config an. +HelpCreate /mf create - Erstellt eine neue Faction. +HelpDeclareIndependence /mf declareindepence - Erklärt die Unabhängikeit zu deinem Lehnsherren. +HelpDeclareWar /mf declarewar - Erklärt einer anderen Faction den Krieg. +HelpDemote /mf demote - Degradiert einen Officer zum Member. +HelpDesc /mf desc - Setzt die Description deiner Faction. +HelpDisband /mf disband - Löscht deine Faction (Du musst Anführer sein um diese Aktion durchzuführen) +HelpDuelAccept /mf duel accept (Spieler) +HelpDuelCancel /mf duel cancel +HelpDuelChallenge /mf duel challenge (Spieler) (Zeitlimit in Sekunden) +HelpEditLaw /mf editlaw - Bearbeitet ein bereits existierendes Gesetz in deiner Faction. +HelpFlagsSet /mf flags set (Option) (Wert) - Setzt ein Fraktionsflag. +HelpFlagsShow /mf flags show - Zeigt die Faction Flags +HelpForce /mf force - Zwingt das Plugin eine bestimmte Aktion auszuführen +HelpForceBonusPower /mf force bonuspower 'Fraktion' 'Zahl' +HelpForceClaim /mf force claim 'Fraktionsname' +HelpForceCreate /mf force create 'Fraktionsname' +HelpForceDemote /mf force demote (Spieler) +HelpForceFlag /mf force flag 'fraktion' 'option' 'wert' +HelpForceJoin /mf force join 'Spieler' 'Fraktion' +HelpForceKick /mf force kick (Spieler) +HelpForceLoad /mf force load +HelpForcePeace /mf force peace 'fraktion1' 'fraktion2' +HelpForcePower /mf force power 'Spieler' 'Nummer' +HelpForceRemoveVassal /mf force removevassal 'Fraktion' 'Vasall' +HelpForceRename /mf force rename 'Fraktion' 'neuer Name' +HelpForceRenounce /mf force renounce (Spieler) +HelpForceSave /mf force save +HelpForceTransfer /mf force transfer 'Fraktion' 'Spieler' +HelpForceUnlock /mf force unlock +HelpGateCancel /mf gate cancel +HelpGateCreate /mf gate create (name) +HelpGateList /mf gate list +HelpGateName /mf gate name (name) +HelpGateRemove /mf gate remove +HelpGrantAccess /mf grantaccess - Gewähren Sie jemandem Zugriff auf einen gesperrten Block. +HelpGrantIndependence /mf grantacess - Gewährt jemandem Zugriff auf einen gelockten Block. +HelpHelp /mf grantindependence - Gewährt einer Vasall Faction Unabhängigkeit. +HelpHome /mf home - Teleportiert dich zu deinem Factiomhome. +HelpInfo /mf info - Zeigt die Information deiner oder einer fremden Faction an. +HelpInvite /mf invite - Invitet einen Spieler in deine Faction. +HelpInvoke /mf invoke ally enemy - Ruft eine verbündete Faction in den Krieg +HelpJoin /mf join - Joint einer Faction (Einladung benötigt) +HelpKick /mf kick - Kickt einen Spieler aus deiner Faction. +HelpLaws /mf laws - Zeigt die Gesetze deiner Faction an. +HelpLeave /Mf leave - Verlässt deine derzeitige Faction. +HelpList /mf list - Listet alle Factions auf dem Server. +HelpLock /mf lock - Verschließt eine Truhe oder eine Tür. +HelpMakePeace /mf makepeace - Sendet ein Friedensangebot an eine andere Faction. +HelpMap /mf map - Zeigt eine Map mit den Chunks nahe deiner Location +HelpMembers /mf members - Listet die Member deiner oder einer anderen Faction. +HelpPower /mf power - Checkt deinen Powerlevel +HelpPrefix /mf prefix - Setzt den Präfix deiner Faction. +HelpPromote /mf promote - Berfördert einen Player zum Officer. +HelpRemoveLaw /mf removelaw - Entfernt ein Gesetz aus deiner Faction. +HelpRename /mf rename - Benennt deine Fction um. +HelpResetPowerLevels /mf resetpowerlevels - Setzt den Factionpowerreword und die summierten Factionpowerlevel zurück. +HelpRevokeAccess /mf revokeaccess - Zieht den Zugriff eines bestimmten Spielers auf einen gelockten Block zurück +HelpSetHome /mv sethome - Setzt das home deiner Faction +HelpSwearFealty /mf swearfealty - Setzt deine Faction in Vasallenschaft zi ener anderen +HelpTransfer /mf transfer - Übergibt deine Faction an einen anderen Spieler. +HelpUnclaim /mf unclaim - Unclaimt Land deiner Faction. +HelpUnclaimall /mf unclaimall - Unclaimt all das Land deiner Faction. +HelpUnlock /mf unlock - Unlocket eine Truhe oder eine Tür. +HelpVassalize /mf vassalize - Sendet ein Vassalisierungsangebot an eine Faction. +HelpVersion /mf version - Checkt die Plugin Version. +HelpWho /mf who - Zeigt die Faction eines bestimmten Spielers an. +HomeClaimedByAnotherFaction Home wurde von einer anderen Faction geclaimt und ist somit nicht mehr nutzbar. +HomeIsInUnclaimedChunk Das Home befindet sich auf einem ungeclaimten Chunk und ist deshalb nicht verfügbar. +HourlySaveAlert Medieval Faction speichert gerade. Das passiert jede Stunde. +IntegerSet Integer gesetzt. +InvitationExpired Die Einladung von Faction %s ist abgelaufen. +InvitationSent Die Einladung wurde gesendet. +KeysLoaded Key geladen: %d +LandAlreadyClaimedBy Dieses Land ist bereits geclaimt durch +LandAlreadyClaimedByYourFaction Dieses Land ist bereits durch deine Faction geclaimt. +LandClaimedBy Dieses Land ist durch %s geclaimt. +LandClaimedUsingAdminBypass Land wurde durch den Adminmodus unclaimed. +LandIsNotClaimed Dieses Land ist nicht geclaimt. +LandIsUnclaimed Dieses Land ist frei. +LandNotCurrentlyClaimed Dieses Land ist im Moment nicht geclaimt. +LandUnclaimed Land unclaimed. +LawAdded Gesetz hinzugefügt. +LawEdited Gesetz bearbeitet. +LawRemoved Gesetz gelöscht. +LawsTitle Gesetze von %s +LeverSuccessfullyLinked Erstellen von Gate 4/4: Hebel erfolgreich verbunden. +Liege Liege: %s +ListLegend P: Macht, M: Mitglieder, L: Land +LoadingClaimedChunks Beanspruchte Blöcke werden geladen... +LoadingLockedBLocks Gesperrte Blöcke werden geladen... +LoadingPlayerPowerRecords Spielerleistungsaufzeichnungen werden geladen... +Locked Gesperrt. +LockedBlockSuccessfullyLoaded Gesperrter Block erfolgreich geladen. +LockedBy Gesperrt von %s +LockingCancelled Sperren abgebrochen. +LockRemovalError Beim Entfernen der Sperre ist ein Fehler aufgetreten. +MaterialsMismatch1 Fehler beim Platzieren von Punkt 1: Nicht übereinstimmende Materialien. +MaterialsMismatch2 Fehler beim Platzieren von Punkt 2: Nicht übereinstimmende Materialien. +MedievalFactionsStringRight Medieval-Factions-%s +MedievalFactionsTitle == Medieval Factions %s == +MembersOf Mitglieder von %s +MissingFactionGatesJSONCollection Gates konnten nicht geladen werden, da die Sammlung 'factionGates' nicht in der Fraktions-JSON-Datei vorhanden war. Führen Sie ein Upgrade von einer früheren Version durch? Standardeinstellung. +MovementDetectedTeleportCancelled Bewegung erfasst. Teleport wurde abgebrochen. +MustBeAtWarOrFactionMustBeInactive Muss sich mit der Zielfraktion im Krieg befinden oder die Zielfraktion muss inaktiv sein. +MustBeInFaction Sorry. Du musst in einer Faction sein um diesen Command zu benutzen. +MustBeOwner Sorry. Du musst der Anführer einer Faction sein um diesen Command zu benutzen. +MustOwnFactionOrBeOfficer Du musst entweder Anführer oder Officer einer Faction sein um diesen Command zu benutzen. +MustTransferOwnership Sorry. Du musst die Faction entweder abgeben oder jeden aus der Faction kicken um sie zu verlassen. +Name Name: %s +NameAlreadyTaken Dieser Name wird berets verwendet. +NeutralityDisabled Neutralität ist derzeit deaktiviert. +NoBlockDetectedToCheckForGate Es wurde kein Block erkannt, um nach dem Gate zu suchen. +NoFactionsDesignatedSingleQuotesRequired Keine Fraktionen benannt. Muss in einfachen Anführungszeichen angegeben werden. +NoLongerBypassingProtections Sie umgehen nicht mehr den Schutz von Medieval Factions. +NoLongerInFactionChat Du hast den Faction Chat verlassen. +NotAMemberOfAnyFaction Du hast keine Faction. +NotAnAlly %s ist kein Verbündeter von dir. +NotAnAllyOrVassal %s ist kein Vasall von dir. +NotAtWarWith Du bist nicht im Krieg mit %s. +NotAVassalOfAFaction Du bist nicht Vasall einer Faction. +NotEnoughArgumentsDesignatedSingleQuotesRequired Nicht genügend Argumente angegeben. Muss in einfachen Anführungszeichen angegeben werden. +NotTheOwnerOfThisBlock Du bist nicht Besitzer dieses Blocks +NotTheOwnerOfThisFaction Du bist nicht der Anführer dieser Faction. +NoVassalOrLiegeReferences Es gab keine Verweise auf Vasallen oder Lehnsherren, die mit dieser Fraktion verbunden waren. +NowBypassingProtections Du umgehst gerade Protections von Medieval Factions +NowSpeakingInFactionChat Du schreibst jetzt im Faction Chat +OnlyPlayersCanUseCommand Du musst ein Spieler sein um diesen Command zu exekutieren. +OnlyUseLeversInClaimedTerritory Fehler: Kann nur Hebel im beanspruchten Gebiet verwenden. +Owner Besitzer: %s +OwnershipTransferred Du wurdest zum Anführer der Faction %s ernannt. +OwnerShipTransferredTo Eigentum an %s übertragen +PermissionNeeded Sorry. Um diesen Command zu benutzen benötigst du die folgende Permission: %s +PlayerAlreadyDueling %s duelliert sich bereits mit jemand anderem. +PlayerAlreadyInFaction Dieser Spieler ist bereits in einer Faction, sorry. +PlayerAlreadyOfficer Dieser Spieler ist bereits ein Officer. +PlayerAndDesiredPowerSingleQuotesRequirement Spieler und gewünschte Kraft müssen in einfachen Anführungszeichen angegeben werden. +PlayerByNameNotFound Sorry. Der Spieler mit dem Namen %s wurde nicht gefunden. +PlayerCantBePromotedBecauseOfLimit Spieler kann nicht befördert werden, da du das Limit erreicht hast. Limit: %d +PlayerDemoted Spieler degradiert. +PlayerIsNotInAFaction Dieser Spieler ist kein Mitglied einer Faction. +PlayerIsNotInYourFaction Dieser Spieler ist nicht Mitglied deiner Faction. +PlayerIsNotMemberOfFaction Dieser Spieler ist kein Member deiner Faction. +PlayerIsNotOfficerOfFaction Dieser Spieler ist nicht Officier deiner Faction. +PlayerNotFound Spieler nicht gefunden. +PlayerPowerRecordsLoaded Spielerleistungsaufzeichnungen geladen. +PlayerPromoted Spieler wurde befördert. +PleaseWaitGate Dieses Tor ist %s, bitte warten. +PluginDisabled Medieval Factions plugin deaktiviert. +PluginDisabling Medieval Factions plugin deaktivieren .... +PluginEnabled Medieval Factions plugin aktiviert. +PluginEnabling Medieval Factions plugin aktivieren .... +PluginLoading Medieval Factions plugin wird geladen... +PluginSaving Medieval Factions plugin speichert... +Point1PlacementSuccessful Tor 1/4 erstellen: Punkt 1 erfolgreich platziert.' +Point2PlacedSuccessfully Gate 2/4 erstellen: Punkt 2 erfolgreich platziert. +Population Bevölkerung: %d +PowerHasDecayed Ihre Leistung ist seit Ihrer letzten Abmeldung um %d gesunken. Deine Macht ist jetzt %d. +PowerLevel Leistungsstufe: %s +PowerLevelHasBeenSetTo Die Leistungsstufe dieses Spielers wurde auf %d . eingestellt +PowerLevelHasIncreased Dein Powerlevel hat sich erhöht. +PowerLevelResetting Zurücksetzen der Leistungsstufe... +PrefixesDisabled Präfixes sind gerade disabled. +PrefixSet Präfix gesetzt. +PrefixTaken Dieser Präfix befindet sich bereits in Nutzung. +ProblemLoadingClaimedChunks Ein Problem ist beim Laden der geclaimten Chunks aufgetreten. +ProblemLoadingFactions Ein Problem ist beim Laden der Factions aufgetreten. +ProblemLoadingPowerRecords Ein Problem ist beim Laden der Spielerpowerrekorde entstanden. +PromotedToOfficer Du wurdest zum Officer deiner Faction befördert. +RadiusRequirement Der Radius muss zwischen 0 und %d liegen. +RemovedGate Tor '%s' entfernt. +ResettingIndividualPowerRecords Zurücksetzen einzelner Leistungsdatensätze. +RightClickCheckAccess Rechtsklicke einen gelockten Block um herauszufinden, wem er gehört. Tippe '/mf checkaccess cancel' um diese Aktion abzubrechen. +RightClickForceUnlock Rechtsklicke eine Truhe oder eine Tür um sie allmächtig zu unlocken (Tippe /mf force unlock cancel um abzubrechen) +RightClickGrantAccess Klicken Sie mit der rechten Maustaste auf eine Truhe oder Tür, um %s Zugriff zu gewähren. Geben Sie /mf grantaccess cancel ein, um dies abzubrechen. +RightClickLock Rechtsklicke eine Tür oder eine Truhe um sie zu locken (Tippe /Mf lock cancel um to cancel) +RightClickRevokeAccess Rechtsklicke einen gelockten Block um den Zugriff eines Spielers zu entfernen (Tippe /Mf revokeaccess cancel um die Aktion abzubrechen) +RightClickUnlock Rechtsklicke eine Truhe oder eine Tür um sie zu unlocken (Tippe /mf unlock cancel um abzubrechen) +SchedulingHourlyAutoSave Stündliches automatisches Speichern planen... +SchedulingPowerDecrease Leistungsabnahme planen... +SchedulingPowerIncrease Leistungserhöhung planen... +SingleQuotesAlliedWarring Alliierte Fraktion und kriegerische Fraktion müssen in einfachen Anführungszeichen angegeben werden. +StringSet Zeichenfolge eingestellt. +SubCommands Unterbefehle: +SuccessFactionMemberRemoval Erfolg. Falls der Spieler in einer Faction war ist er kein Member mehr. +SuccessForceJoin Erfolg. Der Spieler wurde der Faction zugefügt. +SuccessfulDisbandment %s wurde erfolgreich gelöscht. +SuccessOfficerRemoval Falls der Spieler Officer in einer Faction war, wurde er erfolgreich degradiert. +SuccessReferencesRemoved referenzen wurden erfolgreich entfernt. +SupportedLanguageIDList Unterstützte Sprachen IDs: %s +SurroundedChunkProtected Die Zielfraktion hat die Brocken im Norden, Osten, Süden und Westen dieses Brockens beansprucht. Es kann nicht erobert werden. +TargetBlockNotPartOfGate Der Zielblock ist nicht Teil eines Gates. +TargetFactionNotOverClaiming Die Zielfraktion hat nicht mehr Land als ihre Herrschaftsgrenze. +TeleportingAlert Teleportieren in 3 Sekunden... +ThreeBlockRequirement Fehler beim Platzieren von Punkt 2: Tor muss 3 Blöcke oder höher sein. +TriggerBlockNotLever Triggerblock war kein Hebel. Gate-Platzierung storniert. +UsageAddLaw Verwendung: /mf addlaw (neues Gesetz) +UsageAlly Verwendung: /mf ally (Fraktionsname) +UsageBreakAlliance Verwendung: /mf breakalliance (Fraktionsname) +UsageClaimRadius Usage: /mf claim (radius) +UsageConfigSet Verwendung: /mf config set (Option) (Wert) +UsageConfigShow Verwendung: /mf config show ( 1 | 2 ) +UsageCreate Verwendung: /mf create [fraktionsname] +UsageDeclareWar Verwendung: /mf declarewar (Fraktionsname) +UsageDemote Verwendung: /mf demote (Spielername) +UsageDesc Verwendung: /mf desc (Beschreibung) +UsageEditLaw Verwendung: /mf editlaw (Nummer) (bearbeitetes Gesetz) +UsageFlagsSet Verwendung: /mf Flags set (Option) (Wert) +UsageForceBonusPower Verwendung: /mf force bonuspower 'faction' 'number' +UsageForceClaim Verwendung: /mf force claim 'Fraktionsname' +UsageForceCreate Verwendung: /mf force create 'factionName' +UsageForceDemote Verwendung: /mf force demote (Spieler) +UsageForceFlag Verwendung: /mf force flag 'fraktion' 'option' 'wert' +UsageForceJoin Verwendung: /mf force join 'player' 'faction' +UsageForceKick Verwendung: /mf force kick (Spieler) +UsageForcePeace Verwendung: /mf force peace 'faction-1' 'faction-2' +UsageForcePower Verwendung: /mf force power 'player' 'number' +UsageForceRemoveVassal /mf force removevassal 'faction-1' 'faction-2' +UsageForceRename Verwendung: /mf force rename 'faction' 'neuer Name' +UsageForceRenounce Verwendung: /mf force renounce 'faction' +UsageForceTransfer Verwendung: /mf force transfer 'factionName' 'player' +UsageGrantAccess Verwendung: /mf grantaccess (Spielername) +UsageGrantIndependence Verwendung: /mf grantindependence (Fraktionsname) +UsageInvite Verwendung: /mf invite (Spielername) +UsageInvoke Verwendung: /mf invoke '(Name der verbündeten Fraktion)' '(kriegsführende Fraktion)' +UsageJoin Verwendung: /mf join (fraktionsname) +UsageKick Verwendung: /mf kick (Spielername) +UsageMakePeace Verwendung: /mf makepeace (Fraktionsname) +UsagePrefix Verwendung: /mf prefix (neues Präfix) +UsagePromote Verwendung: /mf promote (Spielername) +UsageRemoveLaw Verwendung: /mf removelaw (Nummer) +UsageRename Verwendung: /mf rename (neuer Name) +UsageRevokeAccess Verwendung: /mf revokeaccess (Spielername) +UsageSwearFealty Verwendung: /mf swearfealty (Fraktionsname) +UsageTransfer Verwendung: /mf transfer (Spielername) +UsageVassalize Verwendung: /mf vassalize (Fraktionsname) +UsageWho Verwendung: /mf who (Spielername) +ValidSubCommandsShowSet Gültige Unterbefehle: show, set +VassalContribution Bonuskraft von Vasallen: %d +Vassals Vasallen: %s +WarningPlayerAlreadyStartedCreatingGate WARNUNG: Der Spieler hat bereits damit begonnen, das Tor zu erstellen. startCreatingGate()-Aufruf ignoriert. +WasntFound %s wurde nicht gefunden +WelcomeBackLastLogout Willkommen zurück %s. Du hast dich zuletzt vor %s ausgeloggt. +WikiLink Wiki: https://github.com/dmccoystephenson/Medieval-Factions/wiki +Wilderness Wildnis +WorldsMismatch1 Fehler beim Platzieren von Punkt 1: Welten-Mismatch. WorldsMismatch2 Fehler beim Platzieren von Punkt 2: Welten-Mismatch. \ No newline at end of file diff --git a/src/main/resources/en-us.tsv b/src/main/resources/en-us.tsv index 6e9a906bf..7eecef5a8 100644 --- a/src/main/resources/en-us.tsv +++ b/src/main/resources/en-us.tsv @@ -1,551 +1,551 @@ -AcceptedChallengeDuelHasBegun You have accepted %s's challenge, the duel has begun. -AlertAccessGrantedTo Access granted to %s -AlertAccessRevokedFor Access revoked for %s -AlertAllianceHasBeenBroken %s has broken their alliance your faction. -AlertAlreadyAtWarWith Your faction is already at war with %s. -AlertAlreadyCreatingGate You are already creating a gate. -AlertAlreadyDueling You are already dueling. -AlertAlreadyDuelingPlayer You are already dueling %s. -AlertAlreadyDuelingSomeone You are already dueling someone. -AlertAlreadyGrantingAccess You are already granting access to someone. Type /mf grantaccess cancel to cancel this. -AlertAlreadyInFaction You're already in a faction, sorry. -AlertAlreadyRequestedAlliance You've already requested an alliance with this faction. -AlertAlreadyRequestedPeace You've already requested peace with this faction. -AlertAttemptedAlliance %s has attempted to ally with %s. -AlertAttemptedVassalization %s has attempted to vassalize your faction. If you are the owner, type '/mf swearfealty %s' to accept. -AlertBeenInvited You've been invited to %s. Type /mf join %s to join. -AlertCalledToWar1 %s has called your faction into their war with %s. -AlertCalledToWar2 %s has called %s into their war with your faction. -AlertCalledToWar3 Your faction has called %s into your war with %s. -AlertChallengedToDuel %s has challenged %s to a duel. -AlertChallengedToDuelPlusHowTo %s has challenged you to a duel. Type /mf duel accept to begin. -AlertChallengeIssued You have challenged %s to a duel. -AlertChallengeWasAccepted %s has accepted your challenge, the duel has begun. -AlertChangedGateName Changed gate name to '%s'. -AlertCurrentPowerLevel Your current power level is %d/%d. -AlertDecreasingThePowerOfInactivePlayers Medieval Factions is decreasing the power of every player by %d if they haven't been online in over %d minutes. This will happen every %d minutes. -AlertDemotion You have been demoted to member status in your faction. -AlertDisbandmentDueToZeroPower Your faction has been disbanded due to its cumulative power reaching zero. -AlertFactionAttemptedToVassalize Your faction has attempted to vassalize %s. -AlertFactionHasBeenVassalized Your faction has been vassalized and has a new liege: %s -AlertFactionHasNewVassal Your faction has a new vassal: %s -AlertFactionHomeRemoved Your faction home has been removed. -AlertFactionIsWeakened Your faction has less than half of its max power. It will no longer receive bonus power from vassals and your vassals are now vulnerable. -AlertForcedDemotion You were forcibly demoted from officer status in your faction. -AlertForcedKick You were forcibly kicked from your faction. -AlertForcedLoad Medieval Factions has been forced to load. -AlertForcedSave Medieval Factions has been forced to save. -AlertForcedToJoinFaction You were forced to join a faction. -AlertGate That is the '%s' gate. -AlertGrantedIndependence %s has granted your faction independence. -AlertIncreasingThePowerOfEveryPlayer Medieval Factions is increasing the power of every player by %d. This will happen every %d minutes. -AlertJoinedFaction You joined the faction. -AlertKicked You have been kicked from your faction by %s. -AlertLandClaimed Land claimed. Demesne Size: %d/%d -AlertLandConqueredFromAnotherFaction Land conquered from %s. Demesne Size: %d/%d -AlertLandConqueredFromYourFaction %s has conquered land from your faction. -AlertLeftFaction You left your faction. -AlertLeftFactionAndItGotDeleted You left your faction. It was deleted since no one else was a member. -AlertMoreClaimedChunksThanPower Your faction has more claimed chunks than power. Your land can be conquered. -AlertMustBeAtWarToConquer Your factions have to be at war in order for you to conquer land. -AlertMustBeInFactionToUseCommand You must be in a faction to use this command. -AlertMustBeMemberToCreateGate You must be a member of this faction to create a gate. -AlertMustBeOfficerOrOwnerToClaimLand You must be an officer or owner of a faction to claim land. -AlertMustBeOwnerOrOfficerToCreateGate You must be a faction owner or officer to create a gate. -AlertMustBeOwnerOrOfficerToUseCommand You need to be the owner of a faction or an officer of a faction to use this command. -AlertMustBeOwnerToInvokeAlliance You must be the owner of your faction to invoke an alliance. -AlertMustBeOwnerToUseCommand You need to be the owner of a faction to use this command. -AlertMustKickAllPlayers You need to kick all players before you can disband your faction. -AlertNoGatesDefined Your faction has no gates defined. -AlertNoLaws Your faction doesn't have any laws. -AlertNoLongerVassalFaction %s is no longer a vassal faction. -AlertNonOwnership You don't own this. -AlertNoPendingChallenges You have no pending challenges to cancel. -AlertNotAllied Your faction is not allied with %s. -AlertNotBeenChallenged You have not been challenged to a duel by anyone. -AlertNotBeenChallengedByPlayer You have not been challenged to a duel by '%s'. -AlertNotInFaction You're not in a faction. -AlertNotInvitedToFaction You're not invited to this faction. -AlertNotOfferedVassalizationBy You haven't been offered vassalization by this faction. -AlertNowAlliedWith Your faction is now allied with %s. -AlertNowAtPeaceWith %s is now at peace with %s. -AlertPlayerAlreadyOwner That player is already the owner of that faction. -AlertPlayerNotInFaction That player is not in that faction. -AlertPowerLevelDecreased Your power level has decreased. -AlertPowerLevelIncreasedBy You feel stronger. Your power has increased by %d. -AlertReachedDemesne You have reached your demesne limit. Invite more players to increase this. -AlertUnlocked Unlocked. -AlertUnlockingCancelled Unlocking cancelled. -AllianceBrokenWith Alliance has been broken with %s. -AlliedWith Allied With: %s -AllLandUnclaimed All land unclaimed. -AllLandUnclaimedFrom All land unclaimed from %s. -AlreadyEnteredCheckAccess You have already entered this command. Type '/mf checkaccess cancel' to cancel. -AlreadyEnteredRevokeAccess You have already entered this command. Type '/mf revokeaccess cancel' to cancel. -AlreadyInFaction Sorry, you're already in a faction. Leave if you want to create a different one. -ArgumentMustBeNumber Argument must be a number. -ArgumentsSingleQuotesRequirement Arguments must be designated inside single quotes. -AssignedToRandomFaction You have been assigned to a random faction. -AttemptedAlliance Attempted to ally with %s -AttemptedPeace Attempted to make peace with %s -AtWarWith At War With: %s -AutoclaimToggled Autoclaim toggled. -BlockAlreadyLocked This block is already locked. -BlockIsNotLocked That block isn't locked. -BlockIsPartOfGateMustRemoveGate This block is part of gate '%s'. You must remove the gate first. -BonusPower Bonus Power From Admins: %d -BooleanSet Boolean set. -Cancelled Cancelled. -CancelledGatePlacement1 Error placing point 1. Cancelled gate placement. -CancelledGatePlacement2 Error placing point 2. Cancelled gate placement. -CancelledGatePlacementErrorLinking Error linking to lever. Cancelled gate placement. -CannotAllyWithSelf You can't ally with your own faction. -CannotAttackFactionMember You can't attack another player if you are part of the same faction. -CannotAttackNonWarringPlayer You can't attack another player if your factions aren't at war. -CannotBreakAllianceWithSelf You can't break an alliance with your own faction. -CannotBringNeutralFactionIntoWar You cannot bring neutral factions into war. -CannotCancelActiveDuel Cannot cancel an active duel. -CannotDeclareWarIfLiegeNotWeakened You can't declare war on this faction as they are a vassal unless their liege is weakened. -CannotDeclareWarIfNeutralFaction Neutral factions cannot declare war. -CannotDeclareWarOnAlly You can't declare war on your ally. -CannotDeclareWarOnLiege You can't declare war on your liege. Try '/mf declareindependence' instead. -CannotDeclareWarOnNeutralFaction You cannot declare war on a neutral faction. -CannotDeclareWarOnVassal You can't declare war on your own vassal. -CannotDeclareWarOnYourself You can't declare war on yourself. -CannotDemoteSelf You cannot demote yourself. -CannotDuelSelf You cannot duel yourself. -CannotFindDynmap Cannot find dynmap. -CannotForciblyKickOwner Cannot forcibly kick an owner from their faction. Try disbanding the faction. -CannotGrantAccessToSelf You cannot grant access to yourself. -CannotKickOwner You can't kick the owner. -CannotKickSelf You can't kick yourself. -CannotMakePeaceWithSelf You can't make peace with your own faction. -CannotPlaceChestsNextToUnownedLockedChests You can't place chests next to locked chests you don't own. -CannotPlaceHoppersNextToUnownedLockedChests You can't place hoppers next to, under or above locked chests you don't own. -CannotPromoteSelf You cannot promote yourself. -CannotRevokeAccessFromSelf You cannot revoke access from yourself. -CannotSetFactionHomeInWilderness You can't set your faction home on land your faction hasn't claimed. -CannotSetVersion Can't set version. -CannotTransferToSelf You can't transfer ownership of your faction to yourself. -CannotVassalizeLiege You can't vassalize your liege. -CannotVassalizeSelf You can't vassalize your own faction. -CannotVassalizeVassal You can't vassalize a faction who already has a liege. -CanOnlyCreateGatesInClaimedTerritory You can only create gates in claimed territory. -CanOnlyLockBlocksInClaimedTerritory You can only lock blocks on land claimed by your faction. -CanOnlyLockInFactionTerritory You can only lock things in your faction's territory. -CanOnlyLockSpecificBlocks You can only lock chests, doors, barrels, trapdoors, furnaces, anvils or gates. -ClaimedChunksLoaded Claimed chunks loaded. -ClaimedChunksSuccessfullyLoaded Claimed chunks successfully loaded. -ClickOnTriggerLever Click on the trigger lever... -ClickToPlaceSecondCorner Click to place the second corner... -CmdAddLaw addlaw -CmdAlly ally -CmdAutoClaim autoclaim -CmdBreakAlliance breakalliance -CmdBypass bypass -CmdChat chat -CmdCheckAccess checkaccess -CmdCheckClaim checkclaim -CmdClaim claim -CmdConfig config -CmdConfigSet set -CmdConfigShow show -CmdCreate create -CmdDeclareIndependence declareindependence -CmdDeclareWar declarewar -CmdDemote demote -CmdDesc desc -CmdDisband disband -CmdDuel duel -CmdDuelAccept accept -CmdDuelCancel cancel -CmdDuelChallenge challenge -CmdEditLaw editlaw -CmdFlags flags -CmdFlagsSet set -CmdFlagsShow show -CmdForce force -CmdForceBonusPower bonuspower -CmdForceClaim claim -CmdForceCreate create -CmdForceDemote demote -CmdForceFlag flag -CmdForceJoin join -CmdForceKick kick -CmdForceLoad load -CmdForcePeace peace -CmdForcePower power -CmdForceRename rename -CmdForceRenounce renounce -CmdForceSave save -CmdForceTransfer transfer -CmdForceUnlock unlock -CmdGate gate -CmdGateCancel cancel -CmdGateCreate create -CmdGateList list -CmdGateName name -CmdGateRemove remove -CmdGrantAccess grantaccess -CmdGrantIndependence grantindependence -CmdHelp help -CmdHome home -CmdInfo info -CmdInvite invite -CmdInvoke invoke -CmdJoin join -CmdKick kick -CmdLaws laws -CmdLeave leave -CmdList list -CmdLock lock -CmdMakePeace makepeace -CmdMembers members -CmdPower power -CmdPrefix prefix -CmdPromote promote -CmdRemoveLaw removelaw -CmdRename rename -CmdResetPowerLevels resetpowerlevels -CmdRevokeAccess revokeaccess -CmdSetHome sethome -CmdSwearFealty swearfealty -CmdTransfer transfer -CmdUnclaim unclaim -CmdUnclaimall unclaimall -CmdUnlock unlock -CmdVassalize vassalize -CmdVersion version -CmdWho who -CommandCancelled Command cancelled. -CommandNotRecognized Medieval Factions doesn't recognize that command. -CommandsPage1 == Medieval Factions Commands Page 1/%d == -CommandsPage2 == Medieval Factions Commands Page 2/%d == -CommandsPage3 == Medieval Factions Commands Page 3/%d == -CommandsPage4 == Medieval Factions Commands Page 4/%d == -CommandsPage5 == Medieval Factions Commands Page 5/%d == -CommandsPage6 == Medieval Factions Commands Page 6/%d == -CommandsPage7 == Medieval Factions Commands Page 7/%d == -ConfigListPageOne ===== Config List Page 1/2 ===== -ConfigListPageTwo ===== Config List Page 2/2 ===== -CreatingGateCancelled Creating gate cancelled. -CreatingGateClickWithHoe Creating gate. Click on a block with a Golden Hoe to select the first point. -CuboidDisallowed1 Error placing point 1: You cannot place a cuboid. -CuboidDisallowed2 Error placing point 2: You cannot place a cuboid. -CurrentLanguageID Current Language ID: %s -CurrentlyNoFactions There are currently no factions. -CurrentPowerLevel %s's current power level is %d/%d. -Defeated %s has defeated %s in a duel. -DemesneSize Demesne Size: %d/%d -Description Description: %s -DescriptionSet Description set. -DesignatedFactionNotFound One of the factions designated wasn't found. -DesiredPowerMustBeANumber Desired power must be a number. -DeveloperList Developers: %s -DisbandmentDueToZeroPower %s has been disbanded due to its cumulative power reaching zero. -DoesntExist %s doesn't exist. -Done Done. -DoubleSet Double set. -DuelChallengeCancelled Duel challenge cancelled. -DuelEndedInTie %s and %s's duel has ended in a tie. -DynmapIntegrationSuccessful Dynmap integration successful. -ERROR ERROR: -ErrorAddingAreaMarker Error adding area marker %s -ErrorChunkRemoval An error has occurred during claimed chunk removal. -ErrorClaimedChunkRemoval An error has occurred during claimed chunk removal. -ErrorCouldNotFindGatesFaction Error: Could not find faction for gate '%s'. -ErrorCouldNotLoadFactionGate ERROR: Could not load faction gate.\n -ErrorCreatingMarkerSet Error creating marker set. -ErrorIntegratingWithDynmap Error integrating with dynmap: -ErrorPlayerPowerRecordForUUIDNotFound ERROR: Player's Power Record for uuid not found. Could not get cumulative power level. -ErrorSettingAreaMarkerColor Error setting area marker color to '%s'. -FactionAlreadyAlly That faction is already your ally. -FactionAlreadyExists Sorry. That faction already exists. -FactionAndPlayerSingleQuotesRequirement Faction and player must be designated inside single quotes. -FactionAndVassalSingleQuotesRequirement Faction and vassal to remove must be designated inside single quotes. -FactionCreated Faction created. -FactionCurrentlyEnemyMustMakePeace That faction is currently your enemy. Make peace before trying to ally with them. -FactionDataLoadedSuccessfuly Faction data loaded successfully -FactionDoesNotExist Sorry. That faction doesn't exist. -FactionDoesNotHaveLaws That faction doesn't have any laws. -FactionGates Faction Gates -FactionHomeLoadError An error occurred loading the faction home position. -FactionHomeNotSetYet The faction home isn't set yet. -FactionHomeSet Faction home set. -FactionInfo %s Faction Info -FactionIsNotVassal That faction isn't a vassal of yours. -FactionMustBeDesignatedInsideSingleQuotes Faction must be designated inside single quotes. -FactionNameChanged Faction name changed. -FactionNameNotRecognized That faction name isn't recognized. -FactionNameTooLong That name is too long. -FactionNotEnemy That faction is not your enemy. -FactionNotFound That faction wasn't found. -FactionsSuccessfullyLoaded Factions successfully loaded. -FactionsTitle == Factions == -FactionSuccessfullyDisbanded Faction successfully disbanded. -FactionSuccessfullyLoaded Faction successfully loaded. -FileLoadError An error occurred loading the file -FollowingPlayersHaveAccess The following players have access to this block: -GateCreated Gate successfully created. -HasAttemptedToMakePeaceWith %s has attempted to make peace with %s. -HasBeenKickedFrom %s has been kicked from %s -HasDeclaredIndependence %s has declared independence from %s. -HasDeclaredWarAgainst %s has declared war against %s. -HasJoined %s has joined %s -HelpAddLaw /mf addlaw - Add a law to your faction. -HelpAlly /mf ally - Attempt to ally with a faction. -HelpAutoclaim /mf autoclaim - Toggle auto claim, making land claiming easier. -HelpBreakAlliance /mf breakalliance - Break an alliance with a faction. -HelpBypass /mf bypass - Bypass protections. -HelpChat /mf chat - Toggle faction chat. -HelpCheckAccess /mf checkaccess - Check who has access to a locked block. -HelpCheckClaim /mf checkclaim - Check if land is claimed. -HelpClaim /mf claim - Claim land for your faction. -HelpConfigSet /mf config set (option) (value) - Set a config value. -HelpConfigShow /mf config show - Show config values. -HelpCreate /mf create (name) - Create a new faction. -HelpDeclareIndependence /mf declareindependence - Declare independence from your liege. -HelpDeclareWar /mf declarewar - Declare war against another faction. -HelpDemote /mf demote - Demote an officer to member status. -HelpDesc /mf desc (desc) - Set your faction description. -HelpDisband /mf disband - Disband your faction (must be owner). -HelpDuelAccept /mf duel accept (player) -HelpDuelCancel /mf duel cancel -HelpDuelChallenge /mf duel challenge (player) (time limit in seconds) -HelpEditLaw /mf editlaw - Edit an already existing law in your faction. -HelpFlagsSet /mf flags set (option) (value) - Set a faction flag. -HelpFlagsShow /mf flags show - Show faction flags. -HelpForce /mf force - Force the plugin to perform certain actions. -HelpForceBonusPower /mf force bonuspower 'faction' 'number' -HelpForceClaim /mf force claim 'faction name' -HelpForceCreate /mf force create 'factionName' -HelpForceDemote /mf force demote (player) -HelpForceFlag /mf force flag 'faction' 'option' 'value' -HelpForceJoin /mf force join 'player' 'faction' -HelpForceKick /mf force kick (player) -HelpForceLoad /mf force load -HelpForcePeace /mf force peace 'faction1' 'faction2' -HelpForcePower /mf force power 'player' 'number' -HelpForceRemoveVassal /mf force removevassal 'faction' 'vassal' -HelpForceRename /mf force rename 'faction' 'new name' -HelpForceRenounce /mf force renounce (faction) -HelpForceSave /mf force save -HelpForceTransfer /mf force transfer 'faction' 'player' -HelpForceUnlock /mf force unlock -HelpGateCancel /mf gate cancel -HelpGateCreate /mf gate create (name) -HelpGateList /mf gate list -HelpGateName /mf gate name (name) -HelpGateRemove /mf gate remove -HelpGrantAccess /mf grantaccess - Grant someone access to a locked block. -HelpGrantIndependence /mf grantindependence - Grant a vassal vaction independence. -HelpHelp /mf help # - Show lists of useful commands. -HelpHome /mf home - Teleport to your faction home. -HelpInfo /mf info - See your faction or another faction's information. -HelpInvite /mf invite (player) - Invite a player to your faction. -HelpInvoke /mf invoke (ally) (enemy) - Call an allied faction into a war. -HelpJoin /mf join (faction) - Join a faction if you've been invited. -HelpKick /mf kick - Kick a player from your faction. -HelpLaws /mf laws - View the laws of your faction. -HelpLeave /mf leave - Leave your current faction. -HelpList /mf list - List all factions on the server. -HelpLock /mf lock - Lock a chest or door. -HelpMakePeace /mf makepeace - Send peace offer to another faction. -HelpMap /mf map - Display a map of the claims near your surroundings. -HelpMembers /mf members - List the members of your faction or another faction. -HelpPower /mf power - Check your power level. -HelpPrefix /mf prefix (prefix) - Set your faction's prefix -HelpPromote /mf promote - Promote a player to officer status. -HelpRemoveLaw /mf removelaw - Remove a law from your faction. -HelpRename /mf rename - Rename your faction -HelpResetPowerLevels /mf resetpowerlevels - Reset player power records and faction cumulative power levels. -HelpRevokeAccess /mf revokeaccess - Revoke someone's access to a locked block. -HelpSetHome /mf sethome - Set your faction home. -HelpSwearFealty /mf swearfealty - Swear fealty to a faction. -HelpTransfer /mf transfer - Transfer ownership of your faction to another player. -HelpUnclaim /mf unclaim - Unclaim land for your faction. -HelpUnclaimall /mf unclaimall - Unclaim all land for your faction. -HelpUnlock /mf unlock Unlock a chest or door. -HelpVassalize /mf vassalize - Offer to vassalize a faction. -HelpVersion /mf version - Check plugin version. -HelpWho /mf who - View the faction info a specific player. -HomeClaimedByAnotherFaction Home was claimed by another faction, and has been lost. -HomeIsInUnclaimedChunk Home is in an unclaimed chunk, and is unavailable -HourlySaveAlert Medieval Factions is saving. This will happen every hour. -IntegerSet Integer set. -InvitationExpired Your invitation to %s has expired. -InvitationSent Invitation sent. -KeysLoaded Keys loaded: %d -LandAlreadyClaimedBy This land is already claimed by -LandAlreadyClaimedByYourFaction This land is already claimed by your faction. -LandClaimedBy This land is claimed by %s. -LandClaimedUsingAdminBypass Land unclaimed using admin bypass. -LandIsNotClaimed This land isn't claimed. -LandIsUnclaimed This land is unclaimed. -LandNotCurrentlyClaimed This land is not currently claimed. -LandUnclaimed Land unclaimed. -LawAdded Law added. -LawEdited Law edited. -LawRemoved Law removed. -LawsTitle == Laws of %s == -LeverSuccessfullyLinked Creating Gate 4/4: Lever successfully linked. -Liege Liege: %s -ListLegend P: power, M: members, L: land -LoadingClaimedChunks Loading claimed chunks... -LoadingLockedBLocks Loading locked blocks... -LoadingPlayerPowerRecords Loading player power records... -Locked Locked. -LockedBlockSuccessfullyLoaded Locked block successfully loaded. -LockedBy Locked by %s -LockingCancelled Locking cancelled. -LockRemovalError An error has occurred during lock removal. -MaterialsMismatch1 Error placing point 1: Materials mismatch. -MaterialsMismatch2 Error placing point 2: Materials mismatch. -MedievalFactionsStringRight Medieval-Factions-%s -MedievalFactionsTitle == Medieval Factions %s == -MembersOf Members of %s -MissingFactionGatesJSONCollection Could not load gates because the collection 'factionGates' did not exist in the factions JSON file. Are you upgrading from a previous version? Setting default. -MovementDetectedTeleportCancelled Movement Detected. Teleport cancelled. -MustBeAtWarOrFactionMustBeInactive Must be at war with target faction or target faction must be inactive. -MustBeInFaction Sorry, you must be in a faction to use this command. -MustBeOwner Sorry, you must be the owner of a faction to use this command. -MustOwnFactionOrBeOfficer You have to own a faction or be an officer of a faction to use this command. -MustTransferOwnership Sorry. You must transfer ownership or kick everyone in your faction to leave. -Name Name: %s -NameAlreadyTaken That name is already taken. -NeutralityDisabled Neutrality is currently disabled. -NoBlockDetectedToCheckForGate No block detected to check for gate. -NoFactionsDesignatedSingleQuotesRequired No factions designated. Must be designated inside single quotes. -NoLongerBypassingProtections You are no longer bypassing protections provided by Medieval Factions. -NoLongerInFactionChat You are no longer in faction chat. -NotAMemberOfAnyFaction You are not a member of any faction. -NotAnAlly %s isn't an ally of yours. -NotAnAllyOrVassal %s isn't an ally or vassal of yours. -NotAtWarWith You aren't at war with %s -NotAVassalOfAFaction You aren't a vassal of a faction. +AcceptedChallengeDuelHasBegun You have accepted %s's challenge, the duel has begun. +AlertAccessGrantedTo Access granted to %s +AlertAccessRevokedFor Access revoked for %s +AlertAllianceHasBeenBroken %s has broken their alliance your faction. +AlertAlreadyAtWarWith Your faction is already at war with %s. +AlertAlreadyCreatingGate You are already creating a gate. +AlertAlreadyDueling You are already dueling. +AlertAlreadyDuelingPlayer You are already dueling %s. +AlertAlreadyDuelingSomeone You are already dueling someone. +AlertAlreadyGrantingAccess You are already granting access to someone. Type /mf grantaccess cancel to cancel this. +AlertAlreadyInFaction You're already in a faction, sorry. +AlertAlreadyRequestedAlliance You've already requested an alliance with this faction. +AlertAlreadyRequestedPeace You've already requested peace with this faction. +AlertAttemptedAlliance %s has attempted to ally with %s. +AlertAttemptedVassalization %s has attempted to vassalize your faction. If you are the owner, type '/mf swearfealty %s' to accept. +AlertBeenInvited You've been invited to %s. Type /mf join %s to join. +AlertCalledToWar1 %s has called your faction into their war with %s. +AlertCalledToWar2 %s has called %s into their war with your faction. +AlertCalledToWar3 Your faction has called %s into your war with %s. +AlertChallengedToDuel %s has challenged %s to a duel. +AlertChallengedToDuelPlusHowTo %s has challenged you to a duel. Type /mf duel accept to begin. +AlertChallengeIssued You have challenged %s to a duel. +AlertChallengeWasAccepted %s has accepted your challenge, the duel has begun. +AlertChangedGateName Changed gate name to '%s'. +AlertCurrentPowerLevel Your current power level is %d/%d. +AlertDecreasingThePowerOfInactivePlayers Medieval Factions is decreasing the power of every player by %d if they haven't been online in over %d minutes. This will happen every %d minutes. +AlertDemotion You have been demoted to member status in your faction. +AlertDisbandmentDueToZeroPower Your faction has been disbanded due to its cumulative power reaching zero. +AlertFactionAttemptedToVassalize Your faction has attempted to vassalize %s. +AlertFactionHasBeenVassalized Your faction has been vassalized and has a new liege: %s +AlertFactionHasNewVassal Your faction has a new vassal: %s +AlertFactionHomeRemoved Your faction home has been removed. +AlertFactionIsWeakened Your faction has less than half of its max power. It will no longer receive bonus power from vassals and your vassals are now vulnerable. +AlertForcedDemotion You were forcibly demoted from officer status in your faction. +AlertForcedKick You were forcibly kicked from your faction. +AlertForcedLoad Medieval Factions has been forced to load. +AlertForcedSave Medieval Factions has been forced to save. +AlertForcedToJoinFaction You were forced to join a faction. +AlertGate That is the '%s' gate. +AlertGrantedIndependence %s has granted your faction independence. +AlertIncreasingThePowerOfEveryPlayer Medieval Factions is increasing the power of every player by %d. This will happen every %d minutes. +AlertJoinedFaction You joined the faction. +AlertKicked You have been kicked from your faction by %s. +AlertLandClaimed Land claimed. Demesne Size: %d/%d +AlertLandConqueredFromAnotherFaction Land conquered from %s. Demesne Size: %d/%d +AlertLandConqueredFromYourFaction %s has conquered land from your faction. +AlertLeftFaction You left your faction. +AlertLeftFactionAndItGotDeleted You left your faction. It was deleted since no one else was a member. +AlertMoreClaimedChunksThanPower Your faction has more claimed chunks than power. Your land can be conquered. +AlertMustBeAtWarToConquer Your factions have to be at war in order for you to conquer land. +AlertMustBeInFactionToUseCommand You must be in a faction to use this command. +AlertMustBeMemberToCreateGate You must be a member of this faction to create a gate. +AlertMustBeOfficerOrOwnerToClaimLand You must be an officer or owner of a faction to claim land. +AlertMustBeOwnerOrOfficerToCreateGate You must be a faction owner or officer to create a gate. +AlertMustBeOwnerOrOfficerToUseCommand You need to be the owner of a faction or an officer of a faction to use this command. +AlertMustBeOwnerToInvokeAlliance You must be the owner of your faction to invoke an alliance. +AlertMustBeOwnerToUseCommand You need to be the owner of a faction to use this command. +AlertMustKickAllPlayers You need to kick all players before you can disband your faction. +AlertNoGatesDefined Your faction has no gates defined. +AlertNoLaws Your faction doesn't have any laws. +AlertNoLongerVassalFaction %s is no longer a vassal faction. +AlertNonOwnership You don't own this. +AlertNoPendingChallenges You have no pending challenges to cancel. +AlertNotAllied Your faction is not allied with %s. +AlertNotBeenChallenged You have not been challenged to a duel by anyone. +AlertNotBeenChallengedByPlayer You have not been challenged to a duel by '%s'. +AlertNotInFaction You're not in a faction. +AlertNotInvitedToFaction You're not invited to this faction. +AlertNotOfferedVassalizationBy You haven't been offered vassalization by this faction. +AlertNowAlliedWith Your faction is now allied with %s. +AlertNowAtPeaceWith %s is now at peace with %s. +AlertPlayerAlreadyOwner That player is already the owner of that faction. +AlertPlayerNotInFaction That player is not in that faction. +AlertPowerLevelDecreased Your power level has decreased. +AlertPowerLevelIncreasedBy You feel stronger. Your power has increased by %d. +AlertReachedDemesne You have reached your demesne limit. Invite more players to increase this. +AlertUnlocked Unlocked. +AlertUnlockingCancelled Unlocking cancelled. +AllianceBrokenWith Alliance has been broken with %s. +AlliedWith Allied With: %s +AllLandUnclaimed All land unclaimed. +AllLandUnclaimedFrom All land unclaimed from %s. +AlreadyEnteredCheckAccess You have already entered this command. Type '/mf checkaccess cancel' to cancel. +AlreadyEnteredRevokeAccess You have already entered this command. Type '/mf revokeaccess cancel' to cancel. +AlreadyInFaction Sorry, you're already in a faction. Leave if you want to create a different one. +ArgumentMustBeNumber Argument must be a number. +ArgumentsSingleQuotesRequirement Arguments must be designated inside single quotes. +AssignedToRandomFaction You have been assigned to a random faction. +AttemptedAlliance Attempted to ally with %s +AttemptedPeace Attempted to make peace with %s +AtWarWith At War With: %s +AutoclaimToggled Autoclaim toggled. +BlockAlreadyLocked This block is already locked. +BlockIsNotLocked That block isn't locked. +BlockIsPartOfGateMustRemoveGate This block is part of gate '%s'. You must remove the gate first. +BonusPower Bonus Power From Admins: %d +BooleanSet Boolean set. +Cancelled Cancelled. +CancelledGatePlacement1 Error placing point 1. Cancelled gate placement. +CancelledGatePlacement2 Error placing point 2. Cancelled gate placement. +CancelledGatePlacementErrorLinking Error linking to lever. Cancelled gate placement. +CannotAllyWithSelf You can't ally with your own faction. +CannotAttackFactionMember You can't attack another player if you are part of the same faction. +CannotAttackNonWarringPlayer You can't attack another player if your factions aren't at war. +CannotBreakAllianceWithSelf You can't break an alliance with your own faction. +CannotBringNeutralFactionIntoWar You cannot bring neutral factions into war. +CannotCancelActiveDuel Cannot cancel an active duel. +CannotDeclareWarIfLiegeNotWeakened You can't declare war on this faction as they are a vassal unless their liege is weakened. +CannotDeclareWarIfNeutralFaction Neutral factions cannot declare war. +CannotDeclareWarOnAlly You can't declare war on your ally. +CannotDeclareWarOnLiege You can't declare war on your liege. Try '/mf declareindependence' instead. +CannotDeclareWarOnNeutralFaction You cannot declare war on a neutral faction. +CannotDeclareWarOnVassal You can't declare war on your own vassal. +CannotDeclareWarOnYourself You can't declare war on yourself. +CannotDemoteSelf You cannot demote yourself. +CannotDuelSelf You cannot duel yourself. +CannotFindDynmap Cannot find dynmap. +CannotForciblyKickOwner Cannot forcibly kick an owner from their faction. Try disbanding the faction. +CannotGrantAccessToSelf You cannot grant access to yourself. +CannotKickOwner You can't kick the owner. +CannotKickSelf You can't kick yourself. +CannotMakePeaceWithSelf You can't make peace with your own faction. +CannotPlaceChestsNextToUnownedLockedChests You can't place chests next to locked chests you don't own. +CannotPlaceHoppersNextToUnownedLockedChests You can't place hoppers next to, under or above locked chests you don't own. +CannotPromoteSelf You cannot promote yourself. +CannotRevokeAccessFromSelf You cannot revoke access from yourself. +CannotSetFactionHomeInWilderness You can't set your faction home on land your faction hasn't claimed. +CannotSetVersion Can't set version. +CannotTransferToSelf You can't transfer ownership of your faction to yourself. +CannotVassalizeLiege You can't vassalize your liege. +CannotVassalizeSelf You can't vassalize your own faction. +CannotVassalizeVassal You can't vassalize a faction who already has a liege. +CanOnlyCreateGatesInClaimedTerritory You can only create gates in claimed territory. +CanOnlyLockBlocksInClaimedTerritory You can only lock blocks on land claimed by your faction. +CanOnlyLockInFactionTerritory You can only lock things in your faction's territory. +CanOnlyLockSpecificBlocks You can only lock chests, doors, barrels, trapdoors, furnaces, anvils or gates. +ClaimedChunksLoaded Claimed chunks loaded. +ClaimedChunksSuccessfullyLoaded Claimed chunks successfully loaded. +ClickOnTriggerLever Click on the trigger lever... +ClickToPlaceSecondCorner Click to place the second corner... +CmdAddLaw addlaw +CmdAlly ally +CmdAutoClaim autoclaim +CmdBreakAlliance breakalliance +CmdBypass bypass +CmdChat chat +CmdCheckAccess checkaccess +CmdCheckClaim checkclaim +CmdClaim claim +CmdConfig config +CmdConfigSet set +CmdConfigShow show +CmdCreate create +CmdDeclareIndependence declareindependence +CmdDeclareWar declarewar +CmdDemote demote +CmdDesc desc +CmdDisband disband +CmdDuel duel +CmdDuelAccept accept +CmdDuelCancel cancel +CmdDuelChallenge challenge +CmdEditLaw editlaw +CmdFlags flags +CmdFlagsSet set +CmdFlagsShow show +CmdForce force +CmdForceBonusPower bonuspower +CmdForceClaim claim +CmdForceCreate create +CmdForceDemote demote +CmdForceFlag flag +CmdForceJoin join +CmdForceKick kick +CmdForceLoad load +CmdForcePeace peace +CmdForcePower power +CmdForceRename rename +CmdForceRenounce renounce +CmdForceSave save +CmdForceTransfer transfer +CmdForceUnlock unlock +CmdGate gate +CmdGateCancel cancel +CmdGateCreate create +CmdGateList list +CmdGateName name +CmdGateRemove remove +CmdGrantAccess grantaccess +CmdGrantIndependence grantindependence +CmdHelp help +CmdHome home +CmdInfo info +CmdInvite invite +CmdInvoke invoke +CmdJoin join +CmdKick kick +CmdLaws laws +CmdLeave leave +CmdList list +CmdLock lock +CmdMakePeace makepeace +CmdMembers members +CmdPower power +CmdPrefix prefix +CmdPromote promote +CmdRemoveLaw removelaw +CmdRename rename +CmdResetPowerLevels resetpowerlevels +CmdRevokeAccess revokeaccess +CmdSetHome sethome +CmdSwearFealty swearfealty +CmdTransfer transfer +CmdUnclaim unclaim +CmdUnclaimall unclaimall +CmdUnlock unlock +CmdVassalize vassalize +CmdVersion version +CmdWho who +CommandCancelled Command cancelled. +CommandNotRecognized Medieval Factions doesn't recognize that command. +CommandsPage1 == Medieval Factions Commands Page 1/%d == +CommandsPage2 == Medieval Factions Commands Page 2/%d == +CommandsPage3 == Medieval Factions Commands Page 3/%d == +CommandsPage4 == Medieval Factions Commands Page 4/%d == +CommandsPage5 == Medieval Factions Commands Page 5/%d == +CommandsPage6 == Medieval Factions Commands Page 6/%d == +CommandsPage7 == Medieval Factions Commands Page 7/%d == +ConfigListPageOne ===== Config List Page 1/2 ===== +ConfigListPageTwo ===== Config List Page 2/2 ===== +CreatingGateCancelled Creating gate cancelled. +CreatingGateClickWithHoe Creating gate. Click on a block with a Golden Hoe to select the first point. +CuboidDisallowed1 Error placing point 1: You cannot place a cuboid. +CuboidDisallowed2 Error placing point 2: You cannot place a cuboid. +CurrentLanguageID Current Language ID: %s +CurrentlyNoFactions There are currently no factions. +CurrentPowerLevel %s's current power level is %d/%d. +Defeated %s has defeated %s in a duel. +DemesneSize Demesne Size: %d/%d +Description Description: %s +DescriptionSet Description set. +DesignatedFactionNotFound One of the factions designated wasn't found. +DesiredPowerMustBeANumber Desired power must be a number. +DeveloperList Developers: %s +DisbandmentDueToZeroPower %s has been disbanded due to its cumulative power reaching zero. +DoesntExist %s doesn't exist. +Done Done. +DoubleSet Double set. +DuelChallengeCancelled Duel challenge cancelled. +DuelEndedInTie %s and %s's duel has ended in a tie. +DynmapIntegrationSuccessful Dynmap integration successful. +ERROR ERROR: +ErrorAddingAreaMarker Error adding area marker %s +ErrorChunkRemoval An error has occurred during claimed chunk removal. +ErrorClaimedChunkRemoval An error has occurred during claimed chunk removal. +ErrorCouldNotFindGatesFaction Error: Could not find faction for gate '%s'. +ErrorCouldNotLoadFactionGate ERROR: Could not load faction gate.\n +ErrorCreatingMarkerSet Error creating marker set. +ErrorIntegratingWithDynmap Error integrating with dynmap: +ErrorPlayerPowerRecordForUUIDNotFound ERROR: Player's Power Record for uuid not found. Could not get cumulative power level. +ErrorSettingAreaMarkerColor Error setting area marker color to '%s'. +FactionAlreadyAlly That faction is already your ally. +FactionAlreadyExists Sorry. That faction already exists. +FactionAndPlayerSingleQuotesRequirement Faction and player must be designated inside single quotes. +FactionAndVassalSingleQuotesRequirement Faction and vassal to remove must be designated inside single quotes. +FactionCreated Faction created. +FactionCurrentlyEnemyMustMakePeace That faction is currently your enemy. Make peace before trying to ally with them. +FactionDataLoadedSuccessfuly Faction data loaded successfully +FactionDoesNotExist Sorry. That faction doesn't exist. +FactionDoesNotHaveLaws That faction doesn't have any laws. +FactionGates Faction Gates +FactionHomeLoadError An error occurred loading the faction home position. +FactionHomeNotSetYet The faction home isn't set yet. +FactionHomeSet Faction home set. +FactionInfo %s Faction Info +FactionIsNotVassal That faction isn't a vassal of yours. +FactionMustBeDesignatedInsideSingleQuotes Faction must be designated inside single quotes. +FactionNameChanged Faction name changed. +FactionNameNotRecognized That faction name isn't recognized. +FactionNameTooLong That name is too long. +FactionNotEnemy That faction is not your enemy. +FactionNotFound That faction wasn't found. +FactionsSuccessfullyLoaded Factions successfully loaded. +FactionsTitle == Factions == +FactionSuccessfullyDisbanded Faction successfully disbanded. +FactionSuccessfullyLoaded Faction successfully loaded. +FileLoadError An error occurred loading the file +FollowingPlayersHaveAccess The following players have access to this block: +GateCreated Gate successfully created. +HasAttemptedToMakePeaceWith %s has attempted to make peace with %s. +HasBeenKickedFrom %s has been kicked from %s +HasDeclaredIndependence %s has declared independence from %s. +HasDeclaredWarAgainst %s has declared war against %s. +HasJoined %s has joined %s +HelpAddLaw /mf addlaw - Add a law to your faction. +HelpAlly /mf ally - Attempt to ally with a faction. +HelpAutoclaim /mf autoclaim - Toggle auto claim, making land claiming easier. +HelpBreakAlliance /mf breakalliance - Break an alliance with a faction. +HelpBypass /mf bypass - Bypass protections. +HelpChat /mf chat - Toggle faction chat. +HelpCheckAccess /mf checkaccess - Check who has access to a locked block. +HelpCheckClaim /mf checkclaim - Check if land is claimed. +HelpClaim /mf claim - Claim land for your faction. +HelpConfigSet /mf config set (option) (value) - Set a config value. +HelpConfigShow /mf config show - Show config values. +HelpCreate /mf create (name) - Create a new faction. +HelpDeclareIndependence /mf declareindependence - Declare independence from your liege. +HelpDeclareWar /mf declarewar - Declare war against another faction. +HelpDemote /mf demote - Demote an officer to member status. +HelpDesc /mf desc (desc) - Set your faction description. +HelpDisband /mf disband - Disband your faction (must be owner). +HelpDuelAccept /mf duel accept (player) +HelpDuelCancel /mf duel cancel +HelpDuelChallenge /mf duel challenge (player) (time limit in seconds) +HelpEditLaw /mf editlaw - Edit an already existing law in your faction. +HelpFlagsSet /mf flags set (option) (value) - Set a faction flag. +HelpFlagsShow /mf flags show - Show faction flags. +HelpForce /mf force - Force the plugin to perform certain actions. +HelpForceBonusPower /mf force bonuspower 'faction' 'number' +HelpForceClaim /mf force claim 'faction name' +HelpForceCreate /mf force create 'factionName' +HelpForceDemote /mf force demote (player) +HelpForceFlag /mf force flag 'faction' 'option' 'value' +HelpForceJoin /mf force join 'player' 'faction' +HelpForceKick /mf force kick (player) +HelpForceLoad /mf force load +HelpForcePeace /mf force peace 'faction1' 'faction2' +HelpForcePower /mf force power 'player' 'number' +HelpForceRemoveVassal /mf force removevassal 'faction' 'vassal' +HelpForceRename /mf force rename 'faction' 'new name' +HelpForceRenounce /mf force renounce (faction) +HelpForceSave /mf force save +HelpForceTransfer /mf force transfer 'faction' 'player' +HelpForceUnlock /mf force unlock +HelpGateCancel /mf gate cancel +HelpGateCreate /mf gate create (name) +HelpGateList /mf gate list +HelpGateName /mf gate name (name) +HelpGateRemove /mf gate remove +HelpGrantAccess /mf grantaccess - Grant someone access to a locked block. +HelpGrantIndependence /mf grantindependence - Grant a vassal vaction independence. +HelpHelp /mf help # - Show lists of useful commands. +HelpHome /mf home - Teleport to your faction home. +HelpInfo /mf info - See your faction or another faction's information. +HelpInvite /mf invite (player) - Invite a player to your faction. +HelpInvoke /mf invoke (ally) (enemy) - Call an allied faction into a war. +HelpJoin /mf join (faction) - Join a faction if you've been invited. +HelpKick /mf kick - Kick a player from your faction. +HelpLaws /mf laws - View the laws of your faction. +HelpLeave /mf leave - Leave your current faction. +HelpList /mf list - List all factions on the server. +HelpLock /mf lock - Lock a chest or door. +HelpMakePeace /mf makepeace - Send peace offer to another faction. +HelpMap /mf map - Display a map of the claims near your surroundings. +HelpMembers /mf members - List the members of your faction or another faction. +HelpPower /mf power - Check your power level. +HelpPrefix /mf prefix (prefix) - Set your faction's prefix +HelpPromote /mf promote - Promote a player to officer status. +HelpRemoveLaw /mf removelaw - Remove a law from your faction. +HelpRename /mf rename - Rename your faction +HelpResetPowerLevels /mf resetpowerlevels - Reset player power records and faction cumulative power levels. +HelpRevokeAccess /mf revokeaccess - Revoke someone's access to a locked block. +HelpSetHome /mf sethome - Set your faction home. +HelpSwearFealty /mf swearfealty - Swear fealty to a faction. +HelpTransfer /mf transfer - Transfer ownership of your faction to another player. +HelpUnclaim /mf unclaim - Unclaim land for your faction. +HelpUnclaimall /mf unclaimall - Unclaim all land for your faction. +HelpUnlock /mf unlock Unlock a chest or door. +HelpVassalize /mf vassalize - Offer to vassalize a faction. +HelpVersion /mf version - Check plugin version. +HelpWho /mf who - View the faction info a specific player. +HomeClaimedByAnotherFaction Home was claimed by another faction, and has been lost. +HomeIsInUnclaimedChunk Home is in an unclaimed chunk, and is unavailable +HourlySaveAlert Medieval Factions is saving. This will happen every hour. +IntegerSet Integer set. +InvitationExpired Your invitation to %s has expired. +InvitationSent Invitation sent. +KeysLoaded Keys loaded: %d +LandAlreadyClaimedBy This land is already claimed by +LandAlreadyClaimedByYourFaction This land is already claimed by your faction. +LandClaimedBy This land is claimed by %s. +LandClaimedUsingAdminBypass Land unclaimed using admin bypass. +LandIsNotClaimed This land isn't claimed. +LandIsUnclaimed This land is unclaimed. +LandNotCurrentlyClaimed This land is not currently claimed. +LandUnclaimed Land unclaimed. +LawAdded Law added. +LawEdited Law edited. +LawRemoved Law removed. +LawsTitle == Laws of %s == +LeverSuccessfullyLinked Creating Gate 4/4: Lever successfully linked. +Liege Liege: %s +ListLegend P: power, M: members, L: land +LoadingClaimedChunks Loading claimed chunks... +LoadingLockedBLocks Loading locked blocks... +LoadingPlayerPowerRecords Loading player power records... +Locked Locked. +LockedBlockSuccessfullyLoaded Locked block successfully loaded. +LockedBy Locked by %s +LockingCancelled Locking cancelled. +LockRemovalError An error has occurred during lock removal. +MaterialsMismatch1 Error placing point 1: Materials mismatch. +MaterialsMismatch2 Error placing point 2: Materials mismatch. +MedievalFactionsStringRight Medieval-Factions-%s +MedievalFactionsTitle == Medieval Factions %s == +MembersOf Members of %s +MissingFactionGatesJSONCollection Could not load gates because the collection 'factionGates' did not exist in the factions JSON file. Are you upgrading from a previous version? Setting default. +MovementDetectedTeleportCancelled Movement Detected. Teleport cancelled. +MustBeAtWarOrFactionMustBeInactive Must be at war with target faction or target faction must be inactive. +MustBeInFaction Sorry, you must be in a faction to use this command. +MustBeOwner Sorry, you must be the owner of a faction to use this command. +MustOwnFactionOrBeOfficer You have to own a faction or be an officer of a faction to use this command. +MustTransferOwnership Sorry. You must transfer ownership or kick everyone in your faction to leave. +Name Name: %s +NameAlreadyTaken That name is already taken. +NeutralityDisabled Neutrality is currently disabled. +NoBlockDetectedToCheckForGate No block detected to check for gate. +NoFactionsDesignatedSingleQuotesRequired No factions designated. Must be designated inside single quotes. +NoLongerBypassingProtections You are no longer bypassing protections provided by Medieval Factions. +NoLongerInFactionChat You are no longer in faction chat. +NotAMemberOfAnyFaction You are not a member of any faction. +NotAnAlly %s isn't an ally of yours. +NotAnAllyOrVassal %s isn't an ally or vassal of yours. +NotAtWarWith You aren't at war with %s +NotAVassalOfAFaction You aren't a vassal of a faction. NotEnoughArgumentsDesignatedSingleQuotesRequired Not enough arguments designated. Must be designated inside single quotes. -NotTheOwnerOfThisBlock You are not the owner of this block. -NotTheOwnerOfThisFaction You are not the owner of this faction. -NoVassalOrLiegeReferences There were no vassal or liege references associated with that faction. -NowBypassingProtections You are now bypassing protections provided by Medieval Factions. -NowSpeakingInFactionChat You are now speaking in faction chat. -OnlyPlayersCanUseCommand Only players can use this command. -OnlyUseLeversInClaimedTerritory Error: Can only use levers in claimed territory. -Owner Owner: %s -OwnershipTransferred Ownership of %s has been transferred to you. -OwnerShipTransferredTo Ownership transferred to %s -PermissionNeeded Sorry. In order to use this command, you need the following permission: ''%s' -PlayerAlreadyDueling %s is already duelling someone. -PlayerAlreadyInFaction That player is already in a faction, sorry. -PlayerAlreadyOfficer Player is already an officer. -PlayerAndDesiredPowerSingleQuotesRequirement Player and desired power must be designated inside single quotes. -PlayerByNameNotFound Sorry. Player by the name of %s could not be found. -PlayerCantBePromotedBecauseOfLimit Player can't be promoted because you have reached your limit. Limit: %d -PlayerDemoted Player demoted. -PlayerIsNotInAFaction That player isn't in a faction. -PlayerIsNotInYourFaction That player isn't in your faction. -PlayerIsNotMemberOfFaction That player isn't a member of your faction. -PlayerIsNotOfficerOfFaction That player isn't an officer in your faction. -PlayerNotFound Player not found. -PlayerPowerRecordsLoaded Player power records loaded. -PlayerPromoted Player promoted. -PleaseWaitGate This gate is %s, please wait. -PluginDisabled Medieval Factions plugin disabled. -PluginDisabling Medieval Factions plugin disabling.... -PluginEnabled Medieval Factions plugin enabled. -PluginEnabling Medieval Factions plugin enabling.... -PluginLoading Medieval Factions plugin is loading... -PluginSaving Medieval Factions plugin is saving... -Point1PlacementSuccessful Creating Gate 1/4: Point 1 placed successfully. -Point2PlacedSuccessfully Creating Gate 2/4: Point 2 placed successfully. -Population Population: %d -PowerHasDecayed Your power has decayed by %d since you last logged out. Your power is now %d. -PowerLevel Power Level: %s -PowerLevelHasBeenSetTo The power level of that player has been set to %d -PowerLevelHasIncreased Your power level has increased. -PowerLevelResetting Power level resetting... -PrefixesDisabled Prefixes are currently disabled. -PrefixSet Prefix set. -PrefixTaken This prefix has already been taken. -ProblemLoadingClaimedChunks There was a problem loading the claimed chunks. -ProblemLoadingFactions There was a problem loading the factions. -ProblemLoadingPowerRecords There was a problem loading the player power records. -PromotedToOfficer You have been promoted to officer status in your faction. -RadiusRequirement Radius must be between 0 and %d. -RemovedGate Removed gate '%s'. -ResettingIndividualPowerRecords Resetting individual power records. -RightClickCheckAccess Right click a locked block to check who has access to it. Type '/mf checkaccess cancel' to cancel. -RightClickForceUnlock Right click a chest or door to forcefully unlock it! (Type /mf force unlock cancel to cancel) -RightClickGrantAccess Right click a chest or door to grant %s access. Type /mf grantaccess cancel to cancel this. -RightClickLock Right click a chest or door to lock it. (Type /mf lock cancel to cancel) -RightClickRevokeAccess Right click a locked block to revoke this player's access to it. Type '/mf revokeaccess cancel' to cancel. -RightClickUnlock Right click a chest or door to unlock it. (Type /mf unlock cancel to cancel) -SchedulingHourlyAutoSave Scheduling hourly auto save... -SchedulingPowerDecrease Scheduling power decrease... -SchedulingPowerIncrease Scheduling power increase... -SingleQuotesAlliedWarring Allied faction and warring faction must be designated inside single quotes. -StringSet String set. -SubCommands Sub-commands: -SuccessFactionMemberRemoval Success. If the player was in a faction, they are no longer a member. -SuccessForceJoin Success. Player was forced to join faction. -SuccessfulDisbandment %s has been successfully disbanded. -SuccessOfficerRemoval Success. If player was considered an officer in any faction, they are no longer. -SuccessReferencesRemoved references have been successfully removed. -SupportedLanguageIDList Supported Language IDs: %s -SurroundedChunkProtected Target faction has claimed the chunks to the north, east, south and west of this chunk. It cannot be conquered. -TargetBlockNotPartOfGate Target block is not part of a gate. -TargetFactionNotOverClaiming Target faction does not have more land than their demesne limit. -TeleportingAlert Teleporting in 3 seconds... -ThreeBlockRequirement Error placing point 2: Gate must be 3 blocks or taller. -TriggerBlockNotLever Trigger block was not a lever. Cancelled gate placement. -UsageAddLaw Usage: /mf addlaw (new law) -UsageAlly Usage: /mf ally (faction-name) -UsageBreakAlliance Usage: /mf breakalliance (faction-name) -UsageClaimRadius Usage: /mf claim (radius) -UsageConfigSet Usage: /mf config set (option) (value) -UsageConfigShow Usage: /mf config show ( 1 | 2 ) -UsageCreate Usage: /mf create [faction-name] -UsageDeclareWar Usage: /mf declarewar (faction-name) -UsageDemote Usage: /mf demote (player-name) -UsageDesc Usage: /mf desc (description) -UsageEditLaw Usage: /mf editlaw (number) (edited law) -UsageFlagsSet Usage: /mf flags set (option) (value) -UsageForceBonusPower Usage: /mf force bonuspower 'faction' 'number' -UsageForceClaim Usage: /mf force claim 'faction name' -UsageForceCreate Usage: /mf force create 'factionName' -UsageForceDemote Usage: /mf force demote (player) -UsageForceFlag Usage: /mf force flag 'faction' 'option' 'value' -UsageForceJoin Usage: /mf force join 'player' 'faction' -UsageForceKick Usage: /mf force kick (player) -UsageForcePeace Usage: /mf force peace 'faction-1' 'faction-2' -UsageForcePower Usage: /mf force power 'player' 'number' -UsageForceRemoveVassal /mf force removevassal 'faction-1' 'faction-2' -UsageForceRename Usage: /mf force rename 'faction' 'new name' -UsageForceRenounce Usage: /mf force renounce 'faction' -UsageForceTransfer Usage: /mf force transfer 'factionName' 'player' -UsageGrantAccess Usage: /mf grantaccess (player-name) -UsageGrantIndependence Usage: /mf grantindependence (faction-name) -UsageInvite Usage: /mf invite (player-name) -UsageInvoke Usage: /mf invoke '(allied faction name)' '(warring faction)' -UsageJoin Usage: /mf join (faction-name) -UsageKick Usage: /mf kick (player-name) -UsageMakePeace Usage: /mf makepeace (faction-name) -UsagePrefix Usage: /mf prefix (new prefix) -UsagePromote Usage: /mf promote (player-name) -UsageRemoveLaw Usage: /mf removelaw (number) -UsageRename Usage: /mf rename (newName) -UsageRevokeAccess Usage: /mf revokeaccess (player-name) -UsageSwearFealty Usage: /mf swearfealty (faction-name) -UsageTransfer Usage: /mf transfer (player-name) -UsageVassalize Usage: /mf vassalize (faction-name) -UsageWho Usage: /mf who (player-name) -ValidSubCommandsShowSet Valid sub-commands: show, set -VassalContribution Bonus Power From Vassals: %d -Vassals Vassals: %s -WarningPlayerAlreadyStartedCreatingGate WARNING: Player has already started creating the gate. startCreatingGate() call ignored. -WasntFound '%s' wasn't found. -WelcomeBackLastLogout Welcome back %s. You last logged out %s ago. -WikiLink Wiki: https://github.com/dmccoystephenson/Medieval-Factions/wiki -Wilderness Wilderness -WorldsMismatch1 Error placing point 1: Worlds mismatch. -WorldsMismatch2 Error placing point 2: Worlds mismatch. \ No newline at end of file +NotTheOwnerOfThisBlock You are not the owner of this block. +NotTheOwnerOfThisFaction You are not the owner of this faction. +NoVassalOrLiegeReferences There were no vassal or liege references associated with that faction. +NowBypassingProtections You are now bypassing protections provided by Medieval Factions. +NowSpeakingInFactionChat You are now speaking in faction chat. +OnlyPlayersCanUseCommand Only players can use this command. +OnlyUseLeversInClaimedTerritory Error: Can only use levers in claimed territory. +Owner Owner: %s +OwnershipTransferred Ownership of %s has been transferred to you. +OwnerShipTransferredTo Ownership transferred to %s +PermissionNeeded Sorry. In order to use this command, you need the following permission: ''%s' +PlayerAlreadyDueling %s is already duelling someone. +PlayerAlreadyInFaction That player is already in a faction, sorry. +PlayerAlreadyOfficer Player is already an officer. +PlayerAndDesiredPowerSingleQuotesRequirement Player and desired power must be designated inside single quotes. +PlayerByNameNotFound Sorry. Player by the name of %s could not be found. +PlayerCantBePromotedBecauseOfLimit Player can't be promoted because you have reached your limit. Limit: %d +PlayerDemoted Player demoted. +PlayerIsNotInAFaction That player isn't in a faction. +PlayerIsNotInYourFaction That player isn't in your faction. +PlayerIsNotMemberOfFaction That player isn't a member of your faction. +PlayerIsNotOfficerOfFaction That player isn't an officer in your faction. +PlayerNotFound Player not found. +PlayerPowerRecordsLoaded Player power records loaded. +PlayerPromoted Player promoted. +PleaseWaitGate This gate is %s, please wait. +PluginDisabled Medieval Factions plugin disabled. +PluginDisabling Medieval Factions plugin disabling.... +PluginEnabled Medieval Factions plugin enabled. +PluginEnabling Medieval Factions plugin enabling.... +PluginLoading Medieval Factions plugin is loading... +PluginSaving Medieval Factions plugin is saving... +Point1PlacementSuccessful Creating Gate 1/4: Point 1 placed successfully. +Point2PlacedSuccessfully Creating Gate 2/4: Point 2 placed successfully. +Population Population: %d +PowerHasDecayed Your power has decayed by %d since you last logged out. Your power is now %d. +PowerLevel Power Level: %s +PowerLevelHasBeenSetTo The power level of that player has been set to %d +PowerLevelHasIncreased Your power level has increased. +PowerLevelResetting Power level resetting... +PrefixesDisabled Prefixes are currently disabled. +PrefixSet Prefix set. +PrefixTaken This prefix has already been taken. +ProblemLoadingClaimedChunks There was a problem loading the claimed chunks. +ProblemLoadingFactions There was a problem loading the factions. +ProblemLoadingPowerRecords There was a problem loading the player power records. +PromotedToOfficer You have been promoted to officer status in your faction. +RadiusRequirement Radius must be between 0 and %d. +RemovedGate Removed gate '%s'. +ResettingIndividualPowerRecords Resetting individual power records. +RightClickCheckAccess Right click a locked block to check who has access to it. Type '/mf checkaccess cancel' to cancel. +RightClickForceUnlock Right click a chest or door to forcefully unlock it! (Type /mf force unlock cancel to cancel) +RightClickGrantAccess Right click a chest or door to grant %s access. Type /mf grantaccess cancel to cancel this. +RightClickLock Right click a chest or door to lock it. (Type /mf lock cancel to cancel) +RightClickRevokeAccess Right click a locked block to revoke this player's access to it. Type '/mf revokeaccess cancel' to cancel. +RightClickUnlock Right click a chest or door to unlock it. (Type /mf unlock cancel to cancel) +SchedulingHourlyAutoSave Scheduling hourly auto save... +SchedulingPowerDecrease Scheduling power decrease... +SchedulingPowerIncrease Scheduling power increase... +SingleQuotesAlliedWarring Allied faction and warring faction must be designated inside single quotes. +StringSet String set. +SubCommands Sub-commands: +SuccessFactionMemberRemoval Success. If the player was in a faction, they are no longer a member. +SuccessForceJoin Success. Player was forced to join faction. +SuccessfulDisbandment %s has been successfully disbanded. +SuccessOfficerRemoval Success. If player was considered an officer in any faction, they are no longer. +SuccessReferencesRemoved references have been successfully removed. +SupportedLanguageIDList Supported Language IDs: %s +SurroundedChunkProtected Target faction has claimed the chunks to the north, east, south and west of this chunk. It cannot be conquered. +TargetBlockNotPartOfGate Target block is not part of a gate. +TargetFactionNotOverClaiming Target faction does not have more land than their demesne limit. +TeleportingAlert Teleporting in 3 seconds... +ThreeBlockRequirement Error placing point 2: Gate must be 3 blocks or taller. +TriggerBlockNotLever Trigger block was not a lever. Cancelled gate placement. +UsageAddLaw Usage: /mf addlaw (new law) +UsageAlly Usage: /mf ally (faction-name) +UsageBreakAlliance Usage: /mf breakalliance (faction-name) +UsageClaimRadius Usage: /mf claim (radius) +UsageConfigSet Usage: /mf config set (option) (value) +UsageConfigShow Usage: /mf config show ( 1 | 2 ) +UsageCreate Usage: /mf create [faction-name] +UsageDeclareWar Usage: /mf declarewar (faction-name) +UsageDemote Usage: /mf demote (player-name) +UsageDesc Usage: /mf desc (description) +UsageEditLaw Usage: /mf editlaw (number) (edited law) +UsageFlagsSet Usage: /mf flags set (option) (value) +UsageForceBonusPower Usage: /mf force bonuspower 'faction' 'number' +UsageForceClaim Usage: /mf force claim 'faction name' +UsageForceCreate Usage: /mf force create 'factionName' +UsageForceDemote Usage: /mf force demote (player) +UsageForceFlag Usage: /mf force flag 'faction' 'option' 'value' +UsageForceJoin Usage: /mf force join 'player' 'faction' +UsageForceKick Usage: /mf force kick (player) +UsageForcePeace Usage: /mf force peace 'faction-1' 'faction-2' +UsageForcePower Usage: /mf force power 'player' 'number' +UsageForceRemoveVassal /mf force removevassal 'faction-1' 'faction-2' +UsageForceRename Usage: /mf force rename 'faction' 'new name' +UsageForceRenounce Usage: /mf force renounce 'faction' +UsageForceTransfer Usage: /mf force transfer 'factionName' 'player' +UsageGrantAccess Usage: /mf grantaccess (player-name) +UsageGrantIndependence Usage: /mf grantindependence (faction-name) +UsageInvite Usage: /mf invite (player-name) +UsageInvoke Usage: /mf invoke '(allied faction name)' '(warring faction)' +UsageJoin Usage: /mf join (faction-name) +UsageKick Usage: /mf kick (player-name) +UsageMakePeace Usage: /mf makepeace (faction-name) +UsagePrefix Usage: /mf prefix (new prefix) +UsagePromote Usage: /mf promote (player-name) +UsageRemoveLaw Usage: /mf removelaw (number) +UsageRename Usage: /mf rename (newName) +UsageRevokeAccess Usage: /mf revokeaccess (player-name) +UsageSwearFealty Usage: /mf swearfealty (faction-name) +UsageTransfer Usage: /mf transfer (player-name) +UsageVassalize Usage: /mf vassalize (faction-name) +UsageWho Usage: /mf who (player-name) +ValidSubCommandsShowSet Valid sub-commands: show, set +VassalContribution Bonus Power From Vassals: %d +Vassals Vassals: %s +WarningPlayerAlreadyStartedCreatingGate WARNING: Player has already started creating the gate. startCreatingGate() call ignored. +WasntFound '%s' wasn't found. +WelcomeBackLastLogout Welcome back %s. You last logged out %s ago. +WikiLink Wiki: https://github.com/dmccoystephenson/Medieval-Factions/wiki +Wilderness Wilderness +WorldsMismatch1 Error placing point 1: Worlds mismatch. +WorldsMismatch2 Error placing point 2: Worlds mismatch. \ No newline at end of file diff --git a/src/main/resources/es.tsv b/src/main/resources/es.tsv index 1c3d31e78..348a4331c 100644 --- a/src/main/resources/es.tsv +++ b/src/main/resources/es.tsv @@ -1,551 +1,551 @@ -AcceptedChallengeDuelHasBegun Has aceptado el desafío de %s, comienza el duelo. -AlertAccessGrantedTo Acceso otorgado a %s -AlertAccessRevokedFor Acceso quitado a %s -AlertAllianceHasBeenBroken %s ha roto su alianza a tu facción. -AlertAlreadyAtWarWith Tu facción ya está en conflicto con %s. -AlertAlreadyCreatingGate Ya estás creando un portón. -AlertAlreadyDueling Ya estás en un duelo. -AlertAlreadyDuelingPlayer Ya estás en duelo con %s. -AlertAlreadyDuelingSomeone Ya estás en duelo con alguien. -AlertAlreadyGrantingAccess Ya estás otorgando acceso a alguien. Escribe '/mf daracceso cancelar' para cancelar esto. -AlertAlreadyInFaction Perdona, ya estás en una facción. -AlertAlreadyRequestedAlliance Ya has pedido alianza con esta facción. -AlertAlreadyRequestedPeace Ya has pedido paz con esta facción. -AlertAttemptedAlliance %s ha intentado aliarse con %s. -AlertAttemptedVassalization %s ha intentado avasallar tu facción. Si eres el propietario, escribe '/mf jurarlealtad %s' para aceptar. -AlertBeenInvited Has sido invitado a %s. Escribe '/mf unirse %s' para unirte. -AlertCalledToWar1 %s ha llamado a tu facción a su conflicto contra %s. -AlertCalledToWar2 %s ha llamado a %s a su conflicto contra tu facción. -AlertCalledToWar3 Tu facción ha llamado a %s a tu conflicto contra %s. -AlertChallengedToDuel %s ha desafíado a %s a un duelo. -AlertChallengedToDuelPlusHowTo %s te ha desafíado a un duelo. Escribe '/mf duelo aceptar' para comenzar. -AlertChallengeIssued Has desafíado a %s a un duelo. -AlertChallengeWasAccepted %s ha aceptado tu desafío, comienza el duelo. -AlertChangedGateName Cambiado el nombre del portón a '%s'. -AlertCurrentPowerLevel Tu poder actual es %d/%d. -AlertDecreasingThePowerOfInactivePlayers Medieval Factions está disminuyendo el poder de cada jugador en %d si no se han conectado por más de %d minutos. Esto pasará cada %d minutos. -AlertDemotion Has sido degradado al rango de miembro en tu facción. -AlertDisbandmentDueToZeroPower Tu facción se ha disuelto al caer su poder total a cero. -AlertFactionAttemptedToVassalize Tu facción ha intentado avasallar a %s. -AlertFactionHasBeenVassalized Tu facción ha sido avasallada y tiene un nuevo señorío: %s. -AlertFactionHasNewVassal Tu facción tiene un nuevo vasallo: %s. -AlertFactionHomeRemoved Tu hogar de facción ha sido eliminado. -AlertFactionIsWeakened Tu facción tiene menos de la mitad de su poder máximo. Ya no recibirá poder adicional de los vasallos y tus vasallos ahora son vulnerables. -AlertForcedDemotion Has sido forzadamente degradado de tu rango de oficial en tu facción. -AlertForcedKick Has sido expulsado de tu facción. -AlertForcedLoad Medieval Factions ha sido forzado a cargar. -AlertForcedSave Medieval Factions ha sido forzado a guardar. -AlertForcedToJoinFaction Has sido forzado a unirte a una facción. -AlertGate Este es el portón de '%s'. -AlertGrantedIndependence %s ha otorgado independencia a tu facción. -AlertIncreasingThePowerOfEveryPlayer Medieval Factions está aumentando el poder de cada jugador en %d. Esto pasará cada %d minutos. -AlertJoinedFaction Te has unido a la facción. -AlertKicked Has sido expulsado de tu facción por %s. -AlertLandClaimed Tierra reclamada. Tamaño del Dominio: %d/%d -AlertLandConqueredFromAnotherFaction Tierra conquistada de %s. Tamaño del Dominio: %d/%d -AlertLandConqueredFromYourFaction %s ha conquistado tierra de tu facción. -AlertLeftFaction Has abandonado tu facción. -AlertLeftFactionAndItGotDeleted Has abandonado tu facción. Ha sido disuelta ya que no quedaban miembros. -AlertMoreClaimedChunksThanPower Tu facción tiene más tierras que poder. Tus tierras pueden ser conquistadas. -AlertMustBeAtWarToConquer Ambas facciones tienen que estar en conflicto para poder conquistar sus tierras. -AlertMustBeInFactionToUseCommand Tienes que estar en una facción para usar este comando. -AlertMustBeMemberToCreateGate Tienes que ser miembro de esta facción para crear un portón. -AlertMustBeOfficerOrOwnerToClaimLand Tienes que ser oficial o propietario de una facción para reclamar tierra. -AlertMustBeOwnerOrOfficerToCreateGate Tienes que ser oficial o propietario de una facción para crear un portón. -AlertMustBeOwnerOrOfficerToUseCommand Tienes que ser oficial o propietario de una facción para usar este comando. -AlertMustBeOwnerToInvokeAlliance Tienes que ser el propietario de tu facción para llamar a una alianza. -AlertMustBeOwnerToUseCommand Tienes que ser el propietario de una facción para usar este comando. -AlertMustKickAllPlayers Tienes que expulsar a todos los miembros antes de disolver tu facción. -AlertNoGatesDefined Tu facción no tiene portones. -AlertNoLaws Tu facción no tiene leyes. -AlertNoLongerVassalFaction %s ya no es una facción avasallada. -AlertNonOwnership Esto no te pertenece. -AlertNoPendingChallenges No tienes desafíos pendientes para cancelar. -AlertNotAllied Tu facción no está aliada con %s. -AlertNotBeenChallenged No has sido desafíado a un duelo por nadie. -AlertNotBeenChallengedByPlayer No has sido desafíado a un duelo por '%s'- -AlertNotInFaction No estás en una facción. -AlertNotInvitedToFaction No has sido invitado a esta facción. -AlertNotOfferedVassalizationBy No se te ha ofrecido vasallaje por esta facción. -AlertNowAlliedWith Tu facción ahora está aliada con %s. -AlertNowAtPeaceWith %s ahora está en paz con %s. -AlertPlayerAlreadyOwner Ese jugador ya es miembro de esa facción. -AlertPlayerNotInFaction Este jugador no está en esta facción. -AlertPowerLevelDecreased Tu poder ha disminuido. -AlertPowerLevelIncreasedBy Te sientes más fuerte. Tu poder ha aumentado en %d. -AlertReachedDemesne Has alcanzado el límite de tu dominio. Invita a más jugadores a tu facción para aumentar el límite. -AlertUnlocked Desbloqueado. -AlertUnlockingCancelled Desbloqueo cancelado. -AllianceBrokenWith Alianza rota con %s. -AlliedWith Aliado con: %s -AllLandUnclaimed Todas las tierras han sido renunciadas. -AllLandUnclaimedFrom Todas las tierras de %s han sido renunciadas. -AlreadyEnteredCheckAccess Ya has usado este comando. Escribe '/mf veracceso cancelar' para cancelar. -AlreadyEnteredRevokeAccess Ya has usado este comando. Escribe '/mf quitaracceso cancelar' para cancelar. -AlreadyInFaction Perdona, ya estás en una facción. Abandónala si quieres crear una distinta. -ArgumentMustBeNumber El argumento debe ser un número. -ArgumentsSingleQuotesRequirement Los argumentos deben designarse entre comillas simples. -AssignedToRandomFaction Te han asignado a una facción aleatoria. -AttemptedAlliance Alianza intentada con %s -AttemptedPeace Pan intentada con %s -AtWarWith En Conflicto con: %s -AutoclaimToggled Reclamación automática de tierra habilitada. -BlockAlreadyLocked Este bloque ya está asegurado. -BlockIsNotLocked Este bloque no está asegurado. -BlockIsPartOfGateMustRemoveGate Este bloque es parte del portón '%s'. Debes eliminar este portón primero. -BonusPower Poder adicional de los administradores: %d -BooleanSet Boolean establecido. -Cancelled Cancelado. -CancelledGatePlacement1 Error estableciendo punto 1. Colocación de portón cancelada. -CancelledGatePlacement2 Error estableciendo punto 2. Colocación de portón cancelada. -CancelledGatePlacementErrorLinking Error estableciendo una palanca. Colocación de portón cancelada. -CannotAllyWithSelf No puedes aliarte con tu propia facción. -CannotAttackFactionMember No puedes atacar a otro jugador si sois parte de la misma facción. -CannotAttackNonWarringPlayer No puedes atacar a otro jugador si vuestras facciones no están en conflicto. -CannotBreakAllianceWithSelf No puedes romper alianza con tu propia facción. -CannotBringNeutralFactionIntoWar No puedes traer facciones neutrales a la guerra. -CannotCancelActiveDuel No puedes cancelar un duelo en progreso. -CannotDeclareWarIfLiegeNotWeakened No puedes declarar conflicto contra esta facción ya que son vasallos, a no ser que su señorío se debilite. -CannotDeclareWarIfNeutralFaction Las facciones neutrales no pueden declarar la guerra. -CannotDeclareWarOnAlly No puedes declarar conflicto contra tus aliados. -CannotDeclareWarOnLiege No puedes declarar guerra contra tu señorío. Intenta '/mf declararindependencia' en su lugar. -CannotDeclareWarOnNeutralFaction No puedes declarar la guerra a una facción neutral. -CannotDeclareWarOnVassal No puedes declarar conflicto contra tus vasallos. -CannotDeclareWarOnYourself No puedes declarar conflicto contra tí mismo. -CannotDemoteSelf No puedes degradarte a ti mismo. -CannotDuelSelf No puedes tener un duelo contra tí mismo. -CannotFindDynmap No se puede encontrar DynMap. -CannotForciblyKickOwner No se puede expulsar a un propietario de su facción forzadamente. Intenta disolver la facción. -CannotGrantAccessToSelf No puedes concederte acceso a ti mismo. -CannotKickOwner No puedes expulsar al propietario. -CannotKickSelf No puedes expulsarte a tí mismo. -CannotMakePeaceWithSelf No puedes hacer paces con tu propia facción. -CannotPlaceChestsNextToUnownedLockedChests No puedes colocar cofres al lado de cofres asegurados que no son tuyos. -CannotPlaceHoppersNextToUnownedLockedChests No puedes colocar hoppers al lado, sobre, o bajo cofres asegurados que no son tuyos. -CannotPromoteSelf No puedes promocionarte a ti mismo. -CannotRevokeAccessFromSelf No puede revocar el acceso a usted mismo. -CannotSetFactionHomeInWilderness No puedes establecer tu hogar de facción en tierra que tu facción no ha reclamado. -CannotSetVersion No se puede establecer la versión. -CannotTransferToSelf No puedes transferirte la propiedad de tu facción a tí mismo. -CannotVassalizeLiege No puedes avasallar a tu señorío. -CannotVassalizeSelf No puedes avasallar a tu propia facción. -CannotVassalizeVassal No puedes avasallar una facción que ya tiene un señorío. -CanOnlyCreateGatesInClaimedTerritory Solo puedes crear portones en territorio reclamado. -CanOnlyLockBlocksInClaimedTerritory Solo puedes asegurar bloques en territorio reclamado por tu facción. -CanOnlyLockInFactionTerritory Solo puedes asegurar cosas en territorio de tu facción. -CanOnlyLockSpecificBlocks Solo puedes asegurar cofres, puertas, barriles, trampillas, hornos, yunques o puertas de vallas. -ClaimedChunksLoaded Tierras reclamadas cargadas. -ClaimedChunksSuccessfullyLoaded Tierras reclamadas cargadas con éxito. -ClickOnTriggerLever Haz click en la palanca vinculada... -ClickToPlaceSecondCorner Haz click para colocar la segunda esquina... -CmdAddLaw añadirley -CmdAlly aliar -CmdAutoClaim autoreclamar -CmdBreakAlliance romperalianza -CmdBypass bypass -CmdChat chat -CmdCheckAccess veracceso -CmdCheckClaim verreclamacion -CmdClaim reclamar -CmdConfig config -CmdConfigSet establecer -CmdConfigShow ver -CmdCreate crear -CmdDeclareIndependence declararindependencia -CmdDeclareWar declararconflicto -CmdDemote degradar -CmdDesc desc -CmdDisband disolver -CmdDuel duelo -CmdDuelAccept aceptar -CmdDuelCancel cancelar -CmdDuelChallenge desafiar -CmdEditLaw editarley -CmdFlags banderas -CmdFlagsSet colocar -CmdFlagsShow show -CmdForce forzar -CmdForceBonusPower extrapoder -CmdForceClaim afirmar -CmdForceCreate crear -CmdForceDemote degradar -CmdForceFlag flag -CmdForceJoin unirse -CmdForceKick expulsar -CmdForceLoad cargar -CmdForcePeace paz -CmdForcePower poder -CmdForceRename renombrar -CmdForceRenounce abdicar -CmdForceSave guardar -CmdForceTransfer transferir -CmdForceUnlock desbloquear -CmdGate porton -CmdGateCancel cancelar -CmdGateCreate crear -CmdGateList lista -CmdGateName nombre -CmdGateRemove quitar -CmdGrantAccess daracceso -CmdGrantIndependence otorgarindependencia -CmdHelp ayuda -CmdHome hogar -CmdInfo info -CmdInvite invitar -CmdInvoke invocar -CmdJoin unirse -CmdKick expulsar -CmdLaws leyes -CmdLeave abandonar -CmdList lista -CmdLock asegurar -CmdMakePeace hacerpaces -CmdMembers miembros -CmdPower poder -CmdPrefix prefijo -CmdPromote ascender -CmdRemoveLaw quitarley -CmdRename renombrar -CmdResetPowerLevels reiniciarpoder -CmdRevokeAccess quitaracceso -CmdSetHome establecerhogar -CmdSwearFealty jurarlealtad -CmdTransfer transferir -CmdUnclaim renunciar -CmdUnclaimall renunciartodo -CmdUnlock desasegurar -CmdVassalize avasallar -CmdVersion version -CmdWho quien -CommandCancelled Comando cancelado. -CommandNotRecognized Medieval Factions no reconoce este comando. -CommandsPage1 == Medieval Factions, Página de Comandos 1/%d == -CommandsPage2 == Medieval Factions, Página de Comandos 2/%d == -CommandsPage3 == Medieval Factions, Página de Comandos 3/%d == -CommandsPage4 == Medieval Factions, Página de Comandos 4/%d == -CommandsPage5 == Medieval Factions, Página de Comandos 5/%d == -CommandsPage6 == Medieval Factions, Página de Comandos 6/%d == -CommandsPage7 == Comandos de Facciones Medievales Página 7 /% d == -ConfigListPageOne ===== Página de lista de configuración 1/2 ===== -ConfigListPageTwo ===== Página de lista de configuración 2/2 ===== -CreatingGateCancelled Creación de portón cancelada. -CreatingGateClickWithHoe Creando portón. Haz click en un bloque con una Azada de Oro para seleccionar la primera esquina. -CuboidDisallowed1 Error estableciendo el punto 1: No puedes colocar un cuboide. -CuboidDisallowed2 Error estableciendo el punto 2: No puedes colocar un cuboide. -CurrentLanguageID El ID de Lenguaje actual es: %s -CurrentlyNoFactions Actualmente no hay facciones. -CurrentPowerLevel El poder actual de %s es %d/%d. -Defeated %s ha derrotado a %s en un duelo. -DemesneSize Tamaño del Dominio: %d/%d -Description Descripción: %s -DescriptionSet Descripción establecida. -DesignatedFactionNotFound Una de las facciones escritas no fue encontrada. -DesiredPowerMustBeANumber El poder deseado debe ser un número. -DeveloperList Desarrolladores: %s -DisbandmentDueToZeroPower %s se ha disuelto al caer su poder a cero. -DoesntExist %s no existe. -Done Hecho. -DoubleSet Doble establecido. -DuelChallengeCancelled Desafío de duelo cancelado. -DuelEndedInTie El duelo entre %s y %s acabó en empate. -DynmapIntegrationSuccessful Integración con Dynmap exitosa. -ERROR ERROR: -ErrorAddingAreaMarker Error añadiendo marcador de área %s -ErrorChunkRemoval Un error ha ocurrido durante la eliminación de tierras reclamadas. -ErrorClaimedChunkRemoval Un error ha ocurrido durante la eliminación de tierras reclamadas. -ErrorCouldNotFindGatesFaction Error: No se pudo encontrar la facción del portón '%s'. -ErrorCouldNotLoadFactionGate Error: No se pudo cargar el portón de facción. \n -ErrorCreatingMarkerSet Error creando grupo de marcadores. -ErrorIntegratingWithDynmap Error en la integración con Dynmap. -ErrorPlayerPowerRecordForUUIDNotFound ERROR: No se encontraron Registros de Poder de Jugador para el UUID. No se pudo obtener el poder total. -ErrorSettingAreaMarkerColor Error al establecer el color del marcador de área en '%s'. -FactionAlreadyAlly Esta facción ya es tu aliada. -FactionAlreadyExists Perdona. Esta facción ya existe. -FactionAndPlayerSingleQuotesRequirement Facción y jugador deben ser designados entre comillas simples. -FactionAndVassalSingleQuotesRequirement La facción y el vasallo a eliminar deben estar designados entre comillas simples. -FactionCreated Facción creada. -FactionCurrentlyEnemyMustMakePeace Esta facción es actualmente tu enemiga. Haz las paces antes de intentar aliarte con ella. -FactionDataLoadedSuccessfuly Datos de facción cargados correctamente. -FactionDoesNotExist Perdona. Esta facción no existe. -FactionDoesNotHaveLaws Esta facción no tiene leyes. -FactionGates Portones de Facción. -FactionHomeLoadError Un error ha ocurrido cargando la posición del hogar de facción. -FactionHomeNotSetYet El hogar de facción no se ha establecido aún. -FactionHomeSet Hogar de facción establecido. -FactionInfo Información de Facción de %s -FactionIsNotVassal Esta facción no es tu vasallo. -FactionMustBeDesignatedInsideSingleQuotes Las facciones deben designarse entre comillas simples. -FactionNameChanged Nombre de facción cambiado. -FactionNameNotRecognized No se reconoce el nombre de facción. -FactionNameTooLong Ese nombre es demasiado largo. -FactionNotEnemy Esta facción no es tu enemiga. -FactionNotFound No se encontró la facción. -FactionsSuccessfullyLoaded Facciones cargadas exitosamente. -FactionsTitle == Facciones == -FactionSuccessfullyDisbanded Facción disuelta exitosamente. -FactionSuccessfullyLoaded Facción cargada exitosamente. -FileLoadError Un error ha ocurrido cargando el archivo. -FollowingPlayersHaveAccess Los siguientes jugadores tienen acceso a este bloque: -GateCreated Portón creado exitosamente. -HasAttemptedToMakePeaceWith %s ha intentado hacer las paces con %s. -HasBeenKickedFrom %s ha sido expulsado de %s -HasDeclaredIndependence %s ha declarado su independencia de %s. -HasDeclaredWarAgainst %s ha declarado conflicto contra %s. -HasJoined %s se ha unido a %s -HelpAddLaw /mf añadirley - Añade una ley a tu facción -HelpAlly /mf aliar - Intenta aliarte con una facción. -HelpAutoclaim /mf autoreclamar - Activa reclamación de tierra automática, reclamando la tierra por la que pases. -HelpBreakAlliance /mf romperalianza - Rompe alianza con una facción. -HelpBypass /mf bypass - Ignora protecciones. -HelpChat /mf chat - Activa el chat de facción. -HelpCheckAccess /mf veracceso - Revisa quién tiene acceso a un bloque asegurado. -HelpCheckClaim /mf verreclamacion - Revisa si una tierra está reclamada. -HelpClaim /mf reclamar - Reclama tierra para tu facción. -HelpConfigSet /mf config establecer (opción) (valor) - Establece un valor de configuración -HelpConfigShow /mf config ver - Muestra valores de configuración. -HelpCreate /mf crear (nombre) - Crea una nueva facción. -HelpDeclareIndependence /mf declararindependencia - Declara independencia de tu señorío. -HelpDeclareWar /mf declararconflicto - Declara conflicto contra otra facción. -HelpDemote /mf degradar - Degrada un oficial a miembro. -HelpDesc /mf desc (desc) - Establece la descripción de tu facción. -HelpDisband /mf disolver - Disuelve tu facción (tienes que ser propietario) -HelpDuelAccept /mf duelo aceptar (jugador) -HelpDuelCancel /mf duelo cancelar -HelpDuelChallenge /mf duelo desafiar (jugador) (límite de tiempo en segundos) -HelpEditLaw /mf editarley - Edita una ley que ya existe en tu facción. -HelpFlagsSet /mf banderas colocar (opción) (valor): establece una bandera de facción. -HelpFlagsShow /mf banderas show - Muestra banderas de facción. -HelpForce /mf forzar - Fuerza al plugin a realizar ciertas acciones. -HelpForceBonusPower /mf forzar extrapoder 'facción' 'número' -HelpForceClaim /mf force reclamo 'nombre de facción' -HelpForceCreate /mf forzar crear 'facción' -HelpForceDemote /mf forzar degradar (jugador) -HelpForceFlag /mf force flag 'facción' 'opción' 'valor' -HelpForceJoin /mf forzar unirse 'jugador' 'facción2' -HelpForceKick /mf forzar expulsar (jugador) -HelpForceLoad /mf forzar cargar -HelpForcePeace /mf forzar paz 'facción1' 'facción2' -HelpForcePower /mf forzar poder 'jugador' 'número' -HelpForceRemoveVassal /mf force removevassal 'facción' 'vasallo' -HelpForceRename /mf forzar renombrar 'facción' 'nuevo nombre' -HelpForceRenounce /mf forzar abdicar (facción) -HelpForceSave /mf forzar guardar -HelpForceTransfer /mf forzar transferir 'facción' 'jugador' -HelpForceUnlock /mf forzar desbloqueo -HelpGateCancel /mf portón cancelar -HelpGateCreate /mf portón crear (nombre) -HelpGateList /mf portón lista -HelpGateName /mf portón nombre (nombre) -HelpGateRemove /mf portón quitar -HelpGrantAccess /mf daracceso - Otorga a alguien acceso a un bloque asegurado. -HelpGrantIndependence /mf otorgarindependencia - Otorga a una facción avasallada su independencia. -HelpHelp /mf ayuda # - Muestra lista de comandos útiles. -HelpHome /mf hogar - Telepórtate a tu hogar de facción. -HelpInfo /mf info (facción) - Revisa la información de tu facción o cualquier otra. -HelpInvite /mf invitar (jugador) - Invita a un jugador a tu facción. -HelpInvoke /mf invocar (aliado) (enemigo) - Llama a una facción aliada a tu conflicto. -HelpJoin /mf unirse (facción) - Únete a una facción a la que te han invitado. -HelpKick /mf expulsar - Expulsa a un jugador de tu facción. -HelpLaws /mf leyes - Revisa las leyes de tu facción. -HelpLeave /mf abandonar - Abandona tu facción. -HelpList /mf lista - Lista de todas las facciones del servidor. -HelpLock /mf asegurar - Asegura un cofre o puerta. -HelpMakePeace /mf hacerpaces - Intenta hacer las paces con una facción. -HelpMap /mf map: muestra un mapa de las reclamaciones cercanas a sus alrededores. -HelpMembers /mf miembros - Lista de miembros de tu facción o cualquier otra. -HelpPower /mf poder - Revisa tu poder -HelpPrefix /mf prefijo (prefijo): establece el prefijo de tu facción -HelpPromote /mf ascender - Asciende a un jugador a oficial en tu facción. -HelpRemoveLaw /mf quitarley - Elimina una ley de tu facción. -HelpRename /mf renombrar - Renombra tu facción. -HelpResetPowerLevels /mf reiniciarpoder - Reinicia los registros de poder de jugador y el poder total de una facción. -HelpRevokeAccess /mf quitaracceso - Revoca el acceso de alguien a un bloque asegurado. -HelpSetHome /mf establecerhogar - Establece tu hogar de facción. -HelpSwearFealty /mf jurarlealtad - Jura lealtad a una facción como vasallo. -HelpTransfer /mf transferir - Transfiere propiedad de una facción a otro jugador.\n -HelpUnclaim /mf renunciar - Renuncia a tierras de tu facción. -HelpUnclaimall /mf renunciartodo - Renuncia a todas las tierras de tu facción. -HelpUnlock /mf desasegurar - Quita el seguro de un cofre o puerta. -HelpVassalize /mf avasallar - Ofrece avasallar a una facción como su señorío. -HelpVersion /mf version - Revisa la versión del plugin. -HelpWho /mf quien - Revisa la facción de un jugador. -HomeClaimedByAnotherFaction El hogar fue reclamado por otra facción y se perdió. -HomeIsInUnclaimedChunk El hogar es una tierra sin reclamar y no está disponible. -HourlySaveAlert Medieval Factions está guardando. Esto pasará cada hora. -IntegerSet Variable Entera (Integer) establecida. -InvitationExpired Tu invitación para %s ha caducado. -InvitationSent Invitación enviada. -KeysLoaded Claves cargadas: %d -LandAlreadyClaimedBy Esta tierra ya ha sido reclamada por -LandAlreadyClaimedByYourFaction Esta tierra ya ha sido reclamada por tu facción. -LandClaimedBy Esta tierra está reclamada por %s -LandClaimedUsingAdminBypass Tierra renunciada por medios de administrador. -LandIsNotClaimed Esta tierra no está reclamada. -LandIsUnclaimed Esta tierra está sin reclamar. -LandNotCurrentlyClaimed Esta tierra no está actualmente reclamada. -LandUnclaimed Tierra renunciada. -LawAdded Ley añadida. -LawEdited Ley editada. -LawRemoved Ley eliminada. -LawsTitle == Leyes de %s == -LeverSuccessfullyLinked Creando Portón 4/4: Palanca vinculada con éxto. -Liege Señorío: %s -ListLegend P: Poder, M: Miembros, L: Tierras -LoadingClaimedChunks Cargando tierras reclamdas... -LoadingLockedBLocks Cargando bloques asegurados... -LoadingPlayerPowerRecords Cargando registros de poder de jugador... -Locked Asegurado. -LockedBlockSuccessfullyLoaded Bloque asegurado cargado con éxito. -LockedBy Asegurado por %s -LockingCancelled Aseguramiento cancelado. -LockRemovalError Un error ha ocurrido durante la eliminación del seguro. -MaterialsMismatch1 Error colocando el punto 1: Los materiales no coinciden. -MaterialsMismatch2 Error colocando el punto 2: Los materiales no coinciden. -MedievalFactionsStringRight Medieval-Factions-%s -MedievalFactionsTitle == Medival Factions %s == -MembersOf Miembros de %s -MissingFactionGatesJSONCollection No se pudieron cargar los portones porque la colección 'factionGates' no existía en el archivo JSON de las facciones. ¿Estás actualizando de una versión anterior? Usando configuración por defecto. -MovementDetectedTeleportCancelled Movimiento detectado. Teleportación cancelada. -MustBeAtWarOrFactionMustBeInactive Tienes que estar en conflicto con la facción objetivo, o esta tiene que estar inactiva. -MustBeInFaction Perdona, tienes que estar en una facción para usar este comando. -MustBeOwner Perdona, tienes que ser el propietario de una facción para usar este comando. -MustOwnFactionOrBeOfficer Tienes que ser oficial o propietario de una facción para usar este comando. -MustTransferOwnership Perdona. Tienes que transferir propiedad o expulsar a todos de tu facción para abandonarla. -Name Nombre: %s -NameAlreadyTaken Este nombre ya está en uso. -NeutralityDisabled La neutralidad está actualmente deshabilitada. -NoBlockDetectedToCheckForGate No se ha detecado bloque para buscar portón. -NoFactionsDesignatedSingleQuotesRequired No se han designado facciones. Deben estar designadas entre comillas simples. -NoLongerBypassingProtections Ya no estás ignorando las protecciones otorgadas por Medieval Factions. -NoLongerInFactionChat Ya no estás hablando en Chat de Facción. -NotAMemberOfAnyFaction No eres miembro de ninguna facción. -NotAnAlly %s no es tu aliado. -NotAnAllyOrVassal %s no es un aliado o vasallo tuyo. -NotAtWarWith No estás en conflicto con %s -NotAVassalOfAFaction No eres vasallo de ninguna facción. +AcceptedChallengeDuelHasBegun Has aceptado el desafío de %s, comienza el duelo. +AlertAccessGrantedTo Acceso otorgado a %s +AlertAccessRevokedFor Acceso quitado a %s +AlertAllianceHasBeenBroken %s ha roto su alianza a tu facción. +AlertAlreadyAtWarWith Tu facción ya está en conflicto con %s. +AlertAlreadyCreatingGate Ya estás creando un portón. +AlertAlreadyDueling Ya estás en un duelo. +AlertAlreadyDuelingPlayer Ya estás en duelo con %s. +AlertAlreadyDuelingSomeone Ya estás en duelo con alguien. +AlertAlreadyGrantingAccess Ya estás otorgando acceso a alguien. Escribe '/mf daracceso cancelar' para cancelar esto. +AlertAlreadyInFaction Perdona, ya estás en una facción. +AlertAlreadyRequestedAlliance Ya has pedido alianza con esta facción. +AlertAlreadyRequestedPeace Ya has pedido paz con esta facción. +AlertAttemptedAlliance %s ha intentado aliarse con %s. +AlertAttemptedVassalization %s ha intentado avasallar tu facción. Si eres el propietario, escribe '/mf jurarlealtad %s' para aceptar. +AlertBeenInvited Has sido invitado a %s. Escribe '/mf unirse %s' para unirte. +AlertCalledToWar1 %s ha llamado a tu facción a su conflicto contra %s. +AlertCalledToWar2 %s ha llamado a %s a su conflicto contra tu facción. +AlertCalledToWar3 Tu facción ha llamado a %s a tu conflicto contra %s. +AlertChallengedToDuel %s ha desafíado a %s a un duelo. +AlertChallengedToDuelPlusHowTo %s te ha desafíado a un duelo. Escribe '/mf duelo aceptar' para comenzar. +AlertChallengeIssued Has desafíado a %s a un duelo. +AlertChallengeWasAccepted %s ha aceptado tu desafío, comienza el duelo. +AlertChangedGateName Cambiado el nombre del portón a '%s'. +AlertCurrentPowerLevel Tu poder actual es %d/%d. +AlertDecreasingThePowerOfInactivePlayers Medieval Factions está disminuyendo el poder de cada jugador en %d si no se han conectado por más de %d minutos. Esto pasará cada %d minutos. +AlertDemotion Has sido degradado al rango de miembro en tu facción. +AlertDisbandmentDueToZeroPower Tu facción se ha disuelto al caer su poder total a cero. +AlertFactionAttemptedToVassalize Tu facción ha intentado avasallar a %s. +AlertFactionHasBeenVassalized Tu facción ha sido avasallada y tiene un nuevo señorío: %s. +AlertFactionHasNewVassal Tu facción tiene un nuevo vasallo: %s. +AlertFactionHomeRemoved Tu hogar de facción ha sido eliminado. +AlertFactionIsWeakened Tu facción tiene menos de la mitad de su poder máximo. Ya no recibirá poder adicional de los vasallos y tus vasallos ahora son vulnerables. +AlertForcedDemotion Has sido forzadamente degradado de tu rango de oficial en tu facción. +AlertForcedKick Has sido expulsado de tu facción. +AlertForcedLoad Medieval Factions ha sido forzado a cargar. +AlertForcedSave Medieval Factions ha sido forzado a guardar. +AlertForcedToJoinFaction Has sido forzado a unirte a una facción. +AlertGate Este es el portón de '%s'. +AlertGrantedIndependence %s ha otorgado independencia a tu facción. +AlertIncreasingThePowerOfEveryPlayer Medieval Factions está aumentando el poder de cada jugador en %d. Esto pasará cada %d minutos. +AlertJoinedFaction Te has unido a la facción. +AlertKicked Has sido expulsado de tu facción por %s. +AlertLandClaimed Tierra reclamada. Tamaño del Dominio: %d/%d +AlertLandConqueredFromAnotherFaction Tierra conquistada de %s. Tamaño del Dominio: %d/%d +AlertLandConqueredFromYourFaction %s ha conquistado tierra de tu facción. +AlertLeftFaction Has abandonado tu facción. +AlertLeftFactionAndItGotDeleted Has abandonado tu facción. Ha sido disuelta ya que no quedaban miembros. +AlertMoreClaimedChunksThanPower Tu facción tiene más tierras que poder. Tus tierras pueden ser conquistadas. +AlertMustBeAtWarToConquer Ambas facciones tienen que estar en conflicto para poder conquistar sus tierras. +AlertMustBeInFactionToUseCommand Tienes que estar en una facción para usar este comando. +AlertMustBeMemberToCreateGate Tienes que ser miembro de esta facción para crear un portón. +AlertMustBeOfficerOrOwnerToClaimLand Tienes que ser oficial o propietario de una facción para reclamar tierra. +AlertMustBeOwnerOrOfficerToCreateGate Tienes que ser oficial o propietario de una facción para crear un portón. +AlertMustBeOwnerOrOfficerToUseCommand Tienes que ser oficial o propietario de una facción para usar este comando. +AlertMustBeOwnerToInvokeAlliance Tienes que ser el propietario de tu facción para llamar a una alianza. +AlertMustBeOwnerToUseCommand Tienes que ser el propietario de una facción para usar este comando. +AlertMustKickAllPlayers Tienes que expulsar a todos los miembros antes de disolver tu facción. +AlertNoGatesDefined Tu facción no tiene portones. +AlertNoLaws Tu facción no tiene leyes. +AlertNoLongerVassalFaction %s ya no es una facción avasallada. +AlertNonOwnership Esto no te pertenece. +AlertNoPendingChallenges No tienes desafíos pendientes para cancelar. +AlertNotAllied Tu facción no está aliada con %s. +AlertNotBeenChallenged No has sido desafíado a un duelo por nadie. +AlertNotBeenChallengedByPlayer No has sido desafíado a un duelo por '%s'- +AlertNotInFaction No estás en una facción. +AlertNotInvitedToFaction No has sido invitado a esta facción. +AlertNotOfferedVassalizationBy No se te ha ofrecido vasallaje por esta facción. +AlertNowAlliedWith Tu facción ahora está aliada con %s. +AlertNowAtPeaceWith %s ahora está en paz con %s. +AlertPlayerAlreadyOwner Ese jugador ya es miembro de esa facción. +AlertPlayerNotInFaction Este jugador no está en esta facción. +AlertPowerLevelDecreased Tu poder ha disminuido. +AlertPowerLevelIncreasedBy Te sientes más fuerte. Tu poder ha aumentado en %d. +AlertReachedDemesne Has alcanzado el límite de tu dominio. Invita a más jugadores a tu facción para aumentar el límite. +AlertUnlocked Desbloqueado. +AlertUnlockingCancelled Desbloqueo cancelado. +AllianceBrokenWith Alianza rota con %s. +AlliedWith Aliado con: %s +AllLandUnclaimed Todas las tierras han sido renunciadas. +AllLandUnclaimedFrom Todas las tierras de %s han sido renunciadas. +AlreadyEnteredCheckAccess Ya has usado este comando. Escribe '/mf veracceso cancelar' para cancelar. +AlreadyEnteredRevokeAccess Ya has usado este comando. Escribe '/mf quitaracceso cancelar' para cancelar. +AlreadyInFaction Perdona, ya estás en una facción. Abandónala si quieres crear una distinta. +ArgumentMustBeNumber El argumento debe ser un número. +ArgumentsSingleQuotesRequirement Los argumentos deben designarse entre comillas simples. +AssignedToRandomFaction Te han asignado a una facción aleatoria. +AttemptedAlliance Alianza intentada con %s +AttemptedPeace Pan intentada con %s +AtWarWith En Conflicto con: %s +AutoclaimToggled Reclamación automática de tierra habilitada. +BlockAlreadyLocked Este bloque ya está asegurado. +BlockIsNotLocked Este bloque no está asegurado. +BlockIsPartOfGateMustRemoveGate Este bloque es parte del portón '%s'. Debes eliminar este portón primero. +BonusPower Poder adicional de los administradores: %d +BooleanSet Boolean establecido. +Cancelled Cancelado. +CancelledGatePlacement1 Error estableciendo punto 1. Colocación de portón cancelada. +CancelledGatePlacement2 Error estableciendo punto 2. Colocación de portón cancelada. +CancelledGatePlacementErrorLinking Error estableciendo una palanca. Colocación de portón cancelada. +CannotAllyWithSelf No puedes aliarte con tu propia facción. +CannotAttackFactionMember No puedes atacar a otro jugador si sois parte de la misma facción. +CannotAttackNonWarringPlayer No puedes atacar a otro jugador si vuestras facciones no están en conflicto. +CannotBreakAllianceWithSelf No puedes romper alianza con tu propia facción. +CannotBringNeutralFactionIntoWar No puedes traer facciones neutrales a la guerra. +CannotCancelActiveDuel No puedes cancelar un duelo en progreso. +CannotDeclareWarIfLiegeNotWeakened No puedes declarar conflicto contra esta facción ya que son vasallos, a no ser que su señorío se debilite. +CannotDeclareWarIfNeutralFaction Las facciones neutrales no pueden declarar la guerra. +CannotDeclareWarOnAlly No puedes declarar conflicto contra tus aliados. +CannotDeclareWarOnLiege No puedes declarar guerra contra tu señorío. Intenta '/mf declararindependencia' en su lugar. +CannotDeclareWarOnNeutralFaction No puedes declarar la guerra a una facción neutral. +CannotDeclareWarOnVassal No puedes declarar conflicto contra tus vasallos. +CannotDeclareWarOnYourself No puedes declarar conflicto contra tí mismo. +CannotDemoteSelf No puedes degradarte a ti mismo. +CannotDuelSelf No puedes tener un duelo contra tí mismo. +CannotFindDynmap No se puede encontrar DynMap. +CannotForciblyKickOwner No se puede expulsar a un propietario de su facción forzadamente. Intenta disolver la facción. +CannotGrantAccessToSelf No puedes concederte acceso a ti mismo. +CannotKickOwner No puedes expulsar al propietario. +CannotKickSelf No puedes expulsarte a tí mismo. +CannotMakePeaceWithSelf No puedes hacer paces con tu propia facción. +CannotPlaceChestsNextToUnownedLockedChests No puedes colocar cofres al lado de cofres asegurados que no son tuyos. +CannotPlaceHoppersNextToUnownedLockedChests No puedes colocar hoppers al lado, sobre, o bajo cofres asegurados que no son tuyos. +CannotPromoteSelf No puedes promocionarte a ti mismo. +CannotRevokeAccessFromSelf No puede revocar el acceso a usted mismo. +CannotSetFactionHomeInWilderness No puedes establecer tu hogar de facción en tierra que tu facción no ha reclamado. +CannotSetVersion No se puede establecer la versión. +CannotTransferToSelf No puedes transferirte la propiedad de tu facción a tí mismo. +CannotVassalizeLiege No puedes avasallar a tu señorío. +CannotVassalizeSelf No puedes avasallar a tu propia facción. +CannotVassalizeVassal No puedes avasallar una facción que ya tiene un señorío. +CanOnlyCreateGatesInClaimedTerritory Solo puedes crear portones en territorio reclamado. +CanOnlyLockBlocksInClaimedTerritory Solo puedes asegurar bloques en territorio reclamado por tu facción. +CanOnlyLockInFactionTerritory Solo puedes asegurar cosas en territorio de tu facción. +CanOnlyLockSpecificBlocks Solo puedes asegurar cofres, puertas, barriles, trampillas, hornos, yunques o puertas de vallas. +ClaimedChunksLoaded Tierras reclamadas cargadas. +ClaimedChunksSuccessfullyLoaded Tierras reclamadas cargadas con éxito. +ClickOnTriggerLever Haz click en la palanca vinculada... +ClickToPlaceSecondCorner Haz click para colocar la segunda esquina... +CmdAddLaw añadirley +CmdAlly aliar +CmdAutoClaim autoreclamar +CmdBreakAlliance romperalianza +CmdBypass bypass +CmdChat chat +CmdCheckAccess veracceso +CmdCheckClaim verreclamacion +CmdClaim reclamar +CmdConfig config +CmdConfigSet establecer +CmdConfigShow ver +CmdCreate crear +CmdDeclareIndependence declararindependencia +CmdDeclareWar declararconflicto +CmdDemote degradar +CmdDesc desc +CmdDisband disolver +CmdDuel duelo +CmdDuelAccept aceptar +CmdDuelCancel cancelar +CmdDuelChallenge desafiar +CmdEditLaw editarley +CmdFlags banderas +CmdFlagsSet colocar +CmdFlagsShow show +CmdForce forzar +CmdForceBonusPower extrapoder +CmdForceClaim afirmar +CmdForceCreate crear +CmdForceDemote degradar +CmdForceFlag flag +CmdForceJoin unirse +CmdForceKick expulsar +CmdForceLoad cargar +CmdForcePeace paz +CmdForcePower poder +CmdForceRename renombrar +CmdForceRenounce abdicar +CmdForceSave guardar +CmdForceTransfer transferir +CmdForceUnlock desbloquear +CmdGate porton +CmdGateCancel cancelar +CmdGateCreate crear +CmdGateList lista +CmdGateName nombre +CmdGateRemove quitar +CmdGrantAccess daracceso +CmdGrantIndependence otorgarindependencia +CmdHelp ayuda +CmdHome hogar +CmdInfo info +CmdInvite invitar +CmdInvoke invocar +CmdJoin unirse +CmdKick expulsar +CmdLaws leyes +CmdLeave abandonar +CmdList lista +CmdLock asegurar +CmdMakePeace hacerpaces +CmdMembers miembros +CmdPower poder +CmdPrefix prefijo +CmdPromote ascender +CmdRemoveLaw quitarley +CmdRename renombrar +CmdResetPowerLevels reiniciarpoder +CmdRevokeAccess quitaracceso +CmdSetHome establecerhogar +CmdSwearFealty jurarlealtad +CmdTransfer transferir +CmdUnclaim renunciar +CmdUnclaimall renunciartodo +CmdUnlock desasegurar +CmdVassalize avasallar +CmdVersion version +CmdWho quien +CommandCancelled Comando cancelado. +CommandNotRecognized Medieval Factions no reconoce este comando. +CommandsPage1 == Medieval Factions, Página de Comandos 1/%d == +CommandsPage2 == Medieval Factions, Página de Comandos 2/%d == +CommandsPage3 == Medieval Factions, Página de Comandos 3/%d == +CommandsPage4 == Medieval Factions, Página de Comandos 4/%d == +CommandsPage5 == Medieval Factions, Página de Comandos 5/%d == +CommandsPage6 == Medieval Factions, Página de Comandos 6/%d == +CommandsPage7 == Comandos de Facciones Medievales Página 7 /% d == +ConfigListPageOne ===== Página de lista de configuración 1/2 ===== +ConfigListPageTwo ===== Página de lista de configuración 2/2 ===== +CreatingGateCancelled Creación de portón cancelada. +CreatingGateClickWithHoe Creando portón. Haz click en un bloque con una Azada de Oro para seleccionar la primera esquina. +CuboidDisallowed1 Error estableciendo el punto 1: No puedes colocar un cuboide. +CuboidDisallowed2 Error estableciendo el punto 2: No puedes colocar un cuboide. +CurrentLanguageID El ID de Lenguaje actual es: %s +CurrentlyNoFactions Actualmente no hay facciones. +CurrentPowerLevel El poder actual de %s es %d/%d. +Defeated %s ha derrotado a %s en un duelo. +DemesneSize Tamaño del Dominio: %d/%d +Description Descripción: %s +DescriptionSet Descripción establecida. +DesignatedFactionNotFound Una de las facciones escritas no fue encontrada. +DesiredPowerMustBeANumber El poder deseado debe ser un número. +DeveloperList Desarrolladores: %s +DisbandmentDueToZeroPower %s se ha disuelto al caer su poder a cero. +DoesntExist %s no existe. +Done Hecho. +DoubleSet Doble establecido. +DuelChallengeCancelled Desafío de duelo cancelado. +DuelEndedInTie El duelo entre %s y %s acabó en empate. +DynmapIntegrationSuccessful Integración con Dynmap exitosa. +ERROR ERROR: +ErrorAddingAreaMarker Error añadiendo marcador de área %s +ErrorChunkRemoval Un error ha ocurrido durante la eliminación de tierras reclamadas. +ErrorClaimedChunkRemoval Un error ha ocurrido durante la eliminación de tierras reclamadas. +ErrorCouldNotFindGatesFaction Error: No se pudo encontrar la facción del portón '%s'. +ErrorCouldNotLoadFactionGate Error: No se pudo cargar el portón de facción. \n +ErrorCreatingMarkerSet Error creando grupo de marcadores. +ErrorIntegratingWithDynmap Error en la integración con Dynmap. +ErrorPlayerPowerRecordForUUIDNotFound ERROR: No se encontraron Registros de Poder de Jugador para el UUID. No se pudo obtener el poder total. +ErrorSettingAreaMarkerColor Error al establecer el color del marcador de área en '%s'. +FactionAlreadyAlly Esta facción ya es tu aliada. +FactionAlreadyExists Perdona. Esta facción ya existe. +FactionAndPlayerSingleQuotesRequirement Facción y jugador deben ser designados entre comillas simples. +FactionAndVassalSingleQuotesRequirement La facción y el vasallo a eliminar deben estar designados entre comillas simples. +FactionCreated Facción creada. +FactionCurrentlyEnemyMustMakePeace Esta facción es actualmente tu enemiga. Haz las paces antes de intentar aliarte con ella. +FactionDataLoadedSuccessfuly Datos de facción cargados correctamente. +FactionDoesNotExist Perdona. Esta facción no existe. +FactionDoesNotHaveLaws Esta facción no tiene leyes. +FactionGates Portones de Facción. +FactionHomeLoadError Un error ha ocurrido cargando la posición del hogar de facción. +FactionHomeNotSetYet El hogar de facción no se ha establecido aún. +FactionHomeSet Hogar de facción establecido. +FactionInfo Información de Facción de %s +FactionIsNotVassal Esta facción no es tu vasallo. +FactionMustBeDesignatedInsideSingleQuotes Las facciones deben designarse entre comillas simples. +FactionNameChanged Nombre de facción cambiado. +FactionNameNotRecognized No se reconoce el nombre de facción. +FactionNameTooLong Ese nombre es demasiado largo. +FactionNotEnemy Esta facción no es tu enemiga. +FactionNotFound No se encontró la facción. +FactionsSuccessfullyLoaded Facciones cargadas exitosamente. +FactionsTitle == Facciones == +FactionSuccessfullyDisbanded Facción disuelta exitosamente. +FactionSuccessfullyLoaded Facción cargada exitosamente. +FileLoadError Un error ha ocurrido cargando el archivo. +FollowingPlayersHaveAccess Los siguientes jugadores tienen acceso a este bloque: +GateCreated Portón creado exitosamente. +HasAttemptedToMakePeaceWith %s ha intentado hacer las paces con %s. +HasBeenKickedFrom %s ha sido expulsado de %s +HasDeclaredIndependence %s ha declarado su independencia de %s. +HasDeclaredWarAgainst %s ha declarado conflicto contra %s. +HasJoined %s se ha unido a %s +HelpAddLaw /mf añadirley - Añade una ley a tu facción +HelpAlly /mf aliar - Intenta aliarte con una facción. +HelpAutoclaim /mf autoreclamar - Activa reclamación de tierra automática, reclamando la tierra por la que pases. +HelpBreakAlliance /mf romperalianza - Rompe alianza con una facción. +HelpBypass /mf bypass - Ignora protecciones. +HelpChat /mf chat - Activa el chat de facción. +HelpCheckAccess /mf veracceso - Revisa quién tiene acceso a un bloque asegurado. +HelpCheckClaim /mf verreclamacion - Revisa si una tierra está reclamada. +HelpClaim /mf reclamar - Reclama tierra para tu facción. +HelpConfigSet /mf config establecer (opción) (valor) - Establece un valor de configuración +HelpConfigShow /mf config ver - Muestra valores de configuración. +HelpCreate /mf crear (nombre) - Crea una nueva facción. +HelpDeclareIndependence /mf declararindependencia - Declara independencia de tu señorío. +HelpDeclareWar /mf declararconflicto - Declara conflicto contra otra facción. +HelpDemote /mf degradar - Degrada un oficial a miembro. +HelpDesc /mf desc (desc) - Establece la descripción de tu facción. +HelpDisband /mf disolver - Disuelve tu facción (tienes que ser propietario) +HelpDuelAccept /mf duelo aceptar (jugador) +HelpDuelCancel /mf duelo cancelar +HelpDuelChallenge /mf duelo desafiar (jugador) (límite de tiempo en segundos) +HelpEditLaw /mf editarley - Edita una ley que ya existe en tu facción. +HelpFlagsSet /mf banderas colocar (opción) (valor): establece una bandera de facción. +HelpFlagsShow /mf banderas show - Muestra banderas de facción. +HelpForce /mf forzar - Fuerza al plugin a realizar ciertas acciones. +HelpForceBonusPower /mf forzar extrapoder 'facción' 'número' +HelpForceClaim /mf force reclamo 'nombre de facción' +HelpForceCreate /mf forzar crear 'facción' +HelpForceDemote /mf forzar degradar (jugador) +HelpForceFlag /mf force flag 'facción' 'opción' 'valor' +HelpForceJoin /mf forzar unirse 'jugador' 'facción2' +HelpForceKick /mf forzar expulsar (jugador) +HelpForceLoad /mf forzar cargar +HelpForcePeace /mf forzar paz 'facción1' 'facción2' +HelpForcePower /mf forzar poder 'jugador' 'número' +HelpForceRemoveVassal /mf force removevassal 'facción' 'vasallo' +HelpForceRename /mf forzar renombrar 'facción' 'nuevo nombre' +HelpForceRenounce /mf forzar abdicar (facción) +HelpForceSave /mf forzar guardar +HelpForceTransfer /mf forzar transferir 'facción' 'jugador' +HelpForceUnlock /mf forzar desbloqueo +HelpGateCancel /mf portón cancelar +HelpGateCreate /mf portón crear (nombre) +HelpGateList /mf portón lista +HelpGateName /mf portón nombre (nombre) +HelpGateRemove /mf portón quitar +HelpGrantAccess /mf daracceso - Otorga a alguien acceso a un bloque asegurado. +HelpGrantIndependence /mf otorgarindependencia - Otorga a una facción avasallada su independencia. +HelpHelp /mf ayuda # - Muestra lista de comandos útiles. +HelpHome /mf hogar - Telepórtate a tu hogar de facción. +HelpInfo /mf info (facción) - Revisa la información de tu facción o cualquier otra. +HelpInvite /mf invitar (jugador) - Invita a un jugador a tu facción. +HelpInvoke /mf invocar (aliado) (enemigo) - Llama a una facción aliada a tu conflicto. +HelpJoin /mf unirse (facción) - Únete a una facción a la que te han invitado. +HelpKick /mf expulsar - Expulsa a un jugador de tu facción. +HelpLaws /mf leyes - Revisa las leyes de tu facción. +HelpLeave /mf abandonar - Abandona tu facción. +HelpList /mf lista - Lista de todas las facciones del servidor. +HelpLock /mf asegurar - Asegura un cofre o puerta. +HelpMakePeace /mf hacerpaces - Intenta hacer las paces con una facción. +HelpMap /mf map: muestra un mapa de las reclamaciones cercanas a sus alrededores. +HelpMembers /mf miembros - Lista de miembros de tu facción o cualquier otra. +HelpPower /mf poder - Revisa tu poder +HelpPrefix /mf prefijo (prefijo): establece el prefijo de tu facción +HelpPromote /mf ascender - Asciende a un jugador a oficial en tu facción. +HelpRemoveLaw /mf quitarley - Elimina una ley de tu facción. +HelpRename /mf renombrar - Renombra tu facción. +HelpResetPowerLevels /mf reiniciarpoder - Reinicia los registros de poder de jugador y el poder total de una facción. +HelpRevokeAccess /mf quitaracceso - Revoca el acceso de alguien a un bloque asegurado. +HelpSetHome /mf establecerhogar - Establece tu hogar de facción. +HelpSwearFealty /mf jurarlealtad - Jura lealtad a una facción como vasallo. +HelpTransfer /mf transferir - Transfiere propiedad de una facción a otro jugador.\n +HelpUnclaim /mf renunciar - Renuncia a tierras de tu facción. +HelpUnclaimall /mf renunciartodo - Renuncia a todas las tierras de tu facción. +HelpUnlock /mf desasegurar - Quita el seguro de un cofre o puerta. +HelpVassalize /mf avasallar - Ofrece avasallar a una facción como su señorío. +HelpVersion /mf version - Revisa la versión del plugin. +HelpWho /mf quien - Revisa la facción de un jugador. +HomeClaimedByAnotherFaction El hogar fue reclamado por otra facción y se perdió. +HomeIsInUnclaimedChunk El hogar es una tierra sin reclamar y no está disponible. +HourlySaveAlert Medieval Factions está guardando. Esto pasará cada hora. +IntegerSet Variable Entera (Integer) establecida. +InvitationExpired Tu invitación para %s ha caducado. +InvitationSent Invitación enviada. +KeysLoaded Claves cargadas: %d +LandAlreadyClaimedBy Esta tierra ya ha sido reclamada por +LandAlreadyClaimedByYourFaction Esta tierra ya ha sido reclamada por tu facción. +LandClaimedBy Esta tierra está reclamada por %s +LandClaimedUsingAdminBypass Tierra renunciada por medios de administrador. +LandIsNotClaimed Esta tierra no está reclamada. +LandIsUnclaimed Esta tierra está sin reclamar. +LandNotCurrentlyClaimed Esta tierra no está actualmente reclamada. +LandUnclaimed Tierra renunciada. +LawAdded Ley añadida. +LawEdited Ley editada. +LawRemoved Ley eliminada. +LawsTitle == Leyes de %s == +LeverSuccessfullyLinked Creando Portón 4/4: Palanca vinculada con éxto. +Liege Señorío: %s +ListLegend P: Poder, M: Miembros, L: Tierras +LoadingClaimedChunks Cargando tierras reclamdas... +LoadingLockedBLocks Cargando bloques asegurados... +LoadingPlayerPowerRecords Cargando registros de poder de jugador... +Locked Asegurado. +LockedBlockSuccessfullyLoaded Bloque asegurado cargado con éxito. +LockedBy Asegurado por %s +LockingCancelled Aseguramiento cancelado. +LockRemovalError Un error ha ocurrido durante la eliminación del seguro. +MaterialsMismatch1 Error colocando el punto 1: Los materiales no coinciden. +MaterialsMismatch2 Error colocando el punto 2: Los materiales no coinciden. +MedievalFactionsStringRight Medieval-Factions-%s +MedievalFactionsTitle == Medival Factions %s == +MembersOf Miembros de %s +MissingFactionGatesJSONCollection No se pudieron cargar los portones porque la colección 'factionGates' no existía en el archivo JSON de las facciones. ¿Estás actualizando de una versión anterior? Usando configuración por defecto. +MovementDetectedTeleportCancelled Movimiento detectado. Teleportación cancelada. +MustBeAtWarOrFactionMustBeInactive Tienes que estar en conflicto con la facción objetivo, o esta tiene que estar inactiva. +MustBeInFaction Perdona, tienes que estar en una facción para usar este comando. +MustBeOwner Perdona, tienes que ser el propietario de una facción para usar este comando. +MustOwnFactionOrBeOfficer Tienes que ser oficial o propietario de una facción para usar este comando. +MustTransferOwnership Perdona. Tienes que transferir propiedad o expulsar a todos de tu facción para abandonarla. +Name Nombre: %s +NameAlreadyTaken Este nombre ya está en uso. +NeutralityDisabled La neutralidad está actualmente deshabilitada. +NoBlockDetectedToCheckForGate No se ha detecado bloque para buscar portón. +NoFactionsDesignatedSingleQuotesRequired No se han designado facciones. Deben estar designadas entre comillas simples. +NoLongerBypassingProtections Ya no estás ignorando las protecciones otorgadas por Medieval Factions. +NoLongerInFactionChat Ya no estás hablando en Chat de Facción. +NotAMemberOfAnyFaction No eres miembro de ninguna facción. +NotAnAlly %s no es tu aliado. +NotAnAllyOrVassal %s no es un aliado o vasallo tuyo. +NotAtWarWith No estás en conflicto con %s +NotAVassalOfAFaction No eres vasallo de ninguna facción. NotEnoughArgumentsDesignatedSingleQuotesRequired Insuficientes argumentos designados. Deben designarse entre comillas simples. -NotTheOwnerOfThisBlock No eres propietario de este bloque. -NotTheOwnerOfThisFaction No eres propietario de esta facción. -NoVassalOrLiegeReferences No hay referencias de vasallo o señorío asociadas a esta facción. -NowBypassingProtections Estás ignorando las protecciones otorgadas por Medieval Facctions. -NowSpeakingInFactionChat Estás hablando en Chat de Facción. -OnlyPlayersCanUseCommand Solo los jugadores pueden usar este comando. -OnlyUseLeversInClaimedTerritory Error: solo se pueden usar palancas en tierras reclamadas. -Owner Propietario: %s -OwnershipTransferred La propiedad de %s te ha sido transferida. -OwnerShipTransferredTo Propiedad transferida a %s -PermissionNeeded Perdona. Para usar este comando necesitas el siguiente permiso: '%s' -PlayerAlreadyDueling %s ya está en un duelo contra alguien. -PlayerAlreadyInFaction Perdona. Este jugador ya está en una facción. -PlayerAlreadyOfficer Este jugador ya es un oficial. -PlayerAndDesiredPowerSingleQuotesRequirement El jugador y el poder deseado deben designarse entre comillas simples. -PlayerByNameNotFound Perdona. No se pudo encontrar ningún jugador usando el nombre %s. -PlayerCantBePromotedBecauseOfLimit El jugador no se pudo ascender porque ya alcanzaste tu límite. Límite: %d -PlayerDemoted Jugador degradado. -PlayerIsNotInAFaction Este jugador no está en una facción. -PlayerIsNotInYourFaction Este jugador no está en tu facción. -PlayerIsNotMemberOfFaction Este jugador no es miembro de tu facción. -PlayerIsNotOfficerOfFaction Este jugador no es un oficial en tu facción. -PlayerNotFound Jugador no encontrado. -PlayerPowerRecordsLoaded Registros de Poder de Jugador cargados -PlayerPromoted Jugador ascendido. -PleaseWaitGate El portón es %s, por favor espere. -PluginDisabled Plugin Medieval Factions desactivado. -PluginDisabling Plugin Medieval Factions desactivándose... -PluginEnabled Plugin Medieval Factions activado. -PluginEnabling Plugin Medieval Factions activándose... -PluginLoading Plugin Medieval Factions cargando... -PluginSaving Plugin Medieval Factions guardando... -Point1PlacementSuccessful Creando Portón 1/4: Punto 1 puesto con éxito. -Point2PlacedSuccessfully Creando Portón 2/4: Punto 2 puesto con éxito. -Population Población: %d -PowerHasDecayed Tu poder ha decaído en %d desde la última vez que te desconectaste. Tu poder ahora es %d. -PowerLevel Poder: %s -PowerLevelHasBeenSetTo El poder de este jugador ha sido establecido en %d -PowerLevelHasIncreased Tu poder ha aumentado. -PowerLevelResetting Poder reiniciándose... -PrefixesDisabled Los prefijos están actualmente deshabilitados. -PrefixSet Prefijo establecido. -PrefixTaken Este prefijo ya está en uso. -ProblemLoadingClaimedChunks Error cargando tierras reclamadas. -ProblemLoadingFactions Error cargando facciones. -ProblemLoadingPowerRecords Error cargando Registros de Poder de Jugador. -PromotedToOfficer Has sido ascendido a oficial en tu facción. -RadiusRequirement El radio debe estar entre 0 y %d -RemovedGate Eliminado portón '%s'. -ResettingIndividualPowerRecords Reiniciando registros de poder individual. -RightClickCheckAccess Haz click derecho en un bloque asegurado para ver quién tiene acceso. Escribe '/mf veracceso cancelar' para cancelar. -RightClickForceUnlock ¡Haz clic derecho en un cofre o puerta para desbloquearlo a la fuerza! (Escriba /mf forzar desbloqueo cancelar para cancelar) -RightClickGrantAccess Haz click derecho en un cofre o puerta para dar acceso a %s. Escribe '/mf daracceso cancelar' para cancelar. -RightClickLock Haz click derecho en un cofre o puerta para asegurarlo. Escribe '/mf asegurar cancelar' para cancelar. -RightClickRevokeAccess Haz click derecho en un bloque asegurado para anular el acceso de este jugador. Escribe '/mf quitaracceso cancelar' para cancelar. -RightClickUnlock Haz click derecho en un cofre o puerta para quitar su seguro. Escribe '/mf desasegurar cancelar' para cancelar. -SchedulingHourlyAutoSave Programando guardado automático a cada hora... -SchedulingPowerDecrease Programando disminución de poder... -SchedulingPowerIncrease Programando aumento de poder... -SingleQuotesAlliedWarring La facción aliada y la facción en conflicto deben designarse entre comillas simples. -StringSet String designada. -SubCommands Sub-Comandos: -SuccessFactionMemberRemoval Éxito. Si el jugador estaba en una facción, ya no es miembro. -SuccessForceJoin Éxito. El jugador fue forzado a unirse a una facción. -SuccessfulDisbandment %s ha sido disuelto con éxito. -SuccessOfficerRemoval Éxito. Si el jugador era un oficial de alguna facción, ya no es el caso. -SuccessReferencesRemoved Las referencias se eliminaron con éxito. -SupportedLanguageIDList IDs de Lenguaje soportados: %s -SurroundedChunkProtected La facción objetivo ha reclamado las tierras al Norte, Este, Sur y Oeste de esta. No se puede reclamar. -TargetBlockNotPartOfGate El bloque objetivo no es parte de un portón. -TargetFactionNotOverClaiming La facción objetivo no tiene más tierra que su límite de dominio. -TeleportingAlert Teleportando en 3 segundos... -ThreeBlockRequirement Error colocando el punto 2: El portón debe ser 3 o más bloques de alto. -TriggerBlockNotLever El bloque accionador no era una palanca. Cancelada la colocación de portón. -UsageAddLaw Uso: /mf añadirley (nueva ley) -UsageAlly Uso: /mf aliar (facción) -UsageBreakAlliance Uso: /mf romperalianza (facción) -UsageClaimRadius Uso: /mf reclamar (radio) -UsageConfigSet Uso: /mf config establecer (opción) (value) -UsageConfigShow Uso: /mf config show (1 | 2) -UsageCreate Uso: /mf crear [facción] -UsageDeclareWar Uso: /mf declararconflicto (facción) -UsageDemote Uso: /mf degradar (jugador) -UsageDesc Uso: /mf desc (descripción) -UsageEditLaw Uso: /mf editarley (número) (ley editada) -UsageFlagsSet Uso: /mf banderas colocar (opción) (valor) -UsageForceBonusPower Uso: /mf forzar extrapoder 'facción' 'número' -UsageForceClaim Uso: /mf force reclamo 'nombre de facción' -UsageForceCreate Uso: /mf forzar crear 'facción' -UsageForceDemote Uso: /mf forzar degradar (jugador) -UsageForceFlag Uso: /mf force flag 'facción' 'opción' 'valor' -UsageForceJoin Uso: /mf forzar unirse 'jugador' 'facción' -UsageForceKick Uso: /mf forzar expulsar (jugador) -UsageForcePeace Uso: /mf forzar paz 'facción-1' 'facción-2' -UsageForcePower Uso: /mf forzar poder 'jugador' 'número' -UsageForceRemoveVassal /mf force removevassal 'facción-1' 'facción-2' -UsageForceRename Uso: mf forzar renombrar 'facción' 'nuevo nombre' -UsageForceRenounce Uso: /mf forzar abdicar 'facción' -UsageForceTransfer Uso: /mf forzar transferir 'nombreFacción' 'jugador' -UsageGrantAccess Uso: /mf daracceso (jugador) -UsageGrantIndependence Uso: /mf otorgarindependencia (facción) -UsageInvite Uso: /mf invitar (jugador) -UsageInvoke Uso: /mf invocar '(facción aliada)' '(facción en conflicto)' -UsageJoin Uso: /mf unirse (facción) -UsageKick Uso: /mf expulsar (jugador) -UsageMakePeace Uso: /mf hacerpaces (facción) -UsagePrefix Uso /mf prefijo (nuevo prefijo) -UsagePromote Uso: /mf ascender (jugador) -UsageRemoveLaw Uso: /mf quitarley (número) -UsageRename Uso: /mf renombrar (nuevo nombre) -UsageRevokeAccess Uso: /mf quitaracceso (jugador) -UsageSwearFealty Uso: /mf jurarlealtad (facción) -UsageTransfer Uso: /mf transferir (jugador) -UsageVassalize Uso: /mf avasallar (facción) -UsageWho Uso: /mf quien (jugador) -ValidSubCommandsShowSet Sub-Comandos válidos: ver, establecer -VassalContribution Poder adicional de vasallos: %d -Vassals Vasallos: %s -WarningPlayerAlreadyStartedCreatingGate ALERTA: El jugador ya ha empezado a crear el portón. Llamada a startCreatingGate() ignorada. -WasntFound No se encontró '%s'. -WelcomeBackLastLogout Bienvenido de vuelta, %s. Te desconectaste hace %s. -WikiLink Wiki: https://github.com/dmccoystephenson/Medieval-Factions/wiki -Wilderness Naturaleza -WorldsMismatch1 Error colocando el punto 1: Los mundos no coinciden. -WorldsMismatch2 Error colocando el punto 2: Los mundos no coinciden. \ No newline at end of file +NotTheOwnerOfThisBlock No eres propietario de este bloque. +NotTheOwnerOfThisFaction No eres propietario de esta facción. +NoVassalOrLiegeReferences No hay referencias de vasallo o señorío asociadas a esta facción. +NowBypassingProtections Estás ignorando las protecciones otorgadas por Medieval Facctions. +NowSpeakingInFactionChat Estás hablando en Chat de Facción. +OnlyPlayersCanUseCommand Solo los jugadores pueden usar este comando. +OnlyUseLeversInClaimedTerritory Error: solo se pueden usar palancas en tierras reclamadas. +Owner Propietario: %s +OwnershipTransferred La propiedad de %s te ha sido transferida. +OwnerShipTransferredTo Propiedad transferida a %s +PermissionNeeded Perdona. Para usar este comando necesitas el siguiente permiso: '%s' +PlayerAlreadyDueling %s ya está en un duelo contra alguien. +PlayerAlreadyInFaction Perdona. Este jugador ya está en una facción. +PlayerAlreadyOfficer Este jugador ya es un oficial. +PlayerAndDesiredPowerSingleQuotesRequirement El jugador y el poder deseado deben designarse entre comillas simples. +PlayerByNameNotFound Perdona. No se pudo encontrar ningún jugador usando el nombre %s. +PlayerCantBePromotedBecauseOfLimit El jugador no se pudo ascender porque ya alcanzaste tu límite. Límite: %d +PlayerDemoted Jugador degradado. +PlayerIsNotInAFaction Este jugador no está en una facción. +PlayerIsNotInYourFaction Este jugador no está en tu facción. +PlayerIsNotMemberOfFaction Este jugador no es miembro de tu facción. +PlayerIsNotOfficerOfFaction Este jugador no es un oficial en tu facción. +PlayerNotFound Jugador no encontrado. +PlayerPowerRecordsLoaded Registros de Poder de Jugador cargados +PlayerPromoted Jugador ascendido. +PleaseWaitGate El portón es %s, por favor espere. +PluginDisabled Plugin Medieval Factions desactivado. +PluginDisabling Plugin Medieval Factions desactivándose... +PluginEnabled Plugin Medieval Factions activado. +PluginEnabling Plugin Medieval Factions activándose... +PluginLoading Plugin Medieval Factions cargando... +PluginSaving Plugin Medieval Factions guardando... +Point1PlacementSuccessful Creando Portón 1/4: Punto 1 puesto con éxito. +Point2PlacedSuccessfully Creando Portón 2/4: Punto 2 puesto con éxito. +Population Población: %d +PowerHasDecayed Tu poder ha decaído en %d desde la última vez que te desconectaste. Tu poder ahora es %d. +PowerLevel Poder: %s +PowerLevelHasBeenSetTo El poder de este jugador ha sido establecido en %d +PowerLevelHasIncreased Tu poder ha aumentado. +PowerLevelResetting Poder reiniciándose... +PrefixesDisabled Los prefijos están actualmente deshabilitados. +PrefixSet Prefijo establecido. +PrefixTaken Este prefijo ya está en uso. +ProblemLoadingClaimedChunks Error cargando tierras reclamadas. +ProblemLoadingFactions Error cargando facciones. +ProblemLoadingPowerRecords Error cargando Registros de Poder de Jugador. +PromotedToOfficer Has sido ascendido a oficial en tu facción. +RadiusRequirement El radio debe estar entre 0 y %d +RemovedGate Eliminado portón '%s'. +ResettingIndividualPowerRecords Reiniciando registros de poder individual. +RightClickCheckAccess Haz click derecho en un bloque asegurado para ver quién tiene acceso. Escribe '/mf veracceso cancelar' para cancelar. +RightClickForceUnlock ¡Haz clic derecho en un cofre o puerta para desbloquearlo a la fuerza! (Escriba /mf forzar desbloqueo cancelar para cancelar) +RightClickGrantAccess Haz click derecho en un cofre o puerta para dar acceso a %s. Escribe '/mf daracceso cancelar' para cancelar. +RightClickLock Haz click derecho en un cofre o puerta para asegurarlo. Escribe '/mf asegurar cancelar' para cancelar. +RightClickRevokeAccess Haz click derecho en un bloque asegurado para anular el acceso de este jugador. Escribe '/mf quitaracceso cancelar' para cancelar. +RightClickUnlock Haz click derecho en un cofre o puerta para quitar su seguro. Escribe '/mf desasegurar cancelar' para cancelar. +SchedulingHourlyAutoSave Programando guardado automático a cada hora... +SchedulingPowerDecrease Programando disminución de poder... +SchedulingPowerIncrease Programando aumento de poder... +SingleQuotesAlliedWarring La facción aliada y la facción en conflicto deben designarse entre comillas simples. +StringSet String designada. +SubCommands Sub-Comandos: +SuccessFactionMemberRemoval Éxito. Si el jugador estaba en una facción, ya no es miembro. +SuccessForceJoin Éxito. El jugador fue forzado a unirse a una facción. +SuccessfulDisbandment %s ha sido disuelto con éxito. +SuccessOfficerRemoval Éxito. Si el jugador era un oficial de alguna facción, ya no es el caso. +SuccessReferencesRemoved Las referencias se eliminaron con éxito. +SupportedLanguageIDList IDs de Lenguaje soportados: %s +SurroundedChunkProtected La facción objetivo ha reclamado las tierras al Norte, Este, Sur y Oeste de esta. No se puede reclamar. +TargetBlockNotPartOfGate El bloque objetivo no es parte de un portón. +TargetFactionNotOverClaiming La facción objetivo no tiene más tierra que su límite de dominio. +TeleportingAlert Teleportando en 3 segundos... +ThreeBlockRequirement Error colocando el punto 2: El portón debe ser 3 o más bloques de alto. +TriggerBlockNotLever El bloque accionador no era una palanca. Cancelada la colocación de portón. +UsageAddLaw Uso: /mf añadirley (nueva ley) +UsageAlly Uso: /mf aliar (facción) +UsageBreakAlliance Uso: /mf romperalianza (facción) +UsageClaimRadius Uso: /mf reclamar (radio) +UsageConfigSet Uso: /mf config establecer (opción) (value) +UsageConfigShow Uso: /mf config show (1 | 2) +UsageCreate Uso: /mf crear [facción] +UsageDeclareWar Uso: /mf declararconflicto (facción) +UsageDemote Uso: /mf degradar (jugador) +UsageDesc Uso: /mf desc (descripción) +UsageEditLaw Uso: /mf editarley (número) (ley editada) +UsageFlagsSet Uso: /mf banderas colocar (opción) (valor) +UsageForceBonusPower Uso: /mf forzar extrapoder 'facción' 'número' +UsageForceClaim Uso: /mf force reclamo 'nombre de facción' +UsageForceCreate Uso: /mf forzar crear 'facción' +UsageForceDemote Uso: /mf forzar degradar (jugador) +UsageForceFlag Uso: /mf force flag 'facción' 'opción' 'valor' +UsageForceJoin Uso: /mf forzar unirse 'jugador' 'facción' +UsageForceKick Uso: /mf forzar expulsar (jugador) +UsageForcePeace Uso: /mf forzar paz 'facción-1' 'facción-2' +UsageForcePower Uso: /mf forzar poder 'jugador' 'número' +UsageForceRemoveVassal /mf force removevassal 'facción-1' 'facción-2' +UsageForceRename Uso: mf forzar renombrar 'facción' 'nuevo nombre' +UsageForceRenounce Uso: /mf forzar abdicar 'facción' +UsageForceTransfer Uso: /mf forzar transferir 'nombreFacción' 'jugador' +UsageGrantAccess Uso: /mf daracceso (jugador) +UsageGrantIndependence Uso: /mf otorgarindependencia (facción) +UsageInvite Uso: /mf invitar (jugador) +UsageInvoke Uso: /mf invocar '(facción aliada)' '(facción en conflicto)' +UsageJoin Uso: /mf unirse (facción) +UsageKick Uso: /mf expulsar (jugador) +UsageMakePeace Uso: /mf hacerpaces (facción) +UsagePrefix Uso /mf prefijo (nuevo prefijo) +UsagePromote Uso: /mf ascender (jugador) +UsageRemoveLaw Uso: /mf quitarley (número) +UsageRename Uso: /mf renombrar (nuevo nombre) +UsageRevokeAccess Uso: /mf quitaracceso (jugador) +UsageSwearFealty Uso: /mf jurarlealtad (facción) +UsageTransfer Uso: /mf transferir (jugador) +UsageVassalize Uso: /mf avasallar (facción) +UsageWho Uso: /mf quien (jugador) +ValidSubCommandsShowSet Sub-Comandos válidos: ver, establecer +VassalContribution Poder adicional de vasallos: %d +Vassals Vasallos: %s +WarningPlayerAlreadyStartedCreatingGate ALERTA: El jugador ya ha empezado a crear el portón. Llamada a startCreatingGate() ignorada. +WasntFound No se encontró '%s'. +WelcomeBackLastLogout Bienvenido de vuelta, %s. Te desconectaste hace %s. +WikiLink Wiki: https://github.com/dmccoystephenson/Medieval-Factions/wiki +Wilderness Naturaleza +WorldsMismatch1 Error colocando el punto 1: Los mundos no coinciden. +WorldsMismatch2 Error colocando el punto 2: Los mundos no coinciden. \ No newline at end of file diff --git a/src/main/resources/language.yml b/src/main/resources/language.yml index 21246573c..786b4240e 100644 --- a/src/main/resources/language.yml +++ b/src/main/resources/language.yml @@ -222,9 +222,37 @@ CancelledGatePlacement2: "&cError placing point 2. Cancelled gate placement." ThreeBlockRequirement: "&cError placing point 2: Gate must be 3 blocks or taller." ClickTBlock: "&eClick on the trigger block..." GateCreated: "&aGate successfully created." -CancelledGatePlacementErrorLinking: "&cError linking to lever. Cancelled gate placement." +CancelledGatePlacementErrorLinking: "&cError linking to lever. Cancelled gate placement." CanOnlyTrigger: "&cError: Can only use triggers in claimed territory." TriggerBlockNotPowerable: "&cTrigger block was not powerable. Cancelled gate placement." +CanOnlyLockInFactionTerritory: "&cYou can only lock things in your faction's territory." +BlockAlreadyLocked: "&cThis block is already locked." +Locked: "&cLocked." +Unlocked: "&aUnlocked." +CanOnlyLockSpecificBlocks: "&cYou can only lock chests, doors, barrels, trapdoors, furnaces, anvils or gates." +CanOnlyLockBlocksInClaimedTerritory: "&cYou can only lock blocks on land claimed by your faction." +NotTheOwnerOfThisBlock: "&cYou are not the owner of this block." +AlertAccessGrantedTo: "&cAccess granted to #name#" +FollowingPlayersHaveAccess: "&cThe following players have access to this block:" +AlertAccessRevokedFor: "&aAccess revoked for #name#" +FPHAList: "&b- #name#" +BonusPower: "&aBonus Power From Admins: #amount#" +VassalContribution: "&aBonus Power From Vassals: #amount#" +Fiefs: "&bFiefs: #fiefs#" +Liege: "&bLiege: #name#" +Vassals: "&bVassals: #name#" +Teleport: "&aTeleport in #time# seconds..." +TeleportCancelled: "&cTeleport cancelled." +FactionInfo: + - "&b#faction# Faction Info" + - "&bName: #name#" + - "&bOwner: #owner#" + - "&bDescription: #desc#" + - "&bPopulation: #pplt#" + - "&bAllied With: #aw#" + - "&bAt War With: #aww#" + - "&bPower Level: #pl/#pl_max#" + - "&bDemesne Size: #number#/#max#" PluginInfo: - "&b== Medieval Factions #version# ==" - "&bDevelopers: #dev#" diff --git a/src/main/resources/pt-br.tsv b/src/main/resources/pt-br.tsv index 703383651..80278670c 100644 --- a/src/main/resources/pt-br.tsv +++ b/src/main/resources/pt-br.tsv @@ -1,551 +1,551 @@ -AcceptedChallengeDuelHasBegun Você aceitou o desafio de %s's, o duelo começou. -AlertAccessGrantedTo Acesso garantido a %s -AlertAccessRevokedFor Acesso Revogado a %s -AlertAllianceHasBeenBroken %s Quebrou a aliança com sua facção. -AlertAlreadyAtWarWith Sua facção já esta em guerra com %s. -AlertAlreadyCreatingGate Você ja esta criando um portão. -AlertAlreadyDueling Você já esta duelando. -AlertAlreadyDuelingPlayer Você já esta duelando com %s. -AlertAlreadyDuelingSomeone Você já esta duelando com alguem. -AlertAlreadyGrantingAccess Você já esta garantindo acesso a alguem. Escreva /mf grantaccess cancel para cancelar isto. -AlertAlreadyInFaction Você já esta em uma facção, desculpe. -AlertAlreadyRequestedAlliance Você já solicitou uma aliança com esta facção. -AlertAlreadyRequestedPeace Você já solicitou paz com esta facção. -AlertAttemptedAlliance %s tentou se aliar com %s. -AlertAttemptedVassalization %s tentou vassalizar sua facção. Se você é o dono, digite '/mf swearfealty %s' para aceitar. -AlertBeenInvited Você foi convidado para %s. Escreva /mf join %s para entrar. -AlertCalledToWar1 %s chamou sua facção para a guerra com %s. -AlertCalledToWar2 %s chamou %s para entrar em guerra com sua facção. -AlertCalledToWar3 Sua facção foi chamada por %s em sua guerra com %s. -AlertChallengedToDuel %s desafiou %s para um duelo. -AlertChallengedToDuelPlusHowTo %s desafiou você para um duelo. escreva /mf duel accept para começar. -AlertChallengeIssued Você foi desafiado por %s para um duelo. -AlertChallengeWasAccepted %s aceitou o seu desafio, o duelo começou. -AlertChangedGateName Nome do portão definido como '%s'. -AlertCurrentPowerLevel Seu poder atual é %d/%d. -AlertDecreasingThePowerOfInactivePlayers Medieval Factions está diminuindo o poder de cada jogador em %d se eles não estiveram online em %d minutos. Isso vai acontecer a cada %d minutos. -AlertDemotion Você foi rebaixado ao status de membro em sua facção. -AlertDisbandmentDueToZeroPower Sua facção foi dissolvida devido ao seu poder cumulativo chegar a zero. -AlertFactionAttemptedToVassalize Sua facção tentou vassalizar %s. -AlertFactionHasBeenVassalized Sua facção foi vassalizada e tem um novo soberano: %s -AlertFactionHasNewVassal Sua facção tem um novo vassalo: %s -AlertFactionHomeRemoved A home de sua facção foi removida. -AlertFactionIsWeakened Sua facção tem menos da metade de seu poder máximo. Ela não receberá mais bônus de poder de vassalos e seus vassalos agora estão vulneráveis. -AlertForcedDemotion Você foi rebaixado à força do status de oficial em sua facção. -AlertForcedKick Você foi expulso a força da sua facção. -AlertForcedLoad Medieval factions esta fazendo um carregamento forçado. -AlertForcedSave Medieval Factions esta criando um save forçado. -AlertForcedToJoinFaction Você foi forçado a entrar em uma facção. -AlertGate Este é o portão '%s'. -AlertGrantedIndependence %s concedeu independência à sua facção. -AlertIncreasingThePowerOfEveryPlayer Medieval Factions está aumentando o poder de cada jogador por %d. Isto vai acontecer a cada %d minutos. -AlertJoinedFaction Você entrou na facção. -AlertKicked Você foi expulso da sua facção por %s. -AlertLandClaimed Terra reinvindicada. Tamanho: %d/%d -AlertLandConqueredFromAnotherFaction Terra conquistada por %s. Tamanho: %d/%d -AlertLandConqueredFromYourFaction %s conquistou terras de sua facção. -AlertLeftFaction Você saiu da sua facção. -AlertLeftFactionAndItGotDeleted Você saiu da sua facção. Ela foi excluida por não haver mais membros. -AlertMoreClaimedChunksThanPower Sua facção tem mais terras reivindicados do que poder. Sua terra pode ser conquistada. -AlertMustBeAtWarToConquer Suas facções devem estar em guerra para que você conquiste terras. -AlertMustBeInFactionToUseCommand Você precisa estar em uma facção para usar este comando. -AlertMustBeMemberToCreateGate Você precisa ser membro desta facção para criar um portão. -AlertMustBeOfficerOrOwnerToClaimLand Você precisa ser um oficial ou dono da facção para reinvindicar uma terra. -AlertMustBeOwnerOrOfficerToCreateGate Você precisa ser dono ou oficial da facção para criar um portão. -AlertMustBeOwnerOrOfficerToUseCommand Você precisa ser um oficial ou dono da facção para usar este comando. -AlertMustBeOwnerToInvokeAlliance Você precisa ser dono da facção para solicitar uma aliança. -AlertMustBeOwnerToUseCommand Você precisa ser dono da facção para usar este comando. -AlertMustKickAllPlayers Você precisa expulsar todos os membros antes de excluir uma facção. -AlertNoGatesDefined Sua facção não tem portões definidos. -AlertNoLaws Sua facção não tem nenhuma lei. -AlertNoLongerVassalFaction %s Não é mais um vassalo da facção. -AlertNonOwnership Isso não te pertence. -AlertNoPendingChallenges Você não tem duelos pendentes para cancelar. -AlertNotAllied Sua facção não é aliada com %s. -AlertNotBeenChallenged Você não foi desafiado a um duelo por ninguém. -AlertNotBeenChallengedByPlayer Você não foi desafiado a um duelo por '%s'. -AlertNotInFaction Você não esta em uma facção. -AlertNotInvitedToFaction Você não foi convidado por esta facção. -AlertNotOfferedVassalizationBy Esta facção não ofereceu vassalização a você. -AlertNowAlliedWith Sua facção não é aliada com %s. -AlertNowAtPeaceWith %s esta agora em paz com %s. -AlertPlayerAlreadyOwner Este membro já é dono da facção. -AlertPlayerNotInFaction Este membro não esta na facção. -AlertPowerLevelDecreased Seu nivel de poder desceu. -AlertPowerLevelIncreasedBy Você se sente forte. Seu poder foi aumentado em %d. -AlertReachedDemesne Você atingiu seu limite de propriedade. Convide mais jogadores para aumentar isso. -AlertUnlocked Desbloqueado. -AlertUnlockingCancelled Desbloqueamento cancelado. -AllianceBrokenWith Aliança quebrada com %s. -AlliedWith Aliado com: %s -AllLandUnclaimed Todas as terras foram abandonadas. -AllLandUnclaimedFrom Todas as terras foram abandonadas por %s. -AlreadyEnteredCheckAccess Você já entrou neste comando. Escreva '/mf checkaccess cancel' para cancelar. -AlreadyEnteredRevokeAccess Você já entrou neste comando. Escreva '/mf revokeaccess cancel' para cancelar. -AlreadyInFaction Desculpe, você já esta em uma facção. Saia dela se você deseja criar outra. -ArgumentMustBeNumber O argumento precisa ser um número. -ArgumentsSingleQuotesRequirement Os argumentos devem ser designados entre aspas simples. -AssignedToRandomFaction Você foi atribuído a uma facção aleatória. -AttemptedAlliance Tentativa de se aliar com %s -AttemptedPeace Tentativa de paz com %s -AtWarWith Em guerra com: %s -AutoclaimToggled Autoclaim alternado. -BlockAlreadyLocked Este bloco já esta bloqueado. -BlockIsNotLocked Este bloco não esta bloqueado. -BlockIsPartOfGateMustRemoveGate Este bloco é parte do portão '%s'. Você precisa remover o portão antes. -BonusPower Bonus de de poder por administradores: %d -BooleanSet Boleano definido. -Cancelled Cancelado. -CancelledGatePlacement1 Erro definindo ponto 1. Definição de portão cancelada. -CancelledGatePlacement2 Erro definindo ponto 2. Definição de portão cancelada. -CancelledGatePlacementErrorLinking Erro ao linkar com uma alavanca. Definição de portão cancelada. -CannotAllyWithSelf Você não pode aliar-se a sua propria facção. -CannotAttackFactionMember Você não pode atacar outro jogador que seja parte da sua facção. -CannotAttackNonWarringPlayer Você não pode atacar outro jogador se suas facções não estiverem em guerra. -CannotBreakAllianceWithSelf Você não pode quebrar uma aliança com sua propria facção. -CannotBringNeutralFactionIntoWar Você não pode trazer facções neutras para a guerra. -CannotCancelActiveDuel Você não pode cancelar um duelo ativo. -CannotDeclareWarIfLiegeNotWeakened Você não pode declarar guerra a esta facção, pois eles são vassalos, a menos que seu soberano esteja enfraquecido. -CannotDeclareWarIfNeutralFaction Facções neutras não podem declarar guerra. -CannotDeclareWarOnAlly Você não pode declarar guerra a um aliado. -CannotDeclareWarOnLiege Você não pode declarar guerra ao seu soberano. Tente '/mf declareindependence' em vez disso. -CannotDeclareWarOnNeutralFaction Você não pode declarar guerra contra uma facção neutra. -CannotDeclareWarOnVassal Você não pode declarar guerra ao seu próprio vassalo. -CannotDeclareWarOnYourself Você não pode declarar guerra a si mesmo. -CannotDemoteSelf Você não pode se rebaixar. -CannotDuelSelf Você não pode duelar contra si mesmo. -CannotFindDynmap Não pude encontrar o dynmap. -CannotForciblyKickOwner Você não pode expulsar à força um dono de sua facção. Tente dissolver a facção. -CannotGrantAccessToSelf Você não pode conceder acesso a si mesmo. -CannotKickOwner Você não pode expulsar um dono. -CannotKickSelf Você não pode expulsar a si mesmo. -CannotMakePeaceWithSelf Você não pode criar uma paz em sua propria facção. -CannotPlaceChestsNextToUnownedLockedChests Você não pode colocar baús ao lado de baús bloqueados que você não possui. -CannotPlaceHoppersNextToUnownedLockedChests Você não pode colocar tremonhas próximas, embaixo ou acima de baús trancados que você não possui. -CannotPromoteSelf Você não pode promover a si mesmo. -CannotRevokeAccessFromSelf Você não pode remover acesso de si mesmo. -CannotSetFactionHomeInWilderness Você não pode definir a home de sua facção em terras que ela não reivindicou. -CannotSetVersion Você não pode definir a versão. -CannotTransferToSelf Você não pode transferir o cargo de dono para si mesmo. -CannotVassalizeLiege Você não pode vassalizar seu soberano. -CannotVassalizeSelf Você não pode vassalizar sua própria facção. -CannotVassalizeVassal Você não pode vassalizar uma facção que já tem um soberano. -CanOnlyCreateGatesInClaimedTerritory Você só pode criar portões em terras reinvindicadas. -CanOnlyLockBlocksInClaimedTerritory Você só pode bloquear blocos em uma terra reinvindicada por sua facção. -CanOnlyLockInFactionTerritory You can only lock things in your faction's territory. -CanOnlyLockSpecificBlocks Você só pode bloquear baus, portas, barris, alçapões, fornalhas, bigornas ou portões. -ClaimedChunksLoaded Terras reinvindicadas carregadas. -ClaimedChunksSuccessfullyLoaded Terras reinvindicadas carregadas com sucesso. -ClickOnTriggerLever Clique na alavanca... -ClickToPlaceSecondCorner Clique para colocar o segundo canto... -CmdAddLaw Adicionar leis. -CmdAlly Aliados -CmdAutoClaim Auto reinvindicar -CmdBreakAlliance Quebrar Aliança -CmdBypass bypass -CmdChat chat -CmdCheckAccess Checar acesso -CmdCheckClaim Checar reinvindicação -CmdClaim Reinvindicar -CmdConfig Configurar -CmdConfigSet Definir -CmdConfigShow Mostrar -CmdCreate Criar -CmdDeclareIndependence Declarar independência -CmdDeclareWar Decralarar guerra -CmdDemote Rebaixar -CmdDesc Descrição -CmdDisband Remover -CmdDuel Duelo -CmdDuelAccept Aceitar -CmdDuelCancel Cancelar -CmdDuelChallenge Desafiar -CmdEditLaw Editar leis -CmdFlags Flags -CmdFlagsSet Definir flags -CmdFlagsShow Mostrar flags -CmdForce Forçar -CmdForceBonusPower Bonus de poder -CmdForceClaim Reinvindicar -CmdForceCreate Criar -CmdForceDemote Deletar -CmdForceFlag flag -CmdForceJoin Entrar -CmdForceKick Expulsar -CmdForceLoad Carregar -CmdForcePeace Paz -CmdForcePower Poder -CmdForceRename Renomear -CmdForceRenounce Renunciar -CmdForceSave Salvar -CmdForceTransfer Transferir -CmdForceUnlock Desbloquear -CmdGate Portão -CmdGateCancel Cancelar -CmdGateCreate Criar -CmdGateList Listar -CmdGateName Nome -CmdGateRemove Remover -CmdGrantAccess Garantir acesso -CmdGrantIndependence Garantir independência -CmdHelp Ajuda -CmdHome Home -CmdInfo Info -CmdInvite Convidar -CmdInvoke Invocar -CmdJoin Entrar -CmdKick Expulsar -CmdLaws Leis -CmdLeave Sair -CmdList Listar -CmdLock Bloquear -CmdMakePeace Criar paz -CmdMembers Membros -CmdPower Poder -CmdPrefix prefix -CmdPromote Promover -CmdRemoveLaw Remover lei -CmdRename Renomear -CmdResetPowerLevels Resetar níveis de poder -CmdRevokeAccess Remover acesso -CmdSetHome sethome -CmdSwearFealty juramento -CmdTransfer Transferir -CmdUnclaim Deixar terra -CmdUnclaimall Deixar todas as terras -CmdUnlock Desbloquear -CmdVassalize Vassalizar -CmdVersion Versão -CmdWho Quem -CommandCancelled Comando cancelado. -CommandNotRecognized Medieval Factions não reconhece este comando. -CommandsPage1 == Medieval Factions Pagínas de comando 1/%d == -CommandsPage2 = Medieval Factions Pagínas de comando 2/%d == -CommandsPage3 == Medieval Factions Pagínas de comando 3/%d == -CommandsPage4 == Medieval Factions Pagínas de comando 4/%d == -CommandsPage5 == Medieval Factions Pagínas de comando 5/%d == -CommandsPage6 == Medieval Factions Pagínas de comando 6/%d == -CommandsPage7 == Medieval Factions Pagínas de comando 7/%d == -ConfigListPageOne ===== Lista de configurações 1/2 ===== -ConfigListPageTwo ===== Lista de configurações 2/2 ===== -CreatingGateCancelled Criação de portão cancelada. -CreatingGateClickWithHoe Criando portão. Clique em um bloco com uma enxada de ouro para selecionar o primeiro ponto. -CuboidDisallowed1 Erro ao colocar o ponto 1: você não pode colocar um bloco. -CuboidDisallowed2 Erro ao colocar o ponto 2: você não pode colocar um bloco. -CurrentLanguageID Linguagem atual ID: %s -CurrentlyNoFactions Atualmente não há facções. -CurrentPowerLevel %s's nível de poder atual é %d/%d. -Defeated %s foi derrotado por %s em um duelo. -DemesneSize Tamanho: %d/%d -Description Descrição: %s -DescriptionSet Descrição definida. -DesignatedFactionNotFound Uma das facções designadas não foi encontrada. -DesiredPowerMustBeANumber O poder desejado deve ser um número. -DeveloperList Desenvolvedores: %s -DisbandmentDueToZeroPower %s foi deletada devido ao seu poder cumulativo chegar a zero. -DoesntExist %s Não existe. -Done Pronto. -DoubleSet Definição dupla. -DuelChallengeCancelled O desafio foi cancelado. -DuelEndedInTie %s e %s's se empataram no duelo. -DynmapIntegrationSuccessful A integração de Dynmap foi um sucesso. -ERROR ERROR: -ErrorAddingAreaMarker Erro ao adicionar a área marcada %s -ErrorChunkRemoval Ocorreu um erro durante a remoção da terra reivindicada. -ErrorClaimedChunkRemoval Ocorreu um erro durante a remoção da terra reivindicada. -ErrorCouldNotFindGatesFaction Error: Não foi possível encontrar facção para o portão'%s'. -ErrorCouldNotLoadFactionGate ERROR: Não foi possível carregar o portão da facção.\n -ErrorCreatingMarkerSet Erro ao criar os marcadores. -ErrorIntegratingWithDynmap Erro ao integrar com o dynmap: -ErrorPlayerPowerRecordForUUIDNotFound ERROR: O registro de poder do jogador para uuid não foi encontrado. Não foi possível obter o nível de poder cumulativo. -ErrorSettingAreaMarkerColor Erro ao definir a cor do marcador de área para '%s'. -FactionAlreadyAlly Está facção já é sua aliada. -FactionAlreadyExists Desculpe. Esta facção já existe. -FactionAndPlayerSingleQuotesRequirement Facção e jogador devem ser designados entre aspas simples. -FactionAndVassalSingleQuotesRequirement Facção e vassalo a serem removidos devem ser designados entre aspas simples. -FactionCreated Facção criada. -FactionCurrentlyEnemyMustMakePeace Essa facção é atualmente sua inimiga. Faça as pazes antes de tentar se aliar a eles. -FactionDataLoadedSuccessfuly Dados de facção carregados com sucesso -FactionDoesNotExist Desculpe. Esta facção não existe. -FactionDoesNotHaveLaws Esta facção não tem nenhuma lei. -FactionGates Portões da Facção -FactionHomeLoadError Ocorreu um erro ao carregar a home da facção. -FactionHomeNotSetYet A home da facção ainda não existe. -FactionHomeSet Home da facção definida. -FactionInfo %s Informação da facção -FactionIsNotVassal Esta facção não é sua vassala. -FactionMustBeDesignatedInsideSingleQuotes A facção deve ser designada entre aspas simples. -FactionNameChanged Nome da facção definido. -FactionNameNotRecognized O nome dessa facção não é reconhecido. -FactionNameTooLong Esse nome é muito longo. -FactionNotEnemy Esta facção não é sua inimiga. -FactionNotFound Esta facção não foi encontrada -FactionsSuccessfullyLoaded Facção carregada com sucesso. -FactionsTitle == Factions == -FactionSuccessfullyDisbanded Facção deletada com sucesso. -FactionSuccessfullyLoaded Facção carregada com sucesso. -FileLoadError Um erro ocorreu carregando este arquivo. -FollowingPlayersHaveAccess Os membros a seguir tem acesso a este bloco: -GateCreated Portão criado com sucesso. -HasAttemptedToMakePeaceWith %s tentou fazer as pazes com %s. -HasBeenKickedFrom %s foi expulso por %s -HasDeclaredIndependence %s declarou independência de %s. -HasDeclaredWarAgainst %s declarou guerra contra %s. -HasJoined %s entrou em %s -HelpAddLaw /mf addlaw - adiciona uma lei a sua facção. -HelpAlly /mf ally - Tenta criar aliança com uma facção. -HelpAutoclaim /mf autoclaim - Ativa/desativa a reivindicação automática, tornando a reivindicação de terras mais fácil. -HelpBreakAlliance /mf breakalliance - Quebra a aliança com uma facção. -HelpBypass /mf bypass - Bypass proteções. -HelpChat /mf chat - Ativa/desativa o chat com a facção. -HelpCheckAccess /mf checkaccess - Checa quem tem acesso a um bloco bloqueado. -HelpCheckClaim /mf checkclaim - Checa se a terra é reinvindicada ou não. -HelpClaim /mf claim - Reinvindica uma terra para sua facção. -HelpConfigSet /mf config set (option) (value) - Define uma configuração. -HelpConfigShow /mf config show - Mostra os (value) de configuração. -HelpCreate /mf create (name) - Cria uma nova fação. -HelpDeclareIndependence /mf declareindependence - Declara independência contra seu soberano. -HelpDeclareWar /mf declarewar - Declara guerra contra outra facção. -HelpDemote /mf demote - Rebaixa um oficial ao status de membro. -HelpDesc /mf desc (desc) - Define a descrição da sua facção. -HelpDisband /mf disband - Deleta sua facção (Precisa ser dono). -HelpDuelAccept /mf duel accept (player) Aceita um duelo -HelpDuelCancel /mf duel cancel Cancela o duelo -HelpDuelChallenge /mf duel challenge (player) (time limit in seconds) -HelpEditLaw /mf editlaw - Edita uma lei já existente em sua facção -HelpFlagsSet /mf flags set (option) (value) - Definir uma flag de facção. -HelpFlagsShow /mf flags show - Mostra as flags da facção. -HelpForce /mf force - Força o plugin a fazer certas ações. -HelpForceBonusPower /mf force bonuspower 'faction' 'number' -HelpForceClaim /mf force claim 'faction name' Força uma facção a reinvindar uma terra. -HelpForceCreate /mf force create 'factionName' Força a criação de uma facção. -HelpForceDemote /mf force demote (player) Força um jogador a ser rebaixado. -HelpForceFlag /mf force 'facção' 'opção' 'valor' -HelpForceJoin /mf force join 'player' 'faction2' Força um jogador a entrar em uma facção. -HelpForceKick /mf force kick (player) Força a expulsão de um jogador. -HelpForceLoad /mf force load Força o carregamento. -HelpForcePeace /mf force peace 'faction1' 'faction2' Força a paz entre 2 facções. -HelpForcePower /mf force power 'player' 'number' Força o poder em um jogador. -HelpForceRemoveVassal /mf force removevassal 'faction' 'vassal' Força a remoção de um vassalo. -HelpForceRename /mf force rename 'faction' 'new name' Força o renomeamento de uma facção. -HelpForceRenounce /mf force renounce (faction) Força a renuncia de um facção -HelpForceSave /mf force save Força um save. -HelpForceTransfer /mf force transfer 'faction' 'player' Força a transferência de um jogador para uma facção. -HelpForceUnlock /mf force unlock Força o destravamento. -HelpGateCancel /mf gate cancel Cancela a criação de um portão. -HelpGateCreate /mf gate create (name) Inicia a criação de um portão. -HelpGateList /mf gate list Lista os portões existentes. -HelpGateName /mf gate name (name) Define um nome para o portão. -HelpGateRemove /mf gate remove Remove o portão. -HelpGrantAccess /mf grantaccess - Garante o acesso de alguem a um bloco bloqueado. -HelpGrantIndependence /mf grantindependence - Conceda a independência vassalo de uma vação. -HelpHelp /mf help # - Mostra listas de comandos úteis. -HelpHome /mf home - Teleporta até a home da sua facção. -HelpInfo /mf info - Veja a sua facção ou as informações de outra facção. -HelpInvite /mf invite (player) - Convida um jogador para sua facção. -HelpInvoke /mf invoke (ally) (enemy) - Chama um aliado para a guerra.. -HelpJoin /mf join (faction) - Entra na facção foi foi convidado. -HelpKick /mf kick - Expulsa um jogador da sua facção. -HelpLaws /mf laws - Veja as leis da sua facção. -HelpLeave /mf leave - Sair da facção atual. -HelpList /mf list - Lista todas as facções do servidor. -HelpLock /mf lock - Tranca uma porta ou bau. -HelpMakePeace /mf makepeace - Manda uma oferta de paz para outra facção. -HelpMap /mf map - Exibe um mapa das reivindicações perto de seus arredores. -HelpMembers /mf members - Lista os membros de sua facção ou de outra facção. -HelpPower /mf power - Checa o seu nivel de poder. -HelpPrefix /mf prefix (prefix) - Defina o prefixo da sua facção. -HelpPromote /mf promote - Promove um membro ao titulo de Oficial. -HelpRemoveLaw /mf removelaw - Remove uma lei da sua facção. -HelpRename /mf rename - Renomeia a sua facção -HelpResetPowerLevels /mf resetpowerlevels - Redefina os registros de poder do jogador e os níveis de poder cumulativos das facções. -HelpRevokeAccess /mf revokeaccess - Revoga o acesso do jogador sobre algum bloco bloqueado. -HelpSetHome /mf sethome - Define a home da sua facção. -HelpSwearFealty /mf swearfealty - Jure fidelidade a uma facção. -HelpTransfer /mf transfer - Transfira a propriedade de sua facção para outro jogador.\n -HelpUnclaim /mf unclaim - Abandona terras da sua facção. -HelpUnclaimall /mf unclaimall - Abandona todas as terras da sua facção. -HelpUnlock /mf unlock Desbloqueia uma porta ou bau. -HelpVassalize /mf vassalize - Ofereça-se para vassalizar uma facção. -HelpVersion /mf version - Checa a versão do plugin. -HelpWho /mf who - Veja as informações da facção de um jogador específico. -HomeClaimedByAnotherFaction A home foi reivindicado por outra facção e foi perdida. -HomeIsInUnclaimedChunk A home está em uma terra não reinvindicada e não está disponível. -HourlySaveAlert Medieval Factions esta salvando. Isso vai acontecer a cada 1 hora. -IntegerSet Integer set. -InvitationExpired Sey convite para %s expirou. -InvitationSent Convite enviado. -KeysLoaded Keys loaded: %d -LandAlreadyClaimedBy Esta terra já foi reinvindicada por -LandAlreadyClaimedByYourFaction Esta terra já foi reinvindicada por sua facção. -LandClaimedBy Esta terra esta reinvindicada por %s. -LandClaimedUsingAdminBypass Terra abandonada usando uma admin bypass. -LandIsNotClaimed Esta terra não esta reinvindicada. -LandIsUnclaimed Esta terra esta abandonada. -LandNotCurrentlyClaimed Esta terra atualmente não esta reinvindicada. -LandUnclaimed Terra abandonada. -LawAdded Lei adicionada. -LawEdited Lei modificada. -LawRemoved Lei removida. -LawsTitle == Leis de %s == -LeverSuccessfullyLinked Criando portão 4/4: Alavanca linkada com sucesso. -Liege Soberano: %s -ListLegend P: Poder, M: Membros, L: Terra -LoadingClaimedChunks Carregando chunks das terras... -LoadingLockedBLocks Carregando blocos bloqueados... -LoadingPlayerPowerRecords Carregando registros de poder... -Locked Bloqueado. -LockedBlockSuccessfullyLoaded Bloco Bloqueado carregado com sucesso. -LockedBy Bloqueado por %s -LockingCancelled Bloqueamento cancelado. -LockRemovalError Um erro ocorreu durante a remoção do bloqueio. -MaterialsMismatch1 Erro ao colocar ponto 1: Materiais incompatíveis. -MaterialsMismatch2 Erro ao colocar ponto 2: Materiais incompatíveis. -MedievalFactionsStringRight Medieval-Factions-%s -MedievalFactionsTitle == Medieval Factions %s == -MembersOf Membro de %s -MissingFactionGatesJSONCollection Não foi possível carregar os gates porque a coleção 'factionGates' não existia no arquivo JSON das facções. Você está atualizando de uma versão anterior? A configuração padrão foi definida. -MovementDetectedTeleportCancelled Movimento detectado. Teleporte cancelado. -MustBeAtWarOrFactionMustBeInactive Você já Deve estar em guerra com a facção alvo ou a facção alvo deve esta inativa. -MustBeInFaction Desculpe, você precisa estar em uma facção para fazer isso. -MustBeOwner Desculpe, você precisa ser dono de uma facção para utilizar esse comando. -MustOwnFactionOrBeOfficer Você precisa ser dono de uma facção ou ser oficial de uma facção para usar este comando. -MustTransferOwnership Desculpa. Você deve transferir a propriedade ou expulsar todos em sua facção para sair. -Name Nome: %s -NameAlreadyTaken Este nome já esta em uso. -NeutralityDisabled Sua neutralidade foi desabilitada. -NoBlockDetectedToCheckForGate Nenhum bloco detectado para verificar o portão. -NoFactionsDesignatedSingleQuotesRequired Nenhuma facção designada. Deve ser indicado entre aspas simples. -NoLongerBypassingProtections Você não está mais contornando as bypassings fornecidas pelas facções medievais. -NoLongerInFactionChat Você não esta mais no chat da facção -NotAMemberOfAnyFaction Você não é membro de nenhuma facção. -NotAnAlly %s Não é seu aliado. -NotAnAllyOrVassal %s Não é seu aliado ou seu vassalo. -NotAtWarWith Você não esta em guerra com %s -NotAVassalOfAFaction Você não é vassalo de uma facção. +AcceptedChallengeDuelHasBegun Você aceitou o desafio de %s's, o duelo começou. +AlertAccessGrantedTo Acesso garantido a %s +AlertAccessRevokedFor Acesso Revogado a %s +AlertAllianceHasBeenBroken %s Quebrou a aliança com sua facção. +AlertAlreadyAtWarWith Sua facção já esta em guerra com %s. +AlertAlreadyCreatingGate Você ja esta criando um portão. +AlertAlreadyDueling Você já esta duelando. +AlertAlreadyDuelingPlayer Você já esta duelando com %s. +AlertAlreadyDuelingSomeone Você já esta duelando com alguem. +AlertAlreadyGrantingAccess Você já esta garantindo acesso a alguem. Escreva /mf grantaccess cancel para cancelar isto. +AlertAlreadyInFaction Você já esta em uma facção, desculpe. +AlertAlreadyRequestedAlliance Você já solicitou uma aliança com esta facção. +AlertAlreadyRequestedPeace Você já solicitou paz com esta facção. +AlertAttemptedAlliance %s tentou se aliar com %s. +AlertAttemptedVassalization %s tentou vassalizar sua facção. Se você é o dono, digite '/mf swearfealty %s' para aceitar. +AlertBeenInvited Você foi convidado para %s. Escreva /mf join %s para entrar. +AlertCalledToWar1 %s chamou sua facção para a guerra com %s. +AlertCalledToWar2 %s chamou %s para entrar em guerra com sua facção. +AlertCalledToWar3 Sua facção foi chamada por %s em sua guerra com %s. +AlertChallengedToDuel %s desafiou %s para um duelo. +AlertChallengedToDuelPlusHowTo %s desafiou você para um duelo. escreva /mf duel accept para começar. +AlertChallengeIssued Você foi desafiado por %s para um duelo. +AlertChallengeWasAccepted %s aceitou o seu desafio, o duelo começou. +AlertChangedGateName Nome do portão definido como '%s'. +AlertCurrentPowerLevel Seu poder atual é %d/%d. +AlertDecreasingThePowerOfInactivePlayers Medieval Factions está diminuindo o poder de cada jogador em %d se eles não estiveram online em %d minutos. Isso vai acontecer a cada %d minutos. +AlertDemotion Você foi rebaixado ao status de membro em sua facção. +AlertDisbandmentDueToZeroPower Sua facção foi dissolvida devido ao seu poder cumulativo chegar a zero. +AlertFactionAttemptedToVassalize Sua facção tentou vassalizar %s. +AlertFactionHasBeenVassalized Sua facção foi vassalizada e tem um novo soberano: %s +AlertFactionHasNewVassal Sua facção tem um novo vassalo: %s +AlertFactionHomeRemoved A home de sua facção foi removida. +AlertFactionIsWeakened Sua facção tem menos da metade de seu poder máximo. Ela não receberá mais bônus de poder de vassalos e seus vassalos agora estão vulneráveis. +AlertForcedDemotion Você foi rebaixado à força do status de oficial em sua facção. +AlertForcedKick Você foi expulso a força da sua facção. +AlertForcedLoad Medieval factions esta fazendo um carregamento forçado. +AlertForcedSave Medieval Factions esta criando um save forçado. +AlertForcedToJoinFaction Você foi forçado a entrar em uma facção. +AlertGate Este é o portão '%s'. +AlertGrantedIndependence %s concedeu independência à sua facção. +AlertIncreasingThePowerOfEveryPlayer Medieval Factions está aumentando o poder de cada jogador por %d. Isto vai acontecer a cada %d minutos. +AlertJoinedFaction Você entrou na facção. +AlertKicked Você foi expulso da sua facção por %s. +AlertLandClaimed Terra reinvindicada. Tamanho: %d/%d +AlertLandConqueredFromAnotherFaction Terra conquistada por %s. Tamanho: %d/%d +AlertLandConqueredFromYourFaction %s conquistou terras de sua facção. +AlertLeftFaction Você saiu da sua facção. +AlertLeftFactionAndItGotDeleted Você saiu da sua facção. Ela foi excluida por não haver mais membros. +AlertMoreClaimedChunksThanPower Sua facção tem mais terras reivindicados do que poder. Sua terra pode ser conquistada. +AlertMustBeAtWarToConquer Suas facções devem estar em guerra para que você conquiste terras. +AlertMustBeInFactionToUseCommand Você precisa estar em uma facção para usar este comando. +AlertMustBeMemberToCreateGate Você precisa ser membro desta facção para criar um portão. +AlertMustBeOfficerOrOwnerToClaimLand Você precisa ser um oficial ou dono da facção para reinvindicar uma terra. +AlertMustBeOwnerOrOfficerToCreateGate Você precisa ser dono ou oficial da facção para criar um portão. +AlertMustBeOwnerOrOfficerToUseCommand Você precisa ser um oficial ou dono da facção para usar este comando. +AlertMustBeOwnerToInvokeAlliance Você precisa ser dono da facção para solicitar uma aliança. +AlertMustBeOwnerToUseCommand Você precisa ser dono da facção para usar este comando. +AlertMustKickAllPlayers Você precisa expulsar todos os membros antes de excluir uma facção. +AlertNoGatesDefined Sua facção não tem portões definidos. +AlertNoLaws Sua facção não tem nenhuma lei. +AlertNoLongerVassalFaction %s Não é mais um vassalo da facção. +AlertNonOwnership Isso não te pertence. +AlertNoPendingChallenges Você não tem duelos pendentes para cancelar. +AlertNotAllied Sua facção não é aliada com %s. +AlertNotBeenChallenged Você não foi desafiado a um duelo por ninguém. +AlertNotBeenChallengedByPlayer Você não foi desafiado a um duelo por '%s'. +AlertNotInFaction Você não esta em uma facção. +AlertNotInvitedToFaction Você não foi convidado por esta facção. +AlertNotOfferedVassalizationBy Esta facção não ofereceu vassalização a você. +AlertNowAlliedWith Sua facção não é aliada com %s. +AlertNowAtPeaceWith %s esta agora em paz com %s. +AlertPlayerAlreadyOwner Este membro já é dono da facção. +AlertPlayerNotInFaction Este membro não esta na facção. +AlertPowerLevelDecreased Seu nivel de poder desceu. +AlertPowerLevelIncreasedBy Você se sente forte. Seu poder foi aumentado em %d. +AlertReachedDemesne Você atingiu seu limite de propriedade. Convide mais jogadores para aumentar isso. +AlertUnlocked Desbloqueado. +AlertUnlockingCancelled Desbloqueamento cancelado. +AllianceBrokenWith Aliança quebrada com %s. +AlliedWith Aliado com: %s +AllLandUnclaimed Todas as terras foram abandonadas. +AllLandUnclaimedFrom Todas as terras foram abandonadas por %s. +AlreadyEnteredCheckAccess Você já entrou neste comando. Escreva '/mf checkaccess cancel' para cancelar. +AlreadyEnteredRevokeAccess Você já entrou neste comando. Escreva '/mf revokeaccess cancel' para cancelar. +AlreadyInFaction Desculpe, você já esta em uma facção. Saia dela se você deseja criar outra. +ArgumentMustBeNumber O argumento precisa ser um número. +ArgumentsSingleQuotesRequirement Os argumentos devem ser designados entre aspas simples. +AssignedToRandomFaction Você foi atribuído a uma facção aleatória. +AttemptedAlliance Tentativa de se aliar com %s +AttemptedPeace Tentativa de paz com %s +AtWarWith Em guerra com: %s +AutoclaimToggled Autoclaim alternado. +BlockAlreadyLocked Este bloco já esta bloqueado. +BlockIsNotLocked Este bloco não esta bloqueado. +BlockIsPartOfGateMustRemoveGate Este bloco é parte do portão '%s'. Você precisa remover o portão antes. +BonusPower Bonus de de poder por administradores: %d +BooleanSet Boleano definido. +Cancelled Cancelado. +CancelledGatePlacement1 Erro definindo ponto 1. Definição de portão cancelada. +CancelledGatePlacement2 Erro definindo ponto 2. Definição de portão cancelada. +CancelledGatePlacementErrorLinking Erro ao linkar com uma alavanca. Definição de portão cancelada. +CannotAllyWithSelf Você não pode aliar-se a sua propria facção. +CannotAttackFactionMember Você não pode atacar outro jogador que seja parte da sua facção. +CannotAttackNonWarringPlayer Você não pode atacar outro jogador se suas facções não estiverem em guerra. +CannotBreakAllianceWithSelf Você não pode quebrar uma aliança com sua propria facção. +CannotBringNeutralFactionIntoWar Você não pode trazer facções neutras para a guerra. +CannotCancelActiveDuel Você não pode cancelar um duelo ativo. +CannotDeclareWarIfLiegeNotWeakened Você não pode declarar guerra a esta facção, pois eles são vassalos, a menos que seu soberano esteja enfraquecido. +CannotDeclareWarIfNeutralFaction Facções neutras não podem declarar guerra. +CannotDeclareWarOnAlly Você não pode declarar guerra a um aliado. +CannotDeclareWarOnLiege Você não pode declarar guerra ao seu soberano. Tente '/mf declareindependence' em vez disso. +CannotDeclareWarOnNeutralFaction Você não pode declarar guerra contra uma facção neutra. +CannotDeclareWarOnVassal Você não pode declarar guerra ao seu próprio vassalo. +CannotDeclareWarOnYourself Você não pode declarar guerra a si mesmo. +CannotDemoteSelf Você não pode se rebaixar. +CannotDuelSelf Você não pode duelar contra si mesmo. +CannotFindDynmap Não pude encontrar o dynmap. +CannotForciblyKickOwner Você não pode expulsar à força um dono de sua facção. Tente dissolver a facção. +CannotGrantAccessToSelf Você não pode conceder acesso a si mesmo. +CannotKickOwner Você não pode expulsar um dono. +CannotKickSelf Você não pode expulsar a si mesmo. +CannotMakePeaceWithSelf Você não pode criar uma paz em sua propria facção. +CannotPlaceChestsNextToUnownedLockedChests Você não pode colocar baús ao lado de baús bloqueados que você não possui. +CannotPlaceHoppersNextToUnownedLockedChests Você não pode colocar tremonhas próximas, embaixo ou acima de baús trancados que você não possui. +CannotPromoteSelf Você não pode promover a si mesmo. +CannotRevokeAccessFromSelf Você não pode remover acesso de si mesmo. +CannotSetFactionHomeInWilderness Você não pode definir a home de sua facção em terras que ela não reivindicou. +CannotSetVersion Você não pode definir a versão. +CannotTransferToSelf Você não pode transferir o cargo de dono para si mesmo. +CannotVassalizeLiege Você não pode vassalizar seu soberano. +CannotVassalizeSelf Você não pode vassalizar sua própria facção. +CannotVassalizeVassal Você não pode vassalizar uma facção que já tem um soberano. +CanOnlyCreateGatesInClaimedTerritory Você só pode criar portões em terras reinvindicadas. +CanOnlyLockBlocksInClaimedTerritory Você só pode bloquear blocos em uma terra reinvindicada por sua facção. +CanOnlyLockInFactionTerritory You can only lock things in your faction's territory. +CanOnlyLockSpecificBlocks Você só pode bloquear baus, portas, barris, alçapões, fornalhas, bigornas ou portões. +ClaimedChunksLoaded Terras reinvindicadas carregadas. +ClaimedChunksSuccessfullyLoaded Terras reinvindicadas carregadas com sucesso. +ClickOnTriggerLever Clique na alavanca... +ClickToPlaceSecondCorner Clique para colocar o segundo canto... +CmdAddLaw Adicionar leis. +CmdAlly Aliados +CmdAutoClaim Auto reinvindicar +CmdBreakAlliance Quebrar Aliança +CmdBypass bypass +CmdChat chat +CmdCheckAccess Checar acesso +CmdCheckClaim Checar reinvindicação +CmdClaim Reinvindicar +CmdConfig Configurar +CmdConfigSet Definir +CmdConfigShow Mostrar +CmdCreate Criar +CmdDeclareIndependence Declarar independência +CmdDeclareWar Decralarar guerra +CmdDemote Rebaixar +CmdDesc Descrição +CmdDisband Remover +CmdDuel Duelo +CmdDuelAccept Aceitar +CmdDuelCancel Cancelar +CmdDuelChallenge Desafiar +CmdEditLaw Editar leis +CmdFlags Flags +CmdFlagsSet Definir flags +CmdFlagsShow Mostrar flags +CmdForce Forçar +CmdForceBonusPower Bonus de poder +CmdForceClaim Reinvindicar +CmdForceCreate Criar +CmdForceDemote Deletar +CmdForceFlag flag +CmdForceJoin Entrar +CmdForceKick Expulsar +CmdForceLoad Carregar +CmdForcePeace Paz +CmdForcePower Poder +CmdForceRename Renomear +CmdForceRenounce Renunciar +CmdForceSave Salvar +CmdForceTransfer Transferir +CmdForceUnlock Desbloquear +CmdGate Portão +CmdGateCancel Cancelar +CmdGateCreate Criar +CmdGateList Listar +CmdGateName Nome +CmdGateRemove Remover +CmdGrantAccess Garantir acesso +CmdGrantIndependence Garantir independência +CmdHelp Ajuda +CmdHome Home +CmdInfo Info +CmdInvite Convidar +CmdInvoke Invocar +CmdJoin Entrar +CmdKick Expulsar +CmdLaws Leis +CmdLeave Sair +CmdList Listar +CmdLock Bloquear +CmdMakePeace Criar paz +CmdMembers Membros +CmdPower Poder +CmdPrefix prefix +CmdPromote Promover +CmdRemoveLaw Remover lei +CmdRename Renomear +CmdResetPowerLevels Resetar níveis de poder +CmdRevokeAccess Remover acesso +CmdSetHome sethome +CmdSwearFealty juramento +CmdTransfer Transferir +CmdUnclaim Deixar terra +CmdUnclaimall Deixar todas as terras +CmdUnlock Desbloquear +CmdVassalize Vassalizar +CmdVersion Versão +CmdWho Quem +CommandCancelled Comando cancelado. +CommandNotRecognized Medieval Factions não reconhece este comando. +CommandsPage1 == Medieval Factions Pagínas de comando 1/%d == +CommandsPage2 = Medieval Factions Pagínas de comando 2/%d == +CommandsPage3 == Medieval Factions Pagínas de comando 3/%d == +CommandsPage4 == Medieval Factions Pagínas de comando 4/%d == +CommandsPage5 == Medieval Factions Pagínas de comando 5/%d == +CommandsPage6 == Medieval Factions Pagínas de comando 6/%d == +CommandsPage7 == Medieval Factions Pagínas de comando 7/%d == +ConfigListPageOne ===== Lista de configurações 1/2 ===== +ConfigListPageTwo ===== Lista de configurações 2/2 ===== +CreatingGateCancelled Criação de portão cancelada. +CreatingGateClickWithHoe Criando portão. Clique em um bloco com uma enxada de ouro para selecionar o primeiro ponto. +CuboidDisallowed1 Erro ao colocar o ponto 1: você não pode colocar um bloco. +CuboidDisallowed2 Erro ao colocar o ponto 2: você não pode colocar um bloco. +CurrentLanguageID Linguagem atual ID: %s +CurrentlyNoFactions Atualmente não há facções. +CurrentPowerLevel %s's nível de poder atual é %d/%d. +Defeated %s foi derrotado por %s em um duelo. +DemesneSize Tamanho: %d/%d +Description Descrição: %s +DescriptionSet Descrição definida. +DesignatedFactionNotFound Uma das facções designadas não foi encontrada. +DesiredPowerMustBeANumber O poder desejado deve ser um número. +DeveloperList Desenvolvedores: %s +DisbandmentDueToZeroPower %s foi deletada devido ao seu poder cumulativo chegar a zero. +DoesntExist %s Não existe. +Done Pronto. +DoubleSet Definição dupla. +DuelChallengeCancelled O desafio foi cancelado. +DuelEndedInTie %s e %s's se empataram no duelo. +DynmapIntegrationSuccessful A integração de Dynmap foi um sucesso. +ERROR ERROR: +ErrorAddingAreaMarker Erro ao adicionar a área marcada %s +ErrorChunkRemoval Ocorreu um erro durante a remoção da terra reivindicada. +ErrorClaimedChunkRemoval Ocorreu um erro durante a remoção da terra reivindicada. +ErrorCouldNotFindGatesFaction Error: Não foi possível encontrar facção para o portão'%s'. +ErrorCouldNotLoadFactionGate ERROR: Não foi possível carregar o portão da facção.\n +ErrorCreatingMarkerSet Erro ao criar os marcadores. +ErrorIntegratingWithDynmap Erro ao integrar com o dynmap: +ErrorPlayerPowerRecordForUUIDNotFound ERROR: O registro de poder do jogador para uuid não foi encontrado. Não foi possível obter o nível de poder cumulativo. +ErrorSettingAreaMarkerColor Erro ao definir a cor do marcador de área para '%s'. +FactionAlreadyAlly Está facção já é sua aliada. +FactionAlreadyExists Desculpe. Esta facção já existe. +FactionAndPlayerSingleQuotesRequirement Facção e jogador devem ser designados entre aspas simples. +FactionAndVassalSingleQuotesRequirement Facção e vassalo a serem removidos devem ser designados entre aspas simples. +FactionCreated Facção criada. +FactionCurrentlyEnemyMustMakePeace Essa facção é atualmente sua inimiga. Faça as pazes antes de tentar se aliar a eles. +FactionDataLoadedSuccessfuly Dados de facção carregados com sucesso +FactionDoesNotExist Desculpe. Esta facção não existe. +FactionDoesNotHaveLaws Esta facção não tem nenhuma lei. +FactionGates Portões da Facção +FactionHomeLoadError Ocorreu um erro ao carregar a home da facção. +FactionHomeNotSetYet A home da facção ainda não existe. +FactionHomeSet Home da facção definida. +FactionInfo %s Informação da facção +FactionIsNotVassal Esta facção não é sua vassala. +FactionMustBeDesignatedInsideSingleQuotes A facção deve ser designada entre aspas simples. +FactionNameChanged Nome da facção definido. +FactionNameNotRecognized O nome dessa facção não é reconhecido. +FactionNameTooLong Esse nome é muito longo. +FactionNotEnemy Esta facção não é sua inimiga. +FactionNotFound Esta facção não foi encontrada +FactionsSuccessfullyLoaded Facção carregada com sucesso. +FactionsTitle == Factions == +FactionSuccessfullyDisbanded Facção deletada com sucesso. +FactionSuccessfullyLoaded Facção carregada com sucesso. +FileLoadError Um erro ocorreu carregando este arquivo. +FollowingPlayersHaveAccess Os membros a seguir tem acesso a este bloco: +GateCreated Portão criado com sucesso. +HasAttemptedToMakePeaceWith %s tentou fazer as pazes com %s. +HasBeenKickedFrom %s foi expulso por %s +HasDeclaredIndependence %s declarou independência de %s. +HasDeclaredWarAgainst %s declarou guerra contra %s. +HasJoined %s entrou em %s +HelpAddLaw /mf addlaw - adiciona uma lei a sua facção. +HelpAlly /mf ally - Tenta criar aliança com uma facção. +HelpAutoclaim /mf autoclaim - Ativa/desativa a reivindicação automática, tornando a reivindicação de terras mais fácil. +HelpBreakAlliance /mf breakalliance - Quebra a aliança com uma facção. +HelpBypass /mf bypass - Bypass proteções. +HelpChat /mf chat - Ativa/desativa o chat com a facção. +HelpCheckAccess /mf checkaccess - Checa quem tem acesso a um bloco bloqueado. +HelpCheckClaim /mf checkclaim - Checa se a terra é reinvindicada ou não. +HelpClaim /mf claim - Reinvindica uma terra para sua facção. +HelpConfigSet /mf config set (option) (value) - Define uma configuração. +HelpConfigShow /mf config show - Mostra os (value) de configuração. +HelpCreate /mf create (name) - Cria uma nova fação. +HelpDeclareIndependence /mf declareindependence - Declara independência contra seu soberano. +HelpDeclareWar /mf declarewar - Declara guerra contra outra facção. +HelpDemote /mf demote - Rebaixa um oficial ao status de membro. +HelpDesc /mf desc (desc) - Define a descrição da sua facção. +HelpDisband /mf disband - Deleta sua facção (Precisa ser dono). +HelpDuelAccept /mf duel accept (player) Aceita um duelo +HelpDuelCancel /mf duel cancel Cancela o duelo +HelpDuelChallenge /mf duel challenge (player) (time limit in seconds) +HelpEditLaw /mf editlaw - Edita uma lei já existente em sua facção +HelpFlagsSet /mf flags set (option) (value) - Definir uma flag de facção. +HelpFlagsShow /mf flags show - Mostra as flags da facção. +HelpForce /mf force - Força o plugin a fazer certas ações. +HelpForceBonusPower /mf force bonuspower 'faction' 'number' +HelpForceClaim /mf force claim 'faction name' Força uma facção a reinvindar uma terra. +HelpForceCreate /mf force create 'factionName' Força a criação de uma facção. +HelpForceDemote /mf force demote (player) Força um jogador a ser rebaixado. +HelpForceFlag /mf force 'facção' 'opção' 'valor' +HelpForceJoin /mf force join 'player' 'faction2' Força um jogador a entrar em uma facção. +HelpForceKick /mf force kick (player) Força a expulsão de um jogador. +HelpForceLoad /mf force load Força o carregamento. +HelpForcePeace /mf force peace 'faction1' 'faction2' Força a paz entre 2 facções. +HelpForcePower /mf force power 'player' 'number' Força o poder em um jogador. +HelpForceRemoveVassal /mf force removevassal 'faction' 'vassal' Força a remoção de um vassalo. +HelpForceRename /mf force rename 'faction' 'new name' Força o renomeamento de uma facção. +HelpForceRenounce /mf force renounce (faction) Força a renuncia de um facção +HelpForceSave /mf force save Força um save. +HelpForceTransfer /mf force transfer 'faction' 'player' Força a transferência de um jogador para uma facção. +HelpForceUnlock /mf force unlock Força o destravamento. +HelpGateCancel /mf gate cancel Cancela a criação de um portão. +HelpGateCreate /mf gate create (name) Inicia a criação de um portão. +HelpGateList /mf gate list Lista os portões existentes. +HelpGateName /mf gate name (name) Define um nome para o portão. +HelpGateRemove /mf gate remove Remove o portão. +HelpGrantAccess /mf grantaccess - Garante o acesso de alguem a um bloco bloqueado. +HelpGrantIndependence /mf grantindependence - Conceda a independência vassalo de uma vação. +HelpHelp /mf help # - Mostra listas de comandos úteis. +HelpHome /mf home - Teleporta até a home da sua facção. +HelpInfo /mf info - Veja a sua facção ou as informações de outra facção. +HelpInvite /mf invite (player) - Convida um jogador para sua facção. +HelpInvoke /mf invoke (ally) (enemy) - Chama um aliado para a guerra.. +HelpJoin /mf join (faction) - Entra na facção foi foi convidado. +HelpKick /mf kick - Expulsa um jogador da sua facção. +HelpLaws /mf laws - Veja as leis da sua facção. +HelpLeave /mf leave - Sair da facção atual. +HelpList /mf list - Lista todas as facções do servidor. +HelpLock /mf lock - Tranca uma porta ou bau. +HelpMakePeace /mf makepeace - Manda uma oferta de paz para outra facção. +HelpMap /mf map - Exibe um mapa das reivindicações perto de seus arredores. +HelpMembers /mf members - Lista os membros de sua facção ou de outra facção. +HelpPower /mf power - Checa o seu nivel de poder. +HelpPrefix /mf prefix (prefix) - Defina o prefixo da sua facção. +HelpPromote /mf promote - Promove um membro ao titulo de Oficial. +HelpRemoveLaw /mf removelaw - Remove uma lei da sua facção. +HelpRename /mf rename - Renomeia a sua facção +HelpResetPowerLevels /mf resetpowerlevels - Redefina os registros de poder do jogador e os níveis de poder cumulativos das facções. +HelpRevokeAccess /mf revokeaccess - Revoga o acesso do jogador sobre algum bloco bloqueado. +HelpSetHome /mf sethome - Define a home da sua facção. +HelpSwearFealty /mf swearfealty - Jure fidelidade a uma facção. +HelpTransfer /mf transfer - Transfira a propriedade de sua facção para outro jogador.\n +HelpUnclaim /mf unclaim - Abandona terras da sua facção. +HelpUnclaimall /mf unclaimall - Abandona todas as terras da sua facção. +HelpUnlock /mf unlock Desbloqueia uma porta ou bau. +HelpVassalize /mf vassalize - Ofereça-se para vassalizar uma facção. +HelpVersion /mf version - Checa a versão do plugin. +HelpWho /mf who - Veja as informações da facção de um jogador específico. +HomeClaimedByAnotherFaction A home foi reivindicado por outra facção e foi perdida. +HomeIsInUnclaimedChunk A home está em uma terra não reinvindicada e não está disponível. +HourlySaveAlert Medieval Factions esta salvando. Isso vai acontecer a cada 1 hora. +IntegerSet Integer set. +InvitationExpired Sey convite para %s expirou. +InvitationSent Convite enviado. +KeysLoaded Keys loaded: %d +LandAlreadyClaimedBy Esta terra já foi reinvindicada por +LandAlreadyClaimedByYourFaction Esta terra já foi reinvindicada por sua facção. +LandClaimedBy Esta terra esta reinvindicada por %s. +LandClaimedUsingAdminBypass Terra abandonada usando uma admin bypass. +LandIsNotClaimed Esta terra não esta reinvindicada. +LandIsUnclaimed Esta terra esta abandonada. +LandNotCurrentlyClaimed Esta terra atualmente não esta reinvindicada. +LandUnclaimed Terra abandonada. +LawAdded Lei adicionada. +LawEdited Lei modificada. +LawRemoved Lei removida. +LawsTitle == Leis de %s == +LeverSuccessfullyLinked Criando portão 4/4: Alavanca linkada com sucesso. +Liege Soberano: %s +ListLegend P: Poder, M: Membros, L: Terra +LoadingClaimedChunks Carregando chunks das terras... +LoadingLockedBLocks Carregando blocos bloqueados... +LoadingPlayerPowerRecords Carregando registros de poder... +Locked Bloqueado. +LockedBlockSuccessfullyLoaded Bloco Bloqueado carregado com sucesso. +LockedBy Bloqueado por %s +LockingCancelled Bloqueamento cancelado. +LockRemovalError Um erro ocorreu durante a remoção do bloqueio. +MaterialsMismatch1 Erro ao colocar ponto 1: Materiais incompatíveis. +MaterialsMismatch2 Erro ao colocar ponto 2: Materiais incompatíveis. +MedievalFactionsStringRight Medieval-Factions-%s +MedievalFactionsTitle == Medieval Factions %s == +MembersOf Membro de %s +MissingFactionGatesJSONCollection Não foi possível carregar os gates porque a coleção 'factionGates' não existia no arquivo JSON das facções. Você está atualizando de uma versão anterior? A configuração padrão foi definida. +MovementDetectedTeleportCancelled Movimento detectado. Teleporte cancelado. +MustBeAtWarOrFactionMustBeInactive Você já Deve estar em guerra com a facção alvo ou a facção alvo deve esta inativa. +MustBeInFaction Desculpe, você precisa estar em uma facção para fazer isso. +MustBeOwner Desculpe, você precisa ser dono de uma facção para utilizar esse comando. +MustOwnFactionOrBeOfficer Você precisa ser dono de uma facção ou ser oficial de uma facção para usar este comando. +MustTransferOwnership Desculpa. Você deve transferir a propriedade ou expulsar todos em sua facção para sair. +Name Nome: %s +NameAlreadyTaken Este nome já esta em uso. +NeutralityDisabled Sua neutralidade foi desabilitada. +NoBlockDetectedToCheckForGate Nenhum bloco detectado para verificar o portão. +NoFactionsDesignatedSingleQuotesRequired Nenhuma facção designada. Deve ser indicado entre aspas simples. +NoLongerBypassingProtections Você não está mais contornando as bypassings fornecidas pelas facções medievais. +NoLongerInFactionChat Você não esta mais no chat da facção +NotAMemberOfAnyFaction Você não é membro de nenhuma facção. +NotAnAlly %s Não é seu aliado. +NotAnAllyOrVassal %s Não é seu aliado ou seu vassalo. +NotAtWarWith Você não esta em guerra com %s +NotAVassalOfAFaction Você não é vassalo de uma facção. NotEnoughArgumentsDesignatedSingleQuotesRequired Argumentos insuficientes designados. Deve ser designado entre aspas simples. -NotTheOwnerOfThisBlock Você não é dono deste bloco. -NotTheOwnerOfThisFaction Você não é dono desta facção. -NoVassalOrLiegeReferences Não há referências de vassalos ou vassalos associados a essa facção. -NowBypassingProtections Agora você tem as proteções bypassing dadas por Medieval Factions. -NowSpeakingInFactionChat Agora você esta falando no chat da facção. -OnlyPlayersCanUseCommand Somente jogadores podem usar esse comando. -OnlyUseLeversInClaimedTerritory Error: Você só pode usar alavancas em terras reinvindicadas. -Owner Dono: %s -OwnershipTransferred O dono de %s transferiou o cardo de dono para você. -OwnerShipTransferredTo Cargo de dono transferido para %s -PermissionNeeded Desculpa. Para usar este comando, você precisa da seguinte permissão: ''%s' -PlayerAlreadyDueling %s Já esta duelando com alguém. -PlayerAlreadyInFaction Este jogador já esta em uma facção. -PlayerAlreadyOfficer Este membro já é um oficial. -PlayerAndDesiredPowerSingleQuotesRequirement O jogador e o poder desejado devem ser designados entre aspas simples. -PlayerByNameNotFound Desculpe. o jogador de nome %s não pode ser encontrado. -PlayerCantBePromotedBecauseOfLimit O membro não pode ser promovido porque você atingiu seu limite. Limite: %d -PlayerDemoted Membro rebaixado. -PlayerIsNotInAFaction Este jogador não esta em uma facção. -PlayerIsNotInYourFaction Este jogador não esta na sua facção. -PlayerIsNotMemberOfFaction Este jogador não é membro da sua facção. -PlayerIsNotOfficerOfFaction Este jogador não é oficial em sua facção. -PlayerNotFound Jogador não encontrado. -PlayerPowerRecordsLoaded Registros de poder do jogador carregados. -PlayerPromoted Membro promovido. -PleaseWaitGate Este é o portão %s, por favor espere. -PluginDisabled Medieval Factions plugin desativado. -PluginDisabling Medieval Factions plugin desativando.... -PluginEnabled Medieval Factions plugin ativado. -PluginEnabling Medieval Factions plugin ativando.... -PluginLoading Medieval Factions plugin esta carregando... -PluginSaving Medieval Factions plugin esta salvando... -Point1PlacementSuccessful Criando portão 1/4: Ponto 1 definido com sucesso. -Point2PlacedSuccessfully Criando portão 2/4: Ponto 2 definido com sucesso. -Population População: %d -PowerHasDecayed Seu poder decaiu por %d desde a última vez que você saiu. Seu poder agora é %d. -PowerLevel Nível de poder: %s -PowerLevelHasBeenSetTo O nivel de poder deste jogador foi definido para %d -PowerLevelHasIncreased Seu nível de poder aumentou. -PowerLevelResetting Resetando nivel de poder... -PrefixesDisabled Prefixos estão desativados. -PrefixSet Prefixo definido. -PrefixTaken Este prefixo já esta sendo usado. -ProblemLoadingClaimedChunks Ocorreu um problema ao carregar as chunks reinvindicadas. -ProblemLoadingFactions Ocorreu um problema carregando as facções. -ProblemLoadingPowerRecords Ocorreu um problema ao carregar os registros dos jogares. -PromotedToOfficer Você foi promovido aos status de oficial em sua facção. -RadiusRequirement O raio deve estar entre 0 e %d. -RemovedGate o portão '%s' foi removido. -ResettingIndividualPowerRecords Reiniciando os registros individuais dos jogadores. -RightClickCheckAccess Clique com o botão direito em um bloco bloqueado para verificar quem tem acesso a ele. escreva '/mf checkaccess cancel' para cancelar. -RightClickForceUnlock Clique com o botão direito em um baú ou porta para destrancar com força! (Escreva /mf force unlock cancel para cancelar) -RightClickGrantAccess Clique com o botão direito em um baú ou porta para garantir a %s o acesso. Escreva /mf grantaccess cancel para cancelar. -RightClickLock Clique com o botão direito para bloquea-lo. (Escreva /mf lock cancel para cancelar) -RightClickRevokeAccess Clique com o botão direito para remover o acesso de um membro. Escreva '/mf revokeaccess cancel' para cancelar. -RightClickUnlock Clique com o botão direito para desbloquear um bloco. (Escreva /mf unlock cancel para cancelar) -SchedulingHourlyAutoSave Agendamento de salvamento automático de hora em hora... -SchedulingPowerDecrease Diminuição de poder programado... -SchedulingPowerIncrease Aumento de poder programado... -SingleQuotesAlliedWarring Facção aliada e facção em guerra devem ser designadas entre aspas simples. -StringSet String definida. -SubCommands Sub-comandos: -SuccessFactionMemberRemoval Sucesso. Se o jogador estava em uma facção, ele não é mais um membro. -SuccessForceJoin Sucesso o jogador foi forçado a entra em uma facção. -SuccessfulDisbandment %s foi abandonada com sucesso. -SuccessOfficerRemoval Sucesso se o jogador era considerado oficial em alguma facção, ele não é mais. -SuccessReferencesRemoved As referências foram removidas com sucesso. -SupportedLanguageIDList Línguas suportadas idlist: %s -SurroundedChunkProtected A facção alvo tentou reivindicar as terras ao norte, leste, sul e oeste desta terra. Elas não podem ser conquistadas. -TargetBlockNotPartOfGate O bloco alvo não faz parte de um portão. -TargetFactionNotOverClaiming A facção alvo não tem mais terras do que seu limite de propriedade. -TeleportingAlert Teleportando em 3 segundos... -ThreeBlockRequirement Erro ao definir o ponto 2: O portão deve ter 3 blocos ou mais. -TriggerBlockNotLever O bloco de gatilho não era uma alavanca. Posicionamento do portão cancelado. -UsageAddLaw Usage: /mf addlaw (Nova Lei) -UsageAlly Usage: /mf ally (Nome da facção) -UsageBreakAlliance Usage: /mf breakalliance (Nome da facção) -UsageClaimRadius Usage: /mf claim (raio) -UsageConfigSet Usage: /mf config set (option) (value) -UsageConfigShow Usage: /mf config show ( 1 | 2 ) -UsageCreate Usage: /mf create [Nome da facção] -UsageDeclareWar Usage: /mf declarewar (Nome da facção) -UsageDemote Usage: /mf demote (Nome do jogador) -UsageDesc Usage: /mf desc (Descrição) -UsageEditLaw Usage: /mf editlaw (número) (lei) -UsageFlagsSet Usage: /mf flags set (option) (value) -UsageForceBonusPower Usage: /mf force bonuspower 'facção' 'número' -UsageForceClaim Usage: /mf force claim 'nome da facção' -UsageForceCreate Usage: /mf force create 'nome da facção' -UsageForceDemote Usage: /mf force demote (jogador) -UsageForceFlag Usage: /mf force 'facção' 'opção' 'valor' -UsageForceJoin Usage: /mf force join 'jogador' 'facção' -UsageForceKick Usage: /mf force kick (jogador) -UsageForcePeace Usage: /mf force peace 'facção-1' 'facção-2' -UsageForcePower Usage: /mf force power 'jogador' 'número' -UsageForceRemoveVassal /mf force removevassal 'facção-1' 'facção-2' -UsageForceRename Usage: /mf force rename 'facção' 'novo nome' -UsageForceRenounce Usage: /mf force renounce 'facção' -UsageForceTransfer Usage: /mf force transfer 'nome da facção' 'jogador' -UsageGrantAccess Usage: /mf grantaccess (nome do jogador) -UsageGrantIndependence Usage: /mf grantindependence (nome da facção) -UsageInvite Usage: /mf invite (nome do jogador) -UsageInvoke Usage: /mf invoke '(nome da facção aliada)' '(facção em guerra)' -UsageJoin Usage: /mf join (nome da facção) -UsageKick Usage: /mf kick (nome do jogador) -UsageMakePeace Usage: /mf makepeace (nome da facção) -UsagePrefix Usage: /mf prefix (novo prefixo) -UsagePromote Usage: /mf promote (nome do jogador) -UsageRemoveLaw Usage: /mf removelaw (número) -UsageRename Usage: /mf rename (novo nome) -UsageRevokeAccess Usage: /mf revokeaccess (nome do jogador) -UsageSwearFealty Usage: /mf swearfealty (nome da facção) -UsageTransfer Usage: /mf transfer (nome do jogador) -UsageVassalize Usage: /mf vassalize (nome da facção) -UsageWho Usage: /mf who (nome do jogador) -ValidSubCommandsShowSet Sub-comandos validos: show, set -VassalContribution Bonus de poder do vassalo: %d -Vassals Vassals: %s -WarningPlayerAlreadyStartedCreatingGate Perigo: O jogador já esta criando um portão. startCreatingGate() chamada ignorada. -WasntFound %s' não foi encontrada. -WelcomeBackLastLogout Bem-vindo de volta %s. seu ultimo login foi a %s atrás. -WikiLink Wiki: https://github.com/DansPlugins/Medieval-Factions/wiki -Wilderness Wilderness -WorldsMismatch1 Erro ao definir o ponto 1: Mundos incompatíveis. -WorldsMismatch2 Erro ao definir o ponto 2: Mundos incompatíveis. \ No newline at end of file +NotTheOwnerOfThisBlock Você não é dono deste bloco. +NotTheOwnerOfThisFaction Você não é dono desta facção. +NoVassalOrLiegeReferences Não há referências de vassalos ou vassalos associados a essa facção. +NowBypassingProtections Agora você tem as proteções bypassing dadas por Medieval Factions. +NowSpeakingInFactionChat Agora você esta falando no chat da facção. +OnlyPlayersCanUseCommand Somente jogadores podem usar esse comando. +OnlyUseLeversInClaimedTerritory Error: Você só pode usar alavancas em terras reinvindicadas. +Owner Dono: %s +OwnershipTransferred O dono de %s transferiou o cardo de dono para você. +OwnerShipTransferredTo Cargo de dono transferido para %s +PermissionNeeded Desculpa. Para usar este comando, você precisa da seguinte permissão: ''%s' +PlayerAlreadyDueling %s Já esta duelando com alguém. +PlayerAlreadyInFaction Este jogador já esta em uma facção. +PlayerAlreadyOfficer Este membro já é um oficial. +PlayerAndDesiredPowerSingleQuotesRequirement O jogador e o poder desejado devem ser designados entre aspas simples. +PlayerByNameNotFound Desculpe. o jogador de nome %s não pode ser encontrado. +PlayerCantBePromotedBecauseOfLimit O membro não pode ser promovido porque você atingiu seu limite. Limite: %d +PlayerDemoted Membro rebaixado. +PlayerIsNotInAFaction Este jogador não esta em uma facção. +PlayerIsNotInYourFaction Este jogador não esta na sua facção. +PlayerIsNotMemberOfFaction Este jogador não é membro da sua facção. +PlayerIsNotOfficerOfFaction Este jogador não é oficial em sua facção. +PlayerNotFound Jogador não encontrado. +PlayerPowerRecordsLoaded Registros de poder do jogador carregados. +PlayerPromoted Membro promovido. +PleaseWaitGate Este é o portão %s, por favor espere. +PluginDisabled Medieval Factions plugin desativado. +PluginDisabling Medieval Factions plugin desativando.... +PluginEnabled Medieval Factions plugin ativado. +PluginEnabling Medieval Factions plugin ativando.... +PluginLoading Medieval Factions plugin esta carregando... +PluginSaving Medieval Factions plugin esta salvando... +Point1PlacementSuccessful Criando portão 1/4: Ponto 1 definido com sucesso. +Point2PlacedSuccessfully Criando portão 2/4: Ponto 2 definido com sucesso. +Population População: %d +PowerHasDecayed Seu poder decaiu por %d desde a última vez que você saiu. Seu poder agora é %d. +PowerLevel Nível de poder: %s +PowerLevelHasBeenSetTo O nivel de poder deste jogador foi definido para %d +PowerLevelHasIncreased Seu nível de poder aumentou. +PowerLevelResetting Resetando nivel de poder... +PrefixesDisabled Prefixos estão desativados. +PrefixSet Prefixo definido. +PrefixTaken Este prefixo já esta sendo usado. +ProblemLoadingClaimedChunks Ocorreu um problema ao carregar as chunks reinvindicadas. +ProblemLoadingFactions Ocorreu um problema carregando as facções. +ProblemLoadingPowerRecords Ocorreu um problema ao carregar os registros dos jogares. +PromotedToOfficer Você foi promovido aos status de oficial em sua facção. +RadiusRequirement O raio deve estar entre 0 e %d. +RemovedGate o portão '%s' foi removido. +ResettingIndividualPowerRecords Reiniciando os registros individuais dos jogadores. +RightClickCheckAccess Clique com o botão direito em um bloco bloqueado para verificar quem tem acesso a ele. escreva '/mf checkaccess cancel' para cancelar. +RightClickForceUnlock Clique com o botão direito em um baú ou porta para destrancar com força! (Escreva /mf force unlock cancel para cancelar) +RightClickGrantAccess Clique com o botão direito em um baú ou porta para garantir a %s o acesso. Escreva /mf grantaccess cancel para cancelar. +RightClickLock Clique com o botão direito para bloquea-lo. (Escreva /mf lock cancel para cancelar) +RightClickRevokeAccess Clique com o botão direito para remover o acesso de um membro. Escreva '/mf revokeaccess cancel' para cancelar. +RightClickUnlock Clique com o botão direito para desbloquear um bloco. (Escreva /mf unlock cancel para cancelar) +SchedulingHourlyAutoSave Agendamento de salvamento automático de hora em hora... +SchedulingPowerDecrease Diminuição de poder programado... +SchedulingPowerIncrease Aumento de poder programado... +SingleQuotesAlliedWarring Facção aliada e facção em guerra devem ser designadas entre aspas simples. +StringSet String definida. +SubCommands Sub-comandos: +SuccessFactionMemberRemoval Sucesso. Se o jogador estava em uma facção, ele não é mais um membro. +SuccessForceJoin Sucesso o jogador foi forçado a entra em uma facção. +SuccessfulDisbandment %s foi abandonada com sucesso. +SuccessOfficerRemoval Sucesso se o jogador era considerado oficial em alguma facção, ele não é mais. +SuccessReferencesRemoved As referências foram removidas com sucesso. +SupportedLanguageIDList Línguas suportadas idlist: %s +SurroundedChunkProtected A facção alvo tentou reivindicar as terras ao norte, leste, sul e oeste desta terra. Elas não podem ser conquistadas. +TargetBlockNotPartOfGate O bloco alvo não faz parte de um portão. +TargetFactionNotOverClaiming A facção alvo não tem mais terras do que seu limite de propriedade. +TeleportingAlert Teleportando em 3 segundos... +ThreeBlockRequirement Erro ao definir o ponto 2: O portão deve ter 3 blocos ou mais. +TriggerBlockNotLever O bloco de gatilho não era uma alavanca. Posicionamento do portão cancelado. +UsageAddLaw Usage: /mf addlaw (Nova Lei) +UsageAlly Usage: /mf ally (Nome da facção) +UsageBreakAlliance Usage: /mf breakalliance (Nome da facção) +UsageClaimRadius Usage: /mf claim (raio) +UsageConfigSet Usage: /mf config set (option) (value) +UsageConfigShow Usage: /mf config show ( 1 | 2 ) +UsageCreate Usage: /mf create [Nome da facção] +UsageDeclareWar Usage: /mf declarewar (Nome da facção) +UsageDemote Usage: /mf demote (Nome do jogador) +UsageDesc Usage: /mf desc (Descrição) +UsageEditLaw Usage: /mf editlaw (número) (lei) +UsageFlagsSet Usage: /mf flags set (option) (value) +UsageForceBonusPower Usage: /mf force bonuspower 'facção' 'número' +UsageForceClaim Usage: /mf force claim 'nome da facção' +UsageForceCreate Usage: /mf force create 'nome da facção' +UsageForceDemote Usage: /mf force demote (jogador) +UsageForceFlag Usage: /mf force 'facção' 'opção' 'valor' +UsageForceJoin Usage: /mf force join 'jogador' 'facção' +UsageForceKick Usage: /mf force kick (jogador) +UsageForcePeace Usage: /mf force peace 'facção-1' 'facção-2' +UsageForcePower Usage: /mf force power 'jogador' 'número' +UsageForceRemoveVassal /mf force removevassal 'facção-1' 'facção-2' +UsageForceRename Usage: /mf force rename 'facção' 'novo nome' +UsageForceRenounce Usage: /mf force renounce 'facção' +UsageForceTransfer Usage: /mf force transfer 'nome da facção' 'jogador' +UsageGrantAccess Usage: /mf grantaccess (nome do jogador) +UsageGrantIndependence Usage: /mf grantindependence (nome da facção) +UsageInvite Usage: /mf invite (nome do jogador) +UsageInvoke Usage: /mf invoke '(nome da facção aliada)' '(facção em guerra)' +UsageJoin Usage: /mf join (nome da facção) +UsageKick Usage: /mf kick (nome do jogador) +UsageMakePeace Usage: /mf makepeace (nome da facção) +UsagePrefix Usage: /mf prefix (novo prefixo) +UsagePromote Usage: /mf promote (nome do jogador) +UsageRemoveLaw Usage: /mf removelaw (número) +UsageRename Usage: /mf rename (novo nome) +UsageRevokeAccess Usage: /mf revokeaccess (nome do jogador) +UsageSwearFealty Usage: /mf swearfealty (nome da facção) +UsageTransfer Usage: /mf transfer (nome do jogador) +UsageVassalize Usage: /mf vassalize (nome da facção) +UsageWho Usage: /mf who (nome do jogador) +ValidSubCommandsShowSet Sub-comandos validos: show, set +VassalContribution Bonus de poder do vassalo: %d +Vassals Vassals: %s +WarningPlayerAlreadyStartedCreatingGate Perigo: O jogador já esta criando um portão. startCreatingGate() chamada ignorada. +WasntFound %s' não foi encontrada. +WelcomeBackLastLogout Bem-vindo de volta %s. seu ultimo login foi a %s atrás. +WikiLink Wiki: https://github.com/DansPlugins/Medieval-Factions/wiki +Wilderness Wilderness +WorldsMismatch1 Erro ao definir o ponto 1: Mundos incompatíveis. +WorldsMismatch2 Erro ao definir o ponto 2: Mundos incompatíveis. \ No newline at end of file diff --git a/src/main/resources/ru.tsv b/src/main/resources/ru.tsv index 71fca7700..20e515539 100644 --- a/src/main/resources/ru.tsv +++ b/src/main/resources/ru.tsv @@ -1,551 +1,551 @@ -AcceptedChallengeDuelHasBegun Вы приняли вызов %s, дуэль началась. -AlertAccessGrantedTo Доступ был предоставлен %s -AlertAccessRevokedFor Доступ у %s был отозван -AlertAllianceHasBeenBroken %s разорвал союз с Вашей фракцией. -AlertAlreadyAtWarWith Ваша фракция уже воюет с %s. -AlertAlreadyCreatingGate Вы уже в режиме создания ворот. -AlertAlreadyDueling Вы уже участвуете в дуэли. -AlertAlreadyDuelingPlayer Вы уже сражаетесь с %s. -AlertAlreadyDuelingSomeone Вы уже сражаетесь с кем-то. -AlertAlreadyGrantingAccess Вы уже предоставляете доступ кому-то. Введите /mf grantacess cancel, чтобы отозвать его. -AlertAlreadyInFaction Вы уже во фракции, извините. -AlertAlreadyRequestedAlliance Вы уже запросили союз с этой фракцией. -AlertAlreadyRequestedPeace Вы уже запросили заключение мира с этой фракцией. -AlertAttemptedAlliance %s попытался вступить в союз с %s. -AlertAttemptedVassalization %s попытался вассализировать вашу фракцию. Если вы являетесь её владельцем, введите '/mf swearfealty %s', чтобы принять. -AlertBeenInvited Вас пригласили в %s. Чтобы присоединиться, введите /mf join %s. -AlertCalledToWar1 %s призвал Вашу фракцию к войне с %s. -AlertCalledToWar2 %s призвал %s на войну с вашей фракцией. -AlertCalledToWar3 Ваша фракция призвала %s на войну с %s. -AlertChallengedToDuel %s вызвал %s на дуэль. -AlertChallengedToDuelPlusHowTo %s вызвал вас на дуэль. Введите /mf duel accept, чтобы начать. -AlertChallengeIssued Вы вызвали %s на дуэль. -AlertChallengeWasAccepted %s принял Ваш вызов, дуэль началась. -AlertChangedGateName Имя ворот изменено на '%s'. -AlertCurrentPowerLevel Ваш текущий уровень мощности составляет %d/%d. -AlertDecreasingThePowerOfInactivePlayers Medieval Factions снижает силу каждого игрока на %d, если он не был в сети более %d минут. Это будет происходить каждые %d минут. -AlertDemotion Вы были понижены до статуса члена вашей фракции. -AlertDisbandmentDueToZeroPower Ваша фракция была расформирована, так как ее совокупная сила достигла нуля. -AlertFactionAttemptedToVassalize Ваша фракция попыталась вассализировать %s. -AlertFactionHasBeenVassalized Ваша фракция была вассализирована, и у нее теперь новый сюзерен: %s -AlertFactionHasNewVassal У вашей фракции появился новый вассал: %s -AlertFactionHomeRemoved Дом вашей фракции был удален. -AlertFactionIsWeakened У вашей фракции меньше половины максимальной силы. Он больше не будет получать дополнительную силу от вассалов, и ваши вассалы теперь уязвимы. -AlertForcedDemotion Вы были уволены со звания офицера в вашей фракции. -AlertForcedKick Вас выгнали из фракции. -AlertForcedLoad Medieval Factions был загружен. -AlertForcedSave Medieval Factions был сохранён вручную. -AlertForcedToJoinFaction Вас вынудили вступить во фракцию. -AlertGate Это ворота под названием '%s'. -AlertGrantedIndependence %s предоставил вашей фракции независимость. -AlertIncreasingThePowerOfEveryPlayer Medieval Factions увеличивает силу каждого игрока на %d. Это будет происходить каждые %d минут. -AlertJoinedFaction Вы вступили во фракцию. -AlertKicked %s выгнал Вас из Вашей фракции. -AlertLandClaimed Эта земля была присвоена. Размер владения: %d/%d -AlertLandConqueredFromAnotherFaction Земля, завоеванная %s. Размер владения: %d/%d -AlertLandConqueredFromYourFaction %s захватил земли вашей фракции. -AlertLeftFaction Вы покинули свою фракцию. -AlertLeftFactionAndItGotDeleted Вы покинули свою фракцию. Она был удалена, так как никто не был её участником. -AlertMoreClaimedChunksThanPower У вашей фракции больше присвоенных земель, чем её мощь. Вашу землю можно завоевать. -AlertMustBeAtWarToConquer Ваши фракции должны вести войну, чтобы вы могли завоевать её землю. -AlertMustBeInFactionToUseCommand Чтобы использовать эту команду, Вы должны принадлежать к какой-либо фракции. -AlertMustBeMemberToCreateGate Вы должны быть членом этой фракции, чтобы создать ворота. -AlertMustBeOfficerOrOwnerToClaimLand Вы должны быть офицером или владельцем фракции, чтобы присвоить землю. -AlertMustBeOwnerOrOfficerToCreateGate Чтобы создать ворота, Вы должны быть владельцем или офицером фракции. -AlertMustBeOwnerOrOfficerToUseCommand Чтобы использовать эту команду, Вы должны быть владельцем фракции или её офицером. -AlertMustBeOwnerToInvokeAlliance Чтобы создать альянс, Вы должны быть владельцем своей фракции. -AlertMustBeOwnerToUseCommand Чтобы использовать эту команду, вы должны быть владельцем фракции. -AlertMustKickAllPlayers Вам нужно выгнать всех игроков, прежде чем вы сможете распустить свою фракцию. -AlertNoGatesDefined У Вашей фракции нет ворот. -AlertNoLaws У Вашей фракции нет законов. -AlertNoLongerVassalFaction %s больше не является вассальной фракцией. -AlertNonOwnership Вам это не принадлежит. -AlertNoPendingChallenges У Вас нет незавершенных задач, которые можно отменить. -AlertNotAllied Ваша фракция не состоит в союзе с %s. -AlertNotBeenChallenged Вас никто не вызывал на дуэль. -AlertNotBeenChallengedByPlayer %s не вызывал Вас на дуэль. -AlertNotInFaction Вы не состоите во фракции. -AlertNotInvitedToFaction Вы не приглашены в эту фракцию. -AlertNotOfferedVassalizationBy Эта фракция не предлагала Вам стать её вассалом. -AlertNowAlliedWith Ваша фракция теперь в союзе с %s. -AlertNowAtPeaceWith %s теперь в мире с %s. -AlertPlayerAlreadyOwner Этот игрок уже является владельцем этой фракции. -AlertPlayerNotInFaction Этот игрок не входит в эту фракцию. -AlertPowerLevelDecreased Ваш уровень мощности снизился. -AlertPowerLevelIncreasedBy Вы чувствуете себя сильнее. Ваша сила увеличилась на %d. -AlertReachedDemesne Вы достигли предела своих владений. Пригласите больше игроков, чтобы увеличить его. -AlertUnlocked Разблокирован. -AlertUnlockingCancelled Разблокировка отменена. -AllianceBrokenWith Альянс с %s был разорван. -AlliedWith В союзе с: %s -AllLandUnclaimed Все земли стали независимыми. -AllLandUnclaimedFrom Все земли %s обрели независимость. -AlreadyEnteredCheckAccess Вы уже используете эту команду. Введите '/mf checkacesss cancel' чтобы прекратить. -AlreadyEnteredRevokeAccess Вы уже используете эту команду. Введите '/mf revokeaccess cancel' чтобы прекратить. -AlreadyInFaction Извините, но Вы уже состоите во фракции. Покиньте её, если хотите создать другую. -ArgumentMustBeNumber Аргумент должен быть числом. -ArgumentsSingleQuotesRequirement Аргументы необходимо заключать в одинарные кавычки. -AssignedToRandomFaction Вы попали в случайную фракцию. -AttemptedAlliance Попытка вступить в союз с %s -AttemptedPeace Попытка заключить мир с %s -AtWarWith В состоянии войны с: %s -AutoclaimToggled Автоприсоединение земель отключено. -BlockAlreadyLocked Этот блок уже заблокирован. -BlockIsNotLocked Этот блок не заблокирован. -BlockIsPartOfGateMustRemoveGate Этот блок является частью ворот под названием '%s'. Вы должны сначала удалить эти ворота. -BonusPower Бонусная сила от админов: %d -BooleanSet Булевый тип установлен. -Cancelled Отменено. -CancelledGatePlacement1 Ошибка размещения точки 1. Размещение ворот отменено. -CancelledGatePlacement2 Ошибка размещения точки 2. Размещение ворот отменено. -CancelledGatePlacementErrorLinking Ошибка привязки к рычагу. Размещение ворот отменено. -CannotAllyWithSelf Вы не можете вступить в союз с собственной фракцией. -CannotAttackFactionMember Вы не можете атаковать другого игрока, если состоите с ним в одной фракции. -CannotAttackNonWarringPlayer Вы не можете атаковать другого игрока, если ваши фракции не воюют. -CannotBreakAllianceWithSelf Вы не можете разорвать союз с собственной фракцией. -CannotBringNeutralFactionIntoWar Нельзя вовлекать нейтральные фракции в войну. -CannotCancelActiveDuel Нельзя отменить активную дуэль. -CannotDeclareWarIfLiegeNotWeakened Вы не можете объявить войну вассальной фракции, если их сюзерен не ослаблен. -CannotDeclareWarIfNeutralFaction Нейтральные фракции не могут объявлять войну. -CannotDeclareWarOnAlly Вы не можете объявить войну своему союзнику. -CannotDeclareWarOnLiege Вы не можете объявить войну своему сюзерену. Используйте вместо этого команду '/mf declareindeperence'. -CannotDeclareWarOnNeutralFaction Вы не можете объявить войну нейтральной фракции. -CannotDeclareWarOnVassal Вы не можете объявить войну своему вассалу. -CannotDeclareWarOnYourself Вы не можете объявить войну самому себе. -CannotDemoteSelf Вы не можете понизить себя. -CannotDuelSelf Вы не можете сражаться с собой. -CannotFindDynmap Не могу найти динамическую карту. -CannotForciblyKickOwner Невозможно исключить владельца из его собственной фракции. Попробуйте распустить фракцию. -CannotGrantAccessToSelf Вы не можете предоставить себе доступ. -CannotKickOwner Нельзя выгнать владельца. -CannotKickSelf Вы не можете выгнать самого себя. -CannotMakePeaceWithSelf Вы не можете заключить мир со своей собственной фракцией. -CannotPlaceChestsNextToUnownedLockedChests Вы не можете размещать сундуки рядом с другими заблокированными сундуками, которыми вы не владеете. -CannotPlaceHoppersNextToUnownedLockedChests Вы не можете размещать воронки рядом, под или над закрытыми сундуками, которыми вы не владеете. -CannotPromoteSelf Вы не можете продвигать себя. -CannotRevokeAccessFromSelf Вы не можете запретить себе доступ. -CannotSetFactionHomeInWilderness Вы не можете разместить столицу свой фракции на земле, которая не в её владениях. -CannotSetVersion Не могу установить версию. -CannotTransferToSelf Вы не можете передать владение вашей фракцией самому себе. -CannotVassalizeLiege Вы не можете вассализировать своего сюзерена. -CannotVassalizeSelf Вы не можете вассализировать свою фракцию. -CannotVassalizeVassal Вы не можете вассализировать ту фракцию, у которой уже есть сюзерен. -CanOnlyCreateGatesInClaimedTerritory Вы можете создавать ворота только на своей территории. -CanOnlyLockBlocksInClaimedTerritory Вы можете блокировать блоки только на земле, которой владеет ваша фракция. -CanOnlyLockInFactionTerritory Вы можете запирать вещи только на территории вашей фракции. -CanOnlyLockSpecificBlocks Вы можете запирать только сундуки, двери, бочки, люки, печи, наковальни или ворота. -ClaimedChunksLoaded Владения фракций загружены. -ClaimedChunksSuccessfullyLoaded Владения фракций успешно загружены. -ClickOnTriggerLever Нажмите на рычаг... -ClickToPlaceSecondCorner Щелкните, чтобы разместить второй угол... -CmdAddLaw addlaw -CmdAlly ally -CmdAutoClaim autoclaim -CmdBreakAlliance breakalliance -CmdBypass bypass -CmdChat chat -CmdCheckAccess checkaccess -CmdCheckClaim checkclaim -CmdClaim claim -CmdConfig config -CmdConfigSet set -CmdConfigShow show -CmdCreate create -CmdDeclareIndependence declareindependence -CmdDeclareWar declarewar -CmdDemote demote -CmdDesc desc -CmdDisband disband -CmdDuel duel -CmdDuelAccept accept -CmdDuelCancel cancel -CmdDuelChallenge challenge -CmdEditLaw editlaw -CmdFlags flags -CmdFlagsSet set -CmdFlagsShow show -CmdForce force -CmdForceBonusPower bonuspower -CmdForceClaim claim -CmdForceCreate create -CmdForceDemote demote -CmdForceFlag flag -CmdForceJoin join -CmdForceKick kick -CmdForceLoad load -CmdForcePeace peace -CmdForcePower power -CmdForceRename rename -CmdForceRenounce renounce -CmdForceSave save -CmdForceTransfer transfer -CmdForceUnlock unlock -CmdGate gate -CmdGateCancel cancel -CmdGateCreate create -CmdGateList list -CmdGateName name -CmdGateRemove remove -CmdGrantAccess grantaccess -CmdGrantIndependence grantindependence -CmdHelp help -CmdHome home -CmdInfo info -CmdInvite invite -CmdInvoke invoke -CmdJoin join -CmdKick kick -CmdLaws laws -CmdLeave leave -CmdList list -CmdLock lock -CmdMakePeace makepeace -CmdMembers members -CmdPower power -CmdPrefix prefix -CmdPromote promote -CmdRemoveLaw removelaw -CmdRename rename -CmdResetPowerLevels resetpowerlevels -CmdRevokeAccess revokeaccess -CmdSetHome sethome -CmdSwearFealty swearfealty -CmdTransfer transfer -CmdUnclaim unclaim -CmdUnclaimall unclaimall -CmdUnlock unlock -CmdVassalize vassalize -CmdVersion version -CmdWho who -CommandCancelled Команда отменена. -CommandNotRecognized Medieval Factions не распознал эту команду. -CommandsPage1 == Команды Medieval Factions Страница 1/%d == -CommandsPage2 == Команды Medieval Factions Страница 2/%d == -CommandsPage3 == Команды Medieval Factions Страница 3/%d == -CommandsPage4 == Команды Medieval Factions Страница 4/%d == -CommandsPage5 == Команды Medieval Factions Страница 5/%d == -CommandsPage6 == Команды Medieval Factions Страница 6/%d == -CommandsPage7 == Команды средневековых фракций Страница 7 /% d == -ConfigListPageOne ===== Страница списка конфигураций 1/2 ===== -ConfigListPageTwo ===== Страница списка конфигураций 2/2 ===== -CreatingGateCancelled Создание ворот отменено. -CreatingGateClickWithHoe Создание ворот. Нажмите на блок с золотой мотыгой в руке чтобы выбрать первую точку. -CuboidDisallowed1 Ошибка размещения точки 1: невозможно разместить кубоид. -CuboidDisallowed2 Ошибка размещения точки 2: невозможно разместить кубоид. -CurrentLanguageID Текущий ID языка: %s -CurrentlyNoFactions На данный момент фракций нет. -CurrentPowerLevel Текущий уровень мощи %s составляет %d/%d. -Defeated %s победил %s на дуэли. -DemesneSize Размер владения: %d/%d -Description Описание: %s -DescriptionSet Описание установлено. -DesignatedFactionNotFound Одна из указанных фракций не найдена. -DesiredPowerMustBeANumber Заданная мощь должна быть числом. -DeveloperList Разработчики: %s -DisbandmentDueToZeroPower %s была расформирована из-за того, что её совокупная мощь достигла нуля. -DoesntExist %s не существует. -Done Сделанный. -DoubleSet Двойной установлен. -DuelChallengeCancelled Вызов на дуэль отменен. -DuelEndedInTie Дуэль %s и %s закончилась вничью. -DynmapIntegrationSuccessful Интеграция с динамической картой прошла успешно. -ERROR ОШИБКА: -ErrorAddingAreaMarker Ошибка при добавлении маркера области %s -ErrorChunkRemoval При удалении запрошенного участка произошла ошибка. -ErrorClaimedChunkRemoval При удалении запрошенного участка произошла ошибка. -ErrorCouldNotFindGatesFaction Ошибка: не удалось найти фракцию для ворот '%s'. -ErrorCouldNotLoadFactionGate ОШИБКА: не удалось загрузить ворота фракции. \n -ErrorCreatingMarkerSet Ошибка при создании маркера. -ErrorIntegratingWithDynmap Ошибка интеграции с динамической картой: -ErrorPlayerPowerRecordForUUIDNotFound ОШИБКА: запись мощи игрока для uuid не найдена. Не удалось получить совокупный уровень мощи. -ErrorSettingAreaMarkerColor Ошибка при установке цвета маркера области на '%s'. -FactionAlreadyAlly Эта фракция уже является вашим союзником. -FactionAlreadyExists Извините. Эта фракция уже существует. -FactionAndPlayerSingleQuotesRequirement Фракцию и игрока следует указывать в одинарных кавычках. -FactionAndVassalSingleQuotesRequirement Фракция и вассал, подлежащие удалению, должны быть заключены в одинарные кавычки. -FactionCreated Фракция создана. -FactionCurrentlyEnemyMustMakePeace Эта фракция в настоящее время является Вашим врагом. Заключите мир, прежде чем попытаться вступить с ними в союз. -FactionDataLoadedSuccessfuly Данные фракций успешно загружены -FactionDoesNotExist Извините. Такой фракции не существует. -FactionDoesNotHaveLaws У этой фракции нет никаких законов. -FactionGates Врата фракций -FactionHomeLoadError Произошла ошибка при загрузке домашней позиции фракции. -FactionHomeNotSetYet Дом фракции еще не установлен. -FactionHomeSet Домашняя точка фракции установлена. -FactionInfo Информация о фракции %s -FactionIsNotVassal Эта фракция не является вашим вассалом. -FactionMustBeDesignatedInsideSingleQuotes Фракцию необходимо обозначать в одинарных кавычках. -FactionNameChanged Название фракции изменено. -FactionNameNotRecognized Это название фракции не было распознано. -FactionNameTooLong Это имя слишком длинное. -FactionNotEnemy Эта фракция Вам не враг. -FactionNotFound Эта фракция не найдена. -FactionsSuccessfullyLoaded Фракции успешно загружены. -FactionsTitle == Фракции == -FactionSuccessfullyDisbanded Фракция была успешно расформирована. -FactionSuccessfullyLoaded Фракция успешно загружена. -FileLoadError Произошла ошибка при загрузке файла -FollowingPlayersHaveAccess К этому блоку имеют доступ следующие игроки: -GateCreated Ворота успешно созданы. -HasAttemptedToMakePeaceWith %s попытался заключить мир с %s. -HasBeenKickedFrom %s исключен из %s -HasDeclaredIndependence %s заявил о своей независимости от %s. -HasDeclaredWarAgainst %s объявил войну %s. -HasJoined %s присоединился к %s -HelpAddLaw /mf addlaw - Добавить закон в вашу фракцию. -HelpAlly /mf ally - Вступить в союз с фракцией. -HelpAutoclaim /mf autoclaim - Включить автоматическое присвоение земель, чтобы упростить процесс расширения владений. -HelpBreakAlliance /mf breakalliance - Разорвать союз с фракцией. -HelpBypass /mf bypass - Обход защиты. -HelpChat /mf chat - Переключить чат фракции. -HelpCheckAccess /mf checkaccess - Проверить, у кого есть доступ к заблокированному блоку. -HelpCheckClaim /mf checkclaim - Проверить, кому принадлежит какая-нибудь земля. -HelpClaim /mf claim - Присоединить землю к своей фракции. -HelpConfigSet /mf config set (вариант) (значение) - Установить значение конфигурации. -HelpConfigShow /mf config show - Показать значения конфигурации. -HelpCreate /mf create (имя) - Создать новую фракцию. -HelpDeclareIndependence /mf declareindependence - Объявить независимость от вашего сюзерена. -HelpDeclareWar /mf declarewar - Объявить войну другой фракции. -HelpDemote /mf demote - Понизить офицера до звания участника. -HelpDesc /mf desc (описание) - Установить описание вашей фракции. -HelpDisband /mf disband - Распустить фракцию (Вы должны быть её владельцем). -HelpDuelAccept /mf duel accept (<необязательно> игрок) -HelpDuelCancel /mf duel cancel -HelpDuelChallenge /mf duel challenge (игрок) (<необязательно> ограничение по времени в секундах) -HelpEditLaw /mf editlaw - Редактировать уже существующий закон в Вашей фракции. -HelpFlagsSet /mf flags set (опция) (значение) - Установить флаг фракции. -HelpFlagsShow /mf flags show - Показать флаги фракций. -HelpForce /mf force - Заставить плагин выполнять определенные действия. -HelpForceBonusPower /mf force bonuspower 'фракция' число' -HelpForceClaim /mf force claim 'название фракции' -HelpForceCreate /mf force create 'фракция' -HelpForceDemote /mf force demote (игрок) -HelpForceFlag /mf force flag 'фракция' 'опция' 'значение' -HelpForceJoin /mf force join 'игрок' фракция 2 ' -HelpForceKick /mf force kick (игрок) -HelpForceLoad /mf force load -HelpForcePeace /mf force peace 'фракция1' фракция2 -HelpForcePower /mf force power 'игрок' 'номер' -HelpForceRemoveVassal /mf force removevassal 'фракция' 'вассал' -HelpForceRename /mf force rename 'фракцию' новое имя' -HelpForceRenounce /mf force renounce (фракция) -HelpForceSave /mf force save -HelpForceTransfer /mf force transfer 'фракция' 'игрок' -HelpForceUnlock /mf force unlock -HelpGateCancel /mf gate cancel -HelpGateCreate /mf gate create (<необязательно> название) -HelpGateList /mf gate list -HelpGateName /mf gate name (<необязательно> название) -HelpGateRemove /mf gate remove -HelpGrantAccess /mf grantaccess - Дать кому-то доступ к заблокированному блоку. -HelpGrantIndependence /mf grantindependence - Дать независимость вассалу. -HelpHelp /mf help # - Показать список полезных команд. -HelpHome /mf home - Телепортироваться на домашнюю точку Вашей фракции. -HelpInfo /mf info - Посмотреть информацию о Вашей или чужой фракции. -HelpInvite /mf invite (игрок) - Пригласить игрока в Вашу фракцию. -HelpInvoke /mf invoke (союзник) (враг) - Призвать союзную фракцию на войну. -HelpJoin /mf join (фракция) - Присоединиться к фракции по приглашению. -HelpKick /mf kick - Выгнать игрока из фракции. -HelpLaws /mf laws - Просмотреть законы своей фракции. -HelpLeave /mf leave - Покинуть фракцию. -HelpList /mf list - Список всех фракций на сервере. -HelpLock /mf lock - Заблокировать сундук или дверь. -HelpMakePeace /mf makepeace - Предложить другой фракции мир. -HelpMap /mf map - отобразить карту претензий рядом с вашим окружением. -HelpMembers /mf members - Список участников Вашей или чужой фракции. -HelpPower /mf power - Проверить уровень Вашей мощи. -HelpPrefix /mf prefix (префикс) - Установить префикс Вашей фракции -HelpPromote /mf promote - Повысить игрока до офицерского звания -HelpRemoveLaw /mf removelaw - Удалить закон Вашей фракции. -HelpRename /mf rename - Переименовать Вашу фракцию -HelpResetPowerLevels /mf resetpowerlevels - Сбросить записи мощи игроков и совокупной мощи фракции. -HelpRevokeAccess /mf revokeaccess - Отозвать доступ к заблокированному блоку у кого-либо. -HelpSetHome /mf sethome - Установить домашнюю точку фракции. -HelpSwearFealty /mf swearfealty - Поклясться в верности какой-либо фракции. -HelpTransfer /mf transfer - Передать владение Вашей фракцией другому игроку\n -HelpUnclaim /mf unclaim - Дать независимость какому-либо участку земли у Вашей фракции. -HelpUnclaimall /mf unclaimall - Дать независимость всем землям Вашей фракции. -HelpUnlock /mf unlock - Разблокировать сундук или дверь. -HelpVassalize /mf vassalize - Предложить какой-либо фракции стать Вашим вассалом. -HelpVersion /mf version - Проверить версию плагина. -HelpWho /mf who - Показать информацию о фракции указанного игрока. -HomeClaimedByAnotherFaction Домашняя точка захвачена другой фракцией и была потеряна. -HomeIsInUnclaimedChunk Домашняя точка находится на незанятой Вашей фракцией земле и поэтому недоступна. -HourlySaveAlert Medieval Factions сохраняется... Сохранение будет происходить каждый час. -IntegerSet Целые числа установлены. -InvitationExpired Срок действия Вашего приглашения %s истек. -InvitationSent Приглашение отправлено. -KeysLoaded Загружено ключей: %d -LandAlreadyClaimedBy Эта земля уже захвачена фракцией -LandAlreadyClaimedByYourFaction Эта земля уже занята Вашей фракцией. -LandClaimedBy Эта земля захвачена фракцией %s. -LandClaimedUsingAdminBypass Земля стала независимой благодаря администратору. -LandIsNotClaimed Эта земля никем не занята. -LandIsUnclaimed Эта земля не занята. -LandNotCurrentlyClaimed Эта земля в настоящее время никем не занята. -LandUnclaimed Земля не захвачена. -LawAdded Закон добавлен. -LawEdited Закон был отредактирован. -LawRemoved Закон удален. -LawsTitle == Законы %s == -LeverSuccessfullyLinked Создание ворот 4/4: Рычаг успешно соединён. -Liege Сюзерен: %s -ListLegend P: сила, M: участники, L: земли -LoadingClaimedChunks Загрузка захваченных земель... -LoadingLockedBLocks Загрузка заблокированных блоков... -LoadingPlayerPowerRecords Загрузка записей о мощи игроков... -Locked Заблокировано. -LockedBlockSuccessfullyLoaded Заблокированные блоки успешно загружены. -LockedBy Заблокировано игроком %s -LockingCancelled Блокировка отменена. -LockRemovalError Произошла ошибка при снятии блокировки. -MaterialsMismatch1 Ошибка размещения точки 1: Несоответствие материалов. -MaterialsMismatch2 Ошибка размещения пункта 2: Несоответствие материалов. -MedievalFactionsStringRight Medieval Factions-%s -MedievalFactionsTitle == Medieval Factions %s == -MembersOf Участники фракции %s -MissingFactionGatesJSONCollection Не удалось загрузить врата, потому что коллекция 'factionGates' не существует в JSON файле фракций. Вы обновились с предыдущей версии? Установка по умолчанию... -MovementDetectedTeleportCancelled Обнаружено движение. Телепорт отменён. -MustBeAtWarOrFactionMustBeInactive Должны быть в состоянии войны с указанной фракцией или же указанная фракция должна быть неактивной. -MustBeInFaction Извините, вы должны состоять в какой-либо фракции, чтобы использовать эту команду. -MustBeOwner К сожалению, для использования этой команды вы должны быть владельцем фракции. -MustOwnFactionOrBeOfficer Чтобы использовать эту команду, Вы должны быть владельцем фракции или её офицером. -MustTransferOwnership Сожалею. Вы должны передать право собственности или выгнать всех в вашей фракции, чтобы покинуть ее. -Name Имя: %s -NameAlreadyTaken Это имя уже занято. -NeutralityDisabled Нейтралитет в настоящее время отключен. -NoBlockDetectedToCheckForGate Не обнаружено блока для проверки ворот. -NoFactionsDesignatedSingleQuotesRequired Фракции не указаны. Нужно обязательно заключать их в одинарные кавычки. -NoLongerBypassingProtections Вы больше не обходите защиту Medieval Factions. -NoLongerInFactionChat Вы больше не в чате фракции. -NotAMemberOfAnyFaction Вы не состоите ни в какой фракции. -NotAnAlly %s не является Вашим союзником. -NotAnAllyOrVassal %s не является вашим союзником или вассалом. -NotAtWarWith Вы не воюете с %s -NotAVassalOfAFaction Вы не являетесь вассалом какой-либо фракции. +AcceptedChallengeDuelHasBegun Вы приняли вызов %s, дуэль началась. +AlertAccessGrantedTo Доступ был предоставлен %s +AlertAccessRevokedFor Доступ у %s был отозван +AlertAllianceHasBeenBroken %s разорвал союз с Вашей фракцией. +AlertAlreadyAtWarWith Ваша фракция уже воюет с %s. +AlertAlreadyCreatingGate Вы уже в режиме создания ворот. +AlertAlreadyDueling Вы уже участвуете в дуэли. +AlertAlreadyDuelingPlayer Вы уже сражаетесь с %s. +AlertAlreadyDuelingSomeone Вы уже сражаетесь с кем-то. +AlertAlreadyGrantingAccess Вы уже предоставляете доступ кому-то. Введите /mf grantacess cancel, чтобы отозвать его. +AlertAlreadyInFaction Вы уже во фракции, извините. +AlertAlreadyRequestedAlliance Вы уже запросили союз с этой фракцией. +AlertAlreadyRequestedPeace Вы уже запросили заключение мира с этой фракцией. +AlertAttemptedAlliance %s попытался вступить в союз с %s. +AlertAttemptedVassalization %s попытался вассализировать вашу фракцию. Если вы являетесь её владельцем, введите '/mf swearfealty %s', чтобы принять. +AlertBeenInvited Вас пригласили в %s. Чтобы присоединиться, введите /mf join %s. +AlertCalledToWar1 %s призвал Вашу фракцию к войне с %s. +AlertCalledToWar2 %s призвал %s на войну с вашей фракцией. +AlertCalledToWar3 Ваша фракция призвала %s на войну с %s. +AlertChallengedToDuel %s вызвал %s на дуэль. +AlertChallengedToDuelPlusHowTo %s вызвал вас на дуэль. Введите /mf duel accept, чтобы начать. +AlertChallengeIssued Вы вызвали %s на дуэль. +AlertChallengeWasAccepted %s принял Ваш вызов, дуэль началась. +AlertChangedGateName Имя ворот изменено на '%s'. +AlertCurrentPowerLevel Ваш текущий уровень мощности составляет %d/%d. +AlertDecreasingThePowerOfInactivePlayers Medieval Factions снижает силу каждого игрока на %d, если он не был в сети более %d минут. Это будет происходить каждые %d минут. +AlertDemotion Вы были понижены до статуса члена вашей фракции. +AlertDisbandmentDueToZeroPower Ваша фракция была расформирована, так как ее совокупная сила достигла нуля. +AlertFactionAttemptedToVassalize Ваша фракция попыталась вассализировать %s. +AlertFactionHasBeenVassalized Ваша фракция была вассализирована, и у нее теперь новый сюзерен: %s +AlertFactionHasNewVassal У вашей фракции появился новый вассал: %s +AlertFactionHomeRemoved Дом вашей фракции был удален. +AlertFactionIsWeakened У вашей фракции меньше половины максимальной силы. Он больше не будет получать дополнительную силу от вассалов, и ваши вассалы теперь уязвимы. +AlertForcedDemotion Вы были уволены со звания офицера в вашей фракции. +AlertForcedKick Вас выгнали из фракции. +AlertForcedLoad Medieval Factions был загружен. +AlertForcedSave Medieval Factions был сохранён вручную. +AlertForcedToJoinFaction Вас вынудили вступить во фракцию. +AlertGate Это ворота под названием '%s'. +AlertGrantedIndependence %s предоставил вашей фракции независимость. +AlertIncreasingThePowerOfEveryPlayer Medieval Factions увеличивает силу каждого игрока на %d. Это будет происходить каждые %d минут. +AlertJoinedFaction Вы вступили во фракцию. +AlertKicked %s выгнал Вас из Вашей фракции. +AlertLandClaimed Эта земля была присвоена. Размер владения: %d/%d +AlertLandConqueredFromAnotherFaction Земля, завоеванная %s. Размер владения: %d/%d +AlertLandConqueredFromYourFaction %s захватил земли вашей фракции. +AlertLeftFaction Вы покинули свою фракцию. +AlertLeftFactionAndItGotDeleted Вы покинули свою фракцию. Она был удалена, так как никто не был её участником. +AlertMoreClaimedChunksThanPower У вашей фракции больше присвоенных земель, чем её мощь. Вашу землю можно завоевать. +AlertMustBeAtWarToConquer Ваши фракции должны вести войну, чтобы вы могли завоевать её землю. +AlertMustBeInFactionToUseCommand Чтобы использовать эту команду, Вы должны принадлежать к какой-либо фракции. +AlertMustBeMemberToCreateGate Вы должны быть членом этой фракции, чтобы создать ворота. +AlertMustBeOfficerOrOwnerToClaimLand Вы должны быть офицером или владельцем фракции, чтобы присвоить землю. +AlertMustBeOwnerOrOfficerToCreateGate Чтобы создать ворота, Вы должны быть владельцем или офицером фракции. +AlertMustBeOwnerOrOfficerToUseCommand Чтобы использовать эту команду, Вы должны быть владельцем фракции или её офицером. +AlertMustBeOwnerToInvokeAlliance Чтобы создать альянс, Вы должны быть владельцем своей фракции. +AlertMustBeOwnerToUseCommand Чтобы использовать эту команду, вы должны быть владельцем фракции. +AlertMustKickAllPlayers Вам нужно выгнать всех игроков, прежде чем вы сможете распустить свою фракцию. +AlertNoGatesDefined У Вашей фракции нет ворот. +AlertNoLaws У Вашей фракции нет законов. +AlertNoLongerVassalFaction %s больше не является вассальной фракцией. +AlertNonOwnership Вам это не принадлежит. +AlertNoPendingChallenges У Вас нет незавершенных задач, которые можно отменить. +AlertNotAllied Ваша фракция не состоит в союзе с %s. +AlertNotBeenChallenged Вас никто не вызывал на дуэль. +AlertNotBeenChallengedByPlayer %s не вызывал Вас на дуэль. +AlertNotInFaction Вы не состоите во фракции. +AlertNotInvitedToFaction Вы не приглашены в эту фракцию. +AlertNotOfferedVassalizationBy Эта фракция не предлагала Вам стать её вассалом. +AlertNowAlliedWith Ваша фракция теперь в союзе с %s. +AlertNowAtPeaceWith %s теперь в мире с %s. +AlertPlayerAlreadyOwner Этот игрок уже является владельцем этой фракции. +AlertPlayerNotInFaction Этот игрок не входит в эту фракцию. +AlertPowerLevelDecreased Ваш уровень мощности снизился. +AlertPowerLevelIncreasedBy Вы чувствуете себя сильнее. Ваша сила увеличилась на %d. +AlertReachedDemesne Вы достигли предела своих владений. Пригласите больше игроков, чтобы увеличить его. +AlertUnlocked Разблокирован. +AlertUnlockingCancelled Разблокировка отменена. +AllianceBrokenWith Альянс с %s был разорван. +AlliedWith В союзе с: %s +AllLandUnclaimed Все земли стали независимыми. +AllLandUnclaimedFrom Все земли %s обрели независимость. +AlreadyEnteredCheckAccess Вы уже используете эту команду. Введите '/mf checkacesss cancel' чтобы прекратить. +AlreadyEnteredRevokeAccess Вы уже используете эту команду. Введите '/mf revokeaccess cancel' чтобы прекратить. +AlreadyInFaction Извините, но Вы уже состоите во фракции. Покиньте её, если хотите создать другую. +ArgumentMustBeNumber Аргумент должен быть числом. +ArgumentsSingleQuotesRequirement Аргументы необходимо заключать в одинарные кавычки. +AssignedToRandomFaction Вы попали в случайную фракцию. +AttemptedAlliance Попытка вступить в союз с %s +AttemptedPeace Попытка заключить мир с %s +AtWarWith В состоянии войны с: %s +AutoclaimToggled Автоприсоединение земель отключено. +BlockAlreadyLocked Этот блок уже заблокирован. +BlockIsNotLocked Этот блок не заблокирован. +BlockIsPartOfGateMustRemoveGate Этот блок является частью ворот под названием '%s'. Вы должны сначала удалить эти ворота. +BonusPower Бонусная сила от админов: %d +BooleanSet Булевый тип установлен. +Cancelled Отменено. +CancelledGatePlacement1 Ошибка размещения точки 1. Размещение ворот отменено. +CancelledGatePlacement2 Ошибка размещения точки 2. Размещение ворот отменено. +CancelledGatePlacementErrorLinking Ошибка привязки к рычагу. Размещение ворот отменено. +CannotAllyWithSelf Вы не можете вступить в союз с собственной фракцией. +CannotAttackFactionMember Вы не можете атаковать другого игрока, если состоите с ним в одной фракции. +CannotAttackNonWarringPlayer Вы не можете атаковать другого игрока, если ваши фракции не воюют. +CannotBreakAllianceWithSelf Вы не можете разорвать союз с собственной фракцией. +CannotBringNeutralFactionIntoWar Нельзя вовлекать нейтральные фракции в войну. +CannotCancelActiveDuel Нельзя отменить активную дуэль. +CannotDeclareWarIfLiegeNotWeakened Вы не можете объявить войну вассальной фракции, если их сюзерен не ослаблен. +CannotDeclareWarIfNeutralFaction Нейтральные фракции не могут объявлять войну. +CannotDeclareWarOnAlly Вы не можете объявить войну своему союзнику. +CannotDeclareWarOnLiege Вы не можете объявить войну своему сюзерену. Используйте вместо этого команду '/mf declareindeperence'. +CannotDeclareWarOnNeutralFaction Вы не можете объявить войну нейтральной фракции. +CannotDeclareWarOnVassal Вы не можете объявить войну своему вассалу. +CannotDeclareWarOnYourself Вы не можете объявить войну самому себе. +CannotDemoteSelf Вы не можете понизить себя. +CannotDuelSelf Вы не можете сражаться с собой. +CannotFindDynmap Не могу найти динамическую карту. +CannotForciblyKickOwner Невозможно исключить владельца из его собственной фракции. Попробуйте распустить фракцию. +CannotGrantAccessToSelf Вы не можете предоставить себе доступ. +CannotKickOwner Нельзя выгнать владельца. +CannotKickSelf Вы не можете выгнать самого себя. +CannotMakePeaceWithSelf Вы не можете заключить мир со своей собственной фракцией. +CannotPlaceChestsNextToUnownedLockedChests Вы не можете размещать сундуки рядом с другими заблокированными сундуками, которыми вы не владеете. +CannotPlaceHoppersNextToUnownedLockedChests Вы не можете размещать воронки рядом, под или над закрытыми сундуками, которыми вы не владеете. +CannotPromoteSelf Вы не можете продвигать себя. +CannotRevokeAccessFromSelf Вы не можете запретить себе доступ. +CannotSetFactionHomeInWilderness Вы не можете разместить столицу свой фракции на земле, которая не в её владениях. +CannotSetVersion Не могу установить версию. +CannotTransferToSelf Вы не можете передать владение вашей фракцией самому себе. +CannotVassalizeLiege Вы не можете вассализировать своего сюзерена. +CannotVassalizeSelf Вы не можете вассализировать свою фракцию. +CannotVassalizeVassal Вы не можете вассализировать ту фракцию, у которой уже есть сюзерен. +CanOnlyCreateGatesInClaimedTerritory Вы можете создавать ворота только на своей территории. +CanOnlyLockBlocksInClaimedTerritory Вы можете блокировать блоки только на земле, которой владеет ваша фракция. +CanOnlyLockInFactionTerritory Вы можете запирать вещи только на территории вашей фракции. +CanOnlyLockSpecificBlocks Вы можете запирать только сундуки, двери, бочки, люки, печи, наковальни или ворота. +ClaimedChunksLoaded Владения фракций загружены. +ClaimedChunksSuccessfullyLoaded Владения фракций успешно загружены. +ClickOnTriggerLever Нажмите на рычаг... +ClickToPlaceSecondCorner Щелкните, чтобы разместить второй угол... +CmdAddLaw addlaw +CmdAlly ally +CmdAutoClaim autoclaim +CmdBreakAlliance breakalliance +CmdBypass bypass +CmdChat chat +CmdCheckAccess checkaccess +CmdCheckClaim checkclaim +CmdClaim claim +CmdConfig config +CmdConfigSet set +CmdConfigShow show +CmdCreate create +CmdDeclareIndependence declareindependence +CmdDeclareWar declarewar +CmdDemote demote +CmdDesc desc +CmdDisband disband +CmdDuel duel +CmdDuelAccept accept +CmdDuelCancel cancel +CmdDuelChallenge challenge +CmdEditLaw editlaw +CmdFlags flags +CmdFlagsSet set +CmdFlagsShow show +CmdForce force +CmdForceBonusPower bonuspower +CmdForceClaim claim +CmdForceCreate create +CmdForceDemote demote +CmdForceFlag flag +CmdForceJoin join +CmdForceKick kick +CmdForceLoad load +CmdForcePeace peace +CmdForcePower power +CmdForceRename rename +CmdForceRenounce renounce +CmdForceSave save +CmdForceTransfer transfer +CmdForceUnlock unlock +CmdGate gate +CmdGateCancel cancel +CmdGateCreate create +CmdGateList list +CmdGateName name +CmdGateRemove remove +CmdGrantAccess grantaccess +CmdGrantIndependence grantindependence +CmdHelp help +CmdHome home +CmdInfo info +CmdInvite invite +CmdInvoke invoke +CmdJoin join +CmdKick kick +CmdLaws laws +CmdLeave leave +CmdList list +CmdLock lock +CmdMakePeace makepeace +CmdMembers members +CmdPower power +CmdPrefix prefix +CmdPromote promote +CmdRemoveLaw removelaw +CmdRename rename +CmdResetPowerLevels resetpowerlevels +CmdRevokeAccess revokeaccess +CmdSetHome sethome +CmdSwearFealty swearfealty +CmdTransfer transfer +CmdUnclaim unclaim +CmdUnclaimall unclaimall +CmdUnlock unlock +CmdVassalize vassalize +CmdVersion version +CmdWho who +CommandCancelled Команда отменена. +CommandNotRecognized Medieval Factions не распознал эту команду. +CommandsPage1 == Команды Medieval Factions Страница 1/%d == +CommandsPage2 == Команды Medieval Factions Страница 2/%d == +CommandsPage3 == Команды Medieval Factions Страница 3/%d == +CommandsPage4 == Команды Medieval Factions Страница 4/%d == +CommandsPage5 == Команды Medieval Factions Страница 5/%d == +CommandsPage6 == Команды Medieval Factions Страница 6/%d == +CommandsPage7 == Команды средневековых фракций Страница 7 /% d == +ConfigListPageOne ===== Страница списка конфигураций 1/2 ===== +ConfigListPageTwo ===== Страница списка конфигураций 2/2 ===== +CreatingGateCancelled Создание ворот отменено. +CreatingGateClickWithHoe Создание ворот. Нажмите на блок с золотой мотыгой в руке чтобы выбрать первую точку. +CuboidDisallowed1 Ошибка размещения точки 1: невозможно разместить кубоид. +CuboidDisallowed2 Ошибка размещения точки 2: невозможно разместить кубоид. +CurrentLanguageID Текущий ID языка: %s +CurrentlyNoFactions На данный момент фракций нет. +CurrentPowerLevel Текущий уровень мощи %s составляет %d/%d. +Defeated %s победил %s на дуэли. +DemesneSize Размер владения: %d/%d +Description Описание: %s +DescriptionSet Описание установлено. +DesignatedFactionNotFound Одна из указанных фракций не найдена. +DesiredPowerMustBeANumber Заданная мощь должна быть числом. +DeveloperList Разработчики: %s +DisbandmentDueToZeroPower %s была расформирована из-за того, что её совокупная мощь достигла нуля. +DoesntExist %s не существует. +Done Сделанный. +DoubleSet Двойной установлен. +DuelChallengeCancelled Вызов на дуэль отменен. +DuelEndedInTie Дуэль %s и %s закончилась вничью. +DynmapIntegrationSuccessful Интеграция с динамической картой прошла успешно. +ERROR ОШИБКА: +ErrorAddingAreaMarker Ошибка при добавлении маркера области %s +ErrorChunkRemoval При удалении запрошенного участка произошла ошибка. +ErrorClaimedChunkRemoval При удалении запрошенного участка произошла ошибка. +ErrorCouldNotFindGatesFaction Ошибка: не удалось найти фракцию для ворот '%s'. +ErrorCouldNotLoadFactionGate ОШИБКА: не удалось загрузить ворота фракции. \n +ErrorCreatingMarkerSet Ошибка при создании маркера. +ErrorIntegratingWithDynmap Ошибка интеграции с динамической картой: +ErrorPlayerPowerRecordForUUIDNotFound ОШИБКА: запись мощи игрока для uuid не найдена. Не удалось получить совокупный уровень мощи. +ErrorSettingAreaMarkerColor Ошибка при установке цвета маркера области на '%s'. +FactionAlreadyAlly Эта фракция уже является вашим союзником. +FactionAlreadyExists Извините. Эта фракция уже существует. +FactionAndPlayerSingleQuotesRequirement Фракцию и игрока следует указывать в одинарных кавычках. +FactionAndVassalSingleQuotesRequirement Фракция и вассал, подлежащие удалению, должны быть заключены в одинарные кавычки. +FactionCreated Фракция создана. +FactionCurrentlyEnemyMustMakePeace Эта фракция в настоящее время является Вашим врагом. Заключите мир, прежде чем попытаться вступить с ними в союз. +FactionDataLoadedSuccessfuly Данные фракций успешно загружены +FactionDoesNotExist Извините. Такой фракции не существует. +FactionDoesNotHaveLaws У этой фракции нет никаких законов. +FactionGates Врата фракций +FactionHomeLoadError Произошла ошибка при загрузке домашней позиции фракции. +FactionHomeNotSetYet Дом фракции еще не установлен. +FactionHomeSet Домашняя точка фракции установлена. +FactionInfo Информация о фракции %s +FactionIsNotVassal Эта фракция не является вашим вассалом. +FactionMustBeDesignatedInsideSingleQuotes Фракцию необходимо обозначать в одинарных кавычках. +FactionNameChanged Название фракции изменено. +FactionNameNotRecognized Это название фракции не было распознано. +FactionNameTooLong Это имя слишком длинное. +FactionNotEnemy Эта фракция Вам не враг. +FactionNotFound Эта фракция не найдена. +FactionsSuccessfullyLoaded Фракции успешно загружены. +FactionsTitle == Фракции == +FactionSuccessfullyDisbanded Фракция была успешно расформирована. +FactionSuccessfullyLoaded Фракция успешно загружена. +FileLoadError Произошла ошибка при загрузке файла +FollowingPlayersHaveAccess К этому блоку имеют доступ следующие игроки: +GateCreated Ворота успешно созданы. +HasAttemptedToMakePeaceWith %s попытался заключить мир с %s. +HasBeenKickedFrom %s исключен из %s +HasDeclaredIndependence %s заявил о своей независимости от %s. +HasDeclaredWarAgainst %s объявил войну %s. +HasJoined %s присоединился к %s +HelpAddLaw /mf addlaw - Добавить закон в вашу фракцию. +HelpAlly /mf ally - Вступить в союз с фракцией. +HelpAutoclaim /mf autoclaim - Включить автоматическое присвоение земель, чтобы упростить процесс расширения владений. +HelpBreakAlliance /mf breakalliance - Разорвать союз с фракцией. +HelpBypass /mf bypass - Обход защиты. +HelpChat /mf chat - Переключить чат фракции. +HelpCheckAccess /mf checkaccess - Проверить, у кого есть доступ к заблокированному блоку. +HelpCheckClaim /mf checkclaim - Проверить, кому принадлежит какая-нибудь земля. +HelpClaim /mf claim - Присоединить землю к своей фракции. +HelpConfigSet /mf config set (вариант) (значение) - Установить значение конфигурации. +HelpConfigShow /mf config show - Показать значения конфигурации. +HelpCreate /mf create (имя) - Создать новую фракцию. +HelpDeclareIndependence /mf declareindependence - Объявить независимость от вашего сюзерена. +HelpDeclareWar /mf declarewar - Объявить войну другой фракции. +HelpDemote /mf demote - Понизить офицера до звания участника. +HelpDesc /mf desc (описание) - Установить описание вашей фракции. +HelpDisband /mf disband - Распустить фракцию (Вы должны быть её владельцем). +HelpDuelAccept /mf duel accept (<необязательно> игрок) +HelpDuelCancel /mf duel cancel +HelpDuelChallenge /mf duel challenge (игрок) (<необязательно> ограничение по времени в секундах) +HelpEditLaw /mf editlaw - Редактировать уже существующий закон в Вашей фракции. +HelpFlagsSet /mf flags set (опция) (значение) - Установить флаг фракции. +HelpFlagsShow /mf flags show - Показать флаги фракций. +HelpForce /mf force - Заставить плагин выполнять определенные действия. +HelpForceBonusPower /mf force bonuspower 'фракция' число' +HelpForceClaim /mf force claim 'название фракции' +HelpForceCreate /mf force create 'фракция' +HelpForceDemote /mf force demote (игрок) +HelpForceFlag /mf force flag 'фракция' 'опция' 'значение' +HelpForceJoin /mf force join 'игрок' фракция 2 ' +HelpForceKick /mf force kick (игрок) +HelpForceLoad /mf force load +HelpForcePeace /mf force peace 'фракция1' фракция2 +HelpForcePower /mf force power 'игрок' 'номер' +HelpForceRemoveVassal /mf force removevassal 'фракция' 'вассал' +HelpForceRename /mf force rename 'фракцию' новое имя' +HelpForceRenounce /mf force renounce (фракция) +HelpForceSave /mf force save +HelpForceTransfer /mf force transfer 'фракция' 'игрок' +HelpForceUnlock /mf force unlock +HelpGateCancel /mf gate cancel +HelpGateCreate /mf gate create (<необязательно> название) +HelpGateList /mf gate list +HelpGateName /mf gate name (<необязательно> название) +HelpGateRemove /mf gate remove +HelpGrantAccess /mf grantaccess - Дать кому-то доступ к заблокированному блоку. +HelpGrantIndependence /mf grantindependence - Дать независимость вассалу. +HelpHelp /mf help # - Показать список полезных команд. +HelpHome /mf home - Телепортироваться на домашнюю точку Вашей фракции. +HelpInfo /mf info - Посмотреть информацию о Вашей или чужой фракции. +HelpInvite /mf invite (игрок) - Пригласить игрока в Вашу фракцию. +HelpInvoke /mf invoke (союзник) (враг) - Призвать союзную фракцию на войну. +HelpJoin /mf join (фракция) - Присоединиться к фракции по приглашению. +HelpKick /mf kick - Выгнать игрока из фракции. +HelpLaws /mf laws - Просмотреть законы своей фракции. +HelpLeave /mf leave - Покинуть фракцию. +HelpList /mf list - Список всех фракций на сервере. +HelpLock /mf lock - Заблокировать сундук или дверь. +HelpMakePeace /mf makepeace - Предложить другой фракции мир. +HelpMap /mf map - отобразить карту претензий рядом с вашим окружением. +HelpMembers /mf members - Список участников Вашей или чужой фракции. +HelpPower /mf power - Проверить уровень Вашей мощи. +HelpPrefix /mf prefix (префикс) - Установить префикс Вашей фракции +HelpPromote /mf promote - Повысить игрока до офицерского звания +HelpRemoveLaw /mf removelaw - Удалить закон Вашей фракции. +HelpRename /mf rename - Переименовать Вашу фракцию +HelpResetPowerLevels /mf resetpowerlevels - Сбросить записи мощи игроков и совокупной мощи фракции. +HelpRevokeAccess /mf revokeaccess - Отозвать доступ к заблокированному блоку у кого-либо. +HelpSetHome /mf sethome - Установить домашнюю точку фракции. +HelpSwearFealty /mf swearfealty - Поклясться в верности какой-либо фракции. +HelpTransfer /mf transfer - Передать владение Вашей фракцией другому игроку\n +HelpUnclaim /mf unclaim - Дать независимость какому-либо участку земли у Вашей фракции. +HelpUnclaimall /mf unclaimall - Дать независимость всем землям Вашей фракции. +HelpUnlock /mf unlock - Разблокировать сундук или дверь. +HelpVassalize /mf vassalize - Предложить какой-либо фракции стать Вашим вассалом. +HelpVersion /mf version - Проверить версию плагина. +HelpWho /mf who - Показать информацию о фракции указанного игрока. +HomeClaimedByAnotherFaction Домашняя точка захвачена другой фракцией и была потеряна. +HomeIsInUnclaimedChunk Домашняя точка находится на незанятой Вашей фракцией земле и поэтому недоступна. +HourlySaveAlert Medieval Factions сохраняется... Сохранение будет происходить каждый час. +IntegerSet Целые числа установлены. +InvitationExpired Срок действия Вашего приглашения %s истек. +InvitationSent Приглашение отправлено. +KeysLoaded Загружено ключей: %d +LandAlreadyClaimedBy Эта земля уже захвачена фракцией +LandAlreadyClaimedByYourFaction Эта земля уже занята Вашей фракцией. +LandClaimedBy Эта земля захвачена фракцией %s. +LandClaimedUsingAdminBypass Земля стала независимой благодаря администратору. +LandIsNotClaimed Эта земля никем не занята. +LandIsUnclaimed Эта земля не занята. +LandNotCurrentlyClaimed Эта земля в настоящее время никем не занята. +LandUnclaimed Земля не захвачена. +LawAdded Закон добавлен. +LawEdited Закон был отредактирован. +LawRemoved Закон удален. +LawsTitle == Законы %s == +LeverSuccessfullyLinked Создание ворот 4/4: Рычаг успешно соединён. +Liege Сюзерен: %s +ListLegend P: сила, M: участники, L: земли +LoadingClaimedChunks Загрузка захваченных земель... +LoadingLockedBLocks Загрузка заблокированных блоков... +LoadingPlayerPowerRecords Загрузка записей о мощи игроков... +Locked Заблокировано. +LockedBlockSuccessfullyLoaded Заблокированные блоки успешно загружены. +LockedBy Заблокировано игроком %s +LockingCancelled Блокировка отменена. +LockRemovalError Произошла ошибка при снятии блокировки. +MaterialsMismatch1 Ошибка размещения точки 1: Несоответствие материалов. +MaterialsMismatch2 Ошибка размещения пункта 2: Несоответствие материалов. +MedievalFactionsStringRight Medieval Factions-%s +MedievalFactionsTitle == Medieval Factions %s == +MembersOf Участники фракции %s +MissingFactionGatesJSONCollection Не удалось загрузить врата, потому что коллекция 'factionGates' не существует в JSON файле фракций. Вы обновились с предыдущей версии? Установка по умолчанию... +MovementDetectedTeleportCancelled Обнаружено движение. Телепорт отменён. +MustBeAtWarOrFactionMustBeInactive Должны быть в состоянии войны с указанной фракцией или же указанная фракция должна быть неактивной. +MustBeInFaction Извините, вы должны состоять в какой-либо фракции, чтобы использовать эту команду. +MustBeOwner К сожалению, для использования этой команды вы должны быть владельцем фракции. +MustOwnFactionOrBeOfficer Чтобы использовать эту команду, Вы должны быть владельцем фракции или её офицером. +MustTransferOwnership Сожалею. Вы должны передать право собственности или выгнать всех в вашей фракции, чтобы покинуть ее. +Name Имя: %s +NameAlreadyTaken Это имя уже занято. +NeutralityDisabled Нейтралитет в настоящее время отключен. +NoBlockDetectedToCheckForGate Не обнаружено блока для проверки ворот. +NoFactionsDesignatedSingleQuotesRequired Фракции не указаны. Нужно обязательно заключать их в одинарные кавычки. +NoLongerBypassingProtections Вы больше не обходите защиту Medieval Factions. +NoLongerInFactionChat Вы больше не в чате фракции. +NotAMemberOfAnyFaction Вы не состоите ни в какой фракции. +NotAnAlly %s не является Вашим союзником. +NotAnAllyOrVassal %s не является вашим союзником или вассалом. +NotAtWarWith Вы не воюете с %s +NotAVassalOfAFaction Вы не являетесь вассалом какой-либо фракции. NotEnoughArgumentsDesignatedSingleQuotesRequired Указано недостаточно аргументов. Нужно обязательно заключать их в одинарные кавычки. -NotTheOwnerOfThisBlock Вы не являетесь владельцем этого блока. -NotTheOwnerOfThisFaction Вы не являетесь владельцем этой фракции. -NoVassalOrLiegeReferences С этой фракцией нет связанных вассалов или сюзеренов. -NowBypassingProtections Теперь Вы обходите защиту Medieval Factions. -NowSpeakingInFactionChat Теперь Вы говорите в чате фракции. -OnlyPlayersCanUseCommand Только игроки могут использовать эту команду. -OnlyUseLeversInClaimedTerritory Ошибка: можно использовать рычаги только на территории своей фракции. -Owner Владелец: %s -OwnershipTransferred Право собственности на %s было передано Вам. -OwnerShipTransferredTo Право собственности передано %s -PermissionNeeded Извините. Чтобы использовать эту команду, Вам необходимо следующее разрешение: '%s' -PlayerAlreadyDueling %s уже сражается с кем-то. -PlayerAlreadyInFaction Этот игрок уже состоит во фракции, извините. -PlayerAlreadyOfficer Игрок уже является офицером. -PlayerAndDesiredPowerSingleQuotesRequirement Игрок и желаемая мощь должны быть указаны в одинарных кавычках. -PlayerByNameNotFound Извините. Игрок с именем %s не найден. -PlayerCantBePromotedBecauseOfLimit Игрока нельзя повысить, потому что вы достигли своего лимита. Лимит: %d -PlayerDemoted Игрок был понижен в звании. -PlayerIsNotInAFaction Этот игрок не состоит во фракции. -PlayerIsNotInYourFaction Этого игрока нет в Вашей фракции. -PlayerIsNotMemberOfFaction Этот игрок не является участником Вашей фракции. -PlayerIsNotOfficerOfFaction Этот игрок не является офицером Вашей фракции. -PlayerNotFound Игрок не найден. -PlayerPowerRecordsLoaded Загружены записи мощи игроков. -PlayerPromoted Игрок был повышен. -PleaseWaitGate Эти ворота %s, пожалуйста подождите. -PluginDisabled Плагин Medieval Factions был отключен. -PluginDisabling Отключение плагина Medieval Factions... -PluginEnabled Плагин Medieval Factions включен. -PluginEnabling Плагин Medieval Factions включается... -PluginLoading Плагин Medieval Factions загружается... -PluginSaving Плагин Medieval Factions сохраняется... -Point1PlacementSuccessful Создание ворот 1/4: точка 1 размещена успешно. -Point2PlacedSuccessfully Создание ворот 2/4: точка 2 размещена успешно. -Population Население: %d -PowerHasDecayed Ваша мощность снизилась на %d с момента последнего выхода из игры. Теперь Ваша мощь %d. -PowerLevel Уровень мощи: %s -PowerLevelHasBeenSetTo Уровень мощи этого игрока был установлен на %d -PowerLevelHasIncreased Ваш уровень мощи был повышен. -PowerLevelResetting Уровень мощи сбрасывается... -PrefixesDisabled Префиксы в настоящее время отключены. -PrefixSet Префикс установлен. -PrefixTaken Этот префикс уже занят. -ProblemLoadingClaimedChunks Возникла проблема с загрузкой земель фракций. -ProblemLoadingFactions Возникла проблема с загрузкой фракций. -ProblemLoadingPowerRecords Возникла проблема с загрузкой записей о мощи игроков. -PromotedToOfficer Вы были повышены до звания офицера в Вашей фракции. -RadiusRequirement Радиус должен быть между 0 и %d -RemovedGate Удалены ворота '%s' -ResettingIndividualPowerRecords Сброс записей индивидуальной мощи игроков -RightClickCheckAccess Нажмите правой кнопкой мыши на заблокированный блок, чтобы посмотреть кто имеет к нему доступ. Введите '/mf checkaccess cancel' чтобы остановить проверку. -RightClickForceUnlock Щелкните правой кнопкой мыши сундук или дверь, чтобы разблокировать их! (Введите / mf force unlock cancel для отмены) -RightClickGrantAccess Нажмите правой кнопкой мыши по сундуку или двери, чтобы дать %s доступ. Введите /mf grantaccess cancel чтобы прекратить выдачу доступа. -RightClickLock Нажмите правой кнопкой мыши по сундуку или двери, чтобы заблокировать. (Введите /mf lock cancel чтобы прекратить блокировку) -RightClickRevokeAccess Нажмите правой кнопкой мыши на заблокированный блок, чтобы отозвать доступ игрока к нему. Введите '/mf revokeaccess cancel' чтобы прекратить это. -RightClickUnlock Нажмите правой кнопкой мыши на сундук или дверь, чтобы разблокировать. (Type /mf unlock cancel чтобы прекратить разблокировку) -SchedulingHourlyAutoSave Планирование ежечасного автосохранения... -SchedulingPowerDecrease Планирование понижения мощи... -SchedulingPowerIncrease Планирование увеличения мощи... -SingleQuotesAlliedWarring Союзная и воюющая фракции должны быть обозначены в одинарных кавычках. -StringSet Строка установлена. -SubCommands Подкоманды: -SuccessFactionMemberRemoval Успех. Если игрок состоял во фракции, то он больше не является её участником. -SuccessForceJoin Успех. Игрок был принуждён ко вступлению во фракцию. -SuccessfulDisbandment %s была успешно расформирована. -SuccessOfficerRemoval Успех. Если игрок был офицером во фракции, то он больше таковым не является. -SuccessReferencesRemoved ссылки успешно удалены. -SupportedLanguageIDList ID поддерживаемых языков: %s -SurroundedChunkProtected Фракция-цель владеет землями к северу, востоку, югу и западу от этого участка. Его нельзя захватить. -TargetBlockNotPartOfGate Указанный блок не является частью врат. -TargetFactionNotOverClaiming Фракция-цель не имеет земель больше их лимита. -TeleportingAlert Телепортирование через 3 секунды... -ThreeBlockRequirement Ошибка установки точки 2: Ворота должны быть в высоту 3 или больше блоков. -TriggerBlockNotLever Активирующий блок не является рычагом. Отмена размещения ворот. -UsageAddLaw Использование: /mf addlaw (новый закон) -UsageAlly Использование: /mf ally (фракция) -UsageBreakAlliance Использование: /mf breakalliance (фракция) -UsageClaimRadius Использование: /mf claim (радиус) -UsageConfigSet Использование: /mf config set (опция) (значение) -UsageConfigShow Использование: /mf config show (1 | 2) -UsageCreate Использование: /mf create [фракция] -UsageDeclareWar Использование: /mf declarewar (фракция) -UsageDemote Использование: /mf demote (имя игрока) -UsageDesc Использование: /mf desc (описание) -UsageEditLaw Использование: /mf editlaw (номер) (отредактированный закон) -UsageFlagsSet Использование: /mf flags set (опция) (значение) -UsageForceBonusPower Использование: /mf force bonuspower 'фракция' число' -UsageForceClaim Использование: /mf force claim 'название фракции' -UsageForceCreate Применение : /mf force create 'фракция' -UsageForceDemote Использование: /mf force demote (игрок) -UsageForceFlag Использование: /mf force flag 'faction' 'option' 'value' -UsageForceJoin Использование: /mf force join 'player' 'faction' -UsageForceKick Использование: /mf force kick (игрок) -UsageForcePeace Использование: /mf force peace 'фракция-1' 'фракция-2 -UsageForcePower Использование: /mf force power 'игрок' 'число' -UsageForceRemoveVassal /mf force removevassal 'фракция-1' 'фракция-2' -UsageForceRename Использование: /mf force rename 'фракцию' новое имя' -UsageForceRenounce Использование: /mf force renounce 'фракция' -UsageForceTransfer Использование: /mf force transfer 'имяФракции' 'игрок' -UsageGrantAccess Использование: /mf grantaccess (имя игрока) -UsageGrantIndependence Использование: /mf grantindependence (фракция) -UsageInvite Использование: /mf invite (имя игрока) -UsageInvoke Использование: /mf invoke '(название союзной фракции)' '(враждебная фракция)' -UsageJoin Использование: /mf join (фракция) -UsageKick Использование: /mf kick (имя игрока) -UsageMakePeace Использование: /mf makepeace (фракция) -UsagePrefix Использование: /mf prefix (new prefix) -UsagePromote Использование: /mf promote (имя игрока) -UsageRemoveLaw Использование: /mf removelaw (номер) -UsageRename Использование: /mf rename (новоеИмя) -UsageRevokeAccess Использование: /mf revokeaccess (имя игрока) -UsageSwearFealty Использование: /mf swearfealty (фракция) -UsageTransfer Использование: /mf transfer (имя игрока) -UsageVassalize Использование: /mf vassalize (фракция) -UsageWho Использование: /mf who (имя игрока) -ValidSubCommandsShowSet Допустимые подкоманды: show, set -VassalContribution Дополнительная сила от вассалов:% d -Vassals Вассалы: %s -WarningPlayerAlreadyStartedCreatingGate ВНИМАНИЕ: Игрок уже начал создавать ворота. Вызов startCreatingGate() игнорируется. -WasntFound '%s' не найдено. -WelcomeBackLastLogout С возвращением, %s. Последний раз Вы были в сети %s назад. -WikiLink Вики: https://github.com/dmccoystephenson/Medieval-Factions/wiki -Wilderness Дикие земли -WorldsMismatch1 Ошибка размещения точки 1: Несоответствие миров. -WorldsMismatch2 Ошибка размещения точки 2: Несоответствие миров. \ No newline at end of file +NotTheOwnerOfThisBlock Вы не являетесь владельцем этого блока. +NotTheOwnerOfThisFaction Вы не являетесь владельцем этой фракции. +NoVassalOrLiegeReferences С этой фракцией нет связанных вассалов или сюзеренов. +NowBypassingProtections Теперь Вы обходите защиту Medieval Factions. +NowSpeakingInFactionChat Теперь Вы говорите в чате фракции. +OnlyPlayersCanUseCommand Только игроки могут использовать эту команду. +OnlyUseLeversInClaimedTerritory Ошибка: можно использовать рычаги только на территории своей фракции. +Owner Владелец: %s +OwnershipTransferred Право собственности на %s было передано Вам. +OwnerShipTransferredTo Право собственности передано %s +PermissionNeeded Извините. Чтобы использовать эту команду, Вам необходимо следующее разрешение: '%s' +PlayerAlreadyDueling %s уже сражается с кем-то. +PlayerAlreadyInFaction Этот игрок уже состоит во фракции, извините. +PlayerAlreadyOfficer Игрок уже является офицером. +PlayerAndDesiredPowerSingleQuotesRequirement Игрок и желаемая мощь должны быть указаны в одинарных кавычках. +PlayerByNameNotFound Извините. Игрок с именем %s не найден. +PlayerCantBePromotedBecauseOfLimit Игрока нельзя повысить, потому что вы достигли своего лимита. Лимит: %d +PlayerDemoted Игрок был понижен в звании. +PlayerIsNotInAFaction Этот игрок не состоит во фракции. +PlayerIsNotInYourFaction Этого игрока нет в Вашей фракции. +PlayerIsNotMemberOfFaction Этот игрок не является участником Вашей фракции. +PlayerIsNotOfficerOfFaction Этот игрок не является офицером Вашей фракции. +PlayerNotFound Игрок не найден. +PlayerPowerRecordsLoaded Загружены записи мощи игроков. +PlayerPromoted Игрок был повышен. +PleaseWaitGate Эти ворота %s, пожалуйста подождите. +PluginDisabled Плагин Medieval Factions был отключен. +PluginDisabling Отключение плагина Medieval Factions... +PluginEnabled Плагин Medieval Factions включен. +PluginEnabling Плагин Medieval Factions включается... +PluginLoading Плагин Medieval Factions загружается... +PluginSaving Плагин Medieval Factions сохраняется... +Point1PlacementSuccessful Создание ворот 1/4: точка 1 размещена успешно. +Point2PlacedSuccessfully Создание ворот 2/4: точка 2 размещена успешно. +Population Население: %d +PowerHasDecayed Ваша мощность снизилась на %d с момента последнего выхода из игры. Теперь Ваша мощь %d. +PowerLevel Уровень мощи: %s +PowerLevelHasBeenSetTo Уровень мощи этого игрока был установлен на %d +PowerLevelHasIncreased Ваш уровень мощи был повышен. +PowerLevelResetting Уровень мощи сбрасывается... +PrefixesDisabled Префиксы в настоящее время отключены. +PrefixSet Префикс установлен. +PrefixTaken Этот префикс уже занят. +ProblemLoadingClaimedChunks Возникла проблема с загрузкой земель фракций. +ProblemLoadingFactions Возникла проблема с загрузкой фракций. +ProblemLoadingPowerRecords Возникла проблема с загрузкой записей о мощи игроков. +PromotedToOfficer Вы были повышены до звания офицера в Вашей фракции. +RadiusRequirement Радиус должен быть между 0 и %d +RemovedGate Удалены ворота '%s' +ResettingIndividualPowerRecords Сброс записей индивидуальной мощи игроков +RightClickCheckAccess Нажмите правой кнопкой мыши на заблокированный блок, чтобы посмотреть кто имеет к нему доступ. Введите '/mf checkaccess cancel' чтобы остановить проверку. +RightClickForceUnlock Щелкните правой кнопкой мыши сундук или дверь, чтобы разблокировать их! (Введите / mf force unlock cancel для отмены) +RightClickGrantAccess Нажмите правой кнопкой мыши по сундуку или двери, чтобы дать %s доступ. Введите /mf grantaccess cancel чтобы прекратить выдачу доступа. +RightClickLock Нажмите правой кнопкой мыши по сундуку или двери, чтобы заблокировать. (Введите /mf lock cancel чтобы прекратить блокировку) +RightClickRevokeAccess Нажмите правой кнопкой мыши на заблокированный блок, чтобы отозвать доступ игрока к нему. Введите '/mf revokeaccess cancel' чтобы прекратить это. +RightClickUnlock Нажмите правой кнопкой мыши на сундук или дверь, чтобы разблокировать. (Type /mf unlock cancel чтобы прекратить разблокировку) +SchedulingHourlyAutoSave Планирование ежечасного автосохранения... +SchedulingPowerDecrease Планирование понижения мощи... +SchedulingPowerIncrease Планирование увеличения мощи... +SingleQuotesAlliedWarring Союзная и воюющая фракции должны быть обозначены в одинарных кавычках. +StringSet Строка установлена. +SubCommands Подкоманды: +SuccessFactionMemberRemoval Успех. Если игрок состоял во фракции, то он больше не является её участником. +SuccessForceJoin Успех. Игрок был принуждён ко вступлению во фракцию. +SuccessfulDisbandment %s была успешно расформирована. +SuccessOfficerRemoval Успех. Если игрок был офицером во фракции, то он больше таковым не является. +SuccessReferencesRemoved ссылки успешно удалены. +SupportedLanguageIDList ID поддерживаемых языков: %s +SurroundedChunkProtected Фракция-цель владеет землями к северу, востоку, югу и западу от этого участка. Его нельзя захватить. +TargetBlockNotPartOfGate Указанный блок не является частью врат. +TargetFactionNotOverClaiming Фракция-цель не имеет земель больше их лимита. +TeleportingAlert Телепортирование через 3 секунды... +ThreeBlockRequirement Ошибка установки точки 2: Ворота должны быть в высоту 3 или больше блоков. +TriggerBlockNotLever Активирующий блок не является рычагом. Отмена размещения ворот. +UsageAddLaw Использование: /mf addlaw (новый закон) +UsageAlly Использование: /mf ally (фракция) +UsageBreakAlliance Использование: /mf breakalliance (фракция) +UsageClaimRadius Использование: /mf claim (радиус) +UsageConfigSet Использование: /mf config set (опция) (значение) +UsageConfigShow Использование: /mf config show (1 | 2) +UsageCreate Использование: /mf create [фракция] +UsageDeclareWar Использование: /mf declarewar (фракция) +UsageDemote Использование: /mf demote (имя игрока) +UsageDesc Использование: /mf desc (описание) +UsageEditLaw Использование: /mf editlaw (номер) (отредактированный закон) +UsageFlagsSet Использование: /mf flags set (опция) (значение) +UsageForceBonusPower Использование: /mf force bonuspower 'фракция' число' +UsageForceClaim Использование: /mf force claim 'название фракции' +UsageForceCreate Применение : /mf force create 'фракция' +UsageForceDemote Использование: /mf force demote (игрок) +UsageForceFlag Использование: /mf force flag 'faction' 'option' 'value' +UsageForceJoin Использование: /mf force join 'player' 'faction' +UsageForceKick Использование: /mf force kick (игрок) +UsageForcePeace Использование: /mf force peace 'фракция-1' 'фракция-2 +UsageForcePower Использование: /mf force power 'игрок' 'число' +UsageForceRemoveVassal /mf force removevassal 'фракция-1' 'фракция-2' +UsageForceRename Использование: /mf force rename 'фракцию' новое имя' +UsageForceRenounce Использование: /mf force renounce 'фракция' +UsageForceTransfer Использование: /mf force transfer 'имяФракции' 'игрок' +UsageGrantAccess Использование: /mf grantaccess (имя игрока) +UsageGrantIndependence Использование: /mf grantindependence (фракция) +UsageInvite Использование: /mf invite (имя игрока) +UsageInvoke Использование: /mf invoke '(название союзной фракции)' '(враждебная фракция)' +UsageJoin Использование: /mf join (фракция) +UsageKick Использование: /mf kick (имя игрока) +UsageMakePeace Использование: /mf makepeace (фракция) +UsagePrefix Использование: /mf prefix (new prefix) +UsagePromote Использование: /mf promote (имя игрока) +UsageRemoveLaw Использование: /mf removelaw (номер) +UsageRename Использование: /mf rename (новоеИмя) +UsageRevokeAccess Использование: /mf revokeaccess (имя игрока) +UsageSwearFealty Использование: /mf swearfealty (фракция) +UsageTransfer Использование: /mf transfer (имя игрока) +UsageVassalize Использование: /mf vassalize (фракция) +UsageWho Использование: /mf who (имя игрока) +ValidSubCommandsShowSet Допустимые подкоманды: show, set +VassalContribution Дополнительная сила от вассалов:% d +Vassals Вассалы: %s +WarningPlayerAlreadyStartedCreatingGate ВНИМАНИЕ: Игрок уже начал создавать ворота. Вызов startCreatingGate() игнорируется. +WasntFound '%s' не найдено. +WelcomeBackLastLogout С возвращением, %s. Последний раз Вы были в сети %s назад. +WikiLink Вики: https://github.com/dmccoystephenson/Medieval-Factions/wiki +Wilderness Дикие земли +WorldsMismatch1 Ошибка размещения точки 1: Несоответствие миров. +WorldsMismatch2 Ошибка размещения точки 2: Несоответствие миров. \ No newline at end of file diff --git a/src/main/resources/test.tsv b/src/main/resources/test.tsv index 6e5d7bbdd..7dd8fa6f4 100644 --- a/src/main/resources/test.tsv +++ b/src/main/resources/test.tsv @@ -1,547 +1,547 @@ -AcceptedChallengeDuelHasBegun TestAcceptedChallengeDuelHasBegun -AlertAccessGrantedTo TestAlertAccessGrantedTo -AlertAccessRevokedFor TestAlertAccessRevokedFor -AlertAllianceHasBeenBroken TestAlertAllianceHasBeenBroken -AlertAlreadyAtWarWith TestAlertAlreadyAtWarWith -AlertAlreadyCreatingGate TestAlertAlreadyCreatingGate -AlertAlreadyDueling TestAlertAlreadyDueling -AlertAlreadyDuelingPlayer TestAlertAlreadyDuelingPlayer -AlertAlreadyDuelingSomeone TestAlertAlreadyDuelingSomeone -AlertAlreadyGrantingAccess TestAlertAlreadyGrantingAccess -AlertAlreadyInFaction TestAlertAlreadyInFaction -AlertAlreadyRequestedAlliance TestAlertAlreadyRequestedAlliance -AlertAlreadyRequestedPeace TestAlertAlreadyRequestedPeace -AlertAttemptedAlliance TestAlertAttemptedAlliance -AlertAttemptedVassalization TestAlertAttemptedVassalization -AlertBeenInvited TestAlertBeenInvited -AlertCalledToWar1 TestAlertCalledToWar1 -AlertCalledToWar2 TestAlertCalledToWar2 -AlertCalledToWar3 TestAlertCalledToWar3 -AlertChallengedToDuel TestAlertChallengedToDuel -AlertChallengedToDuelPlusHowTo TestAlertChallengedToDuelPlusHowTo -AlertChallengeIssued TestAlertChallengeIssued -AlertChallengeWasAccepted TestAlertChallengeWasAccepted -AlertChangedGateName TestAlertChangedGateName -AlertCurrentPowerLevel TestAlertCurrentPowerLevel -AlertDecreasingThePowerOfInactivePlayers TestAlertDecreasingThePowerOfInactivePlayers -AlertDemotion TestAlertDemotion -AlertDisbandmentDueToZeroPower TestAlertDisbandmentDueToZeroPower -AlertFactionAttemptedToVassalize TestAlertFactionAttemptedToVassalize -AlertFactionHasBeenVassalized TestAlertFactionHasBeenVassalized -AlertFactionHasNewVassal TestAlertFactionHasNewVassal -AlertFactionHomeRemoved TestAlertFactionHomeRemoved -AlertFactionIsWeakened TestAlertFactionIsWeakened -AlertForcedDemotion TestAlertForcedDemotion -AlertForcedKick TestAlertForcedKick -AlertForcedLoad TestAlertForcedLoad -AlertForcedSave TestAlertForcedSave -AlertForcedToJoinFaction TestAlertForcedToJoinFaction -AlertGate TestAlertGate -AlertGrantedIndependence TestAlertGrantedIndependence -AlertIncreasingThePowerOfEveryPlayer TestAlertIncreasingThePowerOfEveryPlayer -AlertJoinedFaction TestAlertJoinedFaction -AlertKicked TestAlertKicked -AlertLandClaimed TestAlertLandClaimed -AlertLandConqueredFromAnotherFaction TestAlertLandConqueredFromAnotherFaction -AlertLandConqueredFromYourFaction TestAlertLandConqueredFromYourFaction -AlertLeftFaction TestAlertLeftFaction -AlertLeftFactionAndItGotDeleted TestAlertLeftFactionAndItGotDeleted -AlertMoreClaimedChunksThanPower TestAlertMoreClaimedChunksThanPower -AlertMustBeAtWarToConquer TestAlertMustBeAtWarToConquer -AlertMustBeInFactionToUseCommand TestAlertMustBeInFactionToUseCommand -AlertMustBeMemberToCreateGate TestAlertMustBeMemberToCreateGate -AlertMustBeOfficerOrOwnerToClaimLand TestAlertMustBeOfficerOrOwnerToClaimLand -AlertMustBeOwnerOrOfficerToCreateGate TestAlertMustBeOwnerOrOfficerToCreateGate -AlertMustBeOwnerOrOfficerToUseCommand TestAlertMustBeOwnerOrOfficerToUseCommand -AlertMustBeOwnerToInvokeAlliance TestAlertMustBeOwnerToInvokeAlliance -AlertMustBeOwnerToUseCommand TestAlertMustBeOwnerToUseCommand -AlertMustKickAllPlayers TestAlertMustKickAllPlayers -AlertNoGatesDefined TestAlertNoGatesDefined -AlertNoLaws TestAlertNoLaws -AlertNoLongerVassalFaction TestAlertNoLongerVassalFaction -AlertNonOwnership TestAlertNonOwnership -AlertNoPendingChallenges TestAlertNoPendingChallenges -AlertNotAllied TestAlertNotAllied -AlertNotBeenChallenged TestAlertNotBeenChallenged -AlertNotBeenChallengedByPlayer TestAlertNotBeenChallengedByPlayer -AlertNotInFaction TestAlertNotInFaction -AlertNotInvitedToFaction TestAlertNotInvitedToFaction -AlertNotOfferedVassalizationBy TestAlertNotOfferedVassalizationBy -AlertNowAlliedWith TestAlertNowAlliedWith -AlertNowAtPeaceWith TestAlertNowAtPeaceWith -AlertPlayerAlreadyOwner TestAlertPlayerAlreadyOwner -AlertPlayerNotInFaction TestAlertPlayerNotInFaction -AlertPowerLevelDecreased TestAlertPowerLevelDecreased -AlertPowerLevelIncreasedBy TestAlertPowerLevelIncreasedBy -AlertReachedDemesne TestAlertReachedDemesne -AlertUnlocked TestAlertUnlocked -AlertUnlockingCancelled TestAlertUnlockingCancelled -AllianceBrokenWith TestAllianceBrokenWith -AlliedWith TestAlliedWith -AllLandUnclaimed TestAllLandUnclaimed -AllLandUnclaimedFrom TestAllLandUnclaimedFrom -AlreadyEnteredCheckAccess TestAlreadyEnteredCheckAccess -AlreadyEnteredRevokeAccess TestAlreadyEnteredRevokeAccess -AlreadyInFaction TestAlreadyInFaction -ArgumentMustBeNumber TestArgumentMustBeNumber -ArgumentsSingleQuotesRequirement TestArgumentsSingleQuotesRequirement -AssignedToRandomFaction TestAssignedToRandomFaction -AttemptedAlliance TestAttemptedAlliance -AttemptedPeace TestAttemptedPeace -AtWarWith TestAtWarWith -AutoclaimToggled TestAutoclaimToggled -BlockAlreadyLocked TestBlockAlreadyLocked -BlockIsNotLocked TestBlockIsNotLocked -BlockIsPartOfGateMustRemoveGate TestBlockIsPartOfGateMustRemoveGate -BonusPower TestBonusPower -BooleanSet TestBooleanSet -Cancelled TestCancelled -CancelledGatePlacement1 TestCancelledGatePlacement1 -CancelledGatePlacement2 TestCancelledGatePlacement2 -CancelledGatePlacementErrorLinking TestCancelledGatePlacementErrorLinking -CannotAllyWithSelf TestCannotAllyWithSelf -CannotAttackFactionMember TestCannotAttackFactionMember -CannotAttackNonWarringPlayer TestCannotAttackNonWarringPlayer -CannotBreakAllianceWithSelf TestCannotBreakAllianceWithSelf -CannotBringNeutralFactionIntoWar TestCannotBringNeutralFactionIntoWar -CannotCancelActiveDuel TestCannotCancelActiveDuel -CannotDeclareWarIfLiegeNotWeakened TestCannotDeclareWarIfLiegeNotWeakened -CannotDeclareWarIfNeutralFaction TestCannotDeclareWarIfNeutralFaction -CannotDeclareWarOnAlly TestCannotDeclareWarOnAlly -CannotDeclareWarOnLiege TestCannotDeclareWarOnLiege -CannotDeclareWarOnNeutralFaction TestCannotDeclareWarOnNeutralFaction -CannotDeclareWarOnVassal TestCannotDeclareWarOnVassal -CannotDeclareWarOnYourself TestCannotDeclareWarOnYourself -CannotDemoteSelf TestCannotDemoteSelf -CannotDuelSelf TestCannotDuelSelf -CannotFindDynmap TestCannotFindDynmap -CannotForciblyKickOwner TestCannotForciblyKickOwner -CannotGrantAccessToSelf TestCannotGrantAccessToSelf -CannotKickOwner TestCannotKickOwner -CannotKickSelf TestCannotKickSelf -CannotMakePeaceWithSelf TestCannotMakePeaceWithSelf -CannotPlaceChestsNextToUnownedLockedChests TestCannotPlaceChestsNextToUnownedLockedChests -CannotPlaceHoppersNextToUnownedLockedChests TestCannotPlaceHoppersNextToUnownedLockedChests -CannotPromoteSelf TestCannotPromoteSelf -CannotRevokeAccessFromSelf TestCannotRevokeAccessFromSelf -CannotSetFactionHomeInWilderness TestCannotSetFactionHomeInWilderness -CannotSetVersion TestCannotSetVersion -CannotTransferToSelf TestCannotTransferToSelf -CannotVassalizeLiege TestCannotVassalizeLiege -CannotVassalizeSelf TestCannotVassalizeSelf -CannotVassalizeVassal TestCannotVassalizeVassal -CanOnlyCreateGatesInClaimedTerritory TestCanOnlyCreateGatesInClaimedTerritory -CanOnlyLockBlocksInClaimedTerritory TestCanOnlyLockBlocksInClaimedTerritory -CanOnlyLockInFactionTerritory TestCanOnlyLockInFactionTerritory -CanOnlyLockSpecificBlocks TestCanOnlyLockSpecificBlocks -ClaimedChunksLoaded TestClaimedChunksLoaded -ClaimedChunksSuccessfullyLoaded TestClaimedChunksSuccessfullyLoaded -ClickOnTriggerLever TestClickOnTriggerLever -ClickToPlaceSecondCorner TestClickToPlaceSecondCorner -CmdAddLaw TestCmdAddLaw -CmdAlly TestCmdAlly -CmdAutoClaim TestCmdAutoClaim -CmdBreakAlliance TestCmdBreakAlliance -CmdBypass TestCmdBypass -CmdChat TestCmdChat -CmdCheckAccess TestCmdCheckAccess -CmdCheckClaim TestCmdCheckClaim -CmdClaim TestCmdClaim -CmdConfig TestCmdConfig -CmdConfigSet TestCmdConfigSet -CmdConfigShow TestCmdConfigShow -CmdCreate TestCmdCreate -CmdDeclareIndependence TestCmdDeclareIndependence -CmdDeclareWar TestCmdDeclareWar -CmdDemote TestCmdDemote -CmdDesc TestCmdDesc -CmdDisband TestCmdDisband -CmdDuel TestCmdDuel -CmdDuelAccept TestCmdDuelAccept -CmdDuelCancel TestCmdDuelCancel -CmdDuelChallenge TestCmdDuelChallenge -CmdEditLaw TestCmdEditLaw -CmdFlags TestCmdFlags -CmdFlagsSet TestCmdFlagsSet -CmdFlagsShow TestCmdFlagsShow -CmdForce TestCmdForce -CmdForceBonusPower TestCmdForceBonusPower -CmdForceClaim TestCmdForceClaim -CmdForceCreate TestCmdForceCreate -CmdForceDemote TestCmdForceDemote -CmdForceJoin TestCmdForceJoin -CmdForceKick TestCmdForceKick -CmdForceLoad TestCmdForceLoad -CmdForcePeace TestCmdForcePeace -CmdForcePower TestCmdForcePower -CmdForceRename TestCmdForceRename -CmdForceRenounce TestCmdForceRenounce -CmdForceSave TestCmdForceSave -CmdForceTransfer TestCmdForceTransfer -CmdForceUnlock TestCmdForceUnlock -CmdGate TestCmdGate -CmdGateCancel TestCmdGateCancel -CmdGateCreate TestCmdGateCreate -CmdGateList TestCmdGateList -CmdGateName TestCmdGateName -CmdGateRemove TestCmdGateRemove -CmdGrantAccess TestCmdGrantAccess -CmdGrantIndependence TestCmdGrantIndependence -CmdHelp TestCmdHelp -CmdHome TestCmdHome -CmdInfo TestCmdInfo -CmdInvite TestCmdInvite -CmdInvoke TestCmdInvoke -CmdJoin TestCmdJoin -CmdKick TestCmdKick -CmdLaws TestCmdLaws -CmdLeave TestCmdLeave -CmdList TestCmdList -CmdLock TestCmdLock -CmdMakePeace TestCmdMakePeace -CmdMembers TestCmdMembers -CmdPower TestCmdPower -CmdPrefix TestCmdPrefix -CmdPromote TestCmdPromote -CmdRemoveLaw TestCmdRemoveLaw -CmdRename TestCmdRename -CmdResetPowerLevels TestCmdResetPowerLevels -CmdRevokeAccess TestCmdRevokeAccess -CmdSetHome TestCmdSetHome -CmdSwearFealty TestCmdSwearFealty -CmdTransfer TestCmdTransfer -CmdUnclaim TestCmdUnclaim -CmdUnclaimall TestCmdUnclaimall -CmdUnlock TestCmdUnlock -CmdVassalize TestCmdVassalize -CmdVersion TestCmdVersion -CmdWho TestCmdWho -CommandCancelled TestCommandCancelled -CommandNotRecognized TestCommandNotRecognized -CommandsPage1 TestCommandsPage1 -CommandsPage2 TestCommandsPage2 -CommandsPage3 TestCommandsPage3 -CommandsPage4 TestCommandsPage4 -CommandsPage5 TestCommandsPage5 -CommandsPage6 TestCommandsPage6 -CommandsPage7 TestCommandsPage7 -ConfigListPageOne TestConfigListPageOne -ConfigListPageTwo TestConfigListPageTwo -CreatingGateCancelled TestCreatingGateCancelled -CreatingGateClickWithHoe TestCreatingGateClickWithHoe -CuboidDisallowed1 TestCuboidDisallowed1 -CuboidDisallowed2 TestCuboidDisallowed2 -CurrentLanguageID TestCurrentLanguageID -CurrentlyNoFactions TestCurrentlyNoFactions -CurrentPowerLevel TestCurrentPowerLevel -Defeated TestDefeated -DemesneSize TestDemesneSize -Description TestDescription -DescriptionSet TestDescriptionSet -DesignatedFactionNotFound TestDesignatedFactionNotFound -DesiredPowerMustBeANumber TestDesiredPowerMustBeANumber -DeveloperList TestDeveloperList -DisbandmentDueToZeroPower TestDisbandmentDueToZeroPower -DoesntExist TestDoesntExist -Done TestDone -DoubleSet TestDoubleSet -DuelChallengeCancelled TestDuelChallengeCancelled -DuelEndedInTie TestDuelEndedInTie -DynmapIntegrationSuccessful TestDynmapIntegrationSuccessful -ERROR TestERROR -ErrorAddingAreaMarker TestErrorAddingAreaMarker -ErrorChunkRemoval TestErrorChunkRemoval -ErrorClaimedChunkRemoval TestErrorClaimedChunkRemoval -ErrorCouldNotFindGatesFaction TestErrorCouldNotFindGatesFaction -ErrorCouldNotLoadFactionGate TestErrorCouldNotLoadFactionGate -ErrorCreatingMarkerSet TestErrorCreatingMarkerSet -ErrorIntegratingWithDynmap TestErrorIntegratingWithDynmap -ErrorPlayerPowerRecordForUUIDNotFound TestErrorPlayerPowerRecordForUUIDNotFound -ErrorSettingAreaMarkerColor TestErrorSettingAreaMarkerColor -FactionAlreadyAlly TestFactionAlreadyAlly -FactionAlreadyExists TestFactionAlreadyExists -FactionAndPlayerSingleQuotesRequirement TestFactionAndPlayerSingleQuotesRequirement -FactionAndVassalSingleQuotesRequirement TestFactionAndVassalSingleQuotesRequirement -FactionCreated TestFactionCreated -FactionCurrentlyEnemyMustMakePeace TestFactionCurrentlyEnemyMustMakePeace -FactionDataLoadedSuccessfuly TestFactionDataLoadedSuccessfuly -FactionDoesNotExist TestFactionDoesNotExist -FactionDoesNotHaveLaws TestFactionDoesNotHaveLaws -FactionGates TestFactionGates -FactionHomeLoadError TestFactionHomeLoadError -FactionHomeNotSetYet TestFactionHomeNotSetYet -FactionHomeSet TestFactionHomeSet -FactionInfo TestFactionInfo -FactionIsNotVassal TestFactionIsNotVassal -FactionMustBeDesignatedInsideSingleQuotes TestFactionMustBeDesignatedInsideSingleQuotes -FactionNameChanged TestFactionNameChanged -FactionNameNotRecognized TestFactionNameNotRecognized -FactionNotEnemy TestFactionNotEnemy -FactionNotFound TestFactionNotFound -FactionsSuccessfullyLoaded TestFactionsSuccessfullyLoaded -FactionsTitle TestFactionsTitle -FactionSuccessfullyDisbanded TestFactionSuccessfullyDisbanded -FactionSuccessfullyLoaded TestFactionSuccessfullyLoaded -FileLoadError TestFileLoadError -FollowingPlayersHaveAccess TestFollowingPlayersHaveAccess -GateCreated TestGateCreated -HasAttemptedToMakePeaceWith TestHasAttemptedToMakePeaceWith -HasBeenKickedFrom TestHasBeenKickedFrom -HasDeclaredIndependence TestHasDeclaredIndependence -HasDeclaredWarAgainst TestHasDeclaredWarAgainst -HasJoined TestHasJoined -HelpAddLaw TestHelpAddLaw -HelpAlly TestHelpAlly -HelpAutoclaim TestHelpAutoclaim -HelpBreakAlliance TestHelpBreakAlliance -HelpBypass TestHelpBypass -HelpChat TestHelpChat -HelpCheckAccess TestHelpCheckAccess -HelpCheckClaim TestHelpCheckClaim -HelpClaim TestHelpClaim -HelpConfigSet TestHelpConfigSet -HelpConfigShow TestHelpConfigShow -HelpCreate TestHelpCreate -HelpDeclareIndependence TestHelpDeclareIndependence -HelpDeclareWar TestHelpDeclareWar -HelpDemote TestHelpDemote -HelpDesc TestHelpDesc -HelpDisband TestHelpDisband -HelpDuelAccept TestHelpDuelAccept -HelpDuelCancel TestHelpDuelCancel -HelpDuelChallenge TestHelpDuelChallenge -HelpEditLaw TestHelpEditLaw -HelpFlagsSet TestHelpFlagsSet -HelpFlagsShow TestHelpFlagsShow -HelpForce TestHelpForce -HelpForceBonusPower TestHelpForceBonusPower -HelpForceClaim TestHelpForceClaim -HelpForceCreate TestHelpForceCreate -HelpForceDemote TestHelpForceDemote -HelpForceJoin TestHelpForceJoin -HelpForceKick TestHelpForceKick -HelpForceLoad TestHelpForceLoad -HelpForcePeace TestHelpForcePeace -HelpForcePower TestHelpForcePower -HelpForceRemoveVassal TestHelpForceRemoveVassal -HelpForceRename TestHelpForceRename -HelpForceRenounce TestHelpForceRenounce -HelpForceSave TestHelpForceSave -HelpForceTransfer TestHelpForceTransfer -HelpForceUnlock TestHelpForceUnlock -HelpGateCancel TestHelpGateCancel -HelpGateCreate TestHelpGateCreate -HelpGateList TestHelpGateList -HelpGateName TestHelpGateName -HelpGateRemove TestHelpGateRemove -HelpGrantAccess TestHelpGrantAccess -HelpGrantIndependence TestHelpGrantIndependence -HelpHelp TestHelpHelp -HelpHome TestHelpHome -HelpInfo TestHelpInfo -HelpInvite TestHelpInvite -HelpInvoke TestHelpInvoke -HelpJoin TestHelpJoin -HelpKick TestHelpKick -HelpLaws TestHelpLaws -HelpLeave TestHelpLeave -HelpList TestHelpList -HelpLock TestHelpLock -HelpMakePeace TestHelpMakePeace -HelpMap TestHelpMap -HelpMembers TestHelpMembers -HelpPower TestHelpPower -HelpPrefix TestHelpPrefix -HelpPromote TestHelpPromote -HelpRemoveLaw TestHelpRemoveLaw -HelpRename TestHelpRename -HelpResetPowerLevels TestHelpResetPowerLevels -HelpRevokeAccess TestHelpRevokeAccess -HelpSetHome TestHelpSetHome -HelpSwearFealty TestHelpSwearFealty -HelpTransfer TestHelpTransfer -HelpUnclaim TestHelpUnclaim -HelpUnclaimall TestHelpUnclaimall -HelpUnlock TestHelpUnlock -HelpVassalize TestHelpVassalize -HelpVersion TestHelpVersion -HelpWho TestHelpWho -HomeClaimedByAnotherFaction TestHomeClaimedByAnotherFaction -HomeIsInUnclaimedChunk TestHomeIsInUnclaimedChunk -HourlySaveAlert TestHourlySaveAlert -IntegerSet TestIntegerSet -InvitationExpired TestInvitationExpired -InvitationSent TestInvitationSent -KeysLoaded TestKeysLoaded -LandAlreadyClaimedBy TestLandAlreadyClaimedBy -LandAlreadyClaimedByYourFaction TestLandAlreadyClaimedByYourFaction -LandClaimedBy TestLandClaimedBy -LandClaimedUsingAdminBypass TestLandClaimedUsingAdminBypass -LandIsNotClaimed TestLandIsNotClaimed -LandIsUnclaimed TestLandIsUnclaimed -LandNotCurrentlyClaimed TestLandNotCurrentlyClaimed -LandUnclaimed TestLandUnclaimed -LawAdded TestLawAdded -LawEdited TestLawEdited -LawRemoved TestLawRemoved -LawsTitle TestLawsTitle -LeverSuccessfullyLinked TestLeverSuccessfullyLinked -Liege TestLiege -ListLegend TestListLegend -LoadingClaimedChunks TestLoadingClaimedChunks -LoadingLockedBLocks TestLoadingLockedBLocks -LoadingPlayerPowerRecords TestLoadingPlayerPowerRecords -Locked TestLocked -LockedBlockSuccessfullyLoaded TestLockedBlockSuccessfullyLoaded -LockedBy TestLockedBy -LockingCancelled TestLockingCancelled -LockRemovalError TestLockRemovalError -MaterialsMismatch1 TestMaterialsMismatch1 -MaterialsMismatch2 TestMaterialsMismatch2 -MedievalFactionsStringRight TestMedievalFactionsStringRight -MedievalFactionsTitle TestMedievalFactionsTitle -MembersOf TestMembersOf -MissingFactionGatesJSONCollection TestMissingFactionGatesJSONCollection -MovementDetectedTeleportCancelled TestMovementDetectedTeleportCancelled -MustBeAtWarOrFactionMustBeInactive TestMustBeAtWarOrFactionMustBeInactive -MustBeInFaction TestMustBeInFaction -MustBeOwner TestMustBeOwner -MustOwnFactionOrBeOfficer TestMustOwnFactionOrBeOfficer -MustTransferOwnership TestMustTransferOwnership -Name TestName -NameAlreadyTaken TestNameAlreadyTaken -NeutralityDisabled TestNeutralityDisabled -NoBlockDetectedToCheckForGate TestNoBlockDetectedToCheckForGate -NoFactionsDesignatedSingleQuotesRequired TestNoFactionsDesignatedSingleQuotesRequired -NoLongerBypassingProtections TestNoLongerBypassingProtections -NoLongerInFactionChat TestNoLongerInFactionChat -NotAMemberOfAnyFaction TestNotAMemberOfAnyFaction -NotAnAlly TestNotAnAlly -NotAnAllyOrVassal TestNotAnAllyOrVassal -NotAtWarWith TestNotAtWarWith -NotAVassalOfAFaction TestNotAVassalOfAFaction +AcceptedChallengeDuelHasBegun TestAcceptedChallengeDuelHasBegun +AlertAccessGrantedTo TestAlertAccessGrantedTo +AlertAccessRevokedFor TestAlertAccessRevokedFor +AlertAllianceHasBeenBroken TestAlertAllianceHasBeenBroken +AlertAlreadyAtWarWith TestAlertAlreadyAtWarWith +AlertAlreadyCreatingGate TestAlertAlreadyCreatingGate +AlertAlreadyDueling TestAlertAlreadyDueling +AlertAlreadyDuelingPlayer TestAlertAlreadyDuelingPlayer +AlertAlreadyDuelingSomeone TestAlertAlreadyDuelingSomeone +AlertAlreadyGrantingAccess TestAlertAlreadyGrantingAccess +AlertAlreadyInFaction TestAlertAlreadyInFaction +AlertAlreadyRequestedAlliance TestAlertAlreadyRequestedAlliance +AlertAlreadyRequestedPeace TestAlertAlreadyRequestedPeace +AlertAttemptedAlliance TestAlertAttemptedAlliance +AlertAttemptedVassalization TestAlertAttemptedVassalization +AlertBeenInvited TestAlertBeenInvited +AlertCalledToWar1 TestAlertCalledToWar1 +AlertCalledToWar2 TestAlertCalledToWar2 +AlertCalledToWar3 TestAlertCalledToWar3 +AlertChallengedToDuel TestAlertChallengedToDuel +AlertChallengedToDuelPlusHowTo TestAlertChallengedToDuelPlusHowTo +AlertChallengeIssued TestAlertChallengeIssued +AlertChallengeWasAccepted TestAlertChallengeWasAccepted +AlertChangedGateName TestAlertChangedGateName +AlertCurrentPowerLevel TestAlertCurrentPowerLevel +AlertDecreasingThePowerOfInactivePlayers TestAlertDecreasingThePowerOfInactivePlayers +AlertDemotion TestAlertDemotion +AlertDisbandmentDueToZeroPower TestAlertDisbandmentDueToZeroPower +AlertFactionAttemptedToVassalize TestAlertFactionAttemptedToVassalize +AlertFactionHasBeenVassalized TestAlertFactionHasBeenVassalized +AlertFactionHasNewVassal TestAlertFactionHasNewVassal +AlertFactionHomeRemoved TestAlertFactionHomeRemoved +AlertFactionIsWeakened TestAlertFactionIsWeakened +AlertForcedDemotion TestAlertForcedDemotion +AlertForcedKick TestAlertForcedKick +AlertForcedLoad TestAlertForcedLoad +AlertForcedSave TestAlertForcedSave +AlertForcedToJoinFaction TestAlertForcedToJoinFaction +AlertGate TestAlertGate +AlertGrantedIndependence TestAlertGrantedIndependence +AlertIncreasingThePowerOfEveryPlayer TestAlertIncreasingThePowerOfEveryPlayer +AlertJoinedFaction TestAlertJoinedFaction +AlertKicked TestAlertKicked +AlertLandClaimed TestAlertLandClaimed +AlertLandConqueredFromAnotherFaction TestAlertLandConqueredFromAnotherFaction +AlertLandConqueredFromYourFaction TestAlertLandConqueredFromYourFaction +AlertLeftFaction TestAlertLeftFaction +AlertLeftFactionAndItGotDeleted TestAlertLeftFactionAndItGotDeleted +AlertMoreClaimedChunksThanPower TestAlertMoreClaimedChunksThanPower +AlertMustBeAtWarToConquer TestAlertMustBeAtWarToConquer +AlertMustBeInFactionToUseCommand TestAlertMustBeInFactionToUseCommand +AlertMustBeMemberToCreateGate TestAlertMustBeMemberToCreateGate +AlertMustBeOfficerOrOwnerToClaimLand TestAlertMustBeOfficerOrOwnerToClaimLand +AlertMustBeOwnerOrOfficerToCreateGate TestAlertMustBeOwnerOrOfficerToCreateGate +AlertMustBeOwnerOrOfficerToUseCommand TestAlertMustBeOwnerOrOfficerToUseCommand +AlertMustBeOwnerToInvokeAlliance TestAlertMustBeOwnerToInvokeAlliance +AlertMustBeOwnerToUseCommand TestAlertMustBeOwnerToUseCommand +AlertMustKickAllPlayers TestAlertMustKickAllPlayers +AlertNoGatesDefined TestAlertNoGatesDefined +AlertNoLaws TestAlertNoLaws +AlertNoLongerVassalFaction TestAlertNoLongerVassalFaction +AlertNonOwnership TestAlertNonOwnership +AlertNoPendingChallenges TestAlertNoPendingChallenges +AlertNotAllied TestAlertNotAllied +AlertNotBeenChallenged TestAlertNotBeenChallenged +AlertNotBeenChallengedByPlayer TestAlertNotBeenChallengedByPlayer +AlertNotInFaction TestAlertNotInFaction +AlertNotInvitedToFaction TestAlertNotInvitedToFaction +AlertNotOfferedVassalizationBy TestAlertNotOfferedVassalizationBy +AlertNowAlliedWith TestAlertNowAlliedWith +AlertNowAtPeaceWith TestAlertNowAtPeaceWith +AlertPlayerAlreadyOwner TestAlertPlayerAlreadyOwner +AlertPlayerNotInFaction TestAlertPlayerNotInFaction +AlertPowerLevelDecreased TestAlertPowerLevelDecreased +AlertPowerLevelIncreasedBy TestAlertPowerLevelIncreasedBy +AlertReachedDemesne TestAlertReachedDemesne +AlertUnlocked TestAlertUnlocked +AlertUnlockingCancelled TestAlertUnlockingCancelled +AllianceBrokenWith TestAllianceBrokenWith +AlliedWith TestAlliedWith +AllLandUnclaimed TestAllLandUnclaimed +AllLandUnclaimedFrom TestAllLandUnclaimedFrom +AlreadyEnteredCheckAccess TestAlreadyEnteredCheckAccess +AlreadyEnteredRevokeAccess TestAlreadyEnteredRevokeAccess +AlreadyInFaction TestAlreadyInFaction +ArgumentMustBeNumber TestArgumentMustBeNumber +ArgumentsSingleQuotesRequirement TestArgumentsSingleQuotesRequirement +AssignedToRandomFaction TestAssignedToRandomFaction +AttemptedAlliance TestAttemptedAlliance +AttemptedPeace TestAttemptedPeace +AtWarWith TestAtWarWith +AutoclaimToggled TestAutoclaimToggled +BlockAlreadyLocked TestBlockAlreadyLocked +BlockIsNotLocked TestBlockIsNotLocked +BlockIsPartOfGateMustRemoveGate TestBlockIsPartOfGateMustRemoveGate +BonusPower TestBonusPower +BooleanSet TestBooleanSet +Cancelled TestCancelled +CancelledGatePlacement1 TestCancelledGatePlacement1 +CancelledGatePlacement2 TestCancelledGatePlacement2 +CancelledGatePlacementErrorLinking TestCancelledGatePlacementErrorLinking +CannotAllyWithSelf TestCannotAllyWithSelf +CannotAttackFactionMember TestCannotAttackFactionMember +CannotAttackNonWarringPlayer TestCannotAttackNonWarringPlayer +CannotBreakAllianceWithSelf TestCannotBreakAllianceWithSelf +CannotBringNeutralFactionIntoWar TestCannotBringNeutralFactionIntoWar +CannotCancelActiveDuel TestCannotCancelActiveDuel +CannotDeclareWarIfLiegeNotWeakened TestCannotDeclareWarIfLiegeNotWeakened +CannotDeclareWarIfNeutralFaction TestCannotDeclareWarIfNeutralFaction +CannotDeclareWarOnAlly TestCannotDeclareWarOnAlly +CannotDeclareWarOnLiege TestCannotDeclareWarOnLiege +CannotDeclareWarOnNeutralFaction TestCannotDeclareWarOnNeutralFaction +CannotDeclareWarOnVassal TestCannotDeclareWarOnVassal +CannotDeclareWarOnYourself TestCannotDeclareWarOnYourself +CannotDemoteSelf TestCannotDemoteSelf +CannotDuelSelf TestCannotDuelSelf +CannotFindDynmap TestCannotFindDynmap +CannotForciblyKickOwner TestCannotForciblyKickOwner +CannotGrantAccessToSelf TestCannotGrantAccessToSelf +CannotKickOwner TestCannotKickOwner +CannotKickSelf TestCannotKickSelf +CannotMakePeaceWithSelf TestCannotMakePeaceWithSelf +CannotPlaceChestsNextToUnownedLockedChests TestCannotPlaceChestsNextToUnownedLockedChests +CannotPlaceHoppersNextToUnownedLockedChests TestCannotPlaceHoppersNextToUnownedLockedChests +CannotPromoteSelf TestCannotPromoteSelf +CannotRevokeAccessFromSelf TestCannotRevokeAccessFromSelf +CannotSetFactionHomeInWilderness TestCannotSetFactionHomeInWilderness +CannotSetVersion TestCannotSetVersion +CannotTransferToSelf TestCannotTransferToSelf +CannotVassalizeLiege TestCannotVassalizeLiege +CannotVassalizeSelf TestCannotVassalizeSelf +CannotVassalizeVassal TestCannotVassalizeVassal +CanOnlyCreateGatesInClaimedTerritory TestCanOnlyCreateGatesInClaimedTerritory +CanOnlyLockBlocksInClaimedTerritory TestCanOnlyLockBlocksInClaimedTerritory +CanOnlyLockInFactionTerritory TestCanOnlyLockInFactionTerritory +CanOnlyLockSpecificBlocks TestCanOnlyLockSpecificBlocks +ClaimedChunksLoaded TestClaimedChunksLoaded +ClaimedChunksSuccessfullyLoaded TestClaimedChunksSuccessfullyLoaded +ClickOnTriggerLever TestClickOnTriggerLever +ClickToPlaceSecondCorner TestClickToPlaceSecondCorner +CmdAddLaw TestCmdAddLaw +CmdAlly TestCmdAlly +CmdAutoClaim TestCmdAutoClaim +CmdBreakAlliance TestCmdBreakAlliance +CmdBypass TestCmdBypass +CmdChat TestCmdChat +CmdCheckAccess TestCmdCheckAccess +CmdCheckClaim TestCmdCheckClaim +CmdClaim TestCmdClaim +CmdConfig TestCmdConfig +CmdConfigSet TestCmdConfigSet +CmdConfigShow TestCmdConfigShow +CmdCreate TestCmdCreate +CmdDeclareIndependence TestCmdDeclareIndependence +CmdDeclareWar TestCmdDeclareWar +CmdDemote TestCmdDemote +CmdDesc TestCmdDesc +CmdDisband TestCmdDisband +CmdDuel TestCmdDuel +CmdDuelAccept TestCmdDuelAccept +CmdDuelCancel TestCmdDuelCancel +CmdDuelChallenge TestCmdDuelChallenge +CmdEditLaw TestCmdEditLaw +CmdFlags TestCmdFlags +CmdFlagsSet TestCmdFlagsSet +CmdFlagsShow TestCmdFlagsShow +CmdForce TestCmdForce +CmdForceBonusPower TestCmdForceBonusPower +CmdForceClaim TestCmdForceClaim +CmdForceCreate TestCmdForceCreate +CmdForceDemote TestCmdForceDemote +CmdForceJoin TestCmdForceJoin +CmdForceKick TestCmdForceKick +CmdForceLoad TestCmdForceLoad +CmdForcePeace TestCmdForcePeace +CmdForcePower TestCmdForcePower +CmdForceRename TestCmdForceRename +CmdForceRenounce TestCmdForceRenounce +CmdForceSave TestCmdForceSave +CmdForceTransfer TestCmdForceTransfer +CmdForceUnlock TestCmdForceUnlock +CmdGate TestCmdGate +CmdGateCancel TestCmdGateCancel +CmdGateCreate TestCmdGateCreate +CmdGateList TestCmdGateList +CmdGateName TestCmdGateName +CmdGateRemove TestCmdGateRemove +CmdGrantAccess TestCmdGrantAccess +CmdGrantIndependence TestCmdGrantIndependence +CmdHelp TestCmdHelp +CmdHome TestCmdHome +CmdInfo TestCmdInfo +CmdInvite TestCmdInvite +CmdInvoke TestCmdInvoke +CmdJoin TestCmdJoin +CmdKick TestCmdKick +CmdLaws TestCmdLaws +CmdLeave TestCmdLeave +CmdList TestCmdList +CmdLock TestCmdLock +CmdMakePeace TestCmdMakePeace +CmdMembers TestCmdMembers +CmdPower TestCmdPower +CmdPrefix TestCmdPrefix +CmdPromote TestCmdPromote +CmdRemoveLaw TestCmdRemoveLaw +CmdRename TestCmdRename +CmdResetPowerLevels TestCmdResetPowerLevels +CmdRevokeAccess TestCmdRevokeAccess +CmdSetHome TestCmdSetHome +CmdSwearFealty TestCmdSwearFealty +CmdTransfer TestCmdTransfer +CmdUnclaim TestCmdUnclaim +CmdUnclaimall TestCmdUnclaimall +CmdUnlock TestCmdUnlock +CmdVassalize TestCmdVassalize +CmdVersion TestCmdVersion +CmdWho TestCmdWho +CommandCancelled TestCommandCancelled +CommandNotRecognized TestCommandNotRecognized +CommandsPage1 TestCommandsPage1 +CommandsPage2 TestCommandsPage2 +CommandsPage3 TestCommandsPage3 +CommandsPage4 TestCommandsPage4 +CommandsPage5 TestCommandsPage5 +CommandsPage6 TestCommandsPage6 +CommandsPage7 TestCommandsPage7 +ConfigListPageOne TestConfigListPageOne +ConfigListPageTwo TestConfigListPageTwo +CreatingGateCancelled TestCreatingGateCancelled +CreatingGateClickWithHoe TestCreatingGateClickWithHoe +CuboidDisallowed1 TestCuboidDisallowed1 +CuboidDisallowed2 TestCuboidDisallowed2 +CurrentLanguageID TestCurrentLanguageID +CurrentlyNoFactions TestCurrentlyNoFactions +CurrentPowerLevel TestCurrentPowerLevel +Defeated TestDefeated +DemesneSize TestDemesneSize +Description TestDescription +DescriptionSet TestDescriptionSet +DesignatedFactionNotFound TestDesignatedFactionNotFound +DesiredPowerMustBeANumber TestDesiredPowerMustBeANumber +DeveloperList TestDeveloperList +DisbandmentDueToZeroPower TestDisbandmentDueToZeroPower +DoesntExist TestDoesntExist +Done TestDone +DoubleSet TestDoubleSet +DuelChallengeCancelled TestDuelChallengeCancelled +DuelEndedInTie TestDuelEndedInTie +DynmapIntegrationSuccessful TestDynmapIntegrationSuccessful +ERROR TestERROR +ErrorAddingAreaMarker TestErrorAddingAreaMarker +ErrorChunkRemoval TestErrorChunkRemoval +ErrorClaimedChunkRemoval TestErrorClaimedChunkRemoval +ErrorCouldNotFindGatesFaction TestErrorCouldNotFindGatesFaction +ErrorCouldNotLoadFactionGate TestErrorCouldNotLoadFactionGate +ErrorCreatingMarkerSet TestErrorCreatingMarkerSet +ErrorIntegratingWithDynmap TestErrorIntegratingWithDynmap +ErrorPlayerPowerRecordForUUIDNotFound TestErrorPlayerPowerRecordForUUIDNotFound +ErrorSettingAreaMarkerColor TestErrorSettingAreaMarkerColor +FactionAlreadyAlly TestFactionAlreadyAlly +FactionAlreadyExists TestFactionAlreadyExists +FactionAndPlayerSingleQuotesRequirement TestFactionAndPlayerSingleQuotesRequirement +FactionAndVassalSingleQuotesRequirement TestFactionAndVassalSingleQuotesRequirement +FactionCreated TestFactionCreated +FactionCurrentlyEnemyMustMakePeace TestFactionCurrentlyEnemyMustMakePeace +FactionDataLoadedSuccessfuly TestFactionDataLoadedSuccessfuly +FactionDoesNotExist TestFactionDoesNotExist +FactionDoesNotHaveLaws TestFactionDoesNotHaveLaws +FactionGates TestFactionGates +FactionHomeLoadError TestFactionHomeLoadError +FactionHomeNotSetYet TestFactionHomeNotSetYet +FactionHomeSet TestFactionHomeSet +FactionInfo TestFactionInfo +FactionIsNotVassal TestFactionIsNotVassal +FactionMustBeDesignatedInsideSingleQuotes TestFactionMustBeDesignatedInsideSingleQuotes +FactionNameChanged TestFactionNameChanged +FactionNameNotRecognized TestFactionNameNotRecognized +FactionNotEnemy TestFactionNotEnemy +FactionNotFound TestFactionNotFound +FactionsSuccessfullyLoaded TestFactionsSuccessfullyLoaded +FactionsTitle TestFactionsTitle +FactionSuccessfullyDisbanded TestFactionSuccessfullyDisbanded +FactionSuccessfullyLoaded TestFactionSuccessfullyLoaded +FileLoadError TestFileLoadError +FollowingPlayersHaveAccess TestFollowingPlayersHaveAccess +GateCreated TestGateCreated +HasAttemptedToMakePeaceWith TestHasAttemptedToMakePeaceWith +HasBeenKickedFrom TestHasBeenKickedFrom +HasDeclaredIndependence TestHasDeclaredIndependence +HasDeclaredWarAgainst TestHasDeclaredWarAgainst +HasJoined TestHasJoined +HelpAddLaw TestHelpAddLaw +HelpAlly TestHelpAlly +HelpAutoclaim TestHelpAutoclaim +HelpBreakAlliance TestHelpBreakAlliance +HelpBypass TestHelpBypass +HelpChat TestHelpChat +HelpCheckAccess TestHelpCheckAccess +HelpCheckClaim TestHelpCheckClaim +HelpClaim TestHelpClaim +HelpConfigSet TestHelpConfigSet +HelpConfigShow TestHelpConfigShow +HelpCreate TestHelpCreate +HelpDeclareIndependence TestHelpDeclareIndependence +HelpDeclareWar TestHelpDeclareWar +HelpDemote TestHelpDemote +HelpDesc TestHelpDesc +HelpDisband TestHelpDisband +HelpDuelAccept TestHelpDuelAccept +HelpDuelCancel TestHelpDuelCancel +HelpDuelChallenge TestHelpDuelChallenge +HelpEditLaw TestHelpEditLaw +HelpFlagsSet TestHelpFlagsSet +HelpFlagsShow TestHelpFlagsShow +HelpForce TestHelpForce +HelpForceBonusPower TestHelpForceBonusPower +HelpForceClaim TestHelpForceClaim +HelpForceCreate TestHelpForceCreate +HelpForceDemote TestHelpForceDemote +HelpForceJoin TestHelpForceJoin +HelpForceKick TestHelpForceKick +HelpForceLoad TestHelpForceLoad +HelpForcePeace TestHelpForcePeace +HelpForcePower TestHelpForcePower +HelpForceRemoveVassal TestHelpForceRemoveVassal +HelpForceRename TestHelpForceRename +HelpForceRenounce TestHelpForceRenounce +HelpForceSave TestHelpForceSave +HelpForceTransfer TestHelpForceTransfer +HelpForceUnlock TestHelpForceUnlock +HelpGateCancel TestHelpGateCancel +HelpGateCreate TestHelpGateCreate +HelpGateList TestHelpGateList +HelpGateName TestHelpGateName +HelpGateRemove TestHelpGateRemove +HelpGrantAccess TestHelpGrantAccess +HelpGrantIndependence TestHelpGrantIndependence +HelpHelp TestHelpHelp +HelpHome TestHelpHome +HelpInfo TestHelpInfo +HelpInvite TestHelpInvite +HelpInvoke TestHelpInvoke +HelpJoin TestHelpJoin +HelpKick TestHelpKick +HelpLaws TestHelpLaws +HelpLeave TestHelpLeave +HelpList TestHelpList +HelpLock TestHelpLock +HelpMakePeace TestHelpMakePeace +HelpMap TestHelpMap +HelpMembers TestHelpMembers +HelpPower TestHelpPower +HelpPrefix TestHelpPrefix +HelpPromote TestHelpPromote +HelpRemoveLaw TestHelpRemoveLaw +HelpRename TestHelpRename +HelpResetPowerLevels TestHelpResetPowerLevels +HelpRevokeAccess TestHelpRevokeAccess +HelpSetHome TestHelpSetHome +HelpSwearFealty TestHelpSwearFealty +HelpTransfer TestHelpTransfer +HelpUnclaim TestHelpUnclaim +HelpUnclaimall TestHelpUnclaimall +HelpUnlock TestHelpUnlock +HelpVassalize TestHelpVassalize +HelpVersion TestHelpVersion +HelpWho TestHelpWho +HomeClaimedByAnotherFaction TestHomeClaimedByAnotherFaction +HomeIsInUnclaimedChunk TestHomeIsInUnclaimedChunk +HourlySaveAlert TestHourlySaveAlert +IntegerSet TestIntegerSet +InvitationExpired TestInvitationExpired +InvitationSent TestInvitationSent +KeysLoaded TestKeysLoaded +LandAlreadyClaimedBy TestLandAlreadyClaimedBy +LandAlreadyClaimedByYourFaction TestLandAlreadyClaimedByYourFaction +LandClaimedBy TestLandClaimedBy +LandClaimedUsingAdminBypass TestLandClaimedUsingAdminBypass +LandIsNotClaimed TestLandIsNotClaimed +LandIsUnclaimed TestLandIsUnclaimed +LandNotCurrentlyClaimed TestLandNotCurrentlyClaimed +LandUnclaimed TestLandUnclaimed +LawAdded TestLawAdded +LawEdited TestLawEdited +LawRemoved TestLawRemoved +LawsTitle TestLawsTitle +LeverSuccessfullyLinked TestLeverSuccessfullyLinked +Liege TestLiege +ListLegend TestListLegend +LoadingClaimedChunks TestLoadingClaimedChunks +LoadingLockedBLocks TestLoadingLockedBLocks +LoadingPlayerPowerRecords TestLoadingPlayerPowerRecords +Locked TestLocked +LockedBlockSuccessfullyLoaded TestLockedBlockSuccessfullyLoaded +LockedBy TestLockedBy +LockingCancelled TestLockingCancelled +LockRemovalError TestLockRemovalError +MaterialsMismatch1 TestMaterialsMismatch1 +MaterialsMismatch2 TestMaterialsMismatch2 +MedievalFactionsStringRight TestMedievalFactionsStringRight +MedievalFactionsTitle TestMedievalFactionsTitle +MembersOf TestMembersOf +MissingFactionGatesJSONCollection TestMissingFactionGatesJSONCollection +MovementDetectedTeleportCancelled TestMovementDetectedTeleportCancelled +MustBeAtWarOrFactionMustBeInactive TestMustBeAtWarOrFactionMustBeInactive +MustBeInFaction TestMustBeInFaction +MustBeOwner TestMustBeOwner +MustOwnFactionOrBeOfficer TestMustOwnFactionOrBeOfficer +MustTransferOwnership TestMustTransferOwnership +Name TestName +NameAlreadyTaken TestNameAlreadyTaken +NeutralityDisabled TestNeutralityDisabled +NoBlockDetectedToCheckForGate TestNoBlockDetectedToCheckForGate +NoFactionsDesignatedSingleQuotesRequired TestNoFactionsDesignatedSingleQuotesRequired +NoLongerBypassingProtections TestNoLongerBypassingProtections +NoLongerInFactionChat TestNoLongerInFactionChat +NotAMemberOfAnyFaction TestNotAMemberOfAnyFaction +NotAnAlly TestNotAnAlly +NotAnAllyOrVassal TestNotAnAllyOrVassal +NotAtWarWith TestNotAtWarWith +NotAVassalOfAFaction TestNotAVassalOfAFaction NotEnoughArgumentsDesignatedSingleQuotesRequired TestNotEnoughArgumentsDesignatedSingleQuotesRequired -NotTheOwnerOfThisBlock TestNotTheOwnerOfThisBlock -NotTheOwnerOfThisFaction TestNotTheOwnerOfThisFaction -NoVassalOrLiegeReferences TestNoVassalOrLiegeReferences -NowBypassingProtections TestNowBypassingProtections -NowSpeakingInFactionChat TestNowSpeakingInFactionChat -OnlyPlayersCanUseCommand TestOnlyPlayersCanUseCommand -OnlyUseLeversInClaimedTerritory TestOnlyUseLeversInClaimedTerritory -Owner TestOwner -OwnershipTransferred TestOwnershipTransferred -OwnerShipTransferredTo TestOwnerShipTransferredTo -PermissionNeeded TestPermissionNeeded -PlayerAlreadyDueling TestPlayerAlreadyDueling -PlayerAlreadyInFaction TestPlayerAlreadyInFaction -PlayerAlreadyOfficer TestPlayerAlreadyOfficer -PlayerAndDesiredPowerSingleQuotesRequirement TestPlayerAndDesiredPowerSingleQuotesRequirement -PlayerByNameNotFound TestPlayerByNameNotFound -PlayerCantBePromotedBecauseOfLimit TestPlayerCantBePromotedBecauseOfLimit -PlayerDemoted TestPlayerDemoted -PlayerIsNotInAFaction TestPlayerIsNotInAFaction -PlayerIsNotInYourFaction TestPlayerIsNotInYourFaction -PlayerIsNotMemberOfFaction TestPlayerIsNotMemberOfFaction -PlayerIsNotOfficerOfFaction TestPlayerIsNotOfficerOfFaction -PlayerNotFound TestPlayerNotFound -PlayerPowerRecordsLoaded TestPlayerPowerRecordsLoaded -PlayerPromoted TestPlayerPromoted -PleaseWaitGate TestPleaseWaitGate -PluginDisabled TestPluginDisabled -PluginDisabling TestPluginDisabling -PluginEnabled TestPluginEnabled -PluginEnabling TestPluginEnabling -PluginLoading TestPluginLoading -PluginSaving TestPluginSaving -Point1PlacementSuccessful TestPoint1PlacementSuccessful -Point2PlacedSuccessfully TestPoint2PlacedSuccessfully -Population TestPopulation -PowerHasDecayed TestPowerHasDecayed -PowerLevel TestPowerLevel -PowerLevelHasBeenSetTo TestPowerLevelHasBeenSetTo -PowerLevelHasIncreased TestPowerLevelHasIncreased -PowerLevelResetting TestPowerLevelResetting -PrefixesDisabled TestPrefixesDisabled -PrefixSet TestPrefixSet -PrefixTaken TestPrefixTaken -ProblemLoadingClaimedChunks TestProblemLoadingClaimedChunks -ProblemLoadingFactions TestProblemLoadingFactions -ProblemLoadingPowerRecords TestProblemLoadingPowerRecords -PromotedToOfficer TestPromotedToOfficer -RadiusRequirement TestRadiusRequirement -RemovedGate TestRemovedGate -ResettingIndividualPowerRecords TestResettingIndividualPowerRecords -RightClickCheckAccess TestRightClickCheckAccess -RightClickForceUnlock TestRightClickForceUnlock -RightClickGrantAccess TestRightClickGrantAccess -RightClickLock TestRightClickLock -RightClickRevokeAccess TestRightClickRevokeAccess -RightClickUnlock TestRightClickUnlock -SchedulingHourlyAutoSave TestSchedulingHourlyAutoSave -SchedulingPowerDecrease TestSchedulingPowerDecrease -SchedulingPowerIncrease TestSchedulingPowerIncrease -SingleQuotesAlliedWarring TestSingleQuotesAlliedWarring -StringSet TestStringSet -SubCommands TestSubCommands -SuccessFactionMemberRemoval TestSuccessFactionMemberRemoval -SuccessForceJoin TestSuccessForceJoin -SuccessfulDisbandment TestSuccessfulDisbandment -SuccessOfficerRemoval TestSuccessOfficerRemoval -SuccessReferencesRemoved TestSuccessReferencesRemoved -SupportedLanguageIDList TestSupportedLanguageIDList -SurroundedChunkProtected TestSurroundedChunkProtected -TargetBlockNotPartOfGate TestTargetBlockNotPartOfGate -TargetFactionNotOverClaiming TestTargetFactionNotOverClaiming -TeleportingAlert TestTeleportingAlert -ThreeBlockRequirement TestThreeBlockRequirement -TriggerBlockNotLever TestTriggerBlockNotLever -UsageAddLaw TestUsageAddLaw -UsageAlly TestUsageAlly -UsageBreakAlliance TestUsageBreakAlliance -UsageClaimRadius TestUsageClaimRadius -UsageConfigSet TestUsageConfigSet -UsageConfigShow TestUsageConfigShow -UsageCreate TestUsageCreate -UsageDeclareWar TestUsageDeclareWar -UsageDemote TestUsageDemote -UsageDesc TestUsageDesc -UsageEditLaw TestUsageEditLaw -UsageFlagsSet TestUsageFlagsSet -UsageForceBonusPower TestUsageForceBonusPower -UsageForceClaim TestUsageForceClaim -UsageForceCreate TestUsageForceCreate -UsageForceDemote TestUsageForceDemote -UsageForceJoin TestUsageForceJoin -UsageForceKick TestUsageForceKick -UsageForcePeace TestUsageForcePeace -UsageForcePower TestUsageForcePower -UsageForceRemoveVassal TestUsageForceRemoveVassal -UsageForceRename TestUsageForceRename -UsageForceRenounce TestUsageForceRenounce -UsageForceTransfer TestUsageForceTransfer -UsageGrantAccess TestUsageGrantAccess -UsageGrantIndependence TestUsageGrantIndependence -UsageInvite TestUsageInvite -UsageInvoke TestUsageInvoke -UsageJoin TestUsageJoin -UsageKick TestUsageKick -UsageMakePeace TestUsageMakePeace -UsagePrefix TestUsagePrefix -UsagePromote TestUsagePromote -UsageRemoveLaw TestUsageRemoveLaw -UsageRename TestUsageRename -UsageRevokeAccess TestUsageRevokeAccess -UsageSwearFealty TestUsageSwearFealty -UsageTransfer TestUsageTransfer -UsageVassalize TestUsageVassalize -UsageWho TestUsageWho -ValidSubCommandsShowSet TestValidSubCommandsShowSet -VassalContribution TestVassalContribution -Vassals TestVassals -WarningPlayerAlreadyStartedCreatingGate TestWarningPlayerAlreadyStartedCreatingGate -WasntFound TestWasntFound -WelcomeBackLastLogout TestWelcomeBackLastLogout -WikiLink TestWikiLink -Wilderness TestWilderness -WorldsMismatch1 TestWorldsMismatch1 -WorldsMismatch2 TestWorldsMismatch2 \ No newline at end of file +NotTheOwnerOfThisBlock TestNotTheOwnerOfThisBlock +NotTheOwnerOfThisFaction TestNotTheOwnerOfThisFaction +NoVassalOrLiegeReferences TestNoVassalOrLiegeReferences +NowBypassingProtections TestNowBypassingProtections +NowSpeakingInFactionChat TestNowSpeakingInFactionChat +OnlyPlayersCanUseCommand TestOnlyPlayersCanUseCommand +OnlyUseLeversInClaimedTerritory TestOnlyUseLeversInClaimedTerritory +Owner TestOwner +OwnershipTransferred TestOwnershipTransferred +OwnerShipTransferredTo TestOwnerShipTransferredTo +PermissionNeeded TestPermissionNeeded +PlayerAlreadyDueling TestPlayerAlreadyDueling +PlayerAlreadyInFaction TestPlayerAlreadyInFaction +PlayerAlreadyOfficer TestPlayerAlreadyOfficer +PlayerAndDesiredPowerSingleQuotesRequirement TestPlayerAndDesiredPowerSingleQuotesRequirement +PlayerByNameNotFound TestPlayerByNameNotFound +PlayerCantBePromotedBecauseOfLimit TestPlayerCantBePromotedBecauseOfLimit +PlayerDemoted TestPlayerDemoted +PlayerIsNotInAFaction TestPlayerIsNotInAFaction +PlayerIsNotInYourFaction TestPlayerIsNotInYourFaction +PlayerIsNotMemberOfFaction TestPlayerIsNotMemberOfFaction +PlayerIsNotOfficerOfFaction TestPlayerIsNotOfficerOfFaction +PlayerNotFound TestPlayerNotFound +PlayerPowerRecordsLoaded TestPlayerPowerRecordsLoaded +PlayerPromoted TestPlayerPromoted +PleaseWaitGate TestPleaseWaitGate +PluginDisabled TestPluginDisabled +PluginDisabling TestPluginDisabling +PluginEnabled TestPluginEnabled +PluginEnabling TestPluginEnabling +PluginLoading TestPluginLoading +PluginSaving TestPluginSaving +Point1PlacementSuccessful TestPoint1PlacementSuccessful +Point2PlacedSuccessfully TestPoint2PlacedSuccessfully +Population TestPopulation +PowerHasDecayed TestPowerHasDecayed +PowerLevel TestPowerLevel +PowerLevelHasBeenSetTo TestPowerLevelHasBeenSetTo +PowerLevelHasIncreased TestPowerLevelHasIncreased +PowerLevelResetting TestPowerLevelResetting +PrefixesDisabled TestPrefixesDisabled +PrefixSet TestPrefixSet +PrefixTaken TestPrefixTaken +ProblemLoadingClaimedChunks TestProblemLoadingClaimedChunks +ProblemLoadingFactions TestProblemLoadingFactions +ProblemLoadingPowerRecords TestProblemLoadingPowerRecords +PromotedToOfficer TestPromotedToOfficer +RadiusRequirement TestRadiusRequirement +RemovedGate TestRemovedGate +ResettingIndividualPowerRecords TestResettingIndividualPowerRecords +RightClickCheckAccess TestRightClickCheckAccess +RightClickForceUnlock TestRightClickForceUnlock +RightClickGrantAccess TestRightClickGrantAccess +RightClickLock TestRightClickLock +RightClickRevokeAccess TestRightClickRevokeAccess +RightClickUnlock TestRightClickUnlock +SchedulingHourlyAutoSave TestSchedulingHourlyAutoSave +SchedulingPowerDecrease TestSchedulingPowerDecrease +SchedulingPowerIncrease TestSchedulingPowerIncrease +SingleQuotesAlliedWarring TestSingleQuotesAlliedWarring +StringSet TestStringSet +SubCommands TestSubCommands +SuccessFactionMemberRemoval TestSuccessFactionMemberRemoval +SuccessForceJoin TestSuccessForceJoin +SuccessfulDisbandment TestSuccessfulDisbandment +SuccessOfficerRemoval TestSuccessOfficerRemoval +SuccessReferencesRemoved TestSuccessReferencesRemoved +SupportedLanguageIDList TestSupportedLanguageIDList +SurroundedChunkProtected TestSurroundedChunkProtected +TargetBlockNotPartOfGate TestTargetBlockNotPartOfGate +TargetFactionNotOverClaiming TestTargetFactionNotOverClaiming +TeleportingAlert TestTeleportingAlert +ThreeBlockRequirement TestThreeBlockRequirement +TriggerBlockNotLever TestTriggerBlockNotLever +UsageAddLaw TestUsageAddLaw +UsageAlly TestUsageAlly +UsageBreakAlliance TestUsageBreakAlliance +UsageClaimRadius TestUsageClaimRadius +UsageConfigSet TestUsageConfigSet +UsageConfigShow TestUsageConfigShow +UsageCreate TestUsageCreate +UsageDeclareWar TestUsageDeclareWar +UsageDemote TestUsageDemote +UsageDesc TestUsageDesc +UsageEditLaw TestUsageEditLaw +UsageFlagsSet TestUsageFlagsSet +UsageForceBonusPower TestUsageForceBonusPower +UsageForceClaim TestUsageForceClaim +UsageForceCreate TestUsageForceCreate +UsageForceDemote TestUsageForceDemote +UsageForceJoin TestUsageForceJoin +UsageForceKick TestUsageForceKick +UsageForcePeace TestUsageForcePeace +UsageForcePower TestUsageForcePower +UsageForceRemoveVassal TestUsageForceRemoveVassal +UsageForceRename TestUsageForceRename +UsageForceRenounce TestUsageForceRenounce +UsageForceTransfer TestUsageForceTransfer +UsageGrantAccess TestUsageGrantAccess +UsageGrantIndependence TestUsageGrantIndependence +UsageInvite TestUsageInvite +UsageInvoke TestUsageInvoke +UsageJoin TestUsageJoin +UsageKick TestUsageKick +UsageMakePeace TestUsageMakePeace +UsagePrefix TestUsagePrefix +UsagePromote TestUsagePromote +UsageRemoveLaw TestUsageRemoveLaw +UsageRename TestUsageRename +UsageRevokeAccess TestUsageRevokeAccess +UsageSwearFealty TestUsageSwearFealty +UsageTransfer TestUsageTransfer +UsageVassalize TestUsageVassalize +UsageWho TestUsageWho +ValidSubCommandsShowSet TestValidSubCommandsShowSet +VassalContribution TestVassalContribution +Vassals TestVassals +WarningPlayerAlreadyStartedCreatingGate TestWarningPlayerAlreadyStartedCreatingGate +WasntFound TestWasntFound +WelcomeBackLastLogout TestWelcomeBackLastLogout +WikiLink TestWikiLink +Wilderness TestWilderness +WorldsMismatch1 TestWorldsMismatch1 +WorldsMismatch2 TestWorldsMismatch2 \ No newline at end of file From feedadd27d5e0a64577bf6adfa89f4fee8139608 Mon Sep 17 00:00:00 2001 From: dmccoystephenson Date: Fri, 26 Aug 2022 19:38:33 -0600 Subject: [PATCH 09/24] Replaced any instances of .replaceAll with .replace. --- .../factionsystem/commands/AddLawCommand.java | 2 +- .../factionsystem/commands/AllyCommand.java | 14 ++++---- .../commands/BreakAllianceCommand.java | 8 ++--- .../commands/CheckClaimCommand.java | 2 +- .../factionsystem/commands/CreateCommand.java | 6 ++-- .../commands/DeclareIndependenceCommand.java | 4 +-- .../commands/DeclareWarCommand.java | 8 ++--- .../factionsystem/commands/DemoteCommand.java | 4 +-- .../factionsystem/commands/DescCommand.java | 2 +- .../commands/DisbandCommand.java | 4 +-- .../factionsystem/commands/DuelCommand.java | 14 ++++---- .../factionsystem/commands/ForceCommand.java | 4 +-- .../factionsystem/commands/GateCommand.java | 10 +++--- .../commands/GrantAccessCommand.java | 4 +-- .../commands/GrantIndependenceCommand.java | 6 ++-- .../factionsystem/commands/InfoCommand.java | 2 +- .../factionsystem/commands/InviteCommand.java | 8 ++--- .../factionsystem/commands/InvokeCommand.java | 14 ++++---- .../factionsystem/commands/JoinCommand.java | 6 ++-- .../factionsystem/commands/KickCommand.java | 10 +++--- .../factionsystem/commands/LawsCommand.java | 4 +-- .../factionsystem/commands/LeaveCommand.java | 4 +-- .../commands/MakePeaceCommand.java | 12 +++---- .../commands/MembersCommand.java | 12 +++---- .../factionsystem/commands/PowerCommand.java | 12 +++---- .../commands/PromoteCommand.java | 6 ++-- .../factionsystem/commands/RenameCommand.java | 4 +-- .../commands/RevokeAccessCommand.java | 2 +- .../factionsystem/commands/StatsCommand.java | 2 +- .../commands/SwearFealtyCommand.java | 6 ++-- .../commands/TransferCommand.java | 8 ++--- .../commands/UnclaimCommand.java | 2 +- .../commands/UnclaimallCommand.java | 4 +-- .../commands/VassalizeCommand.java | 6 ++-- .../factionsystem/commands/WhoCommand.java | 2 +- .../commands/abs/SubCommand.java | 2 +- .../factionsystem/data/PersistentData.java | 14 ++++---- .../eventhandlers/InteractionHandler.java | 2 +- .../factionsystem/services/GateService.java | 6 ++-- .../factionsystem/utils/ColorConversion.java | 4 +-- .../utils/extended/Messenger.java | 34 +++++++++---------- .../utils/extended/Scheduler.java | 2 +- 42 files changed, 141 insertions(+), 141 deletions(-) diff --git a/src/main/java/dansplugins/factionsystem/commands/AddLawCommand.java b/src/main/java/dansplugins/factionsystem/commands/AddLawCommand.java index 218aeafcf..1f63d2abe 100644 --- a/src/main/java/dansplugins/factionsystem/commands/AddLawCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/AddLawCommand.java @@ -54,7 +54,7 @@ public void execute(Player player, String[] args, String key) { // add the law and send a success message. faction.addLaw(String.join(" ", args)); playerService.sendMessageType(player, "&a" + getText("LawAdded"), Objects.requireNonNull(messageService.getLanguage().getString("LawAdded")) - .replaceAll("#law#", String.join(" ", args)), true); + .replace("#law#", String.join(" ", args)), true); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/AllyCommand.java b/src/main/java/dansplugins/factionsystem/commands/AllyCommand.java index 898c7e018..7738646f5 100644 --- a/src/main/java/dansplugins/factionsystem/commands/AllyCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/AllyCommand.java @@ -58,7 +58,7 @@ public void execute(Player player, String[] args, String key) { // the faction needs to exist to ally if (otherFaction == null) { playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) - .replaceAll("#faction#", String.join(" ", args)), true); + .replace("#faction#", String.join(" ", args)), true); return; } @@ -91,16 +91,16 @@ public void execute(Player player, String[] args, String key) { faction, translate("&a" + getText("AlertAttemptedAlliance", faction.getName(), otherFaction.getName())), Objects.requireNonNull(messageService.getLanguage().getString("AlertAttemptedAlliance")) - .replaceAll("#faction_a#", faction.getName()) - .replaceAll("#faction_b#", otherFaction.getName()) + .replace("#faction_a#", faction.getName()) + .replace("#faction_b#", otherFaction.getName()) ); messageFaction( otherFaction, translate("&a" + getText("AlertAttemptedAlliance", faction.getName(), otherFaction.getName())), Objects.requireNonNull(messageService.getLanguage().getString("AlertAttemptedAlliance")) - .replaceAll("#faction_a#", faction.getName()) - .replaceAll("#faction_b#", otherFaction.getName()) + .replace("#faction_a#", faction.getName()) + .replace("#faction_b#", otherFaction.getName()) ); // check if both factions are have requested an alliance @@ -109,10 +109,10 @@ public void execute(Player player, String[] args, String key) { faction.addAlly(otherFaction.getName()); otherFaction.addAlly(faction.getName()); // message player's faction - messageFaction(faction, translate("&a" + getText("AlertNowAlliedWith", otherFaction.getName())), Objects.requireNonNull(messageService.getLanguage().getString("AlertNowAlliedWith")).replaceAll("#faction#", otherFaction.getName())); + messageFaction(faction, translate("&a" + getText("AlertNowAlliedWith", otherFaction.getName())), Objects.requireNonNull(messageService.getLanguage().getString("AlertNowAlliedWith")).replace("#faction#", otherFaction.getName())); // message target faction - messageFaction(otherFaction, translate("&a" + getText("AlertNowAlliedWith", faction.getName())), Objects.requireNonNull(messageService.getLanguage().getString("AlertNowAlliedWith")).replaceAll("#faction#", faction.getName())); + messageFaction(otherFaction, translate("&a" + getText("AlertNowAlliedWith", faction.getName())), Objects.requireNonNull(messageService.getLanguage().getString("AlertNowAlliedWith")).replace("#faction#", faction.getName())); // remove alliance requests faction.removeAllianceRequest(otherFaction.getName()); diff --git a/src/main/java/dansplugins/factionsystem/commands/BreakAllianceCommand.java b/src/main/java/dansplugins/factionsystem/commands/BreakAllianceCommand.java index 3ab8464e1..aa5da93e9 100644 --- a/src/main/java/dansplugins/factionsystem/commands/BreakAllianceCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/BreakAllianceCommand.java @@ -55,7 +55,7 @@ public void execute(Player player, String[] args, String key) { if (otherFaction == null) { playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) - .replaceAll("#faction#", String.join(" ", args)), true); + .replace("#faction#", String.join(" ", args)), true); return; } @@ -67,7 +67,7 @@ public void execute(Player player, String[] args, String key) { if (!faction.isAlly(otherFaction.getName())) { playerService.sendMessageType(player, "&c" + getText("AlertNotAllied", otherFaction.getName()), Objects.requireNonNull(messageService.getLanguage().getString("AlertNotAllied")) - .replaceAll("#faction#", otherFaction.getName()), true); + .replace("#faction#", otherFaction.getName()), true); return; } @@ -75,10 +75,10 @@ public void execute(Player player, String[] args, String key) { otherFaction.removeAlly(faction.getName()); messageFaction(faction, translate("&c" + getText("AllianceBrokenWith", otherFaction.getName())) , Objects.requireNonNull(messageService.getLanguage().getString("AllianceBrokenWith")) - .replaceAll("#faction#", otherFaction.getName())); + .replace("#faction#", otherFaction.getName())); messageFaction(otherFaction, translate("&c" + getText("AlertAllianceHasBeenBroken", faction.getName())), Objects.requireNonNull(messageService.getLanguage().getString("AlertAllianceHasBeenBroken")) - .replaceAll("#faction#", faction.getName())); + .replace("#faction#", faction.getName())); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/CheckClaimCommand.java b/src/main/java/dansplugins/factionsystem/commands/CheckClaimCommand.java index e739e6958..31cc43b52 100644 --- a/src/main/java/dansplugins/factionsystem/commands/CheckClaimCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/CheckClaimCommand.java @@ -46,7 +46,7 @@ public void execute(Player player, String[] args, String key) { playerService.sendMessageType(player, "&a" + getText("LandIsUnclaimed"), "LandIsUnclaimed", false); } else { playerService.sendMessageType(player, "&c" + getText("LandClaimedBy"), Objects.requireNonNull(messageService.getLanguage().getString("LandClaimedBy")) - .replaceAll("#player#", result), true); + .replace("#player#", result), true); } } diff --git a/src/main/java/dansplugins/factionsystem/commands/CreateCommand.java b/src/main/java/dansplugins/factionsystem/commands/CreateCommand.java index 72f2c2072..87e1e70d3 100644 --- a/src/main/java/dansplugins/factionsystem/commands/CreateCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/CreateCommand.java @@ -78,14 +78,14 @@ public void execute(Player player, String[] args, String key) { if (factionName.length() > config.getInt("factionMaxNameLength")) { playerService.sendMessageType(player, "&c" + getText("FactionNameTooLong"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNameTooLong")) - .replaceAll("#name#", factionName), true); + .replace("#name#", factionName), true); return; } if (persistentData.getFaction(factionName) != null) { playerService.sendMessageType(player, "&c" + getText("FactionAlreadyExists"), Objects.requireNonNull(messageService.getLanguage().getString("FactionAlreadyExists")) - .replaceAll("#name#", factionName), true); + .replace("#name#", factionName), true); return; } @@ -99,7 +99,7 @@ public void execute(Player player, String[] args, String key) { persistentData.addFaction(this.faction); playerService.sendMessageType(player, "&a" + getText("FactionCreated"), Objects.requireNonNull(messageService.getLanguage().getString("FactionCreated")) - .replaceAll("#name#", factionName), true); + .replace("#name#", factionName), true); } } diff --git a/src/main/java/dansplugins/factionsystem/commands/DeclareIndependenceCommand.java b/src/main/java/dansplugins/factionsystem/commands/DeclareIndependenceCommand.java index 286d51154..e8cbbb941 100644 --- a/src/main/java/dansplugins/factionsystem/commands/DeclareIndependenceCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/DeclareIndependenceCommand.java @@ -50,7 +50,7 @@ public void execute(Player player, String[] args, String key) { final Faction liege = getFaction(this.faction.getLiege()); if (liege == null) { - playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")).replaceAll("#faction#", String.join(" ", args)), true); + playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")).replace("#faction#", String.join(" ", args)), true); return; } @@ -74,7 +74,7 @@ public void execute(Player player, String[] args, String key) { } } } - messageServer("&c" + getText("HasDeclaredIndependence", faction.getName(), liege.getName()), Objects.requireNonNull(messageService.getLanguage().getString("HasDeclaredIndependence")).replaceAll("#faction_a#", faction.getName()).replaceAll("#faction_b#", liege.getName())); + messageServer("&c" + getText("HasDeclaredIndependence", faction.getName(), liege.getName()), Objects.requireNonNull(messageService.getLanguage().getString("HasDeclaredIndependence")).replace("#faction_a#", faction.getName()).replace("#faction_b#", liege.getName())); } diff --git a/src/main/java/dansplugins/factionsystem/commands/DeclareWarCommand.java b/src/main/java/dansplugins/factionsystem/commands/DeclareWarCommand.java index 6656f5b27..e47f35a57 100644 --- a/src/main/java/dansplugins/factionsystem/commands/DeclareWarCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/DeclareWarCommand.java @@ -70,7 +70,7 @@ public void execute(Player player, String[] args, String key) { final Faction opponent = getFaction(factionName); if (opponent == null) { playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) - .replaceAll("#faction#", String.join(" ", args)), true); + .replace("#faction#", String.join(" ", args)), true); return; } @@ -82,7 +82,7 @@ public void execute(Player player, String[] args, String key) { if (faction.isEnemy(opponent.getName())) { playerService.sendMessageType(player, "&c" + getText("CannotDeclareWarOnYourself") - , Objects.requireNonNull(messageService.getLanguage().getString("AlertAlreadyAtWarWith")).replaceAll("#faction#", opponent.getName()), true); + , Objects.requireNonNull(messageService.getLanguage().getString("AlertAlreadyAtWarWith")).replace("#faction#", opponent.getName()), true); return; } @@ -137,8 +137,8 @@ public void execute(Player player, String[] args, String key) { opponent.addEnemy(faction.getName()); warFactory.createWar(faction, opponent); messageServer("&c" + getText("HasDeclaredWarAgainst", faction.getName(), opponent.getName()), Objects.requireNonNull(messageService.getLanguage().getString("HasDeclaredWarAgainst")) - .replaceAll("#f_a#", faction.getName()) - .replaceAll("#f_b#", opponent.getName())); + .replace("#f_a#", faction.getName()) + .replace("#f_b#", opponent.getName())); } } diff --git a/src/main/java/dansplugins/factionsystem/commands/DemoteCommand.java b/src/main/java/dansplugins/factionsystem/commands/DemoteCommand.java index e966ce496..a19820dab 100644 --- a/src/main/java/dansplugins/factionsystem/commands/DemoteCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/DemoteCommand.java @@ -61,7 +61,7 @@ public void execute(Player player, String[] args, String key) { if (playerToBeDemoted == null) { playerService.sendMessageType(player, "&c" + getText("PlayerByNameNotFound") , Objects.requireNonNull(messageService.getLanguage().getString("PlayerByNameNotFound")) - .replaceAll("#name#", args[0]), true); + .replace("#name#", args[0]), true); return; } @@ -85,7 +85,7 @@ public void execute(Player player, String[] args, String key) { } playerService.sendMessageType(player, "&c" + getText("PlayerDemoted") , Objects.requireNonNull(messageService.getLanguage().getString("PlayerDemoted")) - .replaceAll("#name#", playerToBeDemoted.getName()), true); + .replace("#name#", playerToBeDemoted.getName()), true); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/DescCommand.java b/src/main/java/dansplugins/factionsystem/commands/DescCommand.java index 007b0c0a0..625b4c7c1 100644 --- a/src/main/java/dansplugins/factionsystem/commands/DescCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/DescCommand.java @@ -51,7 +51,7 @@ public void execute(Player player, String[] args, String key) { faction.setDescription(String.join(" ", args)); playerService.sendMessageType(player, "&c" + getText("DescriptionSet") , Objects.requireNonNull(messageService.getLanguage().getString("Description")) - .replaceAll("#desc#", String.join(" ", args)), true); + .replace("#desc#", String.join(" ", args)), true); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/DisbandCommand.java b/src/main/java/dansplugins/factionsystem/commands/DisbandCommand.java index 26536b810..cb49d7d77 100644 --- a/src/main/java/dansplugins/factionsystem/commands/DisbandCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/DisbandCommand.java @@ -84,7 +84,7 @@ public void execute(CommandSender sender, String[] args, String key) { if (disband == null) { playerService.sendMessageType(sender, "&c" + getText("FactionNotFound") , Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) - .replaceAll("#faction#", String.join(" ", args)), true); + .replace("#faction#", String.join(" ", args)), true); return; } final int factionIndex = persistentData.getFactionIndexOf(disband); @@ -94,7 +94,7 @@ public void execute(CommandSender sender, String[] args, String key) { ephemeralData.getPlayersInFactionChat().remove(((Player) sender).getUniqueId()); } else { playerService.sendMessageType(sender, "&c" + getText("SuccessfulDisbandment", disband.getName()) - , Objects.requireNonNull(messageService.getLanguage().getString("SuccessfulDisbandment")).replaceAll("#faction#", disband.getName()), true); + , Objects.requireNonNull(messageService.getLanguage().getString("SuccessfulDisbandment")).replace("#faction#", disband.getName()), true); } removeFaction(factionIndex, self ? ((OfflinePlayer) sender) : null); } diff --git a/src/main/java/dansplugins/factionsystem/commands/DuelCommand.java b/src/main/java/dansplugins/factionsystem/commands/DuelCommand.java index 530f17c29..d08cf9170 100644 --- a/src/main/java/dansplugins/factionsystem/commands/DuelCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/DuelCommand.java @@ -62,11 +62,11 @@ public void execute(Player player, String[] args, String key) { } Player target = Bukkit.getPlayer(args[1]); if (target == null) { - playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[1]), true); + playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[1]), true); return; } if (isDuelling(target)) { - playerService.sendMessageType(player, "&c" + getText("PlayerAlreadyDueling", target.getName()), Objects.requireNonNull(messageService.getLanguage().getString("PlayerAlreadyDueling")).replaceAll("#name#", args[1]), true); + playerService.sendMessageType(player, "&c" + getText("PlayerAlreadyDueling", target.getName()), Objects.requireNonNull(messageService.getLanguage().getString("PlayerAlreadyDueling")).replace("#name#", args[1]), true); return; } int timeLimit = 120; // Time limit in seconds. TODO: Make config option. @@ -74,7 +74,7 @@ public void execute(Player player, String[] args, String key) { timeLimit = getIntSafe(args[2], 120); } inviteDuel(player, target, timeLimit); - playerService.sendMessageType(player, "&b" + getText("AlertChallengeIssued", target.getName()), Objects.requireNonNull(messageService.getLanguage().getString("AlertChallengeIssued")).replaceAll("#name#", target.getName()), true); + playerService.sendMessageType(player, "&b" + getText("AlertChallengeIssued", target.getName()), Objects.requireNonNull(messageService.getLanguage().getString("AlertChallengeIssued")).replace("#name#", target.getName()), true); } else if (safeEquals(args[0], playerService.getMessageType(getText("CmdDuelAccept"), messageService.getLanguage().getString("Alias.CmdDuelAccept")), "accept")) { if (isDuelling(player)) { playerService.sendMessageType(player, "&c" + getText("AlertAlreadyDuelingSomeone"), "AlertAlreadyDuelingSomeone", false); @@ -85,14 +85,14 @@ public void execute(Player player, String[] args, String key) { if (args.length >= 2) { final Player target = Bukkit.getPlayer(args[2]); if (target == null) { - playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[1]), true); + playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[1]), true); return; } duel = ephemeralData.getDuel(player, target); notChallenged = getText("AlertNotBeenChallengedByPlayer", target.getName()); - notChallenged2 = Objects.requireNonNull(messageService.getLanguage().getString("AlertNotBeenChallengedByPlayer")).replaceAll("#name#", target.getName()); + notChallenged2 = Objects.requireNonNull(messageService.getLanguage().getString("AlertNotBeenChallengedByPlayer")).replace("#name#", target.getName()); alreadyDueling = getText("AlertAlreadyDuelingPlayer", target.getName()); - alreadyDueling2 = Objects.requireNonNull(messageService.getLanguage().getString("AlertAlreadyDuelingPlayer")).replaceAll("#name#", target.getName()); + alreadyDueling2 = Objects.requireNonNull(messageService.getLanguage().getString("AlertAlreadyDuelingPlayer")).replace("#name#", target.getName()); } else { duel = getDuel(player); notChallenged = getText("AlertNotBeenChallenged"); @@ -168,7 +168,7 @@ private boolean isDuelling(Player player) { private void inviteDuel(Player player, Player target, int limit) { playerService.sendMessageType(target, "&a" + getText("AlertChallengedToDuelPlusHowTo", player.getName()), Objects.requireNonNull(messageService.getLanguage().getString("AlertChallengedToDuelPlusHowTo")) - .replaceAll("#name#", player.getName()), true); + .replace("#name#", player.getName()), true); ephemeralData.getDuelingPlayers().add(new Duel(medievalFactions, ephemeralData, player, target, limit)); } } \ No newline at end of file diff --git a/src/main/java/dansplugins/factionsystem/commands/ForceCommand.java b/src/main/java/dansplugins/factionsystem/commands/ForceCommand.java index 58ad44804..178f3547f 100644 --- a/src/main/java/dansplugins/factionsystem/commands/ForceCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/ForceCommand.java @@ -154,8 +154,8 @@ private void forcePeace(CommandSender sender, String[] args) { // announce peace to all players on server. messageServer("&a" + getText("AlertNowAtPeaceWith", former.getName(), latter.getName()), Objects.requireNonNull(messageService.getLanguage().getString("AlertNowAtPeaceWith")) - .replaceAll("#p1#", former.getName()) - .replaceAll("#p2#", latter.getName()) + .replace("#p1#", former.getName()) + .replace("#p2#", latter.getName()) ); } } diff --git a/src/main/java/dansplugins/factionsystem/commands/GateCommand.java b/src/main/java/dansplugins/factionsystem/commands/GateCommand.java index 43fa51131..52ab9321d 100644 --- a/src/main/java/dansplugins/factionsystem/commands/GateCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/GateCommand.java @@ -94,8 +94,8 @@ public void execute(Player player, String[] args, String key) { for (Gate gate : faction.getGates()) { playerService.sendMessageType(player, "&b" + String.format("%s: %s", gate.getName(), gate.coordsToString()), Objects.requireNonNull(messageService.getLanguage().getString("GateLocation")) - .replaceAll("#name#", gate.getName()) - .replaceAll("#location#", gate.coordsToString()), true); + .replace("#name#", gate.getName()) + .replace("#location#", gate.coordsToString()), true); } } else { playerService.sendMessageType(player, "&c" + getText("AlertNoGatesDefined"), "AlertNoGatesDefined", false); @@ -126,7 +126,7 @@ public void execute(Player player, String[] args, String key) { if (gateFaction == null) { playerService.sendMessageType(player, "&c" + getText("ErrorCouldNotFindGatesFaction", gate.getName()) , Objects.requireNonNull(messageService.getLanguage().getString("ErrorCouldNotFindGatesFaction")) - .replaceAll("#name#", gate.getName()) + .replace("#name#", gate.getName()) , true); return; } @@ -138,7 +138,7 @@ public void execute(Player player, String[] args, String key) { gateFaction.removeGate(gate); playerService.sendMessageType(player, "&b" + getText("RemovedGate", gate.getName()) , Objects.requireNonNull(messageService.getLanguage().getString("RemovedGate")) - .replaceAll("#name#", gate.getName()) + .replace("#name#", gate.getName()) , true); } if (rename) { @@ -147,7 +147,7 @@ public void execute(Player player, String[] args, String key) { gate.setName(String.join(" ", arguments)); playerService.sendMessageType(player, "&b" + getText("AlertChangedGateName", gate.getName()) , Objects.requireNonNull(messageService.getLanguage().getString("AlertChangedGateName")) - .replaceAll("#name#", gate.getName()) + .replace("#name#", gate.getName()) , true); } } diff --git a/src/main/java/dansplugins/factionsystem/commands/GrantAccessCommand.java b/src/main/java/dansplugins/factionsystem/commands/GrantAccessCommand.java index 680e1c907..22d11fd21 100644 --- a/src/main/java/dansplugins/factionsystem/commands/GrantAccessCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/GrantAccessCommand.java @@ -57,7 +57,7 @@ public void execute(Player player, String[] args, String key) { final UUID targetUUID = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (targetUUID == null) { playerService.sendMessageType(player, "&c" + getText("PlayerNotFound") - , Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); + , Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); return; } if (targetUUID == player.getUniqueId()) { @@ -67,7 +67,7 @@ public void execute(Player player, String[] args, String key) { } ephemeralData.getPlayersGrantingAccess().put(player.getUniqueId(), targetUUID); playerService.sendMessageType(player, "&a" + getText("RightClickGrantAccess", args[0]) - , Objects.requireNonNull(messageService.getLanguage().getString("RightClickGrantAccess")).replaceAll("#name#", args[0]), true); + , Objects.requireNonNull(messageService.getLanguage().getString("RightClickGrantAccess")).replace("#name#", args[0]), true); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/GrantIndependenceCommand.java b/src/main/java/dansplugins/factionsystem/commands/GrantIndependenceCommand.java index fb6de1fb7..3e53b2e5b 100644 --- a/src/main/java/dansplugins/factionsystem/commands/GrantIndependenceCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/GrantIndependenceCommand.java @@ -46,7 +46,7 @@ public void execute(Player player, String[] args, String key) { final Faction target = getFaction(String.join(" ", args)); if (target == null) { playerService.sendMessageType(player, "&c" + getText("FactionNotFound") - , Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")).replaceAll("#faction#", String.join(" ", args)) + , Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")).replace("#faction#", String.join(" ", args)) , true); return; } @@ -59,11 +59,11 @@ public void execute(Player player, String[] args, String key) { // inform all players in that faction that they are now independent messageFaction(target, translate("&a" + getText("AlertGrantedIndependence", faction.getName())), Objects.requireNonNull(messageService.getLanguage().getString("AlertGrantedIndependence")) - .replaceAll("#name#", faction.getName())); + .replace("#name#", faction.getName())); // inform all players in players faction that a vassal was granted independence messageFaction(faction, translate("&a" + getText("AlertNoLongerVassalFaction", target.getName())) , Objects.requireNonNull(messageService.getLanguage().getString("AlertNoLongerVassalFaction")) - .replaceAll("#name#", target.getName())); + .replace("#name#", target.getName())); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/InfoCommand.java b/src/main/java/dansplugins/factionsystem/commands/InfoCommand.java index 0b129a098..4e49cde6c 100644 --- a/src/main/java/dansplugins/factionsystem/commands/InfoCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/InfoCommand.java @@ -73,7 +73,7 @@ public void execute(CommandSender sender, String[] args, String key) { if (target == null) { playerService.sendMessageType(sender, "&c" + getText("FactionNotFound") , Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) - .replaceAll("#faction#", String.join(" ", args)), true); + .replace("#faction#", String.join(" ", args)), true); return; } } diff --git a/src/main/java/dansplugins/factionsystem/commands/InviteCommand.java b/src/main/java/dansplugins/factionsystem/commands/InviteCommand.java index 588e39f88..17989eab7 100644 --- a/src/main/java/dansplugins/factionsystem/commands/InviteCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/InviteCommand.java @@ -66,7 +66,7 @@ public void execute(Player player, String[] args, String key) { if (playerUUID == null) { playerService.sendMessageType(player, "&c" + getText("PlayerNotFound") , Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")) - .replaceAll("#name#", args[0]) + .replace("#name#", args[0]) , true); return; } @@ -76,7 +76,7 @@ public void execute(Player player, String[] args, String key) { if (target == null) { playerService.sendMessageType(player, "&c" + getText("PlayerNotFound") , Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")) - .replaceAll("#name#", args[0]) + .replace("#name#", args[0]) , true); return; } @@ -91,7 +91,7 @@ public void execute(Player player, String[] args, String key) { if (target.isOnline() && target.getPlayer() != null) { playerService.sendMessageType(target.getPlayer(), "&a" + getText("AlertBeenInvited", faction.getName(), faction.getName()) - , Objects.requireNonNull(messageService.getLanguage().getString("AlertBeenInvited")).replaceAll("#name#", faction.getName()), + , Objects.requireNonNull(messageService.getLanguage().getString("AlertBeenInvited")).replace("#name#", faction.getName()), true ); } @@ -105,7 +105,7 @@ public void execute(Player player, String[] args, String key) { playerService.sendMessageType(player, "&c" + getText("InvitationExpired", faction.getName()), Objects.requireNonNull(messageService.getLanguage().getString("InvitationExpired")) - .replaceAll("#name#", faction.getName()), + .replace("#name#", faction.getName()), true ); } diff --git a/src/main/java/dansplugins/factionsystem/commands/InvokeCommand.java b/src/main/java/dansplugins/factionsystem/commands/InvokeCommand.java index a28e3f00e..138b74251 100644 --- a/src/main/java/dansplugins/factionsystem/commands/InvokeCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/InvokeCommand.java @@ -56,18 +56,18 @@ public void execute(Player player, String[] args, String key) { final Faction invokee = getFaction(argumentsInsideDoubleQuotes.get(0)); final Faction warringFaction = getFaction(argumentsInsideDoubleQuotes.get(1)); if (invokee == null || warringFaction == null) { - playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")).replaceAll("#faction#", argumentsInsideDoubleQuotes.get(0)), true); - playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")).replaceAll("#faction#", argumentsInsideDoubleQuotes.get(1)), true); + playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")).replace("#faction#", argumentsInsideDoubleQuotes.get(0)), true); + playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")).replace("#faction#", argumentsInsideDoubleQuotes.get(1)), true); return; } if (!this.faction.isAlly(invokee.getName()) && !this.faction.isVassal(invokee.getName())) { - playerService.sendMessageType(player, "&c" + getText("NotAnAllyOrVassal", invokee.getName()), Objects.requireNonNull(messageService.getLanguage().getString("NotAnAllyOrVassal")).replaceAll("#name#", invokee.getName()), true); + playerService.sendMessageType(player, "&c" + getText("NotAnAllyOrVassal", invokee.getName()), Objects.requireNonNull(messageService.getLanguage().getString("NotAnAllyOrVassal")).replace("#name#", invokee.getName()), true); return; } if (!this.faction.isEnemy(warringFaction.getName())) { playerService.sendMessageType(player, "&c" + getText("NotAtWarWith", warringFaction.getName()) - , messageService.getLanguage().getString("NotAtWarWith").replaceAll("#name#", warringFaction.getName()) + , messageService.getLanguage().getString("NotAtWarWith").replace("#name#", warringFaction.getName()) , true); return; } @@ -83,13 +83,13 @@ public void execute(Player player, String[] args, String key) { warringFaction.addEnemy(invokee.getName()); messageFaction(invokee, // Message ally faction - "&c" + getText("AlertCalledToWar1", faction.getName(), warringFaction.getName()), Objects.requireNonNull(messageService.getLanguage().getString("AlertCalledToWar1")).replaceAll("#f1#", faction.getName()).replaceAll("#f2#", warringFaction.getName())); + "&c" + getText("AlertCalledToWar1", faction.getName(), warringFaction.getName()), Objects.requireNonNull(messageService.getLanguage().getString("AlertCalledToWar1")).replace("#f1#", faction.getName()).replace("#f2#", warringFaction.getName())); messageFaction(warringFaction, // Message warring faction - "&c" + getText("AlertCalledToWar2", faction.getName(), invokee.getName()), Objects.requireNonNull(messageService.getLanguage().getString("AlertCalledToWar2")).replaceAll("#f1#", faction.getName()).replaceAll("#f2#", invokee.getName())); + "&c" + getText("AlertCalledToWar2", faction.getName(), invokee.getName()), Objects.requireNonNull(messageService.getLanguage().getString("AlertCalledToWar2")).replace("#f1#", faction.getName()).replace("#f2#", invokee.getName())); messageFaction(this.faction, // Message player faction - "&a" + getText("AlertCalledToWar3", invokee.getName(), warringFaction.getName()), Objects.requireNonNull(messageService.getLanguage().getString("AlertCalledToWar3")).replaceAll("#f1#", faction.getName()).replaceAll("#f2#", warringFaction.getName())); + "&a" + getText("AlertCalledToWar3", invokee.getName(), warringFaction.getName()), Objects.requireNonNull(messageService.getLanguage().getString("AlertCalledToWar3")).replace("#f1#", faction.getName()).replace("#f2#", warringFaction.getName())); } } diff --git a/src/main/java/dansplugins/factionsystem/commands/JoinCommand.java b/src/main/java/dansplugins/factionsystem/commands/JoinCommand.java index 1328446f0..9fe2fce54 100644 --- a/src/main/java/dansplugins/factionsystem/commands/JoinCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/JoinCommand.java @@ -57,7 +57,7 @@ public void execute(Player player, String[] args, String key) { final Faction target = getFaction(String.join(" ", args)); if (target == null) { playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) - .replaceAll("#faction#", String.join(" ", args)), true); + .replace("#faction#", String.join(" ", args)), true); return; } if (!target.isInvited(player.getUniqueId())) { @@ -73,8 +73,8 @@ public void execute(Player player, String[] args, String key) { } messageFaction(target, "&a" + getText("HasJoined", player.getName(), target.getName()) , Objects.requireNonNull(messageService.getLanguage().getString("HasJoined")) - .replaceAll("#name#", player.getName()) - .replaceAll("#faction#", target.getName())); + .replace("#name#", player.getName()) + .replace("#faction#", target.getName())); target.addMember(player.getUniqueId()); target.uninvite(player.getUniqueId()); player.sendMessage(translate("&a" + getText("AlertJoinedFaction"))); diff --git a/src/main/java/dansplugins/factionsystem/commands/KickCommand.java b/src/main/java/dansplugins/factionsystem/commands/KickCommand.java index 2c8468b7b..c75630269 100644 --- a/src/main/java/dansplugins/factionsystem/commands/KickCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/KickCommand.java @@ -55,14 +55,14 @@ public void execute(Player player, String[] args, String key) { UUIDChecker uuidChecker = new UUIDChecker(); final UUID targetUUID = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (targetUUID == null) { - playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); + playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); return; } OfflinePlayer target = Bukkit.getOfflinePlayer(targetUUID); if (!target.hasPlayedBefore()) { target = Bukkit.getPlayer(args[0]); if (target == null) { - playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); + playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); return; } } @@ -89,12 +89,12 @@ public void execute(Player player, String[] args, String key) { faction.removeMember(targetUUID); messageFaction(faction, "&c" + getText("HasBeenKickedFrom", target.getName(), faction.getName()), Objects.requireNonNull(messageService.getLanguage().getString("HasBeenKickedFrom")) - .replaceAll("#name#", args[0]) - .replaceAll("#faction#", faction.getName())); + .replace("#name#", args[0]) + .replace("#faction#", faction.getName())); if (target.isOnline() && target.getPlayer() != null) { playerService.sendMessageType(player, "&c" + getText("AlertKicked", player.getName()) , Objects.requireNonNull(messageService.getLanguage().getString("AlertKicked")) - .replaceAll("#name#", player.getName()), true); + .replace("#name#", player.getName()), true); } } diff --git a/src/main/java/dansplugins/factionsystem/commands/LawsCommand.java b/src/main/java/dansplugins/factionsystem/commands/LawsCommand.java index 98d456ddc..c80c3aa60 100644 --- a/src/main/java/dansplugins/factionsystem/commands/LawsCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/LawsCommand.java @@ -59,7 +59,7 @@ public void execute(Player player, String[] args, String key) { if (target == null) { playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) - .replaceAll("#faction#", String.join(" ", args)), true); + .replace("#faction#", String.join(" ", args)), true); return; } if (target.getNumLaws() == 0) { @@ -70,7 +70,7 @@ public void execute(Player player, String[] args, String key) { } playerService.sendMessageType(player, "&b" + getText("LawsTitle", target.getName()) , Objects.requireNonNull(messageService.getLanguage().getString("LawsTitle")) - .replaceAll("#name#", target.getName()), true); + .replace("#name#", target.getName()), true); IntStream.range(0, target.getNumLaws()) .mapToObj(i -> translate("&b" + (i + 1) + ". " + target.getLaws().get(i))) .forEach(player::sendMessage); diff --git a/src/main/java/dansplugins/factionsystem/commands/LeaveCommand.java b/src/main/java/dansplugins/factionsystem/commands/LeaveCommand.java index 3cecd7d4e..7525d5d9a 100644 --- a/src/main/java/dansplugins/factionsystem/commands/LeaveCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/LeaveCommand.java @@ -63,8 +63,8 @@ public void execute(Player player, String[] args, String key) { , "AlertLeftFaction", false); messageFaction(faction, translate("&a" + player.getName() + " has left " + faction.getName()), Objects.requireNonNull(messageService.getLanguage().getString("AlertLeftFactionTeam")) - .replaceAll("#name#", player.getName()) - .replaceAll("#faction#", faction.getName())); + .replace("#name#", player.getName()) + .replace("#faction#", faction.getName())); } diff --git a/src/main/java/dansplugins/factionsystem/commands/MakePeaceCommand.java b/src/main/java/dansplugins/factionsystem/commands/MakePeaceCommand.java index 967ede787..46c4518ff 100644 --- a/src/main/java/dansplugins/factionsystem/commands/MakePeaceCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/MakePeaceCommand.java @@ -52,7 +52,7 @@ public void execute(Player player, String[] args, String key) { if (target == null) { playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) - .replaceAll("#faction#", String.join(" ", args)), true); + .replace("#faction#", String.join(" ", args)), true); return; } if (target == faction) { @@ -73,13 +73,13 @@ public void execute(Player player, String[] args, String key) { faction.requestTruce(target.getName()); playerService.sendMessageType(player, "&a" + getText("AttemptedPeace", target.getName()) , Objects.requireNonNull(messageService.getLanguage().getString("AttemptedPeace")) - .replaceAll("#name#", target.getName()), + .replace("#name#", target.getName()), true); messageFaction(target, translate("&a" + getText("HasAttemptedToMakePeaceWith", faction.getName(), target.getName())), Objects.requireNonNull(messageService.getLanguage().getString("HasAttemptedToMakePeaceWith")) - .replaceAll("#f1#", faction.getName()) - .replaceAll("#f2#", target.getName())); + .replace("#f1#", faction.getName()) + .replace("#f2#", target.getName())); if (faction.isTruceRequested(target.getName()) && target.isTruceRequested(faction.getName())) { FactionWarEndEvent warEndEvent = new FactionWarEndEvent(this.faction, target); Bukkit.getPluginManager().callEvent(warEndEvent); @@ -97,8 +97,8 @@ public void execute(Player player, String[] args, String key) { // Notify messageServer("&a" + getText("AlertNowAtPeaceWith", faction.getName(), target.getName()), Objects.requireNonNull(messageService.getLanguage().getString("AlertNowAtPeaceWith")) - .replaceAll("#p1#", faction.getName()) - .replaceAll("#p2#", target.getName())); + .replace("#p1#", faction.getName()) + .replace("#p2#", target.getName())); } } diff --git a/src/main/java/dansplugins/factionsystem/commands/MembersCommand.java b/src/main/java/dansplugins/factionsystem/commands/MembersCommand.java index bf2aa8eb4..34dfe31d7 100644 --- a/src/main/java/dansplugins/factionsystem/commands/MembersCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/MembersCommand.java @@ -74,7 +74,7 @@ public void execute(CommandSender sender, String[] args, String key) { if (faction == null) { playerService.sendMessageType(sender, "&c" + getText("FactionNameNotRecognized"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) - .replaceAll("#faction#", String.join(" ", args + .replace("#faction#", String.join(" ", args )), true); return; } @@ -101,7 +101,7 @@ public void execute(CommandSender sender, String[] args, String key) { sender.sendMessage(translate("&b----------\n")); } else { playerService.sendMessageType(sender, "", Objects.requireNonNull(messageService.getLanguage().getString("MembersFaction.Title")) - .replaceAll("#faction#", faction.getName()) + .replace("#faction#", faction.getName()) , true); faction.getMemberList().stream() .map(Bukkit::getOfflinePlayer) @@ -117,12 +117,12 @@ public void execute(CommandSender sender, String[] args, String key) { color = messageService.getLanguage().getString("MembersFaction.Owner.Color"); } return playerService.colorize(Objects.requireNonNull(messageService.getLanguage().getString("MembersFaction.Message")) - .replaceAll("#color#", Objects.requireNonNull(color)) - .replaceAll("#rank#", Objects.requireNonNull(rank)) - .replaceAll("#name#", Objects.requireNonNull(player.getName()))); + .replace("#color#", Objects.requireNonNull(color)) + .replace("#rank#", Objects.requireNonNull(rank)) + .replace("#name#", Objects.requireNonNull(player.getName()))); }).forEach(sender::sendMessage); playerService.sendMessageType(sender, "", Objects.requireNonNull(messageService.getLanguage().getString("MembersFaction.SubTitle")) - .replaceAll("#faction#", faction.getName()) + .replace("#faction#", faction.getName()) , true); } diff --git a/src/main/java/dansplugins/factionsystem/commands/PowerCommand.java b/src/main/java/dansplugins/factionsystem/commands/PowerCommand.java index 00b09216f..3d1b40ca4 100644 --- a/src/main/java/dansplugins/factionsystem/commands/PowerCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/PowerCommand.java @@ -65,23 +65,23 @@ record = persistentData.getPlayersPowerRecord(((Player) sender).getUniqueId()); playerService.sendMessageType(sender, "&b" + getText("AlertCurrentPowerLevel", record.getPower(), record.maxPower()) , Objects.requireNonNull(messageService.getLanguage().getString("AlertCurrentPowerLevel")) - .replaceAll("#power#", String.valueOf(record.getPower())) - .replaceAll("#max#", String.valueOf(record.maxPower())), true); + .replace("#power#", String.valueOf(record.getPower())) + .replace("#max#", String.valueOf(record.maxPower())), true); return; } UUIDChecker uuidChecker = new UUIDChecker(); final UUID target = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (target == null) { playerService.sendMessageType(sender, "&c" + getText("PlayerNotFound"), - Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); + Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); return; } record = persistentData.getPlayersPowerRecord(target); playerService.sendMessageType(sender, "&b" + getText("CurrentPowerLevel", args[0], record.getPower(), record.maxPower()) , Objects.requireNonNull(messageService.getLanguage().getString("CurrentPowerLevel")) - .replaceAll("#power#", String.valueOf(record.getPower())) - .replaceAll("#max#", String.valueOf(record.maxPower())) - .replaceAll("#name#", args[0]), true); + .replace("#power#", String.valueOf(record.getPower())) + .replace("#max#", String.valueOf(record.maxPower())) + .replace("#name#", args[0]), true); } } \ No newline at end of file diff --git a/src/main/java/dansplugins/factionsystem/commands/PromoteCommand.java b/src/main/java/dansplugins/factionsystem/commands/PromoteCommand.java index dbde7792b..ce4260222 100644 --- a/src/main/java/dansplugins/factionsystem/commands/PromoteCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/PromoteCommand.java @@ -51,14 +51,14 @@ public void execute(Player player, String[] args, String key) { UUIDChecker uuidChecker = new UUIDChecker(); final UUID targetUUID = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (targetUUID == null) { - playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); + playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); return; } OfflinePlayer target = Bukkit.getOfflinePlayer(targetUUID); if (!target.hasPlayedBefore()) { target = Bukkit.getPlayer(args[0]); if (target == null) { - playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); + playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); return; } } @@ -88,7 +88,7 @@ public void execute(Player player, String[] args, String key) { playerService.sendMessageType(player, "&c" + getText("PlayerCantBePromotedBecauseOfLimit", faction.calculateMaxOfficers()) , Objects.requireNonNull(messageService.getLanguage().getString("PlayerCantBePromotedBecauseOfLimit")) - .replaceAll("#number#", String.valueOf(faction.calculateMaxOfficers())), true); + .replace("#number#", String.valueOf(faction.calculateMaxOfficers())), true); } } diff --git a/src/main/java/dansplugins/factionsystem/commands/RenameCommand.java b/src/main/java/dansplugins/factionsystem/commands/RenameCommand.java index 3d2851642..566df7964 100644 --- a/src/main/java/dansplugins/factionsystem/commands/RenameCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/RenameCommand.java @@ -58,14 +58,14 @@ public void execute(Player player, String[] args, String key) { if (newName.length() > config.getInt("factionMaxNameLength")) { playerService.sendMessageType(player, "&c" + getText("FactionNameTooLong"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNameTooLong")) - .replaceAll("#name#", newName), true); + .replace("#name#", newName), true); return; } final String oldName = faction.getName(); if (getFaction(newName) != null) { playerService.sendMessageType(player, "&c" + getText("FactionAlreadyExists"), Objects.requireNonNull(messageService.getLanguage().getString("FactionAlreadyExists")) - .replaceAll("#name#", newName), true); + .replace("#name#", newName), true); return; } final FactionRenameEvent renameEvent = new FactionRenameEvent(faction, oldName, newName); diff --git a/src/main/java/dansplugins/factionsystem/commands/RevokeAccessCommand.java b/src/main/java/dansplugins/factionsystem/commands/RevokeAccessCommand.java index f6aa516f1..fe3a3ccd3 100644 --- a/src/main/java/dansplugins/factionsystem/commands/RevokeAccessCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/RevokeAccessCommand.java @@ -59,7 +59,7 @@ public void execute(Player player, String[] args, String key) { UUIDChecker uuidChecker = new UUIDChecker(); final UUID targetUUID = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (targetUUID == null) { - playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); + playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); return; } if (targetUUID == player.getUniqueId()) { diff --git a/src/main/java/dansplugins/factionsystem/commands/StatsCommand.java b/src/main/java/dansplugins/factionsystem/commands/StatsCommand.java index 024104703..d8d249626 100644 --- a/src/main/java/dansplugins/factionsystem/commands/StatsCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/StatsCommand.java @@ -41,7 +41,7 @@ public void execute(CommandSender sender, String[] args, String key) { messageService.getLanguage().getStringList("StatsFaction") .forEach(s -> { if (s.contains("#faction#")) { - s = s.replaceAll("#faction#", String.valueOf(persistentData.getNumFactions())); + s = s.replace("#faction#", String.valueOf(persistentData.getNumFactions())); } s = playerService.colorize(s); playerService.sendMessageType(sender, "", s, true); diff --git a/src/main/java/dansplugins/factionsystem/commands/SwearFealtyCommand.java b/src/main/java/dansplugins/factionsystem/commands/SwearFealtyCommand.java index ba5f21754..582e9c500 100644 --- a/src/main/java/dansplugins/factionsystem/commands/SwearFealtyCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/SwearFealtyCommand.java @@ -48,7 +48,7 @@ public void execute(Player player, String[] args, String key) { final Faction target = getFaction(String.join(" ", args)); if (target == null) { playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) - .replaceAll("#faction#", String.join(" ", args)), true); + .replace("#faction#", String.join(" ", args)), true); return; } if (!target.hasBeenOfferedVassalization(faction.getName())) { @@ -66,12 +66,12 @@ public void execute(Player player, String[] args, String key) { // inform target faction that they have a new vassal messageFaction(target, translate("&a" + getText("AlertFactionHasNewVassal", faction.getName())) , Objects.requireNonNull(messageService.getLanguage().getString("AlertFactionHasNewVassal")) - .replaceAll("#name#", faction.getName())); + .replace("#name#", faction.getName())); // inform players faction that they have a new liege messageFaction(faction, translate("&a" + getText("AlertFactionHasBeenVassalized", target.getName())) , Objects.requireNonNull(messageService.getLanguage().getString("AlertFactionHasBeenVassalized")) - .replaceAll("#name#", target.getName())); + .replace("#name#", target.getName())); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/TransferCommand.java b/src/main/java/dansplugins/factionsystem/commands/TransferCommand.java index 860327bba..14f4fb110 100644 --- a/src/main/java/dansplugins/factionsystem/commands/TransferCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/TransferCommand.java @@ -49,14 +49,14 @@ public void execute(Player player, String[] args, String key) { UUIDChecker uuidChecker = new UUIDChecker(); final UUID targetUUID = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (targetUUID == null) { - playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); + playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); return; } OfflinePlayer target = Bukkit.getOfflinePlayer(targetUUID); if (!target.hasPlayedBefore()) { target = Bukkit.getPlayer(args[0]); if (target == null) { - playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); + playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); return; } } @@ -77,11 +77,11 @@ public void execute(Player player, String[] args, String key) { faction.setOwner(targetUUID); playerService.sendMessageType(player, "&b" + getText("OwnerShipTransferredTo", args[0]) , Objects.requireNonNull(messageService.getLanguage().getString("OwnerShipTransferredTo")) - .replaceAll("#name#", args[0]), true); + .replace("#name#", args[0]), true); if (target.isOnline() && target.getPlayer() != null) { // Message if we can :) playerService.sendMessageType(target.getPlayer(), "&a" + getText("OwnershipTransferred", faction.getName()), Objects.requireNonNull(messageService.getLanguage().getString("'OwnershipTransferred")) - .replaceAll("#name#", faction.getName()), true); + .replace("#name#", faction.getName()), true); } } diff --git a/src/main/java/dansplugins/factionsystem/commands/UnclaimCommand.java b/src/main/java/dansplugins/factionsystem/commands/UnclaimCommand.java index 1abc8b269..deb49fb22 100644 --- a/src/main/java/dansplugins/factionsystem/commands/UnclaimCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/UnclaimCommand.java @@ -63,7 +63,7 @@ public void execute(Player player, String[] args, String key) { chunkDataAccessor.radiusUnclaimAtLocation(radius, player, faction); playerService.sendMessageType(player, "Unclaimed radius of " + radius + " claims around you!" , Objects.requireNonNull(messageService.getLanguage().getString("UnClaimedRadius")) - .replaceAll("#number#", String.valueOf(radius)), true); + .replace("#number#", String.valueOf(radius)), true); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/UnclaimallCommand.java b/src/main/java/dansplugins/factionsystem/commands/UnclaimallCommand.java index 980e9e05e..811abf8f0 100644 --- a/src/main/java/dansplugins/factionsystem/commands/UnclaimallCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/UnclaimallCommand.java @@ -76,7 +76,7 @@ public void execute(CommandSender sender, String[] args, String key) { if (faction == null) { playerService.sendMessageType(sender, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) - .replaceAll("#faction#", String.join(" ", args)), true); + .replace("#faction#", String.join(" ", args)), true); return; } } @@ -90,7 +90,7 @@ public void execute(CommandSender sender, String[] args, String key) { dynmapIntegrator.updateClaims(); playerService.sendMessageType(sender, "&a" + getText("AllLandUnclaimedFrom", faction.getName()) , Objects.requireNonNull(messageService.getLanguage().getString("AllLandUnclaimedFrom")) - .replaceAll("#name#", faction.getName()), false); + .replace("#name#", faction.getName()), false); // remove locks associated with this faction persistentData.removeAllLocks(faction.getName()); diff --git a/src/main/java/dansplugins/factionsystem/commands/VassalizeCommand.java b/src/main/java/dansplugins/factionsystem/commands/VassalizeCommand.java index 7e6da4119..7f6093f96 100644 --- a/src/main/java/dansplugins/factionsystem/commands/VassalizeCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/VassalizeCommand.java @@ -51,7 +51,7 @@ public void execute(Player player, String[] args, String key) { final Faction target = getFaction(String.join(" ", args)); if (target == null) { playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) - .replaceAll("#faction#", String.join(" ", args)), true); + .replace("#faction#", String.join(" ", args)), true); return; } // make sure player isn't trying to vassalize their own faction @@ -85,12 +85,12 @@ public void execute(Player player, String[] args, String key) { messageFaction(target, translate("&a" + getText("AlertAttemptedVassalization", faction.getName(), faction.getName())) , Objects.requireNonNull(messageService.getLanguage().getString("AlertAttemptedVassalization")) - .replaceAll("#name#", faction.getName())); + .replace("#name#", faction.getName())); // inform all players in players faction that a vassalization offer was sent messageFaction(faction, translate("&a" + getText("AlertFactionAttemptedToVassalize", target.getName())) , Objects.requireNonNull(messageService.getLanguage().getString("AlertFactionAttemptedToVassalize")) - .replaceAll("#name#", target.getName())); + .replace("#name#", target.getName())); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/WhoCommand.java b/src/main/java/dansplugins/factionsystem/commands/WhoCommand.java index 49fdacbfe..e1ee3b2a7 100644 --- a/src/main/java/dansplugins/factionsystem/commands/WhoCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/WhoCommand.java @@ -51,7 +51,7 @@ public void execute(Player player, String[] args, String key) { UUIDChecker uuidChecker = new UUIDChecker(); final UUID targetUUID = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (targetUUID == null) { - playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replaceAll("#name#", args[0]), true); + playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); return; } final Faction temp = getPlayerFaction(targetUUID); diff --git a/src/main/java/dansplugins/factionsystem/commands/abs/SubCommand.java b/src/main/java/dansplugins/factionsystem/commands/abs/SubCommand.java index 618cc939b..8db8acb70 100644 --- a/src/main/java/dansplugins/factionsystem/commands/abs/SubCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/abs/SubCommand.java @@ -204,7 +204,7 @@ public boolean checkPermissions(CommandSender sender, String... permission) { break; } if (!has) { - playerService.sendMessageType(sender, translate("&c" + getText("PermissionNeeded", permission[0])), Objects.requireNonNull(messageService.getLanguage().getString("PermissionNeeded")).replaceAll("#permission#", permission[0]), true); + playerService.sendMessageType(sender, translate("&c" + getText("PermissionNeeded", permission[0])), Objects.requireNonNull(messageService.getLanguage().getString("PermissionNeeded")).replace("#permission#", permission[0]), true); } return has; } diff --git a/src/main/java/dansplugins/factionsystem/data/PersistentData.java b/src/main/java/dansplugins/factionsystem/data/PersistentData.java index 093e43f2e..e8c783021 100644 --- a/src/main/java/dansplugins/factionsystem/data/PersistentData.java +++ b/src/main/java/dansplugins/factionsystem/data/PersistentData.java @@ -437,7 +437,7 @@ public boolean isBlockInGate(Block block, Player player) { for (Gate gate : faction.getGates()) { if (gate.hasBlock(block)) { playerService.sendMessageType(player, ChatColor.RED + String.format(localeService.get("BlockIsPartOfGateMustRemoveGate"), gate.getName()) - , Objects.requireNonNull(messageService.getLanguage().getString("BlockIsPartOfGateMustRemoveGate")).replaceAll("#name#", gate.getName()), true); + , Objects.requireNonNull(messageService.getLanguage().getString("BlockIsPartOfGateMustRemoveGate")).replace("#name#", gate.getName()), true); return true; } } @@ -469,7 +469,7 @@ private void initiatePowerIncrease(PowerRecord powerRecord) { powerRecord.increasePower(); playerService.sendMessageType(getServer().getPlayer(powerRecord.getPlayerUUID()), ChatColor.GREEN + String.format(localeService.get("AlertPowerLevelIncreasedBy"), configService.getInt("powerIncreaseAmount")) , Objects.requireNonNull(messageService.getLanguage().getString("AlertPowerLevelIncreasedBy")) - .replaceAll("#number#", String.valueOf(configService.getInt("powerIncreaseAmount"))), true); + .replace("#number#", String.valueOf(configService.getInt("powerIncreaseAmount"))), true); } } @@ -639,7 +639,7 @@ public void radiusClaimAtLocation(int depth, Player claimant, Location location, if (depth < 0 || depth > maxClaimRadius) { playerService.sendMessageType(claimant, ChatColor.RED + String.format(localeService.get("RadiusRequirement"), maxClaimRadius), Objects.requireNonNull(messageService.getLanguage().getString("RadiusRequirement")) - .replaceAll("#number#", String.valueOf(maxClaimRadius)), true); + .replace("#number#", String.valueOf(maxClaimRadius)), true); return; } @@ -729,7 +729,7 @@ public void removeChunkAtPlayerLocation(Player player, Faction playersFaction) { // ensure that the chunk is claimed by the player's faction. if (!chunk.getHolder().equalsIgnoreCase(playersFaction.getName())) { playerService.sendMessageType(player, ChatColor.RED + String.format(localeService.get("LandClaimedBy"), chunk.getHolder()) - , Objects.requireNonNull(messageService.getLanguage().getString("LandClaimedBy")).replaceAll("#player#", chunk.getHolder()), true); + , Objects.requireNonNull(messageService.getLanguage().getString("LandClaimedBy")).replace("#player#", chunk.getHolder()), true); return; } @@ -1016,11 +1016,11 @@ private void claimChunkAtLocation(Player claimant, double[] chunkCoords, World w Chunk toClaim = world.getChunkAt((int) chunkCoords[0], (int) chunkCoords[1]); addClaimedChunk(toClaim, claimantsFaction, claimant.getWorld()); playerService.sendMessageType(claimant, ChatColor.GREEN + String.format(localeService.get("AlertLandConqueredFromAnotherFaction"), targetFaction.getName(), getChunksClaimedByFaction(claimantsFaction.getName()), claimantsFaction.getCumulativePowerLevel()) - , Objects.requireNonNull(messageService.getLanguage().getString("AlertLandConqueredFromAnotherFaction")).replaceAll("#name", targetFaction.getName()).replaceAll("#number#", String.valueOf(getChunksClaimedByFaction(claimantsFaction.getName()))).replaceAll("#max#", String.valueOf(claimantsFaction.getCumulativePowerLevel())), true); + , Objects.requireNonNull(messageService.getLanguage().getString("AlertLandConqueredFromAnotherFaction")).replace("#name", targetFaction.getName()).replace("#number#", String.valueOf(getChunksClaimedByFaction(claimantsFaction.getName()))).replace("#max#", String.valueOf(claimantsFaction.getCumulativePowerLevel())), true); messenger.sendAllPlayersInFactionMessage(targetFaction, playerService .getMessageType(ChatColor.RED + String.format(localeService.get("AlertLandConqueredFromYourFaction"), claimantsFaction.getName()) - , Objects.requireNonNull(messageService.getLanguage().getString("AlertLandConqueredFromYourFaction")).replaceAll("#number#", claimantsFaction.getName()))); + , Objects.requireNonNull(messageService.getLanguage().getString("AlertLandConqueredFromYourFaction")).replace("#number#", claimantsFaction.getName()))); } } else { Chunk toClaim = world.getChunkAt((int) chunkCoords[0], (int) chunkCoords[1]); @@ -1030,7 +1030,7 @@ private void claimChunkAtLocation(Player claimant, double[] chunkCoords, World w // chunk not already claimed addClaimedChunk(toClaim, claimantsFaction, claimant.getWorld()); playerService.sendMessageType(claimant, ChatColor.GREEN + String.format(localeService.get("AlertLandClaimed"), getChunksClaimedByFaction(claimantsFaction.getName()), claimantsFaction.getCumulativePowerLevel()) - , Objects.requireNonNull(messageService.getLanguage().getString("AlertLandClaimed")).replaceAll("#number#", String.valueOf(getChunksClaimedByFaction(claimantsFaction.getName()))).replaceAll("#max#", String.valueOf(claimantsFaction.getCumulativePowerLevel())), true); + , Objects.requireNonNull(messageService.getLanguage().getString("AlertLandClaimed")).replace("#number#", String.valueOf(getChunksClaimedByFaction(claimantsFaction.getName()))).replace("#max#", String.valueOf(claimantsFaction.getCumulativePowerLevel())), true); } } } diff --git a/src/main/java/dansplugins/factionsystem/eventhandlers/InteractionHandler.java b/src/main/java/dansplugins/factionsystem/eventhandlers/InteractionHandler.java index 6158f0a2d..d665c5744 100644 --- a/src/main/java/dansplugins/factionsystem/eventhandlers/InteractionHandler.java +++ b/src/main/java/dansplugins/factionsystem/eventhandlers/InteractionHandler.java @@ -204,7 +204,7 @@ public void handle(PlayerInteractEvent event) { String owner = uuidChecker.findPlayerNameBasedOnUUID(lockedBlock.getOwner()); playerService.sendMessageType(player, ChatColor.RED + String.format(localeService.get("LockedBy"), owner) , Objects.requireNonNull(messageService.getLanguage().getString("LockedBy")) - .replaceAll("#name#", owner), true); + .replace("#name#", owner), true); event.setCancelled(true); return; } diff --git a/src/main/java/dansplugins/factionsystem/services/GateService.java b/src/main/java/dansplugins/factionsystem/services/GateService.java index 2f1aab3b1..c207c2c17 100644 --- a/src/main/java/dansplugins/factionsystem/services/GateService.java +++ b/src/main/java/dansplugins/factionsystem/services/GateService.java @@ -63,7 +63,7 @@ public void handlePotentialGateInteraction(Block clickedBlock, Player player, Pl } else { event.setCancelled(true); playerService.sendMessageType(player, ChatColor.RED + String.format(localeService.get("PleaseWaitGate"), g.getStatus()) - , Objects.requireNonNull(messageService.getLanguage().getString("PleaseWaitGate")).replaceAll("#status#", g.getStatus()), true); + , Objects.requireNonNull(messageService.getLanguage().getString("PleaseWaitGate")).replace("#status#", g.getStatus()), true); return; } } else { @@ -72,7 +72,7 @@ public void handlePotentialGateInteraction(Block clickedBlock, Player player, Pl } else { event.setCancelled(true); playerService.sendMessageType(player, ChatColor.RED + String.format(localeService.get("PleaseWaitGate"), g.getStatus()) - , Objects.requireNonNull(messageService.getLanguage().getString("PleaseWaitGate")).replaceAll("#status#", g.getStatus()), true); + , Objects.requireNonNull(messageService.getLanguage().getString("PleaseWaitGate")).replace("#status#", g.getStatus()), true); return; } } @@ -218,7 +218,7 @@ public void handleCreatingGate(Block clickedBlock, Player player, PlayerInteract } } else { playerService.sendMessageType(event.getPlayer(), ChatColor.RED + localeService.get("PermissionGate") - , Objects.requireNonNull(messageService.getLanguage().getString("PermissionNeeded")).replaceAll("#permission#", "mf.gate"), true); + , Objects.requireNonNull(messageService.getLanguage().getString("PermissionNeeded")).replace("#permission#", "mf.gate"), true); } } } diff --git a/src/main/java/dansplugins/factionsystem/utils/ColorConversion.java b/src/main/java/dansplugins/factionsystem/utils/ColorConversion.java index 95e5666db..d6b3c6811 100644 --- a/src/main/java/dansplugins/factionsystem/utils/ColorConversion.java +++ b/src/main/java/dansplugins/factionsystem/utils/ColorConversion.java @@ -139,9 +139,9 @@ public String getColor() { public boolean equals(String in) { return name().equalsIgnoreCase(in) || - name().equalsIgnoreCase(in.replaceAll(" ", "_")) || + name().equalsIgnoreCase(in.replace(" ", "_")) || getColor().equalsIgnoreCase(in) || - getColor().equalsIgnoreCase(in.replaceAll(" ", "_")); + getColor().equalsIgnoreCase(in.replace(" ", "_")); } @Override diff --git a/src/main/java/dansplugins/factionsystem/utils/extended/Messenger.java b/src/main/java/dansplugins/factionsystem/utils/extended/Messenger.java index bb4e046a0..4061b42f1 100644 --- a/src/main/java/dansplugins/factionsystem/utils/extended/Messenger.java +++ b/src/main/java/dansplugins/factionsystem/utils/extended/Messenger.java @@ -55,17 +55,17 @@ public void sendFactionInfo(CommandSender sender, Faction faction, int power) { sender.sendMessage(ChatColor.AQUA + "----------\n"); } else { messageService.getLanguage().getStringList("FactionInfo").forEach(s -> { - s = s.replaceAll("#faction#", faction.getName()) - .replaceAll("#name#", faction.getName()) - .replaceAll("#owner#", uuidChecker.findPlayerNameBasedOnUUID(faction.getOwner())) - .replaceAll("#desc#", faction.getDescription()) - .replaceAll("#pplt#", String.valueOf(faction.getPopulation())) - .replaceAll("#aw#", faction.getAlliesSeparatedByCommas()) - .replaceAll("#aww#", faction.getEnemiesSeparatedByCommas()) - .replaceAll("#pl#", String.valueOf(faction.getCumulativePowerLevel())) - .replaceAll("#pl_max#", String.valueOf(faction.getMaximumCumulativePowerLevel())) - .replaceAll("#number#", String.valueOf(power)) - .replaceAll("#max#", String.valueOf(faction.getCumulativePowerLevel())); + s = s.replace("#faction#", faction.getName()) + .replace("#name#", faction.getName()) + .replace("#owner#", uuidChecker.findPlayerNameBasedOnUUID(faction.getOwner())) + .replace("#desc#", faction.getDescription()) + .replace("#pplt#", String.valueOf(faction.getPopulation())) + .replace("#aw#", faction.getAlliesSeparatedByCommas()) + .replace("#aww#", faction.getEnemiesSeparatedByCommas()) + .replace("#pl#", String.valueOf(faction.getCumulativePowerLevel())) + .replace("#pl_max#", String.valueOf(faction.getMaximumCumulativePowerLevel())) + .replace("#number#", String.valueOf(power)) + .replace("#max#", String.valueOf(faction.getCumulativePowerLevel())); playerService.sendMessageType(sender, "", s, true); }); } @@ -78,7 +78,7 @@ public void sendFactionInfo(CommandSender sender, Faction faction, int power) { private void sendBonusPowerInfo(Faction faction, CommandSender sender) { if (faction.getBonusPower() != 0) { playerService.sendMessageType(sender, ChatColor.AQUA + String.format(localeService.get("BonusPower"), faction.getBonusPower()) - , Objects.requireNonNull(messageService.getLanguage().getString("BonusPower")).replaceAll("BonusPower", String.valueOf(faction.getBonusPower())), true); + , Objects.requireNonNull(messageService.getLanguage().getString("BonusPower")).replace("BonusPower", String.valueOf(faction.getBonusPower())), true); } } @@ -87,10 +87,10 @@ private void sendLiegeInfoIfLiege(Faction faction, CommandSender sender) { if (faction.isLiege()) { if (!faction.isWeakened()) { playerService.sendMessageType(sender, ChatColor.AQUA + String.format(localeService.get("VassalContribution"), vassalContribution) + "\n" - , Objects.requireNonNull(messageService.getLanguage().getString("VassalContribution")).replaceAll("#amount#", String.valueOf(vassalContribution)), true); + , Objects.requireNonNull(messageService.getLanguage().getString("VassalContribution")).replace("#amount#", String.valueOf(vassalContribution)), true); } else { playerService.sendMessageType(sender, ChatColor.AQUA + String.format(localeService.get("VassalContribution"), 0) + "\n" - , Objects.requireNonNull(messageService.getLanguage().getString("VassalContribution")).replaceAll("#amount#", String.valueOf(0)), true); + , Objects.requireNonNull(messageService.getLanguage().getString("VassalContribution")).replace("#amount#", String.valueOf(0)), true); } } } @@ -104,7 +104,7 @@ private void sendFiefsInfo(Faction faction, CommandSender sender) { fiefsSeparatedByCommas.append(fief.getName()); } playerService.sendMessageType(sender, ChatColor.AQUA + String.format("Fiefs: %s", fiefsSeparatedByCommas) - , Objects.requireNonNull(messageService.getLanguage().getString("Fiefs")).replaceAll("#fiefs#", String.valueOf(fiefsSeparatedByCommas)), true); + , Objects.requireNonNull(messageService.getLanguage().getString("Fiefs")).replace("#fiefs#", String.valueOf(fiefsSeparatedByCommas)), true); } } } @@ -112,11 +112,11 @@ private void sendFiefsInfo(Faction faction, CommandSender sender) { private void sendLiegeInfoIfVassal(Faction faction, CommandSender sender) { if (faction.hasLiege()) { playerService.sendMessageType(sender, ChatColor.AQUA + String.format(localeService.get("Liege"), faction.getLiege()) + "\n" - , Objects.requireNonNull(messageService.getLanguage().getString("Liege")).replaceAll("#name#", faction.getLiege()), true); + , Objects.requireNonNull(messageService.getLanguage().getString("Liege")).replace("#name#", faction.getLiege()), true); } if (faction.isLiege()) { playerService.sendMessageType(sender, ChatColor.AQUA + String.format(localeService.get("Vassals"), faction.getVassalsSeparatedByCommas()) + "\n" - , Objects.requireNonNull(messageService.getLanguage().getString("Vassals")).replaceAll("#name#", faction.getVassalsSeparatedByCommas()), true); + , Objects.requireNonNull(messageService.getLanguage().getString("Vassals")).replace("#name#", faction.getVassalsSeparatedByCommas()), true); } } diff --git a/src/main/java/dansplugins/factionsystem/utils/extended/Scheduler.java b/src/main/java/dansplugins/factionsystem/utils/extended/Scheduler.java index 2b40c5387..4a24d7167 100644 --- a/src/main/java/dansplugins/factionsystem/utils/extended/Scheduler.java +++ b/src/main/java/dansplugins/factionsystem/utils/extended/Scheduler.java @@ -108,7 +108,7 @@ private boolean isFactionExceedingTheirDemesneLimit(Faction faction) { public void scheduleTeleport(Player player, Location destinationLocation) { final int teleport_delay = configService.getInt("teleportDelay"); playerService.sendMessageType(player, ChatColor.AQUA + "Teleporting in " + teleport_delay + " seconds..." - , Objects.requireNonNull(messageService.getLanguage().getString("Teleport")).replaceAll("#time#", String.valueOf(teleport_delay)), true); + , Objects.requireNonNull(messageService.getLanguage().getString("Teleport")).replace("#time#", String.valueOf(teleport_delay)), true); DelayedTeleportTask delayedTeleportTask = new DelayedTeleportTask(player, destinationLocation); delayedTeleportTask.runTaskLater(medievalFactions, (long) teleport_delay * getRandomNumberBetween(15, 25)); } From 99fded59f1444904c915c1b45eca03438ec7a02d Mon Sep 17 00:00:00 2001 From: dmccoystephenson Date: Fri, 26 Aug 2022 20:00:49 -0600 Subject: [PATCH 10/24] Removed any instantiations of the MedievalFactions class. --- .../factionsystem/commands/DisbandCommand.java | 6 ++++-- .../dansplugins/factionsystem/commands/DuelCommand.java | 2 +- .../dansplugins/factionsystem/commands/GateCommand.java | 2 +- .../dansplugins/factionsystem/commands/StatsCommand.java | 7 +++++-- .../factionsystem/services/CommandService.java | 8 ++++---- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/main/java/dansplugins/factionsystem/commands/DisbandCommand.java b/src/main/java/dansplugins/factionsystem/commands/DisbandCommand.java index cb49d7d77..060fbcb30 100644 --- a/src/main/java/dansplugins/factionsystem/commands/DisbandCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/DisbandCommand.java @@ -28,12 +28,14 @@ */ public class DisbandCommand extends SubCommand { private final Logger logger; + private final MedievalFactions medievalFactions; - public DisbandCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, Logger logger, PlayerService playerService, MessageService messageService) { + public DisbandCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, Logger logger, PlayerService playerService, MessageService messageService, MedievalFactions medievalFactions) { super(new String[]{ "disband", LOCALE_PREFIX + "CmdDisband" }, false, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); this.logger = logger; + this.medievalFactions = medievalFactions; } /** @@ -62,7 +64,7 @@ public void execute(CommandSender sender, String[] args, String key) { if (args.length == 0) { if (!checkPermissions(sender, "mf.disband")) return; if (!(sender instanceof Player)) { // ONLY Players can be in a Faction - if (!new MedievalFactions().USE_NEW_LANGUAGE_FILE) { + if (!medievalFactions.USE_NEW_LANGUAGE_FILE) { sender.sendMessage(translate(getText("OnlyPlayersCanUseCommand"))); } else { playerService.sendConsoleMessage(sender.getServer().getConsoleSender(), "OnlyPlayersCanUseCommand", true); diff --git a/src/main/java/dansplugins/factionsystem/commands/DuelCommand.java b/src/main/java/dansplugins/factionsystem/commands/DuelCommand.java index d08cf9170..c7b5dfa0b 100644 --- a/src/main/java/dansplugins/factionsystem/commands/DuelCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/DuelCommand.java @@ -147,7 +147,7 @@ public void execute(CommandSender sender, String[] args, String key) { } private void sendHelp(CommandSender sender) { - if (!new MedievalFactions().USE_NEW_LANGUAGE_FILE) { + if (!medievalFactions.USE_NEW_LANGUAGE_FILE) { sender.sendMessage("&b" + getText("SubCommands")); sender.sendMessage("&b" + getText("HelpDuelChallenge")); sender.sendMessage("&b" + getText("HelpDuelAccept")); diff --git a/src/main/java/dansplugins/factionsystem/commands/GateCommand.java b/src/main/java/dansplugins/factionsystem/commands/GateCommand.java index 52ab9321d..5c399b1ac 100644 --- a/src/main/java/dansplugins/factionsystem/commands/GateCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/GateCommand.java @@ -46,7 +46,7 @@ public GateCommand(LocaleService localeService, PersistentData persistentData, E public void execute(Player player, String[] args, String key) { if (!(checkPermissions(player, "mf.gate"))) return; if (args.length == 0) { - if (!new MedievalFactions().USE_NEW_LANGUAGE_FILE) { + if (!medievalFactions.USE_NEW_LANGUAGE_FILE) { player.sendMessage(translate("&b" + getText("SubCommands"))); player.sendMessage(translate("&b" + getText("HelpGateCreate"))); player.sendMessage(translate("&b" + getText("HelpGateName"))); diff --git a/src/main/java/dansplugins/factionsystem/commands/StatsCommand.java b/src/main/java/dansplugins/factionsystem/commands/StatsCommand.java index d8d249626..4206953d9 100644 --- a/src/main/java/dansplugins/factionsystem/commands/StatsCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/StatsCommand.java @@ -21,10 +21,13 @@ * @author Callum Johnson */ public class StatsCommand extends SubCommand { - public StatsCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService) { + private MedievalFactions medievalFactions; + + public StatsCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, PlayerService playerService, MessageService messageService, MedievalFactions medievalFactions) { super(new String[]{ "stats", LOCALE_PREFIX + "CmdStats" }, false, false, false, false, localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService); + this.medievalFactions = medievalFactions; } @Override @@ -34,7 +37,7 @@ public void execute(Player player, String[] args, String key) { @Override public void execute(CommandSender sender, String[] args, String key) { - if (!new MedievalFactions().USE_NEW_LANGUAGE_FILE) { + if (!medievalFactions.USE_NEW_LANGUAGE_FILE) { sender.sendMessage(ChatColor.AQUA + "=== Medieval Factions Stats ==="); sender.sendMessage(ChatColor.AQUA + "Number of factions: " + persistentData.getNumFactions()); } else { diff --git a/src/main/java/dansplugins/factionsystem/services/CommandService.java b/src/main/java/dansplugins/factionsystem/services/CommandService.java index 0e726f51e..0d06714ac 100644 --- a/src/main/java/dansplugins/factionsystem/services/CommandService.java +++ b/src/main/java/dansplugins/factionsystem/services/CommandService.java @@ -57,7 +57,7 @@ public CommandService(LocaleService localeService, MedievalFactions medievalFact new DeclareWarCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, warFactory, playerService, messageService), new DemoteCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), new DescCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), - new DisbandCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, logger, playerService, messageService), + new DisbandCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, logger, playerService, messageService, medievalFactions), new DuelCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, medievalFactions, playerService, messageService), new EditLawCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), new FlagsCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), @@ -73,7 +73,7 @@ public CommandService(LocaleService localeService, MedievalFactions medievalFact new JoinCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, logger, playerService, messageService), new KickCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, logger, playerService, messageService), new LawsCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), - new LeaveCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, logger, new DisbandCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, logger, playerService, messageService), playerService, messageService), + new LeaveCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, logger, new DisbandCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, logger, playerService, messageService, medievalFactions), playerService, messageService), new ListCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), new LockCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, relationChecker, playerService, messageService), new MakePeaceCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), @@ -95,7 +95,7 @@ public CommandService(LocaleService localeService, MedievalFactions medievalFact new VersionCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, medievalFactions, playerService, messageService), new WhoCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, messenger, playerService, messageService), new MapCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), - new StatsCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService) + new StatsCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService, medievalFactions) )); } @@ -108,7 +108,7 @@ public boolean interpretCommand(CommandSender sender, String label, String[] arg // send plugin information if (!medievalFactions.USE_NEW_LANGUAGE_FILE) { sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("MedievalFactionsTitle"), medievalFactions.getVersion())); - sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("DeveloperList"), new MedievalFactions().getDescription().getAuthors())); + sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("DeveloperList"), medievalFactions.getDescription().getAuthors())); sender.sendMessage(ChatColor.AQUA + localeService.get("WikiLink")); sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("CurrentLanguageID"), configService.getString("languageid"))); sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("SupportedLanguageIDList"), localeService.getSupportedLanguageIDsSeparatedByCommas())); From 7cc3bceb477074115bab7bcdf980d8cd4f945828 Mon Sep 17 00:00:00 2001 From: dmccoystephenson Date: Sat, 27 Aug 2022 10:14:07 -0600 Subject: [PATCH 11/24] Removed unnecessary method. --- .../java/dansplugins/factionsystem/MedievalFactions.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/java/dansplugins/factionsystem/MedievalFactions.java b/src/main/java/dansplugins/factionsystem/MedievalFactions.java index 229ca05ff..c51d33e66 100644 --- a/src/main/java/dansplugins/factionsystem/MedievalFactions.java +++ b/src/main/java/dansplugins/factionsystem/MedievalFactions.java @@ -61,10 +61,6 @@ public class MedievalFactions extends PonderBukkitPlugin { private final Scheduler scheduler = new Scheduler(logger, configService.getLocaleService(), this, persistentData, configService, playerTeleporter, playerService, messageService); private final CommandService commandService = new CommandService(configService.getLocaleService(), this, configService, persistentData, ephemeralData, persistentData.getChunkDataAccessor(), persistentData.getDynmapIntegrator(), warFactory, logger, scheduler, messenger, relationChecker, fiefsIntegrator, currenciesIntegrator, playerService, messageService); - public MedievalFactions getMedievalFactions() { - return medievalFactions; - } - public ConfigService getConfigService() { return configService; } @@ -74,7 +70,6 @@ public ConfigService getConfigService() { */ @Override public void onEnable() { - medievalFactions = this; initializeConfig(); messageService.createLanguageFile(); load(); From 2038989f0a243f69b2156d87eb074a5dfda001ac Mon Sep 17 00:00:00 2001 From: dmccoystephenson Date: Tue, 6 Sep 2022 23:08:53 -0600 Subject: [PATCH 12/24] Removed 'this' reference in the main class. --- .../java/dansplugins/factionsystem/MedievalFactions.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/dansplugins/factionsystem/MedievalFactions.java b/src/main/java/dansplugins/factionsystem/MedievalFactions.java index 72d655b47..13a3298ad 100644 --- a/src/main/java/dansplugins/factionsystem/MedievalFactions.java +++ b/src/main/java/dansplugins/factionsystem/MedievalFactions.java @@ -73,10 +73,10 @@ public void onEnable() { handleIntegrations(); makeSureEveryPlayerExperiencesPowerDecay(); - this.getCommand("mf").setTabCompleter(new TabCompleterBase(persistentData, configService)); - this.getCommand("f").setTabCompleter(new TabCompleterBase(persistentData, configService)); - this.getCommand("medievalfactions").setTabCompleter(new TabCompleterBase(persistentData, configService)); - this.getCommand("factions").setTabCompleter(new TabCompleterBase(persistentData, configService)); + getCommand("mf").setTabCompleter(new TabCompleterBase(persistentData, configService)); + getCommand("f").setTabCompleter(new TabCompleterBase(persistentData, configService)); + getCommand("medievalfactions").setTabCompleter(new TabCompleterBase(persistentData, configService)); + getCommand("factions").setTabCompleter(new TabCompleterBase(persistentData, configService)); } /** From 5940e0299b5df3963586523d2b5a1fc24efabc72 Mon Sep 17 00:00:00 2001 From: dmccoystephenson Date: Tue, 6 Sep 2022 23:23:44 -0600 Subject: [PATCH 13/24] Made fields private and modified formatting. --- .../commands/abs/TabCompleterBase.java | 350 ++++++------------ 1 file changed, 118 insertions(+), 232 deletions(-) diff --git a/src/main/java/dansplugins/factionsystem/commands/abs/TabCompleterBase.java b/src/main/java/dansplugins/factionsystem/commands/abs/TabCompleterBase.java index f4494d301..4953748f1 100644 --- a/src/main/java/dansplugins/factionsystem/commands/abs/TabCompleterBase.java +++ b/src/main/java/dansplugins/factionsystem/commands/abs/TabCompleterBase.java @@ -18,14 +18,14 @@ import javax.annotation.Nullable; public class TabCompleterBase implements TabCompleter { + private PersistentData persistentData; + private ConfigService configService; - PersistentData persistentData; - ConfigService configService; - public TabCompleterBase(PersistentData persistentData, ConfigService configService) - { + public TabCompleterBase(PersistentData persistentData, ConfigService configService) { this.persistentData = persistentData; this.configService = configService; } + public List getOnlinePlayers(String partialName) { return filterStartingWith(partialName, Bukkit.getOnlinePlayers().stream().map(OfflinePlayer::getName)); } @@ -47,11 +47,9 @@ public List filterStartingWith(String prefix, Collection strings return filterStartingWith(prefix, strings.stream()); } - public List tackOnBeginningAndEndQuotes(List targetedList) - { + public List tackOnBeginningAndEndQuotes(List targetedList) { final List changed = new ArrayList<>(); - for(String string : targetedList) - { + for(String string : targetedList) { String changedString = '"' + string + '"'; changed.add(changedString); } @@ -59,16 +57,14 @@ public List tackOnBeginningAndEndQuotes(List targetedList) return changed; } - public String removeBeginningAndEndQuotes(String targetedString) - { + public String removeBeginningAndEndQuotes(String targetedString) { return targetedString.replace("\"", ""); } List argsLength1 = new ArrayList(); @Override - public List onTabComplete(CommandSender sender, Command command, String alias, String[] args) - { + public List onTabComplete(CommandSender sender, Command command, String alias, String[] args) { final List factionsAllowedtoAlly = new ArrayList<>(); final List factionsAllowedtoWar = new ArrayList<>(); final List officersInFaction = new ArrayList<>(); @@ -76,11 +72,9 @@ public List onTabComplete(CommandSender sender, Command command, String final List factionNames = new ArrayList<>(); List result = new ArrayList(); - if(sender instanceof Player) - { + if (sender instanceof Player) { Player player = (Player) sender; - if(argsLength1.isEmpty()) - { + if (argsLength1.isEmpty()) { argsLength1.addAll(Arrays.asList( "addlaw", "ally", @@ -138,221 +132,166 @@ public List onTabComplete(CommandSender sender, Command command, String )); } - if(args.length == 1) - { - for(String a : argsLength1) - { - if(a.toLowerCase().startsWith(args[0].toLowerCase())) - { + if (args.length == 1) { + for(String a : argsLength1) { + if (a.toLowerCase().startsWith(args[0].toLowerCase())) { result.add(a); } } return result; } - if(args.length == 2) - { - if(args[0].equalsIgnoreCase("ally")) - { - if(persistentData.isInFaction(player.getUniqueId())) - { + if (args.length == 2) { + if (args[0].equalsIgnoreCase("ally")) { + if (persistentData.isInFaction(player.getUniqueId())) { Faction playerFaction = persistentData.getPlayersFaction(player.getUniqueId()); ArrayList playerAllies = playerFaction.getAllies(); - for(Faction faction : persistentData.getFactions()) - { - if(!playerAllies.contains(faction.getName()) && !faction.getName().equals(playerFaction.getName())) - { + for(Faction faction : persistentData.getFactions()) { + if(!playerAllies.contains(faction.getName()) && !faction.getName().equals(playerFaction.getName())) { factionsAllowedtoAlly.add(faction.getName()); } } return filterStartingWith(args[1], factionsAllowedtoAlly); } } - if(args[0].equalsIgnoreCase("breakalliance")) - { - if(persistentData.isInFaction(player.getUniqueId())) - { + if (args[0].equalsIgnoreCase("breakalliance")) { + if (persistentData.isInFaction(player.getUniqueId())) { Faction playerFaction = persistentData.getPlayersFaction(player.getUniqueId()); return filterStartingWith(args[1], playerFaction.getAllies()); } } - if(args[0].equalsIgnoreCase("checkaccess")) - { + if (args[0].equalsIgnoreCase("checkaccess")) { return filterStartingWith(args[1], Collections.singletonList("cancel")); } - if(args[0].equalsIgnoreCase("config") && sender.hasPermission("mf.admin") || args[0].equalsIgnoreCase("config") && sender.hasPermission("mf.config")) - { + if (args[0].equalsIgnoreCase("config") && sender.hasPermission("mf.admin") || args[0].equalsIgnoreCase("config") && sender.hasPermission("mf.config")) { return filterStartingWith(args[1], Arrays.asList("get", "show", "set")); } - if(args[0].equalsIgnoreCase("declarewar")) - { - if(persistentData.isInFaction(player.getUniqueId())) - { + if (args[0].equalsIgnoreCase("declarewar")) { + if(persistentData.isInFaction(player.getUniqueId())) { Faction playerFaction = persistentData.getPlayersFaction(player.getUniqueId()); ArrayList playerEnemies = playerFaction.getEnemyFactions(); ArrayList playerAllies = playerFaction.getAllies(); - for(Faction faction : persistentData.getFactions()) - { + for(Faction faction : persistentData.getFactions()) { // If the faction is not an ally and they are not already enemied to them - if(!playerAllies.contains(faction.getName()) && !playerEnemies.contains(faction.getName()) && !faction.getName().equalsIgnoreCase(playerFaction.getName())) - { + if(!playerAllies.contains(faction.getName()) && !playerEnemies.contains(faction.getName()) && !faction.getName().equalsIgnoreCase(playerFaction.getName())) { factionsAllowedtoWar.add(faction.getName()); } } return filterStartingWith(args[1], tackOnBeginningAndEndQuotes(factionsAllowedtoWar)); } } - if(args[0].equalsIgnoreCase("demote")) - { - if(persistentData.isInFaction(player.getUniqueId())) - { + if (args[0].equalsIgnoreCase("demote")) { + if (persistentData.isInFaction(player.getUniqueId())) { Faction playerFaction = persistentData.getPlayersFaction(player.getUniqueId()); - for(UUID uuid : playerFaction.getOfficerList()) - { + for (UUID uuid : playerFaction.getOfficerList()) { Player officer = Bukkit.getPlayer(uuid); - if(officer != null) - { + if (officer != null) { officersInFaction.add(officer.getName()); } } return filterStartingWith(args[1], officersInFaction); } } - if(args[0].equalsIgnoreCase("disband")) - { - if(sender.hasPermission("mf.admin") || sender.hasPermission("mf.disband.others")) - { + if (args[0].equalsIgnoreCase("disband")) { + if (sender.hasPermission("mf.admin") || sender.hasPermission("mf.disband.others")) { persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); return filterStartingWith(args[1], factionNames); } } - if(args[0].equalsIgnoreCase("duel")) - { + if (args[0].equalsIgnoreCase("duel")) { return filterStartingWith(args[1], Arrays.asList("challenge", "accept", "cancel")); } - if(args[0].equalsIgnoreCase("editlaw")) - { - if(persistentData.isInFaction(player.getUniqueId())) - { + if (args[0].equalsIgnoreCase("editlaw")) { + if (persistentData.isInFaction(player.getUniqueId())) { Faction playerFaction = persistentData.getPlayersFaction(player.getUniqueId()); - if(playerFaction.getNumLaws() != 0) - { + if (playerFaction.getNumLaws() != 0) { ArrayList numbers = new ArrayList<>(); - for(int i = 1; i < playerFaction.getNumLaws() + 1; i++) - { + for (int i = 1; i < playerFaction.getNumLaws() + 1; i++) { numbers.add(Integer.toString(i)); } return filterStartingWith(args[1], numbers); } } } - if(args[0].equalsIgnoreCase("flags")) - { + if (args[0].equalsIgnoreCase("flags")) { return filterStartingWith(args[1], Arrays.asList("set", "show")); } - if(args[0].equalsIgnoreCase("force")) - { - if(sender.hasPermission("mf.force.*")) // /mf force - { + if (args[0].equalsIgnoreCase("force")) { + if(sender.hasPermission("mf.force.*")) { return filterStartingWith(args[1], Arrays.asList("save", "load", "peace", "demote", "join", "kick", "power", "renounce", "transfer", "removevassal", "rename", "bonuspower", "unlock", "create", "claim", "flag")); } } - if(args[0].equalsIgnoreCase("gate")) - { + if (args[0].equalsIgnoreCase("gate")) { return filterStartingWith(args[1], Arrays.asList("create", "name", "list", "remove", "cancel")); } - if(args[0].equalsIgnoreCase("grantaccess")) - { + if (args[0].equalsIgnoreCase("grantaccess")) { return filterStartingWith(args[1], getOnlinePlayers(args[1])); } - if(args[0].equalsIgnoreCase("grantindependence")) - { - if(persistentData.isInFaction(player.getUniqueId())) - { + if (args[0].equalsIgnoreCase("grantindependence")) { + if(persistentData.isInFaction(player.getUniqueId())) { Faction faction = persistentData.getPlayersFaction(player.getUniqueId()); return filterStartingWith(args[1], faction.getVassals()); } } - if(args[0].equalsIgnoreCase("help")) - { + if (args[0].equalsIgnoreCase("help")) { return filterStartingWith(args[1], IntStream.range(1, 7).mapToObj(String::valueOf)); } - if(args[0].equalsIgnoreCase("info")) - { + if (args[0].equalsIgnoreCase("info")) { persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); return filterStartingWith(args[1], factionNames); } - if(args[0].equalsIgnoreCase("invite")) - { + if (args[0].equalsIgnoreCase("invite")) { return filterStartingWith(args[1], getOnlinePlayers(args[1])); } - if(args[0].equalsIgnoreCase("invoke")) - { - if(persistentData.isInFaction(player.getUniqueId())) - { + if (args[0].equalsIgnoreCase("invoke")) { + if (persistentData.isInFaction(player.getUniqueId())) { Faction faction = persistentData.getPlayersFaction(player.getUniqueId()); ArrayList allies = faction.getAllies(); return filterStartingWith(args[1], tackOnBeginningAndEndQuotes(allies)); } } - if(args[0].equalsIgnoreCase("invite")) - { + if (args[0].equalsIgnoreCase("invite")) { return filterStartingWith(args[1], getOnlinePlayers(args[1])); } - if(args[0].equalsIgnoreCase("join")) - { + if (args[0].equalsIgnoreCase("join")) { persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); return filterStartingWith(args[1], factionNames); } - if(args[0].equalsIgnoreCase("kick")) - { - if(persistentData.isInFaction(player.getUniqueId())) - { + if (args[0].equalsIgnoreCase("kick")) { + if (persistentData.isInFaction(player.getUniqueId())) { Faction faction = persistentData.getPlayersFaction(player.getUniqueId()); - for(UUID uuid : faction.getMemberList()) - { + for (UUID uuid : faction.getMemberList()) { Player member = Bukkit.getPlayer(uuid); - if(member != null) - { + if (member != null) { membersInFaction.add(member.getName()); } } return filterStartingWith(args[1], membersInFaction); } } - if(args[0].equalsIgnoreCase("lock")) - { + if (args[0].equalsIgnoreCase("lock")) { return filterStartingWith(args[1], Collections.singletonList("cancel")); } - if(args[0].equalsIgnoreCase("makepeace")) - { - if(persistentData.isInFaction(player.getUniqueId())) - { + if (args[0].equalsIgnoreCase("makepeace")) { + if (persistentData.isInFaction(player.getUniqueId())) { Faction faction = persistentData.getPlayersFaction(player.getUniqueId()); ArrayList enemies = faction.getEnemyFactions(); return filterStartingWith(args[1], tackOnBeginningAndEndQuotes(enemies)); } } - if(args[0].equalsIgnoreCase("members")) - { + if (args[0].equalsIgnoreCase("members")) { persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); return filterStartingWith(args[1], factionNames); } - if(args[0].equalsIgnoreCase("power")) - { + if (args[0].equalsIgnoreCase("power")) { return filterStartingWith(args[1], getOnlinePlayers(args[1])); } - if(args[0].equalsIgnoreCase("promote")) - { - if(persistentData.isInFaction(player.getUniqueId())) - { + if (args[0].equalsIgnoreCase("promote")) { + if (persistentData.isInFaction(player.getUniqueId())) { Faction faction = persistentData.getPlayersFaction(player.getUniqueId()); - for(UUID uuid : faction.getMemberList()) - { + for (UUID uuid : faction.getMemberList()) { Player member = Bukkit.getPlayer(uuid); - if(member != null) - { - if(!faction.getOfficerList().contains(uuid)) - { + if (member != null) { + if (!faction.getOfficerList().contains(uuid)) { membersInFaction.add(member.getName()); } } @@ -360,183 +299,139 @@ public List onTabComplete(CommandSender sender, Command command, String return filterStartingWith(args[1], membersInFaction); } } - if(args[0].equalsIgnoreCase("removelaw")) - { - if(persistentData.isInFaction(player.getUniqueId())) - { + if (args[0].equalsIgnoreCase("removelaw")) { + if (persistentData.isInFaction(player.getUniqueId())) { Faction playerFaction = persistentData.getPlayersFaction(player.getUniqueId()); - if(playerFaction.getNumLaws() != 0) - { + if (playerFaction.getNumLaws() != 0) { ArrayList numbers = new ArrayList<>(); - for(int i = 1; i < playerFaction.getNumLaws() + 1; i++) - { + for (int i = 1; i < playerFaction.getNumLaws() + 1; i++) { numbers.add(Integer.toString(i)); } return filterStartingWith(args[1], numbers); } } } - if(args[0].equalsIgnoreCase("revokeaccess")) - { + if (args[0].equalsIgnoreCase("revokeaccess")) { List addCancelString = getOnlinePlayers(args[1]); addCancelString.add("cancel"); return filterStartingWith(args[1], addCancelString); } - if(args[0].equalsIgnoreCase("swearfealty")) - { + if (args[0].equalsIgnoreCase("swearfealty")) { persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); return filterStartingWith(args[1], factionNames); } - if(args[0].equalsIgnoreCase("transfer")) - { - if(persistentData.isInFaction(player.getUniqueId())) - { + if (args[0].equalsIgnoreCase("transfer")) { + if (persistentData.isInFaction(player.getUniqueId())) { Faction faction = persistentData.getPlayersFaction(player.getUniqueId()); - for(UUID uuid : faction.getMemberList()) - { + for (UUID uuid : faction.getMemberList()) { Player member = Bukkit.getPlayer(uuid); - if(member != null) - { + if (member != null) { membersInFaction.add(member.getName()); } } return filterStartingWith(args[1], membersInFaction); } } - if(args[0].equalsIgnoreCase("unlock")) - { + if (args[0].equalsIgnoreCase("unlock")) { return filterStartingWith(args[1], Collections.singletonList("cancel")); } - if(args[0].equalsIgnoreCase("vassalize")) - { - if(persistentData.isInFaction(player.getUniqueId())) - { + if (args[0].equalsIgnoreCase("vassalize")) { + if (persistentData.isInFaction(player.getUniqueId())) { Faction playerFaction = persistentData.getPlayersFaction(player.getUniqueId()); ArrayList vassalizeableFactions = new ArrayList<>(); - for(Faction faction : persistentData.getFactions()) - { - if(!playerFaction.getVassals().contains(faction.getName())) - { + for (Faction faction : persistentData.getFactions()) { + if (!playerFaction.getVassals().contains(faction.getName())) { vassalizeableFactions.add(faction.getName()); } } return filterStartingWith(args[1], vassalizeableFactions); } } - if(args[0].equalsIgnoreCase("who")) - { + if (args[0].equalsIgnoreCase("who")) { return filterStartingWith(args[1], getOnlinePlayers(args[1])); } } - if(args.length == 3) - { - if(args[0].equalsIgnoreCase("config") && sender.hasPermission("mf.admin") || args[0].equalsIgnoreCase("config") && sender.hasPermission("mf.config")) - { - if(args[1].equalsIgnoreCase("show")) - { + if (args.length == 3) { + if (args[0].equalsIgnoreCase("config") && sender.hasPermission("mf.admin") || args[0].equalsIgnoreCase("config") && sender.hasPermission("mf.config")) { + if (args[1].equalsIgnoreCase("show")) { return filterStartingWith(args[2], Arrays.asList("1", "2")); } - if(args[1].equalsIgnoreCase("get")) - { + if (args[1].equalsIgnoreCase("get")) { return filterStartingWith(args[2], Arrays.asList("1", "2")); } - if(args[1].equalsIgnoreCase("set")) - { + if (args[1].equalsIgnoreCase("set")) { return filterStartingWith(args[2], configService.getStringConfigOptions()); } } - if(args[0].equalsIgnoreCase("duel")) - { - if(args[1].equalsIgnoreCase("challenge")) - { + if (args[0].equalsIgnoreCase("duel")) { + if (args[1].equalsIgnoreCase("challenge")) { return filterStartingWith(args[2], getOnlinePlayers(args[2])); } } - if(args[0].equalsIgnoreCase("flags")) - { - if(args[1].equalsIgnoreCase("set")) - { - if(persistentData.isInFaction(player.getUniqueId())) - { + if (args[0].equalsIgnoreCase("flags")) { + if (args[1].equalsIgnoreCase("set")) { + if (persistentData.isInFaction(player.getUniqueId())) { Faction faction = persistentData.getPlayersFaction(player.getUniqueId()); return filterStartingWith(args[2], faction.getFlags().getFlagNamesList()); } } } - if(args[0].equalsIgnoreCase("force")) - { - if(args[1].equalsIgnoreCase("peace")) - { + if (args[0].equalsIgnoreCase("force")) { + if (args[1].equalsIgnoreCase("peace")) { persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); return filterStartingWith(args[2], tackOnBeginningAndEndQuotes(factionNames)); } - if(args[1].equalsIgnoreCase("demote")) - { + if (args[1].equalsIgnoreCase("demote")) { return filterStartingWith(args[2], getOnlinePlayers(args[2])); } - if(args[1].equalsIgnoreCase("join")) - { + if (args[1].equalsIgnoreCase("join")) { return filterStartingWith(args[2], tackOnBeginningAndEndQuotes(getOnlinePlayers(args[2]))); } - if(args[1].equalsIgnoreCase("kick")) - { + if (args[1].equalsIgnoreCase("kick")) { return filterStartingWith(args[2], getOnlinePlayers(args[2])); } - if(args[1].equalsIgnoreCase("power")) - { + if (args[1].equalsIgnoreCase("power")) { return filterStartingWith(args[2], tackOnBeginningAndEndQuotes(getOnlinePlayers(args[2]))); } - if(args[1].equalsIgnoreCase("renounce")) - { - if(persistentData.isInFaction(player.getUniqueId())) - { + if (args[1].equalsIgnoreCase("renounce")) { + if (persistentData.isInFaction(player.getUniqueId())) { persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); return filterStartingWith(args[2], tackOnBeginningAndEndQuotes(factionNames)); } } - if(args[1].equalsIgnoreCase("transfer")) - { - if(persistentData.isInFaction(player.getUniqueId())) - { + if (args[1].equalsIgnoreCase("transfer")) { + if (persistentData.isInFaction(player.getUniqueId())) { persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); return filterStartingWith(args[2], tackOnBeginningAndEndQuotes(factionNames)); } } - if(args[1].equalsIgnoreCase("removevassal")) - { + if (args[1].equalsIgnoreCase("removevassal")) { persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); return filterStartingWith(args[2], tackOnBeginningAndEndQuotes(factionNames)); } - if(args[1].equalsIgnoreCase("rename")) - { + if (args[1].equalsIgnoreCase("rename")) { persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); return filterStartingWith(args[2], tackOnBeginningAndEndQuotes(factionNames)); } - if(args[1].equalsIgnoreCase("bonuspower")) - { + if (args[1].equalsIgnoreCase("bonuspower")) { persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); return filterStartingWith(args[2], tackOnBeginningAndEndQuotes(factionNames)); } - if(args[1].equalsIgnoreCase("unlock")) - { + if (args[1].equalsIgnoreCase("unlock")) { return filterStartingWith(args[2], Collections.singletonList("cancel")); } - if(args[1].equalsIgnoreCase("claim")) - { + if (args[1].equalsIgnoreCase("claim")) { persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); return filterStartingWith(args[2], tackOnBeginningAndEndQuotes(factionNames)); } - if(args[1].equalsIgnoreCase("flag")) - { + if (args[1].equalsIgnoreCase("flag")) { persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); return filterStartingWith(args[2], tackOnBeginningAndEndQuotes(factionNames)); } } - if(args[0].equalsIgnoreCase("invoke")) - { - if(persistentData.isInFaction(player.getUniqueId())) - { + if (args[0].equalsIgnoreCase("invoke")) { + if (persistentData.isInFaction(player.getUniqueId())) { Faction faction = persistentData.getPlayersFaction(player.getUniqueId()); ArrayList enemies = faction.getEnemyFactions(); return filterStartingWith(args[1], tackOnBeginningAndEndQuotes(enemies)); @@ -544,37 +439,28 @@ public List onTabComplete(CommandSender sender, Command command, String } } - if(args.length == 4) - { - if(args[0].equalsIgnoreCase("force")) - { - if(args[1].equalsIgnoreCase("peace")) - { + if (args.length == 4) { + if (args[0].equalsIgnoreCase("force")) { + if (args[1].equalsIgnoreCase("peace")) { persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); return filterStartingWith(args[3], tackOnBeginningAndEndQuotes(factionNames)); } - if(args[1].equalsIgnoreCase("join")) - { + if (args[1].equalsIgnoreCase("join")) { persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); return filterStartingWith(args[3], tackOnBeginningAndEndQuotes(factionNames)); } - if(args[1].equalsIgnoreCase("transfer")) - { + if (args[1].equalsIgnoreCase("transfer")) { persistentData.getFactions().forEach(faction1 -> factionNames.add(faction1.getName())); return filterStartingWith(args[3], tackOnBeginningAndEndQuotes(getOnlinePlayers(args[2]))); } - if(args[1].equalsIgnoreCase("removevassal")) - { - if(persistentData.getFaction(removeBeginningAndEndQuotes(args[2])) != null) - { + if (args[1].equalsIgnoreCase("removevassal")) { + if(persistentData.getFaction(removeBeginningAndEndQuotes(args[2])) != null) { Faction faction = persistentData.getFaction(removeBeginningAndEndQuotes(args[2])); return filterStartingWith(args[3], tackOnBeginningAndEndQuotes(faction.getVassals())); } } - if(args[1].equalsIgnoreCase("flag")) - { - if(persistentData.getFaction(removeBeginningAndEndQuotes(args[2])) != null) - { + if (args[1].equalsIgnoreCase("flag")) { + if (persistentData.getFaction(removeBeginningAndEndQuotes(args[2])) != null) { Faction faction = persistentData.getFaction(removeBeginningAndEndQuotes(args[2])); return filterStartingWith(args[3], faction.getFlags().getFlagNamesList()); } From 2ab500f1456b61f4614806e606d931cd499097c0 Mon Sep 17 00:00:00 2001 From: dmccoystephenson Date: Wed, 7 Sep 2022 22:42:26 -0600 Subject: [PATCH 14/24] Removed an unnecessary cast. --- .../factionsystem/commands/abs/TabCompleterBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/dansplugins/factionsystem/commands/abs/TabCompleterBase.java b/src/main/java/dansplugins/factionsystem/commands/abs/TabCompleterBase.java index 4953748f1..cea045709 100644 --- a/src/main/java/dansplugins/factionsystem/commands/abs/TabCompleterBase.java +++ b/src/main/java/dansplugins/factionsystem/commands/abs/TabCompleterBase.java @@ -38,7 +38,7 @@ public String joinArgsBeyond(int index, String delim, String[] args) { } public List filterStartingWith(String prefix, Stream stream) { - return (List)stream.filter((s) -> { + return stream.filter((s) -> { return s != null && !s.isEmpty() && s.toLowerCase().startsWith(prefix.toLowerCase()); }).collect(Collectors.toList()); } From 1f7af3108bc4161f9ecedafb1522605ed2f39de0 Mon Sep 17 00:00:00 2001 From: Jack Caycedo <85153425+jackcayc924@users.noreply.github.com> Date: Wed, 7 Sep 2022 23:32:59 -0700 Subject: [PATCH 15/24] TabCompletion Tab completion work --- .../factionsystem/MedievalFactions.java | 2 +- .../commands/abs/TabCompleterBase.java | 28 ++++++---- .../objects/helper/FactionFlags.java | 5 ++ .../factionsystem/services/ConfigService.java | 52 +++++++++++++++++++ .../services/MessageService.java | 4 +- 5 files changed, 78 insertions(+), 13 deletions(-) diff --git a/src/main/java/dansplugins/factionsystem/MedievalFactions.java b/src/main/java/dansplugins/factionsystem/MedievalFactions.java index 8ca8632bd..b9be58b00 100644 --- a/src/main/java/dansplugins/factionsystem/MedievalFactions.java +++ b/src/main/java/dansplugins/factionsystem/MedievalFactions.java @@ -51,7 +51,7 @@ public class MedievalFactions extends PonderBukkitPlugin { private final PlayerTeleporter playerTeleporter = new PlayerTeleporter(logger); private final TerritoryOwnerNotifier territoryOwnerNotifier = new TerritoryOwnerNotifier(configService.getLocaleService(), configService, actionBarService); public boolean USE_NEW_LANGUAGE_FILE = configService.getBoolean("useNewLanguageFile"); - private MedievalFactions medievalFactions; + private MedievalFactions medievalFactions = this; private final MessageService messageService = new MessageService(medievalFactions); private final PlayerService playerService = new PlayerService(medievalFactions, messageService); private final Messenger messenger = new Messenger(configService.getLocaleService(), fiefsIntegrator, playerService, messageService, medievalFactions); diff --git a/src/main/java/dansplugins/factionsystem/commands/abs/TabCompleterBase.java b/src/main/java/dansplugins/factionsystem/commands/abs/TabCompleterBase.java index cea045709..50f9c7138 100644 --- a/src/main/java/dansplugins/factionsystem/commands/abs/TabCompleterBase.java +++ b/src/main/java/dansplugins/factionsystem/commands/abs/TabCompleterBase.java @@ -85,7 +85,6 @@ public List onTabComplete(CommandSender sender, Command command, String "checkaccess", "checkclaim", "claim", - "config", "create", "declareindependence", "declarewar", @@ -117,7 +116,7 @@ public List onTabComplete(CommandSender sender, Command command, String "prefix", "promote", "removelaw", - "rename", // here I intentionally left out resetpowerlevels, since its an important command you wouldn't want to accidentally use. + "rename", "revokeaccess", "sethome", "stats", @@ -126,16 +125,22 @@ public List onTabComplete(CommandSender sender, Command command, String "unclaimall", "unclaim", "unlock", - "vassalize", - "version", - "" - + "vassalize" )); } if (args.length == 1) { - for(String a : argsLength1) { - if (a.toLowerCase().startsWith(args[0].toLowerCase())) { - result.add(a); + if(player.isOp()) { + argsLength1.addAll(Arrays.asList("config", "resetpowerlevels", "version", "bypass")); + for(String a : argsLength1) { + if(a.toLowerCase().startsWith(args[0].toLowerCase())) { + result.add(a); + } + } + } else { + for(String a : argsLength1) { + if(a.toLowerCase().startsWith(args[0].toLowerCase())) { + result.add(a); + } } } return result; @@ -275,7 +280,7 @@ public List onTabComplete(CommandSender sender, Command command, String if (persistentData.isInFaction(player.getUniqueId())) { Faction faction = persistentData.getPlayersFaction(player.getUniqueId()); ArrayList enemies = faction.getEnemyFactions(); - return filterStartingWith(args[1], tackOnBeginningAndEndQuotes(enemies)); + return filterStartingWith(args[1], enemies); } } if (args[0].equalsIgnoreCase("members")) { @@ -350,6 +355,7 @@ public List onTabComplete(CommandSender sender, Command command, String if (args[0].equalsIgnoreCase("who")) { return filterStartingWith(args[1], getOnlinePlayers(args[1])); } + return null; } if (args.length == 3) { @@ -437,6 +443,7 @@ public List onTabComplete(CommandSender sender, Command command, String return filterStartingWith(args[1], tackOnBeginningAndEndQuotes(enemies)); } } + return null; } if (args.length == 4) { @@ -466,6 +473,7 @@ public List onTabComplete(CommandSender sender, Command command, String } } } + return null; } } diff --git a/src/main/java/dansplugins/factionsystem/objects/helper/FactionFlags.java b/src/main/java/dansplugins/factionsystem/objects/helper/FactionFlags.java index 3b59d4bc0..59762f0cc 100644 --- a/src/main/java/dansplugins/factionsystem/objects/helper/FactionFlags.java +++ b/src/main/java/dansplugins/factionsystem/objects/helper/FactionFlags.java @@ -123,6 +123,11 @@ public void loadMissingFlagsIfNecessary() { } } + public ArrayList getFlagNamesList() + { + return flagNames; + } + public void sendFlagList(Player player) { player.sendMessage(ChatColor.AQUA + "" + getFlagsSeparatedByCommas()); } diff --git a/src/main/java/dansplugins/factionsystem/services/ConfigService.java b/src/main/java/dansplugins/factionsystem/services/ConfigService.java index 1e20ab347..1b2673f65 100644 --- a/src/main/java/dansplugins/factionsystem/services/ConfigService.java +++ b/src/main/java/dansplugins/factionsystem/services/ConfigService.java @@ -9,6 +9,9 @@ import org.bukkit.command.CommandSender; import org.bukkit.configuration.file.FileConfiguration; +import java.util.ArrayList; +import java.util.Collections; + /** * @author Daniel McCoy Stephenson */ @@ -368,6 +371,55 @@ public void sendPageTwoOfConfigList(CommandSender sender) { + ", teleportDelay: " + getInt("teleportDelay")); } + public ArrayList getStringConfigOptions() + { + final ArrayList configOptions = new ArrayList<>(); + Collections.addAll(configOptions, + "initialMaxPowerLevel", + "initialPowerLevel", + "powerIncreaseAmount", + "minutesBeforeInitialPowerIncrease", + "minutesBetweenPowerIncreases", + "officerLimit", + "officerPerMemberCount", + "minutesBetweenPowerDecreases", + "minutesBeforePowerDecrease", + "powerDecreaseAmount", + "factionMaxNameLength", + "factionMaxNumberGates", + "factionMaxGateArea", + "maxClaimRadius", + "teleportDelay", + "mobsSpawnInFactionTerritory", + "laddersPlaceableInEnemyFactionTerritory", + "warsRequiredForPVP", + "powerDecreases", + "surroundedChunksProtected", + "zeroPowerFactionsGetDisbanded", + "nonMembersCanInteractWithDoors", + "playersChatWithPrefixes", + "chatSharedInVassalageTrees", + "allowAllyInteraction", + "allowVassalageTreeInteraction", + "territoryAlertPopUp", + "territoryIndicatorActionbar", + "randomFactionAssignment", + "allowNeutrality", + "showPrefixesInFactionChat", + "debugMode", + "factionProtectionsEnabled", + "limitLand", + "factionsCanSetPrefixColors", + "playersLosePowerOnDeath", + "bonusPowerEnabled", + "factionOwnerMultiplier", + "factionOfficerMultiplier", + "vassalContributionPercentageMultiplier", + "powerLostOnDeath", + "powerGainedOnKill"); + return configOptions; + } + public boolean hasBeenAltered() { return altered; } diff --git a/src/main/java/dansplugins/factionsystem/services/MessageService.java b/src/main/java/dansplugins/factionsystem/services/MessageService.java index 8e9472726..5943f634b 100644 --- a/src/main/java/dansplugins/factionsystem/services/MessageService.java +++ b/src/main/java/dansplugins/factionsystem/services/MessageService.java @@ -20,8 +20,8 @@ public MessageService(MedievalFactions medievalFactions) { } public void createLanguageFile() { - languageFile = new File(medievalFactions.getMedievalFactions().getDataFolder(), "language.yml"); - if (!languageFile.exists()) medievalFactions.getMedievalFactions().saveResource("language.yml", false); + languageFile = new File(medievalFactions.getDataFolder(), "language.yml"); + if (!languageFile.exists()) medievalFactions.saveResource("language.yml", false); language = new YamlConfiguration(); try { From 1b0daaa8eea302eebc179200b7917ce3192ec76e Mon Sep 17 00:00:00 2001 From: dmccoystephenson Date: Thu, 8 Sep 2022 07:09:46 -0600 Subject: [PATCH 16/24] Removed unnecessary field. --- .../java/dansplugins/factionsystem/MedievalFactions.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/dansplugins/factionsystem/MedievalFactions.java b/src/main/java/dansplugins/factionsystem/MedievalFactions.java index b9be58b00..e6b403b67 100644 --- a/src/main/java/dansplugins/factionsystem/MedievalFactions.java +++ b/src/main/java/dansplugins/factionsystem/MedievalFactions.java @@ -51,10 +51,9 @@ public class MedievalFactions extends PonderBukkitPlugin { private final PlayerTeleporter playerTeleporter = new PlayerTeleporter(logger); private final TerritoryOwnerNotifier territoryOwnerNotifier = new TerritoryOwnerNotifier(configService.getLocaleService(), configService, actionBarService); public boolean USE_NEW_LANGUAGE_FILE = configService.getBoolean("useNewLanguageFile"); - private MedievalFactions medievalFactions = this; - private final MessageService messageService = new MessageService(medievalFactions); - private final PlayerService playerService = new PlayerService(medievalFactions, messageService); - private final Messenger messenger = new Messenger(configService.getLocaleService(), fiefsIntegrator, playerService, messageService, medievalFactions); + private final MessageService messageService = new MessageService(this); + private final PlayerService playerService = new PlayerService(this, messageService); + private final Messenger messenger = new Messenger(configService.getLocaleService(), fiefsIntegrator, playerService, messageService, this); private final PersistentData persistentData = new PersistentData(configService.getLocaleService(), configService, this, messenger, ephemeralData, logger, fiefsIntegrator, currenciesIntegrator, playerService, messageService); private final WarFactory warFactory = new WarFactory(persistentData); private final RelationChecker relationChecker = new RelationChecker(persistentData); From c0643ea82ed8a01f397d4f40b711c7e6da5998e3 Mon Sep 17 00:00:00 2001 From: dmccoystephenson Date: Thu, 8 Sep 2022 07:13:09 -0600 Subject: [PATCH 17/24] Added author information to the README. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 837885117..3178ed6ac 100644 --- a/README.md +++ b/README.md @@ -59,6 +59,8 @@ GoodLucky777 | Fixed a bug and a few typos in the code Elafir | Made it possible to control gates with redstone [Deej](https://github.com/Mr-Deej) | Added checks to several commands VoChiDanh | Refactored parts the PersistentData class in an attempt to resolve java compatibility issues +alyphen | Transitioned the project from using maven to gradle. +[JackAttack924](https://github.com/jackcayc924) | Created Tab-Completion functionality for commands ### Translators Name | Language(s) From fb0d48a19a032bd20f3b8fe230a54c26ac6742de Mon Sep 17 00:00:00 2001 From: Daniel McCoy Stephenson Date: Thu, 15 Sep 2022 07:12:42 -0600 Subject: [PATCH 18/24] Configurable Autosave (#1516) --- .../factionsystem/services/ConfigService.java | 24 ++++++++++++++++--- .../utils/extended/Scheduler.java | 7 ++++-- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/main/java/dansplugins/factionsystem/services/ConfigService.java b/src/main/java/dansplugins/factionsystem/services/ConfigService.java index 1b2673f65..996a37954 100644 --- a/src/main/java/dansplugins/factionsystem/services/ConfigService.java +++ b/src/main/java/dansplugins/factionsystem/services/ConfigService.java @@ -172,6 +172,12 @@ public void handleVersionMismatch() { if (!getConfig().isString("factionless")) { getConfig().set("factionless", "FactionLess"); } + if (!getConfig().isSet("secondsBeforeInitialAutosave")) { + getConfig().set("secondsBeforeInitialAutosave", 60 * 60); + } + if (!getConfig().isSet("secondsBetweenAutosaves")) { + getConfig().set("secondsBetweenAutosaves", 60 * 60); + } deleteOldConfigOptionsIfPresent(); getConfig().options().copyDefaults(true); @@ -214,7 +220,9 @@ public void setConfigOption(String option, String value, CommandSender sender) { || option.equalsIgnoreCase("factionMaxNumberGates") || option.equalsIgnoreCase("factionMaxGateArea") || option.equalsIgnoreCase("maxClaimRadius") - || option.equalsIgnoreCase("teleportDelay")) { + || option.equalsIgnoreCase("teleportDelay") + || option.equalsIgnoreCase("secondsBeforeInitialAutosave") + || option.equalsIgnoreCase("secondsBetweenAutosaves")) { getConfig().set(option, Integer.parseInt(value)); sender.sendMessage(ChatColor.GREEN + localeService.get("IntegerSet")); } else if (option.equalsIgnoreCase("mobsSpawnInFactionTerritory") @@ -314,6 +322,8 @@ public void saveConfigDefaults() { getConfig().set("teleportDelay", 3); getConfig().set("factionless", "FactionLess"); getConfig().set("useNewLanguageFile", false); + getConfig().set("secondsBeforeInitialAutosave", 60); + getConfig().set("secondsBetweenAutosaves", 60); getConfig().options().copyDefaults(true); medievalFactions.saveConfig(); } @@ -368,7 +378,11 @@ public void sendPageTwoOfConfigList(CommandSender sender) { + ", bonusPowerEnabled: " + getBoolean("bonusPowerEnabled") + ", powerLostOnDeath: " + getDouble("powerLostOnDeath") + ", powerGainedOnKill: " + getDouble("powerGainedOnKill") - + ", teleportDelay: " + getInt("teleportDelay")); + + ", teleportDelay: " + getInt("teleportDelay") + + ", factionless: " + getString("factionless") + + ", useNewLanguageFile: " + getBoolean("useNewLanguageFile") + + ", secondsBeforeInitialAutosave: " + getInt("secondsBeforeInitialAutosave") + + ", secondsBetweenAutosaves: " + getInt("secondsBetweenAutosaves")); } public ArrayList getStringConfigOptions() @@ -416,7 +430,11 @@ public ArrayList getStringConfigOptions() "factionOfficerMultiplier", "vassalContributionPercentageMultiplier", "powerLostOnDeath", - "powerGainedOnKill"); + "powerGainedOnKill", + "factionless", + "useNewLanguageFile", + "secondsBeforeInitialAutosave", + "secondsBetweenAutosaves"); return configOptions; } diff --git a/src/main/java/dansplugins/factionsystem/utils/extended/Scheduler.java b/src/main/java/dansplugins/factionsystem/utils/extended/Scheduler.java index 4a24d7167..b5429a679 100644 --- a/src/main/java/dansplugins/factionsystem/utils/extended/Scheduler.java +++ b/src/main/java/dansplugins/factionsystem/utils/extended/Scheduler.java @@ -48,8 +48,11 @@ public Scheduler(Logger logger, LocaleService localeService, MedievalFactions me public void scheduleAutosave() { logger.debug(localeService.get("SchedulingHourlyAutoSave")); - int delay = 60 * 60; // 1 hour - int secondsUntilRepeat = 60 * 60; // 1 hour + int delay = configService.getInt("secondsBeforeInitialAutosave"); + int secondsUntilRepeat = configService.getInt("secondsBetweenAutosaves"); + if (delay == 0 || secondsUntilRepeat == 0) { + return; + } Bukkit.getScheduler().scheduleSyncRepeatingTask(medievalFactions, new Runnable() { @Override public void run() { From 15b714f6f5b19d0469c3ca3efafd1d45c8f2d77b Mon Sep 17 00:00:00 2001 From: dmccoystephenson Date: Thu, 15 Sep 2022 17:59:59 -0600 Subject: [PATCH 19/24] Removed fiefs and currencies integration. --- CONTRIBUTING.md | 1 - build.gradle | 3 -- pom.xml | 6 --- .../factionsystem/MedievalFactions.java | 14 ++----- .../factionsystem/commands/CreateCommand.java | 10 +---- .../commands/DisbandCommand.java | 2 +- .../factionsystem/commands/DuelCommand.java | 2 +- .../factionsystem/commands/ForceCommand.java | 12 ++---- .../factionsystem/commands/GateCommand.java | 2 +- .../commands/MembersCommand.java | 2 +- .../factionsystem/commands/StatsCommand.java | 2 +- .../factionsystem/data/PersistentData.java | 10 +---- .../integrators/CurrenciesIntegrator.java | 17 --------- .../integrators/DynmapIntegrator.java | 2 +- .../integrators/FiefsIntegrator.java | 38 ------------------- .../factionsystem/objects/domain/Faction.java | 22 +++-------- .../objects/helper/FactionFlags.java | 31 +-------------- .../services/CommandService.java | 10 ++--- .../factionsystem/services/PlayerService.java | 9 ++--- .../utils/extended/Messenger.java | 26 +++---------- src/main/resources/language.yml | 4 +- src/main/resources/plugin.yml | 2 +- 22 files changed, 39 insertions(+), 188 deletions(-) delete mode 100644 src/main/java/dansplugins/factionsystem/integrators/CurrenciesIntegrator.java delete mode 100644 src/main/java/dansplugins/factionsystem/integrators/FiefsIntegrator.java diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index df67c0450..3d1e90969 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,7 +3,6 @@ Thank you so much for being willing to contribute to this project! It wouldn't be where it is today without the help of others. Please feel free to fork the repository and contact me on my [support discord server](https://discord.gg/xXtuAQ2). ## Some Things To Know -- I use ZenHub to manage repository issues. This is optional for contributors. - Our highest priority issues will given the "priority" label. [Check them out here](https://github.com/dmccoystephenson/Medieval-Factions/issues?q=is%3Aissue+is%3Aopen+label%3Apriority) ## Process diff --git a/build.gradle b/build.gradle index 4173cf08f..85bca9bd5 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,6 @@ repositories { } dependencies { - implementation 'com.github.dmccoystephenson:Fiefs:v0.8' implementation 'com.github.Preponderous-Software:Ponder:1.1' implementation 'me.clip:placeholderapi:2.11.1' implementation 'org.spigotmc:spigot-api:1.14.1-R0.1-SNAPSHOT' @@ -46,7 +45,6 @@ shadowJar { include(dependency('com.github.Preponderous-Software:Ponder')) include(dependency('org.bstats:bstats-bukkit')) include(dependency('org.bstats:bstats-base')) - include(dependency('com.github.dmccoystephenson:Fiefs')) } relocate 'preponderous.ponder', 'dansplugins.factionsystem.shadow.preponderous.ponder' relocate 'org.intellij', 'dansplugins.factionsystem.shadow.org.intellij' @@ -55,7 +53,6 @@ shadowJar { relocate 'junit', 'dansplugins.factionsystem.shadow.junit' relocate 'org.hamcrest', 'dansplugins.factionsystem.shadow.org.hamcrest' relocate 'org.junit', 'dansplugins.factionsystem.shadow.org.junit' - relocate 'dansplugins.fiefs', 'dansplugins.factionsystem.shadow.dansplugins.fiefs' } artifacts { diff --git a/pom.xml b/pom.xml index dac6fdf9c..3b4954534 100644 --- a/pom.xml +++ b/pom.xml @@ -95,12 +95,6 @@ 2.2 provided - - com.github.dmccoystephenson - Fiefs - v0.8 - compile - com.github.Preponderous-Software Ponder diff --git a/src/main/java/dansplugins/factionsystem/MedievalFactions.java b/src/main/java/dansplugins/factionsystem/MedievalFactions.java index e6b403b67..c616151d9 100644 --- a/src/main/java/dansplugins/factionsystem/MedievalFactions.java +++ b/src/main/java/dansplugins/factionsystem/MedievalFactions.java @@ -11,9 +11,7 @@ import dansplugins.factionsystem.eventhandlers.*; import dansplugins.factionsystem.externalapi.MedievalFactionsAPI; import dansplugins.factionsystem.factories.WarFactory; -import dansplugins.factionsystem.integrators.CurrenciesIntegrator; import dansplugins.factionsystem.integrators.DynmapIntegrator; -import dansplugins.factionsystem.integrators.FiefsIntegrator; import dansplugins.factionsystem.placeholders.PlaceholderAPI; import dansplugins.factionsystem.services.*; import dansplugins.factionsystem.utils.Logger; @@ -46,27 +44,23 @@ public class MedievalFactions extends PonderBukkitPlugin { private final ConfigService configService = new ConfigService(this); private final EphemeralData ephemeralData = new EphemeralData(); private final Logger logger = new Logger(this); - private final FiefsIntegrator fiefsIntegrator = new FiefsIntegrator(this); - private final CurrenciesIntegrator currenciesIntegrator = new CurrenciesIntegrator(); private final PlayerTeleporter playerTeleporter = new PlayerTeleporter(logger); private final TerritoryOwnerNotifier territoryOwnerNotifier = new TerritoryOwnerNotifier(configService.getLocaleService(), configService, actionBarService); - public boolean USE_NEW_LANGUAGE_FILE = configService.getBoolean("useNewLanguageFile"); private final MessageService messageService = new MessageService(this); - private final PlayerService playerService = new PlayerService(this, messageService); - private final Messenger messenger = new Messenger(configService.getLocaleService(), fiefsIntegrator, playerService, messageService, this); - private final PersistentData persistentData = new PersistentData(configService.getLocaleService(), configService, this, messenger, ephemeralData, logger, fiefsIntegrator, currenciesIntegrator, playerService, messageService); + private final PlayerService playerService = new PlayerService(configService, messageService); + private final Messenger messenger = new Messenger(configService.getLocaleService(), playerService, messageService, this, configService); + private final PersistentData persistentData = new PersistentData(configService.getLocaleService(), configService, this, messenger, ephemeralData, logger, playerService, messageService); private final WarFactory warFactory = new WarFactory(persistentData); private final RelationChecker relationChecker = new RelationChecker(persistentData); private final GateService gateService = new GateService(persistentData, configService.getLocaleService(), ephemeralData, playerService, messageService); private final LockService lockService = new LockService(persistentData, configService.getLocaleService(), persistentData.getBlockChecker(), playerService, messageService, ephemeralData); private final Scheduler scheduler = new Scheduler(logger, configService.getLocaleService(), this, persistentData, configService, playerTeleporter, playerService, messageService); - private final CommandService commandService = new CommandService(configService.getLocaleService(), this, configService, persistentData, ephemeralData, persistentData.getChunkDataAccessor(), persistentData.getDynmapIntegrator(), warFactory, logger, scheduler, messenger, relationChecker, fiefsIntegrator, currenciesIntegrator, playerService, messageService); + private final CommandService commandService = new CommandService(configService.getLocaleService(), this, configService, persistentData, ephemeralData, persistentData.getChunkDataAccessor(), persistentData.getDynmapIntegrator(), warFactory, logger, scheduler, messenger, relationChecker, playerService, messageService); public ConfigService getConfigService() { return configService; } - /** * This runs when the server starts. */ diff --git a/src/main/java/dansplugins/factionsystem/commands/CreateCommand.java b/src/main/java/dansplugins/factionsystem/commands/CreateCommand.java index 87e1e70d3..3db506de6 100644 --- a/src/main/java/dansplugins/factionsystem/commands/CreateCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/CreateCommand.java @@ -9,9 +9,7 @@ import dansplugins.factionsystem.data.EphemeralData; import dansplugins.factionsystem.data.PersistentData; import dansplugins.factionsystem.events.FactionCreateEvent; -import dansplugins.factionsystem.integrators.CurrenciesIntegrator; import dansplugins.factionsystem.integrators.DynmapIntegrator; -import dansplugins.factionsystem.integrators.FiefsIntegrator; import dansplugins.factionsystem.objects.domain.Faction; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; @@ -29,17 +27,13 @@ * @author Callum Johnson */ public class CreateCommand extends SubCommand { - private final FiefsIntegrator fiefsIntegrator; - private final CurrenciesIntegrator currenciesIntegrator; private final Logger logger; private final MedievalFactions medievalFactions; - public CreateCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, FiefsIntegrator fiefsIntegrator, CurrenciesIntegrator currenciesIntegrator, Logger logger, MedievalFactions medievalFactions, PlayerService playerService, MessageService messageService) { + public CreateCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, Logger logger, MedievalFactions medievalFactions, PlayerService playerService, MessageService messageService) { super(new String[]{ LOCALE_PREFIX + "CmdCreate", "Create" }, true, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); - this.fiefsIntegrator = fiefsIntegrator; - this.currenciesIntegrator = currenciesIntegrator; this.logger = logger; this.medievalFactions = medievalFactions; } @@ -89,7 +83,7 @@ public void execute(Player player, String[] args, String key) { return; } - this.faction = new Faction(factionName, player.getUniqueId(), configService, localeService, fiefsIntegrator, currenciesIntegrator, dynmapIntegrator, logger, persistentData, medievalFactions, playerService); + this.faction = new Faction(factionName, player.getUniqueId(), configService, localeService, dynmapIntegrator, logger, persistentData, medievalFactions, playerService); this.faction.addMember(player.getUniqueId()); diff --git a/src/main/java/dansplugins/factionsystem/commands/DisbandCommand.java b/src/main/java/dansplugins/factionsystem/commands/DisbandCommand.java index 060fbcb30..cf7749725 100644 --- a/src/main/java/dansplugins/factionsystem/commands/DisbandCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/DisbandCommand.java @@ -64,7 +64,7 @@ public void execute(CommandSender sender, String[] args, String key) { if (args.length == 0) { if (!checkPermissions(sender, "mf.disband")) return; if (!(sender instanceof Player)) { // ONLY Players can be in a Faction - if (!medievalFactions.USE_NEW_LANGUAGE_FILE) { + if (!configService.getBoolean("useNewLanguageFile")) { sender.sendMessage(translate(getText("OnlyPlayersCanUseCommand"))); } else { playerService.sendConsoleMessage(sender.getServer().getConsoleSender(), "OnlyPlayersCanUseCommand", true); diff --git a/src/main/java/dansplugins/factionsystem/commands/DuelCommand.java b/src/main/java/dansplugins/factionsystem/commands/DuelCommand.java index c7b5dfa0b..d52a80d28 100644 --- a/src/main/java/dansplugins/factionsystem/commands/DuelCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/DuelCommand.java @@ -147,7 +147,7 @@ public void execute(CommandSender sender, String[] args, String key) { } private void sendHelp(CommandSender sender) { - if (!medievalFactions.USE_NEW_LANGUAGE_FILE) { + if (!configService.getBoolean("useNewLanguageFile")) { sender.sendMessage("&b" + getText("SubCommands")); sender.sendMessage("&b" + getText("HelpDuelChallenge")); sender.sendMessage("&b" + getText("HelpDuelAccept")); diff --git a/src/main/java/dansplugins/factionsystem/commands/ForceCommand.java b/src/main/java/dansplugins/factionsystem/commands/ForceCommand.java index 178f3547f..4b4731343 100644 --- a/src/main/java/dansplugins/factionsystem/commands/ForceCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/ForceCommand.java @@ -9,9 +9,7 @@ import dansplugins.factionsystem.data.EphemeralData; import dansplugins.factionsystem.data.PersistentData; import dansplugins.factionsystem.events.*; -import dansplugins.factionsystem.integrators.CurrenciesIntegrator; import dansplugins.factionsystem.integrators.DynmapIntegrator; -import dansplugins.factionsystem.integrators.FiefsIntegrator; import dansplugins.factionsystem.objects.domain.Faction; import dansplugins.factionsystem.objects.domain.PowerRecord; import dansplugins.factionsystem.services.ConfigService; @@ -19,11 +17,11 @@ import dansplugins.factionsystem.services.MessageService; import dansplugins.factionsystem.services.PlayerService; import dansplugins.factionsystem.utils.Logger; -import dansplugins.fiefs.utils.UUIDChecker; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import preponderous.ponder.minecraft.bukkit.tools.UUIDChecker; import preponderous.ponder.misc.ArgumentParser; import java.lang.reflect.Method; @@ -35,8 +33,6 @@ public class ForceCommand extends SubCommand { private final MedievalFactions medievalFactions; private final Logger logger; - private final FiefsIntegrator fiefsIntegrator; - private final CurrenciesIntegrator currenciesIntegrator; private final String[] commands = new String[]{ "Save", "Load", "Peace", "Demote", "Join", "Kick", "Power", "Renounce", "Transfer", "RemoveVassal", "Rename", "BonusPower", "Unlock", "Create", "Claim", "Flag" @@ -46,14 +42,12 @@ public class ForceCommand extends SubCommand { private final ArgumentParser argumentParser = new ArgumentParser(); private final UUIDChecker uuidChecker = new UUIDChecker(); - public ForceCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, MedievalFactions medievalFactions, Logger logger, FiefsIntegrator fiefsIntegrator, CurrenciesIntegrator currenciesIntegrator, PlayerService playerService, MessageService messageService) { + public ForceCommand(LocaleService localeService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, ConfigService configService, MedievalFactions medievalFactions, Logger logger, PlayerService playerService, MessageService messageService) { super(new String[]{ "Force", LOCALE_PREFIX + "CmdForce" }, false, persistentData, localeService, ephemeralData, configService, playerService, messageService, chunkDataAccessor, dynmapIntegrator); this.medievalFactions = medievalFactions; this.logger = logger; - this.fiefsIntegrator = fiefsIntegrator; - this.currenciesIntegrator = currenciesIntegrator; // Register sub-commands. Arrays.stream(commands).forEach(command -> subMap.put(Arrays.asList(command, getText("CmdForce" + command)), "force" + command) @@ -557,7 +551,7 @@ public void forceCreate(CommandSender sender, String[] args) { return; } - this.faction = new Faction(configService, localeService, fiefsIntegrator, currenciesIntegrator, dynmapIntegrator, logger, persistentData, medievalFactions, playerService, newFactionName); + this.faction = new Faction(configService, localeService, dynmapIntegrator, logger, persistentData, medievalFactions, playerService, newFactionName); FactionCreateEvent createEvent = new FactionCreateEvent(this.faction, player); Bukkit.getPluginManager().callEvent(createEvent); if (!createEvent.isCancelled()) { diff --git a/src/main/java/dansplugins/factionsystem/commands/GateCommand.java b/src/main/java/dansplugins/factionsystem/commands/GateCommand.java index 5c399b1ac..1e57e3cfd 100644 --- a/src/main/java/dansplugins/factionsystem/commands/GateCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/GateCommand.java @@ -46,7 +46,7 @@ public GateCommand(LocaleService localeService, PersistentData persistentData, E public void execute(Player player, String[] args, String key) { if (!(checkPermissions(player, "mf.gate"))) return; if (args.length == 0) { - if (!medievalFactions.USE_NEW_LANGUAGE_FILE) { + if (!configService.getBoolean("useNewLanguageFile")) { player.sendMessage(translate("&b" + getText("SubCommands"))); player.sendMessage(translate("&b" + getText("HelpGateCreate"))); player.sendMessage(translate("&b" + getText("HelpGateName"))); diff --git a/src/main/java/dansplugins/factionsystem/commands/MembersCommand.java b/src/main/java/dansplugins/factionsystem/commands/MembersCommand.java index 34dfe31d7..4c84a2817 100644 --- a/src/main/java/dansplugins/factionsystem/commands/MembersCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/MembersCommand.java @@ -80,7 +80,7 @@ public void execute(CommandSender sender, String[] args, String key) { } } // send Faction Members - if (!medievalFactions.USE_NEW_LANGUAGE_FILE) { + if (!configService.getBoolean("useNewLanguageFile")) { sender.sendMessage(translate("&b----------\n" + getText("MembersOf", faction.getName()))); sender.sendMessage(translate("&b----------\n")); faction.getMemberList().stream() diff --git a/src/main/java/dansplugins/factionsystem/commands/StatsCommand.java b/src/main/java/dansplugins/factionsystem/commands/StatsCommand.java index 4206953d9..f5792670e 100644 --- a/src/main/java/dansplugins/factionsystem/commands/StatsCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/StatsCommand.java @@ -37,7 +37,7 @@ public void execute(Player player, String[] args, String key) { @Override public void execute(CommandSender sender, String[] args, String key) { - if (!medievalFactions.USE_NEW_LANGUAGE_FILE) { + if (!configService.getBoolean("useNewLanguageFile")) { sender.sendMessage(ChatColor.AQUA + "=== Medieval Factions Stats ==="); sender.sendMessage(ChatColor.AQUA + "Number of factions: " + persistentData.getNumFactions()); } else { diff --git a/src/main/java/dansplugins/factionsystem/data/PersistentData.java b/src/main/java/dansplugins/factionsystem/data/PersistentData.java index e8c783021..fcf746848 100644 --- a/src/main/java/dansplugins/factionsystem/data/PersistentData.java +++ b/src/main/java/dansplugins/factionsystem/data/PersistentData.java @@ -11,9 +11,7 @@ import dansplugins.factionsystem.MedievalFactions; import dansplugins.factionsystem.events.FactionClaimEvent; import dansplugins.factionsystem.events.FactionUnclaimEvent; -import dansplugins.factionsystem.integrators.CurrenciesIntegrator; import dansplugins.factionsystem.integrators.DynmapIntegrator; -import dansplugins.factionsystem.integrators.FiefsIntegrator; import dansplugins.factionsystem.objects.domain.*; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; @@ -52,8 +50,6 @@ public class PersistentData { private final Messenger messenger; private final EphemeralData ephemeralData; private final Logger logger; - private final FiefsIntegrator fiefsIntegrator; - private final CurrenciesIntegrator currenciesIntegrator; private final InteractionAccessChecker interactionAccessChecker; private final ArrayList factions = new ArrayList<>(); private final ArrayList claimedChunks = new ArrayList<>(); @@ -66,15 +62,13 @@ public class PersistentData { private final DynmapIntegrator dynmapIntegrator; private final BlockChecker blockChecker; - public PersistentData(LocaleService localeService, ConfigService configService, MedievalFactions medievalFactions, Messenger messenger, EphemeralData ephemeralData, Logger logger, FiefsIntegrator fiefsIntegrator, CurrenciesIntegrator currenciesIntegrator, PlayerService playerService, MessageService messageService) { + public PersistentData(LocaleService localeService, ConfigService configService, MedievalFactions medievalFactions, Messenger messenger, EphemeralData ephemeralData, Logger logger, PlayerService playerService, MessageService messageService) { this.localeService = localeService; this.configService = configService; this.medievalFactions = medievalFactions; this.messenger = messenger; this.ephemeralData = ephemeralData; this.logger = logger; - this.fiefsIntegrator = fiefsIntegrator; - this.currenciesIntegrator = currenciesIntegrator; this.playerService = playerService; this.messageService = messageService; interactionAccessChecker = new InteractionAccessChecker(this, configService, ephemeralData, logger); @@ -1429,7 +1423,7 @@ private void loadFactions() { ArrayList> data = loadDataFromFilename(FILE_PATH + FACTIONS_FILE_NAME); for (Map factionData : data) { - Faction newFaction = new Faction(factionData, configService, localeService, fiefsIntegrator, currenciesIntegrator, dynmapIntegrator, logger, persistentData, medievalFactions, playerService); + Faction newFaction = new Faction(factionData, configService, localeService, dynmapIntegrator, logger, persistentData, medievalFactions, playerService); factions.add(newFaction); } } diff --git a/src/main/java/dansplugins/factionsystem/integrators/CurrenciesIntegrator.java b/src/main/java/dansplugins/factionsystem/integrators/CurrenciesIntegrator.java deleted file mode 100644 index 33d5d25f7..000000000 --- a/src/main/java/dansplugins/factionsystem/integrators/CurrenciesIntegrator.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - Copyright (c) 2022 Daniel McCoy Stephenson - GPL3 License - */ -package dansplugins.factionsystem.integrators; - -import org.bukkit.Bukkit; - -/** - * @author Daniel McCoy Stephenson - */ -public class CurrenciesIntegrator { - - public boolean isCurrenciesNotPresent() { - return Bukkit.getServer().getPluginManager().getPlugin("Currencies") == null; - } -} \ No newline at end of file diff --git a/src/main/java/dansplugins/factionsystem/integrators/DynmapIntegrator.java b/src/main/java/dansplugins/factionsystem/integrators/DynmapIntegrator.java index 0d1a0678c..1aeefb71c 100644 --- a/src/main/java/dansplugins/factionsystem/integrators/DynmapIntegrator.java +++ b/src/main/java/dansplugins/factionsystem/integrators/DynmapIntegrator.java @@ -8,12 +8,12 @@ import dansplugins.factionsystem.objects.helper.ChunkFlags; import dansplugins.factionsystem.services.LocaleService; import dansplugins.factionsystem.utils.Logger; -import dansplugins.fiefs.utils.UUIDChecker; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginManager; import org.bukkit.scheduler.BukkitRunnable; import org.dynmap.DynmapCommonAPI; import org.dynmap.markers.*; +import preponderous.ponder.minecraft.bukkit.tools.UUIDChecker; import java.util.*; diff --git a/src/main/java/dansplugins/factionsystem/integrators/FiefsIntegrator.java b/src/main/java/dansplugins/factionsystem/integrators/FiefsIntegrator.java deleted file mode 100644 index f282d2806..000000000 --- a/src/main/java/dansplugins/factionsystem/integrators/FiefsIntegrator.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - Copyright (c) 2022 Daniel McCoy Stephenson - GPL3 License - */ -package dansplugins.factionsystem.integrators; - -import dansplugins.factionsystem.MedievalFactions; -import dansplugins.fiefs.externalapi.FiefsAPI; -import org.bukkit.Bukkit; - -/** - * @author Daniel McCoy Stephenson - */ -public class FiefsIntegrator { - - private FiefsAPI fi_api = null; - - public FiefsIntegrator(MedievalFactions medievalFactions) { - if (isFiefsPresent()) { - if (medievalFactions.isDebugEnabled()) { - System.out.println("[DEBUG] Fiefs was found successfully!"); - } - fi_api = new FiefsAPI(); - } else { - if (medievalFactions.isDebugEnabled()) { - System.out.println("[DEBUG] Fiefs was not found!"); - } - } - } - - public boolean isFiefsPresent() { - return (Bukkit.getServer().getPluginManager().getPlugin("Fiefs") != null); - } - - public FiefsAPI getAPI() { - return fi_api; - } -} \ No newline at end of file diff --git a/src/main/java/dansplugins/factionsystem/objects/domain/Faction.java b/src/main/java/dansplugins/factionsystem/objects/domain/Faction.java index 5c1588aea..bff960fa3 100644 --- a/src/main/java/dansplugins/factionsystem/objects/domain/Faction.java +++ b/src/main/java/dansplugins/factionsystem/objects/domain/Faction.java @@ -9,9 +9,7 @@ import com.google.gson.reflect.TypeToken; import dansplugins.factionsystem.MedievalFactions; import dansplugins.factionsystem.data.PersistentData; -import dansplugins.factionsystem.integrators.CurrenciesIntegrator; import dansplugins.factionsystem.integrators.DynmapIntegrator; -import dansplugins.factionsystem.integrators.FiefsIntegrator; import dansplugins.factionsystem.objects.helper.FactionFlags; import dansplugins.factionsystem.objects.inherited.Nation; import dansplugins.factionsystem.objects.inherited.specification.Feudal; @@ -36,8 +34,6 @@ public class Faction extends Nation implements Feudal, Savable { private final ConfigService configService; private final LocaleService localeService; - private final FiefsIntegrator fiefsIntegrator; - private final CurrenciesIntegrator currenciesIntegrator; private final DynmapIntegrator dynmapIntegrator; private final Logger logger; private final PersistentData persistentData; @@ -54,11 +50,9 @@ public class Faction extends Nation implements Feudal, Savable { private int bonusPower = 0; private boolean autoclaim = false; - public Faction(String initialName, UUID creator, ConfigService configService, LocaleService localeService, FiefsIntegrator fiefsIntegrator, CurrenciesIntegrator currenciesIntegrator, DynmapIntegrator dynmapIntegrator, Logger logger, PersistentData persistentData, MedievalFactions medievalFactions, PlayerService playerService) { + public Faction(String initialName, UUID creator, ConfigService configService, LocaleService localeService, DynmapIntegrator dynmapIntegrator, Logger logger, PersistentData persistentData, MedievalFactions medievalFactions, PlayerService playerService) { this.configService = configService; this.localeService = localeService; - this.fiefsIntegrator = fiefsIntegrator; - this.currenciesIntegrator = currenciesIntegrator; this.dynmapIntegrator = dynmapIntegrator; this.logger = logger; this.persistentData = persistentData; @@ -67,15 +61,13 @@ public Faction(String initialName, UUID creator, ConfigService configService, Lo setName(initialName); setOwner(creator); prefix = initialName; - flags = new FactionFlags(configService, localeService, fiefsIntegrator, currenciesIntegrator, dynmapIntegrator, logger, this.playerService); + flags = new FactionFlags(configService, localeService, dynmapIntegrator, logger, this.playerService); flags.initializeFlagValues(); } - public Faction(ConfigService configService, LocaleService localeService, FiefsIntegrator fiefsIntegrator, CurrenciesIntegrator currenciesIntegrator, DynmapIntegrator dynmapIntegrator, Logger logger, PersistentData persistentData, MedievalFactions medievalFactions, PlayerService playerService, String initialName) { + public Faction(ConfigService configService, LocaleService localeService, DynmapIntegrator dynmapIntegrator, Logger logger, PersistentData persistentData, MedievalFactions medievalFactions, PlayerService playerService, String initialName) { this.configService = configService; this.localeService = localeService; - this.fiefsIntegrator = fiefsIntegrator; - this.currenciesIntegrator = currenciesIntegrator; this.dynmapIntegrator = dynmapIntegrator; this.logger = logger; this.persistentData = persistentData; @@ -83,21 +75,19 @@ public Faction(ConfigService configService, LocaleService localeService, FiefsIn this.playerService = playerService; setName(initialName); prefix = initialName; - flags = new FactionFlags(configService, localeService, fiefsIntegrator, currenciesIntegrator, dynmapIntegrator, logger, this.playerService); + flags = new FactionFlags(configService, localeService, dynmapIntegrator, logger, this.playerService); flags.initializeFlagValues(); } - public Faction(Map data, ConfigService configService, LocaleService localeService, FiefsIntegrator fiefsIntegrator, CurrenciesIntegrator currenciesIntegrator, DynmapIntegrator dynmapIntegrator, Logger logger, PersistentData persistentData, MedievalFactions medievalFactions, PlayerService playerService) { + public Faction(Map data, ConfigService configService, LocaleService localeService, DynmapIntegrator dynmapIntegrator, Logger logger, PersistentData persistentData, MedievalFactions medievalFactions, PlayerService playerService) { this.configService = configService; this.localeService = localeService; - this.fiefsIntegrator = fiefsIntegrator; - this.currenciesIntegrator = currenciesIntegrator; this.dynmapIntegrator = dynmapIntegrator; this.logger = logger; this.persistentData = persistentData; this.medievalFactions = medievalFactions; this.playerService = playerService; - flags = new FactionFlags(configService, localeService, fiefsIntegrator, currenciesIntegrator, dynmapIntegrator, logger, this.playerService); + flags = new FactionFlags(configService, localeService, dynmapIntegrator, logger, this.playerService); this.load(data); } diff --git a/src/main/java/dansplugins/factionsystem/objects/helper/FactionFlags.java b/src/main/java/dansplugins/factionsystem/objects/helper/FactionFlags.java index 59762f0cc..3f3a3fd21 100644 --- a/src/main/java/dansplugins/factionsystem/objects/helper/FactionFlags.java +++ b/src/main/java/dansplugins/factionsystem/objects/helper/FactionFlags.java @@ -4,9 +4,7 @@ */ package dansplugins.factionsystem.objects.helper; -import dansplugins.factionsystem.integrators.CurrenciesIntegrator; import dansplugins.factionsystem.integrators.DynmapIntegrator; -import dansplugins.factionsystem.integrators.FiefsIntegrator; import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; import dansplugins.factionsystem.services.PlayerService; @@ -29,8 +27,6 @@ public class FactionFlags { private final ConfigService configService; private final LocaleService localeService; - private final FiefsIntegrator fiefsIntegrator; - private final CurrenciesIntegrator currenciesIntegrator; private final DynmapIntegrator dynmapIntegrator; private final Logger logger; private final PlayerService playerService; @@ -41,11 +37,9 @@ public class FactionFlags { private HashMap doubleValues = new HashMap<>(); private HashMap stringValues = new HashMap<>(); - public FactionFlags(ConfigService configService, LocaleService localeService, FiefsIntegrator fiefsIntegrator, CurrenciesIntegrator currenciesIntegrator, DynmapIntegrator dynmapIntegrator, Logger logger, PlayerService playerService) { + public FactionFlags(ConfigService configService, LocaleService localeService, DynmapIntegrator dynmapIntegrator, Logger logger, PlayerService playerService) { this.configService = configService; this.localeService = localeService; - this.fiefsIntegrator = fiefsIntegrator; - this.currenciesIntegrator = currenciesIntegrator; this.dynmapIntegrator = dynmapIntegrator; this.logger = logger; this.playerService = playerService; @@ -62,7 +56,6 @@ private void initializeFlagNames() { // this is called internally flagNames.add("territoryAlertColor"); flagNames.add("prefixColor"); flagNames.add("allowFriendlyFire"); - flagNames.add("fiefsEnabled"); flagNames.add("officersCanMintCurrency"); flagNames.add("acceptBonusPower"); } @@ -78,7 +71,6 @@ public void initializeFlagValues() { stringValues.put("territoryAlertColor", configService.getString("territoryAlertColor")); stringValues.put("prefixColor", "white"); booleanValues.put("allowFriendlyFire", false); - booleanValues.put("fiefsEnabled", true); booleanValues.put("officersCanMintCurrency", false); booleanValues.put("acceptBonusPower", true); } @@ -112,9 +104,6 @@ public void loadMissingFlagsIfNecessary() { if (!booleanValues.containsKey("allowFriendlyFire")) { booleanValues.put("allowFriendlyFire", false); } - if (!booleanValues.containsKey("fiefsEnabled")) { - booleanValues.put("fiefsEnabled", true); - } if (!booleanValues.containsKey("officersCanMintCurrency")) { booleanValues.put("officersCanMintCurrency", false); } @@ -149,16 +138,6 @@ public void setFlag(String flag, String value, Player player) { return; } - if (flag.equals("fiefsEnabled") && !fiefsIntegrator.isFiefsPresent()) { - playerService.sendMessageType(player, "&cFiefs either isn't enabled or present.", "FiefsNotEnable", false); - return; - } - - if (flag.equals("officersCanMintCurrency") && currenciesIntegrator.isCurrenciesNotPresent()) { - // TODO: add locale message - return; - } - if (isFlag(flag)) { if (integerValues.containsKey(flag)) { integerValues.replace(flag, Integer.parseInt(value)); @@ -290,14 +269,6 @@ private String getFlagsSeparatedByCommas() { continue; } - if (flagName.equals("fiefsEnabled") && !fiefsIntegrator.isFiefsPresent()) { - continue; - } - - if (flagName.equals("officersCanMintCurrency") && currenciesIntegrator.isCurrenciesNotPresent()) { - continue; - } - if (!toReturn.toString().equals("")) { toReturn.append(", "); } diff --git a/src/main/java/dansplugins/factionsystem/services/CommandService.java b/src/main/java/dansplugins/factionsystem/services/CommandService.java index 0d06714ac..e969b454c 100644 --- a/src/main/java/dansplugins/factionsystem/services/CommandService.java +++ b/src/main/java/dansplugins/factionsystem/services/CommandService.java @@ -10,9 +10,7 @@ import dansplugins.factionsystem.data.EphemeralData; import dansplugins.factionsystem.data.PersistentData; import dansplugins.factionsystem.factories.WarFactory; -import dansplugins.factionsystem.integrators.CurrenciesIntegrator; import dansplugins.factionsystem.integrators.DynmapIntegrator; -import dansplugins.factionsystem.integrators.FiefsIntegrator; import dansplugins.factionsystem.utils.Logger; import dansplugins.factionsystem.utils.RelationChecker; import dansplugins.factionsystem.utils.extended.Messenger; @@ -35,7 +33,7 @@ public class CommandService { private final MessageService messageService; private final Set subCommands = new HashSet<>(); - public CommandService(LocaleService localeService, MedievalFactions medievalFactions, ConfigService configService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, WarFactory warFactory, Logger logger, Scheduler scheduler, Messenger messenger, RelationChecker relationChecker, FiefsIntegrator fiefsIntegrator, CurrenciesIntegrator currenciesIntegrator, PlayerService playerService, MessageService messageService) { + public CommandService(LocaleService localeService, MedievalFactions medievalFactions, ConfigService configService, PersistentData persistentData, EphemeralData ephemeralData, PersistentData.ChunkDataAccessor chunkDataAccessor, DynmapIntegrator dynmapIntegrator, WarFactory warFactory, Logger logger, Scheduler scheduler, Messenger messenger, RelationChecker relationChecker, PlayerService playerService, MessageService messageService) { this.localeService = localeService; this.medievalFactions = medievalFactions; this.configService = configService; @@ -52,7 +50,7 @@ public CommandService(LocaleService localeService, MedievalFactions medievalFact new CheckClaimCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), new ClaimCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), new ConfigCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, medievalFactions, playerService, messageService), - new CreateCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, fiefsIntegrator, currenciesIntegrator, logger, medievalFactions, playerService, messageService), + new CreateCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, logger, medievalFactions, playerService, messageService), new DeclareIndependenceCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), new DeclareWarCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, warFactory, playerService, messageService), new DemoteCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), @@ -61,7 +59,7 @@ public CommandService(LocaleService localeService, MedievalFactions medievalFact new DuelCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, medievalFactions, playerService, messageService), new EditLawCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), new FlagsCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), - new ForceCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, medievalFactions, logger, fiefsIntegrator, currenciesIntegrator, playerService, messageService), + new ForceCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, medievalFactions, logger, playerService, messageService), new GateCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, medievalFactions, playerService, messageService), new GrantAccessCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), new GrantIndependenceCommand(localeService, persistentData, ephemeralData, chunkDataAccessor, dynmapIntegrator, configService, playerService, messageService), @@ -106,7 +104,7 @@ public boolean interpretCommand(CommandSender sender, String label, String[] arg // no arguments check if (args.length == 0) { // send plugin information - if (!medievalFactions.USE_NEW_LANGUAGE_FILE) { + if (!configService.getBoolean("useNewLanguageFile")) { sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("MedievalFactionsTitle"), medievalFactions.getVersion())); sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("DeveloperList"), medievalFactions.getDescription().getAuthors())); sender.sendMessage(ChatColor.AQUA + localeService.get("WikiLink")); diff --git a/src/main/java/dansplugins/factionsystem/services/PlayerService.java b/src/main/java/dansplugins/factionsystem/services/PlayerService.java index 03dc6236e..e21c9d7f1 100644 --- a/src/main/java/dansplugins/factionsystem/services/PlayerService.java +++ b/src/main/java/dansplugins/factionsystem/services/PlayerService.java @@ -8,17 +8,16 @@ import java.util.List; public class PlayerService { - - private final MedievalFactions medievalFactions; + private final ConfigService configService; private final MessageService messageService; - public PlayerService(MedievalFactions medievalFactions, MessageService messageService) { - this.medievalFactions = medievalFactions; + public PlayerService(ConfigService configService, MessageService messageService) { + this.configService = configService; this.messageService = messageService; } public String getMessageType(String oldtype, String newtype) { - if (medievalFactions.USE_NEW_LANGUAGE_FILE) { + if (configService.getBoolean("useNewLanguageFile")) { return newtype; } else { return oldtype; diff --git a/src/main/java/dansplugins/factionsystem/utils/extended/Messenger.java b/src/main/java/dansplugins/factionsystem/utils/extended/Messenger.java index 4061b42f1..2b40fbd2c 100644 --- a/src/main/java/dansplugins/factionsystem/utils/extended/Messenger.java +++ b/src/main/java/dansplugins/factionsystem/utils/extended/Messenger.java @@ -5,12 +5,11 @@ package dansplugins.factionsystem.utils.extended; import dansplugins.factionsystem.MedievalFactions; -import dansplugins.factionsystem.integrators.FiefsIntegrator; import dansplugins.factionsystem.objects.domain.Faction; +import dansplugins.factionsystem.services.ConfigService; import dansplugins.factionsystem.services.LocaleService; import dansplugins.factionsystem.services.MessageService; import dansplugins.factionsystem.services.PlayerService; -import dansplugins.fiefs.externalapi.FI_Fief; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -27,22 +26,22 @@ */ public class Messenger extends preponderous.ponder.minecraft.bukkit.tools.Messenger { private final LocaleService localeService; - private final FiefsIntegrator fiefsIntegrator; private final PlayerService playerService; private final MessageService messageService; private final MedievalFactions medievalFactions; + private final ConfigService configService; - public Messenger(LocaleService localeService, FiefsIntegrator fiefsIntegrator, PlayerService playerService, MessageService messageService, MedievalFactions medievalFactions) { + public Messenger(LocaleService localeService, PlayerService playerService, MessageService messageService, MedievalFactions medievalFactions, ConfigService configService) { this.localeService = localeService; - this.fiefsIntegrator = fiefsIntegrator; this.playerService = playerService; this.messageService = messageService; this.medievalFactions = medievalFactions; + this.configService = configService; } public void sendFactionInfo(CommandSender sender, Faction faction, int power) { UUIDChecker uuidChecker = new UUIDChecker(); - if (!medievalFactions.USE_NEW_LANGUAGE_FILE) { + if (!configService.getBoolean("useNewLanguageFile")) { sender.sendMessage(ChatColor.BOLD + "" + ChatColor.AQUA + String.format(localeService.get("FactionInfo"), faction.getName()) + "\n----------\n"); sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("Name"), faction.getName()) + "\n"); sender.sendMessage(ChatColor.AQUA + String.format(localeService.get("Owner"), uuidChecker.findPlayerNameBasedOnUUID(faction.getOwner())) + "\n"); @@ -70,7 +69,6 @@ public void sendFactionInfo(CommandSender sender, Faction faction, int power) { }); } sendLiegeInfoIfVassal(faction, sender); - sendFiefsInfo(faction, sender); sendLiegeInfoIfLiege(faction, sender); sendBonusPowerInfo(faction, sender); } @@ -95,20 +93,6 @@ private void sendLiegeInfoIfLiege(Faction faction, CommandSender sender) { } } - private void sendFiefsInfo(Faction faction, CommandSender sender) { - if (fiefsIntegrator.isFiefsPresent()) { - ArrayList fiefs = fiefsIntegrator.getAPI().getFiefsOfFaction(faction.getName()); - if (fiefs.size() != 0) { - StringBuilder fiefsSeparatedByCommas = new StringBuilder(); - for (FI_Fief fief : fiefs) { - fiefsSeparatedByCommas.append(fief.getName()); - } - playerService.sendMessageType(sender, ChatColor.AQUA + String.format("Fiefs: %s", fiefsSeparatedByCommas) - , Objects.requireNonNull(messageService.getLanguage().getString("Fiefs")).replace("#fiefs#", String.valueOf(fiefsSeparatedByCommas)), true); - } - } - } - private void sendLiegeInfoIfVassal(Faction faction, CommandSender sender) { if (faction.hasLiege()) { playerService.sendMessageType(sender, ChatColor.AQUA + String.format(localeService.get("Liege"), faction.getLiege()) + "\n" diff --git a/src/main/resources/language.yml b/src/main/resources/language.yml index 786b4240e..14e2871fc 100644 --- a/src/main/resources/language.yml +++ b/src/main/resources/language.yml @@ -93,7 +93,7 @@ CannotGrantAccessToSelf: "&cYou cannot grant access to yourself." RightClickGrantAccess: "&eRight click a chest or door to grant #name# access. Type /mf grantaccess cancel to cancel this." AlertGrantedIndependence: "&a#name# has granted your faction independence." AlertNoLongerVassalFaction: "&c#name# is no longer a vassal faction." -FactionHomeNotSetYet: "&cThe faction home isn't set yet". +FactionHomeNotSetYet: "&cThe faction home isn't set yet." HomeIsInUnclaimedChunk: "&cHome is in an unclaimed chunk, and is unavailable" HomeClaimedByAnotherFaction: "&cHome was claimed by another faction, and has been lost." AlertMustBeInFactionToUseCommand: "&cYou must be in a faction to use this command." @@ -201,7 +201,6 @@ BlockIsNotLocked: "&cThat block isn't locked." NeutralityDisabled: "&cNeutrality is currently disabled." CannotSetPrefix: "&cYou can't set prefix colors." PrefixesDisabled: "&cPrefixes are currently disabled." -FiefsNotEnable: "&cFiefs either isn't enabled or present." CommandNotRecognized: "&cMedieval Factions doesn't recognize that command." PleaseWaitGate: "&aThis gate is #status#, please wait." CanOnlyCreateGatesInClaimedTerritory: "&cYou can only create gates in claimed territory." @@ -238,7 +237,6 @@ AlertAccessRevokedFor: "&aAccess revoked for #name#" FPHAList: "&b- #name#" BonusPower: "&aBonus Power From Admins: #amount#" VassalContribution: "&aBonus Power From Vassals: #amount#" -Fiefs: "&bFiefs: #fiefs#" Liege: "&bLiege: #name#" Vassals: "&bVassals: #name#" Teleport: "&aTeleport in #time# seconds..." diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index f4c7cee6d..be954059f 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -3,7 +3,7 @@ version: '@version@' authors: [DanTheTechMan, Pasarus, Caibinus, Callum, Richardhyy, Mitras2, Kaonami, GoodLucky777, Elafir, Deej, VoChiDanh, alyphen, JackAttack924] main: dansplugins.factionsystem.MedievalFactions api-version: 1.13 -softdepend: [ dynmap, PlaceholderAPI, Fiefs ] +softdepend: [ dynmap, PlaceholderAPI] description: This Minecraft plugin allows players to organize themselves into feudal, diplomatic, lawful groups akin to nations. commands: From 8fa0a90b8b047439615fe4b718bca16a63e1e4f9 Mon Sep 17 00:00:00 2001 From: dmccoystephenson Date: Thu, 15 Sep 2022 19:54:10 -0600 Subject: [PATCH 20/24] Removed the 'officersCanMintCurrency' faction flag. --- .../factionsystem/objects/helper/FactionFlags.java | 5 ----- .../dansplugins/factionsystem/services/MessageService.java | 4 +++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/dansplugins/factionsystem/objects/helper/FactionFlags.java b/src/main/java/dansplugins/factionsystem/objects/helper/FactionFlags.java index 3f3a3fd21..f9eb0d122 100644 --- a/src/main/java/dansplugins/factionsystem/objects/helper/FactionFlags.java +++ b/src/main/java/dansplugins/factionsystem/objects/helper/FactionFlags.java @@ -56,7 +56,6 @@ private void initializeFlagNames() { // this is called internally flagNames.add("territoryAlertColor"); flagNames.add("prefixColor"); flagNames.add("allowFriendlyFire"); - flagNames.add("officersCanMintCurrency"); flagNames.add("acceptBonusPower"); } @@ -71,7 +70,6 @@ public void initializeFlagValues() { stringValues.put("territoryAlertColor", configService.getString("territoryAlertColor")); stringValues.put("prefixColor", "white"); booleanValues.put("allowFriendlyFire", false); - booleanValues.put("officersCanMintCurrency", false); booleanValues.put("acceptBonusPower", true); } @@ -104,9 +102,6 @@ public void loadMissingFlagsIfNecessary() { if (!booleanValues.containsKey("allowFriendlyFire")) { booleanValues.put("allowFriendlyFire", false); } - if (!booleanValues.containsKey("officersCanMintCurrency")) { - booleanValues.put("officersCanMintCurrency", false); - } if (!booleanValues.containsKey("acceptBonusPower")) { booleanValues.put("acceptBonusPower", true); } diff --git a/src/main/java/dansplugins/factionsystem/services/MessageService.java b/src/main/java/dansplugins/factionsystem/services/MessageService.java index 5943f634b..af47cc96f 100644 --- a/src/main/java/dansplugins/factionsystem/services/MessageService.java +++ b/src/main/java/dansplugins/factionsystem/services/MessageService.java @@ -21,7 +21,9 @@ public MessageService(MedievalFactions medievalFactions) { public void createLanguageFile() { languageFile = new File(medievalFactions.getDataFolder(), "language.yml"); - if (!languageFile.exists()) medievalFactions.saveResource("language.yml", false); + if (!languageFile.exists()) { + medievalFactions.saveResource("language.yml", false); + } language = new YamlConfiguration(); try { From d6af19027554a3a24a29ef1e63b11607653aaa5f Mon Sep 17 00:00:00 2001 From: dmccoystephenson Date: Fri, 23 Sep 2022 17:23:09 -0600 Subject: [PATCH 21/24] Renamed methods in PlayerService class. --- .../factionsystem/commands/AddLawCommand.java | 4 +- .../factionsystem/commands/AllyCommand.java | 12 ++--- .../commands/AutoClaimCommand.java | 2 +- .../commands/BreakAllianceCommand.java | 8 ++-- .../factionsystem/commands/BypassCommand.java | 2 +- .../factionsystem/commands/ChatCommand.java | 2 +- .../commands/CheckAccessCommand.java | 6 +-- .../commands/CheckClaimCommand.java | 4 +- .../factionsystem/commands/ClaimCommand.java | 4 +- .../factionsystem/commands/CreateCommand.java | 10 ++-- .../commands/DeclareIndependenceCommand.java | 4 +- .../commands/DeclareWarCommand.java | 22 ++++----- .../factionsystem/commands/DemoteCommand.java | 12 ++--- .../factionsystem/commands/DescCommand.java | 4 +- .../commands/DisbandCommand.java | 10 ++-- .../factionsystem/commands/DuelCommand.java | 38 +++++++-------- .../commands/EditLawCommand.java | 4 +- .../factionsystem/commands/FlagsCommand.java | 10 ++-- .../factionsystem/commands/GateCommand.java | 42 ++++++++-------- .../commands/GrantAccessCommand.java | 12 ++--- .../commands/GrantIndependenceCommand.java | 2 +- .../factionsystem/commands/HomeCommand.java | 8 ++-- .../factionsystem/commands/InfoCommand.java | 6 +-- .../factionsystem/commands/InviteCommand.java | 12 ++--- .../factionsystem/commands/InvokeCommand.java | 10 ++-- .../factionsystem/commands/JoinCommand.java | 8 ++-- .../factionsystem/commands/KickCommand.java | 12 ++--- .../factionsystem/commands/LawsCommand.java | 10 ++-- .../factionsystem/commands/LeaveCommand.java | 2 +- .../factionsystem/commands/ListCommand.java | 4 +- .../factionsystem/commands/LockCommand.java | 4 +- .../commands/MakePeaceCommand.java | 12 ++--- .../commands/MembersCommand.java | 10 ++-- .../factionsystem/commands/PowerCommand.java | 8 ++-- .../factionsystem/commands/PrefixCommand.java | 4 +- .../commands/PromoteCommand.java | 18 +++---- .../commands/RemoveLawCommand.java | 6 +-- .../factionsystem/commands/RenameCommand.java | 8 ++-- .../commands/RevokeAccessCommand.java | 12 ++--- .../commands/SetHomeCommand.java | 6 +-- .../factionsystem/commands/StatsCommand.java | 2 +- .../commands/SwearFealtyCommand.java | 6 +-- .../commands/TransferCommand.java | 14 +++--- .../commands/UnclaimCommand.java | 6 +-- .../commands/UnclaimallCommand.java | 10 ++-- .../factionsystem/commands/UnlockCommand.java | 4 +- .../commands/VassalizeCommand.java | 10 ++-- .../factionsystem/commands/WhoCommand.java | 6 +-- .../commands/abs/SubCommand.java | 6 +-- .../factionsystem/data/PersistentData.java | 36 +++++++------- .../eventhandlers/InteractionHandler.java | 10 ++-- .../eventhandlers/MoveHandler.java | 2 +- .../objects/helper/FactionFlags.java | 6 +-- .../services/CommandService.java | 4 +- .../factionsystem/services/GateService.java | 48 +++++++++---------- .../factionsystem/services/LockService.java | 40 ++++++++-------- .../factionsystem/services/PlayerService.java | 17 +++---- .../utils/extended/Messenger.java | 12 ++--- .../utils/extended/Scheduler.java | 6 +-- 59 files changed, 307 insertions(+), 312 deletions(-) diff --git a/src/main/java/dansplugins/factionsystem/commands/AddLawCommand.java b/src/main/java/dansplugins/factionsystem/commands/AddLawCommand.java index 1f63d2abe..f068d1d6e 100644 --- a/src/main/java/dansplugins/factionsystem/commands/AddLawCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/AddLawCommand.java @@ -47,13 +47,13 @@ public void execute(Player player, String[] args, String key) { // check if they have provided any strings beyond "addlaw" if (args.length == 0) { - playerService.sendMessageType(player, translate("&c" + getText("UsageAddLaw")), "UsageAddLaw", false); + playerService.sendMessage(player, translate("&c" + getText("UsageAddLaw")), "UsageAddLaw", false); return; } // add the law and send a success message. faction.addLaw(String.join(" ", args)); - playerService.sendMessageType(player, "&a" + getText("LawAdded"), Objects.requireNonNull(messageService.getLanguage().getString("LawAdded")) + playerService.sendMessage(player, "&a" + getText("LawAdded"), Objects.requireNonNull(messageService.getLanguage().getString("LawAdded")) .replace("#law#", String.join(" ", args)), true); } diff --git a/src/main/java/dansplugins/factionsystem/commands/AllyCommand.java b/src/main/java/dansplugins/factionsystem/commands/AllyCommand.java index 7738646f5..5867d4a6d 100644 --- a/src/main/java/dansplugins/factionsystem/commands/AllyCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/AllyCommand.java @@ -48,7 +48,7 @@ public void execute(Player player, String[] args, String key) { } if (args.length == 0) { - playerService.sendMessageType(player, "&c" + getText("UsageAlly"), "UsageAlly", false); + playerService.sendMessage(player, "&c" + getText("UsageAlly"), "UsageAlly", false); return; } @@ -57,30 +57,30 @@ public void execute(Player player, String[] args, String key) { // the faction needs to exist to ally if (otherFaction == null) { - playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) + playerService.sendMessage(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) .replace("#faction#", String.join(" ", args)), true); return; } // the faction can't be itself if (otherFaction == faction) { - playerService.sendMessageType(player, "&c" + getText("CannotAllyWithSelf"), "CannotAllyWithSelf", false); + playerService.sendMessage(player, "&c" + getText("CannotAllyWithSelf"), "CannotAllyWithSelf", false); return; } // no need to allow them to ally if they're already allies if (faction.isAlly(otherFaction.getName())) { - playerService.sendMessageType(player, "&c" + getText("FactionAlreadyAlly"), "FactionAlreadyAlly", false); + playerService.sendMessage(player, "&c" + getText("FactionAlreadyAlly"), "FactionAlreadyAlly", false); return; } if (faction.isEnemy(otherFaction.getName())) { - playerService.sendMessageType(player, "&cThat faction is currently at war with your faction.", "FactionIsEnemy", false); + playerService.sendMessage(player, "&cThat faction is currently at war with your faction.", "FactionIsEnemy", false); return; } if (faction.isRequestedAlly(otherFaction.getName())) { - playerService.sendMessageType(player, "&c" + getText("AlertAlreadyRequestedAlliance"), "AlertAlreadyRequestedAlliance", false); + playerService.sendMessage(player, "&c" + getText("AlertAlreadyRequestedAlliance"), "AlertAlreadyRequestedAlliance", false); return; } diff --git a/src/main/java/dansplugins/factionsystem/commands/AutoClaimCommand.java b/src/main/java/dansplugins/factionsystem/commands/AutoClaimCommand.java index f79db9a6d..fa3ee72d5 100644 --- a/src/main/java/dansplugins/factionsystem/commands/AutoClaimCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/AutoClaimCommand.java @@ -44,7 +44,7 @@ public void execute(Player player, String[] args, String key) { } faction.toggleAutoClaim(); - playerService.sendMessageType(player, "&b" + getText("AutoclaimToggled"), "AutoclaimToggled", false); + playerService.sendMessage(player, "&b" + getText("AutoclaimToggled"), "AutoclaimToggled", false); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/BreakAllianceCommand.java b/src/main/java/dansplugins/factionsystem/commands/BreakAllianceCommand.java index aa5da93e9..f1938c653 100644 --- a/src/main/java/dansplugins/factionsystem/commands/BreakAllianceCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/BreakAllianceCommand.java @@ -47,25 +47,25 @@ public void execute(Player player, String[] args, String key) { } if (args.length == 0) { - playerService.sendMessageType(player, "&c" + getText("UsageBreakAlliance"), "UsageBreakAlliance", false); + playerService.sendMessage(player, "&c" + getText("UsageBreakAlliance"), "UsageBreakAlliance", false); return; } final Faction otherFaction = getFaction(String.join(" ", args)); if (otherFaction == null) { - playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), + playerService.sendMessage(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) .replace("#faction#", String.join(" ", args)), true); return; } if (otherFaction == faction) { - playerService.sendMessageType(player, "&c" + getText("CannotBreakAllianceWithSelf"), "CannotBreakAllianceWithSelf", false); + playerService.sendMessage(player, "&c" + getText("CannotBreakAllianceWithSelf"), "CannotBreakAllianceWithSelf", false); return; } if (!faction.isAlly(otherFaction.getName())) { - playerService.sendMessageType(player, "&c" + getText("AlertNotAllied", otherFaction.getName()), + playerService.sendMessage(player, "&c" + getText("AlertNotAllied", otherFaction.getName()), Objects.requireNonNull(messageService.getLanguage().getString("AlertNotAllied")) .replace("#faction#", otherFaction.getName()), true); return; diff --git a/src/main/java/dansplugins/factionsystem/commands/BypassCommand.java b/src/main/java/dansplugins/factionsystem/commands/BypassCommand.java index 96776980c..f44922702 100644 --- a/src/main/java/dansplugins/factionsystem/commands/BypassCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/BypassCommand.java @@ -51,7 +51,7 @@ public void execute(Player player, String[] args, String key) { } else { ephemeralData.getAdminsBypassingProtections().add(player.getUniqueId()); } - playerService.sendMessageType(player, "&a" + getText(path), path, false); + playerService.sendMessage(player, "&a" + getText(path), path, false); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/ChatCommand.java b/src/main/java/dansplugins/factionsystem/commands/ChatCommand.java index 3e1907c7a..f6ff98404 100644 --- a/src/main/java/dansplugins/factionsystem/commands/ChatCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/ChatCommand.java @@ -49,7 +49,7 @@ public void execute(Player player, String[] args, String key) { } else { ephemeralData.getPlayersInFactionChat().add(player.getUniqueId()); } - playerService.sendMessageType(player, "&c" + getText(path), path, false); + playerService.sendMessage(player, "&c" + getText(path), path, false); } /** diff --git a/src/main/java/dansplugins/factionsystem/commands/CheckAccessCommand.java b/src/main/java/dansplugins/factionsystem/commands/CheckAccessCommand.java index ff97b65b3..adf15a6fa 100644 --- a/src/main/java/dansplugins/factionsystem/commands/CheckAccessCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/CheckAccessCommand.java @@ -48,13 +48,13 @@ public void execute(Player player, String[] args, String key) { if (cancel && contains) { ephemeralData.getPlayersCheckingAccess().remove(player.getUniqueId()); - playerService.sendMessageType(player, "&c" + getText("Cancelled"), "Cancelled", false); + playerService.sendMessage(player, "&c" + getText("Cancelled"), "Cancelled", false); } else { if (contains) { - playerService.sendMessageType(player, "&c" + getText("AlreadyEnteredCheckAccess"), "AlreadyEnteredCheckAccess", false); + playerService.sendMessage(player, "&c" + getText("AlreadyEnteredCheckAccess"), "AlreadyEnteredCheckAccess", false); } else { ephemeralData.getPlayersCheckingAccess().add(player.getUniqueId()); - playerService.sendMessageType(player, "&a" + getText("RightClickCheckAccess"), "RightClickCheckAccess", false); + playerService.sendMessage(player, "&a" + getText("RightClickCheckAccess"), "RightClickCheckAccess", false); } } } diff --git a/src/main/java/dansplugins/factionsystem/commands/CheckClaimCommand.java b/src/main/java/dansplugins/factionsystem/commands/CheckClaimCommand.java index 31cc43b52..fd349b4ed 100644 --- a/src/main/java/dansplugins/factionsystem/commands/CheckClaimCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/CheckClaimCommand.java @@ -43,9 +43,9 @@ public void execute(Player player, String[] args, String key) { final String result = chunkDataAccessor.checkOwnershipAtPlayerLocation(player); if (result.equals("unclaimed")) { - playerService.sendMessageType(player, "&a" + getText("LandIsUnclaimed"), "LandIsUnclaimed", false); + playerService.sendMessage(player, "&a" + getText("LandIsUnclaimed"), "LandIsUnclaimed", false); } else { - playerService.sendMessageType(player, "&c" + getText("LandClaimedBy"), Objects.requireNonNull(messageService.getLanguage().getString("LandClaimedBy")) + playerService.sendMessage(player, "&c" + getText("LandClaimedBy"), Objects.requireNonNull(messageService.getLanguage().getString("LandClaimedBy")) .replace("#player#", result), true); } } diff --git a/src/main/java/dansplugins/factionsystem/commands/ClaimCommand.java b/src/main/java/dansplugins/factionsystem/commands/ClaimCommand.java index 1fb8c934f..09a5ad446 100644 --- a/src/main/java/dansplugins/factionsystem/commands/ClaimCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/ClaimCommand.java @@ -38,7 +38,7 @@ public void execute(Player player, String[] args, String key) { if ((boolean) faction.getFlags().getFlag("mustBeOfficerToManageLand")) { // officer or owner rank required if (!faction.isOfficer(player.getUniqueId()) && !faction.isOwner(player.getUniqueId())) { - playerService.sendMessageType(player, "&a" + getText("AlertMustBeOfficerOrOwnerToClaimLand"), "AlertMustBeOfficerOrOwnerToClaimLand", false); + playerService.sendMessage(player, "&a" + getText("AlertMustBeOfficerOrOwnerToClaimLand"), "AlertMustBeOfficerOrOwnerToClaimLand", false); return; } } @@ -47,7 +47,7 @@ public void execute(Player player, String[] args, String key) { int depth = getIntSafe(args[0], -1); if (depth <= 0) { - playerService.sendMessageType(player, "&a" + getText("UsageClaimRadius"), "UsageClaimRadius", false); + playerService.sendMessage(player, "&a" + getText("UsageClaimRadius"), "UsageClaimRadius", false); } else { chunkDataAccessor.radiusClaimAtLocation(depth, player, player.getLocation(), faction); } diff --git a/src/main/java/dansplugins/factionsystem/commands/CreateCommand.java b/src/main/java/dansplugins/factionsystem/commands/CreateCommand.java index 3db506de6..32eaca2ed 100644 --- a/src/main/java/dansplugins/factionsystem/commands/CreateCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/CreateCommand.java @@ -54,13 +54,13 @@ public void execute(Player player, String[] args, String key) { this.faction = getPlayerFaction(player); if (this.faction != null) { - playerService.sendMessageType(player, "&c" + getText("AlreadyInFaction"), + playerService.sendMessage(player, "&c" + getText("AlreadyInFaction"), "AlreadyInFaction", false); return; } if (args.length == 0) { - playerService.sendMessageType(player, "&c" + getText("UsageCreate"), + playerService.sendMessage(player, "&c" + getText("UsageCreate"), "UsageCreate", false); return; } @@ -70,14 +70,14 @@ public void execute(Player player, String[] args, String key) { final FileConfiguration config = configService.getConfig(); if (factionName.length() > config.getInt("factionMaxNameLength")) { - playerService.sendMessageType(player, "&c" + getText("FactionNameTooLong"), + playerService.sendMessage(player, "&c" + getText("FactionNameTooLong"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNameTooLong")) .replace("#name#", factionName), true); return; } if (persistentData.getFaction(factionName) != null) { - playerService.sendMessageType(player, "&c" + getText("FactionAlreadyExists"), + playerService.sendMessage(player, "&c" + getText("FactionAlreadyExists"), Objects.requireNonNull(messageService.getLanguage().getString("FactionAlreadyExists")) .replace("#name#", factionName), true); return; @@ -91,7 +91,7 @@ public void execute(Player player, String[] args, String key) { Bukkit.getPluginManager().callEvent(createEvent); if (!createEvent.isCancelled()) { persistentData.addFaction(this.faction); - playerService.sendMessageType(player, "&a" + getText("FactionCreated"), + playerService.sendMessage(player, "&a" + getText("FactionCreated"), Objects.requireNonNull(messageService.getLanguage().getString("FactionCreated")) .replace("#name#", factionName), true); } diff --git a/src/main/java/dansplugins/factionsystem/commands/DeclareIndependenceCommand.java b/src/main/java/dansplugins/factionsystem/commands/DeclareIndependenceCommand.java index e8cbbb941..e65f32b74 100644 --- a/src/main/java/dansplugins/factionsystem/commands/DeclareIndependenceCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/DeclareIndependenceCommand.java @@ -44,13 +44,13 @@ public void execute(Player player, String[] args, String key) { } if (!(this.faction.hasLiege()) || this.faction.getLiege() == null) { - playerService.sendMessageType(player, "&c" + getText("NotAVassalOfAFaction"), "NotAVassalOfAFaction", false); + playerService.sendMessage(player, "&c" + getText("NotAVassalOfAFaction"), "NotAVassalOfAFaction", false); return; } final Faction liege = getFaction(this.faction.getLiege()); if (liege == null) { - playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")).replace("#faction#", String.join(" ", args)), true); + playerService.sendMessage(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")).replace("#faction#", String.join(" ", args)), true); return; } diff --git a/src/main/java/dansplugins/factionsystem/commands/DeclareWarCommand.java b/src/main/java/dansplugins/factionsystem/commands/DeclareWarCommand.java index e47f35a57..8301655a1 100644 --- a/src/main/java/dansplugins/factionsystem/commands/DeclareWarCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/DeclareWarCommand.java @@ -51,7 +51,7 @@ public void execute(Player player, String[] args, String key) { } if (args.length == 0) { - playerService.sendMessageType(player, "&c" + "Usage: /mf declarewar \"faction\"", + playerService.sendMessage(player, "&c" + "Usage: /mf declarewar \"faction\"", "UsageDeclareWar", false); return; } @@ -60,7 +60,7 @@ public void execute(Player player, String[] args, String key) { List doubleQuoteArgs = argumentParser.getArgumentsInsideDoubleQuotes(args); if (doubleQuoteArgs.size() == 0) { - playerService.sendMessageType(player, "&c" + "Usage: /mf declarewar \"faction\" (quotation marks are required)", + playerService.sendMessage(player, "&c" + "Usage: /mf declarewar \"faction\" (quotation marks are required)", "UsageDeclareWar", false); return; } @@ -69,19 +69,19 @@ public void execute(Player player, String[] args, String key) { final Faction opponent = getFaction(factionName); if (opponent == null) { - playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) + playerService.sendMessage(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) .replace("#faction#", String.join(" ", args)), true); return; } if (opponent == faction) { - playerService.sendMessageType(player, "&c" + getText("CannotDeclareWarOnYourself") + playerService.sendMessage(player, "&c" + getText("CannotDeclareWarOnYourself") , "CannotDeclareWarOnYourself", false); return; } if (faction.isEnemy(opponent.getName())) { - playerService.sendMessageType(player, "&c" + getText("CannotDeclareWarOnYourself") + playerService.sendMessage(player, "&c" + getText("CannotDeclareWarOnYourself") , Objects.requireNonNull(messageService.getLanguage().getString("AlertAlreadyAtWarWith")).replace("#faction#", opponent.getName()), true); return; @@ -89,7 +89,7 @@ public void execute(Player player, String[] args, String key) { if (faction.hasLiege() && opponent.hasLiege()) { if (faction.isVassal(opponent.getName())) { - playerService.sendMessageType(player, "&c" + getText("CannotDeclareWarOnVassal") + playerService.sendMessage(player, "&c" + getText("CannotDeclareWarOnVassal") , "CannotDeclareWarOnVassal", false); return; } @@ -98,33 +98,33 @@ public void execute(Player player, String[] args, String key) { final Faction enemyLiege = getFaction(opponent.getLiege()); if (enemyLiege.calculateCumulativePowerLevelWithoutVassalContribution() < enemyLiege.getMaximumCumulativePowerLevel() / 2) { - playerService.sendMessageType(player, "&c" + getText("CannotDeclareWarIfLiegeNotWeakened") + playerService.sendMessage(player, "&c" + getText("CannotDeclareWarIfLiegeNotWeakened") , "CannotDeclareWarIfLiegeNotWeakened", false); } } } if (faction.isLiege(opponent.getName())) { - playerService.sendMessageType(player, "&c" + getText("CannotDeclareWarOnLiege") + playerService.sendMessage(player, "&c" + getText("CannotDeclareWarOnLiege") , "CannotDeclareWarOnLiege", false); return; } if (faction.isAlly(opponent.getName())) { - playerService.sendMessageType(player, "&c" + getText("CannotDeclareWarOnAlly") + playerService.sendMessage(player, "&c" + getText("CannotDeclareWarOnAlly") , "CannotDeclareWarOnAlly", false); return; } if (configService.getBoolean("allowNeutrality") && ((boolean) opponent.getFlags().getFlag("neutral"))) { - playerService.sendMessageType(player, "&c" + getText("CannotDeclareWarOnNeutralFaction") + playerService.sendMessage(player, "&c" + getText("CannotDeclareWarOnNeutralFaction") , "CannotDeclareWarOnNeutralFaction", false); return; } if (configService.getBoolean("allowNeutrality") && ((boolean) faction.getFlags().getFlag("neutral"))) { - playerService.sendMessageType(player, "&c" + getText("CannotDeclareWarIfNeutralFaction") + playerService.sendMessage(player, "&c" + getText("CannotDeclareWarIfNeutralFaction") , "CannotDeclareWarIfNeutralFaction", false); return; } diff --git a/src/main/java/dansplugins/factionsystem/commands/DemoteCommand.java b/src/main/java/dansplugins/factionsystem/commands/DemoteCommand.java index a19820dab..a4de04516 100644 --- a/src/main/java/dansplugins/factionsystem/commands/DemoteCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/DemoteCommand.java @@ -46,7 +46,7 @@ public void execute(Player player, String[] args, String key) { } if (args.length == 0) { - playerService.sendMessageType(player, "&c" + getText("UsageDemote") + playerService.sendMessage(player, "&c" + getText("UsageDemote") , "UsageDemote", false); return; } @@ -59,20 +59,20 @@ public void execute(Player player, String[] args, String key) { } if (playerToBeDemoted == null) { - playerService.sendMessageType(player, "&c" + getText("PlayerByNameNotFound") + playerService.sendMessage(player, "&c" + getText("PlayerByNameNotFound") , Objects.requireNonNull(messageService.getLanguage().getString("PlayerByNameNotFound")) .replace("#name#", args[0]), true); return; } if (playerToBeDemoted.getUniqueId() == player.getUniqueId()) { - playerService.sendMessageType(player, "&c" + getText("CannotDemoteSelf") + playerService.sendMessage(player, "&c" + getText("CannotDemoteSelf") , "CannotDemoteSelf", false); return; } if (!this.faction.isOfficer(playerToBeDemoted.getUniqueId())) { - playerService.sendMessageType(player, "&c" + getText("PlayerIsNotOfficerOfFaction") + playerService.sendMessage(player, "&c" + getText("PlayerIsNotOfficerOfFaction") , "PlayerIsNotOfficerOfFaction", false); return; } @@ -80,10 +80,10 @@ public void execute(Player player, String[] args, String key) { faction.removeOfficer(playerToBeDemoted.getUniqueId()); if (playerToBeDemoted.isOnline()) { - playerService.sendMessageType(player, "&c" + getText("AlertDemotion") + playerService.sendMessage(player, "&c" + getText("AlertDemotion") , "AlertDemotion", false); } - playerService.sendMessageType(player, "&c" + getText("PlayerDemoted") + playerService.sendMessage(player, "&c" + getText("PlayerDemoted") , Objects.requireNonNull(messageService.getLanguage().getString("PlayerDemoted")) .replace("#name#", playerToBeDemoted.getName()), true); } diff --git a/src/main/java/dansplugins/factionsystem/commands/DescCommand.java b/src/main/java/dansplugins/factionsystem/commands/DescCommand.java index 625b4c7c1..e79c8f4ad 100644 --- a/src/main/java/dansplugins/factionsystem/commands/DescCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/DescCommand.java @@ -43,13 +43,13 @@ public void execute(Player player, String[] args, String key) { } if (args.length == 0) { - playerService.sendMessageType(player, "&c" + getText("UsageDesc") + playerService.sendMessage(player, "&c" + getText("UsageDesc") , "UsageDesc", false); return; } faction.setDescription(String.join(" ", args)); - playerService.sendMessageType(player, "&c" + getText("DescriptionSet") + playerService.sendMessage(player, "&c" + getText("DescriptionSet") , Objects.requireNonNull(messageService.getLanguage().getString("Description")) .replace("#desc#", String.join(" ", args)), true); } diff --git a/src/main/java/dansplugins/factionsystem/commands/DisbandCommand.java b/src/main/java/dansplugins/factionsystem/commands/DisbandCommand.java index cf7749725..5037241b5 100644 --- a/src/main/java/dansplugins/factionsystem/commands/DisbandCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/DisbandCommand.java @@ -67,14 +67,14 @@ public void execute(CommandSender sender, String[] args, String key) { if (!configService.getBoolean("useNewLanguageFile")) { sender.sendMessage(translate(getText("OnlyPlayersCanUseCommand"))); } else { - playerService.sendConsoleMessage(sender.getServer().getConsoleSender(), "OnlyPlayersCanUseCommand", true); + playerService.sendMessageToConsole(sender.getServer().getConsoleSender(), "OnlyPlayersCanUseCommand", true); } return; } disband = getPlayerFaction(sender); self = true; if (disband.getPopulation() != 1) { - playerService.sendMessageType(sender, "&c" + getText("AlertMustKickAllPlayers") + playerService.sendMessage(sender, "&c" + getText("AlertMustKickAllPlayers") , "AlertMustKickAllPlayers", false); return; } @@ -84,18 +84,18 @@ public void execute(CommandSender sender, String[] args, String key) { self = false; } if (disband == null) { - playerService.sendMessageType(sender, "&c" + getText("FactionNotFound") + playerService.sendMessage(sender, "&c" + getText("FactionNotFound") , Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) .replace("#faction#", String.join(" ", args)), true); return; } final int factionIndex = persistentData.getFactionIndexOf(disband); if (self) { - playerService.sendMessageType(sender, "&c" + getText("FactionSuccessfullyDisbanded") + playerService.sendMessage(sender, "&c" + getText("FactionSuccessfullyDisbanded") , "FactionSuccessfullyDisbanded", false); ephemeralData.getPlayersInFactionChat().remove(((Player) sender).getUniqueId()); } else { - playerService.sendMessageType(sender, "&c" + getText("SuccessfulDisbandment", disband.getName()) + playerService.sendMessage(sender, "&c" + getText("SuccessfulDisbandment", disband.getName()) , Objects.requireNonNull(messageService.getLanguage().getString("SuccessfulDisbandment")).replace("#faction#", disband.getName()), true); } removeFaction(factionIndex, self ? ((OfflinePlayer) sender) : null); diff --git a/src/main/java/dansplugins/factionsystem/commands/DuelCommand.java b/src/main/java/dansplugins/factionsystem/commands/DuelCommand.java index d52a80d28..2acab0e75 100644 --- a/src/main/java/dansplugins/factionsystem/commands/DuelCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/DuelCommand.java @@ -47,26 +47,26 @@ public void execute(Player player, String[] args, String key) { sendHelp(player); return; } - if (safeEquals(args[0], playerService.getMessageType(getText("CmdDuelChallenge"), messageService.getLanguage().getString("Alias. CmdDuelChallenge")), "challenge")) { + if (safeEquals(args[0], playerService.decideWhichMessageToUse(getText("CmdDuelChallenge"), messageService.getLanguage().getString("Alias. CmdDuelChallenge")), "challenge")) { if (!(args.length >= 2)) { sendHelp(player); return; } if (player.getName().equals(args[1])) { - playerService.sendMessageType(player, "&c" + getText("CannotDuelSelf"), "CannotDuelSelf", false); + playerService.sendMessage(player, "&c" + getText("CannotDuelSelf"), "CannotDuelSelf", false); return; } if (isDuelling(player)) { - playerService.sendMessageType(player, "&c" + getText("AlertAlreadyDuelingSomeone"), "AlertAlreadyDuelingSomeone", false); + playerService.sendMessage(player, "&c" + getText("AlertAlreadyDuelingSomeone"), "AlertAlreadyDuelingSomeone", false); return; } Player target = Bukkit.getPlayer(args[1]); if (target == null) { - playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[1]), true); + playerService.sendMessage(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[1]), true); return; } if (isDuelling(target)) { - playerService.sendMessageType(player, "&c" + getText("PlayerAlreadyDueling", target.getName()), Objects.requireNonNull(messageService.getLanguage().getString("PlayerAlreadyDueling")).replace("#name#", args[1]), true); + playerService.sendMessage(player, "&c" + getText("PlayerAlreadyDueling", target.getName()), Objects.requireNonNull(messageService.getLanguage().getString("PlayerAlreadyDueling")).replace("#name#", args[1]), true); return; } int timeLimit = 120; // Time limit in seconds. TODO: Make config option. @@ -74,10 +74,10 @@ public void execute(Player player, String[] args, String key) { timeLimit = getIntSafe(args[2], 120); } inviteDuel(player, target, timeLimit); - playerService.sendMessageType(player, "&b" + getText("AlertChallengeIssued", target.getName()), Objects.requireNonNull(messageService.getLanguage().getString("AlertChallengeIssued")).replace("#name#", target.getName()), true); - } else if (safeEquals(args[0], playerService.getMessageType(getText("CmdDuelAccept"), messageService.getLanguage().getString("Alias.CmdDuelAccept")), "accept")) { + playerService.sendMessage(player, "&b" + getText("AlertChallengeIssued", target.getName()), Objects.requireNonNull(messageService.getLanguage().getString("AlertChallengeIssued")).replace("#name#", target.getName()), true); + } else if (safeEquals(args[0], playerService.decideWhichMessageToUse(getText("CmdDuelAccept"), messageService.getLanguage().getString("Alias.CmdDuelAccept")), "accept")) { if (isDuelling(player)) { - playerService.sendMessageType(player, "&c" + getText("AlertAlreadyDuelingSomeone"), "AlertAlreadyDuelingSomeone", false); + playerService.sendMessage(player, "&c" + getText("AlertAlreadyDuelingSomeone"), "AlertAlreadyDuelingSomeone", false); return; } final Duel duel; @@ -85,7 +85,7 @@ public void execute(Player player, String[] args, String key) { if (args.length >= 2) { final Player target = Bukkit.getPlayer(args[2]); if (target == null) { - playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[1]), true); + playerService.sendMessage(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[1]), true); return; } duel = ephemeralData.getDuel(player, target); @@ -101,34 +101,34 @@ public void execute(Player player, String[] args, String key) { alreadyDueling2 = messageService.getLanguage().getString("AlertAlreadyDueling"); } if (duel == null) { - playerService.sendMessageType(player, "&c" + notChallenged, notChallenged2, true); + playerService.sendMessage(player, "&c" + notChallenged, notChallenged2, true); return; } if (duel.getStatus().equals(DuelState.DUELLING)) { - playerService.sendMessageType(player, "&c" + alreadyDueling, alreadyDueling2, true); + playerService.sendMessage(player, "&c" + alreadyDueling, alreadyDueling2, true); return; } if (!(duel.isChallenged(player))) { - playerService.sendMessageType(player, "&c" + notChallenged, notChallenged2, true); + playerService.sendMessage(player, "&c" + notChallenged, notChallenged2, true); return; } duel.acceptDuel(); - } else if (safeEquals(args[0], playerService.getMessageType(getText("CmdDuelCancel"), messageService.getLanguage().getString("Alias.CmdDuelCancel")), "cancel")) { + } else if (safeEquals(args[0], playerService.decideWhichMessageToUse(getText("CmdDuelCancel"), messageService.getLanguage().getString("Alias.CmdDuelCancel")), "cancel")) { if (!isDuelling(player)) { - playerService.sendMessageType(player, "&c" + getText("AlertNoPendingChallenges"), "AlertNoPendingChallenges", false); + playerService.sendMessage(player, "&c" + getText("AlertNoPendingChallenges"), "AlertNoPendingChallenges", false); return; } final Duel duel = getDuel(player); if (duel == null) { - playerService.sendMessageType(player, "&c" + getText("AlertNoPendingChallenges"), "AlertNoPendingChallenges", false); + playerService.sendMessage(player, "&c" + getText("AlertNoPendingChallenges"), "AlertNoPendingChallenges", false); return; } if (duel.getStatus().equals(DuelState.DUELLING)) { - playerService.sendMessageType(player, "c" + getText("CannotCancelActiveDuel"), "CannotCancelActiveDuel", false); + playerService.sendMessage(player, "c" + getText("CannotCancelActiveDuel"), "CannotCancelActiveDuel", false); return; } ephemeralData.getDuelingPlayers().remove(duel); - playerService.sendMessageType(player, "&b" + getText("DuelChallengeCancelled"), "DuelChallengeCancelled", false); + playerService.sendMessage(player, "&b" + getText("DuelChallengeCancelled"), "DuelChallengeCancelled", false); } else { sendHelp(player); } @@ -153,7 +153,7 @@ private void sendHelp(CommandSender sender) { sender.sendMessage("&b" + getText("HelpDuelAccept")); sender.sendMessage("&b" + getText("HelpDuelCancel")); } else { - playerService.sendListMessage(sender, messageService.getLanguage().getStringList("DuelHelp")); + playerService.sendMultipleMessages(sender, messageService.getLanguage().getStringList("DuelHelp")); } } @@ -166,7 +166,7 @@ private boolean isDuelling(Player player) { } private void inviteDuel(Player player, Player target, int limit) { - playerService.sendMessageType(target, "&a" + getText("AlertChallengedToDuelPlusHowTo", player.getName()), + playerService.sendMessage(target, "&a" + getText("AlertChallengedToDuelPlusHowTo", player.getName()), Objects.requireNonNull(messageService.getLanguage().getString("AlertChallengedToDuelPlusHowTo")) .replace("#name#", player.getName()), true); ephemeralData.getDuelingPlayers().add(new Duel(medievalFactions, ephemeralData, player, target, limit)); diff --git a/src/main/java/dansplugins/factionsystem/commands/EditLawCommand.java b/src/main/java/dansplugins/factionsystem/commands/EditLawCommand.java index e0000f9c8..28a4a0902 100644 --- a/src/main/java/dansplugins/factionsystem/commands/EditLawCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/EditLawCommand.java @@ -37,14 +37,14 @@ public void execute(Player player, String[] args, String key) { if (!(checkPermissions(player, permission))) return; final int lawToEdit = getIntSafe(args[0], 0) - 1; if (lawToEdit < 0 || lawToEdit >= faction.getLaws().size()) { - playerService.sendMessageType(player, "&c" + getText("UsageEditLaw"), "UsageEditLaw", false); + playerService.sendMessage(player, "&c" + getText("UsageEditLaw"), "UsageEditLaw", false); return; } String[] arguments = new String[args.length - 1]; System.arraycopy(args, 1, arguments, 0, arguments.length); final String editedLaw = String.join(" ", arguments); if (faction.editLaw(lawToEdit, editedLaw)) { - playerService.sendMessageType(player, "&a" + getText("LawEdited"), "LawEdited", false); + playerService.sendMessage(player, "&a" + getText("LawEdited"), "LawEdited", false); } } diff --git a/src/main/java/dansplugins/factionsystem/commands/FlagsCommand.java b/src/main/java/dansplugins/factionsystem/commands/FlagsCommand.java index 06102ce83..416e4c669 100644 --- a/src/main/java/dansplugins/factionsystem/commands/FlagsCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/FlagsCommand.java @@ -40,19 +40,19 @@ public void execute(Player player, String[] args, String key) { } if (args.length == 0) { - playerService.sendMessageType(player, "&c" + getText("ValidSubCommandsShowSet"), "ValidSubCommandsShowSet", false); + playerService.sendMessage(player, "&c" + getText("ValidSubCommandsShowSet"), "ValidSubCommandsShowSet", false); return; } final Faction playersFaction = getPlayerFaction(player); - final boolean show = safeEquals(args[0], "get", "show", playerService.getMessageType(getText("CmdFlagsShow"), messageService.getLanguage().getString("Alias.CmdFlagsShow"))); - final boolean set = safeEquals(args[0], "set", playerService.getMessageType(getText("CmdFlagsSet"), messageService.getLanguage().getString("Alias.CmdFlagsSet"))); + final boolean show = safeEquals(args[0], "get", "show", playerService.decideWhichMessageToUse(getText("CmdFlagsShow"), messageService.getLanguage().getString("Alias.CmdFlagsShow"))); + final boolean set = safeEquals(args[0], "set", playerService.decideWhichMessageToUse(getText("CmdFlagsSet"), messageService.getLanguage().getString("Alias.CmdFlagsSet"))); if (show) { playersFaction.getFlags().sendFlagList(player); } else if (set) { if (args.length < 3) { - playerService.sendMessageType(player, "&c" + getText("UsageFlagsSet"), "UsageFlagsSet", false); + playerService.sendMessage(player, "&c" + getText("UsageFlagsSet"), "UsageFlagsSet", false); } else { final StringBuilder builder = new StringBuilder(); // Send the flag_argument as one String for (int i = 2; i < args.length; i++) builder.append(args[i]).append(" "); @@ -60,7 +60,7 @@ public void execute(Player player, String[] args, String key) { } } else { - playerService.sendMessageType(player, "&c" + getText("ValidSubCommandsShowSet"), "ValidSubCommandsShowSet", false); + playerService.sendMessage(player, "&c" + getText("ValidSubCommandsShowSet"), "ValidSubCommandsShowSet", false); } } diff --git a/src/main/java/dansplugins/factionsystem/commands/GateCommand.java b/src/main/java/dansplugins/factionsystem/commands/GateCommand.java index 1e57e3cfd..13b25b7b8 100644 --- a/src/main/java/dansplugins/factionsystem/commands/GateCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/GateCommand.java @@ -54,25 +54,25 @@ public void execute(Player player, String[] args, String key) { player.sendMessage(translate("&b" + getText("HelpGateRemove"))); player.sendMessage(translate("&b" + getText("HelpGateCancel"))); } else { - playerService.sendListMessage(player, messageService.getLanguage().getStringList("GateHelp")); + playerService.sendMultipleMessages(player, messageService.getLanguage().getStringList("GateHelp")); } return; } - if (safeEquals(args[0], "cancel", playerService.getMessageType(getText("CmdGateCancel"), messageService.getLanguage().getString("Alias.CmdGateCancel")))) { + if (safeEquals(args[0], "cancel", playerService.decideWhichMessageToUse(getText("CmdGateCancel"), messageService.getLanguage().getString("Alias.CmdGateCancel")))) { // Cancel Logic if (ephemeralData.getCreatingGatePlayers().remove(player.getUniqueId()) != null) { - playerService.sendMessageType(player, "&c" + getText("CreatingGateCancelled"), "CreatingGateCancelled", false); + playerService.sendMessage(player, "&c" + getText("CreatingGateCancelled"), "CreatingGateCancelled", false); return; } } - if (safeEquals(args[0], "create", playerService.getMessageType(getText("CmdGateCreate"), messageService.getLanguage().getString("Alias.CmdGateCreate")))) { + if (safeEquals(args[0], "create", playerService.decideWhichMessageToUse(getText("CmdGateCreate"), messageService.getLanguage().getString("Alias.CmdGateCreate")))) { // Create Logic if (ephemeralData.getCreatingGatePlayers().containsKey(player.getUniqueId())) { - playerService.sendMessageType(player, "&c" + getText("AlertAlreadyCreatingGate"), "AlertAlreadyCreatingGate", false); + playerService.sendMessage(player, "&c" + getText("AlertAlreadyCreatingGate"), "AlertAlreadyCreatingGate", false); return; } if (!faction.isOfficer(player.getUniqueId()) && !faction.isOwner(player.getUniqueId())) { - playerService.sendMessageType(player, "&c" + getText("AlertMustBeOwnerOrOfficerToUseCommand"), "AlertMustBeOwnerOrOfficerToUseCommand", false); + playerService.sendMessage(player, "&c" + getText("AlertMustBeOwnerOrOfficerToUseCommand"), "AlertMustBeOwnerOrOfficerToUseCommand", false); return; } final String gateName; @@ -81,62 +81,62 @@ public void execute(Player player, String[] args, String key) { System.arraycopy(args, 1, arguments, 0, arguments.length); gateName = String.join(" ", arguments); } else { - gateName = playerService.getMessageType("Unnamed Gate", messageService.getLanguage().getString("UnnamedGate")); + gateName = playerService.decideWhichMessageToUse("Unnamed Gate", messageService.getLanguage().getString("UnnamedGate")); } startCreatingGate(player, gateName); - playerService.sendMessageType(player, "&b" + getText("CreatingGateClickWithHoe"), "CreatingGateClickWithHoe", false); + playerService.sendMessage(player, "&b" + getText("CreatingGateClickWithHoe"), "CreatingGateClickWithHoe", false); return; } - if (safeEquals(args[0], "list", playerService.getMessageType(getText("CmdGateList"), messageService.getLanguage().getString("Alias.CmdGateList")))) { + if (safeEquals(args[0], "list", playerService.decideWhichMessageToUse(getText("CmdGateList"), messageService.getLanguage().getString("Alias.CmdGateList")))) { // List logic if (faction.getGates().size() > 0) { - playerService.sendMessageType(player, "&bFaction Gates", "FactionGate", false); + playerService.sendMessage(player, "&bFaction Gates", "FactionGate", false); for (Gate gate : faction.getGates()) { - playerService.sendMessageType(player, "&b" + String.format("%s: %s", gate.getName(), gate.coordsToString()), + playerService.sendMessage(player, "&b" + String.format("%s: %s", gate.getName(), gate.coordsToString()), Objects.requireNonNull(messageService.getLanguage().getString("GateLocation")) .replace("#name#", gate.getName()) .replace("#location#", gate.coordsToString()), true); } } else { - playerService.sendMessageType(player, "&c" + getText("AlertNoGatesDefined"), "AlertNoGatesDefined", false); + playerService.sendMessage(player, "&c" + getText("AlertNoGatesDefined"), "AlertNoGatesDefined", false); } return; } - final boolean remove = safeEquals(args[0], "remove", playerService.getMessageType(getText("CmdGateRemove"), messageService.getLanguage().getString("Alias.CmdGateRemove"))); - final boolean rename = safeEquals(args[0], "name", playerService.getMessageType(getText("CmdGateName"), messageService.getLanguage().getString("Alias.CmdGateName"))); + final boolean remove = safeEquals(args[0], "remove", playerService.decideWhichMessageToUse(getText("CmdGateRemove"), messageService.getLanguage().getString("Alias.CmdGateRemove"))); + final boolean rename = safeEquals(args[0], "name", playerService.decideWhichMessageToUse(getText("CmdGateName"), messageService.getLanguage().getString("Alias.CmdGateName"))); if (rename || remove) { final Block targetBlock = player.getTargetBlock(null, 16); if (targetBlock.getType().equals(Material.AIR)) { - playerService.sendMessageType(player, "&c" + getText("NoBlockDetectedToCheckForGate") + playerService.sendMessage(player, "&c" + getText("NoBlockDetectedToCheckForGate") , "NoBlockDetectedToCheckForGate", false); return; } if (!persistentData.isGateBlock(targetBlock)) { - playerService.sendMessageType(player, "&c" + getText("TargetBlockNotPartOfGate") + playerService.sendMessage(player, "&c" + getText("TargetBlockNotPartOfGate") , "TargetBlockNotPartOfGate", false); return; } final Gate gate = persistentData.getGate(targetBlock); if (gate == null) { - playerService.sendMessageType(player, "&c" + getText("TargetBlockNotPartOfGate") + playerService.sendMessage(player, "&c" + getText("TargetBlockNotPartOfGate") , "TargetBlockNotPartOfGate", false); return; } final Faction gateFaction = persistentData.getGateFaction(gate); if (gateFaction == null) { - playerService.sendMessageType(player, "&c" + getText("ErrorCouldNotFindGatesFaction", gate.getName()) + playerService.sendMessage(player, "&c" + getText("ErrorCouldNotFindGatesFaction", gate.getName()) , Objects.requireNonNull(messageService.getLanguage().getString("ErrorCouldNotFindGatesFaction")) .replace("#name#", gate.getName()) , true); return; } if (!gateFaction.isOfficer(player.getUniqueId()) && !gateFaction.isOwner(player.getUniqueId())) { - playerService.sendMessageType(player, "&c" + getText("AlertMustBeOwnerOrOfficerToUseCommand"), "AlertMustBeOwnerOrOfficerToUseCommand", false); + playerService.sendMessage(player, "&c" + getText("AlertMustBeOwnerOrOfficerToUseCommand"), "AlertMustBeOwnerOrOfficerToUseCommand", false); return; } if (remove) { gateFaction.removeGate(gate); - playerService.sendMessageType(player, "&b" + getText("RemovedGate", gate.getName()) + playerService.sendMessage(player, "&b" + getText("RemovedGate", gate.getName()) , Objects.requireNonNull(messageService.getLanguage().getString("RemovedGate")) .replace("#name#", gate.getName()) , true); @@ -145,7 +145,7 @@ public void execute(Player player, String[] args, String key) { String[] arguments = new String[args.length - 1]; System.arraycopy(args, 1, arguments, 0, arguments.length); gate.setName(String.join(" ", arguments)); - playerService.sendMessageType(player, "&b" + getText("AlertChangedGateName", gate.getName()) + playerService.sendMessage(player, "&b" + getText("AlertChangedGateName", gate.getName()) , Objects.requireNonNull(messageService.getLanguage().getString("AlertChangedGateName")) .replace("#name#", gate.getName()) , true); diff --git a/src/main/java/dansplugins/factionsystem/commands/GrantAccessCommand.java b/src/main/java/dansplugins/factionsystem/commands/GrantAccessCommand.java index 22d11fd21..f8234038b 100644 --- a/src/main/java/dansplugins/factionsystem/commands/GrantAccessCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/GrantAccessCommand.java @@ -40,33 +40,33 @@ public GrantAccessCommand(LocaleService localeService, PersistentData persistent @Override public void execute(Player player, String[] args, String key) { if (args.length == 0) { - playerService.sendMessageType(player, "&c" + getText("UsageGrantAccess"), + playerService.sendMessage(player, "&c" + getText("UsageGrantAccess"), "UsageGrantAccess", false); return; } if (args[0].equalsIgnoreCase("cancel")) { - playerService.sendMessageType(player, "&c" + getText("CommandCancelled"), "CommandCancelled", false); + playerService.sendMessage(player, "&c" + getText("CommandCancelled"), "CommandCancelled", false); return; } if (ephemeralData.getPlayersGrantingAccess().containsKey(player.getUniqueId())) { - playerService.sendMessageType(player, "&c" + getText("AlertAlreadyGrantingAccess") + playerService.sendMessage(player, "&c" + getText("AlertAlreadyGrantingAccess") , "AlertAlreadyGrantingAccess", false); return; } UUIDChecker uuidChecker = new UUIDChecker(); final UUID targetUUID = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (targetUUID == null) { - playerService.sendMessageType(player, "&c" + getText("PlayerNotFound") + playerService.sendMessage(player, "&c" + getText("PlayerNotFound") , Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); return; } if (targetUUID == player.getUniqueId()) { - playerService.sendMessageType(player, "&c" + getText("CannotGrantAccessToSelf") + playerService.sendMessage(player, "&c" + getText("CannotGrantAccessToSelf") , "CannotGrantAccessToSelf", false); return; } ephemeralData.getPlayersGrantingAccess().put(player.getUniqueId(), targetUUID); - playerService.sendMessageType(player, "&a" + getText("RightClickGrantAccess", args[0]) + playerService.sendMessage(player, "&a" + getText("RightClickGrantAccess", args[0]) , Objects.requireNonNull(messageService.getLanguage().getString("RightClickGrantAccess")).replace("#name#", args[0]), true); } diff --git a/src/main/java/dansplugins/factionsystem/commands/GrantIndependenceCommand.java b/src/main/java/dansplugins/factionsystem/commands/GrantIndependenceCommand.java index 3e53b2e5b..42061752d 100644 --- a/src/main/java/dansplugins/factionsystem/commands/GrantIndependenceCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/GrantIndependenceCommand.java @@ -45,7 +45,7 @@ public void execute(Player player, String[] args, String key) { } final Faction target = getFaction(String.join(" ", args)); if (target == null) { - playerService.sendMessageType(player, "&c" + getText("FactionNotFound") + playerService.sendMessage(player, "&c" + getText("FactionNotFound") , Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")).replace("#faction#", String.join(" ", args)) , true); return; diff --git a/src/main/java/dansplugins/factionsystem/commands/HomeCommand.java b/src/main/java/dansplugins/factionsystem/commands/HomeCommand.java index 434a6687b..e299b6eed 100644 --- a/src/main/java/dansplugins/factionsystem/commands/HomeCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/HomeCommand.java @@ -42,24 +42,24 @@ public HomeCommand(LocaleService localeService, PersistentData persistentData, E public void execute(Player player, String[] args, String key) { if (!(checkPermissions(player, "mf.home"))) return; if (faction.getFactionHome() == null) { - playerService.sendMessageType(player, "&c" + getText("FactionHomeNotSetYet") + playerService.sendMessage(player, "&c" + getText("FactionHomeNotSetYet") , "FactionHomeNotSetYet", false); return; } final Chunk home_chunk; if (!chunkDataAccessor.isClaimed(home_chunk = faction.getFactionHome().getChunk())) { - playerService.sendMessageType(player, "&c" + getText("HomeIsInUnclaimedChunk") + playerService.sendMessage(player, "&c" + getText("HomeIsInUnclaimedChunk") , "HomeIsInUnclaimedChunk", false); return; } ClaimedChunk chunk = chunkDataAccessor.getClaimedChunk(home_chunk); if (chunk == null || chunk.getHolder() == null) { - playerService.sendMessageType(player, "&c" + getText("HomeIsInUnclaimedChunk") + playerService.sendMessage(player, "&c" + getText("HomeIsInUnclaimedChunk") , "HomeIsInUnclaimedChunk", false); return; } if (!chunk.getHolder().equalsIgnoreCase(faction.getName())) { - playerService.sendMessageType(player, "&c" + getText("HomeClaimedByAnotherFaction") + playerService.sendMessage(player, "&c" + getText("HomeClaimedByAnotherFaction") , "HomeClaimedByAnotherFaction", false); return; } diff --git a/src/main/java/dansplugins/factionsystem/commands/InfoCommand.java b/src/main/java/dansplugins/factionsystem/commands/InfoCommand.java index 4e49cde6c..db7093fad 100644 --- a/src/main/java/dansplugins/factionsystem/commands/InfoCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/InfoCommand.java @@ -58,20 +58,20 @@ public void execute(CommandSender sender, String[] args, String key) { final Faction target; if (args.length == 0) { if (!(sender instanceof Player)) { - playerService.sendMessageType(sender, getText("OnlyPlayersCanUseCommand") + playerService.sendMessage(sender, getText("OnlyPlayersCanUseCommand") , "OnlyPlayersCanUseCommand", false); return; } target = getPlayerFaction(sender); if (target == null) { - playerService.sendMessageType(sender, "&c" + getText("AlertMustBeInFactionToUseCommand") + playerService.sendMessage(sender, "&c" + getText("AlertMustBeInFactionToUseCommand") , "AlertMustBeInFactionToUseCommand", false); return; } } else { target = getFaction(String.join(" ", args)); if (target == null) { - playerService.sendMessageType(sender, "&c" + getText("FactionNotFound") + playerService.sendMessage(sender, "&c" + getText("FactionNotFound") , Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) .replace("#faction#", String.join(" ", args)), true); return; diff --git a/src/main/java/dansplugins/factionsystem/commands/InviteCommand.java b/src/main/java/dansplugins/factionsystem/commands/InviteCommand.java index 17989eab7..83271dd44 100644 --- a/src/main/java/dansplugins/factionsystem/commands/InviteCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/InviteCommand.java @@ -56,7 +56,7 @@ public void execute(Player player, String[] args, String key) { if ((boolean) faction.getFlags().getFlag("mustBeOfficerToInviteOthers")) { // officer or owner rank required if (!faction.isOfficer(player.getUniqueId()) && !faction.isOwner(player.getUniqueId())) { - playerService.sendMessageType(player, "&c" + getText("AlertMustBeOwnerOrOfficerToUseCommand") + playerService.sendMessage(player, "&c" + getText("AlertMustBeOwnerOrOfficerToUseCommand") , "AlertMustBeOwnerOrOfficerToUseCommand", false); return; } @@ -64,7 +64,7 @@ public void execute(Player player, String[] args, String key) { UUIDChecker uuidChecker = new UUIDChecker(); final UUID playerUUID = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (playerUUID == null) { - playerService.sendMessageType(player, "&c" + getText("PlayerNotFound") + playerService.sendMessage(player, "&c" + getText("PlayerNotFound") , Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")) .replace("#name#", args[0]) , true); @@ -74,7 +74,7 @@ public void execute(Player player, String[] args, String key) { if (!target.hasPlayedBefore()) { target = Bukkit.getPlayer(args[0]); if (target == null) { - playerService.sendMessageType(player, "&c" + getText("PlayerNotFound") + playerService.sendMessage(player, "&c" + getText("PlayerNotFound") , Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")) .replace("#name#", args[0]) , true); @@ -82,14 +82,14 @@ public void execute(Player player, String[] args, String key) { } } if (persistentData.isInFaction(playerUUID)) { - playerService.sendMessageType(player, "&c" + getText("PlayerAlreadyInFaction") + playerService.sendMessage(player, "&c" + getText("PlayerAlreadyInFaction") , "PlayerAlreadyInFaction", false); return; } faction.invite(playerUUID); player.sendMessage(ChatColor.GREEN + localeService.get("InvitationSent")); if (target.isOnline() && target.getPlayer() != null) { - playerService.sendMessageType(target.getPlayer(), + playerService.sendMessage(target.getPlayer(), "&a" + getText("AlertBeenInvited", faction.getName(), faction.getName()) , Objects.requireNonNull(messageService.getLanguage().getString("AlertBeenInvited")).replace("#name#", faction.getName()), true @@ -102,7 +102,7 @@ public void execute(Player player, String[] args, String key) { getServer().getScheduler().runTaskLater(medievalFactions, () -> { faction.uninvite(playerUUID); if (tmp.isOnline() && tmp.getPlayer() != null) { - playerService.sendMessageType(player, + playerService.sendMessage(player, "&c" + getText("InvitationExpired", faction.getName()), Objects.requireNonNull(messageService.getLanguage().getString("InvitationExpired")) .replace("#name#", faction.getName()), diff --git a/src/main/java/dansplugins/factionsystem/commands/InvokeCommand.java b/src/main/java/dansplugins/factionsystem/commands/InvokeCommand.java index 138b74251..0c2eb7b3f 100644 --- a/src/main/java/dansplugins/factionsystem/commands/InvokeCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/InvokeCommand.java @@ -56,23 +56,23 @@ public void execute(Player player, String[] args, String key) { final Faction invokee = getFaction(argumentsInsideDoubleQuotes.get(0)); final Faction warringFaction = getFaction(argumentsInsideDoubleQuotes.get(1)); if (invokee == null || warringFaction == null) { - playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")).replace("#faction#", argumentsInsideDoubleQuotes.get(0)), true); - playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")).replace("#faction#", argumentsInsideDoubleQuotes.get(1)), true); + playerService.sendMessage(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")).replace("#faction#", argumentsInsideDoubleQuotes.get(0)), true); + playerService.sendMessage(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")).replace("#faction#", argumentsInsideDoubleQuotes.get(1)), true); return; } if (!this.faction.isAlly(invokee.getName()) && !this.faction.isVassal(invokee.getName())) { - playerService.sendMessageType(player, "&c" + getText("NotAnAllyOrVassal", invokee.getName()), Objects.requireNonNull(messageService.getLanguage().getString("NotAnAllyOrVassal")).replace("#name#", invokee.getName()), true); + playerService.sendMessage(player, "&c" + getText("NotAnAllyOrVassal", invokee.getName()), Objects.requireNonNull(messageService.getLanguage().getString("NotAnAllyOrVassal")).replace("#name#", invokee.getName()), true); return; } if (!this.faction.isEnemy(warringFaction.getName())) { - playerService.sendMessageType(player, "&c" + getText("NotAtWarWith", warringFaction.getName()) + playerService.sendMessage(player, "&c" + getText("NotAtWarWith", warringFaction.getName()) , messageService.getLanguage().getString("NotAtWarWith").replace("#name#", warringFaction.getName()) , true); return; } if (configService.getBoolean("allowNeutrality") && ((boolean) invokee.getFlags().getFlag("neutral"))) { - playerService.sendMessageType(player, "&c" + getText("CannotBringNeutralFactionIntoWar") + playerService.sendMessage(player, "&c" + getText("CannotBringNeutralFactionIntoWar") , "CannotBringNeutralFactionIntoWar", false); return; } diff --git a/src/main/java/dansplugins/factionsystem/commands/JoinCommand.java b/src/main/java/dansplugins/factionsystem/commands/JoinCommand.java index 9fe2fce54..f822e5fe7 100644 --- a/src/main/java/dansplugins/factionsystem/commands/JoinCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/JoinCommand.java @@ -46,22 +46,22 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.join"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - playerService.sendMessageType(player, "&c" + getText("UsageJoin"), "UsageJoin", false); + playerService.sendMessage(player, "&c" + getText("UsageJoin"), "UsageJoin", false); return; } if (persistentData.isInFaction(player.getUniqueId())) { - playerService.sendMessageType(player, "&c" + getText("AlertAlreadyInFaction") + playerService.sendMessage(player, "&c" + getText("AlertAlreadyInFaction") , "AlertAlreadyInFaction", false); return; } final Faction target = getFaction(String.join(" ", args)); if (target == null) { - playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) + playerService.sendMessage(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) .replace("#faction#", String.join(" ", args)), true); return; } if (!target.isInvited(player.getUniqueId())) { - playerService.sendMessageType(player, "&cYou are not invited to this faction." + playerService.sendMessage(player, "&cYou are not invited to this faction." , "NotInvite", false); return; } diff --git a/src/main/java/dansplugins/factionsystem/commands/KickCommand.java b/src/main/java/dansplugins/factionsystem/commands/KickCommand.java index c75630269..48313a756 100644 --- a/src/main/java/dansplugins/factionsystem/commands/KickCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/KickCommand.java @@ -48,31 +48,31 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.kick"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - playerService.sendMessageType(player, "&c" + getText("UsageKick") + playerService.sendMessage(player, "&c" + getText("UsageKick") , "UsageKick", false); return; } UUIDChecker uuidChecker = new UUIDChecker(); final UUID targetUUID = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (targetUUID == null) { - playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); + playerService.sendMessage(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); return; } OfflinePlayer target = Bukkit.getOfflinePlayer(targetUUID); if (!target.hasPlayedBefore()) { target = Bukkit.getPlayer(args[0]); if (target == null) { - playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); + playerService.sendMessage(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); return; } } if (target.getUniqueId().equals(player.getUniqueId())) { - playerService.sendMessageType(player, "&c" + getText("CannotKickSelf") + playerService.sendMessage(player, "&c" + getText("CannotKickSelf") , "CannotKickSelf", false); return; } if (this.faction.isOwner(targetUUID)) { - playerService.sendMessageType(player, "&c" + getText("CannotKickOwner") + playerService.sendMessage(player, "&c" + getText("CannotKickOwner") , "CannotKickOwner", false); return; } @@ -92,7 +92,7 @@ public void execute(Player player, String[] args, String key) { .replace("#name#", args[0]) .replace("#faction#", faction.getName())); if (target.isOnline() && target.getPlayer() != null) { - playerService.sendMessageType(player, "&c" + getText("AlertKicked", player.getName()) + playerService.sendMessage(player, "&c" + getText("AlertKicked", player.getName()) , Objects.requireNonNull(messageService.getLanguage().getString("AlertKicked")) .replace("#name#", player.getName()), true); } diff --git a/src/main/java/dansplugins/factionsystem/commands/LawsCommand.java b/src/main/java/dansplugins/factionsystem/commands/LawsCommand.java index c80c3aa60..c5c8d965d 100644 --- a/src/main/java/dansplugins/factionsystem/commands/LawsCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/LawsCommand.java @@ -45,30 +45,30 @@ public void execute(Player player, String[] args, String key) { if (args.length == 0) { target = getPlayerFaction(player); if (target == null) { - playerService.sendMessageType(player, "&c" + getText("AlertMustBeInFactionToUseCommand") + playerService.sendMessage(player, "&c" + getText("AlertMustBeInFactionToUseCommand") , "AlertMustBeInFactionToUseCommand", false); return; } if (target.getNumLaws() == 0) { - playerService.sendMessageType(player, "&c" + getText("AlertNoLaws") + playerService.sendMessage(player, "&c" + getText("AlertNoLaws") , "AlertNoLaws", false); return; } } else { target = getFaction(String.join(" ", args)); if (target == null) { - playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), + playerService.sendMessage(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) .replace("#faction#", String.join(" ", args)), true); return; } if (target.getNumLaws() == 0) { - playerService.sendMessageType(player, "&c" + getText("FactionDoesNotHaveLaws") + playerService.sendMessage(player, "&c" + getText("FactionDoesNotHaveLaws") , "FactionDoesNotHaveLaws", false); return; } } - playerService.sendMessageType(player, "&b" + getText("LawsTitle", target.getName()) + playerService.sendMessage(player, "&b" + getText("LawsTitle", target.getName()) , Objects.requireNonNull(messageService.getLanguage().getString("LawsTitle")) .replace("#name#", target.getName()), true); IntStream.range(0, target.getNumLaws()) diff --git a/src/main/java/dansplugins/factionsystem/commands/LeaveCommand.java b/src/main/java/dansplugins/factionsystem/commands/LeaveCommand.java index 7525d5d9a..720884d8f 100644 --- a/src/main/java/dansplugins/factionsystem/commands/LeaveCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/LeaveCommand.java @@ -59,7 +59,7 @@ public void execute(Player player, String[] args, String key) { if (faction.isOfficer(player.getUniqueId())) faction.removeOfficer(player.getUniqueId()); // Remove Officer. ephemeralData.getPlayersInFactionChat().remove(player.getUniqueId()); // Remove from Faction Chat. faction.removeMember(player.getUniqueId()); - playerService.sendMessageType(player, "&b" + getText("AlertLeftFaction") + playerService.sendMessage(player, "&b" + getText("AlertLeftFaction") , "AlertLeftFaction", false); messageFaction(faction, translate("&a" + player.getName() + " has left " + faction.getName()), Objects.requireNonNull(messageService.getLanguage().getString("AlertLeftFactionTeam")) diff --git a/src/main/java/dansplugins/factionsystem/commands/ListCommand.java b/src/main/java/dansplugins/factionsystem/commands/ListCommand.java index 6a36c3378..7c6ffc85a 100644 --- a/src/main/java/dansplugins/factionsystem/commands/ListCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/ListCommand.java @@ -54,11 +54,11 @@ public void execute(CommandSender sender, String[] args, String key) { final String permission = "mf.list"; if (!(checkPermissions(sender, permission))) return; if (persistentData.getNumFactions() == 0) { - playerService.sendMessageType(sender, "&b" + getText("CurrentlyNoFactions") + playerService.sendMessage(sender, "&b" + getText("CurrentlyNoFactions") , "CurrentlyNoFactions", false); return; } - playerService.sendMessageType(sender, "&b&l" + getText("FactionsTitle") + playerService.sendMessage(sender, "&b&l" + getText("FactionsTitle") , "FactionsTitle", false); List sortedFactionList = persistentData.getSortedListOfFactions(); sender.sendMessage(ChatColor.AQUA + localeService.get("ListLegend")); diff --git a/src/main/java/dansplugins/factionsystem/commands/LockCommand.java b/src/main/java/dansplugins/factionsystem/commands/LockCommand.java index 6dceb66d8..32e0a46fc 100644 --- a/src/main/java/dansplugins/factionsystem/commands/LockCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/LockCommand.java @@ -47,14 +47,14 @@ public void execute(Player player, String[] args, String key) { } if (args.length >= 1 && safeEquals(args[0], "cancel")) { if (ephemeralData.getLockingPlayers().remove(player.getUniqueId())) { // Remove them - playerService.sendMessageType(player, "&c" + getText("LockingCancelled"), + playerService.sendMessage(player, "&c" + getText("LockingCancelled"), "LockingCancelled", false); return; } } ephemeralData.getLockingPlayers().add(player.getUniqueId()); ephemeralData.getUnlockingPlayers().remove(player.getUniqueId()); - playerService.sendMessageType(player, "&a" + getText("RightClickLock") + playerService.sendMessage(player, "&a" + getText("RightClickLock") , "RightClickLock", false); } diff --git a/src/main/java/dansplugins/factionsystem/commands/MakePeaceCommand.java b/src/main/java/dansplugins/factionsystem/commands/MakePeaceCommand.java index 46c4518ff..a9c269b3b 100644 --- a/src/main/java/dansplugins/factionsystem/commands/MakePeaceCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/MakePeaceCommand.java @@ -43,35 +43,35 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.makepeace"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - playerService.sendMessageType(player, + playerService.sendMessage(player, "&c" + getText("UsageMakePeace") , "UsageMakePeace", false); return; } final Faction target = getFaction(String.join(" ", args)); if (target == null) { - playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), + playerService.sendMessage(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) .replace("#faction#", String.join(" ", args)), true); return; } if (target == faction) { - playerService.sendMessageType(player, "&c" + getText("CannotMakePeaceWithSelf") + playerService.sendMessage(player, "&c" + getText("CannotMakePeaceWithSelf") , "CannotMakePeaceWithSelf", false); return; } if (faction.isTruceRequested(target.getName())) { - playerService.sendMessageType(player, "&c" + getText("AlertAlreadyRequestedPeace") + playerService.sendMessage(player, "&c" + getText("AlertAlreadyRequestedPeace") , "AlertAlreadyRequestedPeace", false); return; } if (!faction.isEnemy(target.getName())) { - playerService.sendMessageType(player, "&c" + getText("FactionNotEnemy") + playerService.sendMessage(player, "&c" + getText("FactionNotEnemy") , "FactionNotEnemy", false); return; } faction.requestTruce(target.getName()); - playerService.sendMessageType(player, "&a" + getText("AttemptedPeace", target.getName()) + playerService.sendMessage(player, "&a" + getText("AttemptedPeace", target.getName()) , Objects.requireNonNull(messageService.getLanguage().getString("AttemptedPeace")) .replace("#name#", target.getName()), true); diff --git a/src/main/java/dansplugins/factionsystem/commands/MembersCommand.java b/src/main/java/dansplugins/factionsystem/commands/MembersCommand.java index 4c84a2817..669022936 100644 --- a/src/main/java/dansplugins/factionsystem/commands/MembersCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/MembersCommand.java @@ -59,20 +59,20 @@ public void execute(CommandSender sender, String[] args, String key) { final Faction faction; if (args.length == 0) { if (!(sender instanceof Player)) { - playerService.sendMessageType(sender, getText("OnlyPlayersCanUseCommand") + playerService.sendMessage(sender, getText("OnlyPlayersCanUseCommand") , "OnlyPlayersCanUseCommand", false); return; } faction = getPlayerFaction(sender); if (faction == null) { - playerService.sendMessageType(sender, getText("AlertMustBeInFactionToUseCommand") + playerService.sendMessage(sender, getText("AlertMustBeInFactionToUseCommand") , "AlertMustBeInFactionToUseCommand", false); return; } } else { faction = getFaction(String.join(" ", args)); if (faction == null) { - playerService.sendMessageType(sender, "&c" + getText("FactionNameNotRecognized"), + playerService.sendMessage(sender, "&c" + getText("FactionNameNotRecognized"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) .replace("#faction#", String.join(" ", args )), true); @@ -100,7 +100,7 @@ public void execute(CommandSender sender, String[] args, String key) { }).forEach(sender::sendMessage); sender.sendMessage(translate("&b----------\n")); } else { - playerService.sendMessageType(sender, "", Objects.requireNonNull(messageService.getLanguage().getString("MembersFaction.Title")) + playerService.sendMessage(sender, "", Objects.requireNonNull(messageService.getLanguage().getString("MembersFaction.Title")) .replace("#faction#", faction.getName()) , true); faction.getMemberList().stream() @@ -121,7 +121,7 @@ public void execute(CommandSender sender, String[] args, String key) { .replace("#rank#", Objects.requireNonNull(rank)) .replace("#name#", Objects.requireNonNull(player.getName()))); }).forEach(sender::sendMessage); - playerService.sendMessageType(sender, "", Objects.requireNonNull(messageService.getLanguage().getString("MembersFaction.SubTitle")) + playerService.sendMessage(sender, "", Objects.requireNonNull(messageService.getLanguage().getString("MembersFaction.SubTitle")) .replace("#faction#", faction.getName()) , true); diff --git a/src/main/java/dansplugins/factionsystem/commands/PowerCommand.java b/src/main/java/dansplugins/factionsystem/commands/PowerCommand.java index 3d1b40ca4..d964be2b9 100644 --- a/src/main/java/dansplugins/factionsystem/commands/PowerCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/PowerCommand.java @@ -57,12 +57,12 @@ public void execute(CommandSender sender, String[] args, String key) { final PowerRecord record; if (args.length == 0) { if (!(sender instanceof Player)) { - playerService.sendMessageType(sender, getText("OnlyPlayersCanUseCommand") + playerService.sendMessage(sender, getText("OnlyPlayersCanUseCommand") , "OnlyPlayersCanUseCommand", false); return; } record = persistentData.getPlayersPowerRecord(((Player) sender).getUniqueId()); - playerService.sendMessageType(sender, "&b" + + playerService.sendMessage(sender, "&b" + getText("AlertCurrentPowerLevel", record.getPower(), record.maxPower()) , Objects.requireNonNull(messageService.getLanguage().getString("AlertCurrentPowerLevel")) .replace("#power#", String.valueOf(record.getPower())) @@ -72,12 +72,12 @@ record = persistentData.getPlayersPowerRecord(((Player) sender).getUniqueId()); UUIDChecker uuidChecker = new UUIDChecker(); final UUID target = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (target == null) { - playerService.sendMessageType(sender, "&c" + getText("PlayerNotFound"), + playerService.sendMessage(sender, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); return; } record = persistentData.getPlayersPowerRecord(target); - playerService.sendMessageType(sender, "&b" + + playerService.sendMessage(sender, "&b" + getText("CurrentPowerLevel", args[0], record.getPower(), record.maxPower()) , Objects.requireNonNull(messageService.getLanguage().getString("CurrentPowerLevel")) .replace("#power#", String.valueOf(record.getPower())) diff --git a/src/main/java/dansplugins/factionsystem/commands/PrefixCommand.java b/src/main/java/dansplugins/factionsystem/commands/PrefixCommand.java index 10e8262b5..23adc5954 100644 --- a/src/main/java/dansplugins/factionsystem/commands/PrefixCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/PrefixCommand.java @@ -39,12 +39,12 @@ public void execute(Player player, String[] args, String key) { if (!(checkPermissions(player, permission))) return; final String newPrefix = String.join(" ", args); if (persistentData.isPrefixTaken(newPrefix)) { - playerService.sendMessageType(player, "&c" + getText("PrefixTaken") + playerService.sendMessage(player, "&c" + getText("PrefixTaken") , "PrefixTaken", false); return; } faction.setPrefix(newPrefix); - playerService.sendMessageType(player, "&c" + getText("PrefixSet") + playerService.sendMessage(player, "&c" + getText("PrefixSet") , "PrefixSet", false); } diff --git a/src/main/java/dansplugins/factionsystem/commands/PromoteCommand.java b/src/main/java/dansplugins/factionsystem/commands/PromoteCommand.java index ce4260222..dba3d2748 100644 --- a/src/main/java/dansplugins/factionsystem/commands/PromoteCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/PromoteCommand.java @@ -44,48 +44,48 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.promote"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - playerService.sendMessageType(player, "&c" + getText("UsagePromote") + playerService.sendMessage(player, "&c" + getText("UsagePromote") , "UsagePromote", false); return; } UUIDChecker uuidChecker = new UUIDChecker(); final UUID targetUUID = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (targetUUID == null) { - playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); + playerService.sendMessage(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); return; } OfflinePlayer target = Bukkit.getOfflinePlayer(targetUUID); if (!target.hasPlayedBefore()) { target = Bukkit.getPlayer(args[0]); if (target == null) { - playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); + playerService.sendMessage(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); return; } } if (!faction.isMember(targetUUID)) { - playerService.sendMessageType(player, "&c" + getText("PlayerIsNotMemberOfFaction") + playerService.sendMessage(player, "&c" + getText("PlayerIsNotMemberOfFaction") , "PlayerIsNotMemberOfFaction", false); return; } if (faction.isOfficer(targetUUID)) { - playerService.sendMessageType(player, "&c" + getText("PlayerAlreadyOfficer") + playerService.sendMessage(player, "&c" + getText("PlayerAlreadyOfficer") , "PlayerAlreadyOfficer", false); return; } if (targetUUID == player.getUniqueId()) { - playerService.sendMessageType(player, "&c" + getText("CannotPromoteSelf") + playerService.sendMessage(player, "&c" + getText("CannotPromoteSelf") , "CannotPromoteSelf", false); return; } if (faction.addOfficer(targetUUID)) { - playerService.sendMessageType(player, "&a" + getText("PlayerPromoted") + playerService.sendMessage(player, "&a" + getText("PlayerPromoted") , "PlayerPromoted", false); if (target.isOnline() && target.getPlayer() != null) { - playerService.sendMessageType(target.getPlayer(), "&a" + getText("PromotedToOfficer") + playerService.sendMessage(target.getPlayer(), "&a" + getText("PromotedToOfficer") , "PromotedToOfficer", false); } } else { - playerService.sendMessageType(player, "&c" + + playerService.sendMessage(player, "&c" + getText("PlayerCantBePromotedBecauseOfLimit", faction.calculateMaxOfficers()) , Objects.requireNonNull(messageService.getLanguage().getString("PlayerCantBePromotedBecauseOfLimit")) .replace("#number#", String.valueOf(faction.calculateMaxOfficers())), true); diff --git a/src/main/java/dansplugins/factionsystem/commands/RemoveLawCommand.java b/src/main/java/dansplugins/factionsystem/commands/RemoveLawCommand.java index 6c652dece..a48b371ee 100644 --- a/src/main/java/dansplugins/factionsystem/commands/RemoveLawCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/RemoveLawCommand.java @@ -38,17 +38,17 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.removelaw"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - playerService.sendMessageType(player, "&c" + getText("UsageRemoveLaw") + playerService.sendMessage(player, "&c" + getText("UsageRemoveLaw") , "UsageRemoveLaw", false); return; } final int lawToRemove = getIntSafe(args[0], 0) - 1; if (lawToRemove < 0) { - playerService.sendMessageType(player, "&c" + getText("UsageRemoveLaw") + playerService.sendMessage(player, "&c" + getText("UsageRemoveLaw") , "UsageRemoveLaw", false); return; } - if (faction.removeLaw(lawToRemove)) playerService.sendMessageType(player, "&a" + getText("LawRemoved") + if (faction.removeLaw(lawToRemove)) playerService.sendMessage(player, "&a" + getText("LawRemoved") , "LawRemoved", false); } diff --git a/src/main/java/dansplugins/factionsystem/commands/RenameCommand.java b/src/main/java/dansplugins/factionsystem/commands/RenameCommand.java index 566df7964..797e820f8 100644 --- a/src/main/java/dansplugins/factionsystem/commands/RenameCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/RenameCommand.java @@ -49,21 +49,21 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.rename"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - playerService.sendMessageType(player, "&c" + getText("UsageRename") + playerService.sendMessage(player, "&c" + getText("UsageRename") , "UsageRename", false); return; } final String newName = String.join(" ", args).trim(); final FileConfiguration config = medievalFactions.getConfig(); if (newName.length() > config.getInt("factionMaxNameLength")) { - playerService.sendMessageType(player, "&c" + getText("FactionNameTooLong"), + playerService.sendMessage(player, "&c" + getText("FactionNameTooLong"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNameTooLong")) .replace("#name#", newName), true); return; } final String oldName = faction.getName(); if (getFaction(newName) != null) { - playerService.sendMessageType(player, "&c" + getText("FactionAlreadyExists"), + playerService.sendMessage(player, "&c" + getText("FactionAlreadyExists"), Objects.requireNonNull(messageService.getLanguage().getString("FactionAlreadyExists")) .replace("#name#", newName), true); return; @@ -77,7 +77,7 @@ public void execute(Player player, String[] args, String key) { // change name faction.setName(newName); - playerService.sendMessageType(player, "&a" + getText("FactionNameChanged") + playerService.sendMessage(player, "&a" + getText("FactionNameChanged") , "FactionNameChanged", false); persistentData.updateFactionReferencesDueToNameChange(oldName, newName); diff --git a/src/main/java/dansplugins/factionsystem/commands/RevokeAccessCommand.java b/src/main/java/dansplugins/factionsystem/commands/RevokeAccessCommand.java index fe3a3ccd3..dd9ba5d40 100644 --- a/src/main/java/dansplugins/factionsystem/commands/RevokeAccessCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/RevokeAccessCommand.java @@ -42,35 +42,35 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.revokeaccess"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - playerService.sendMessageType(player, "&c" + getText("UsageRevokeAccess") + playerService.sendMessage(player, "&c" + getText("UsageRevokeAccess") , "UsageRevokeAccess", false); return; } if (args[0].equalsIgnoreCase("cancel")) { ephemeralData.getPlayersRevokingAccess().remove(player.getUniqueId()); - playerService.sendMessageType(player, "&c" + getText("Cancelled"), "Cancelled", false); + playerService.sendMessage(player, "&c" + getText("Cancelled"), "Cancelled", false); return; } if (ephemeralData.getPlayersRevokingAccess().containsKey(player.getUniqueId())) { - playerService.sendMessageType(player, "&c" + getText("AlreadyEnteredRevokeAccess") + playerService.sendMessage(player, "&c" + getText("AlreadyEnteredRevokeAccess") , "AlreadyEnteredRevokeAccess", false); return; } UUIDChecker uuidChecker = new UUIDChecker(); final UUID targetUUID = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (targetUUID == null) { - playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); + playerService.sendMessage(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); return; } if (targetUUID == player.getUniqueId()) { - playerService.sendMessageType(player, "&c" + getText("CannotRevokeAccessFromSelf") + playerService.sendMessage(player, "&c" + getText("CannotRevokeAccessFromSelf") , "CannotRevokeAccessFromSelf", false); return; } ephemeralData.getPlayersRevokingAccess().put( player.getUniqueId(), targetUUID ); - playerService.sendMessageType(player, "&a" + getText("RightClickRevokeAccess") + playerService.sendMessage(player, "&a" + getText("RightClickRevokeAccess") , "RightClickRevokeAccess", false); } diff --git a/src/main/java/dansplugins/factionsystem/commands/SetHomeCommand.java b/src/main/java/dansplugins/factionsystem/commands/SetHomeCommand.java index b1cd2e32f..90ed38d24 100644 --- a/src/main/java/dansplugins/factionsystem/commands/SetHomeCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/SetHomeCommand.java @@ -39,18 +39,18 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.sethome"; if (!(checkPermissions(player, permission))) return; if (!chunkDataAccessor.isClaimed(player.getLocation().getChunk())) { - playerService.sendMessageType(player, "&c" + getText("LandIsNotClaimed") + playerService.sendMessage(player, "&c" + getText("LandIsNotClaimed") , "LandIsNotClaimed", false); return; } ClaimedChunk chunk = chunkDataAccessor.getClaimedChunk(player.getLocation().getChunk()); if (chunk == null || !chunk.getHolder().equalsIgnoreCase(faction.getName())) { - playerService.sendMessageType(player, "&c" + getText("CannotSetFactionHomeInWilderness"), + playerService.sendMessage(player, "&c" + getText("CannotSetFactionHomeInWilderness"), "CannotSetFactionHomeInWilderness", false); return; } faction.setFactionHome(player.getLocation()); - playerService.sendMessageType(player, "&a" + getText("FactionHomeSet"), + playerService.sendMessage(player, "&a" + getText("FactionHomeSet"), "FactionHomeSet", false); } diff --git a/src/main/java/dansplugins/factionsystem/commands/StatsCommand.java b/src/main/java/dansplugins/factionsystem/commands/StatsCommand.java index f5792670e..d84ac55fb 100644 --- a/src/main/java/dansplugins/factionsystem/commands/StatsCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/StatsCommand.java @@ -47,7 +47,7 @@ public void execute(CommandSender sender, String[] args, String key) { s = s.replace("#faction#", String.valueOf(persistentData.getNumFactions())); } s = playerService.colorize(s); - playerService.sendMessageType(sender, "", s, true); + playerService.sendMessage(sender, "", s, true); }); } } diff --git a/src/main/java/dansplugins/factionsystem/commands/SwearFealtyCommand.java b/src/main/java/dansplugins/factionsystem/commands/SwearFealtyCommand.java index 582e9c500..fac88b2f9 100644 --- a/src/main/java/dansplugins/factionsystem/commands/SwearFealtyCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/SwearFealtyCommand.java @@ -41,18 +41,18 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.swearfealty"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - playerService.sendMessageType(player, "&c" + getText("UsageSwearFealty") + playerService.sendMessage(player, "&c" + getText("UsageSwearFealty") , "UsageSwearFealty", false); return; } final Faction target = getFaction(String.join(" ", args)); if (target == null) { - playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) + playerService.sendMessage(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) .replace("#faction#", String.join(" ", args)), true); return; } if (!target.hasBeenOfferedVassalization(faction.getName())) { - playerService.sendMessageType(player, "&c" + getText("AlertNotOfferedVassalizationBy") + playerService.sendMessage(player, "&c" + getText("AlertNotOfferedVassalizationBy") , "AlertNotOfferedVassalizationBy", false); return; } diff --git a/src/main/java/dansplugins/factionsystem/commands/TransferCommand.java b/src/main/java/dansplugins/factionsystem/commands/TransferCommand.java index 14f4fb110..34fe03794 100644 --- a/src/main/java/dansplugins/factionsystem/commands/TransferCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/TransferCommand.java @@ -42,31 +42,31 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.transfer"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - playerService.sendMessageType(player, "&c" + getText("UsageTransfer") + playerService.sendMessage(player, "&c" + getText("UsageTransfer") , "UsageTransfer", false); return; } UUIDChecker uuidChecker = new UUIDChecker(); final UUID targetUUID = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (targetUUID == null) { - playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); + playerService.sendMessage(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); return; } OfflinePlayer target = Bukkit.getOfflinePlayer(targetUUID); if (!target.hasPlayedBefore()) { target = Bukkit.getPlayer(args[0]); if (target == null) { - playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); + playerService.sendMessage(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); return; } } if (!faction.isMember(targetUUID)) { - playerService.sendMessageType(player, "&c" + getText("PlayerIsNotInYourFaction") + playerService.sendMessage(player, "&c" + getText("PlayerIsNotInYourFaction") , "PlayerIsNotInYourFaction", false); return; } if (targetUUID.equals(player.getUniqueId())) { - playerService.sendMessageType(player, "&c" + getText("CannotTransferToSelf") + playerService.sendMessage(player, "&c" + getText("CannotTransferToSelf") , "CannotTransferToSelf", false); return; } @@ -75,11 +75,11 @@ public void execute(Player player, String[] args, String key) { // set owner faction.setOwner(targetUUID); - playerService.sendMessageType(player, "&b" + getText("OwnerShipTransferredTo", args[0]) + playerService.sendMessage(player, "&b" + getText("OwnerShipTransferredTo", args[0]) , Objects.requireNonNull(messageService.getLanguage().getString("OwnerShipTransferredTo")) .replace("#name#", args[0]), true); if (target.isOnline() && target.getPlayer() != null) { // Message if we can :) - playerService.sendMessageType(target.getPlayer(), "&a" + getText("OwnershipTransferred", faction.getName()), + playerService.sendMessage(target.getPlayer(), "&a" + getText("OwnershipTransferred", faction.getName()), Objects.requireNonNull(messageService.getLanguage().getString("'OwnershipTransferred")) .replace("#name#", faction.getName()), true); } diff --git a/src/main/java/dansplugins/factionsystem/commands/UnclaimCommand.java b/src/main/java/dansplugins/factionsystem/commands/UnclaimCommand.java index deb49fb22..32bb08c6f 100644 --- a/src/main/java/dansplugins/factionsystem/commands/UnclaimCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/UnclaimCommand.java @@ -43,7 +43,7 @@ public void execute(Player player, String[] args, String key) { if ((boolean) faction.getFlags().getFlag("mustBeOfficerToManageLand")) { // officer or owner rank required if (!faction.isOfficer(player.getUniqueId()) && !faction.isOwner(player.getUniqueId()) && !isPlayerBypassing) { - playerService.sendMessageType(player, "&c" + "You're not able to claim land at this time." + playerService.sendMessage(player, "&c" + "You're not able to claim land at this time." , "NotAbleToClaim", false); return; } @@ -51,7 +51,7 @@ public void execute(Player player, String[] args, String key) { if (args.length == 0) { chunkDataAccessor.removeChunkAtPlayerLocation(player, faction); dynmapIntegrator.updateClaims(); - playerService.sendMessageType(player, "&aUnclaimed your current claim." + playerService.sendMessage(player, "&aUnclaimed your current claim." , "UnClaimed", false); return; } @@ -61,7 +61,7 @@ public void execute(Player player, String[] args, String key) { radius = 1; } chunkDataAccessor.radiusUnclaimAtLocation(radius, player, faction); - playerService.sendMessageType(player, "Unclaimed radius of " + radius + " claims around you!" + playerService.sendMessage(player, "Unclaimed radius of " + radius + " claims around you!" , Objects.requireNonNull(messageService.getLanguage().getString("UnClaimedRadius")) .replace("#number#", String.valueOf(radius)), true); } diff --git a/src/main/java/dansplugins/factionsystem/commands/UnclaimallCommand.java b/src/main/java/dansplugins/factionsystem/commands/UnclaimallCommand.java index 811abf8f0..0ce2d5c5c 100644 --- a/src/main/java/dansplugins/factionsystem/commands/UnclaimallCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/UnclaimallCommand.java @@ -54,19 +54,19 @@ public void execute(CommandSender sender, String[] args, String key) { if (args.length == 0) { // Self if (!(sender instanceof Player)) { - playerService.sendMessageType(sender, getText("OnlyPlayersCanUseCommand") + playerService.sendMessage(sender, getText("OnlyPlayersCanUseCommand") , "OnlyPlayersCanUseCommand", false); return; } if (!(checkPermissions(sender, "mf.unclaimall"))) return; faction = getPlayerFaction(sender); if (faction == null) { - playerService.sendMessageType(sender, "&c" + getText("AlertMustBeInFactionToUseCommand"), + playerService.sendMessage(sender, "&c" + getText("AlertMustBeInFactionToUseCommand"), "AlertMustBeInFactionToUseCommand", false); return; } if (!faction.isOwner(((Player) sender).getUniqueId())) { - playerService.sendMessageType(sender, "&c" + getText("AlertMustBeOwnerToUseCommand"), + playerService.sendMessage(sender, "&c" + getText("AlertMustBeOwnerToUseCommand"), "AlertMustBeOwnerToUseCommand", false); return; } @@ -74,7 +74,7 @@ public void execute(CommandSender sender, String[] args, String key) { if (!(checkPermissions(sender, "mf.unclaimall.others", "mf.admin"))) return; faction = getFaction(String.join(" ", args)); if (faction == null) { - playerService.sendMessageType(sender, "&c" + getText("FactionNotFound"), + playerService.sendMessage(sender, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) .replace("#faction#", String.join(" ", args)), true); return; @@ -88,7 +88,7 @@ public void execute(CommandSender sender, String[] args, String key) { // remove claimed chunks chunkDataAccessor.removeAllClaimedChunks(faction.getName()); dynmapIntegrator.updateClaims(); - playerService.sendMessageType(sender, "&a" + getText("AllLandUnclaimedFrom", faction.getName()) + playerService.sendMessage(sender, "&a" + getText("AllLandUnclaimedFrom", faction.getName()) , Objects.requireNonNull(messageService.getLanguage().getString("AllLandUnclaimedFrom")) .replace("#name#", faction.getName()), false); diff --git a/src/main/java/dansplugins/factionsystem/commands/UnlockCommand.java b/src/main/java/dansplugins/factionsystem/commands/UnlockCommand.java index 11221fce3..bc2eccbea 100644 --- a/src/main/java/dansplugins/factionsystem/commands/UnlockCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/UnlockCommand.java @@ -46,7 +46,7 @@ public void execute(Player player, String[] args, String key) { if (args.length != 0 && args[0].equalsIgnoreCase("cancel")) { ephemeralData.getUnlockingPlayers().remove(player.getUniqueId()); ephemeralData.getForcefullyUnlockingPlayers().remove(player.getUniqueId()); // just in case the player tries to cancel a forceful unlock without using the force command - playerService.sendMessageType(player, "&c" + getText("AlertUnlockingCancelled") + playerService.sendMessage(player, "&c" + getText("AlertUnlockingCancelled") , "AlertUnlockingCancelled", false); return; } @@ -56,7 +56,7 @@ public void execute(Player player, String[] args, String key) { ephemeralData.getLockingPlayers().remove(player.getUniqueId()); // inform them they need to right click the block that they want to lock or type /mf lock cancel to cancel it - playerService.sendMessageType(player, "&a" + getText("RightClickUnlock") + playerService.sendMessage(player, "&a" + getText("RightClickUnlock") , "RightClickUnlock", false); } diff --git a/src/main/java/dansplugins/factionsystem/commands/VassalizeCommand.java b/src/main/java/dansplugins/factionsystem/commands/VassalizeCommand.java index 7f6093f96..431c0db46 100644 --- a/src/main/java/dansplugins/factionsystem/commands/VassalizeCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/VassalizeCommand.java @@ -44,31 +44,31 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.vassalize"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - playerService.sendMessageType(player, "&c" + getText("UsageVassalize") + playerService.sendMessage(player, "&c" + getText("UsageVassalize") , "UsageVassalize", false); return; } final Faction target = getFaction(String.join(" ", args)); if (target == null) { - playerService.sendMessageType(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) + playerService.sendMessage(player, "&c" + getText("FactionNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("FactionNotFound")) .replace("#faction#", String.join(" ", args)), true); return; } // make sure player isn't trying to vassalize their own faction if (faction.getName().equalsIgnoreCase(target.getName())) { - playerService.sendMessageType(player, "&c" + getText("CannotVassalizeSelf") + playerService.sendMessage(player, "&c" + getText("CannotVassalizeSelf") , "CannotVassalizeSelf", false); return; } // make sure player isn't trying to vassalize their liege if (target.getName().equalsIgnoreCase(faction.getLiege())) { - playerService.sendMessageType(player, "&c" + getText("CannotVassalizeLiege") + playerService.sendMessage(player, "&c" + getText("CannotVassalizeLiege") , "CannotVassalizeLiege", false); return; } // make sure player isn't trying to vassalize a vassal if (target.hasLiege()) { - playerService.sendMessageType(player, "&c" + getText("CannotVassalizeVassal") + playerService.sendMessage(player, "&c" + getText("CannotVassalizeVassal") , "CannotVassalizeVassal", false); return; } diff --git a/src/main/java/dansplugins/factionsystem/commands/WhoCommand.java b/src/main/java/dansplugins/factionsystem/commands/WhoCommand.java index e1ee3b2a7..c0b6e76fd 100644 --- a/src/main/java/dansplugins/factionsystem/commands/WhoCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/WhoCommand.java @@ -44,19 +44,19 @@ public void execute(Player player, String[] args, String key) { final String permission = "mf.who"; if (!(checkPermissions(player, permission))) return; if (args.length == 0) { - playerService.sendMessageType(player, "&c" + getText("UsageWho") + playerService.sendMessage(player, "&c" + getText("UsageWho") , "UsageWho", false); return; } UUIDChecker uuidChecker = new UUIDChecker(); final UUID targetUUID = uuidChecker.findUUIDBasedOnPlayerName(args[0]); if (targetUUID == null) { - playerService.sendMessageType(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); + playerService.sendMessage(player, "&c" + getText("PlayerNotFound"), Objects.requireNonNull(messageService.getLanguage().getString("PlayerNotFound")).replace("#name#", args[0]), true); return; } final Faction temp = getPlayerFaction(targetUUID); if (temp == null) { - playerService.sendMessageType(player, "&c" + getText("PlayerIsNotInAFaction") + playerService.sendMessage(player, "&c" + getText("PlayerIsNotInAFaction") , "PlayerIsNotInAFaction", false); return; } diff --git a/src/main/java/dansplugins/factionsystem/commands/abs/SubCommand.java b/src/main/java/dansplugins/factionsystem/commands/abs/SubCommand.java index 8db8acb70..082e12e62 100644 --- a/src/main/java/dansplugins/factionsystem/commands/abs/SubCommand.java +++ b/src/main/java/dansplugins/factionsystem/commands/abs/SubCommand.java @@ -204,7 +204,7 @@ public boolean checkPermissions(CommandSender sender, String... permission) { break; } if (!has) { - playerService.sendMessageType(sender, translate("&c" + getText("PermissionNeeded", permission[0])), Objects.requireNonNull(messageService.getLanguage().getString("PermissionNeeded")).replace("#permission#", permission[0]), true); + playerService.sendMessage(sender, translate("&c" + getText("PermissionNeeded", permission[0])), Objects.requireNonNull(messageService.getLanguage().getString("PermissionNeeded")).replace("#permission#", permission[0]), true); } return has; } @@ -283,7 +283,7 @@ protected Faction getFaction(String name) { * @param newmessage new message to send to the Faction. */ protected void messageFaction(Faction faction, String oldmessage, String newmessage) { - faction.getMemberList().stream().map(Bukkit::getOfflinePlayer).filter(OfflinePlayer::isOnline).map(OfflinePlayer::getPlayer).filter(Objects::nonNull).forEach(player -> playerService.sendMessageType(player, oldmessage, newmessage, true)); + faction.getMemberList().stream().map(Bukkit::getOfflinePlayer).filter(OfflinePlayer::isOnline).map(OfflinePlayer::getPlayer).filter(Objects::nonNull).forEach(player -> playerService.sendMessage(player, oldmessage, newmessage, true)); } /** @@ -293,7 +293,7 @@ protected void messageFaction(Faction faction, String oldmessage, String newmess * @param newmessage old message to send to the players. */ protected void messageServer(String oldmessage, String newmessage) { - Bukkit.getOnlinePlayers().forEach(player -> playerService.sendMessageType(player, oldmessage, newmessage, true)); + Bukkit.getOnlinePlayers().forEach(player -> playerService.sendMessage(player, oldmessage, newmessage, true)); } /** diff --git a/src/main/java/dansplugins/factionsystem/data/PersistentData.java b/src/main/java/dansplugins/factionsystem/data/PersistentData.java index fcf746848..057928d9a 100644 --- a/src/main/java/dansplugins/factionsystem/data/PersistentData.java +++ b/src/main/java/dansplugins/factionsystem/data/PersistentData.java @@ -430,7 +430,7 @@ public boolean isBlockInGate(Block block, Player player) { for (Faction faction : factions) { for (Gate gate : faction.getGates()) { if (gate.hasBlock(block)) { - playerService.sendMessageType(player, ChatColor.RED + String.format(localeService.get("BlockIsPartOfGateMustRemoveGate"), gate.getName()) + playerService.sendMessage(player, ChatColor.RED + String.format(localeService.get("BlockIsPartOfGateMustRemoveGate"), gate.getName()) , Objects.requireNonNull(messageService.getLanguage().getString("BlockIsPartOfGateMustRemoveGate")).replace("#name#", gate.getName()), true); return true; } @@ -461,7 +461,7 @@ public void initiatePowerIncreaseForAllPlayers() { private void initiatePowerIncrease(PowerRecord powerRecord) { if (powerRecord.getPower() < powerRecord.maxPower() && Objects.requireNonNull(getServer().getPlayer(powerRecord.getPlayerUUID())).isOnline()) { powerRecord.increasePower(); - playerService.sendMessageType(getServer().getPlayer(powerRecord.getPlayerUUID()), ChatColor.GREEN + String.format(localeService.get("AlertPowerLevelIncreasedBy"), configService.getInt("powerIncreaseAmount")) + playerService.sendMessage(getServer().getPlayer(powerRecord.getPlayerUUID()), ChatColor.GREEN + String.format(localeService.get("AlertPowerLevelIncreasedBy"), configService.getInt("powerIncreaseAmount")) , Objects.requireNonNull(messageService.getLanguage().getString("AlertPowerLevelIncreasedBy")) .replace("#number#", String.valueOf(configService.getInt("powerIncreaseAmount"))), true); } @@ -476,7 +476,7 @@ public void disbandAllZeroPowerFactions() { } for (String factionName : factionsToDisband) { - messenger.sendAllPlayersInFactionMessage(getFaction(factionName), playerService.getMessageType(ChatColor.RED + localeService.get("AlertDisbandmentDueToZeroPower"), messageService.getLanguage().getString("AlertDisbandmentDueToZeroPower"))); + messenger.sendAllPlayersInFactionMessage(getFaction(factionName), playerService.decideWhichMessageToUse(ChatColor.RED + localeService.get("AlertDisbandmentDueToZeroPower"), messageService.getLanguage().getString("AlertDisbandmentDueToZeroPower"))); removeFaction(factionName); System.out.printf((localeService.get("DisbandmentDueToZeroPower")) + "%n", factionName); } @@ -631,7 +631,7 @@ public void radiusClaimAtLocation(int depth, Player claimant, Location location, // check if depth is valid if (depth < 0 || depth > maxClaimRadius) { - playerService.sendMessageType(claimant, ChatColor.RED + String.format(localeService.get("RadiusRequirement"), maxClaimRadius), + playerService.sendMessage(claimant, ChatColor.RED + String.format(localeService.get("RadiusRequirement"), maxClaimRadius), Objects.requireNonNull(messageService.getLanguage().getString("RadiusRequirement")) .replace("#number#", String.valueOf(maxClaimRadius)), true); return; @@ -704,11 +704,11 @@ public void removeChunkAtPlayerLocation(Player player, Faction playersFaction) { ClaimedChunk chunk = isChunkClaimed(playerCoords[0], playerCoords[1], Objects.requireNonNull(player.getLocation().getWorld()).getName()); if (chunk != null) { removeChunk(chunk, player, getFaction(chunk.getHolder())); - playerService.sendMessageType(player, ChatColor.GREEN + localeService.get("LandClaimedUsingAdminBypass") + playerService.sendMessage(player, ChatColor.GREEN + localeService.get("LandClaimedUsingAdminBypass") , "LandClaimedUsingAdminBypass", false); return; } - playerService.sendMessageType(player, ChatColor.RED + localeService.get("LandNotCurrentlyClaimed") + playerService.sendMessage(player, ChatColor.RED + localeService.get("LandNotCurrentlyClaimed") , "LandNotCurrentlyClaimed", false); return; } @@ -722,14 +722,14 @@ public void removeChunkAtPlayerLocation(Player player, Faction playersFaction) { // ensure that the chunk is claimed by the player's faction. if (!chunk.getHolder().equalsIgnoreCase(playersFaction.getName())) { - playerService.sendMessageType(player, ChatColor.RED + String.format(localeService.get("LandClaimedBy"), chunk.getHolder()) + playerService.sendMessage(player, ChatColor.RED + String.format(localeService.get("LandClaimedBy"), chunk.getHolder()) , Objects.requireNonNull(messageService.getLanguage().getString("LandClaimedBy")).replace("#player#", chunk.getHolder()), true); return; } // initiate removal removeChunk(chunk, player, playersFaction); - playerService.sendMessageType(player, ChatColor.GREEN + localeService.get("LandUnclaimed"), + playerService.sendMessage(player, ChatColor.GREEN + localeService.get("LandUnclaimed"), "LandUnclaimed", false); } @@ -832,7 +832,7 @@ public void informPlayerIfTheirLandIsInDanger(Player player) { Faction faction = getPlayersFaction(player.getUniqueId()); if (faction != null) { if (isFactionExceedingTheirDemesneLimit(faction)) { - playerService.sendMessageType(player, ChatColor.RED + localeService.get("AlertMoreClaimedChunksThanPower") + playerService.sendMessage(player, ChatColor.RED + localeService.get("AlertMoreClaimedChunksThanPower") , "AlertMoreClaimedChunksThanPower", false); } } @@ -951,7 +951,7 @@ private void claimChunkAtLocation(Player claimant, double[] chunkCoords, World w if (configService.getBoolean("limitLand")) { // if at demesne limit if (!(getChunksClaimedByFaction(claimantsFaction.getName()) < claimantsFaction.getCumulativePowerLevel())) { - playerService.sendMessageType(claimant, ChatColor.RED + localeService.get("AlertReachedDemesne") + playerService.sendMessage(claimant, ChatColor.RED + localeService.get("AlertReachedDemesne") , "AlertReachedDemesne", false); return; } @@ -965,14 +965,14 @@ private void claimChunkAtLocation(Player claimant, double[] chunkCoords, World w // if holder is player's faction if (targetFaction.getName().equalsIgnoreCase(claimantsFaction.getName()) && !claimantsFaction.getAutoClaimStatus()) { - playerService.sendMessageType(claimant, ChatColor.RED + localeService.get("LandAlreadyClaimedByYourFaction") + playerService.sendMessage(claimant, ChatColor.RED + localeService.get("LandAlreadyClaimedByYourFaction") , "LandAlreadyClaimedByYourFaction", false); return; } // if not at war with target faction if (!claimantsFaction.isEnemy(targetFaction.getName())) { - playerService.sendMessageType(claimant, ChatColor.RED + "You must be at war with a faction to conquer land from them." + playerService.sendMessage(claimant, ChatColor.RED + "You must be at war with a faction to conquer land from them." , "IsNotEnemy", false); return; } @@ -980,7 +980,7 @@ private void claimChunkAtLocation(Player claimant, double[] chunkCoords, World w // surrounded chunk protection check if (configService.getBoolean("surroundedChunksProtected")) { if (isClaimedChunkSurroundedByChunksClaimedBySameFaction(chunk)) { - playerService.sendMessageType(claimant, ChatColor.RED + localeService.get("SurroundedChunkProtected"), + playerService.sendMessage(claimant, ChatColor.RED + localeService.get("SurroundedChunkProtected"), "SurroundedChunkProtected", false); return; } @@ -991,7 +991,7 @@ private void claimChunkAtLocation(Player claimant, double[] chunkCoords, World w // if target faction does not have more land than their demesne limit if (!(targetFactionsCumulativePowerLevel < chunksClaimedByTargetFaction)) { - playerService.sendMessageType(claimant, ChatColor.RED + localeService.get("TargetFactionNotOverClaiming") + playerService.sendMessage(claimant, ChatColor.RED + localeService.get("TargetFactionNotOverClaiming") , "TargetFactionNotOverClaiming", false); return; } @@ -1009,11 +1009,11 @@ private void claimChunkAtLocation(Player claimant, double[] chunkCoords, World w Chunk toClaim = world.getChunkAt((int) chunkCoords[0], (int) chunkCoords[1]); addClaimedChunk(toClaim, claimantsFaction, claimant.getWorld()); - playerService.sendMessageType(claimant, ChatColor.GREEN + String.format(localeService.get("AlertLandConqueredFromAnotherFaction"), targetFaction.getName(), getChunksClaimedByFaction(claimantsFaction.getName()), claimantsFaction.getCumulativePowerLevel()) + playerService.sendMessage(claimant, ChatColor.GREEN + String.format(localeService.get("AlertLandConqueredFromAnotherFaction"), targetFaction.getName(), getChunksClaimedByFaction(claimantsFaction.getName()), claimantsFaction.getCumulativePowerLevel()) , Objects.requireNonNull(messageService.getLanguage().getString("AlertLandConqueredFromAnotherFaction")).replace("#name", targetFaction.getName()).replace("#number#", String.valueOf(getChunksClaimedByFaction(claimantsFaction.getName()))).replace("#max#", String.valueOf(claimantsFaction.getCumulativePowerLevel())), true); messenger.sendAllPlayersInFactionMessage(targetFaction, playerService - .getMessageType(ChatColor.RED + String.format(localeService.get("AlertLandConqueredFromYourFaction"), claimantsFaction.getName()) + .decideWhichMessageToUse(ChatColor.RED + String.format(localeService.get("AlertLandConqueredFromYourFaction"), claimantsFaction.getName()) , Objects.requireNonNull(messageService.getLanguage().getString("AlertLandConqueredFromYourFaction")).replace("#number#", claimantsFaction.getName()))); } } else { @@ -1023,7 +1023,7 @@ private void claimChunkAtLocation(Player claimant, double[] chunkCoords, World w if (!claimEvent.isCancelled()) { // chunk not already claimed addClaimedChunk(toClaim, claimantsFaction, claimant.getWorld()); - playerService.sendMessageType(claimant, ChatColor.GREEN + String.format(localeService.get("AlertLandClaimed"), getChunksClaimedByFaction(claimantsFaction.getName()), claimantsFaction.getCumulativePowerLevel()) + playerService.sendMessage(claimant, ChatColor.GREEN + String.format(localeService.get("AlertLandClaimed"), getChunksClaimedByFaction(claimantsFaction.getName()), claimantsFaction.getCumulativePowerLevel()) , Objects.requireNonNull(messageService.getLanguage().getString("AlertLandClaimed")).replace("#number#", String.valueOf(getChunksClaimedByFaction(claimantsFaction.getName()))).replace("#max#", String.valueOf(claimantsFaction.getCumulativePowerLevel())), true); } } @@ -1118,7 +1118,7 @@ private void removeChunk(ClaimedChunk chunkToRemove, Player unclaimingPlayer, Fa && chunkToRemove.getWorldName().equalsIgnoreCase(Objects.requireNonNull(unclaimingPlayer.getLocation().getWorld()).getName())) { // remove faction home holdingFaction.setFactionHome(null); - messenger.sendAllPlayersInFactionMessage(holdingFaction, playerService.getMessageType(ChatColor.RED + localeService.get("AlertFactionHomeRemoved"), messageService.getLanguage().getString("AlertFactionHomeRemoved"))); + messenger.sendAllPlayersInFactionMessage(holdingFaction, playerService.decideWhichMessageToUse(ChatColor.RED + localeService.get("AlertFactionHomeRemoved"), messageService.getLanguage().getString("AlertFactionHomeRemoved"))); } } diff --git a/src/main/java/dansplugins/factionsystem/eventhandlers/InteractionHandler.java b/src/main/java/dansplugins/factionsystem/eventhandlers/InteractionHandler.java index d665c5744..daeec3207 100644 --- a/src/main/java/dansplugins/factionsystem/eventhandlers/InteractionHandler.java +++ b/src/main/java/dansplugins/factionsystem/eventhandlers/InteractionHandler.java @@ -85,7 +85,7 @@ public void handle(BlockBreakEvent event) { boolean isOwner = persistentData.getLockedBlock(block).getOwner().equals(player.getUniqueId()); if (!isOwner) { event.setCancelled(true); - playerService.sendMessageType(player, ChatColor.RED + localeService.get("AlertNonOwnership") + playerService.sendMessage(player, ChatColor.RED + localeService.get("AlertNonOwnership") , "AlertNonOwnership", false); return; } @@ -128,7 +128,7 @@ public void handle(BlockPlaceEvent event) { if (blockChecker.isChest(event.getBlock())) { boolean isNextToNonOwnedLockedChest = blockChecker.isNextToNonOwnedLockedChest(event.getPlayer(), event.getBlock()); if (isNextToNonOwnedLockedChest) { - playerService.sendMessageType(player, ChatColor.RED + localeService.get("CannotPlaceChestsNextToUnownedLockedChests") + playerService.sendMessage(player, ChatColor.RED + localeService.get("CannotPlaceChestsNextToUnownedLockedChests") , "CannotPlaceChestsNextToUnownedLockedChests", false); event.setCancelled(true); return; @@ -172,7 +172,7 @@ public void handle(BlockPlaceEvent event) { boolean isUnderOrAboveNonOwnedLockedChest = blockChecker.isUnderOrAboveNonOwnedLockedChest(event.getPlayer(), event.getBlock()); if (isNextToNonOwnedLockedChest || isUnderOrAboveNonOwnedLockedChest) { event.setCancelled(true); - playerService.sendMessageType(player, ChatColor.RED + localeService.get("CannotPlaceHoppersNextToUnownedLockedChests") + playerService.sendMessage(player, ChatColor.RED + localeService.get("CannotPlaceHoppersNextToUnownedLockedChests") , "CannotPlaceHoppersNextToUnownedLockedChests", false); } } @@ -202,7 +202,7 @@ public void handle(PlayerInteractEvent event) { if (!playerHasAccess && !isPlayerBypassing) { UUIDChecker uuidChecker = new UUIDChecker(); String owner = uuidChecker.findPlayerNameBasedOnUUID(lockedBlock.getOwner()); - playerService.sendMessageType(player, ChatColor.RED + String.format(localeService.get("LockedBy"), owner) + playerService.sendMessage(player, ChatColor.RED + String.format(localeService.get("LockedBy"), owner) , Objects.requireNonNull(messageService.getLanguage().getString("LockedBy")) .replace("#name#", owner), true); event.setCancelled(true); @@ -232,7 +232,7 @@ public void handle(PlayerInteractEvent event) { } else { if (isPlayerUsingAnAccessCommand(player)) { - playerService.sendMessageType(player, ChatColor.RED + localeService.get("BlockIsNotLocked"), "BlockIsNotLocked", false); + playerService.sendMessage(player, ChatColor.RED + localeService.get("BlockIsNotLocked"), "BlockIsNotLocked", false); } } diff --git a/src/main/java/dansplugins/factionsystem/eventhandlers/MoveHandler.java b/src/main/java/dansplugins/factionsystem/eventhandlers/MoveHandler.java index 0e1f4a543..53bfba9c1 100644 --- a/src/main/java/dansplugins/factionsystem/eventhandlers/MoveHandler.java +++ b/src/main/java/dansplugins/factionsystem/eventhandlers/MoveHandler.java @@ -100,7 +100,7 @@ private void initiateAutoclaimCheck(Player player) { if (notAtDemesneLimit(playersFaction)) { scheduleClaiming(player, playersFaction); } else { - playerService.sendMessageType(player, ChatColor.RED + localeService.get("AlertReachedDemesne"), "AlertReachedDemesne", false); + playerService.sendMessage(player, ChatColor.RED + localeService.get("AlertReachedDemesne"), "AlertReachedDemesne", false); } } } diff --git a/src/main/java/dansplugins/factionsystem/objects/helper/FactionFlags.java b/src/main/java/dansplugins/factionsystem/objects/helper/FactionFlags.java index f9eb0d122..ed8e893de 100644 --- a/src/main/java/dansplugins/factionsystem/objects/helper/FactionFlags.java +++ b/src/main/java/dansplugins/factionsystem/objects/helper/FactionFlags.java @@ -118,18 +118,18 @@ public void sendFlagList(Player player) { public void setFlag(String flag, String value, Player player) { if (flag.equals("neutral") && !configService.getBoolean("allowNeutrality")) { - playerService.sendMessageType(player, ChatColor.RED + "" + localeService.get("NeutralityDisabled") + playerService.sendMessage(player, ChatColor.RED + "" + localeService.get("NeutralityDisabled") , "NeutralityDisabled", false); return; } if (flag.equals("prefixColor") && !configService.getBoolean("factionsCanSetPrefixColors")) { - playerService.sendMessageType(player, "&cPlayers can't set prefix colors.", "CannotSetPrefix", false); + playerService.sendMessage(player, "&cPlayers can't set prefix colors.", "CannotSetPrefix", false); return; } if (flag.equals("prefixColor") && (!configService.getBoolean("playersChatWithPrefixes"))) { - playerService.sendMessageType(player, ChatColor.RED + "" + localeService.get("PrefixesDisabled"), "PrefixesDisabled", false); + playerService.sendMessage(player, ChatColor.RED + "" + localeService.get("PrefixesDisabled"), "PrefixesDisabled", false); return; } diff --git a/src/main/java/dansplugins/factionsystem/services/CommandService.java b/src/main/java/dansplugins/factionsystem/services/CommandService.java index e969b454c..2fd8d7e82 100644 --- a/src/main/java/dansplugins/factionsystem/services/CommandService.java +++ b/src/main/java/dansplugins/factionsystem/services/CommandService.java @@ -114,7 +114,7 @@ public boolean interpretCommand(CommandSender sender, String label, String[] arg messageService.getLanguage().getStringList("PluginInfo") .forEach(s -> { s = s.replace("#version#", medievalFactions.getVersion()).replace("#dev#", medievalFactions.getDescription().getAuthors().toString()); - playerService.sendMessageType(sender, s, s, true); + playerService.sendMessage(sender, s, s, true); }); } return true; @@ -130,7 +130,7 @@ public boolean interpretCommand(CommandSender sender, String label, String[] arg } } - playerService.sendMessageType(sender, ChatColor.RED + localeService.get("CommandNotRecognized"), "CommandNotRecognized", false); + playerService.sendMessage(sender, ChatColor.RED + localeService.get("CommandNotRecognized"), "CommandNotRecognized", false); } return false; } diff --git a/src/main/java/dansplugins/factionsystem/services/GateService.java b/src/main/java/dansplugins/factionsystem/services/GateService.java index c207c2c17..dea50ba20 100644 --- a/src/main/java/dansplugins/factionsystem/services/GateService.java +++ b/src/main/java/dansplugins/factionsystem/services/GateService.java @@ -62,7 +62,7 @@ public void handlePotentialGateInteraction(Block clickedBlock, Player player, Pl g.openGate(); } else { event.setCancelled(true); - playerService.sendMessageType(player, ChatColor.RED + String.format(localeService.get("PleaseWaitGate"), g.getStatus()) + playerService.sendMessage(player, ChatColor.RED + String.format(localeService.get("PleaseWaitGate"), g.getStatus()) , Objects.requireNonNull(messageService.getLanguage().getString("PleaseWaitGate")).replace("#status#", g.getStatus()), true); return; } @@ -71,7 +71,7 @@ public void handlePotentialGateInteraction(Block clickedBlock, Player player, Pl g.closeGate(); } else { event.setCancelled(true); - playerService.sendMessageType(player, ChatColor.RED + String.format(localeService.get("PleaseWaitGate"), g.getStatus()) + playerService.sendMessage(player, ChatColor.RED + String.format(localeService.get("PleaseWaitGate"), g.getStatus()) , Objects.requireNonNull(messageService.getLanguage().getString("PleaseWaitGate")).replace("#status#", g.getStatus()), true); return; } @@ -108,19 +108,19 @@ public void handlePotentialGateInteraction(Block block, BlockRedstoneEvent event public void handleCreatingGate(Block clickedBlock, Player player, PlayerInteractEvent event) { if (!persistentData.getChunkDataAccessor().isClaimed(clickedBlock.getChunk())) { - playerService.sendMessageType(player, ChatColor.RED + localeService.get("CanOnlyCreateGatesInClaimedTerritory"), "CanOnlyCreateGatesInClaimedTerritory", false); + playerService.sendMessage(player, ChatColor.RED + localeService.get("CanOnlyCreateGatesInClaimedTerritory"), "CanOnlyCreateGatesInClaimedTerritory", false); return; } else { ClaimedChunk claimedChunk = persistentData.getChunkDataAccessor().getClaimedChunk(clickedBlock.getChunk()); if (claimedChunk != null) { if (!persistentData.getFaction(claimedChunk.getHolder()).isMember(player.getUniqueId())) { - playerService.sendMessageType(player, ChatColor.RED + localeService.get("AlertMustBeMemberToCreateGate"), "AlertMustBeMemberToCreateGate", false); + playerService.sendMessage(player, ChatColor.RED + localeService.get("AlertMustBeMemberToCreateGate"), "AlertMustBeMemberToCreateGate", false); return; } else { if (!persistentData.getFaction(claimedChunk.getHolder()).isOwner(player.getUniqueId()) && !persistentData.getFaction(claimedChunk.getHolder()).isOfficer(player.getUniqueId())) { - playerService.sendMessageType(player, ChatColor.RED + localeService.get("AlertMustBeOwnerOrOfficerToCreateGate"), "AlertMustBeOwnerOrOfficerToCreateGate", false); + playerService.sendMessage(player, ChatColor.RED + localeService.get("AlertMustBeOwnerOrOfficerToCreateGate"), "AlertMustBeOwnerOrOfficerToCreateGate", false); return; } } @@ -132,24 +132,24 @@ public void handleCreatingGate(Block clickedBlock, Player player, PlayerInteract if (ephemeralData.getCreatingGatePlayers().containsKey(event.getPlayer().getUniqueId()) && ephemeralData.getCreatingGatePlayers().get(event.getPlayer().getUniqueId()).getCoord1() == null) { Gate.ErrorCodeAddCoord e = ephemeralData.getCreatingGatePlayers().get(event.getPlayer().getUniqueId()).addCoord(clickedBlock); if (e.equals(Gate.ErrorCodeAddCoord.None)) { - playerService.sendMessageType(event.getPlayer(), ChatColor.GREEN + localeService.get("Point1PlacementSuccessful") + playerService.sendMessage(event.getPlayer(), ChatColor.GREEN + localeService.get("Point1PlacementSuccessful") , "Point1PlacementSuccessful", false); - playerService.sendMessageType(event.getPlayer(), ChatColor.YELLOW + localeService.get("ClickToPlaceSecondCorner") + playerService.sendMessage(event.getPlayer(), ChatColor.YELLOW + localeService.get("ClickToPlaceSecondCorner") , "ClickToPlaceSecondCorner", false); } else if (e.equals(Gate.ErrorCodeAddCoord.MaterialMismatch)) { - playerService.sendMessageType(event.getPlayer(), ChatColor.RED + localeService.get("MaterialsMismatch1") + playerService.sendMessage(event.getPlayer(), ChatColor.RED + localeService.get("MaterialsMismatch1") , "MaterialsMismatch1", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } else if (e.equals(Gate.ErrorCodeAddCoord.WorldMismatch)) { - playerService.sendMessageType(event.getPlayer(), ChatColor.RED + localeService.get("WorldsMismatch1") + playerService.sendMessage(event.getPlayer(), ChatColor.RED + localeService.get("WorldsMismatch1") , "WorldsMismatch1", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } else if (e.equals(Gate.ErrorCodeAddCoord.NoCuboids)) { - playerService.sendMessageType(player, ChatColor.RED + localeService.get("CuboidDisallowed1") + playerService.sendMessage(player, ChatColor.RED + localeService.get("CuboidDisallowed1") , "CuboidDisallowed1", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } else { - playerService.sendMessageType(player, ChatColor.RED + localeService.get("CancelledGatePlacement1") + playerService.sendMessage(player, ChatColor.RED + localeService.get("CancelledGatePlacement1") , "CancelledGatePlacement1", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } @@ -159,28 +159,28 @@ public void handleCreatingGate(Block clickedBlock, Player player, PlayerInteract if (!ephemeralData.getCreatingGatePlayers().get(event.getPlayer().getUniqueId()).getCoord1().equals(clickedBlock)) { Gate.ErrorCodeAddCoord e = ephemeralData.getCreatingGatePlayers().get(event.getPlayer().getUniqueId()).addCoord(clickedBlock); if (e.equals(Gate.ErrorCodeAddCoord.None)) { - playerService.sendMessageType(event.getPlayer(), ChatColor.GREEN + localeService.get("Point2PlacementSuccessful") + playerService.sendMessage(event.getPlayer(), ChatColor.GREEN + localeService.get("Point2PlacementSuccessful") , "Point2PlacementSuccessful", false); - playerService.sendMessageType(event.getPlayer(), ChatColor.YELLOW + "Click on the trigger block..." + playerService.sendMessage(event.getPlayer(), ChatColor.YELLOW + "Click on the trigger block..." , "ClickTBlock", false); } else if (e.equals(Gate.ErrorCodeAddCoord.MaterialMismatch)) { - playerService.sendMessageType(event.getPlayer(), ChatColor.RED + localeService.get("MaterialsMismatch2") + playerService.sendMessage(event.getPlayer(), ChatColor.RED + localeService.get("MaterialsMismatch2") , "MaterialsMismatch2", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } else if (e.equals(Gate.ErrorCodeAddCoord.WorldMismatch)) { - playerService.sendMessageType(event.getPlayer(), ChatColor.RED + localeService.get("WorldsMismatch2") + playerService.sendMessage(event.getPlayer(), ChatColor.RED + localeService.get("WorldsMismatch2") , "WorldsMismatch2", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } else if (e.equals(Gate.ErrorCodeAddCoord.NoCuboids)) { - playerService.sendMessageType(player, ChatColor.RED + localeService.get("CuboidDisallowed2") + playerService.sendMessage(player, ChatColor.RED + localeService.get("CuboidDisallowed2") , "CuboidDisallowed2", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } else if (e.equals(Gate.ErrorCodeAddCoord.LessThanThreeHigh)) { - playerService.sendMessageType(player, ChatColor.RED + localeService.get("ThreeBlockRequirement") + playerService.sendMessage(player, ChatColor.RED + localeService.get("ThreeBlockRequirement") , "ThreeBlockRequirement", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } else { - playerService.sendMessageType(player, ChatColor.RED + localeService.get("CancelledGatePlacement2") + playerService.sendMessage(player, ChatColor.RED + localeService.get("CancelledGatePlacement2") , "CancelledGatePlacement2", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } @@ -196,28 +196,28 @@ public void handleCreatingGate(Block clickedBlock, Player player, PlayerInteract Faction faction = persistentData.getFaction(claim.getHolder()); faction.addGate(ephemeralData.getCreatingGatePlayers().get(event.getPlayer().getUniqueId())); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); - playerService.sendMessageType(event.getPlayer(), ChatColor.GREEN + "Creating Gate 4/4: Trigger successfully linked." + playerService.sendMessage(event.getPlayer(), ChatColor.GREEN + "Creating Gate 4/4: Trigger successfully linked." , "Point4TriggeredSuccessfully", false); - playerService.sendMessageType(event.getPlayer(), ChatColor.GREEN + localeService.get("GateCreated") + playerService.sendMessage(event.getPlayer(), ChatColor.GREEN + localeService.get("GateCreated") , "GateCreated", false); } else { - playerService.sendMessageType(event.getPlayer(), ChatColor.RED + localeService.get("CancelledGatePlacementErrorLinking") + playerService.sendMessage(event.getPlayer(), ChatColor.RED + localeService.get("CancelledGatePlacementErrorLinking") , "CancelledGatePlacementErrorLinking", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } } else { - playerService.sendMessageType(event.getPlayer(), ChatColor.RED + "Error: Can only use triggers in claimed territory." + playerService.sendMessage(event.getPlayer(), ChatColor.RED + "Error: Can only use triggers in claimed territory." , "CanOnlyTrigger", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } } else { - playerService.sendMessageType(event.getPlayer(), ChatColor.RED + "Trigger block was not powerable. Cancelled gate placement." + playerService.sendMessage(event.getPlayer(), ChatColor.RED + "Trigger block was not powerable. Cancelled gate placement." , "TriggerBlockNotPowerable", false); ephemeralData.getCreatingGatePlayers().remove(event.getPlayer().getUniqueId()); } } } else { - playerService.sendMessageType(event.getPlayer(), ChatColor.RED + localeService.get("PermissionGate") + playerService.sendMessage(event.getPlayer(), ChatColor.RED + localeService.get("PermissionGate") , Objects.requireNonNull(messageService.getLanguage().getString("PermissionNeeded")).replace("#permission#", "mf.gate"), true); } } diff --git a/src/main/java/dansplugins/factionsystem/services/LockService.java b/src/main/java/dansplugins/factionsystem/services/LockService.java index c1c15bc4e..822ea3e67 100644 --- a/src/main/java/dansplugins/factionsystem/services/LockService.java +++ b/src/main/java/dansplugins/factionsystem/services/LockService.java @@ -48,14 +48,14 @@ public void handleLockingBlock(PlayerInteractEvent event, Player player, Block c // if claimed by other faction if (!chunk.getHolder().equalsIgnoreCase(persistentData.getPlayersFaction(player.getUniqueId()).getName())) { - playerService.sendMessageType(player, ChatColor.RED + localeService.get("CanOnlyLockInFactionTerritory"), "CanOnlyLockInFactionTerritory", false); + playerService.sendMessage(player, ChatColor.RED + localeService.get("CanOnlyLockInFactionTerritory"), "CanOnlyLockInFactionTerritory", false); event.setCancelled(true); return; } // if already locked if (persistentData.isBlockLocked(clickedBlock)) { - playerService.sendMessageType(player, ChatColor.RED + localeService.get("BlockAlreadyLocked"), "BlockAlreadyLocked", false); + playerService.sendMessage(player, ChatColor.RED + localeService.get("BlockAlreadyLocked"), "BlockAlreadyLocked", false); event.setCancelled(true); return; } @@ -98,7 +98,7 @@ public void handleLockingBlock(PlayerInteractEvent event, Player player, Block c persistentData.addLockedBlock(newLockedBlock2); } - playerService.sendMessageType(player, ChatColor.GREEN + localeService.get("Locked"), "Locked", false); + playerService.sendMessage(player, ChatColor.GREEN + localeService.get("Locked"), "Locked", false); ephemeralData.getLockingPlayers().remove(player.getUniqueId()); } @@ -109,10 +109,10 @@ public void handleLockingBlock(PlayerInteractEvent event, Player player, Block c event.setCancelled(true); } else { - playerService.sendMessageType(player, ChatColor.RED + localeService.get("CanOnlyLockSpecificBlocks"), "CanOnlyLockSpecificBlocks", false); + playerService.sendMessage(player, ChatColor.RED + localeService.get("CanOnlyLockSpecificBlocks"), "CanOnlyLockSpecificBlocks", false); } } else { - playerService.sendMessageType(player, ChatColor.RED + localeService.get("CanOnlyLockBlocksInClaimedTerritory"), "CanOnlyLockBlocksInClaimedTerritory", false); + playerService.sendMessage(player, ChatColor.RED + localeService.get("CanOnlyLockBlocksInClaimedTerritory"), "CanOnlyLockBlocksInClaimedTerritory", false); event.setCancelled(true); } } @@ -120,7 +120,7 @@ public void handleLockingBlock(PlayerInteractEvent event, Player player, Block c private void lock1x1Block(Player player, Block clickedBlock) { LockedBlock block = new LockedBlock(player.getUniqueId(), persistentData.getPlayersFaction(player.getUniqueId()).getName(), clickedBlock.getX(), clickedBlock.getY(), clickedBlock.getZ(), clickedBlock.getWorld().getName()); persistentData.addLockedBlock(block); - playerService.sendMessageType(player, ChatColor.GREEN + localeService.get("Locked"), "Locked", false); + playerService.sendMessage(player, ChatColor.GREEN + localeService.get("Locked"), "Locked", false); ephemeralData.getLockingPlayers().remove(player.getUniqueId()); } @@ -145,7 +145,7 @@ public void handleUnlockingBlock(PlayerInteractEvent event, Player player, Block // unlock single chest persistentData.removeLockedBlock(clickedBlock); } - playerService.sendMessageType(player, ChatColor.GREEN + localeService.get("AlertUnlocked"), "Unlocked", false); + playerService.sendMessage(player, ChatColor.GREEN + localeService.get("AlertUnlocked"), "Unlocked", false); ephemeralData.getUnlockingPlayers().remove(player.getUniqueId()); } @@ -162,7 +162,7 @@ public void handleUnlockingBlock(PlayerInteractEvent event, Player player, Block persistentData.removeLockedBlock(clickedBlock.getWorld().getBlockAt(clickedBlock.getX(), clickedBlock.getY() - 1, clickedBlock.getZ())); } - playerService.sendMessageType(player, ChatColor.GREEN + localeService.get("AlertUnlocked"), "Unlocked", false); + playerService.sendMessage(player, ChatColor.GREEN + localeService.get("AlertUnlocked"), "Unlocked", false); ephemeralData.getUnlockingPlayers().remove(player.getUniqueId()); } @@ -170,7 +170,7 @@ public void handleUnlockingBlock(PlayerInteractEvent event, Player player, Block if (blockChecker.isGate(clickedBlock) || blockChecker.isBarrel(clickedBlock) || blockChecker.isTrapdoor(clickedBlock) || blockChecker.isFurnace(clickedBlock)) { persistentData.removeLockedBlock(clickedBlock); - playerService.sendMessageType(player, ChatColor.GREEN + localeService.get("AlertUnlocked"), "Unlocked", false); + playerService.sendMessage(player, ChatColor.GREEN + localeService.get("AlertUnlocked"), "Unlocked", false); ephemeralData.getUnlockingPlayers().remove(player.getUniqueId()); } @@ -180,7 +180,7 @@ public void handleUnlockingBlock(PlayerInteractEvent event, Player player, Block event.setCancelled(true); } } else { - playerService.sendMessageType(player, ChatColor.RED + localeService.get("BlockIsNotLocked"), "BlockIsNotLocked", false); + playerService.sendMessage(player, ChatColor.RED + localeService.get("BlockIsNotLocked"), "BlockIsNotLocked", false); event.setCancelled(true); } } @@ -190,7 +190,7 @@ public void handleGrantingAccess(PlayerInteractEvent event, Block clickedBlock, // if not owner if (persistentData.getLockedBlock(clickedBlock).getOwner() != player.getUniqueId()) { - playerService.sendMessageType(player, ChatColor.RED + localeService.get("NotTheOwnerOfThisBlock"), "NotTheOwnerOfThisBlock", false); + playerService.sendMessage(player, ChatColor.RED + localeService.get("NotTheOwnerOfThisBlock"), "NotTheOwnerOfThisBlock", false); return; } @@ -210,7 +210,7 @@ public void handleGrantingAccess(PlayerInteractEvent event, Block clickedBlock, // grant access to single chest persistentData.getLockedBlock(clickedBlock).addToAccessList(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId())); } - playerService.sendMessageType(player, ChatColor.GREEN + String.format(localeService.get("AlertAccessGrantedTo"), uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId()))), Objects.requireNonNull(messageService.getLanguage().getString("AlertAccessGrantedTo")).replace("#name#", uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId()))), true); + playerService.sendMessage(player, ChatColor.GREEN + String.format(localeService.get("AlertAccessGrantedTo"), uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId()))), Objects.requireNonNull(messageService.getLanguage().getString("AlertAccessGrantedTo")).replace("#name#", uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId()))), true); ephemeralData.getPlayersGrantingAccess().remove(player.getUniqueId()); } @@ -228,7 +228,7 @@ public void handleGrantingAccess(PlayerInteractEvent event, Block clickedBlock, persistentData.getLockedBlock(clickedBlock).addToAccessList(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId())); } - playerService.sendMessageType(player, ChatColor.GREEN + String.format(localeService.get("AlertAccessGrantedTo"), uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId()))), Objects.requireNonNull(messageService.getLanguage().getString("AlertAccessGrantedTo")).replace("#name#", uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId()))), true); + playerService.sendMessage(player, ChatColor.GREEN + String.format(localeService.get("AlertAccessGrantedTo"), uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId()))), Objects.requireNonNull(messageService.getLanguage().getString("AlertAccessGrantedTo")).replace("#name#", uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId()))), true); ephemeralData.getPlayersGrantingAccess().remove(player.getUniqueId()); } @@ -236,7 +236,7 @@ public void handleGrantingAccess(PlayerInteractEvent event, Block clickedBlock, if (blockChecker.isGate(clickedBlock) || blockChecker.isBarrel(clickedBlock) || blockChecker.isTrapdoor(clickedBlock) || blockChecker.isFurnace(clickedBlock)) { persistentData.getLockedBlock(clickedBlock).addToAccessList(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId())); - playerService.sendMessageType(player, ChatColor.GREEN + String.format(localeService.get("AlertAccessGrantedTo"), uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId()))), Objects.requireNonNull(messageService.getLanguage().getString("AlertAccessGrantedTo")).replace("#name#", uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId()))), true); + playerService.sendMessage(player, ChatColor.GREEN + String.format(localeService.get("AlertAccessGrantedTo"), uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId()))), Objects.requireNonNull(messageService.getLanguage().getString("AlertAccessGrantedTo")).replace("#name#", uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId()))), true); ephemeralData.getPlayersGrantingAccess().remove(player.getUniqueId()); } @@ -245,9 +245,9 @@ public void handleGrantingAccess(PlayerInteractEvent event, Block clickedBlock, public void handleCheckingAccess(PlayerInteractEvent event, LockedBlock lockedBlock, Player player) { UUIDChecker uuidChecker = new UUIDChecker(); - playerService.sendMessageType(player, ChatColor.AQUA + localeService.get("FollowingPlayersHaveAccess"), "FollowingPlayersHaveAccess", false); + playerService.sendMessage(player, ChatColor.AQUA + localeService.get("FollowingPlayersHaveAccess"), "FollowingPlayersHaveAccess", false); for (UUID playerUUID : lockedBlock.getAccessList()) { - playerService.sendMessageType(player, ChatColor.AQUA + " - " + uuidChecker.findPlayerNameBasedOnUUID(playerUUID), Objects.requireNonNull(messageService.getLanguage().getString("FPHAList")).replace("#name#", uuidChecker.findPlayerNameBasedOnUUID(playerUUID)), true); + playerService.sendMessage(player, ChatColor.AQUA + " - " + uuidChecker.findPlayerNameBasedOnUUID(playerUUID), Objects.requireNonNull(messageService.getLanguage().getString("FPHAList")).replace("#name#", uuidChecker.findPlayerNameBasedOnUUID(playerUUID)), true); } ephemeralData.getPlayersCheckingAccess().remove(player.getUniqueId()); event.setCancelled(true); @@ -258,7 +258,7 @@ public void handleRevokingAccess(PlayerInteractEvent event, Block clickedBlock, // if not owner if (persistentData.getLockedBlock(clickedBlock).getOwner() != player.getUniqueId()) { - playerService.sendMessageType(player, ChatColor.RED + localeService.get("NotTheOwnerOfThisBlock"), "NotTheOwnerOfThisBlock", false); + playerService.sendMessage(player, ChatColor.RED + localeService.get("NotTheOwnerOfThisBlock"), "NotTheOwnerOfThisBlock", false); return; } @@ -278,7 +278,7 @@ public void handleRevokingAccess(PlayerInteractEvent event, Block clickedBlock, // revoke access to single chest persistentData.getLockedBlock(clickedBlock).removeFromAccessList(ephemeralData.getPlayersRevokingAccess().get(player.getUniqueId())); } - playerService.sendMessageType(player, ChatColor.GREEN + String.format(localeService.get("AlertAccessRevokedFor"), uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersRevokingAccess().get(player.getUniqueId()))), Objects.requireNonNull(messageService.getLanguage().getString("AlertAccessRevokedFor")).replace("#name#", uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId()))), true); + playerService.sendMessage(player, ChatColor.GREEN + String.format(localeService.get("AlertAccessRevokedFor"), uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersRevokingAccess().get(player.getUniqueId()))), Objects.requireNonNull(messageService.getLanguage().getString("AlertAccessRevokedFor")).replace("#name#", uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId()))), true); ephemeralData.getPlayersRevokingAccess().remove(player.getUniqueId()); } @@ -296,7 +296,7 @@ public void handleRevokingAccess(PlayerInteractEvent event, Block clickedBlock, persistentData.getLockedBlock(clickedBlock).removeFromAccessList(ephemeralData.getPlayersRevokingAccess().get(player.getUniqueId())); } - playerService.sendMessageType(player, ChatColor.GREEN + String.format(localeService.get("AlertAccessRevokedFor"), uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersRevokingAccess().get(player.getUniqueId()))), Objects.requireNonNull(messageService.getLanguage().getString("AlertAccessRevokedFor")).replace("#name#", uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId()))), true); + playerService.sendMessage(player, ChatColor.GREEN + String.format(localeService.get("AlertAccessRevokedFor"), uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersRevokingAccess().get(player.getUniqueId()))), Objects.requireNonNull(messageService.getLanguage().getString("AlertAccessRevokedFor")).replace("#name#", uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId()))), true); ephemeralData.getPlayersRevokingAccess().remove(player.getUniqueId()); } @@ -304,7 +304,7 @@ public void handleRevokingAccess(PlayerInteractEvent event, Block clickedBlock, if (blockChecker.isGate(clickedBlock) || blockChecker.isBarrel(clickedBlock) || blockChecker.isTrapdoor(clickedBlock) || blockChecker.isFurnace(clickedBlock)) { persistentData.getLockedBlock(clickedBlock).removeFromAccessList(ephemeralData.getPlayersRevokingAccess().get(player.getUniqueId())); - playerService.sendMessageType(player, ChatColor.GREEN + String.format(localeService.get("AlertAccessRevokedFor"), uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersRevokingAccess().get(player.getUniqueId()))), Objects.requireNonNull(messageService.getLanguage().getString("AlertAccessRevokedFor")).replace("#name#", uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId()))), true); + playerService.sendMessage(player, ChatColor.GREEN + String.format(localeService.get("AlertAccessRevokedFor"), uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersRevokingAccess().get(player.getUniqueId()))), Objects.requireNonNull(messageService.getLanguage().getString("AlertAccessRevokedFor")).replace("#name#", uuidChecker.findPlayerNameBasedOnUUID(ephemeralData.getPlayersGrantingAccess().get(player.getUniqueId()))), true); ephemeralData.getPlayersRevokingAccess().remove(player.getUniqueId()); } diff --git a/src/main/java/dansplugins/factionsystem/services/PlayerService.java b/src/main/java/dansplugins/factionsystem/services/PlayerService.java index e21c9d7f1..d0ce9e4bf 100644 --- a/src/main/java/dansplugins/factionsystem/services/PlayerService.java +++ b/src/main/java/dansplugins/factionsystem/services/PlayerService.java @@ -1,6 +1,5 @@ package dansplugins.factionsystem.services; -import dansplugins.factionsystem.MedievalFactions; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; @@ -16,7 +15,7 @@ public PlayerService(ConfigService configService, MessageService messageService) this.messageService = messageService; } - public String getMessageType(String oldtype, String newtype) { + public String decideWhichMessageToUse(String oldtype, String newtype) { if (configService.getBoolean("useNewLanguageFile")) { return newtype; } else { @@ -24,19 +23,19 @@ public String getMessageType(String oldtype, String newtype) { } } - public void sendMessageType(CommandSender sender, String oldtype, String newtype, Boolean replace) { + public void sendMessage(CommandSender sender, String oldtype, String newtype, Boolean replace) { if (!replace) { - sender.sendMessage(colorize(getMessageType(oldtype, messageService.getLanguage().getString(newtype)))); + sender.sendMessage(colorize(decideWhichMessageToUse(oldtype, messageService.getLanguage().getString(newtype)))); } else { - sender.sendMessage(colorize(getMessageType(oldtype, newtype))); + sender.sendMessage(colorize(decideWhichMessageToUse(oldtype, newtype))); } } - public void sendListMessage(CommandSender sender, List msg) { + public void sendMultipleMessages(CommandSender sender, List msg) { msg.forEach(s -> sender.sendMessage(colorize(s))); } - public void sendConsoleMessage(ConsoleCommandSender c, String msg, Boolean message) { + public void sendMessageToConsole(ConsoleCommandSender c, String msg, Boolean message) { if (!message) { c.sendMessage(colorize(msg)); } else { @@ -44,10 +43,6 @@ public void sendConsoleMessage(ConsoleCommandSender c, String msg, Boolean messa } } - public void sendConsoleMessage(ConsoleCommandSender c, List msg) { - msg.forEach(s -> sendConsoleMessage(c, s, false)); - } - public String colorize(String input) { return ChatColor.translateAlternateColorCodes('&', input); } diff --git a/src/main/java/dansplugins/factionsystem/utils/extended/Messenger.java b/src/main/java/dansplugins/factionsystem/utils/extended/Messenger.java index 2b40fbd2c..bde454bf9 100644 --- a/src/main/java/dansplugins/factionsystem/utils/extended/Messenger.java +++ b/src/main/java/dansplugins/factionsystem/utils/extended/Messenger.java @@ -65,7 +65,7 @@ public void sendFactionInfo(CommandSender sender, Faction faction, int power) { .replace("#pl_max#", String.valueOf(faction.getMaximumCumulativePowerLevel())) .replace("#number#", String.valueOf(power)) .replace("#max#", String.valueOf(faction.getCumulativePowerLevel())); - playerService.sendMessageType(sender, "", s, true); + playerService.sendMessage(sender, "", s, true); }); } sendLiegeInfoIfVassal(faction, sender); @@ -75,7 +75,7 @@ public void sendFactionInfo(CommandSender sender, Faction faction, int power) { private void sendBonusPowerInfo(Faction faction, CommandSender sender) { if (faction.getBonusPower() != 0) { - playerService.sendMessageType(sender, ChatColor.AQUA + String.format(localeService.get("BonusPower"), faction.getBonusPower()) + playerService.sendMessage(sender, ChatColor.AQUA + String.format(localeService.get("BonusPower"), faction.getBonusPower()) , Objects.requireNonNull(messageService.getLanguage().getString("BonusPower")).replace("BonusPower", String.valueOf(faction.getBonusPower())), true); } } @@ -84,10 +84,10 @@ private void sendLiegeInfoIfLiege(Faction faction, CommandSender sender) { int vassalContribution = faction.calculateCumulativePowerLevelWithVassalContribution() - faction.calculateCumulativePowerLevelWithoutVassalContribution(); if (faction.isLiege()) { if (!faction.isWeakened()) { - playerService.sendMessageType(sender, ChatColor.AQUA + String.format(localeService.get("VassalContribution"), vassalContribution) + "\n" + playerService.sendMessage(sender, ChatColor.AQUA + String.format(localeService.get("VassalContribution"), vassalContribution) + "\n" , Objects.requireNonNull(messageService.getLanguage().getString("VassalContribution")).replace("#amount#", String.valueOf(vassalContribution)), true); } else { - playerService.sendMessageType(sender, ChatColor.AQUA + String.format(localeService.get("VassalContribution"), 0) + "\n" + playerService.sendMessage(sender, ChatColor.AQUA + String.format(localeService.get("VassalContribution"), 0) + "\n" , Objects.requireNonNull(messageService.getLanguage().getString("VassalContribution")).replace("#amount#", String.valueOf(0)), true); } } @@ -95,11 +95,11 @@ private void sendLiegeInfoIfLiege(Faction faction, CommandSender sender) { private void sendLiegeInfoIfVassal(Faction faction, CommandSender sender) { if (faction.hasLiege()) { - playerService.sendMessageType(sender, ChatColor.AQUA + String.format(localeService.get("Liege"), faction.getLiege()) + "\n" + playerService.sendMessage(sender, ChatColor.AQUA + String.format(localeService.get("Liege"), faction.getLiege()) + "\n" , Objects.requireNonNull(messageService.getLanguage().getString("Liege")).replace("#name#", faction.getLiege()), true); } if (faction.isLiege()) { - playerService.sendMessageType(sender, ChatColor.AQUA + String.format(localeService.get("Vassals"), faction.getVassalsSeparatedByCommas()) + "\n" + playerService.sendMessage(sender, ChatColor.AQUA + String.format(localeService.get("Vassals"), faction.getVassalsSeparatedByCommas()) + "\n" , Objects.requireNonNull(messageService.getLanguage().getString("Vassals")).replace("#name#", faction.getVassalsSeparatedByCommas()), true); } } diff --git a/src/main/java/dansplugins/factionsystem/utils/extended/Scheduler.java b/src/main/java/dansplugins/factionsystem/utils/extended/Scheduler.java index b5429a679..cf5bb0200 100644 --- a/src/main/java/dansplugins/factionsystem/utils/extended/Scheduler.java +++ b/src/main/java/dansplugins/factionsystem/utils/extended/Scheduler.java @@ -98,7 +98,7 @@ private void informPlayerIfTheirLandIsInDanger(Player player) { Faction faction = persistentData.getPlayersFaction(player.getUniqueId()); if (faction != null) { if (isFactionExceedingTheirDemesneLimit(faction)) { - playerService.sendMessageType(player, ChatColor.RED + localeService.get("AlertMoreClaimedChunksThanPower") + playerService.sendMessage(player, ChatColor.RED + localeService.get("AlertMoreClaimedChunksThanPower") , "AlertMoreClaimedChunksThanPower", false); } } @@ -110,7 +110,7 @@ private boolean isFactionExceedingTheirDemesneLimit(Faction faction) { public void scheduleTeleport(Player player, Location destinationLocation) { final int teleport_delay = configService.getInt("teleportDelay"); - playerService.sendMessageType(player, ChatColor.AQUA + "Teleporting in " + teleport_delay + " seconds..." + playerService.sendMessage(player, ChatColor.AQUA + "Teleporting in " + teleport_delay + " seconds..." , Objects.requireNonNull(messageService.getLanguage().getString("Teleport")).replace("#time#", String.valueOf(teleport_delay)), true); DelayedTeleportTask delayedTeleportTask = new DelayedTeleportTask(player, destinationLocation); delayedTeleportTask.runTaskLater(medievalFactions, (long) teleport_delay * getRandomNumberBetween(15, 25)); @@ -138,7 +138,7 @@ public void run() { if (playerHasNotMoved()) { teleportPlayer(); } else { - playerService.sendMessageType(player, ChatColor.RED + "Teleport cancelled.", + playerService.sendMessage(player, ChatColor.RED + "Teleport cancelled.", "TeleportCancelled", false); } } From 84db7c9b0643ed992f5d1d2f4754f462b69cbd37 Mon Sep 17 00:00:00 2001 From: dmccoystephenson Date: Fri, 23 Sep 2022 17:33:37 -0600 Subject: [PATCH 22/24] Added comments to the PlayerService class for clarity. --- .../factionsystem/services/PlayerService.java | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/src/main/java/dansplugins/factionsystem/services/PlayerService.java b/src/main/java/dansplugins/factionsystem/services/PlayerService.java index d0ce9e4bf..ba5f03da4 100644 --- a/src/main/java/dansplugins/factionsystem/services/PlayerService.java +++ b/src/main/java/dansplugins/factionsystem/services/PlayerService.java @@ -6,15 +6,29 @@ import java.util.List; +/** + * Sends messages to players and the console. + */ public class PlayerService { private final ConfigService configService; private final MessageService messageService; + /** + * Constructor for the PlayerService class. + * @param configService The ConfigService instance. + * @param messageService The MessageService instance. + */ public PlayerService(ConfigService configService, MessageService messageService) { this.configService = configService; this.messageService = messageService; } + /** + * Decide which message to send to the player. + * @param oldtype The old type of message. + * @param newtype The new type of message. + * @return + */ public String decideWhichMessageToUse(String oldtype, String newtype) { if (configService.getBoolean("useNewLanguageFile")) { return newtype; @@ -23,6 +37,13 @@ public String decideWhichMessageToUse(String oldtype, String newtype) { } } + /** + * Send a message to the player. + * @param sender The player to send the message to. + * @param oldtype The old type of message. + * @param newtype The new type of message. + * @param replace Whether or not parts of the message in the newtype are replaced. + */ public void sendMessage(CommandSender sender, String oldtype, String newtype, Boolean replace) { if (!replace) { sender.sendMessage(colorize(decideWhichMessageToUse(oldtype, messageService.getLanguage().getString(newtype)))); @@ -31,10 +52,21 @@ public void sendMessage(CommandSender sender, String oldtype, String newtype, Bo } } + /** + * Send multiple messages to the player. + * @param sender The player to send the messages to. + * @param msg The messages to send. + */ public void sendMultipleMessages(CommandSender sender, List msg) { msg.forEach(s -> sender.sendMessage(colorize(s))); } + /** + * Send a message to the console. + * @param c The console to send the message to. + * @param msg The message to send. + * @param message Whether or not to use the message service. + */ public void sendMessageToConsole(ConsoleCommandSender c, String msg, Boolean message) { if (!message) { c.sendMessage(colorize(msg)); @@ -43,6 +75,11 @@ public void sendMessageToConsole(ConsoleCommandSender c, String msg, Boolean mes } } + /** + * Add color to a string. + * @param input The string to add color to. + * @return The string with color. + */ public String colorize(String input) { return ChatColor.translateAlternateColorCodes('&', input); } From b4fed748378731f80d48d64072ca7bef7910f5c6 Mon Sep 17 00:00:00 2001 From: dmccoystephenson Date: Fri, 23 Sep 2022 18:07:11 -0600 Subject: [PATCH 23/24] Modified variable names in the PlayerService class. --- .../factionsystem/services/PlayerService.java | 53 ++++++++++--------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/src/main/java/dansplugins/factionsystem/services/PlayerService.java b/src/main/java/dansplugins/factionsystem/services/PlayerService.java index ba5f03da4..62cf9fd16 100644 --- a/src/main/java/dansplugins/factionsystem/services/PlayerService.java +++ b/src/main/java/dansplugins/factionsystem/services/PlayerService.java @@ -25,53 +25,56 @@ public PlayerService(ConfigService configService, MessageService messageService) /** * Decide which message to send to the player. - * @param oldtype The old type of message. - * @param newtype The new type of message. + * @param tsvMessage The old type of message. + * @param ymlMessage The new type of message. * @return */ - public String decideWhichMessageToUse(String oldtype, String newtype) { + public String decideWhichMessageToUse(String tsvMessage, String ymlMessage) { if (configService.getBoolean("useNewLanguageFile")) { - return newtype; - } else { - return oldtype; + return ymlMessage; + } + else { + return tsvMessage; } } /** * Send a message to the player. * @param sender The player to send the message to. - * @param oldtype The old type of message. - * @param newtype The new type of message. - * @param replace Whether or not parts of the message in the newtype are replaced. + * @param tsvMessage The old type of message. + * @param ymlMessage The new type of message. + * @param placeholdersReplaced Whether or not parts of the message in the newtype are replaced. */ - public void sendMessage(CommandSender sender, String oldtype, String newtype, Boolean replace) { - if (!replace) { - sender.sendMessage(colorize(decideWhichMessageToUse(oldtype, messageService.getLanguage().getString(newtype)))); - } else { - sender.sendMessage(colorize(decideWhichMessageToUse(oldtype, newtype))); + public void sendMessage(CommandSender sender, String tsvMessage, String ymlMessage, Boolean placeholdersReplaced) { + if (!placeholdersReplaced) { + sender.sendMessage(colorize(decideWhichMessageToUse(tsvMessage, messageService.getLanguage().getString(ymlMessage)))); + } + else { + sender.sendMessage(colorize(decideWhichMessageToUse(tsvMessage, ymlMessage))); } } /** * Send multiple messages to the player. * @param sender The player to send the messages to. - * @param msg The messages to send. + * @param messages The messages to send. */ - public void sendMultipleMessages(CommandSender sender, List msg) { - msg.forEach(s -> sender.sendMessage(colorize(s))); + public void sendMultipleMessages(CommandSender sender, List messages) { + messages.forEach(s -> sender.sendMessage(colorize(s))); } /** * Send a message to the console. - * @param c The console to send the message to. - * @param msg The message to send. - * @param message Whether or not to use the message service. + * @param console The console to send the message to. + * @param message The message to send. + * @param useMessageService Whether or not to use the message service. */ - public void sendMessageToConsole(ConsoleCommandSender c, String msg, Boolean message) { - if (!message) { - c.sendMessage(colorize(msg)); - } else { - c.sendMessage(colorize(messageService.getLanguage().getString(msg))); + public void sendMessageToConsole(ConsoleCommandSender console, String message, Boolean useMessageService) { + if (!useMessageService) { + console.sendMessage(colorize(message)); + } + else { + console.sendMessage(colorize(messageService.getLanguage().getString(message))); } } From 88ee7eb9e3a84cefa919a5e635cc5c8ae56931d3 Mon Sep 17 00:00:00 2001 From: VoChiDanh Date: Sat, 24 Sep 2022 18:55:59 +0700 Subject: [PATCH 24/24] Fix tsv & yml --- .../factionsystem/MedievalFactions.java | 1 - .../services/MessageService.java | 23 +- src/main/resources/de.tsv | 166 +-- src/main/resources/en-us.tsv | 1100 ++++++++--------- src/main/resources/es.tsv | 1100 ++++++++--------- src/main/resources/pt-br.tsv | 1100 ++++++++--------- src/main/resources/ru.tsv | 1100 ++++++++--------- src/main/resources/test.tsv | 1092 ++++++++-------- 8 files changed, 2844 insertions(+), 2838 deletions(-) diff --git a/src/main/java/dansplugins/factionsystem/MedievalFactions.java b/src/main/java/dansplugins/factionsystem/MedievalFactions.java index c616151d9..8347c05da 100644 --- a/src/main/java/dansplugins/factionsystem/MedievalFactions.java +++ b/src/main/java/dansplugins/factionsystem/MedievalFactions.java @@ -4,7 +4,6 @@ */ package dansplugins.factionsystem; -import dansplugins.factionsystem.commands.AddLawCommand; import dansplugins.factionsystem.commands.abs.TabCompleterBase; import dansplugins.factionsystem.data.EphemeralData; import dansplugins.factionsystem.data.PersistentData; diff --git a/src/main/java/dansplugins/factionsystem/services/MessageService.java b/src/main/java/dansplugins/factionsystem/services/MessageService.java index af47cc96f..b55fe5ad8 100644 --- a/src/main/java/dansplugins/factionsystem/services/MessageService.java +++ b/src/main/java/dansplugins/factionsystem/services/MessageService.java @@ -21,10 +21,7 @@ public MessageService(MedievalFactions medievalFactions) { public void createLanguageFile() { languageFile = new File(medievalFactions.getDataFolder(), "language.yml"); - if (!languageFile.exists()) { - medievalFactions.saveResource("language.yml", false); - } - + if (!languageFile.exists()) medievalFactions.saveResource("language.yml", false); language = new YamlConfiguration(); try { language.load(languageFile); @@ -37,15 +34,25 @@ public FileConfiguration getLanguage() { return language; } + public void reloadLanguage() { - language = YamlConfiguration.loadConfiguration(languageFile); + if (languageFile.exists()) { + language = YamlConfiguration.loadConfiguration(languageFile); + } else { + createLanguageFile(); + } } public void saveLanguage() { - try { - language.save(languageFile); - } catch (IOException ignored) { + if (languageFile.exists()) { + try { + language.save(languageFile); + } catch (IOException ignored) { + } + } else { + createLanguageFile(); } } + } diff --git a/src/main/resources/de.tsv b/src/main/resources/de.tsv index 09cd47452..3c683e715 100644 --- a/src/main/resources/de.tsv +++ b/src/main/resources/de.tsv @@ -1,93 +1,93 @@ -AcceptedChallengeDuelHasBegun Du hast die Herausforderung von %s angenommen, das Duell hat begonnen. -AlertAccessGrantedTo Zugriff auf %s gewährt -AlertAccessRevokedFor Zugriff für %s widerrufen -AlertAllianceHasBeenBroken %s hat deine Allianz deiner Fraktion gebrochen. -AlertAlreadyAtWarWith Deine Fraktion befindet sich bereits im Krieg mit%s. -AlertAlreadyCreatingGate Du erstellst bereits ein Gate. -AlertAlreadyDueling Du bist bereits in einem Duell -AlertAlreadyDuelingPlayer Du duellerist dich bereits mit %s -AlertAlreadyDuelingSomeone Du duellierst dich schon mit jemandem. -AlertAlreadyGrantingAccess Du gewährst bereits jemandem Zugriff. Gebe / mf grantaccess cancel ein, um dies abzubrechen. -AlertAlreadyInFaction Du bist schon in einer Fraktion, sorry. -AlertAlreadyRequestedAlliance Du hast bereits ein Bündnisangebot an diese Faction gesendet. -AlertAlreadyRequestedPeace Du hast bereits ein Friedensangebot an diese Faction gesendet. -AlertAttemptedAlliance %s hat versucht sich mit %s zu verbünden -AlertAttemptedVassalization %s hat versucht, deine Fraktion zu vassalisieren. Wenn du der Eigentümer bist, gebe '/mf swearfealty %s' ein, um zu akzeptieren. -AlertBeenInvited Du wurdest zu %s eingeladen. Gebe /mf join %s ein, um beizutreten. -AlertCalledToWar1 %s hat deine Fraktion in ihren Krieg mit %s gerufen. -AlertCalledToWar2 %s hat %s in den Krieg mit deiner Faction gerufen. +AcceptedChallengeDuelHasBegun Du hast die Herausforderung von %s angenommen, das Duell hat begonnen. +AlertAccessGrantedTo Zugriff auf %s gewährt +AlertAccessRevokedFor Zugriff für %s widerrufen +AlertAllianceHasBeenBroken %s hat deine Allianz deiner Fraktion gebrochen. +AlertAlreadyAtWarWith Deine Fraktion befindet sich bereits im Krieg mit%s. +AlertAlreadyCreatingGate Du erstellst bereits ein Gate. +AlertAlreadyDueling Du bist bereits in einem Duell +AlertAlreadyDuelingPlayer Du duellerist dich bereits mit %s +AlertAlreadyDuelingSomeone Du duellierst dich schon mit jemandem. +AlertAlreadyGrantingAccess Du gewährst bereits jemandem Zugriff. Gebe / mf grantaccess cancel ein, um dies abzubrechen. +AlertAlreadyInFaction Du bist schon in einer Fraktion, sorry. +AlertAlreadyRequestedAlliance Du hast bereits ein Bündnisangebot an diese Faction gesendet. +AlertAlreadyRequestedPeace Du hast bereits ein Friedensangebot an diese Faction gesendet. +AlertAttemptedAlliance %s hat versucht sich mit %s zu verbünden +AlertAttemptedVassalization %s hat versucht, deine Fraktion zu vassalisieren. Wenn du der Eigentümer bist, gebe '/mf swearfealty %s' ein, um zu akzeptieren. +AlertBeenInvited Du wurdest zu %s eingeladen. Gebe /mf join %s ein, um beizutreten. +AlertCalledToWar1 %s hat deine Fraktion in ihren Krieg mit %s gerufen. +AlertCalledToWar2 %s hat %s in den Krieg mit deiner Faction gerufen. AlertCalledToWar3 -Deine Fraktion hat %s in deinen Krieg mit %s gerufen. + Deine Fraktion hat %s in deinen Krieg mit %s gerufen. AlertChallengedToDuel -%s hat %s zu einem Duell herausgefordert. -AlertChallengedToDuelPlusHowTo %s hat dich zu einem Duell herausgefordert. Typ /mf duell akzeptieren, um zu beginnen. + %s hat %s zu einem Duell herausgefordert. +AlertChallengedToDuelPlusHowTo %s hat dich zu einem Duell herausgefordert. Typ /mf duell akzeptieren, um zu beginnen. AlertChallengeIssued -Du hast %s zu einem Duell herausgefordert. -AlertChallengeWasAccepted %s hat deine Herausforderung angenommen, das Duell hat begonnen. -AlertChangedGateName Der Gate-Name wurde in '% s' geändert. -AlertCurrentPowerLevel Deine aktuelles Power Level ist% d /% d. -AlertDecreasingThePowerOfInactivePlayers Medieval Factions verringert die Power jedes Spielers um %d, wenn sie seit mehr als%d Minuten nicht mehr online waren. Dies geschieht alle %d Minuten. -AlertDemotion Du wurdest in deiner Fraktion zum Mitgliedsstatus herabgestuft. -AlertDisbandmentDueToZeroPower Deine Fraktion wurde aufgelöst, weil deine kumulative Power Null erreicht hat. -AlertFactionAttemptedToVassalize Deine Fraktion hat versucht, %s zu vassalisieren. -AlertFactionHasBeenVassalized Deine Fraktion wurde vassalisiert und hat einen neuen Lehnsherrn: %s -AlertFactionHasNewVassal Deine Fraktion hat einen neuen Vasallen: %s -AlertFactionHomeRemoved Dein Factionhome wurde entfernt. -AlertFactionIsWeakened Deine Faction hat weniger als die Häflte der Max-Power. Sie wird keinen Bonus Power von ihren, jetzt unabhängigen, Vasallen mehr bekommen. + Du hast %s zu einem Duell herausgefordert. +AlertChallengeWasAccepted %s hat deine Herausforderung angenommen, das Duell hat begonnen. +AlertChangedGateName Der Gate-Name wurde in '% s' geändert. +AlertCurrentPowerLevel Deine aktuelles Power Level ist% d /% d. +AlertDecreasingThePowerOfInactivePlayers Medieval Factions verringert die Power jedes Spielers um %d, wenn sie seit mehr als%d Minuten nicht mehr online waren. Dies geschieht alle %d Minuten. +AlertDemotion Du wurdest in deiner Fraktion zum Mitgliedsstatus herabgestuft. +AlertDisbandmentDueToZeroPower Deine Fraktion wurde aufgelöst, weil deine kumulative Power Null erreicht hat. +AlertFactionAttemptedToVassalize Deine Fraktion hat versucht, %s zu vassalisieren. +AlertFactionHasBeenVassalized Deine Fraktion wurde vassalisiert und hat einen neuen Lehnsherrn: %s +AlertFactionHasNewVassal Deine Fraktion hat einen neuen Vasallen: %s +AlertFactionHomeRemoved Dein Factionhome wurde entfernt. +AlertFactionIsWeakened Deine Faction hat weniger als die Häflte der Max-Power. Sie wird keinen Bonus Power von ihren, jetzt unabhängigen, Vasallen mehr bekommen. AlertForcedDemotion -Du wurdest in deiner Fraktion gewaltsam vom Offiziersstatus herabgestuft. + Du wurdest in deiner Fraktion gewaltsam vom Offiziersstatus herabgestuft. AlertForcedKick -Du wurdest gewaltsam aus deiner Fraktion geworfen. -AlertForcedLoad Medieval Factions wurde zum Laden gezwungen. -AlertForcedSave Medieval Factions wurde gezwungen zu speichern. -AlertForcedToJoinFaction Du wurdest gezwungen, einer Fraktion beizutreten. -AlertGate Das ist das '%s' Tor. -AlertGrantedIndependence %s hat deiner Fraktion Unabhängigkeit gewährt. + Du wurdest gewaltsam aus deiner Fraktion geworfen. +AlertForcedLoad Medieval Factions wurde zum Laden gezwungen. +AlertForcedSave Medieval Factions wurde gezwungen zu speichern. +AlertForcedToJoinFaction Du wurdest gezwungen, einer Fraktion beizutreten. +AlertGate Das ist das '%s' Tor. +AlertGrantedIndependence %s hat deiner Fraktion Unabhängigkeit gewährt. AlertIncreasingThePowerOfEveryPlayer -Medieval Factions erhöht die Power jedes Spielers um %d. Dies geschieht alle %d Minuten. -AlertJoinedFaction Du bist der Fraktion beigetreten. -AlertKicked Du wurdest von %s aus deiner Fraktion geworfen. -AlertLandClaimed Land beansprucht. Herrschaftsgröße: %d/%d -AlertLandConqueredFromAnotherFaction Land erobert von %s. Größe deiner Faction: %d%d -AlertLandConqueredFromYourFaction %s hat Land von deiner Fraktion erobert. -AlertLeftFaction Du hast deine Fraktion verlassen. -AlertLeftFactionAndItGotDeleted Du hast deine Faction verlassen. Sie wurde gelöscht, da sie nun keine Mitglieder mehr hat -AlertMoreClaimedChunksThanPower Deine Fraktion hat mehr geclaimte Chunks als Power. Dein Land kann erobert werden. -AlertMustBeAtWarToConquer Beide Fraktionen müssen sich im Krieg befinden, damit du Land erobern kannst. -AlertMustBeInFactionToUseCommand Du musst in einer Faction sein um diesen Command zu benutzen -AlertMustBeMemberToCreateGate Du musst Member der Faction sein um ein Gate zu erstellen -AlertMustBeOfficerOrOwnerToClaimLand Du musst entweder Vizeanführer- oder Anführer sein um Land zu claimen -AlertMustBeOwnerOrOfficerToCreateGate Du musst Faction Owner oder Vizeanführer sein um ein Gate zu erstellen -AlertMustBeOwnerOrOfficerToUseCommand Du musst Anführer oder Vizeanführer einer Faction sein um diesen Command zu benutzen -AlertMustBeOwnerToInvokeAlliance Du musst Anführer einer Faction sein um eine Allianz zu beschließen! -AlertMustBeOwnerToUseCommand Du musst Anführer einer Faction sein um diesen Command zu nutzen -AlertMustKickAllPlayers Du musst alle Spieler aus der Faction kicken, bevor du sie löschen kannst! -AlertNoGatesDefined Deine Faction hat keine eigenen Gates. -AlertNoLaws Deine Faction hat keine eigenen Regeln -AlertNoLongerVassalFaction %s ist nicht mehr Vasall deiner Faction -AlertNonOwnership Das gehört dir nicht! -AlertNoPendingChallenges Du hast keine anstehenden Herausforderungen, die du abbrechen kannst -AlertNotAllied Deine Faction ist in keinem Bündnis mit %s -AlertNotBeenChallenged Du hast keine ausstehenden Duellherausforderungen mehr -AlertNotBeenChallengedByPlayer Du wurdest nicht zu einem Duell mit %s herausgefordert -AlertNotInFaction Du bist in keiner Faction! -AlertNotInvitedToFaction Du bist nicht in diese Faction eingeladen worden. -AlertNotOfferedVassalizationBy Du hast kein Angebot um Vasall dieser Faction zu werden -AlertNowAlliedWith Dein Faction hat jetzt ein Bündnis mit %s -AlertNowAtPeaceWith %s steht nun wieder im Frieden mit %s. -AlertPlayerAlreadyOwner Dieser Spieler ist bereits der Anführer dieser Faction! -AlertPlayerNotInFaction Dieser Spieler ist nicht in dieser Faction -AlertPowerLevelDecreased Dein Powerlevel ist gesunken -AlertPowerLevelIncreasedBy Du fühlst dich wieder stärker. Dein Powerlevel ist auf %d gestiegen. -AlertReachedDemesne Du hast das Limit der Menge von Land erreicht. Lade mehr Spieler ein um dieses Limit anzuheben. -AlertUnlocked Entsperrt. -AlertUnlockingCancelled Entsperrung abgebrochen. -AllianceBrokenWith Die Allianz mit %s wurde gebrochen -AlliedWith Verbündet mit: %s -AllLandUnclaimed All dein Land wurde unclaimed -AllLandUnclaimedFrom Alles Land von %s wurde unclaimed -AlreadyEnteredCheckAccess Du hast diesen Command bereits durchgeführt. Tippe "/mf checkaccess cancel' um ihn abzubrechen + Medieval Factions erhöht die Power jedes Spielers um %d. Dies geschieht alle %d Minuten. +AlertJoinedFaction Du bist der Fraktion beigetreten. +AlertKicked Du wurdest von %s aus deiner Fraktion geworfen. +AlertLandClaimed Land beansprucht. Herrschaftsgröße: %d/%d +AlertLandConqueredFromAnotherFaction Land erobert von %s. Größe deiner Faction: %d%d +AlertLandConqueredFromYourFaction %s hat Land von deiner Fraktion erobert. +AlertLeftFaction Du hast deine Fraktion verlassen. +AlertLeftFactionAndItGotDeleted Du hast deine Faction verlassen. Sie wurde gelöscht, da sie nun keine Mitglieder mehr hat +AlertMoreClaimedChunksThanPower Deine Fraktion hat mehr geclaimte Chunks als Power. Dein Land kann erobert werden. +AlertMustBeAtWarToConquer Beide Fraktionen müssen sich im Krieg befinden, damit du Land erobern kannst. +AlertMustBeInFactionToUseCommand Du musst in einer Faction sein um diesen Command zu benutzen +AlertMustBeMemberToCreateGate Du musst Member der Faction sein um ein Gate zu erstellen +AlertMustBeOfficerOrOwnerToClaimLand Du musst entweder Vizeanführer- oder Anführer sein um Land zu claimen +AlertMustBeOwnerOrOfficerToCreateGate Du musst Faction Owner oder Vizeanführer sein um ein Gate zu erstellen +AlertMustBeOwnerOrOfficerToUseCommand Du musst Anführer oder Vizeanführer einer Faction sein um diesen Command zu benutzen +AlertMustBeOwnerToInvokeAlliance Du musst Anführer einer Faction sein um eine Allianz zu beschließen! +AlertMustBeOwnerToUseCommand Du musst Anführer einer Faction sein um diesen Command zu nutzen +AlertMustKickAllPlayers Du musst alle Spieler aus der Faction kicken, bevor du sie löschen kannst! +AlertNoGatesDefined Deine Faction hat keine eigenen Gates. +AlertNoLaws Deine Faction hat keine eigenen Regeln +AlertNoLongerVassalFaction %s ist nicht mehr Vasall deiner Faction +AlertNonOwnership Das gehört dir nicht! +AlertNoPendingChallenges Du hast keine anstehenden Herausforderungen, die du abbrechen kannst +AlertNotAllied Deine Faction ist in keinem Bündnis mit %s +AlertNotBeenChallenged Du hast keine ausstehenden Duellherausforderungen mehr +AlertNotBeenChallengedByPlayer Du wurdest nicht zu einem Duell mit %s herausgefordert +AlertNotInFaction Du bist in keiner Faction! +AlertNotInvitedToFaction Du bist nicht in diese Faction eingeladen worden. +AlertNotOfferedVassalizationBy Du hast kein Angebot um Vasall dieser Faction zu werden +AlertNowAlliedWith Dein Faction hat jetzt ein Bündnis mit %s +AlertNowAtPeaceWith %s steht nun wieder im Frieden mit %s. +AlertPlayerAlreadyOwner Dieser Spieler ist bereits der Anführer dieser Faction! +AlertPlayerNotInFaction Dieser Spieler ist nicht in dieser Faction +AlertPowerLevelDecreased Dein Powerlevel ist gesunken +AlertPowerLevelIncreasedBy Du fühlst dich wieder stärker. Dein Powerlevel ist auf %d gestiegen. +AlertReachedDemesne Du hast das Limit der Menge von Land erreicht. Lade mehr Spieler ein um dieses Limit anzuheben. +AlertUnlocked Entsperrt. +AlertUnlockingCancelled Entsperrung abgebrochen. +AllianceBrokenWith Die Allianz mit %s wurde gebrochen +AlliedWith Verbündet mit: %s +AllLandUnclaimed All dein Land wurde unclaimed +AllLandUnclaimedFrom Alles Land von %s wurde unclaimed +AlreadyEnteredCheckAccess Du hast diesen Command bereits durchgeführt. Tippe "/mf checkaccess cancel' um ihn abzubrechen AlreadyEnteredRevokeAccess Du hast diesen Command bereits durchgeführt. Tippe /mf revokeacces cancel um ihn zurückzuziehen AlreadyInFaction Sorry, du bist bereits in einer Faction. Verlasse sie um eine neue zu erstellen ArgumentMustBeNumber Das Argument muss eine Zahl sein. diff --git a/src/main/resources/en-us.tsv b/src/main/resources/en-us.tsv index 7eecef5a8..6e9a906bf 100644 --- a/src/main/resources/en-us.tsv +++ b/src/main/resources/en-us.tsv @@ -1,551 +1,551 @@ -AcceptedChallengeDuelHasBegun You have accepted %s's challenge, the duel has begun. -AlertAccessGrantedTo Access granted to %s -AlertAccessRevokedFor Access revoked for %s -AlertAllianceHasBeenBroken %s has broken their alliance your faction. -AlertAlreadyAtWarWith Your faction is already at war with %s. -AlertAlreadyCreatingGate You are already creating a gate. -AlertAlreadyDueling You are already dueling. -AlertAlreadyDuelingPlayer You are already dueling %s. -AlertAlreadyDuelingSomeone You are already dueling someone. -AlertAlreadyGrantingAccess You are already granting access to someone. Type /mf grantaccess cancel to cancel this. -AlertAlreadyInFaction You're already in a faction, sorry. -AlertAlreadyRequestedAlliance You've already requested an alliance with this faction. -AlertAlreadyRequestedPeace You've already requested peace with this faction. -AlertAttemptedAlliance %s has attempted to ally with %s. -AlertAttemptedVassalization %s has attempted to vassalize your faction. If you are the owner, type '/mf swearfealty %s' to accept. -AlertBeenInvited You've been invited to %s. Type /mf join %s to join. -AlertCalledToWar1 %s has called your faction into their war with %s. -AlertCalledToWar2 %s has called %s into their war with your faction. -AlertCalledToWar3 Your faction has called %s into your war with %s. -AlertChallengedToDuel %s has challenged %s to a duel. -AlertChallengedToDuelPlusHowTo %s has challenged you to a duel. Type /mf duel accept to begin. -AlertChallengeIssued You have challenged %s to a duel. -AlertChallengeWasAccepted %s has accepted your challenge, the duel has begun. -AlertChangedGateName Changed gate name to '%s'. -AlertCurrentPowerLevel Your current power level is %d/%d. -AlertDecreasingThePowerOfInactivePlayers Medieval Factions is decreasing the power of every player by %d if they haven't been online in over %d minutes. This will happen every %d minutes. -AlertDemotion You have been demoted to member status in your faction. -AlertDisbandmentDueToZeroPower Your faction has been disbanded due to its cumulative power reaching zero. -AlertFactionAttemptedToVassalize Your faction has attempted to vassalize %s. -AlertFactionHasBeenVassalized Your faction has been vassalized and has a new liege: %s -AlertFactionHasNewVassal Your faction has a new vassal: %s -AlertFactionHomeRemoved Your faction home has been removed. -AlertFactionIsWeakened Your faction has less than half of its max power. It will no longer receive bonus power from vassals and your vassals are now vulnerable. -AlertForcedDemotion You were forcibly demoted from officer status in your faction. -AlertForcedKick You were forcibly kicked from your faction. -AlertForcedLoad Medieval Factions has been forced to load. -AlertForcedSave Medieval Factions has been forced to save. -AlertForcedToJoinFaction You were forced to join a faction. -AlertGate That is the '%s' gate. -AlertGrantedIndependence %s has granted your faction independence. -AlertIncreasingThePowerOfEveryPlayer Medieval Factions is increasing the power of every player by %d. This will happen every %d minutes. -AlertJoinedFaction You joined the faction. -AlertKicked You have been kicked from your faction by %s. -AlertLandClaimed Land claimed. Demesne Size: %d/%d -AlertLandConqueredFromAnotherFaction Land conquered from %s. Demesne Size: %d/%d -AlertLandConqueredFromYourFaction %s has conquered land from your faction. -AlertLeftFaction You left your faction. -AlertLeftFactionAndItGotDeleted You left your faction. It was deleted since no one else was a member. -AlertMoreClaimedChunksThanPower Your faction has more claimed chunks than power. Your land can be conquered. -AlertMustBeAtWarToConquer Your factions have to be at war in order for you to conquer land. -AlertMustBeInFactionToUseCommand You must be in a faction to use this command. -AlertMustBeMemberToCreateGate You must be a member of this faction to create a gate. -AlertMustBeOfficerOrOwnerToClaimLand You must be an officer or owner of a faction to claim land. -AlertMustBeOwnerOrOfficerToCreateGate You must be a faction owner or officer to create a gate. -AlertMustBeOwnerOrOfficerToUseCommand You need to be the owner of a faction or an officer of a faction to use this command. -AlertMustBeOwnerToInvokeAlliance You must be the owner of your faction to invoke an alliance. -AlertMustBeOwnerToUseCommand You need to be the owner of a faction to use this command. -AlertMustKickAllPlayers You need to kick all players before you can disband your faction. -AlertNoGatesDefined Your faction has no gates defined. -AlertNoLaws Your faction doesn't have any laws. -AlertNoLongerVassalFaction %s is no longer a vassal faction. -AlertNonOwnership You don't own this. -AlertNoPendingChallenges You have no pending challenges to cancel. -AlertNotAllied Your faction is not allied with %s. -AlertNotBeenChallenged You have not been challenged to a duel by anyone. -AlertNotBeenChallengedByPlayer You have not been challenged to a duel by '%s'. -AlertNotInFaction You're not in a faction. -AlertNotInvitedToFaction You're not invited to this faction. -AlertNotOfferedVassalizationBy You haven't been offered vassalization by this faction. -AlertNowAlliedWith Your faction is now allied with %s. -AlertNowAtPeaceWith %s is now at peace with %s. -AlertPlayerAlreadyOwner That player is already the owner of that faction. -AlertPlayerNotInFaction That player is not in that faction. -AlertPowerLevelDecreased Your power level has decreased. -AlertPowerLevelIncreasedBy You feel stronger. Your power has increased by %d. -AlertReachedDemesne You have reached your demesne limit. Invite more players to increase this. -AlertUnlocked Unlocked. -AlertUnlockingCancelled Unlocking cancelled. -AllianceBrokenWith Alliance has been broken with %s. -AlliedWith Allied With: %s -AllLandUnclaimed All land unclaimed. -AllLandUnclaimedFrom All land unclaimed from %s. -AlreadyEnteredCheckAccess You have already entered this command. Type '/mf checkaccess cancel' to cancel. -AlreadyEnteredRevokeAccess You have already entered this command. Type '/mf revokeaccess cancel' to cancel. -AlreadyInFaction Sorry, you're already in a faction. Leave if you want to create a different one. -ArgumentMustBeNumber Argument must be a number. -ArgumentsSingleQuotesRequirement Arguments must be designated inside single quotes. -AssignedToRandomFaction You have been assigned to a random faction. -AttemptedAlliance Attempted to ally with %s -AttemptedPeace Attempted to make peace with %s -AtWarWith At War With: %s -AutoclaimToggled Autoclaim toggled. -BlockAlreadyLocked This block is already locked. -BlockIsNotLocked That block isn't locked. -BlockIsPartOfGateMustRemoveGate This block is part of gate '%s'. You must remove the gate first. -BonusPower Bonus Power From Admins: %d -BooleanSet Boolean set. -Cancelled Cancelled. -CancelledGatePlacement1 Error placing point 1. Cancelled gate placement. -CancelledGatePlacement2 Error placing point 2. Cancelled gate placement. -CancelledGatePlacementErrorLinking Error linking to lever. Cancelled gate placement. -CannotAllyWithSelf You can't ally with your own faction. -CannotAttackFactionMember You can't attack another player if you are part of the same faction. -CannotAttackNonWarringPlayer You can't attack another player if your factions aren't at war. -CannotBreakAllianceWithSelf You can't break an alliance with your own faction. -CannotBringNeutralFactionIntoWar You cannot bring neutral factions into war. -CannotCancelActiveDuel Cannot cancel an active duel. -CannotDeclareWarIfLiegeNotWeakened You can't declare war on this faction as they are a vassal unless their liege is weakened. -CannotDeclareWarIfNeutralFaction Neutral factions cannot declare war. -CannotDeclareWarOnAlly You can't declare war on your ally. -CannotDeclareWarOnLiege You can't declare war on your liege. Try '/mf declareindependence' instead. -CannotDeclareWarOnNeutralFaction You cannot declare war on a neutral faction. -CannotDeclareWarOnVassal You can't declare war on your own vassal. -CannotDeclareWarOnYourself You can't declare war on yourself. -CannotDemoteSelf You cannot demote yourself. -CannotDuelSelf You cannot duel yourself. -CannotFindDynmap Cannot find dynmap. -CannotForciblyKickOwner Cannot forcibly kick an owner from their faction. Try disbanding the faction. -CannotGrantAccessToSelf You cannot grant access to yourself. -CannotKickOwner You can't kick the owner. -CannotKickSelf You can't kick yourself. -CannotMakePeaceWithSelf You can't make peace with your own faction. -CannotPlaceChestsNextToUnownedLockedChests You can't place chests next to locked chests you don't own. -CannotPlaceHoppersNextToUnownedLockedChests You can't place hoppers next to, under or above locked chests you don't own. -CannotPromoteSelf You cannot promote yourself. -CannotRevokeAccessFromSelf You cannot revoke access from yourself. -CannotSetFactionHomeInWilderness You can't set your faction home on land your faction hasn't claimed. -CannotSetVersion Can't set version. -CannotTransferToSelf You can't transfer ownership of your faction to yourself. -CannotVassalizeLiege You can't vassalize your liege. -CannotVassalizeSelf You can't vassalize your own faction. -CannotVassalizeVassal You can't vassalize a faction who already has a liege. -CanOnlyCreateGatesInClaimedTerritory You can only create gates in claimed territory. -CanOnlyLockBlocksInClaimedTerritory You can only lock blocks on land claimed by your faction. -CanOnlyLockInFactionTerritory You can only lock things in your faction's territory. -CanOnlyLockSpecificBlocks You can only lock chests, doors, barrels, trapdoors, furnaces, anvils or gates. -ClaimedChunksLoaded Claimed chunks loaded. -ClaimedChunksSuccessfullyLoaded Claimed chunks successfully loaded. -ClickOnTriggerLever Click on the trigger lever... -ClickToPlaceSecondCorner Click to place the second corner... -CmdAddLaw addlaw -CmdAlly ally -CmdAutoClaim autoclaim -CmdBreakAlliance breakalliance -CmdBypass bypass -CmdChat chat -CmdCheckAccess checkaccess -CmdCheckClaim checkclaim -CmdClaim claim -CmdConfig config -CmdConfigSet set -CmdConfigShow show -CmdCreate create -CmdDeclareIndependence declareindependence -CmdDeclareWar declarewar -CmdDemote demote -CmdDesc desc -CmdDisband disband -CmdDuel duel -CmdDuelAccept accept -CmdDuelCancel cancel -CmdDuelChallenge challenge -CmdEditLaw editlaw -CmdFlags flags -CmdFlagsSet set -CmdFlagsShow show -CmdForce force -CmdForceBonusPower bonuspower -CmdForceClaim claim -CmdForceCreate create -CmdForceDemote demote -CmdForceFlag flag -CmdForceJoin join -CmdForceKick kick -CmdForceLoad load -CmdForcePeace peace -CmdForcePower power -CmdForceRename rename -CmdForceRenounce renounce -CmdForceSave save -CmdForceTransfer transfer -CmdForceUnlock unlock -CmdGate gate -CmdGateCancel cancel -CmdGateCreate create -CmdGateList list -CmdGateName name -CmdGateRemove remove -CmdGrantAccess grantaccess -CmdGrantIndependence grantindependence -CmdHelp help -CmdHome home -CmdInfo info -CmdInvite invite -CmdInvoke invoke -CmdJoin join -CmdKick kick -CmdLaws laws -CmdLeave leave -CmdList list -CmdLock lock -CmdMakePeace makepeace -CmdMembers members -CmdPower power -CmdPrefix prefix -CmdPromote promote -CmdRemoveLaw removelaw -CmdRename rename -CmdResetPowerLevels resetpowerlevels -CmdRevokeAccess revokeaccess -CmdSetHome sethome -CmdSwearFealty swearfealty -CmdTransfer transfer -CmdUnclaim unclaim -CmdUnclaimall unclaimall -CmdUnlock unlock -CmdVassalize vassalize -CmdVersion version -CmdWho who -CommandCancelled Command cancelled. -CommandNotRecognized Medieval Factions doesn't recognize that command. -CommandsPage1 == Medieval Factions Commands Page 1/%d == -CommandsPage2 == Medieval Factions Commands Page 2/%d == -CommandsPage3 == Medieval Factions Commands Page 3/%d == -CommandsPage4 == Medieval Factions Commands Page 4/%d == -CommandsPage5 == Medieval Factions Commands Page 5/%d == -CommandsPage6 == Medieval Factions Commands Page 6/%d == -CommandsPage7 == Medieval Factions Commands Page 7/%d == -ConfigListPageOne ===== Config List Page 1/2 ===== -ConfigListPageTwo ===== Config List Page 2/2 ===== -CreatingGateCancelled Creating gate cancelled. -CreatingGateClickWithHoe Creating gate. Click on a block with a Golden Hoe to select the first point. -CuboidDisallowed1 Error placing point 1: You cannot place a cuboid. -CuboidDisallowed2 Error placing point 2: You cannot place a cuboid. -CurrentLanguageID Current Language ID: %s -CurrentlyNoFactions There are currently no factions. -CurrentPowerLevel %s's current power level is %d/%d. -Defeated %s has defeated %s in a duel. -DemesneSize Demesne Size: %d/%d -Description Description: %s -DescriptionSet Description set. -DesignatedFactionNotFound One of the factions designated wasn't found. -DesiredPowerMustBeANumber Desired power must be a number. -DeveloperList Developers: %s -DisbandmentDueToZeroPower %s has been disbanded due to its cumulative power reaching zero. -DoesntExist %s doesn't exist. -Done Done. -DoubleSet Double set. -DuelChallengeCancelled Duel challenge cancelled. -DuelEndedInTie %s and %s's duel has ended in a tie. -DynmapIntegrationSuccessful Dynmap integration successful. -ERROR ERROR: -ErrorAddingAreaMarker Error adding area marker %s -ErrorChunkRemoval An error has occurred during claimed chunk removal. -ErrorClaimedChunkRemoval An error has occurred during claimed chunk removal. -ErrorCouldNotFindGatesFaction Error: Could not find faction for gate '%s'. -ErrorCouldNotLoadFactionGate ERROR: Could not load faction gate.\n -ErrorCreatingMarkerSet Error creating marker set. -ErrorIntegratingWithDynmap Error integrating with dynmap: -ErrorPlayerPowerRecordForUUIDNotFound ERROR: Player's Power Record for uuid not found. Could not get cumulative power level. -ErrorSettingAreaMarkerColor Error setting area marker color to '%s'. -FactionAlreadyAlly That faction is already your ally. -FactionAlreadyExists Sorry. That faction already exists. -FactionAndPlayerSingleQuotesRequirement Faction and player must be designated inside single quotes. -FactionAndVassalSingleQuotesRequirement Faction and vassal to remove must be designated inside single quotes. -FactionCreated Faction created. -FactionCurrentlyEnemyMustMakePeace That faction is currently your enemy. Make peace before trying to ally with them. -FactionDataLoadedSuccessfuly Faction data loaded successfully -FactionDoesNotExist Sorry. That faction doesn't exist. -FactionDoesNotHaveLaws That faction doesn't have any laws. -FactionGates Faction Gates -FactionHomeLoadError An error occurred loading the faction home position. -FactionHomeNotSetYet The faction home isn't set yet. -FactionHomeSet Faction home set. -FactionInfo %s Faction Info -FactionIsNotVassal That faction isn't a vassal of yours. -FactionMustBeDesignatedInsideSingleQuotes Faction must be designated inside single quotes. -FactionNameChanged Faction name changed. -FactionNameNotRecognized That faction name isn't recognized. -FactionNameTooLong That name is too long. -FactionNotEnemy That faction is not your enemy. -FactionNotFound That faction wasn't found. -FactionsSuccessfullyLoaded Factions successfully loaded. -FactionsTitle == Factions == -FactionSuccessfullyDisbanded Faction successfully disbanded. -FactionSuccessfullyLoaded Faction successfully loaded. -FileLoadError An error occurred loading the file -FollowingPlayersHaveAccess The following players have access to this block: -GateCreated Gate successfully created. -HasAttemptedToMakePeaceWith %s has attempted to make peace with %s. -HasBeenKickedFrom %s has been kicked from %s -HasDeclaredIndependence %s has declared independence from %s. -HasDeclaredWarAgainst %s has declared war against %s. -HasJoined %s has joined %s -HelpAddLaw /mf addlaw - Add a law to your faction. -HelpAlly /mf ally - Attempt to ally with a faction. -HelpAutoclaim /mf autoclaim - Toggle auto claim, making land claiming easier. -HelpBreakAlliance /mf breakalliance - Break an alliance with a faction. -HelpBypass /mf bypass - Bypass protections. -HelpChat /mf chat - Toggle faction chat. -HelpCheckAccess /mf checkaccess - Check who has access to a locked block. -HelpCheckClaim /mf checkclaim - Check if land is claimed. -HelpClaim /mf claim - Claim land for your faction. -HelpConfigSet /mf config set (option) (value) - Set a config value. -HelpConfigShow /mf config show - Show config values. -HelpCreate /mf create (name) - Create a new faction. -HelpDeclareIndependence /mf declareindependence - Declare independence from your liege. -HelpDeclareWar /mf declarewar - Declare war against another faction. -HelpDemote /mf demote - Demote an officer to member status. -HelpDesc /mf desc (desc) - Set your faction description. -HelpDisband /mf disband - Disband your faction (must be owner). -HelpDuelAccept /mf duel accept (player) -HelpDuelCancel /mf duel cancel -HelpDuelChallenge /mf duel challenge (player) (time limit in seconds) -HelpEditLaw /mf editlaw - Edit an already existing law in your faction. -HelpFlagsSet /mf flags set (option) (value) - Set a faction flag. -HelpFlagsShow /mf flags show - Show faction flags. -HelpForce /mf force - Force the plugin to perform certain actions. -HelpForceBonusPower /mf force bonuspower 'faction' 'number' -HelpForceClaim /mf force claim 'faction name' -HelpForceCreate /mf force create 'factionName' -HelpForceDemote /mf force demote (player) -HelpForceFlag /mf force flag 'faction' 'option' 'value' -HelpForceJoin /mf force join 'player' 'faction' -HelpForceKick /mf force kick (player) -HelpForceLoad /mf force load -HelpForcePeace /mf force peace 'faction1' 'faction2' -HelpForcePower /mf force power 'player' 'number' -HelpForceRemoveVassal /mf force removevassal 'faction' 'vassal' -HelpForceRename /mf force rename 'faction' 'new name' -HelpForceRenounce /mf force renounce (faction) -HelpForceSave /mf force save -HelpForceTransfer /mf force transfer 'faction' 'player' -HelpForceUnlock /mf force unlock -HelpGateCancel /mf gate cancel -HelpGateCreate /mf gate create (name) -HelpGateList /mf gate list -HelpGateName /mf gate name (name) -HelpGateRemove /mf gate remove -HelpGrantAccess /mf grantaccess - Grant someone access to a locked block. -HelpGrantIndependence /mf grantindependence - Grant a vassal vaction independence. -HelpHelp /mf help # - Show lists of useful commands. -HelpHome /mf home - Teleport to your faction home. -HelpInfo /mf info - See your faction or another faction's information. -HelpInvite /mf invite (player) - Invite a player to your faction. -HelpInvoke /mf invoke (ally) (enemy) - Call an allied faction into a war. -HelpJoin /mf join (faction) - Join a faction if you've been invited. -HelpKick /mf kick - Kick a player from your faction. -HelpLaws /mf laws - View the laws of your faction. -HelpLeave /mf leave - Leave your current faction. -HelpList /mf list - List all factions on the server. -HelpLock /mf lock - Lock a chest or door. -HelpMakePeace /mf makepeace - Send peace offer to another faction. -HelpMap /mf map - Display a map of the claims near your surroundings. -HelpMembers /mf members - List the members of your faction or another faction. -HelpPower /mf power - Check your power level. -HelpPrefix /mf prefix (prefix) - Set your faction's prefix -HelpPromote /mf promote - Promote a player to officer status. -HelpRemoveLaw /mf removelaw - Remove a law from your faction. -HelpRename /mf rename - Rename your faction -HelpResetPowerLevels /mf resetpowerlevels - Reset player power records and faction cumulative power levels. -HelpRevokeAccess /mf revokeaccess - Revoke someone's access to a locked block. -HelpSetHome /mf sethome - Set your faction home. -HelpSwearFealty /mf swearfealty - Swear fealty to a faction. -HelpTransfer /mf transfer - Transfer ownership of your faction to another player. -HelpUnclaim /mf unclaim - Unclaim land for your faction. -HelpUnclaimall /mf unclaimall - Unclaim all land for your faction. -HelpUnlock /mf unlock Unlock a chest or door. -HelpVassalize /mf vassalize - Offer to vassalize a faction. -HelpVersion /mf version - Check plugin version. -HelpWho /mf who - View the faction info a specific player. -HomeClaimedByAnotherFaction Home was claimed by another faction, and has been lost. -HomeIsInUnclaimedChunk Home is in an unclaimed chunk, and is unavailable -HourlySaveAlert Medieval Factions is saving. This will happen every hour. -IntegerSet Integer set. -InvitationExpired Your invitation to %s has expired. -InvitationSent Invitation sent. -KeysLoaded Keys loaded: %d -LandAlreadyClaimedBy This land is already claimed by -LandAlreadyClaimedByYourFaction This land is already claimed by your faction. -LandClaimedBy This land is claimed by %s. -LandClaimedUsingAdminBypass Land unclaimed using admin bypass. -LandIsNotClaimed This land isn't claimed. -LandIsUnclaimed This land is unclaimed. -LandNotCurrentlyClaimed This land is not currently claimed. -LandUnclaimed Land unclaimed. -LawAdded Law added. -LawEdited Law edited. -LawRemoved Law removed. -LawsTitle == Laws of %s == -LeverSuccessfullyLinked Creating Gate 4/4: Lever successfully linked. -Liege Liege: %s -ListLegend P: power, M: members, L: land -LoadingClaimedChunks Loading claimed chunks... -LoadingLockedBLocks Loading locked blocks... -LoadingPlayerPowerRecords Loading player power records... -Locked Locked. -LockedBlockSuccessfullyLoaded Locked block successfully loaded. -LockedBy Locked by %s -LockingCancelled Locking cancelled. -LockRemovalError An error has occurred during lock removal. -MaterialsMismatch1 Error placing point 1: Materials mismatch. -MaterialsMismatch2 Error placing point 2: Materials mismatch. -MedievalFactionsStringRight Medieval-Factions-%s -MedievalFactionsTitle == Medieval Factions %s == -MembersOf Members of %s -MissingFactionGatesJSONCollection Could not load gates because the collection 'factionGates' did not exist in the factions JSON file. Are you upgrading from a previous version? Setting default. -MovementDetectedTeleportCancelled Movement Detected. Teleport cancelled. -MustBeAtWarOrFactionMustBeInactive Must be at war with target faction or target faction must be inactive. -MustBeInFaction Sorry, you must be in a faction to use this command. -MustBeOwner Sorry, you must be the owner of a faction to use this command. -MustOwnFactionOrBeOfficer You have to own a faction or be an officer of a faction to use this command. -MustTransferOwnership Sorry. You must transfer ownership or kick everyone in your faction to leave. -Name Name: %s -NameAlreadyTaken That name is already taken. -NeutralityDisabled Neutrality is currently disabled. -NoBlockDetectedToCheckForGate No block detected to check for gate. -NoFactionsDesignatedSingleQuotesRequired No factions designated. Must be designated inside single quotes. -NoLongerBypassingProtections You are no longer bypassing protections provided by Medieval Factions. -NoLongerInFactionChat You are no longer in faction chat. -NotAMemberOfAnyFaction You are not a member of any faction. -NotAnAlly %s isn't an ally of yours. -NotAnAllyOrVassal %s isn't an ally or vassal of yours. -NotAtWarWith You aren't at war with %s -NotAVassalOfAFaction You aren't a vassal of a faction. +AcceptedChallengeDuelHasBegun You have accepted %s's challenge, the duel has begun. +AlertAccessGrantedTo Access granted to %s +AlertAccessRevokedFor Access revoked for %s +AlertAllianceHasBeenBroken %s has broken their alliance your faction. +AlertAlreadyAtWarWith Your faction is already at war with %s. +AlertAlreadyCreatingGate You are already creating a gate. +AlertAlreadyDueling You are already dueling. +AlertAlreadyDuelingPlayer You are already dueling %s. +AlertAlreadyDuelingSomeone You are already dueling someone. +AlertAlreadyGrantingAccess You are already granting access to someone. Type /mf grantaccess cancel to cancel this. +AlertAlreadyInFaction You're already in a faction, sorry. +AlertAlreadyRequestedAlliance You've already requested an alliance with this faction. +AlertAlreadyRequestedPeace You've already requested peace with this faction. +AlertAttemptedAlliance %s has attempted to ally with %s. +AlertAttemptedVassalization %s has attempted to vassalize your faction. If you are the owner, type '/mf swearfealty %s' to accept. +AlertBeenInvited You've been invited to %s. Type /mf join %s to join. +AlertCalledToWar1 %s has called your faction into their war with %s. +AlertCalledToWar2 %s has called %s into their war with your faction. +AlertCalledToWar3 Your faction has called %s into your war with %s. +AlertChallengedToDuel %s has challenged %s to a duel. +AlertChallengedToDuelPlusHowTo %s has challenged you to a duel. Type /mf duel accept to begin. +AlertChallengeIssued You have challenged %s to a duel. +AlertChallengeWasAccepted %s has accepted your challenge, the duel has begun. +AlertChangedGateName Changed gate name to '%s'. +AlertCurrentPowerLevel Your current power level is %d/%d. +AlertDecreasingThePowerOfInactivePlayers Medieval Factions is decreasing the power of every player by %d if they haven't been online in over %d minutes. This will happen every %d minutes. +AlertDemotion You have been demoted to member status in your faction. +AlertDisbandmentDueToZeroPower Your faction has been disbanded due to its cumulative power reaching zero. +AlertFactionAttemptedToVassalize Your faction has attempted to vassalize %s. +AlertFactionHasBeenVassalized Your faction has been vassalized and has a new liege: %s +AlertFactionHasNewVassal Your faction has a new vassal: %s +AlertFactionHomeRemoved Your faction home has been removed. +AlertFactionIsWeakened Your faction has less than half of its max power. It will no longer receive bonus power from vassals and your vassals are now vulnerable. +AlertForcedDemotion You were forcibly demoted from officer status in your faction. +AlertForcedKick You were forcibly kicked from your faction. +AlertForcedLoad Medieval Factions has been forced to load. +AlertForcedSave Medieval Factions has been forced to save. +AlertForcedToJoinFaction You were forced to join a faction. +AlertGate That is the '%s' gate. +AlertGrantedIndependence %s has granted your faction independence. +AlertIncreasingThePowerOfEveryPlayer Medieval Factions is increasing the power of every player by %d. This will happen every %d minutes. +AlertJoinedFaction You joined the faction. +AlertKicked You have been kicked from your faction by %s. +AlertLandClaimed Land claimed. Demesne Size: %d/%d +AlertLandConqueredFromAnotherFaction Land conquered from %s. Demesne Size: %d/%d +AlertLandConqueredFromYourFaction %s has conquered land from your faction. +AlertLeftFaction You left your faction. +AlertLeftFactionAndItGotDeleted You left your faction. It was deleted since no one else was a member. +AlertMoreClaimedChunksThanPower Your faction has more claimed chunks than power. Your land can be conquered. +AlertMustBeAtWarToConquer Your factions have to be at war in order for you to conquer land. +AlertMustBeInFactionToUseCommand You must be in a faction to use this command. +AlertMustBeMemberToCreateGate You must be a member of this faction to create a gate. +AlertMustBeOfficerOrOwnerToClaimLand You must be an officer or owner of a faction to claim land. +AlertMustBeOwnerOrOfficerToCreateGate You must be a faction owner or officer to create a gate. +AlertMustBeOwnerOrOfficerToUseCommand You need to be the owner of a faction or an officer of a faction to use this command. +AlertMustBeOwnerToInvokeAlliance You must be the owner of your faction to invoke an alliance. +AlertMustBeOwnerToUseCommand You need to be the owner of a faction to use this command. +AlertMustKickAllPlayers You need to kick all players before you can disband your faction. +AlertNoGatesDefined Your faction has no gates defined. +AlertNoLaws Your faction doesn't have any laws. +AlertNoLongerVassalFaction %s is no longer a vassal faction. +AlertNonOwnership You don't own this. +AlertNoPendingChallenges You have no pending challenges to cancel. +AlertNotAllied Your faction is not allied with %s. +AlertNotBeenChallenged You have not been challenged to a duel by anyone. +AlertNotBeenChallengedByPlayer You have not been challenged to a duel by '%s'. +AlertNotInFaction You're not in a faction. +AlertNotInvitedToFaction You're not invited to this faction. +AlertNotOfferedVassalizationBy You haven't been offered vassalization by this faction. +AlertNowAlliedWith Your faction is now allied with %s. +AlertNowAtPeaceWith %s is now at peace with %s. +AlertPlayerAlreadyOwner That player is already the owner of that faction. +AlertPlayerNotInFaction That player is not in that faction. +AlertPowerLevelDecreased Your power level has decreased. +AlertPowerLevelIncreasedBy You feel stronger. Your power has increased by %d. +AlertReachedDemesne You have reached your demesne limit. Invite more players to increase this. +AlertUnlocked Unlocked. +AlertUnlockingCancelled Unlocking cancelled. +AllianceBrokenWith Alliance has been broken with %s. +AlliedWith Allied With: %s +AllLandUnclaimed All land unclaimed. +AllLandUnclaimedFrom All land unclaimed from %s. +AlreadyEnteredCheckAccess You have already entered this command. Type '/mf checkaccess cancel' to cancel. +AlreadyEnteredRevokeAccess You have already entered this command. Type '/mf revokeaccess cancel' to cancel. +AlreadyInFaction Sorry, you're already in a faction. Leave if you want to create a different one. +ArgumentMustBeNumber Argument must be a number. +ArgumentsSingleQuotesRequirement Arguments must be designated inside single quotes. +AssignedToRandomFaction You have been assigned to a random faction. +AttemptedAlliance Attempted to ally with %s +AttemptedPeace Attempted to make peace with %s +AtWarWith At War With: %s +AutoclaimToggled Autoclaim toggled. +BlockAlreadyLocked This block is already locked. +BlockIsNotLocked That block isn't locked. +BlockIsPartOfGateMustRemoveGate This block is part of gate '%s'. You must remove the gate first. +BonusPower Bonus Power From Admins: %d +BooleanSet Boolean set. +Cancelled Cancelled. +CancelledGatePlacement1 Error placing point 1. Cancelled gate placement. +CancelledGatePlacement2 Error placing point 2. Cancelled gate placement. +CancelledGatePlacementErrorLinking Error linking to lever. Cancelled gate placement. +CannotAllyWithSelf You can't ally with your own faction. +CannotAttackFactionMember You can't attack another player if you are part of the same faction. +CannotAttackNonWarringPlayer You can't attack another player if your factions aren't at war. +CannotBreakAllianceWithSelf You can't break an alliance with your own faction. +CannotBringNeutralFactionIntoWar You cannot bring neutral factions into war. +CannotCancelActiveDuel Cannot cancel an active duel. +CannotDeclareWarIfLiegeNotWeakened You can't declare war on this faction as they are a vassal unless their liege is weakened. +CannotDeclareWarIfNeutralFaction Neutral factions cannot declare war. +CannotDeclareWarOnAlly You can't declare war on your ally. +CannotDeclareWarOnLiege You can't declare war on your liege. Try '/mf declareindependence' instead. +CannotDeclareWarOnNeutralFaction You cannot declare war on a neutral faction. +CannotDeclareWarOnVassal You can't declare war on your own vassal. +CannotDeclareWarOnYourself You can't declare war on yourself. +CannotDemoteSelf You cannot demote yourself. +CannotDuelSelf You cannot duel yourself. +CannotFindDynmap Cannot find dynmap. +CannotForciblyKickOwner Cannot forcibly kick an owner from their faction. Try disbanding the faction. +CannotGrantAccessToSelf You cannot grant access to yourself. +CannotKickOwner You can't kick the owner. +CannotKickSelf You can't kick yourself. +CannotMakePeaceWithSelf You can't make peace with your own faction. +CannotPlaceChestsNextToUnownedLockedChests You can't place chests next to locked chests you don't own. +CannotPlaceHoppersNextToUnownedLockedChests You can't place hoppers next to, under or above locked chests you don't own. +CannotPromoteSelf You cannot promote yourself. +CannotRevokeAccessFromSelf You cannot revoke access from yourself. +CannotSetFactionHomeInWilderness You can't set your faction home on land your faction hasn't claimed. +CannotSetVersion Can't set version. +CannotTransferToSelf You can't transfer ownership of your faction to yourself. +CannotVassalizeLiege You can't vassalize your liege. +CannotVassalizeSelf You can't vassalize your own faction. +CannotVassalizeVassal You can't vassalize a faction who already has a liege. +CanOnlyCreateGatesInClaimedTerritory You can only create gates in claimed territory. +CanOnlyLockBlocksInClaimedTerritory You can only lock blocks on land claimed by your faction. +CanOnlyLockInFactionTerritory You can only lock things in your faction's territory. +CanOnlyLockSpecificBlocks You can only lock chests, doors, barrels, trapdoors, furnaces, anvils or gates. +ClaimedChunksLoaded Claimed chunks loaded. +ClaimedChunksSuccessfullyLoaded Claimed chunks successfully loaded. +ClickOnTriggerLever Click on the trigger lever... +ClickToPlaceSecondCorner Click to place the second corner... +CmdAddLaw addlaw +CmdAlly ally +CmdAutoClaim autoclaim +CmdBreakAlliance breakalliance +CmdBypass bypass +CmdChat chat +CmdCheckAccess checkaccess +CmdCheckClaim checkclaim +CmdClaim claim +CmdConfig config +CmdConfigSet set +CmdConfigShow show +CmdCreate create +CmdDeclareIndependence declareindependence +CmdDeclareWar declarewar +CmdDemote demote +CmdDesc desc +CmdDisband disband +CmdDuel duel +CmdDuelAccept accept +CmdDuelCancel cancel +CmdDuelChallenge challenge +CmdEditLaw editlaw +CmdFlags flags +CmdFlagsSet set +CmdFlagsShow show +CmdForce force +CmdForceBonusPower bonuspower +CmdForceClaim claim +CmdForceCreate create +CmdForceDemote demote +CmdForceFlag flag +CmdForceJoin join +CmdForceKick kick +CmdForceLoad load +CmdForcePeace peace +CmdForcePower power +CmdForceRename rename +CmdForceRenounce renounce +CmdForceSave save +CmdForceTransfer transfer +CmdForceUnlock unlock +CmdGate gate +CmdGateCancel cancel +CmdGateCreate create +CmdGateList list +CmdGateName name +CmdGateRemove remove +CmdGrantAccess grantaccess +CmdGrantIndependence grantindependence +CmdHelp help +CmdHome home +CmdInfo info +CmdInvite invite +CmdInvoke invoke +CmdJoin join +CmdKick kick +CmdLaws laws +CmdLeave leave +CmdList list +CmdLock lock +CmdMakePeace makepeace +CmdMembers members +CmdPower power +CmdPrefix prefix +CmdPromote promote +CmdRemoveLaw removelaw +CmdRename rename +CmdResetPowerLevels resetpowerlevels +CmdRevokeAccess revokeaccess +CmdSetHome sethome +CmdSwearFealty swearfealty +CmdTransfer transfer +CmdUnclaim unclaim +CmdUnclaimall unclaimall +CmdUnlock unlock +CmdVassalize vassalize +CmdVersion version +CmdWho who +CommandCancelled Command cancelled. +CommandNotRecognized Medieval Factions doesn't recognize that command. +CommandsPage1 == Medieval Factions Commands Page 1/%d == +CommandsPage2 == Medieval Factions Commands Page 2/%d == +CommandsPage3 == Medieval Factions Commands Page 3/%d == +CommandsPage4 == Medieval Factions Commands Page 4/%d == +CommandsPage5 == Medieval Factions Commands Page 5/%d == +CommandsPage6 == Medieval Factions Commands Page 6/%d == +CommandsPage7 == Medieval Factions Commands Page 7/%d == +ConfigListPageOne ===== Config List Page 1/2 ===== +ConfigListPageTwo ===== Config List Page 2/2 ===== +CreatingGateCancelled Creating gate cancelled. +CreatingGateClickWithHoe Creating gate. Click on a block with a Golden Hoe to select the first point. +CuboidDisallowed1 Error placing point 1: You cannot place a cuboid. +CuboidDisallowed2 Error placing point 2: You cannot place a cuboid. +CurrentLanguageID Current Language ID: %s +CurrentlyNoFactions There are currently no factions. +CurrentPowerLevel %s's current power level is %d/%d. +Defeated %s has defeated %s in a duel. +DemesneSize Demesne Size: %d/%d +Description Description: %s +DescriptionSet Description set. +DesignatedFactionNotFound One of the factions designated wasn't found. +DesiredPowerMustBeANumber Desired power must be a number. +DeveloperList Developers: %s +DisbandmentDueToZeroPower %s has been disbanded due to its cumulative power reaching zero. +DoesntExist %s doesn't exist. +Done Done. +DoubleSet Double set. +DuelChallengeCancelled Duel challenge cancelled. +DuelEndedInTie %s and %s's duel has ended in a tie. +DynmapIntegrationSuccessful Dynmap integration successful. +ERROR ERROR: +ErrorAddingAreaMarker Error adding area marker %s +ErrorChunkRemoval An error has occurred during claimed chunk removal. +ErrorClaimedChunkRemoval An error has occurred during claimed chunk removal. +ErrorCouldNotFindGatesFaction Error: Could not find faction for gate '%s'. +ErrorCouldNotLoadFactionGate ERROR: Could not load faction gate.\n +ErrorCreatingMarkerSet Error creating marker set. +ErrorIntegratingWithDynmap Error integrating with dynmap: +ErrorPlayerPowerRecordForUUIDNotFound ERROR: Player's Power Record for uuid not found. Could not get cumulative power level. +ErrorSettingAreaMarkerColor Error setting area marker color to '%s'. +FactionAlreadyAlly That faction is already your ally. +FactionAlreadyExists Sorry. That faction already exists. +FactionAndPlayerSingleQuotesRequirement Faction and player must be designated inside single quotes. +FactionAndVassalSingleQuotesRequirement Faction and vassal to remove must be designated inside single quotes. +FactionCreated Faction created. +FactionCurrentlyEnemyMustMakePeace That faction is currently your enemy. Make peace before trying to ally with them. +FactionDataLoadedSuccessfuly Faction data loaded successfully +FactionDoesNotExist Sorry. That faction doesn't exist. +FactionDoesNotHaveLaws That faction doesn't have any laws. +FactionGates Faction Gates +FactionHomeLoadError An error occurred loading the faction home position. +FactionHomeNotSetYet The faction home isn't set yet. +FactionHomeSet Faction home set. +FactionInfo %s Faction Info +FactionIsNotVassal That faction isn't a vassal of yours. +FactionMustBeDesignatedInsideSingleQuotes Faction must be designated inside single quotes. +FactionNameChanged Faction name changed. +FactionNameNotRecognized That faction name isn't recognized. +FactionNameTooLong That name is too long. +FactionNotEnemy That faction is not your enemy. +FactionNotFound That faction wasn't found. +FactionsSuccessfullyLoaded Factions successfully loaded. +FactionsTitle == Factions == +FactionSuccessfullyDisbanded Faction successfully disbanded. +FactionSuccessfullyLoaded Faction successfully loaded. +FileLoadError An error occurred loading the file +FollowingPlayersHaveAccess The following players have access to this block: +GateCreated Gate successfully created. +HasAttemptedToMakePeaceWith %s has attempted to make peace with %s. +HasBeenKickedFrom %s has been kicked from %s +HasDeclaredIndependence %s has declared independence from %s. +HasDeclaredWarAgainst %s has declared war against %s. +HasJoined %s has joined %s +HelpAddLaw /mf addlaw - Add a law to your faction. +HelpAlly /mf ally - Attempt to ally with a faction. +HelpAutoclaim /mf autoclaim - Toggle auto claim, making land claiming easier. +HelpBreakAlliance /mf breakalliance - Break an alliance with a faction. +HelpBypass /mf bypass - Bypass protections. +HelpChat /mf chat - Toggle faction chat. +HelpCheckAccess /mf checkaccess - Check who has access to a locked block. +HelpCheckClaim /mf checkclaim - Check if land is claimed. +HelpClaim /mf claim - Claim land for your faction. +HelpConfigSet /mf config set (option) (value) - Set a config value. +HelpConfigShow /mf config show - Show config values. +HelpCreate /mf create (name) - Create a new faction. +HelpDeclareIndependence /mf declareindependence - Declare independence from your liege. +HelpDeclareWar /mf declarewar - Declare war against another faction. +HelpDemote /mf demote - Demote an officer to member status. +HelpDesc /mf desc (desc) - Set your faction description. +HelpDisband /mf disband - Disband your faction (must be owner). +HelpDuelAccept /mf duel accept (player) +HelpDuelCancel /mf duel cancel +HelpDuelChallenge /mf duel challenge (player) (time limit in seconds) +HelpEditLaw /mf editlaw - Edit an already existing law in your faction. +HelpFlagsSet /mf flags set (option) (value) - Set a faction flag. +HelpFlagsShow /mf flags show - Show faction flags. +HelpForce /mf force - Force the plugin to perform certain actions. +HelpForceBonusPower /mf force bonuspower 'faction' 'number' +HelpForceClaim /mf force claim 'faction name' +HelpForceCreate /mf force create 'factionName' +HelpForceDemote /mf force demote (player) +HelpForceFlag /mf force flag 'faction' 'option' 'value' +HelpForceJoin /mf force join 'player' 'faction' +HelpForceKick /mf force kick (player) +HelpForceLoad /mf force load +HelpForcePeace /mf force peace 'faction1' 'faction2' +HelpForcePower /mf force power 'player' 'number' +HelpForceRemoveVassal /mf force removevassal 'faction' 'vassal' +HelpForceRename /mf force rename 'faction' 'new name' +HelpForceRenounce /mf force renounce (faction) +HelpForceSave /mf force save +HelpForceTransfer /mf force transfer 'faction' 'player' +HelpForceUnlock /mf force unlock +HelpGateCancel /mf gate cancel +HelpGateCreate /mf gate create (name) +HelpGateList /mf gate list +HelpGateName /mf gate name (name) +HelpGateRemove /mf gate remove +HelpGrantAccess /mf grantaccess - Grant someone access to a locked block. +HelpGrantIndependence /mf grantindependence - Grant a vassal vaction independence. +HelpHelp /mf help # - Show lists of useful commands. +HelpHome /mf home - Teleport to your faction home. +HelpInfo /mf info - See your faction or another faction's information. +HelpInvite /mf invite (player) - Invite a player to your faction. +HelpInvoke /mf invoke (ally) (enemy) - Call an allied faction into a war. +HelpJoin /mf join (faction) - Join a faction if you've been invited. +HelpKick /mf kick - Kick a player from your faction. +HelpLaws /mf laws - View the laws of your faction. +HelpLeave /mf leave - Leave your current faction. +HelpList /mf list - List all factions on the server. +HelpLock /mf lock - Lock a chest or door. +HelpMakePeace /mf makepeace - Send peace offer to another faction. +HelpMap /mf map - Display a map of the claims near your surroundings. +HelpMembers /mf members - List the members of your faction or another faction. +HelpPower /mf power - Check your power level. +HelpPrefix /mf prefix (prefix) - Set your faction's prefix +HelpPromote /mf promote - Promote a player to officer status. +HelpRemoveLaw /mf removelaw - Remove a law from your faction. +HelpRename /mf rename - Rename your faction +HelpResetPowerLevels /mf resetpowerlevels - Reset player power records and faction cumulative power levels. +HelpRevokeAccess /mf revokeaccess - Revoke someone's access to a locked block. +HelpSetHome /mf sethome - Set your faction home. +HelpSwearFealty /mf swearfealty - Swear fealty to a faction. +HelpTransfer /mf transfer - Transfer ownership of your faction to another player. +HelpUnclaim /mf unclaim - Unclaim land for your faction. +HelpUnclaimall /mf unclaimall - Unclaim all land for your faction. +HelpUnlock /mf unlock Unlock a chest or door. +HelpVassalize /mf vassalize - Offer to vassalize a faction. +HelpVersion /mf version - Check plugin version. +HelpWho /mf who - View the faction info a specific player. +HomeClaimedByAnotherFaction Home was claimed by another faction, and has been lost. +HomeIsInUnclaimedChunk Home is in an unclaimed chunk, and is unavailable +HourlySaveAlert Medieval Factions is saving. This will happen every hour. +IntegerSet Integer set. +InvitationExpired Your invitation to %s has expired. +InvitationSent Invitation sent. +KeysLoaded Keys loaded: %d +LandAlreadyClaimedBy This land is already claimed by +LandAlreadyClaimedByYourFaction This land is already claimed by your faction. +LandClaimedBy This land is claimed by %s. +LandClaimedUsingAdminBypass Land unclaimed using admin bypass. +LandIsNotClaimed This land isn't claimed. +LandIsUnclaimed This land is unclaimed. +LandNotCurrentlyClaimed This land is not currently claimed. +LandUnclaimed Land unclaimed. +LawAdded Law added. +LawEdited Law edited. +LawRemoved Law removed. +LawsTitle == Laws of %s == +LeverSuccessfullyLinked Creating Gate 4/4: Lever successfully linked. +Liege Liege: %s +ListLegend P: power, M: members, L: land +LoadingClaimedChunks Loading claimed chunks... +LoadingLockedBLocks Loading locked blocks... +LoadingPlayerPowerRecords Loading player power records... +Locked Locked. +LockedBlockSuccessfullyLoaded Locked block successfully loaded. +LockedBy Locked by %s +LockingCancelled Locking cancelled. +LockRemovalError An error has occurred during lock removal. +MaterialsMismatch1 Error placing point 1: Materials mismatch. +MaterialsMismatch2 Error placing point 2: Materials mismatch. +MedievalFactionsStringRight Medieval-Factions-%s +MedievalFactionsTitle == Medieval Factions %s == +MembersOf Members of %s +MissingFactionGatesJSONCollection Could not load gates because the collection 'factionGates' did not exist in the factions JSON file. Are you upgrading from a previous version? Setting default. +MovementDetectedTeleportCancelled Movement Detected. Teleport cancelled. +MustBeAtWarOrFactionMustBeInactive Must be at war with target faction or target faction must be inactive. +MustBeInFaction Sorry, you must be in a faction to use this command. +MustBeOwner Sorry, you must be the owner of a faction to use this command. +MustOwnFactionOrBeOfficer You have to own a faction or be an officer of a faction to use this command. +MustTransferOwnership Sorry. You must transfer ownership or kick everyone in your faction to leave. +Name Name: %s +NameAlreadyTaken That name is already taken. +NeutralityDisabled Neutrality is currently disabled. +NoBlockDetectedToCheckForGate No block detected to check for gate. +NoFactionsDesignatedSingleQuotesRequired No factions designated. Must be designated inside single quotes. +NoLongerBypassingProtections You are no longer bypassing protections provided by Medieval Factions. +NoLongerInFactionChat You are no longer in faction chat. +NotAMemberOfAnyFaction You are not a member of any faction. +NotAnAlly %s isn't an ally of yours. +NotAnAllyOrVassal %s isn't an ally or vassal of yours. +NotAtWarWith You aren't at war with %s +NotAVassalOfAFaction You aren't a vassal of a faction. NotEnoughArgumentsDesignatedSingleQuotesRequired Not enough arguments designated. Must be designated inside single quotes. -NotTheOwnerOfThisBlock You are not the owner of this block. -NotTheOwnerOfThisFaction You are not the owner of this faction. -NoVassalOrLiegeReferences There were no vassal or liege references associated with that faction. -NowBypassingProtections You are now bypassing protections provided by Medieval Factions. -NowSpeakingInFactionChat You are now speaking in faction chat. -OnlyPlayersCanUseCommand Only players can use this command. -OnlyUseLeversInClaimedTerritory Error: Can only use levers in claimed territory. -Owner Owner: %s -OwnershipTransferred Ownership of %s has been transferred to you. -OwnerShipTransferredTo Ownership transferred to %s -PermissionNeeded Sorry. In order to use this command, you need the following permission: ''%s' -PlayerAlreadyDueling %s is already duelling someone. -PlayerAlreadyInFaction That player is already in a faction, sorry. -PlayerAlreadyOfficer Player is already an officer. -PlayerAndDesiredPowerSingleQuotesRequirement Player and desired power must be designated inside single quotes. -PlayerByNameNotFound Sorry. Player by the name of %s could not be found. -PlayerCantBePromotedBecauseOfLimit Player can't be promoted because you have reached your limit. Limit: %d -PlayerDemoted Player demoted. -PlayerIsNotInAFaction That player isn't in a faction. -PlayerIsNotInYourFaction That player isn't in your faction. -PlayerIsNotMemberOfFaction That player isn't a member of your faction. -PlayerIsNotOfficerOfFaction That player isn't an officer in your faction. -PlayerNotFound Player not found. -PlayerPowerRecordsLoaded Player power records loaded. -PlayerPromoted Player promoted. -PleaseWaitGate This gate is %s, please wait. -PluginDisabled Medieval Factions plugin disabled. -PluginDisabling Medieval Factions plugin disabling.... -PluginEnabled Medieval Factions plugin enabled. -PluginEnabling Medieval Factions plugin enabling.... -PluginLoading Medieval Factions plugin is loading... -PluginSaving Medieval Factions plugin is saving... -Point1PlacementSuccessful Creating Gate 1/4: Point 1 placed successfully. -Point2PlacedSuccessfully Creating Gate 2/4: Point 2 placed successfully. -Population Population: %d -PowerHasDecayed Your power has decayed by %d since you last logged out. Your power is now %d. -PowerLevel Power Level: %s -PowerLevelHasBeenSetTo The power level of that player has been set to %d -PowerLevelHasIncreased Your power level has increased. -PowerLevelResetting Power level resetting... -PrefixesDisabled Prefixes are currently disabled. -PrefixSet Prefix set. -PrefixTaken This prefix has already been taken. -ProblemLoadingClaimedChunks There was a problem loading the claimed chunks. -ProblemLoadingFactions There was a problem loading the factions. -ProblemLoadingPowerRecords There was a problem loading the player power records. -PromotedToOfficer You have been promoted to officer status in your faction. -RadiusRequirement Radius must be between 0 and %d. -RemovedGate Removed gate '%s'. -ResettingIndividualPowerRecords Resetting individual power records. -RightClickCheckAccess Right click a locked block to check who has access to it. Type '/mf checkaccess cancel' to cancel. -RightClickForceUnlock Right click a chest or door to forcefully unlock it! (Type /mf force unlock cancel to cancel) -RightClickGrantAccess Right click a chest or door to grant %s access. Type /mf grantaccess cancel to cancel this. -RightClickLock Right click a chest or door to lock it. (Type /mf lock cancel to cancel) -RightClickRevokeAccess Right click a locked block to revoke this player's access to it. Type '/mf revokeaccess cancel' to cancel. -RightClickUnlock Right click a chest or door to unlock it. (Type /mf unlock cancel to cancel) -SchedulingHourlyAutoSave Scheduling hourly auto save... -SchedulingPowerDecrease Scheduling power decrease... -SchedulingPowerIncrease Scheduling power increase... -SingleQuotesAlliedWarring Allied faction and warring faction must be designated inside single quotes. -StringSet String set. -SubCommands Sub-commands: -SuccessFactionMemberRemoval Success. If the player was in a faction, they are no longer a member. -SuccessForceJoin Success. Player was forced to join faction. -SuccessfulDisbandment %s has been successfully disbanded. -SuccessOfficerRemoval Success. If player was considered an officer in any faction, they are no longer. -SuccessReferencesRemoved references have been successfully removed. -SupportedLanguageIDList Supported Language IDs: %s -SurroundedChunkProtected Target faction has claimed the chunks to the north, east, south and west of this chunk. It cannot be conquered. -TargetBlockNotPartOfGate Target block is not part of a gate. -TargetFactionNotOverClaiming Target faction does not have more land than their demesne limit. -TeleportingAlert Teleporting in 3 seconds... -ThreeBlockRequirement Error placing point 2: Gate must be 3 blocks or taller. -TriggerBlockNotLever Trigger block was not a lever. Cancelled gate placement. -UsageAddLaw Usage: /mf addlaw (new law) -UsageAlly Usage: /mf ally (faction-name) -UsageBreakAlliance Usage: /mf breakalliance (faction-name) -UsageClaimRadius Usage: /mf claim (radius) -UsageConfigSet Usage: /mf config set (option) (value) -UsageConfigShow Usage: /mf config show ( 1 | 2 ) -UsageCreate Usage: /mf create [faction-name] -UsageDeclareWar Usage: /mf declarewar (faction-name) -UsageDemote Usage: /mf demote (player-name) -UsageDesc Usage: /mf desc (description) -UsageEditLaw Usage: /mf editlaw (number) (edited law) -UsageFlagsSet Usage: /mf flags set (option) (value) -UsageForceBonusPower Usage: /mf force bonuspower 'faction' 'number' -UsageForceClaim Usage: /mf force claim 'faction name' -UsageForceCreate Usage: /mf force create 'factionName' -UsageForceDemote Usage: /mf force demote (player) -UsageForceFlag Usage: /mf force flag 'faction' 'option' 'value' -UsageForceJoin Usage: /mf force join 'player' 'faction' -UsageForceKick Usage: /mf force kick (player) -UsageForcePeace Usage: /mf force peace 'faction-1' 'faction-2' -UsageForcePower Usage: /mf force power 'player' 'number' -UsageForceRemoveVassal /mf force removevassal 'faction-1' 'faction-2' -UsageForceRename Usage: /mf force rename 'faction' 'new name' -UsageForceRenounce Usage: /mf force renounce 'faction' -UsageForceTransfer Usage: /mf force transfer 'factionName' 'player' -UsageGrantAccess Usage: /mf grantaccess (player-name) -UsageGrantIndependence Usage: /mf grantindependence (faction-name) -UsageInvite Usage: /mf invite (player-name) -UsageInvoke Usage: /mf invoke '(allied faction name)' '(warring faction)' -UsageJoin Usage: /mf join (faction-name) -UsageKick Usage: /mf kick (player-name) -UsageMakePeace Usage: /mf makepeace (faction-name) -UsagePrefix Usage: /mf prefix (new prefix) -UsagePromote Usage: /mf promote (player-name) -UsageRemoveLaw Usage: /mf removelaw (number) -UsageRename Usage: /mf rename (newName) -UsageRevokeAccess Usage: /mf revokeaccess (player-name) -UsageSwearFealty Usage: /mf swearfealty (faction-name) -UsageTransfer Usage: /mf transfer (player-name) -UsageVassalize Usage: /mf vassalize (faction-name) -UsageWho Usage: /mf who (player-name) -ValidSubCommandsShowSet Valid sub-commands: show, set -VassalContribution Bonus Power From Vassals: %d -Vassals Vassals: %s -WarningPlayerAlreadyStartedCreatingGate WARNING: Player has already started creating the gate. startCreatingGate() call ignored. -WasntFound '%s' wasn't found. -WelcomeBackLastLogout Welcome back %s. You last logged out %s ago. -WikiLink Wiki: https://github.com/dmccoystephenson/Medieval-Factions/wiki -Wilderness Wilderness -WorldsMismatch1 Error placing point 1: Worlds mismatch. -WorldsMismatch2 Error placing point 2: Worlds mismatch. \ No newline at end of file +NotTheOwnerOfThisBlock You are not the owner of this block. +NotTheOwnerOfThisFaction You are not the owner of this faction. +NoVassalOrLiegeReferences There were no vassal or liege references associated with that faction. +NowBypassingProtections You are now bypassing protections provided by Medieval Factions. +NowSpeakingInFactionChat You are now speaking in faction chat. +OnlyPlayersCanUseCommand Only players can use this command. +OnlyUseLeversInClaimedTerritory Error: Can only use levers in claimed territory. +Owner Owner: %s +OwnershipTransferred Ownership of %s has been transferred to you. +OwnerShipTransferredTo Ownership transferred to %s +PermissionNeeded Sorry. In order to use this command, you need the following permission: ''%s' +PlayerAlreadyDueling %s is already duelling someone. +PlayerAlreadyInFaction That player is already in a faction, sorry. +PlayerAlreadyOfficer Player is already an officer. +PlayerAndDesiredPowerSingleQuotesRequirement Player and desired power must be designated inside single quotes. +PlayerByNameNotFound Sorry. Player by the name of %s could not be found. +PlayerCantBePromotedBecauseOfLimit Player can't be promoted because you have reached your limit. Limit: %d +PlayerDemoted Player demoted. +PlayerIsNotInAFaction That player isn't in a faction. +PlayerIsNotInYourFaction That player isn't in your faction. +PlayerIsNotMemberOfFaction That player isn't a member of your faction. +PlayerIsNotOfficerOfFaction That player isn't an officer in your faction. +PlayerNotFound Player not found. +PlayerPowerRecordsLoaded Player power records loaded. +PlayerPromoted Player promoted. +PleaseWaitGate This gate is %s, please wait. +PluginDisabled Medieval Factions plugin disabled. +PluginDisabling Medieval Factions plugin disabling.... +PluginEnabled Medieval Factions plugin enabled. +PluginEnabling Medieval Factions plugin enabling.... +PluginLoading Medieval Factions plugin is loading... +PluginSaving Medieval Factions plugin is saving... +Point1PlacementSuccessful Creating Gate 1/4: Point 1 placed successfully. +Point2PlacedSuccessfully Creating Gate 2/4: Point 2 placed successfully. +Population Population: %d +PowerHasDecayed Your power has decayed by %d since you last logged out. Your power is now %d. +PowerLevel Power Level: %s +PowerLevelHasBeenSetTo The power level of that player has been set to %d +PowerLevelHasIncreased Your power level has increased. +PowerLevelResetting Power level resetting... +PrefixesDisabled Prefixes are currently disabled. +PrefixSet Prefix set. +PrefixTaken This prefix has already been taken. +ProblemLoadingClaimedChunks There was a problem loading the claimed chunks. +ProblemLoadingFactions There was a problem loading the factions. +ProblemLoadingPowerRecords There was a problem loading the player power records. +PromotedToOfficer You have been promoted to officer status in your faction. +RadiusRequirement Radius must be between 0 and %d. +RemovedGate Removed gate '%s'. +ResettingIndividualPowerRecords Resetting individual power records. +RightClickCheckAccess Right click a locked block to check who has access to it. Type '/mf checkaccess cancel' to cancel. +RightClickForceUnlock Right click a chest or door to forcefully unlock it! (Type /mf force unlock cancel to cancel) +RightClickGrantAccess Right click a chest or door to grant %s access. Type /mf grantaccess cancel to cancel this. +RightClickLock Right click a chest or door to lock it. (Type /mf lock cancel to cancel) +RightClickRevokeAccess Right click a locked block to revoke this player's access to it. Type '/mf revokeaccess cancel' to cancel. +RightClickUnlock Right click a chest or door to unlock it. (Type /mf unlock cancel to cancel) +SchedulingHourlyAutoSave Scheduling hourly auto save... +SchedulingPowerDecrease Scheduling power decrease... +SchedulingPowerIncrease Scheduling power increase... +SingleQuotesAlliedWarring Allied faction and warring faction must be designated inside single quotes. +StringSet String set. +SubCommands Sub-commands: +SuccessFactionMemberRemoval Success. If the player was in a faction, they are no longer a member. +SuccessForceJoin Success. Player was forced to join faction. +SuccessfulDisbandment %s has been successfully disbanded. +SuccessOfficerRemoval Success. If player was considered an officer in any faction, they are no longer. +SuccessReferencesRemoved references have been successfully removed. +SupportedLanguageIDList Supported Language IDs: %s +SurroundedChunkProtected Target faction has claimed the chunks to the north, east, south and west of this chunk. It cannot be conquered. +TargetBlockNotPartOfGate Target block is not part of a gate. +TargetFactionNotOverClaiming Target faction does not have more land than their demesne limit. +TeleportingAlert Teleporting in 3 seconds... +ThreeBlockRequirement Error placing point 2: Gate must be 3 blocks or taller. +TriggerBlockNotLever Trigger block was not a lever. Cancelled gate placement. +UsageAddLaw Usage: /mf addlaw (new law) +UsageAlly Usage: /mf ally (faction-name) +UsageBreakAlliance Usage: /mf breakalliance (faction-name) +UsageClaimRadius Usage: /mf claim (radius) +UsageConfigSet Usage: /mf config set (option) (value) +UsageConfigShow Usage: /mf config show ( 1 | 2 ) +UsageCreate Usage: /mf create [faction-name] +UsageDeclareWar Usage: /mf declarewar (faction-name) +UsageDemote Usage: /mf demote (player-name) +UsageDesc Usage: /mf desc (description) +UsageEditLaw Usage: /mf editlaw (number) (edited law) +UsageFlagsSet Usage: /mf flags set (option) (value) +UsageForceBonusPower Usage: /mf force bonuspower 'faction' 'number' +UsageForceClaim Usage: /mf force claim 'faction name' +UsageForceCreate Usage: /mf force create 'factionName' +UsageForceDemote Usage: /mf force demote (player) +UsageForceFlag Usage: /mf force flag 'faction' 'option' 'value' +UsageForceJoin Usage: /mf force join 'player' 'faction' +UsageForceKick Usage: /mf force kick (player) +UsageForcePeace Usage: /mf force peace 'faction-1' 'faction-2' +UsageForcePower Usage: /mf force power 'player' 'number' +UsageForceRemoveVassal /mf force removevassal 'faction-1' 'faction-2' +UsageForceRename Usage: /mf force rename 'faction' 'new name' +UsageForceRenounce Usage: /mf force renounce 'faction' +UsageForceTransfer Usage: /mf force transfer 'factionName' 'player' +UsageGrantAccess Usage: /mf grantaccess (player-name) +UsageGrantIndependence Usage: /mf grantindependence (faction-name) +UsageInvite Usage: /mf invite (player-name) +UsageInvoke Usage: /mf invoke '(allied faction name)' '(warring faction)' +UsageJoin Usage: /mf join (faction-name) +UsageKick Usage: /mf kick (player-name) +UsageMakePeace Usage: /mf makepeace (faction-name) +UsagePrefix Usage: /mf prefix (new prefix) +UsagePromote Usage: /mf promote (player-name) +UsageRemoveLaw Usage: /mf removelaw (number) +UsageRename Usage: /mf rename (newName) +UsageRevokeAccess Usage: /mf revokeaccess (player-name) +UsageSwearFealty Usage: /mf swearfealty (faction-name) +UsageTransfer Usage: /mf transfer (player-name) +UsageVassalize Usage: /mf vassalize (faction-name) +UsageWho Usage: /mf who (player-name) +ValidSubCommandsShowSet Valid sub-commands: show, set +VassalContribution Bonus Power From Vassals: %d +Vassals Vassals: %s +WarningPlayerAlreadyStartedCreatingGate WARNING: Player has already started creating the gate. startCreatingGate() call ignored. +WasntFound '%s' wasn't found. +WelcomeBackLastLogout Welcome back %s. You last logged out %s ago. +WikiLink Wiki: https://github.com/dmccoystephenson/Medieval-Factions/wiki +Wilderness Wilderness +WorldsMismatch1 Error placing point 1: Worlds mismatch. +WorldsMismatch2 Error placing point 2: Worlds mismatch. \ No newline at end of file diff --git a/src/main/resources/es.tsv b/src/main/resources/es.tsv index 348a4331c..e9ab925ee 100644 --- a/src/main/resources/es.tsv +++ b/src/main/resources/es.tsv @@ -1,551 +1,551 @@ -AcceptedChallengeDuelHasBegun Has aceptado el desafío de %s, comienza el duelo. -AlertAccessGrantedTo Acceso otorgado a %s -AlertAccessRevokedFor Acceso quitado a %s -AlertAllianceHasBeenBroken %s ha roto su alianza a tu facción. -AlertAlreadyAtWarWith Tu facción ya está en conflicto con %s. -AlertAlreadyCreatingGate Ya estás creando un portón. -AlertAlreadyDueling Ya estás en un duelo. -AlertAlreadyDuelingPlayer Ya estás en duelo con %s. -AlertAlreadyDuelingSomeone Ya estás en duelo con alguien. -AlertAlreadyGrantingAccess Ya estás otorgando acceso a alguien. Escribe '/mf daracceso cancelar' para cancelar esto. -AlertAlreadyInFaction Perdona, ya estás en una facción. -AlertAlreadyRequestedAlliance Ya has pedido alianza con esta facción. -AlertAlreadyRequestedPeace Ya has pedido paz con esta facción. -AlertAttemptedAlliance %s ha intentado aliarse con %s. -AlertAttemptedVassalization %s ha intentado avasallar tu facción. Si eres el propietario, escribe '/mf jurarlealtad %s' para aceptar. -AlertBeenInvited Has sido invitado a %s. Escribe '/mf unirse %s' para unirte. -AlertCalledToWar1 %s ha llamado a tu facción a su conflicto contra %s. -AlertCalledToWar2 %s ha llamado a %s a su conflicto contra tu facción. -AlertCalledToWar3 Tu facción ha llamado a %s a tu conflicto contra %s. -AlertChallengedToDuel %s ha desafíado a %s a un duelo. -AlertChallengedToDuelPlusHowTo %s te ha desafíado a un duelo. Escribe '/mf duelo aceptar' para comenzar. -AlertChallengeIssued Has desafíado a %s a un duelo. -AlertChallengeWasAccepted %s ha aceptado tu desafío, comienza el duelo. -AlertChangedGateName Cambiado el nombre del portón a '%s'. -AlertCurrentPowerLevel Tu poder actual es %d/%d. -AlertDecreasingThePowerOfInactivePlayers Medieval Factions está disminuyendo el poder de cada jugador en %d si no se han conectado por más de %d minutos. Esto pasará cada %d minutos. -AlertDemotion Has sido degradado al rango de miembro en tu facción. -AlertDisbandmentDueToZeroPower Tu facción se ha disuelto al caer su poder total a cero. -AlertFactionAttemptedToVassalize Tu facción ha intentado avasallar a %s. -AlertFactionHasBeenVassalized Tu facción ha sido avasallada y tiene un nuevo señorío: %s. -AlertFactionHasNewVassal Tu facción tiene un nuevo vasallo: %s. -AlertFactionHomeRemoved Tu hogar de facción ha sido eliminado. -AlertFactionIsWeakened Tu facción tiene menos de la mitad de su poder máximo. Ya no recibirá poder adicional de los vasallos y tus vasallos ahora son vulnerables. -AlertForcedDemotion Has sido forzadamente degradado de tu rango de oficial en tu facción. -AlertForcedKick Has sido expulsado de tu facción. -AlertForcedLoad Medieval Factions ha sido forzado a cargar. -AlertForcedSave Medieval Factions ha sido forzado a guardar. -AlertForcedToJoinFaction Has sido forzado a unirte a una facción. -AlertGate Este es el portón de '%s'. -AlertGrantedIndependence %s ha otorgado independencia a tu facción. -AlertIncreasingThePowerOfEveryPlayer Medieval Factions está aumentando el poder de cada jugador en %d. Esto pasará cada %d minutos. -AlertJoinedFaction Te has unido a la facción. -AlertKicked Has sido expulsado de tu facción por %s. -AlertLandClaimed Tierra reclamada. Tamaño del Dominio: %d/%d -AlertLandConqueredFromAnotherFaction Tierra conquistada de %s. Tamaño del Dominio: %d/%d -AlertLandConqueredFromYourFaction %s ha conquistado tierra de tu facción. -AlertLeftFaction Has abandonado tu facción. -AlertLeftFactionAndItGotDeleted Has abandonado tu facción. Ha sido disuelta ya que no quedaban miembros. -AlertMoreClaimedChunksThanPower Tu facción tiene más tierras que poder. Tus tierras pueden ser conquistadas. -AlertMustBeAtWarToConquer Ambas facciones tienen que estar en conflicto para poder conquistar sus tierras. -AlertMustBeInFactionToUseCommand Tienes que estar en una facción para usar este comando. -AlertMustBeMemberToCreateGate Tienes que ser miembro de esta facción para crear un portón. -AlertMustBeOfficerOrOwnerToClaimLand Tienes que ser oficial o propietario de una facción para reclamar tierra. -AlertMustBeOwnerOrOfficerToCreateGate Tienes que ser oficial o propietario de una facción para crear un portón. -AlertMustBeOwnerOrOfficerToUseCommand Tienes que ser oficial o propietario de una facción para usar este comando. -AlertMustBeOwnerToInvokeAlliance Tienes que ser el propietario de tu facción para llamar a una alianza. -AlertMustBeOwnerToUseCommand Tienes que ser el propietario de una facción para usar este comando. -AlertMustKickAllPlayers Tienes que expulsar a todos los miembros antes de disolver tu facción. -AlertNoGatesDefined Tu facción no tiene portones. -AlertNoLaws Tu facción no tiene leyes. -AlertNoLongerVassalFaction %s ya no es una facción avasallada. -AlertNonOwnership Esto no te pertenece. -AlertNoPendingChallenges No tienes desafíos pendientes para cancelar. -AlertNotAllied Tu facción no está aliada con %s. -AlertNotBeenChallenged No has sido desafíado a un duelo por nadie. -AlertNotBeenChallengedByPlayer No has sido desafíado a un duelo por '%s'- -AlertNotInFaction No estás en una facción. -AlertNotInvitedToFaction No has sido invitado a esta facción. -AlertNotOfferedVassalizationBy No se te ha ofrecido vasallaje por esta facción. -AlertNowAlliedWith Tu facción ahora está aliada con %s. -AlertNowAtPeaceWith %s ahora está en paz con %s. -AlertPlayerAlreadyOwner Ese jugador ya es miembro de esa facción. -AlertPlayerNotInFaction Este jugador no está en esta facción. -AlertPowerLevelDecreased Tu poder ha disminuido. -AlertPowerLevelIncreasedBy Te sientes más fuerte. Tu poder ha aumentado en %d. -AlertReachedDemesne Has alcanzado el límite de tu dominio. Invita a más jugadores a tu facción para aumentar el límite. -AlertUnlocked Desbloqueado. -AlertUnlockingCancelled Desbloqueo cancelado. -AllianceBrokenWith Alianza rota con %s. -AlliedWith Aliado con: %s -AllLandUnclaimed Todas las tierras han sido renunciadas. -AllLandUnclaimedFrom Todas las tierras de %s han sido renunciadas. -AlreadyEnteredCheckAccess Ya has usado este comando. Escribe '/mf veracceso cancelar' para cancelar. -AlreadyEnteredRevokeAccess Ya has usado este comando. Escribe '/mf quitaracceso cancelar' para cancelar. -AlreadyInFaction Perdona, ya estás en una facción. Abandónala si quieres crear una distinta. -ArgumentMustBeNumber El argumento debe ser un número. -ArgumentsSingleQuotesRequirement Los argumentos deben designarse entre comillas simples. -AssignedToRandomFaction Te han asignado a una facción aleatoria. -AttemptedAlliance Alianza intentada con %s -AttemptedPeace Pan intentada con %s -AtWarWith En Conflicto con: %s -AutoclaimToggled Reclamación automática de tierra habilitada. -BlockAlreadyLocked Este bloque ya está asegurado. -BlockIsNotLocked Este bloque no está asegurado. -BlockIsPartOfGateMustRemoveGate Este bloque es parte del portón '%s'. Debes eliminar este portón primero. -BonusPower Poder adicional de los administradores: %d -BooleanSet Boolean establecido. -Cancelled Cancelado. -CancelledGatePlacement1 Error estableciendo punto 1. Colocación de portón cancelada. -CancelledGatePlacement2 Error estableciendo punto 2. Colocación de portón cancelada. -CancelledGatePlacementErrorLinking Error estableciendo una palanca. Colocación de portón cancelada. -CannotAllyWithSelf No puedes aliarte con tu propia facción. -CannotAttackFactionMember No puedes atacar a otro jugador si sois parte de la misma facción. -CannotAttackNonWarringPlayer No puedes atacar a otro jugador si vuestras facciones no están en conflicto. -CannotBreakAllianceWithSelf No puedes romper alianza con tu propia facción. -CannotBringNeutralFactionIntoWar No puedes traer facciones neutrales a la guerra. -CannotCancelActiveDuel No puedes cancelar un duelo en progreso. -CannotDeclareWarIfLiegeNotWeakened No puedes declarar conflicto contra esta facción ya que son vasallos, a no ser que su señorío se debilite. -CannotDeclareWarIfNeutralFaction Las facciones neutrales no pueden declarar la guerra. -CannotDeclareWarOnAlly No puedes declarar conflicto contra tus aliados. -CannotDeclareWarOnLiege No puedes declarar guerra contra tu señorío. Intenta '/mf declararindependencia' en su lugar. -CannotDeclareWarOnNeutralFaction No puedes declarar la guerra a una facción neutral. -CannotDeclareWarOnVassal No puedes declarar conflicto contra tus vasallos. -CannotDeclareWarOnYourself No puedes declarar conflicto contra tí mismo. -CannotDemoteSelf No puedes degradarte a ti mismo. -CannotDuelSelf No puedes tener un duelo contra tí mismo. -CannotFindDynmap No se puede encontrar DynMap. -CannotForciblyKickOwner No se puede expulsar a un propietario de su facción forzadamente. Intenta disolver la facción. -CannotGrantAccessToSelf No puedes concederte acceso a ti mismo. -CannotKickOwner No puedes expulsar al propietario. -CannotKickSelf No puedes expulsarte a tí mismo. -CannotMakePeaceWithSelf No puedes hacer paces con tu propia facción. -CannotPlaceChestsNextToUnownedLockedChests No puedes colocar cofres al lado de cofres asegurados que no son tuyos. -CannotPlaceHoppersNextToUnownedLockedChests No puedes colocar hoppers al lado, sobre, o bajo cofres asegurados que no son tuyos. -CannotPromoteSelf No puedes promocionarte a ti mismo. -CannotRevokeAccessFromSelf No puede revocar el acceso a usted mismo. -CannotSetFactionHomeInWilderness No puedes establecer tu hogar de facción en tierra que tu facción no ha reclamado. -CannotSetVersion No se puede establecer la versión. -CannotTransferToSelf No puedes transferirte la propiedad de tu facción a tí mismo. -CannotVassalizeLiege No puedes avasallar a tu señorío. -CannotVassalizeSelf No puedes avasallar a tu propia facción. -CannotVassalizeVassal No puedes avasallar una facción que ya tiene un señorío. -CanOnlyCreateGatesInClaimedTerritory Solo puedes crear portones en territorio reclamado. -CanOnlyLockBlocksInClaimedTerritory Solo puedes asegurar bloques en territorio reclamado por tu facción. -CanOnlyLockInFactionTerritory Solo puedes asegurar cosas en territorio de tu facción. -CanOnlyLockSpecificBlocks Solo puedes asegurar cofres, puertas, barriles, trampillas, hornos, yunques o puertas de vallas. -ClaimedChunksLoaded Tierras reclamadas cargadas. -ClaimedChunksSuccessfullyLoaded Tierras reclamadas cargadas con éxito. -ClickOnTriggerLever Haz click en la palanca vinculada... -ClickToPlaceSecondCorner Haz click para colocar la segunda esquina... -CmdAddLaw añadirley -CmdAlly aliar -CmdAutoClaim autoreclamar -CmdBreakAlliance romperalianza -CmdBypass bypass -CmdChat chat -CmdCheckAccess veracceso -CmdCheckClaim verreclamacion -CmdClaim reclamar -CmdConfig config -CmdConfigSet establecer -CmdConfigShow ver -CmdCreate crear -CmdDeclareIndependence declararindependencia -CmdDeclareWar declararconflicto -CmdDemote degradar -CmdDesc desc -CmdDisband disolver -CmdDuel duelo -CmdDuelAccept aceptar -CmdDuelCancel cancelar -CmdDuelChallenge desafiar -CmdEditLaw editarley -CmdFlags banderas -CmdFlagsSet colocar -CmdFlagsShow show -CmdForce forzar -CmdForceBonusPower extrapoder -CmdForceClaim afirmar -CmdForceCreate crear -CmdForceDemote degradar -CmdForceFlag flag -CmdForceJoin unirse -CmdForceKick expulsar -CmdForceLoad cargar -CmdForcePeace paz -CmdForcePower poder -CmdForceRename renombrar -CmdForceRenounce abdicar -CmdForceSave guardar -CmdForceTransfer transferir -CmdForceUnlock desbloquear -CmdGate porton -CmdGateCancel cancelar -CmdGateCreate crear -CmdGateList lista -CmdGateName nombre -CmdGateRemove quitar -CmdGrantAccess daracceso -CmdGrantIndependence otorgarindependencia -CmdHelp ayuda -CmdHome hogar -CmdInfo info -CmdInvite invitar -CmdInvoke invocar -CmdJoin unirse -CmdKick expulsar -CmdLaws leyes -CmdLeave abandonar -CmdList lista -CmdLock asegurar -CmdMakePeace hacerpaces -CmdMembers miembros -CmdPower poder -CmdPrefix prefijo -CmdPromote ascender -CmdRemoveLaw quitarley -CmdRename renombrar -CmdResetPowerLevels reiniciarpoder -CmdRevokeAccess quitaracceso -CmdSetHome establecerhogar -CmdSwearFealty jurarlealtad -CmdTransfer transferir -CmdUnclaim renunciar -CmdUnclaimall renunciartodo -CmdUnlock desasegurar -CmdVassalize avasallar -CmdVersion version -CmdWho quien -CommandCancelled Comando cancelado. -CommandNotRecognized Medieval Factions no reconoce este comando. -CommandsPage1 == Medieval Factions, Página de Comandos 1/%d == -CommandsPage2 == Medieval Factions, Página de Comandos 2/%d == -CommandsPage3 == Medieval Factions, Página de Comandos 3/%d == -CommandsPage4 == Medieval Factions, Página de Comandos 4/%d == -CommandsPage5 == Medieval Factions, Página de Comandos 5/%d == -CommandsPage6 == Medieval Factions, Página de Comandos 6/%d == -CommandsPage7 == Comandos de Facciones Medievales Página 7 /% d == -ConfigListPageOne ===== Página de lista de configuración 1/2 ===== -ConfigListPageTwo ===== Página de lista de configuración 2/2 ===== -CreatingGateCancelled Creación de portón cancelada. -CreatingGateClickWithHoe Creando portón. Haz click en un bloque con una Azada de Oro para seleccionar la primera esquina. -CuboidDisallowed1 Error estableciendo el punto 1: No puedes colocar un cuboide. -CuboidDisallowed2 Error estableciendo el punto 2: No puedes colocar un cuboide. -CurrentLanguageID El ID de Lenguaje actual es: %s -CurrentlyNoFactions Actualmente no hay facciones. -CurrentPowerLevel El poder actual de %s es %d/%d. -Defeated %s ha derrotado a %s en un duelo. -DemesneSize Tamaño del Dominio: %d/%d -Description Descripción: %s -DescriptionSet Descripción establecida. -DesignatedFactionNotFound Una de las facciones escritas no fue encontrada. -DesiredPowerMustBeANumber El poder deseado debe ser un número. -DeveloperList Desarrolladores: %s -DisbandmentDueToZeroPower %s se ha disuelto al caer su poder a cero. -DoesntExist %s no existe. -Done Hecho. -DoubleSet Doble establecido. -DuelChallengeCancelled Desafío de duelo cancelado. -DuelEndedInTie El duelo entre %s y %s acabó en empate. -DynmapIntegrationSuccessful Integración con Dynmap exitosa. -ERROR ERROR: -ErrorAddingAreaMarker Error añadiendo marcador de área %s -ErrorChunkRemoval Un error ha ocurrido durante la eliminación de tierras reclamadas. -ErrorClaimedChunkRemoval Un error ha ocurrido durante la eliminación de tierras reclamadas. -ErrorCouldNotFindGatesFaction Error: No se pudo encontrar la facción del portón '%s'. -ErrorCouldNotLoadFactionGate Error: No se pudo cargar el portón de facción. \n -ErrorCreatingMarkerSet Error creando grupo de marcadores. -ErrorIntegratingWithDynmap Error en la integración con Dynmap. -ErrorPlayerPowerRecordForUUIDNotFound ERROR: No se encontraron Registros de Poder de Jugador para el UUID. No se pudo obtener el poder total. -ErrorSettingAreaMarkerColor Error al establecer el color del marcador de área en '%s'. -FactionAlreadyAlly Esta facción ya es tu aliada. -FactionAlreadyExists Perdona. Esta facción ya existe. -FactionAndPlayerSingleQuotesRequirement Facción y jugador deben ser designados entre comillas simples. -FactionAndVassalSingleQuotesRequirement La facción y el vasallo a eliminar deben estar designados entre comillas simples. -FactionCreated Facción creada. -FactionCurrentlyEnemyMustMakePeace Esta facción es actualmente tu enemiga. Haz las paces antes de intentar aliarte con ella. -FactionDataLoadedSuccessfuly Datos de facción cargados correctamente. -FactionDoesNotExist Perdona. Esta facción no existe. -FactionDoesNotHaveLaws Esta facción no tiene leyes. -FactionGates Portones de Facción. -FactionHomeLoadError Un error ha ocurrido cargando la posición del hogar de facción. -FactionHomeNotSetYet El hogar de facción no se ha establecido aún. -FactionHomeSet Hogar de facción establecido. -FactionInfo Información de Facción de %s -FactionIsNotVassal Esta facción no es tu vasallo. -FactionMustBeDesignatedInsideSingleQuotes Las facciones deben designarse entre comillas simples. -FactionNameChanged Nombre de facción cambiado. -FactionNameNotRecognized No se reconoce el nombre de facción. -FactionNameTooLong Ese nombre es demasiado largo. -FactionNotEnemy Esta facción no es tu enemiga. -FactionNotFound No se encontró la facción. -FactionsSuccessfullyLoaded Facciones cargadas exitosamente. -FactionsTitle == Facciones == -FactionSuccessfullyDisbanded Facción disuelta exitosamente. -FactionSuccessfullyLoaded Facción cargada exitosamente. -FileLoadError Un error ha ocurrido cargando el archivo. -FollowingPlayersHaveAccess Los siguientes jugadores tienen acceso a este bloque: -GateCreated Portón creado exitosamente. -HasAttemptedToMakePeaceWith %s ha intentado hacer las paces con %s. -HasBeenKickedFrom %s ha sido expulsado de %s -HasDeclaredIndependence %s ha declarado su independencia de %s. -HasDeclaredWarAgainst %s ha declarado conflicto contra %s. -HasJoined %s se ha unido a %s -HelpAddLaw /mf añadirley - Añade una ley a tu facción -HelpAlly /mf aliar - Intenta aliarte con una facción. -HelpAutoclaim /mf autoreclamar - Activa reclamación de tierra automática, reclamando la tierra por la que pases. -HelpBreakAlliance /mf romperalianza - Rompe alianza con una facción. -HelpBypass /mf bypass - Ignora protecciones. -HelpChat /mf chat - Activa el chat de facción. -HelpCheckAccess /mf veracceso - Revisa quién tiene acceso a un bloque asegurado. -HelpCheckClaim /mf verreclamacion - Revisa si una tierra está reclamada. -HelpClaim /mf reclamar - Reclama tierra para tu facción. -HelpConfigSet /mf config establecer (opción) (valor) - Establece un valor de configuración -HelpConfigShow /mf config ver - Muestra valores de configuración. -HelpCreate /mf crear (nombre) - Crea una nueva facción. -HelpDeclareIndependence /mf declararindependencia - Declara independencia de tu señorío. -HelpDeclareWar /mf declararconflicto - Declara conflicto contra otra facción. -HelpDemote /mf degradar - Degrada un oficial a miembro. -HelpDesc /mf desc (desc) - Establece la descripción de tu facción. -HelpDisband /mf disolver - Disuelve tu facción (tienes que ser propietario) -HelpDuelAccept /mf duelo aceptar (jugador) -HelpDuelCancel /mf duelo cancelar -HelpDuelChallenge /mf duelo desafiar (jugador) (límite de tiempo en segundos) -HelpEditLaw /mf editarley - Edita una ley que ya existe en tu facción. -HelpFlagsSet /mf banderas colocar (opción) (valor): establece una bandera de facción. -HelpFlagsShow /mf banderas show - Muestra banderas de facción. -HelpForce /mf forzar - Fuerza al plugin a realizar ciertas acciones. -HelpForceBonusPower /mf forzar extrapoder 'facción' 'número' -HelpForceClaim /mf force reclamo 'nombre de facción' -HelpForceCreate /mf forzar crear 'facción' -HelpForceDemote /mf forzar degradar (jugador) -HelpForceFlag /mf force flag 'facción' 'opción' 'valor' -HelpForceJoin /mf forzar unirse 'jugador' 'facción2' -HelpForceKick /mf forzar expulsar (jugador) -HelpForceLoad /mf forzar cargar -HelpForcePeace /mf forzar paz 'facción1' 'facción2' -HelpForcePower /mf forzar poder 'jugador' 'número' -HelpForceRemoveVassal /mf force removevassal 'facción' 'vasallo' -HelpForceRename /mf forzar renombrar 'facción' 'nuevo nombre' -HelpForceRenounce /mf forzar abdicar (facción) -HelpForceSave /mf forzar guardar -HelpForceTransfer /mf forzar transferir 'facción' 'jugador' -HelpForceUnlock /mf forzar desbloqueo -HelpGateCancel /mf portón cancelar -HelpGateCreate /mf portón crear (nombre) -HelpGateList /mf portón lista -HelpGateName /mf portón nombre (nombre) -HelpGateRemove /mf portón quitar -HelpGrantAccess /mf daracceso - Otorga a alguien acceso a un bloque asegurado. -HelpGrantIndependence /mf otorgarindependencia - Otorga a una facción avasallada su independencia. -HelpHelp /mf ayuda # - Muestra lista de comandos útiles. -HelpHome /mf hogar - Telepórtate a tu hogar de facción. -HelpInfo /mf info (facción) - Revisa la información de tu facción o cualquier otra. -HelpInvite /mf invitar (jugador) - Invita a un jugador a tu facción. -HelpInvoke /mf invocar (aliado) (enemigo) - Llama a una facción aliada a tu conflicto. -HelpJoin /mf unirse (facción) - Únete a una facción a la que te han invitado. -HelpKick /mf expulsar - Expulsa a un jugador de tu facción. -HelpLaws /mf leyes - Revisa las leyes de tu facción. -HelpLeave /mf abandonar - Abandona tu facción. -HelpList /mf lista - Lista de todas las facciones del servidor. -HelpLock /mf asegurar - Asegura un cofre o puerta. -HelpMakePeace /mf hacerpaces - Intenta hacer las paces con una facción. -HelpMap /mf map: muestra un mapa de las reclamaciones cercanas a sus alrededores. -HelpMembers /mf miembros - Lista de miembros de tu facción o cualquier otra. -HelpPower /mf poder - Revisa tu poder -HelpPrefix /mf prefijo (prefijo): establece el prefijo de tu facción -HelpPromote /mf ascender - Asciende a un jugador a oficial en tu facción. -HelpRemoveLaw /mf quitarley - Elimina una ley de tu facción. -HelpRename /mf renombrar - Renombra tu facción. -HelpResetPowerLevels /mf reiniciarpoder - Reinicia los registros de poder de jugador y el poder total de una facción. -HelpRevokeAccess /mf quitaracceso - Revoca el acceso de alguien a un bloque asegurado. -HelpSetHome /mf establecerhogar - Establece tu hogar de facción. -HelpSwearFealty /mf jurarlealtad - Jura lealtad a una facción como vasallo. -HelpTransfer /mf transferir - Transfiere propiedad de una facción a otro jugador.\n -HelpUnclaim /mf renunciar - Renuncia a tierras de tu facción. -HelpUnclaimall /mf renunciartodo - Renuncia a todas las tierras de tu facción. -HelpUnlock /mf desasegurar - Quita el seguro de un cofre o puerta. -HelpVassalize /mf avasallar - Ofrece avasallar a una facción como su señorío. -HelpVersion /mf version - Revisa la versión del plugin. -HelpWho /mf quien - Revisa la facción de un jugador. -HomeClaimedByAnotherFaction El hogar fue reclamado por otra facción y se perdió. -HomeIsInUnclaimedChunk El hogar es una tierra sin reclamar y no está disponible. -HourlySaveAlert Medieval Factions está guardando. Esto pasará cada hora. -IntegerSet Variable Entera (Integer) establecida. -InvitationExpired Tu invitación para %s ha caducado. -InvitationSent Invitación enviada. -KeysLoaded Claves cargadas: %d -LandAlreadyClaimedBy Esta tierra ya ha sido reclamada por -LandAlreadyClaimedByYourFaction Esta tierra ya ha sido reclamada por tu facción. -LandClaimedBy Esta tierra está reclamada por %s -LandClaimedUsingAdminBypass Tierra renunciada por medios de administrador. -LandIsNotClaimed Esta tierra no está reclamada. -LandIsUnclaimed Esta tierra está sin reclamar. -LandNotCurrentlyClaimed Esta tierra no está actualmente reclamada. -LandUnclaimed Tierra renunciada. -LawAdded Ley añadida. -LawEdited Ley editada. -LawRemoved Ley eliminada. -LawsTitle == Leyes de %s == -LeverSuccessfullyLinked Creando Portón 4/4: Palanca vinculada con éxto. -Liege Señorío: %s -ListLegend P: Poder, M: Miembros, L: Tierras -LoadingClaimedChunks Cargando tierras reclamdas... -LoadingLockedBLocks Cargando bloques asegurados... -LoadingPlayerPowerRecords Cargando registros de poder de jugador... -Locked Asegurado. -LockedBlockSuccessfullyLoaded Bloque asegurado cargado con éxito. -LockedBy Asegurado por %s -LockingCancelled Aseguramiento cancelado. -LockRemovalError Un error ha ocurrido durante la eliminación del seguro. -MaterialsMismatch1 Error colocando el punto 1: Los materiales no coinciden. -MaterialsMismatch2 Error colocando el punto 2: Los materiales no coinciden. -MedievalFactionsStringRight Medieval-Factions-%s -MedievalFactionsTitle == Medival Factions %s == -MembersOf Miembros de %s -MissingFactionGatesJSONCollection No se pudieron cargar los portones porque la colección 'factionGates' no existía en el archivo JSON de las facciones. ¿Estás actualizando de una versión anterior? Usando configuración por defecto. -MovementDetectedTeleportCancelled Movimiento detectado. Teleportación cancelada. -MustBeAtWarOrFactionMustBeInactive Tienes que estar en conflicto con la facción objetivo, o esta tiene que estar inactiva. -MustBeInFaction Perdona, tienes que estar en una facción para usar este comando. -MustBeOwner Perdona, tienes que ser el propietario de una facción para usar este comando. -MustOwnFactionOrBeOfficer Tienes que ser oficial o propietario de una facción para usar este comando. -MustTransferOwnership Perdona. Tienes que transferir propiedad o expulsar a todos de tu facción para abandonarla. -Name Nombre: %s -NameAlreadyTaken Este nombre ya está en uso. -NeutralityDisabled La neutralidad está actualmente deshabilitada. -NoBlockDetectedToCheckForGate No se ha detecado bloque para buscar portón. -NoFactionsDesignatedSingleQuotesRequired No se han designado facciones. Deben estar designadas entre comillas simples. -NoLongerBypassingProtections Ya no estás ignorando las protecciones otorgadas por Medieval Factions. -NoLongerInFactionChat Ya no estás hablando en Chat de Facción. -NotAMemberOfAnyFaction No eres miembro de ninguna facción. -NotAnAlly %s no es tu aliado. -NotAnAllyOrVassal %s no es un aliado o vasallo tuyo. -NotAtWarWith No estás en conflicto con %s -NotAVassalOfAFaction No eres vasallo de ninguna facción. +AcceptedChallengeDuelHasBegun Has aceptado el desafío de %s, comienza el duelo. +AlertAccessGrantedTo Acceso otorgado a %s +AlertAccessRevokedFor Acceso quitado a %s +AlertAllianceHasBeenBroken %s ha roto su alianza a tu facción. +AlertAlreadyAtWarWith Tu facción ya está en conflicto con %s. +AlertAlreadyCreatingGate Ya estás creando un portón. +AlertAlreadyDueling Ya estás en un duelo. +AlertAlreadyDuelingPlayer Ya estás en duelo con %s. +AlertAlreadyDuelingSomeone Ya estás en duelo con alguien. +AlertAlreadyGrantingAccess Ya estás otorgando acceso a alguien. Escribe '/mf daracceso cancelar' para cancelar esto. +AlertAlreadyInFaction Perdona, ya estás en una facción. +AlertAlreadyRequestedAlliance Ya has pedido alianza con esta facción. +AlertAlreadyRequestedPeace Ya has pedido paz con esta facción. +AlertAttemptedAlliance %s ha intentado aliarse con %s. +AlertAttemptedVassalization %s ha intentado avasallar tu facción. Si eres el propietario, escribe '/mf jurarlealtad %s' para aceptar. +AlertBeenInvited Has sido invitado a %s. Escribe '/mf unirse %s' para unirte. +AlertCalledToWar1 %s ha llamado a tu facción a su conflicto contra %s. +AlertCalledToWar2 %s ha llamado a %s a su conflicto contra tu facción. +AlertCalledToWar3 Tu facción ha llamado a %s a tu conflicto contra %s. +AlertChallengedToDuel %s ha desafíado a %s a un duelo. +AlertChallengedToDuelPlusHowTo %s te ha desafíado a un duelo. Escribe '/mf duelo aceptar' para comenzar. +AlertChallengeIssued Has desafíado a %s a un duelo. +AlertChallengeWasAccepted %s ha aceptado tu desafío, comienza el duelo. +AlertChangedGateName Cambiado el nombre del portón a '%s'. +AlertCurrentPowerLevel Tu poder actual es %d/%d. +AlertDecreasingThePowerOfInactivePlayers Medieval Factions está disminuyendo el poder de cada jugador en %d si no se han conectado por más de %d minutos. Esto pasará cada %d minutos. +AlertDemotion Has sido degradado al rango de miembro en tu facción. +AlertDisbandmentDueToZeroPower Tu facción se ha disuelto al caer su poder total a cero. +AlertFactionAttemptedToVassalize Tu facción ha intentado avasallar a %s. +AlertFactionHasBeenVassalized Tu facción ha sido avasallada y tiene un nuevo señorío: %s. +AlertFactionHasNewVassal Tu facción tiene un nuevo vasallo: %s. +AlertFactionHomeRemoved Tu hogar de facción ha sido eliminado. +AlertFactionIsWeakened Tu facción tiene menos de la mitad de su poder máximo. Ya no recibirá poder adicional de los vasallos y tus vasallos ahora son vulnerables. +AlertForcedDemotion Has sido forzadamente degradado de tu rango de oficial en tu facción. +AlertForcedKick Has sido expulsado de tu facción. +AlertForcedLoad Medieval Factions ha sido forzado a cargar. +AlertForcedSave Medieval Factions ha sido forzado a guardar. +AlertForcedToJoinFaction Has sido forzado a unirte a una facción. +AlertGate Este es el portón de '%s'. +AlertGrantedIndependence %s ha otorgado independencia a tu facción. +AlertIncreasingThePowerOfEveryPlayer Medieval Factions está aumentando el poder de cada jugador en %d. Esto pasará cada %d minutos. +AlertJoinedFaction Te has unido a la facción. +AlertKicked Has sido expulsado de tu facción por %s. +AlertLandClaimed Tierra reclamada. Tamaño del Dominio: %d/%d +AlertLandConqueredFromAnotherFaction Tierra conquistada de %s. Tamaño del Dominio: %d/%d +AlertLandConqueredFromYourFaction %s ha conquistado tierra de tu facción. +AlertLeftFaction Has abandonado tu facción. +AlertLeftFactionAndItGotDeleted Has abandonado tu facción. Ha sido disuelta ya que no quedaban miembros. +AlertMoreClaimedChunksThanPower Tu facción tiene más tierras que poder. Tus tierras pueden ser conquistadas. +AlertMustBeAtWarToConquer Ambas facciones tienen que estar en conflicto para poder conquistar sus tierras. +AlertMustBeInFactionToUseCommand Tienes que estar en una facción para usar este comando. +AlertMustBeMemberToCreateGate Tienes que ser miembro de esta facción para crear un portón. +AlertMustBeOfficerOrOwnerToClaimLand Tienes que ser oficial o propietario de una facción para reclamar tierra. +AlertMustBeOwnerOrOfficerToCreateGate Tienes que ser oficial o propietario de una facción para crear un portón. +AlertMustBeOwnerOrOfficerToUseCommand Tienes que ser oficial o propietario de una facción para usar este comando. +AlertMustBeOwnerToInvokeAlliance Tienes que ser el propietario de tu facción para llamar a una alianza. +AlertMustBeOwnerToUseCommand Tienes que ser el propietario de una facción para usar este comando. +AlertMustKickAllPlayers Tienes que expulsar a todos los miembros antes de disolver tu facción. +AlertNoGatesDefined Tu facción no tiene portones. +AlertNoLaws Tu facción no tiene leyes. +AlertNoLongerVassalFaction %s ya no es una facción avasallada. +AlertNonOwnership Esto no te pertenece. +AlertNoPendingChallenges No tienes desafíos pendientes para cancelar. +AlertNotAllied Tu facción no está aliada con %s. +AlertNotBeenChallenged No has sido desafíado a un duelo por nadie. +AlertNotBeenChallengedByPlayer No has sido desafíado a un duelo por '%s'- +AlertNotInFaction No estás en una facción. +AlertNotInvitedToFaction No has sido invitado a esta facción. +AlertNotOfferedVassalizationBy No se te ha ofrecido vasallaje por esta facción. +AlertNowAlliedWith Tu facción ahora está aliada con %s. +AlertNowAtPeaceWith %s ahora está en paz con %s. +AlertPlayerAlreadyOwner Ese jugador ya es miembro de esa facción. +AlertPlayerNotInFaction Este jugador no está en esta facción. +AlertPowerLevelDecreased Tu poder ha disminuido. +AlertPowerLevelIncreasedBy Te sientes más fuerte. Tu poder ha aumentado en %d. +AlertReachedDemesne Has alcanzado el límite de tu dominio. Invita a más jugadores a tu facción para aumentar el límite. +AlertUnlocked Desbloqueado. +AlertUnlockingCancelled Desbloqueo cancelado. +AllianceBrokenWith Alianza rota con %s. +AlliedWith Aliado con: %s +AllLandUnclaimed Todas las tierras han sido renunciadas. +AllLandUnclaimedFrom Todas las tierras de %s han sido renunciadas. +AlreadyEnteredCheckAccess Ya has usado este comando. Escribe '/mf veracceso cancelar' para cancelar. +AlreadyEnteredRevokeAccess Ya has usado este comando. Escribe '/mf quitaracceso cancelar' para cancelar. +AlreadyInFaction Perdona, ya estás en una facción. Abandónala si quieres crear una distinta. +ArgumentMustBeNumber El argumento debe ser un número. +ArgumentsSingleQuotesRequirement Los argumentos deben designarse entre comillas simples. +AssignedToRandomFaction Te han asignado a una facción aleatoria. +AttemptedAlliance Alianza intentada con %s +AttemptedPeace Pan intentada con %s +AtWarWith En Conflicto con: %s +AutoclaimToggled Reclamación automática de tierra habilitada. +BlockAlreadyLocked Este bloque ya está asegurado. +BlockIsNotLocked Este bloque no está asegurado. +BlockIsPartOfGateMustRemoveGate Este bloque es parte del portón '%s'. Debes eliminar este portón primero. +BonusPower Poder adicional de los administradores: %d +BooleanSet Boolean establecido. +Cancelled Cancelado. +CancelledGatePlacement1 Error estableciendo punto 1. Colocación de portón cancelada. +CancelledGatePlacement2 Error estableciendo punto 2. Colocación de portón cancelada. +CancelledGatePlacementErrorLinking Error estableciendo una palanca. Colocación de portón cancelada. +CannotAllyWithSelf No puedes aliarte con tu propia facción. +CannotAttackFactionMember No puedes atacar a otro jugador si sois parte de la misma facción. +CannotAttackNonWarringPlayer No puedes atacar a otro jugador si vuestras facciones no están en conflicto. +CannotBreakAllianceWithSelf No puedes romper alianza con tu propia facción. +CannotBringNeutralFactionIntoWar No puedes traer facciones neutrales a la guerra. +CannotCancelActiveDuel No puedes cancelar un duelo en progreso. +CannotDeclareWarIfLiegeNotWeakened No puedes declarar conflicto contra esta facción ya que son vasallos, a no ser que su señorío se debilite. +CannotDeclareWarIfNeutralFaction Las facciones neutrales no pueden declarar la guerra. +CannotDeclareWarOnAlly No puedes declarar conflicto contra tus aliados. +CannotDeclareWarOnLiege No puedes declarar guerra contra tu señorío. Intenta '/mf declararindependencia' en su lugar. +CannotDeclareWarOnNeutralFaction No puedes declarar la guerra a una facción neutral. +CannotDeclareWarOnVassal No puedes declarar conflicto contra tus vasallos. +CannotDeclareWarOnYourself No puedes declarar conflicto contra tí mismo. +CannotDemoteSelf No puedes degradarte a ti mismo. +CannotDuelSelf No puedes tener un duelo contra tí mismo. +CannotFindDynmap No se puede encontrar DynMap. +CannotForciblyKickOwner No se puede expulsar a un propietario de su facción forzadamente. Intenta disolver la facción. +CannotGrantAccessToSelf No puedes concederte acceso a ti mismo. +CannotKickOwner No puedes expulsar al propietario. +CannotKickSelf No puedes expulsarte a tí mismo. +CannotMakePeaceWithSelf No puedes hacer paces con tu propia facción. +CannotPlaceChestsNextToUnownedLockedChests No puedes colocar cofres al lado de cofres asegurados que no son tuyos. +CannotPlaceHoppersNextToUnownedLockedChests No puedes colocar hoppers al lado, sobre, o bajo cofres asegurados que no son tuyos. +CannotPromoteSelf No puedes promocionarte a ti mismo. +CannotRevokeAccessFromSelf No puede revocar el acceso a usted mismo. +CannotSetFactionHomeInWilderness No puedes establecer tu hogar de facción en tierra que tu facción no ha reclamado. +CannotSetVersion No se puede establecer la versión. +CannotTransferToSelf No puedes transferirte la propiedad de tu facción a tí mismo. +CannotVassalizeLiege No puedes avasallar a tu señorío. +CannotVassalizeSelf No puedes avasallar a tu propia facción. +CannotVassalizeVassal No puedes avasallar una facción que ya tiene un señorío. +CanOnlyCreateGatesInClaimedTerritory Solo puedes crear portones en territorio reclamado. +CanOnlyLockBlocksInClaimedTerritory Solo puedes asegurar bloques en territorio reclamado por tu facción. +CanOnlyLockInFactionTerritory Solo puedes asegurar cosas en territorio de tu facción. +CanOnlyLockSpecificBlocks Solo puedes asegurar cofres, puertas, barriles, trampillas, hornos, yunques o puertas de vallas. +ClaimedChunksLoaded Tierras reclamadas cargadas. +ClaimedChunksSuccessfullyLoaded Tierras reclamadas cargadas con éxito. +ClickOnTriggerLever Haz click en la palanca vinculada... +ClickToPlaceSecondCorner Haz click para colocar la segunda esquina... +CmdAddLaw añadirley +CmdAlly aliar +CmdAutoClaim autoreclamar +CmdBreakAlliance romperalianza +CmdBypass bypass +CmdChat chat +CmdCheckAccess veracceso +CmdCheckClaim verreclamacion +CmdClaim reclamar +CmdConfig config +CmdConfigSet establecer +CmdConfigShow ver +CmdCreate crear +CmdDeclareIndependence declararindependencia +CmdDeclareWar declararconflicto +CmdDemote degradar +CmdDesc desc +CmdDisband disolver +CmdDuel duelo +CmdDuelAccept aceptar +CmdDuelCancel cancelar +CmdDuelChallenge desafiar +CmdEditLaw editarley +CmdFlags banderas +CmdFlagsSet colocar +CmdFlagsShow show +CmdForce forzar +CmdForceBonusPower extrapoder +CmdForceClaim afirmar +CmdForceCreate crear +CmdForceDemote degradar +CmdForceFlag flag +CmdForceJoin unirse +CmdForceKick expulsar +CmdForceLoad cargar +CmdForcePeace paz +CmdForcePower poder +CmdForceRename renombrar +CmdForceRenounce abdicar +CmdForceSave guardar +CmdForceTransfer transferir +CmdForceUnlock desbloquear +CmdGate porton +CmdGateCancel cancelar +CmdGateCreate crear +CmdGateList lista +CmdGateName nombre +CmdGateRemove quitar +CmdGrantAccess daracceso +CmdGrantIndependence otorgarindependencia +CmdHelp ayuda +CmdHome hogar +CmdInfo info +CmdInvite invitar +CmdInvoke invocar +CmdJoin unirse +CmdKick expulsar +CmdLaws leyes +CmdLeave abandonar +CmdList lista +CmdLock asegurar +CmdMakePeace hacerpaces +CmdMembers miembros +CmdPower poder +CmdPrefix prefijo +CmdPromote ascender +CmdRemoveLaw quitarley +CmdRename renombrar +CmdResetPowerLevels reiniciarpoder +CmdRevokeAccess quitaracceso +CmdSetHome establecerhogar +CmdSwearFealty jurarlealtad +CmdTransfer transferir +CmdUnclaim renunciar +CmdUnclaimall renunciartodo +CmdUnlock desasegurar +CmdVassalize avasallar +CmdVersion version +CmdWho quien +CommandCancelled Comando cancelado. +CommandNotRecognized Medieval Factions no reconoce este comando. +CommandsPage1 == Medieval Factions, Página de Comandos 1/%d == +CommandsPage2 == Medieval Factions, Página de Comandos 2/%d == +CommandsPage3 == Medieval Factions, Página de Comandos 3/%d == +CommandsPage4 == Medieval Factions, Página de Comandos 4/%d == +CommandsPage5 == Medieval Factions, Página de Comandos 5/%d == +CommandsPage6 == Medieval Factions, Página de Comandos 6/%d == +CommandsPage7 == Comandos de Facciones Medievales Página 7 /% d == +ConfigListPageOne ===== Página de lista de configuración 1/2 ===== +ConfigListPageTwo ===== Página de lista de configuración 2/2 ===== +CreatingGateCancelled Creación de portón cancelada. +CreatingGateClickWithHoe Creando portón. Haz click en un bloque con una Azada de Oro para seleccionar la primera esquina. +CuboidDisallowed1 Error estableciendo el punto 1: No puedes colocar un cuboide. +CuboidDisallowed2 Error estableciendo el punto 2: No puedes colocar un cuboide. +CurrentLanguageID El ID de Lenguaje actual es: %s +CurrentlyNoFactions Actualmente no hay facciones. +CurrentPowerLevel El poder actual de %s es %d/%d. +Defeated %s ha derrotado a %s en un duelo. +DemesneSize Tamaño del Dominio: %d/%d +Description Descripción: %s +DescriptionSet Descripción establecida. +DesignatedFactionNotFound Una de las facciones escritas no fue encontrada. +DesiredPowerMustBeANumber El poder deseado debe ser un número. +DeveloperList Desarrolladores: %s +DisbandmentDueToZeroPower %s se ha disuelto al caer su poder a cero. +DoesntExist %s no existe. +Done Hecho. +DoubleSet Doble establecido. +DuelChallengeCancelled Desafío de duelo cancelado. +DuelEndedInTie El duelo entre %s y %s acabó en empate. +DynmapIntegrationSuccessful Integración con Dynmap exitosa. +ERROR ERROR: +ErrorAddingAreaMarker Error añadiendo marcador de área %s +ErrorChunkRemoval Un error ha ocurrido durante la eliminación de tierras reclamadas. +ErrorClaimedChunkRemoval Un error ha ocurrido durante la eliminación de tierras reclamadas. +ErrorCouldNotFindGatesFaction Error: No se pudo encontrar la facción del portón '%s'. +ErrorCouldNotLoadFactionGate Error: No se pudo cargar el portón de facción. \n +ErrorCreatingMarkerSet Error creando grupo de marcadores. +ErrorIntegratingWithDynmap Error en la integración con Dynmap. +ErrorPlayerPowerRecordForUUIDNotFound ERROR: No se encontraron Registros de Poder de Jugador para el UUID. No se pudo obtener el poder total. +ErrorSettingAreaMarkerColor Error al establecer el color del marcador de área en '%s'. +FactionAlreadyAlly Esta facción ya es tu aliada. +FactionAlreadyExists Perdona. Esta facción ya existe. +FactionAndPlayerSingleQuotesRequirement Facción y jugador deben ser designados entre comillas simples. +FactionAndVassalSingleQuotesRequirement La facción y el vasallo a eliminar deben estar designados entre comillas simples. +FactionCreated Facción creada. +FactionCurrentlyEnemyMustMakePeace Esta facción es actualmente tu enemiga. Haz las paces antes de intentar aliarte con ella. +FactionDataLoadedSuccessfuly Datos de facción cargados correctamente. +FactionDoesNotExist Perdona. Esta facción no existe. +FactionDoesNotHaveLaws Esta facción no tiene leyes. +FactionGates Portones de Facción. +FactionHomeLoadError Un error ha ocurrido cargando la posición del hogar de facción. +FactionHomeNotSetYet El hogar de facción no se ha establecido aún. +FactionHomeSet Hogar de facción establecido. +FactionInfo Información de Facción de %s +FactionIsNotVassal Esta facción no es tu vasallo. +FactionMustBeDesignatedInsideSingleQuotes Las facciones deben designarse entre comillas simples. +FactionNameChanged Nombre de facción cambiado. +FactionNameNotRecognized No se reconoce el nombre de facción. +FactionNameTooLong Ese nombre es demasiado largo. +FactionNotEnemy Esta facción no es tu enemiga. +FactionNotFound No se encontró la facción. +FactionsSuccessfullyLoaded Facciones cargadas exitosamente. +FactionsTitle == Facciones == +FactionSuccessfullyDisbanded Facción disuelta exitosamente. +FactionSuccessfullyLoaded Facción cargada exitosamente. +FileLoadError Un error ha ocurrido cargando el archivo. +FollowingPlayersHaveAccess Los siguientes jugadores tienen acceso a este bloque: +GateCreated Portón creado exitosamente. +HasAttemptedToMakePeaceWith %s ha intentado hacer las paces con %s. +HasBeenKickedFrom %s ha sido expulsado de %s +HasDeclaredIndependence %s ha declarado su independencia de %s. +HasDeclaredWarAgainst %s ha declarado conflicto contra %s. +HasJoined %s se ha unido a %s +HelpAddLaw /mf añadirley - Añade una ley a tu facción +HelpAlly /mf aliar - Intenta aliarte con una facción. +HelpAutoclaim /mf autoreclamar - Activa reclamación de tierra automática, reclamando la tierra por la que pases. +HelpBreakAlliance /mf romperalianza - Rompe alianza con una facción. +HelpBypass /mf bypass - Ignora protecciones. +HelpChat /mf chat - Activa el chat de facción. +HelpCheckAccess /mf veracceso - Revisa quién tiene acceso a un bloque asegurado. +HelpCheckClaim /mf verreclamacion - Revisa si una tierra está reclamada. +HelpClaim /mf reclamar - Reclama tierra para tu facción. +HelpConfigSet /mf config establecer (opción) (valor) - Establece un valor de configuración +HelpConfigShow /mf config ver - Muestra valores de configuración. +HelpCreate /mf crear (nombre) - Crea una nueva facción. +HelpDeclareIndependence /mf declararindependencia - Declara independencia de tu señorío. +HelpDeclareWar /mf declararconflicto - Declara conflicto contra otra facción. +HelpDemote /mf degradar - Degrada un oficial a miembro. +HelpDesc /mf desc (desc) - Establece la descripción de tu facción. +HelpDisband /mf disolver - Disuelve tu facción (tienes que ser propietario) +HelpDuelAccept /mf duelo aceptar (jugador) +HelpDuelCancel /mf duelo cancelar +HelpDuelChallenge /mf duelo desafiar (jugador) (límite de tiempo en segundos) +HelpEditLaw /mf editarley - Edita una ley que ya existe en tu facción. +HelpFlagsSet /mf banderas colocar (opción) (valor): establece una bandera de facción. +HelpFlagsShow /mf banderas show - Muestra banderas de facción. +HelpForce /mf forzar - Fuerza al plugin a realizar ciertas acciones. +HelpForceBonusPower /mf forzar extrapoder 'facción' 'número' +HelpForceClaim /mf force reclamo 'nombre de facción' +HelpForceCreate /mf forzar crear 'facción' +HelpForceDemote /mf forzar degradar (jugador) +HelpForceFlag /mf force flag 'facción' 'opción' 'valor' +HelpForceJoin /mf forzar unirse 'jugador' 'facción2' +HelpForceKick /mf forzar expulsar (jugador) +HelpForceLoad /mf forzar cargar +HelpForcePeace /mf forzar paz 'facción1' 'facción2' +HelpForcePower /mf forzar poder 'jugador' 'número' +HelpForceRemoveVassal /mf force removevassal 'facción' 'vasallo' +HelpForceRename /mf forzar renombrar 'facción' 'nuevo nombre' +HelpForceRenounce /mf forzar abdicar (facción) +HelpForceSave /mf forzar guardar +HelpForceTransfer /mf forzar transferir 'facción' 'jugador' +HelpForceUnlock /mf forzar desbloqueo +HelpGateCancel /mf portón cancelar +HelpGateCreate /mf portón crear (nombre) +HelpGateList /mf portón lista +HelpGateName /mf portón nombre (nombre) +HelpGateRemove /mf portón quitar +HelpGrantAccess /mf daracceso - Otorga a alguien acceso a un bloque asegurado. +HelpGrantIndependence /mf otorgarindependencia - Otorga a una facción avasallada su independencia. +HelpHelp /mf ayuda # - Muestra lista de comandos útiles. +HelpHome /mf hogar - Telepórtate a tu hogar de facción. +HelpInfo /mf info (facción) - Revisa la información de tu facción o cualquier otra. +HelpInvite /mf invitar (jugador) - Invita a un jugador a tu facción. +HelpInvoke /mf invocar (aliado) (enemigo) - Llama a una facción aliada a tu conflicto. +HelpJoin /mf unirse (facción) - Únete a una facción a la que te han invitado. +HelpKick /mf expulsar - Expulsa a un jugador de tu facción. +HelpLaws /mf leyes - Revisa las leyes de tu facción. +HelpLeave /mf abandonar - Abandona tu facción. +HelpList /mf lista - Lista de todas las facciones del servidor. +HelpLock /mf asegurar - Asegura un cofre o puerta. +HelpMakePeace /mf hacerpaces - Intenta hacer las paces con una facción. +HelpMap /mf map: muestra un mapa de las reclamaciones cercanas a sus alrededores. +HelpMembers /mf miembros - Lista de miembros de tu facción o cualquier otra. +HelpPower /mf poder - Revisa tu poder +HelpPrefix /mf prefijo (prefijo): establece el prefijo de tu facción +HelpPromote /mf ascender - Asciende a un jugador a oficial en tu facción. +HelpRemoveLaw /mf quitarley - Elimina una ley de tu facción. +HelpRename /mf renombrar - Renombra tu facción. +HelpResetPowerLevels /mf reiniciarpoder - Reinicia los registros de poder de jugador y el poder total de una facción. +HelpRevokeAccess /mf quitaracceso - Revoca el acceso de alguien a un bloque asegurado. +HelpSetHome /mf establecerhogar - Establece tu hogar de facción. +HelpSwearFealty /mf jurarlealtad - Jura lealtad a una facción como vasallo. +HelpTransfer /mf transferir - Transfiere propiedad de una facción a otro jugador.\n +HelpUnclaim /mf renunciar - Renuncia a tierras de tu facción. +HelpUnclaimall /mf renunciartodo - Renuncia a todas las tierras de tu facción. +HelpUnlock /mf desasegurar - Quita el seguro de un cofre o puerta. +HelpVassalize /mf avasallar - Ofrece avasallar a una facción como su señorío. +HelpVersion /mf version - Revisa la versión del plugin. +HelpWho /mf quien - Revisa la facción de un jugador. +HomeClaimedByAnotherFaction El hogar fue reclamado por otra facción y se perdió. +HomeIsInUnclaimedChunk El hogar es una tierra sin reclamar y no está disponible. +HourlySaveAlert Medieval Factions está guardando. Esto pasará cada hora. +IntegerSet Variable Entera (Integer) establecida. +InvitationExpired Tu invitación para %s ha caducado. +InvitationSent Invitación enviada. +KeysLoaded Claves cargadas: %d +LandAlreadyClaimedBy Esta tierra ya ha sido reclamada por +LandAlreadyClaimedByYourFaction Esta tierra ya ha sido reclamada por tu facción. +LandClaimedBy Esta tierra está reclamada por %s +LandClaimedUsingAdminBypass Tierra renunciada por medios de administrador. +LandIsNotClaimed Esta tierra no está reclamada. +LandIsUnclaimed Esta tierra está sin reclamar. +LandNotCurrentlyClaimed Esta tierra no está actualmente reclamada. +LandUnclaimed Tierra renunciada. +LawAdded Ley añadida. +LawEdited Ley editada. +LawRemoved Ley eliminada. +LawsTitle == Leyes de %s == +LeverSuccessfullyLinked Creando Portón 4/4: Palanca vinculada con éxto. +Liege Señorío: %s +ListLegend P: Poder, M: Miembros, L: Tierras +LoadingClaimedChunks Cargando tierras reclamdas... +LoadingLockedBLocks Cargando bloques asegurados... +LoadingPlayerPowerRecords Cargando registros de poder de jugador... +Locked Asegurado. +LockedBlockSuccessfullyLoaded Bloque asegurado cargado con éxito. +LockedBy Asegurado por %s +LockingCancelled Aseguramiento cancelado. +LockRemovalError Un error ha ocurrido durante la eliminación del seguro. +MaterialsMismatch1 Error colocando el punto 1: Los materiales no coinciden. +MaterialsMismatch2 Error colocando el punto 2: Los materiales no coinciden. +MedievalFactionsStringRight Medieval-Factions-%s +MedievalFactionsTitle == Medival Factions %s == +MembersOf Miembros de %s +MissingFactionGatesJSONCollection No se pudieron cargar los portones porque la colección 'factionGates' no existía en el archivo JSON de las facciones. ¿Estás actualizando de una versión anterior? Usando configuración por defecto. +MovementDetectedTeleportCancelled Movimiento detectado. Teleportación cancelada. +MustBeAtWarOrFactionMustBeInactive Tienes que estar en conflicto con la facción objetivo, o esta tiene que estar inactiva. +MustBeInFaction Perdona, tienes que estar en una facción para usar este comando. +MustBeOwner Perdona, tienes que ser el propietario de una facción para usar este comando. +MustOwnFactionOrBeOfficer Tienes que ser oficial o propietario de una facción para usar este comando. +MustTransferOwnership Perdona. Tienes que transferir propiedad o expulsar a todos de tu facción para abandonarla. +Name Nombre: %s +NameAlreadyTaken Este nombre ya está en uso. +NeutralityDisabled La neutralidad está actualmente deshabilitada. +NoBlockDetectedToCheckForGate No se ha detecado bloque para buscar portón. +NoFactionsDesignatedSingleQuotesRequired No se han designado facciones. Deben estar designadas entre comillas simples. +NoLongerBypassingProtections Ya no estás ignorando las protecciones otorgadas por Medieval Factions. +NoLongerInFactionChat Ya no estás hablando en Chat de Facción. +NotAMemberOfAnyFaction No eres miembro de ninguna facción. +NotAnAlly %s no es tu aliado. +NotAnAllyOrVassal %s no es un aliado o vasallo tuyo. +NotAtWarWith No estás en conflicto con %s +NotAVassalOfAFaction No eres vasallo de ninguna facción. NotEnoughArgumentsDesignatedSingleQuotesRequired Insuficientes argumentos designados. Deben designarse entre comillas simples. -NotTheOwnerOfThisBlock No eres propietario de este bloque. -NotTheOwnerOfThisFaction No eres propietario de esta facción. -NoVassalOrLiegeReferences No hay referencias de vasallo o señorío asociadas a esta facción. -NowBypassingProtections Estás ignorando las protecciones otorgadas por Medieval Facctions. -NowSpeakingInFactionChat Estás hablando en Chat de Facción. -OnlyPlayersCanUseCommand Solo los jugadores pueden usar este comando. -OnlyUseLeversInClaimedTerritory Error: solo se pueden usar palancas en tierras reclamadas. -Owner Propietario: %s -OwnershipTransferred La propiedad de %s te ha sido transferida. -OwnerShipTransferredTo Propiedad transferida a %s -PermissionNeeded Perdona. Para usar este comando necesitas el siguiente permiso: '%s' -PlayerAlreadyDueling %s ya está en un duelo contra alguien. -PlayerAlreadyInFaction Perdona. Este jugador ya está en una facción. -PlayerAlreadyOfficer Este jugador ya es un oficial. -PlayerAndDesiredPowerSingleQuotesRequirement El jugador y el poder deseado deben designarse entre comillas simples. -PlayerByNameNotFound Perdona. No se pudo encontrar ningún jugador usando el nombre %s. -PlayerCantBePromotedBecauseOfLimit El jugador no se pudo ascender porque ya alcanzaste tu límite. Límite: %d -PlayerDemoted Jugador degradado. -PlayerIsNotInAFaction Este jugador no está en una facción. -PlayerIsNotInYourFaction Este jugador no está en tu facción. -PlayerIsNotMemberOfFaction Este jugador no es miembro de tu facción. -PlayerIsNotOfficerOfFaction Este jugador no es un oficial en tu facción. -PlayerNotFound Jugador no encontrado. -PlayerPowerRecordsLoaded Registros de Poder de Jugador cargados -PlayerPromoted Jugador ascendido. -PleaseWaitGate El portón es %s, por favor espere. -PluginDisabled Plugin Medieval Factions desactivado. -PluginDisabling Plugin Medieval Factions desactivándose... -PluginEnabled Plugin Medieval Factions activado. -PluginEnabling Plugin Medieval Factions activándose... -PluginLoading Plugin Medieval Factions cargando... -PluginSaving Plugin Medieval Factions guardando... -Point1PlacementSuccessful Creando Portón 1/4: Punto 1 puesto con éxito. -Point2PlacedSuccessfully Creando Portón 2/4: Punto 2 puesto con éxito. -Population Población: %d -PowerHasDecayed Tu poder ha decaído en %d desde la última vez que te desconectaste. Tu poder ahora es %d. -PowerLevel Poder: %s -PowerLevelHasBeenSetTo El poder de este jugador ha sido establecido en %d -PowerLevelHasIncreased Tu poder ha aumentado. -PowerLevelResetting Poder reiniciándose... -PrefixesDisabled Los prefijos están actualmente deshabilitados. -PrefixSet Prefijo establecido. -PrefixTaken Este prefijo ya está en uso. -ProblemLoadingClaimedChunks Error cargando tierras reclamadas. -ProblemLoadingFactions Error cargando facciones. -ProblemLoadingPowerRecords Error cargando Registros de Poder de Jugador. -PromotedToOfficer Has sido ascendido a oficial en tu facción. -RadiusRequirement El radio debe estar entre 0 y %d -RemovedGate Eliminado portón '%s'. -ResettingIndividualPowerRecords Reiniciando registros de poder individual. -RightClickCheckAccess Haz click derecho en un bloque asegurado para ver quién tiene acceso. Escribe '/mf veracceso cancelar' para cancelar. -RightClickForceUnlock ¡Haz clic derecho en un cofre o puerta para desbloquearlo a la fuerza! (Escriba /mf forzar desbloqueo cancelar para cancelar) -RightClickGrantAccess Haz click derecho en un cofre o puerta para dar acceso a %s. Escribe '/mf daracceso cancelar' para cancelar. -RightClickLock Haz click derecho en un cofre o puerta para asegurarlo. Escribe '/mf asegurar cancelar' para cancelar. -RightClickRevokeAccess Haz click derecho en un bloque asegurado para anular el acceso de este jugador. Escribe '/mf quitaracceso cancelar' para cancelar. -RightClickUnlock Haz click derecho en un cofre o puerta para quitar su seguro. Escribe '/mf desasegurar cancelar' para cancelar. -SchedulingHourlyAutoSave Programando guardado automático a cada hora... -SchedulingPowerDecrease Programando disminución de poder... -SchedulingPowerIncrease Programando aumento de poder... -SingleQuotesAlliedWarring La facción aliada y la facción en conflicto deben designarse entre comillas simples. -StringSet String designada. -SubCommands Sub-Comandos: -SuccessFactionMemberRemoval Éxito. Si el jugador estaba en una facción, ya no es miembro. -SuccessForceJoin Éxito. El jugador fue forzado a unirse a una facción. -SuccessfulDisbandment %s ha sido disuelto con éxito. -SuccessOfficerRemoval Éxito. Si el jugador era un oficial de alguna facción, ya no es el caso. -SuccessReferencesRemoved Las referencias se eliminaron con éxito. -SupportedLanguageIDList IDs de Lenguaje soportados: %s -SurroundedChunkProtected La facción objetivo ha reclamado las tierras al Norte, Este, Sur y Oeste de esta. No se puede reclamar. -TargetBlockNotPartOfGate El bloque objetivo no es parte de un portón. -TargetFactionNotOverClaiming La facción objetivo no tiene más tierra que su límite de dominio. -TeleportingAlert Teleportando en 3 segundos... -ThreeBlockRequirement Error colocando el punto 2: El portón debe ser 3 o más bloques de alto. -TriggerBlockNotLever El bloque accionador no era una palanca. Cancelada la colocación de portón. -UsageAddLaw Uso: /mf añadirley (nueva ley) -UsageAlly Uso: /mf aliar (facción) -UsageBreakAlliance Uso: /mf romperalianza (facción) -UsageClaimRadius Uso: /mf reclamar (radio) -UsageConfigSet Uso: /mf config establecer (opción) (value) -UsageConfigShow Uso: /mf config show (1 | 2) -UsageCreate Uso: /mf crear [facción] -UsageDeclareWar Uso: /mf declararconflicto (facción) -UsageDemote Uso: /mf degradar (jugador) -UsageDesc Uso: /mf desc (descripción) -UsageEditLaw Uso: /mf editarley (número) (ley editada) -UsageFlagsSet Uso: /mf banderas colocar (opción) (valor) -UsageForceBonusPower Uso: /mf forzar extrapoder 'facción' 'número' -UsageForceClaim Uso: /mf force reclamo 'nombre de facción' -UsageForceCreate Uso: /mf forzar crear 'facción' -UsageForceDemote Uso: /mf forzar degradar (jugador) -UsageForceFlag Uso: /mf force flag 'facción' 'opción' 'valor' -UsageForceJoin Uso: /mf forzar unirse 'jugador' 'facción' -UsageForceKick Uso: /mf forzar expulsar (jugador) -UsageForcePeace Uso: /mf forzar paz 'facción-1' 'facción-2' -UsageForcePower Uso: /mf forzar poder 'jugador' 'número' -UsageForceRemoveVassal /mf force removevassal 'facción-1' 'facción-2' -UsageForceRename Uso: mf forzar renombrar 'facción' 'nuevo nombre' -UsageForceRenounce Uso: /mf forzar abdicar 'facción' -UsageForceTransfer Uso: /mf forzar transferir 'nombreFacción' 'jugador' -UsageGrantAccess Uso: /mf daracceso (jugador) -UsageGrantIndependence Uso: /mf otorgarindependencia (facción) -UsageInvite Uso: /mf invitar (jugador) -UsageInvoke Uso: /mf invocar '(facción aliada)' '(facción en conflicto)' -UsageJoin Uso: /mf unirse (facción) -UsageKick Uso: /mf expulsar (jugador) -UsageMakePeace Uso: /mf hacerpaces (facción) -UsagePrefix Uso /mf prefijo (nuevo prefijo) -UsagePromote Uso: /mf ascender (jugador) -UsageRemoveLaw Uso: /mf quitarley (número) -UsageRename Uso: /mf renombrar (nuevo nombre) -UsageRevokeAccess Uso: /mf quitaracceso (jugador) -UsageSwearFealty Uso: /mf jurarlealtad (facción) -UsageTransfer Uso: /mf transferir (jugador) -UsageVassalize Uso: /mf avasallar (facción) -UsageWho Uso: /mf quien (jugador) -ValidSubCommandsShowSet Sub-Comandos válidos: ver, establecer -VassalContribution Poder adicional de vasallos: %d -Vassals Vasallos: %s -WarningPlayerAlreadyStartedCreatingGate ALERTA: El jugador ya ha empezado a crear el portón. Llamada a startCreatingGate() ignorada. -WasntFound No se encontró '%s'. -WelcomeBackLastLogout Bienvenido de vuelta, %s. Te desconectaste hace %s. -WikiLink Wiki: https://github.com/dmccoystephenson/Medieval-Factions/wiki -Wilderness Naturaleza -WorldsMismatch1 Error colocando el punto 1: Los mundos no coinciden. -WorldsMismatch2 Error colocando el punto 2: Los mundos no coinciden. \ No newline at end of file +NotTheOwnerOfThisBlock No eres propietario de este bloque. +NotTheOwnerOfThisFaction No eres propietario de esta facción. +NoVassalOrLiegeReferences No hay referencias de vasallo o señorío asociadas a esta facción. +NowBypassingProtections Estás ignorando las protecciones otorgadas por Medieval Facctions. +NowSpeakingInFactionChat Estás hablando en Chat de Facción. +OnlyPlayersCanUseCommand Solo los jugadores pueden usar este comando. +OnlyUseLeversInClaimedTerritory Error: solo se pueden usar palancas en tierras reclamadas. +Owner Propietario: %s +OwnershipTransferred La propiedad de %s te ha sido transferida. +OwnerShipTransferredTo Propiedad transferida a %s +PermissionNeeded Perdona. Para usar este comando necesitas el siguiente permiso: '%s' +PlayerAlreadyDueling %s ya está en un duelo contra alguien. +PlayerAlreadyInFaction Perdona. Este jugador ya está en una facción. +PlayerAlreadyOfficer Este jugador ya es un oficial. +PlayerAndDesiredPowerSingleQuotesRequirement El jugador y el poder deseado deben designarse entre comillas simples. +PlayerByNameNotFound Perdona. No se pudo encontrar ningún jugador usando el nombre %s. +PlayerCantBePromotedBecauseOfLimit El jugador no se pudo ascender porque ya alcanzaste tu límite. Límite: %d +PlayerDemoted Jugador degradado. +PlayerIsNotInAFaction Este jugador no está en una facción. +PlayerIsNotInYourFaction Este jugador no está en tu facción. +PlayerIsNotMemberOfFaction Este jugador no es miembro de tu facción. +PlayerIsNotOfficerOfFaction Este jugador no es un oficial en tu facción. +PlayerNotFound Jugador no encontrado. +PlayerPowerRecordsLoaded Registros de Poder de Jugador cargados +PlayerPromoted Jugador ascendido. +PleaseWaitGate El portón es %s, por favor espere. +PluginDisabled Plugin Medieval Factions desactivado. +PluginDisabling Plugin Medieval Factions desactivándose... +PluginEnabled Plugin Medieval Factions activado. +PluginEnabling Plugin Medieval Factions activándose... +PluginLoading Plugin Medieval Factions cargando... +PluginSaving Plugin Medieval Factions guardando... +Point1PlacementSuccessful Creando Portón 1/4: Punto 1 puesto con éxito. +Point2PlacedSuccessfully Creando Portón 2/4: Punto 2 puesto con éxito. +Population Población: %d +PowerHasDecayed Tu poder ha decaído en %d desde la última vez que te desconectaste. Tu poder ahora es %d. +PowerLevel Poder: %s +PowerLevelHasBeenSetTo El poder de este jugador ha sido establecido en %d +PowerLevelHasIncreased Tu poder ha aumentado. +PowerLevelResetting Poder reiniciándose... +PrefixesDisabled Los prefijos están actualmente deshabilitados. +PrefixSet Prefijo establecido. +PrefixTaken Este prefijo ya está en uso. +ProblemLoadingClaimedChunks Error cargando tierras reclamadas. +ProblemLoadingFactions Error cargando facciones. +ProblemLoadingPowerRecords Error cargando Registros de Poder de Jugador. +PromotedToOfficer Has sido ascendido a oficial en tu facción. +RadiusRequirement El radio debe estar entre 0 y %d +RemovedGate Eliminado portón '%s'. +ResettingIndividualPowerRecords Reiniciando registros de poder individual. +RightClickCheckAccess Haz click derecho en un bloque asegurado para ver quién tiene acceso. Escribe '/mf veracceso cancelar' para cancelar. +RightClickForceUnlock ¡Haz clic derecho en un cofre o puerta para desbloquearlo a la fuerza! (Escriba /mf forzar desbloqueo cancelar para cancelar) +RightClickGrantAccess Haz click derecho en un cofre o puerta para dar acceso a %s. Escribe '/mf daracceso cancelar' para cancelar. +RightClickLock Haz click derecho en un cofre o puerta para asegurarlo. Escribe '/mf asegurar cancelar' para cancelar. +RightClickRevokeAccess Haz click derecho en un bloque asegurado para anular el acceso de este jugador. Escribe '/mf quitaracceso cancelar' para cancelar. +RightClickUnlock Haz click derecho en un cofre o puerta para quitar su seguro. Escribe '/mf desasegurar cancelar' para cancelar. +SchedulingHourlyAutoSave Programando guardado automático a cada hora... +SchedulingPowerDecrease Programando disminución de poder... +SchedulingPowerIncrease Programando aumento de poder... +SingleQuotesAlliedWarring La facción aliada y la facción en conflicto deben designarse entre comillas simples. +StringSet String designada. +SubCommands Sub-Comandos: +SuccessFactionMemberRemoval Éxito. Si el jugador estaba en una facción, ya no es miembro. +SuccessForceJoin Éxito. El jugador fue forzado a unirse a una facción. +SuccessfulDisbandment %s ha sido disuelto con éxito. +SuccessOfficerRemoval Éxito. Si el jugador era un oficial de alguna facción, ya no es el caso. +SuccessReferencesRemoved Las referencias se eliminaron con éxito. +SupportedLanguageIDList IDs de Lenguaje soportados: %s +SurroundedChunkProtected La facción objetivo ha reclamado las tierras al Norte, Este, Sur y Oeste de esta. No se puede reclamar. +TargetBlockNotPartOfGate El bloque objetivo no es parte de un portón. +TargetFactionNotOverClaiming La facción objetivo no tiene más tierra que su límite de dominio. +TeleportingAlert Teleportando en 3 segundos... +ThreeBlockRequirement Error colocando el punto 2: El portón debe ser 3 o más bloques de alto. +TriggerBlockNotLever El bloque accionador no era una palanca. Cancelada la colocación de portón. +UsageAddLaw Uso: /mf añadirley (nueva ley) +UsageAlly Uso: /mf aliar (facción) +UsageBreakAlliance Uso: /mf romperalianza (facción) +UsageClaimRadius Uso: /mf reclamar (radio) +UsageConfigSet Uso: /mf config establecer (opción) (value) +UsageConfigShow Uso: /mf config show (1 | 2) +UsageCreate Uso: /mf crear [facción] +UsageDeclareWar Uso: /mf declararconflicto (facción) +UsageDemote Uso: /mf degradar (jugador) +UsageDesc Uso: /mf desc (descripción) +UsageEditLaw Uso: /mf editarley (número) (ley editada) +UsageFlagsSet Uso: /mf banderas colocar (opción) (valor) +UsageForceBonusPower Uso: /mf forzar extrapoder 'facción' 'número' +UsageForceClaim Uso: /mf force reclamo 'nombre de facción' +UsageForceCreate Uso: /mf forzar crear 'facción' +UsageForceDemote Uso: /mf forzar degradar (jugador) +UsageForceFlag Uso: /mf force flag 'facción' 'opción' 'valor' +UsageForceJoin Uso: /mf forzar unirse 'jugador' 'facción' +UsageForceKick Uso: /mf forzar expulsar (jugador) +UsageForcePeace Uso: /mf forzar paz 'facción-1' 'facción-2' +UsageForcePower Uso: /mf forzar poder 'jugador' 'número' +UsageForceRemoveVassal /mf force removevassal 'facción-1' 'facción-2' +UsageForceRename Uso: mf forzar renombrar 'facción' 'nuevo nombre' +UsageForceRenounce Uso: /mf forzar abdicar 'facción' +UsageForceTransfer Uso: /mf forzar transferir 'nombreFacción' 'jugador' +UsageGrantAccess Uso: /mf daracceso (jugador) +UsageGrantIndependence Uso: /mf otorgarindependencia (facción) +UsageInvite Uso: /mf invitar (jugador) +UsageInvoke Uso: /mf invocar '(facción aliada)' '(facción en conflicto)' +UsageJoin Uso: /mf unirse (facción) +UsageKick Uso: /mf expulsar (jugador) +UsageMakePeace Uso: /mf hacerpaces (facción) +UsagePrefix Uso /mf prefijo (nuevo prefijo) +UsagePromote Uso: /mf ascender (jugador) +UsageRemoveLaw Uso: /mf quitarley (número) +UsageRename Uso: /mf renombrar (nuevo nombre) +UsageRevokeAccess Uso: /mf quitaracceso (jugador) +UsageSwearFealty Uso: /mf jurarlealtad (facción) +UsageTransfer Uso: /mf transferir (jugador) +UsageVassalize Uso: /mf avasallar (facción) +UsageWho Uso: /mf quien (jugador) +ValidSubCommandsShowSet Sub-Comandos válidos: ver, establecer +VassalContribution Poder adicional de vasallos: %d +Vassals Vasallos: %s +WarningPlayerAlreadyStartedCreatingGate ALERTA: El jugador ya ha empezado a crear el portón. Llamada a startCreatingGate() ignorada. +WasntFound No se encontró '%s'. +WelcomeBackLastLogout Bienvenido de vuelta, %s. Te desconectaste hace %s. +WikiLink Wiki: https://github.com/dmccoystephenson/Medieval-Factions/wiki +Wilderness Naturaleza +WorldsMismatch1 Error colocando el punto 1: Los mundos no coinciden. +WorldsMismatch2 Error colocando el punto 2: Los mundos no coinciden. \ No newline at end of file diff --git a/src/main/resources/pt-br.tsv b/src/main/resources/pt-br.tsv index 80278670c..703383651 100644 --- a/src/main/resources/pt-br.tsv +++ b/src/main/resources/pt-br.tsv @@ -1,551 +1,551 @@ -AcceptedChallengeDuelHasBegun Você aceitou o desafio de %s's, o duelo começou. -AlertAccessGrantedTo Acesso garantido a %s -AlertAccessRevokedFor Acesso Revogado a %s -AlertAllianceHasBeenBroken %s Quebrou a aliança com sua facção. -AlertAlreadyAtWarWith Sua facção já esta em guerra com %s. -AlertAlreadyCreatingGate Você ja esta criando um portão. -AlertAlreadyDueling Você já esta duelando. -AlertAlreadyDuelingPlayer Você já esta duelando com %s. -AlertAlreadyDuelingSomeone Você já esta duelando com alguem. -AlertAlreadyGrantingAccess Você já esta garantindo acesso a alguem. Escreva /mf grantaccess cancel para cancelar isto. -AlertAlreadyInFaction Você já esta em uma facção, desculpe. -AlertAlreadyRequestedAlliance Você já solicitou uma aliança com esta facção. -AlertAlreadyRequestedPeace Você já solicitou paz com esta facção. -AlertAttemptedAlliance %s tentou se aliar com %s. -AlertAttemptedVassalization %s tentou vassalizar sua facção. Se você é o dono, digite '/mf swearfealty %s' para aceitar. -AlertBeenInvited Você foi convidado para %s. Escreva /mf join %s para entrar. -AlertCalledToWar1 %s chamou sua facção para a guerra com %s. -AlertCalledToWar2 %s chamou %s para entrar em guerra com sua facção. -AlertCalledToWar3 Sua facção foi chamada por %s em sua guerra com %s. -AlertChallengedToDuel %s desafiou %s para um duelo. -AlertChallengedToDuelPlusHowTo %s desafiou você para um duelo. escreva /mf duel accept para começar. -AlertChallengeIssued Você foi desafiado por %s para um duelo. -AlertChallengeWasAccepted %s aceitou o seu desafio, o duelo começou. -AlertChangedGateName Nome do portão definido como '%s'. -AlertCurrentPowerLevel Seu poder atual é %d/%d. -AlertDecreasingThePowerOfInactivePlayers Medieval Factions está diminuindo o poder de cada jogador em %d se eles não estiveram online em %d minutos. Isso vai acontecer a cada %d minutos. -AlertDemotion Você foi rebaixado ao status de membro em sua facção. -AlertDisbandmentDueToZeroPower Sua facção foi dissolvida devido ao seu poder cumulativo chegar a zero. -AlertFactionAttemptedToVassalize Sua facção tentou vassalizar %s. -AlertFactionHasBeenVassalized Sua facção foi vassalizada e tem um novo soberano: %s -AlertFactionHasNewVassal Sua facção tem um novo vassalo: %s -AlertFactionHomeRemoved A home de sua facção foi removida. -AlertFactionIsWeakened Sua facção tem menos da metade de seu poder máximo. Ela não receberá mais bônus de poder de vassalos e seus vassalos agora estão vulneráveis. -AlertForcedDemotion Você foi rebaixado à força do status de oficial em sua facção. -AlertForcedKick Você foi expulso a força da sua facção. -AlertForcedLoad Medieval factions esta fazendo um carregamento forçado. -AlertForcedSave Medieval Factions esta criando um save forçado. -AlertForcedToJoinFaction Você foi forçado a entrar em uma facção. -AlertGate Este é o portão '%s'. -AlertGrantedIndependence %s concedeu independência à sua facção. -AlertIncreasingThePowerOfEveryPlayer Medieval Factions está aumentando o poder de cada jogador por %d. Isto vai acontecer a cada %d minutos. -AlertJoinedFaction Você entrou na facção. -AlertKicked Você foi expulso da sua facção por %s. -AlertLandClaimed Terra reinvindicada. Tamanho: %d/%d -AlertLandConqueredFromAnotherFaction Terra conquistada por %s. Tamanho: %d/%d -AlertLandConqueredFromYourFaction %s conquistou terras de sua facção. -AlertLeftFaction Você saiu da sua facção. -AlertLeftFactionAndItGotDeleted Você saiu da sua facção. Ela foi excluida por não haver mais membros. -AlertMoreClaimedChunksThanPower Sua facção tem mais terras reivindicados do que poder. Sua terra pode ser conquistada. -AlertMustBeAtWarToConquer Suas facções devem estar em guerra para que você conquiste terras. -AlertMustBeInFactionToUseCommand Você precisa estar em uma facção para usar este comando. -AlertMustBeMemberToCreateGate Você precisa ser membro desta facção para criar um portão. -AlertMustBeOfficerOrOwnerToClaimLand Você precisa ser um oficial ou dono da facção para reinvindicar uma terra. -AlertMustBeOwnerOrOfficerToCreateGate Você precisa ser dono ou oficial da facção para criar um portão. -AlertMustBeOwnerOrOfficerToUseCommand Você precisa ser um oficial ou dono da facção para usar este comando. -AlertMustBeOwnerToInvokeAlliance Você precisa ser dono da facção para solicitar uma aliança. -AlertMustBeOwnerToUseCommand Você precisa ser dono da facção para usar este comando. -AlertMustKickAllPlayers Você precisa expulsar todos os membros antes de excluir uma facção. -AlertNoGatesDefined Sua facção não tem portões definidos. -AlertNoLaws Sua facção não tem nenhuma lei. -AlertNoLongerVassalFaction %s Não é mais um vassalo da facção. -AlertNonOwnership Isso não te pertence. -AlertNoPendingChallenges Você não tem duelos pendentes para cancelar. -AlertNotAllied Sua facção não é aliada com %s. -AlertNotBeenChallenged Você não foi desafiado a um duelo por ninguém. -AlertNotBeenChallengedByPlayer Você não foi desafiado a um duelo por '%s'. -AlertNotInFaction Você não esta em uma facção. -AlertNotInvitedToFaction Você não foi convidado por esta facção. -AlertNotOfferedVassalizationBy Esta facção não ofereceu vassalização a você. -AlertNowAlliedWith Sua facção não é aliada com %s. -AlertNowAtPeaceWith %s esta agora em paz com %s. -AlertPlayerAlreadyOwner Este membro já é dono da facção. -AlertPlayerNotInFaction Este membro não esta na facção. -AlertPowerLevelDecreased Seu nivel de poder desceu. -AlertPowerLevelIncreasedBy Você se sente forte. Seu poder foi aumentado em %d. -AlertReachedDemesne Você atingiu seu limite de propriedade. Convide mais jogadores para aumentar isso. -AlertUnlocked Desbloqueado. -AlertUnlockingCancelled Desbloqueamento cancelado. -AllianceBrokenWith Aliança quebrada com %s. -AlliedWith Aliado com: %s -AllLandUnclaimed Todas as terras foram abandonadas. -AllLandUnclaimedFrom Todas as terras foram abandonadas por %s. -AlreadyEnteredCheckAccess Você já entrou neste comando. Escreva '/mf checkaccess cancel' para cancelar. -AlreadyEnteredRevokeAccess Você já entrou neste comando. Escreva '/mf revokeaccess cancel' para cancelar. -AlreadyInFaction Desculpe, você já esta em uma facção. Saia dela se você deseja criar outra. -ArgumentMustBeNumber O argumento precisa ser um número. -ArgumentsSingleQuotesRequirement Os argumentos devem ser designados entre aspas simples. -AssignedToRandomFaction Você foi atribuído a uma facção aleatória. -AttemptedAlliance Tentativa de se aliar com %s -AttemptedPeace Tentativa de paz com %s -AtWarWith Em guerra com: %s -AutoclaimToggled Autoclaim alternado. -BlockAlreadyLocked Este bloco já esta bloqueado. -BlockIsNotLocked Este bloco não esta bloqueado. -BlockIsPartOfGateMustRemoveGate Este bloco é parte do portão '%s'. Você precisa remover o portão antes. -BonusPower Bonus de de poder por administradores: %d -BooleanSet Boleano definido. -Cancelled Cancelado. -CancelledGatePlacement1 Erro definindo ponto 1. Definição de portão cancelada. -CancelledGatePlacement2 Erro definindo ponto 2. Definição de portão cancelada. -CancelledGatePlacementErrorLinking Erro ao linkar com uma alavanca. Definição de portão cancelada. -CannotAllyWithSelf Você não pode aliar-se a sua propria facção. -CannotAttackFactionMember Você não pode atacar outro jogador que seja parte da sua facção. -CannotAttackNonWarringPlayer Você não pode atacar outro jogador se suas facções não estiverem em guerra. -CannotBreakAllianceWithSelf Você não pode quebrar uma aliança com sua propria facção. -CannotBringNeutralFactionIntoWar Você não pode trazer facções neutras para a guerra. -CannotCancelActiveDuel Você não pode cancelar um duelo ativo. -CannotDeclareWarIfLiegeNotWeakened Você não pode declarar guerra a esta facção, pois eles são vassalos, a menos que seu soberano esteja enfraquecido. -CannotDeclareWarIfNeutralFaction Facções neutras não podem declarar guerra. -CannotDeclareWarOnAlly Você não pode declarar guerra a um aliado. -CannotDeclareWarOnLiege Você não pode declarar guerra ao seu soberano. Tente '/mf declareindependence' em vez disso. -CannotDeclareWarOnNeutralFaction Você não pode declarar guerra contra uma facção neutra. -CannotDeclareWarOnVassal Você não pode declarar guerra ao seu próprio vassalo. -CannotDeclareWarOnYourself Você não pode declarar guerra a si mesmo. -CannotDemoteSelf Você não pode se rebaixar. -CannotDuelSelf Você não pode duelar contra si mesmo. -CannotFindDynmap Não pude encontrar o dynmap. -CannotForciblyKickOwner Você não pode expulsar à força um dono de sua facção. Tente dissolver a facção. -CannotGrantAccessToSelf Você não pode conceder acesso a si mesmo. -CannotKickOwner Você não pode expulsar um dono. -CannotKickSelf Você não pode expulsar a si mesmo. -CannotMakePeaceWithSelf Você não pode criar uma paz em sua propria facção. -CannotPlaceChestsNextToUnownedLockedChests Você não pode colocar baús ao lado de baús bloqueados que você não possui. -CannotPlaceHoppersNextToUnownedLockedChests Você não pode colocar tremonhas próximas, embaixo ou acima de baús trancados que você não possui. -CannotPromoteSelf Você não pode promover a si mesmo. -CannotRevokeAccessFromSelf Você não pode remover acesso de si mesmo. -CannotSetFactionHomeInWilderness Você não pode definir a home de sua facção em terras que ela não reivindicou. -CannotSetVersion Você não pode definir a versão. -CannotTransferToSelf Você não pode transferir o cargo de dono para si mesmo. -CannotVassalizeLiege Você não pode vassalizar seu soberano. -CannotVassalizeSelf Você não pode vassalizar sua própria facção. -CannotVassalizeVassal Você não pode vassalizar uma facção que já tem um soberano. -CanOnlyCreateGatesInClaimedTerritory Você só pode criar portões em terras reinvindicadas. -CanOnlyLockBlocksInClaimedTerritory Você só pode bloquear blocos em uma terra reinvindicada por sua facção. -CanOnlyLockInFactionTerritory You can only lock things in your faction's territory. -CanOnlyLockSpecificBlocks Você só pode bloquear baus, portas, barris, alçapões, fornalhas, bigornas ou portões. -ClaimedChunksLoaded Terras reinvindicadas carregadas. -ClaimedChunksSuccessfullyLoaded Terras reinvindicadas carregadas com sucesso. -ClickOnTriggerLever Clique na alavanca... -ClickToPlaceSecondCorner Clique para colocar o segundo canto... -CmdAddLaw Adicionar leis. -CmdAlly Aliados -CmdAutoClaim Auto reinvindicar -CmdBreakAlliance Quebrar Aliança -CmdBypass bypass -CmdChat chat -CmdCheckAccess Checar acesso -CmdCheckClaim Checar reinvindicação -CmdClaim Reinvindicar -CmdConfig Configurar -CmdConfigSet Definir -CmdConfigShow Mostrar -CmdCreate Criar -CmdDeclareIndependence Declarar independência -CmdDeclareWar Decralarar guerra -CmdDemote Rebaixar -CmdDesc Descrição -CmdDisband Remover -CmdDuel Duelo -CmdDuelAccept Aceitar -CmdDuelCancel Cancelar -CmdDuelChallenge Desafiar -CmdEditLaw Editar leis -CmdFlags Flags -CmdFlagsSet Definir flags -CmdFlagsShow Mostrar flags -CmdForce Forçar -CmdForceBonusPower Bonus de poder -CmdForceClaim Reinvindicar -CmdForceCreate Criar -CmdForceDemote Deletar -CmdForceFlag flag -CmdForceJoin Entrar -CmdForceKick Expulsar -CmdForceLoad Carregar -CmdForcePeace Paz -CmdForcePower Poder -CmdForceRename Renomear -CmdForceRenounce Renunciar -CmdForceSave Salvar -CmdForceTransfer Transferir -CmdForceUnlock Desbloquear -CmdGate Portão -CmdGateCancel Cancelar -CmdGateCreate Criar -CmdGateList Listar -CmdGateName Nome -CmdGateRemove Remover -CmdGrantAccess Garantir acesso -CmdGrantIndependence Garantir independência -CmdHelp Ajuda -CmdHome Home -CmdInfo Info -CmdInvite Convidar -CmdInvoke Invocar -CmdJoin Entrar -CmdKick Expulsar -CmdLaws Leis -CmdLeave Sair -CmdList Listar -CmdLock Bloquear -CmdMakePeace Criar paz -CmdMembers Membros -CmdPower Poder -CmdPrefix prefix -CmdPromote Promover -CmdRemoveLaw Remover lei -CmdRename Renomear -CmdResetPowerLevels Resetar níveis de poder -CmdRevokeAccess Remover acesso -CmdSetHome sethome -CmdSwearFealty juramento -CmdTransfer Transferir -CmdUnclaim Deixar terra -CmdUnclaimall Deixar todas as terras -CmdUnlock Desbloquear -CmdVassalize Vassalizar -CmdVersion Versão -CmdWho Quem -CommandCancelled Comando cancelado. -CommandNotRecognized Medieval Factions não reconhece este comando. -CommandsPage1 == Medieval Factions Pagínas de comando 1/%d == -CommandsPage2 = Medieval Factions Pagínas de comando 2/%d == -CommandsPage3 == Medieval Factions Pagínas de comando 3/%d == -CommandsPage4 == Medieval Factions Pagínas de comando 4/%d == -CommandsPage5 == Medieval Factions Pagínas de comando 5/%d == -CommandsPage6 == Medieval Factions Pagínas de comando 6/%d == -CommandsPage7 == Medieval Factions Pagínas de comando 7/%d == -ConfigListPageOne ===== Lista de configurações 1/2 ===== -ConfigListPageTwo ===== Lista de configurações 2/2 ===== -CreatingGateCancelled Criação de portão cancelada. -CreatingGateClickWithHoe Criando portão. Clique em um bloco com uma enxada de ouro para selecionar o primeiro ponto. -CuboidDisallowed1 Erro ao colocar o ponto 1: você não pode colocar um bloco. -CuboidDisallowed2 Erro ao colocar o ponto 2: você não pode colocar um bloco. -CurrentLanguageID Linguagem atual ID: %s -CurrentlyNoFactions Atualmente não há facções. -CurrentPowerLevel %s's nível de poder atual é %d/%d. -Defeated %s foi derrotado por %s em um duelo. -DemesneSize Tamanho: %d/%d -Description Descrição: %s -DescriptionSet Descrição definida. -DesignatedFactionNotFound Uma das facções designadas não foi encontrada. -DesiredPowerMustBeANumber O poder desejado deve ser um número. -DeveloperList Desenvolvedores: %s -DisbandmentDueToZeroPower %s foi deletada devido ao seu poder cumulativo chegar a zero. -DoesntExist %s Não existe. -Done Pronto. -DoubleSet Definição dupla. -DuelChallengeCancelled O desafio foi cancelado. -DuelEndedInTie %s e %s's se empataram no duelo. -DynmapIntegrationSuccessful A integração de Dynmap foi um sucesso. -ERROR ERROR: -ErrorAddingAreaMarker Erro ao adicionar a área marcada %s -ErrorChunkRemoval Ocorreu um erro durante a remoção da terra reivindicada. -ErrorClaimedChunkRemoval Ocorreu um erro durante a remoção da terra reivindicada. -ErrorCouldNotFindGatesFaction Error: Não foi possível encontrar facção para o portão'%s'. -ErrorCouldNotLoadFactionGate ERROR: Não foi possível carregar o portão da facção.\n -ErrorCreatingMarkerSet Erro ao criar os marcadores. -ErrorIntegratingWithDynmap Erro ao integrar com o dynmap: -ErrorPlayerPowerRecordForUUIDNotFound ERROR: O registro de poder do jogador para uuid não foi encontrado. Não foi possível obter o nível de poder cumulativo. -ErrorSettingAreaMarkerColor Erro ao definir a cor do marcador de área para '%s'. -FactionAlreadyAlly Está facção já é sua aliada. -FactionAlreadyExists Desculpe. Esta facção já existe. -FactionAndPlayerSingleQuotesRequirement Facção e jogador devem ser designados entre aspas simples. -FactionAndVassalSingleQuotesRequirement Facção e vassalo a serem removidos devem ser designados entre aspas simples. -FactionCreated Facção criada. -FactionCurrentlyEnemyMustMakePeace Essa facção é atualmente sua inimiga. Faça as pazes antes de tentar se aliar a eles. -FactionDataLoadedSuccessfuly Dados de facção carregados com sucesso -FactionDoesNotExist Desculpe. Esta facção não existe. -FactionDoesNotHaveLaws Esta facção não tem nenhuma lei. -FactionGates Portões da Facção -FactionHomeLoadError Ocorreu um erro ao carregar a home da facção. -FactionHomeNotSetYet A home da facção ainda não existe. -FactionHomeSet Home da facção definida. -FactionInfo %s Informação da facção -FactionIsNotVassal Esta facção não é sua vassala. -FactionMustBeDesignatedInsideSingleQuotes A facção deve ser designada entre aspas simples. -FactionNameChanged Nome da facção definido. -FactionNameNotRecognized O nome dessa facção não é reconhecido. -FactionNameTooLong Esse nome é muito longo. -FactionNotEnemy Esta facção não é sua inimiga. -FactionNotFound Esta facção não foi encontrada -FactionsSuccessfullyLoaded Facção carregada com sucesso. -FactionsTitle == Factions == -FactionSuccessfullyDisbanded Facção deletada com sucesso. -FactionSuccessfullyLoaded Facção carregada com sucesso. -FileLoadError Um erro ocorreu carregando este arquivo. -FollowingPlayersHaveAccess Os membros a seguir tem acesso a este bloco: -GateCreated Portão criado com sucesso. -HasAttemptedToMakePeaceWith %s tentou fazer as pazes com %s. -HasBeenKickedFrom %s foi expulso por %s -HasDeclaredIndependence %s declarou independência de %s. -HasDeclaredWarAgainst %s declarou guerra contra %s. -HasJoined %s entrou em %s -HelpAddLaw /mf addlaw - adiciona uma lei a sua facção. -HelpAlly /mf ally - Tenta criar aliança com uma facção. -HelpAutoclaim /mf autoclaim - Ativa/desativa a reivindicação automática, tornando a reivindicação de terras mais fácil. -HelpBreakAlliance /mf breakalliance - Quebra a aliança com uma facção. -HelpBypass /mf bypass - Bypass proteções. -HelpChat /mf chat - Ativa/desativa o chat com a facção. -HelpCheckAccess /mf checkaccess - Checa quem tem acesso a um bloco bloqueado. -HelpCheckClaim /mf checkclaim - Checa se a terra é reinvindicada ou não. -HelpClaim /mf claim - Reinvindica uma terra para sua facção. -HelpConfigSet /mf config set (option) (value) - Define uma configuração. -HelpConfigShow /mf config show - Mostra os (value) de configuração. -HelpCreate /mf create (name) - Cria uma nova fação. -HelpDeclareIndependence /mf declareindependence - Declara independência contra seu soberano. -HelpDeclareWar /mf declarewar - Declara guerra contra outra facção. -HelpDemote /mf demote - Rebaixa um oficial ao status de membro. -HelpDesc /mf desc (desc) - Define a descrição da sua facção. -HelpDisband /mf disband - Deleta sua facção (Precisa ser dono). -HelpDuelAccept /mf duel accept (player) Aceita um duelo -HelpDuelCancel /mf duel cancel Cancela o duelo -HelpDuelChallenge /mf duel challenge (player) (time limit in seconds) -HelpEditLaw /mf editlaw - Edita uma lei já existente em sua facção -HelpFlagsSet /mf flags set (option) (value) - Definir uma flag de facção. -HelpFlagsShow /mf flags show - Mostra as flags da facção. -HelpForce /mf force - Força o plugin a fazer certas ações. -HelpForceBonusPower /mf force bonuspower 'faction' 'number' -HelpForceClaim /mf force claim 'faction name' Força uma facção a reinvindar uma terra. -HelpForceCreate /mf force create 'factionName' Força a criação de uma facção. -HelpForceDemote /mf force demote (player) Força um jogador a ser rebaixado. -HelpForceFlag /mf force 'facção' 'opção' 'valor' -HelpForceJoin /mf force join 'player' 'faction2' Força um jogador a entrar em uma facção. -HelpForceKick /mf force kick (player) Força a expulsão de um jogador. -HelpForceLoad /mf force load Força o carregamento. -HelpForcePeace /mf force peace 'faction1' 'faction2' Força a paz entre 2 facções. -HelpForcePower /mf force power 'player' 'number' Força o poder em um jogador. -HelpForceRemoveVassal /mf force removevassal 'faction' 'vassal' Força a remoção de um vassalo. -HelpForceRename /mf force rename 'faction' 'new name' Força o renomeamento de uma facção. -HelpForceRenounce /mf force renounce (faction) Força a renuncia de um facção -HelpForceSave /mf force save Força um save. -HelpForceTransfer /mf force transfer 'faction' 'player' Força a transferência de um jogador para uma facção. -HelpForceUnlock /mf force unlock Força o destravamento. -HelpGateCancel /mf gate cancel Cancela a criação de um portão. -HelpGateCreate /mf gate create (name) Inicia a criação de um portão. -HelpGateList /mf gate list Lista os portões existentes. -HelpGateName /mf gate name (name) Define um nome para o portão. -HelpGateRemove /mf gate remove Remove o portão. -HelpGrantAccess /mf grantaccess - Garante o acesso de alguem a um bloco bloqueado. -HelpGrantIndependence /mf grantindependence - Conceda a independência vassalo de uma vação. -HelpHelp /mf help # - Mostra listas de comandos úteis. -HelpHome /mf home - Teleporta até a home da sua facção. -HelpInfo /mf info - Veja a sua facção ou as informações de outra facção. -HelpInvite /mf invite (player) - Convida um jogador para sua facção. -HelpInvoke /mf invoke (ally) (enemy) - Chama um aliado para a guerra.. -HelpJoin /mf join (faction) - Entra na facção foi foi convidado. -HelpKick /mf kick - Expulsa um jogador da sua facção. -HelpLaws /mf laws - Veja as leis da sua facção. -HelpLeave /mf leave - Sair da facção atual. -HelpList /mf list - Lista todas as facções do servidor. -HelpLock /mf lock - Tranca uma porta ou bau. -HelpMakePeace /mf makepeace - Manda uma oferta de paz para outra facção. -HelpMap /mf map - Exibe um mapa das reivindicações perto de seus arredores. -HelpMembers /mf members - Lista os membros de sua facção ou de outra facção. -HelpPower /mf power - Checa o seu nivel de poder. -HelpPrefix /mf prefix (prefix) - Defina o prefixo da sua facção. -HelpPromote /mf promote - Promove um membro ao titulo de Oficial. -HelpRemoveLaw /mf removelaw - Remove uma lei da sua facção. -HelpRename /mf rename - Renomeia a sua facção -HelpResetPowerLevels /mf resetpowerlevels - Redefina os registros de poder do jogador e os níveis de poder cumulativos das facções. -HelpRevokeAccess /mf revokeaccess - Revoga o acesso do jogador sobre algum bloco bloqueado. -HelpSetHome /mf sethome - Define a home da sua facção. -HelpSwearFealty /mf swearfealty - Jure fidelidade a uma facção. -HelpTransfer /mf transfer - Transfira a propriedade de sua facção para outro jogador.\n -HelpUnclaim /mf unclaim - Abandona terras da sua facção. -HelpUnclaimall /mf unclaimall - Abandona todas as terras da sua facção. -HelpUnlock /mf unlock Desbloqueia uma porta ou bau. -HelpVassalize /mf vassalize - Ofereça-se para vassalizar uma facção. -HelpVersion /mf version - Checa a versão do plugin. -HelpWho /mf who - Veja as informações da facção de um jogador específico. -HomeClaimedByAnotherFaction A home foi reivindicado por outra facção e foi perdida. -HomeIsInUnclaimedChunk A home está em uma terra não reinvindicada e não está disponível. -HourlySaveAlert Medieval Factions esta salvando. Isso vai acontecer a cada 1 hora. -IntegerSet Integer set. -InvitationExpired Sey convite para %s expirou. -InvitationSent Convite enviado. -KeysLoaded Keys loaded: %d -LandAlreadyClaimedBy Esta terra já foi reinvindicada por -LandAlreadyClaimedByYourFaction Esta terra já foi reinvindicada por sua facção. -LandClaimedBy Esta terra esta reinvindicada por %s. -LandClaimedUsingAdminBypass Terra abandonada usando uma admin bypass. -LandIsNotClaimed Esta terra não esta reinvindicada. -LandIsUnclaimed Esta terra esta abandonada. -LandNotCurrentlyClaimed Esta terra atualmente não esta reinvindicada. -LandUnclaimed Terra abandonada. -LawAdded Lei adicionada. -LawEdited Lei modificada. -LawRemoved Lei removida. -LawsTitle == Leis de %s == -LeverSuccessfullyLinked Criando portão 4/4: Alavanca linkada com sucesso. -Liege Soberano: %s -ListLegend P: Poder, M: Membros, L: Terra -LoadingClaimedChunks Carregando chunks das terras... -LoadingLockedBLocks Carregando blocos bloqueados... -LoadingPlayerPowerRecords Carregando registros de poder... -Locked Bloqueado. -LockedBlockSuccessfullyLoaded Bloco Bloqueado carregado com sucesso. -LockedBy Bloqueado por %s -LockingCancelled Bloqueamento cancelado. -LockRemovalError Um erro ocorreu durante a remoção do bloqueio. -MaterialsMismatch1 Erro ao colocar ponto 1: Materiais incompatíveis. -MaterialsMismatch2 Erro ao colocar ponto 2: Materiais incompatíveis. -MedievalFactionsStringRight Medieval-Factions-%s -MedievalFactionsTitle == Medieval Factions %s == -MembersOf Membro de %s -MissingFactionGatesJSONCollection Não foi possível carregar os gates porque a coleção 'factionGates' não existia no arquivo JSON das facções. Você está atualizando de uma versão anterior? A configuração padrão foi definida. -MovementDetectedTeleportCancelled Movimento detectado. Teleporte cancelado. -MustBeAtWarOrFactionMustBeInactive Você já Deve estar em guerra com a facção alvo ou a facção alvo deve esta inativa. -MustBeInFaction Desculpe, você precisa estar em uma facção para fazer isso. -MustBeOwner Desculpe, você precisa ser dono de uma facção para utilizar esse comando. -MustOwnFactionOrBeOfficer Você precisa ser dono de uma facção ou ser oficial de uma facção para usar este comando. -MustTransferOwnership Desculpa. Você deve transferir a propriedade ou expulsar todos em sua facção para sair. -Name Nome: %s -NameAlreadyTaken Este nome já esta em uso. -NeutralityDisabled Sua neutralidade foi desabilitada. -NoBlockDetectedToCheckForGate Nenhum bloco detectado para verificar o portão. -NoFactionsDesignatedSingleQuotesRequired Nenhuma facção designada. Deve ser indicado entre aspas simples. -NoLongerBypassingProtections Você não está mais contornando as bypassings fornecidas pelas facções medievais. -NoLongerInFactionChat Você não esta mais no chat da facção -NotAMemberOfAnyFaction Você não é membro de nenhuma facção. -NotAnAlly %s Não é seu aliado. -NotAnAllyOrVassal %s Não é seu aliado ou seu vassalo. -NotAtWarWith Você não esta em guerra com %s -NotAVassalOfAFaction Você não é vassalo de uma facção. +AcceptedChallengeDuelHasBegun Você aceitou o desafio de %s's, o duelo começou. +AlertAccessGrantedTo Acesso garantido a %s +AlertAccessRevokedFor Acesso Revogado a %s +AlertAllianceHasBeenBroken %s Quebrou a aliança com sua facção. +AlertAlreadyAtWarWith Sua facção já esta em guerra com %s. +AlertAlreadyCreatingGate Você ja esta criando um portão. +AlertAlreadyDueling Você já esta duelando. +AlertAlreadyDuelingPlayer Você já esta duelando com %s. +AlertAlreadyDuelingSomeone Você já esta duelando com alguem. +AlertAlreadyGrantingAccess Você já esta garantindo acesso a alguem. Escreva /mf grantaccess cancel para cancelar isto. +AlertAlreadyInFaction Você já esta em uma facção, desculpe. +AlertAlreadyRequestedAlliance Você já solicitou uma aliança com esta facção. +AlertAlreadyRequestedPeace Você já solicitou paz com esta facção. +AlertAttemptedAlliance %s tentou se aliar com %s. +AlertAttemptedVassalization %s tentou vassalizar sua facção. Se você é o dono, digite '/mf swearfealty %s' para aceitar. +AlertBeenInvited Você foi convidado para %s. Escreva /mf join %s para entrar. +AlertCalledToWar1 %s chamou sua facção para a guerra com %s. +AlertCalledToWar2 %s chamou %s para entrar em guerra com sua facção. +AlertCalledToWar3 Sua facção foi chamada por %s em sua guerra com %s. +AlertChallengedToDuel %s desafiou %s para um duelo. +AlertChallengedToDuelPlusHowTo %s desafiou você para um duelo. escreva /mf duel accept para começar. +AlertChallengeIssued Você foi desafiado por %s para um duelo. +AlertChallengeWasAccepted %s aceitou o seu desafio, o duelo começou. +AlertChangedGateName Nome do portão definido como '%s'. +AlertCurrentPowerLevel Seu poder atual é %d/%d. +AlertDecreasingThePowerOfInactivePlayers Medieval Factions está diminuindo o poder de cada jogador em %d se eles não estiveram online em %d minutos. Isso vai acontecer a cada %d minutos. +AlertDemotion Você foi rebaixado ao status de membro em sua facção. +AlertDisbandmentDueToZeroPower Sua facção foi dissolvida devido ao seu poder cumulativo chegar a zero. +AlertFactionAttemptedToVassalize Sua facção tentou vassalizar %s. +AlertFactionHasBeenVassalized Sua facção foi vassalizada e tem um novo soberano: %s +AlertFactionHasNewVassal Sua facção tem um novo vassalo: %s +AlertFactionHomeRemoved A home de sua facção foi removida. +AlertFactionIsWeakened Sua facção tem menos da metade de seu poder máximo. Ela não receberá mais bônus de poder de vassalos e seus vassalos agora estão vulneráveis. +AlertForcedDemotion Você foi rebaixado à força do status de oficial em sua facção. +AlertForcedKick Você foi expulso a força da sua facção. +AlertForcedLoad Medieval factions esta fazendo um carregamento forçado. +AlertForcedSave Medieval Factions esta criando um save forçado. +AlertForcedToJoinFaction Você foi forçado a entrar em uma facção. +AlertGate Este é o portão '%s'. +AlertGrantedIndependence %s concedeu independência à sua facção. +AlertIncreasingThePowerOfEveryPlayer Medieval Factions está aumentando o poder de cada jogador por %d. Isto vai acontecer a cada %d minutos. +AlertJoinedFaction Você entrou na facção. +AlertKicked Você foi expulso da sua facção por %s. +AlertLandClaimed Terra reinvindicada. Tamanho: %d/%d +AlertLandConqueredFromAnotherFaction Terra conquistada por %s. Tamanho: %d/%d +AlertLandConqueredFromYourFaction %s conquistou terras de sua facção. +AlertLeftFaction Você saiu da sua facção. +AlertLeftFactionAndItGotDeleted Você saiu da sua facção. Ela foi excluida por não haver mais membros. +AlertMoreClaimedChunksThanPower Sua facção tem mais terras reivindicados do que poder. Sua terra pode ser conquistada. +AlertMustBeAtWarToConquer Suas facções devem estar em guerra para que você conquiste terras. +AlertMustBeInFactionToUseCommand Você precisa estar em uma facção para usar este comando. +AlertMustBeMemberToCreateGate Você precisa ser membro desta facção para criar um portão. +AlertMustBeOfficerOrOwnerToClaimLand Você precisa ser um oficial ou dono da facção para reinvindicar uma terra. +AlertMustBeOwnerOrOfficerToCreateGate Você precisa ser dono ou oficial da facção para criar um portão. +AlertMustBeOwnerOrOfficerToUseCommand Você precisa ser um oficial ou dono da facção para usar este comando. +AlertMustBeOwnerToInvokeAlliance Você precisa ser dono da facção para solicitar uma aliança. +AlertMustBeOwnerToUseCommand Você precisa ser dono da facção para usar este comando. +AlertMustKickAllPlayers Você precisa expulsar todos os membros antes de excluir uma facção. +AlertNoGatesDefined Sua facção não tem portões definidos. +AlertNoLaws Sua facção não tem nenhuma lei. +AlertNoLongerVassalFaction %s Não é mais um vassalo da facção. +AlertNonOwnership Isso não te pertence. +AlertNoPendingChallenges Você não tem duelos pendentes para cancelar. +AlertNotAllied Sua facção não é aliada com %s. +AlertNotBeenChallenged Você não foi desafiado a um duelo por ninguém. +AlertNotBeenChallengedByPlayer Você não foi desafiado a um duelo por '%s'. +AlertNotInFaction Você não esta em uma facção. +AlertNotInvitedToFaction Você não foi convidado por esta facção. +AlertNotOfferedVassalizationBy Esta facção não ofereceu vassalização a você. +AlertNowAlliedWith Sua facção não é aliada com %s. +AlertNowAtPeaceWith %s esta agora em paz com %s. +AlertPlayerAlreadyOwner Este membro já é dono da facção. +AlertPlayerNotInFaction Este membro não esta na facção. +AlertPowerLevelDecreased Seu nivel de poder desceu. +AlertPowerLevelIncreasedBy Você se sente forte. Seu poder foi aumentado em %d. +AlertReachedDemesne Você atingiu seu limite de propriedade. Convide mais jogadores para aumentar isso. +AlertUnlocked Desbloqueado. +AlertUnlockingCancelled Desbloqueamento cancelado. +AllianceBrokenWith Aliança quebrada com %s. +AlliedWith Aliado com: %s +AllLandUnclaimed Todas as terras foram abandonadas. +AllLandUnclaimedFrom Todas as terras foram abandonadas por %s. +AlreadyEnteredCheckAccess Você já entrou neste comando. Escreva '/mf checkaccess cancel' para cancelar. +AlreadyEnteredRevokeAccess Você já entrou neste comando. Escreva '/mf revokeaccess cancel' para cancelar. +AlreadyInFaction Desculpe, você já esta em uma facção. Saia dela se você deseja criar outra. +ArgumentMustBeNumber O argumento precisa ser um número. +ArgumentsSingleQuotesRequirement Os argumentos devem ser designados entre aspas simples. +AssignedToRandomFaction Você foi atribuído a uma facção aleatória. +AttemptedAlliance Tentativa de se aliar com %s +AttemptedPeace Tentativa de paz com %s +AtWarWith Em guerra com: %s +AutoclaimToggled Autoclaim alternado. +BlockAlreadyLocked Este bloco já esta bloqueado. +BlockIsNotLocked Este bloco não esta bloqueado. +BlockIsPartOfGateMustRemoveGate Este bloco é parte do portão '%s'. Você precisa remover o portão antes. +BonusPower Bonus de de poder por administradores: %d +BooleanSet Boleano definido. +Cancelled Cancelado. +CancelledGatePlacement1 Erro definindo ponto 1. Definição de portão cancelada. +CancelledGatePlacement2 Erro definindo ponto 2. Definição de portão cancelada. +CancelledGatePlacementErrorLinking Erro ao linkar com uma alavanca. Definição de portão cancelada. +CannotAllyWithSelf Você não pode aliar-se a sua propria facção. +CannotAttackFactionMember Você não pode atacar outro jogador que seja parte da sua facção. +CannotAttackNonWarringPlayer Você não pode atacar outro jogador se suas facções não estiverem em guerra. +CannotBreakAllianceWithSelf Você não pode quebrar uma aliança com sua propria facção. +CannotBringNeutralFactionIntoWar Você não pode trazer facções neutras para a guerra. +CannotCancelActiveDuel Você não pode cancelar um duelo ativo. +CannotDeclareWarIfLiegeNotWeakened Você não pode declarar guerra a esta facção, pois eles são vassalos, a menos que seu soberano esteja enfraquecido. +CannotDeclareWarIfNeutralFaction Facções neutras não podem declarar guerra. +CannotDeclareWarOnAlly Você não pode declarar guerra a um aliado. +CannotDeclareWarOnLiege Você não pode declarar guerra ao seu soberano. Tente '/mf declareindependence' em vez disso. +CannotDeclareWarOnNeutralFaction Você não pode declarar guerra contra uma facção neutra. +CannotDeclareWarOnVassal Você não pode declarar guerra ao seu próprio vassalo. +CannotDeclareWarOnYourself Você não pode declarar guerra a si mesmo. +CannotDemoteSelf Você não pode se rebaixar. +CannotDuelSelf Você não pode duelar contra si mesmo. +CannotFindDynmap Não pude encontrar o dynmap. +CannotForciblyKickOwner Você não pode expulsar à força um dono de sua facção. Tente dissolver a facção. +CannotGrantAccessToSelf Você não pode conceder acesso a si mesmo. +CannotKickOwner Você não pode expulsar um dono. +CannotKickSelf Você não pode expulsar a si mesmo. +CannotMakePeaceWithSelf Você não pode criar uma paz em sua propria facção. +CannotPlaceChestsNextToUnownedLockedChests Você não pode colocar baús ao lado de baús bloqueados que você não possui. +CannotPlaceHoppersNextToUnownedLockedChests Você não pode colocar tremonhas próximas, embaixo ou acima de baús trancados que você não possui. +CannotPromoteSelf Você não pode promover a si mesmo. +CannotRevokeAccessFromSelf Você não pode remover acesso de si mesmo. +CannotSetFactionHomeInWilderness Você não pode definir a home de sua facção em terras que ela não reivindicou. +CannotSetVersion Você não pode definir a versão. +CannotTransferToSelf Você não pode transferir o cargo de dono para si mesmo. +CannotVassalizeLiege Você não pode vassalizar seu soberano. +CannotVassalizeSelf Você não pode vassalizar sua própria facção. +CannotVassalizeVassal Você não pode vassalizar uma facção que já tem um soberano. +CanOnlyCreateGatesInClaimedTerritory Você só pode criar portões em terras reinvindicadas. +CanOnlyLockBlocksInClaimedTerritory Você só pode bloquear blocos em uma terra reinvindicada por sua facção. +CanOnlyLockInFactionTerritory You can only lock things in your faction's territory. +CanOnlyLockSpecificBlocks Você só pode bloquear baus, portas, barris, alçapões, fornalhas, bigornas ou portões. +ClaimedChunksLoaded Terras reinvindicadas carregadas. +ClaimedChunksSuccessfullyLoaded Terras reinvindicadas carregadas com sucesso. +ClickOnTriggerLever Clique na alavanca... +ClickToPlaceSecondCorner Clique para colocar o segundo canto... +CmdAddLaw Adicionar leis. +CmdAlly Aliados +CmdAutoClaim Auto reinvindicar +CmdBreakAlliance Quebrar Aliança +CmdBypass bypass +CmdChat chat +CmdCheckAccess Checar acesso +CmdCheckClaim Checar reinvindicação +CmdClaim Reinvindicar +CmdConfig Configurar +CmdConfigSet Definir +CmdConfigShow Mostrar +CmdCreate Criar +CmdDeclareIndependence Declarar independência +CmdDeclareWar Decralarar guerra +CmdDemote Rebaixar +CmdDesc Descrição +CmdDisband Remover +CmdDuel Duelo +CmdDuelAccept Aceitar +CmdDuelCancel Cancelar +CmdDuelChallenge Desafiar +CmdEditLaw Editar leis +CmdFlags Flags +CmdFlagsSet Definir flags +CmdFlagsShow Mostrar flags +CmdForce Forçar +CmdForceBonusPower Bonus de poder +CmdForceClaim Reinvindicar +CmdForceCreate Criar +CmdForceDemote Deletar +CmdForceFlag flag +CmdForceJoin Entrar +CmdForceKick Expulsar +CmdForceLoad Carregar +CmdForcePeace Paz +CmdForcePower Poder +CmdForceRename Renomear +CmdForceRenounce Renunciar +CmdForceSave Salvar +CmdForceTransfer Transferir +CmdForceUnlock Desbloquear +CmdGate Portão +CmdGateCancel Cancelar +CmdGateCreate Criar +CmdGateList Listar +CmdGateName Nome +CmdGateRemove Remover +CmdGrantAccess Garantir acesso +CmdGrantIndependence Garantir independência +CmdHelp Ajuda +CmdHome Home +CmdInfo Info +CmdInvite Convidar +CmdInvoke Invocar +CmdJoin Entrar +CmdKick Expulsar +CmdLaws Leis +CmdLeave Sair +CmdList Listar +CmdLock Bloquear +CmdMakePeace Criar paz +CmdMembers Membros +CmdPower Poder +CmdPrefix prefix +CmdPromote Promover +CmdRemoveLaw Remover lei +CmdRename Renomear +CmdResetPowerLevels Resetar níveis de poder +CmdRevokeAccess Remover acesso +CmdSetHome sethome +CmdSwearFealty juramento +CmdTransfer Transferir +CmdUnclaim Deixar terra +CmdUnclaimall Deixar todas as terras +CmdUnlock Desbloquear +CmdVassalize Vassalizar +CmdVersion Versão +CmdWho Quem +CommandCancelled Comando cancelado. +CommandNotRecognized Medieval Factions não reconhece este comando. +CommandsPage1 == Medieval Factions Pagínas de comando 1/%d == +CommandsPage2 = Medieval Factions Pagínas de comando 2/%d == +CommandsPage3 == Medieval Factions Pagínas de comando 3/%d == +CommandsPage4 == Medieval Factions Pagínas de comando 4/%d == +CommandsPage5 == Medieval Factions Pagínas de comando 5/%d == +CommandsPage6 == Medieval Factions Pagínas de comando 6/%d == +CommandsPage7 == Medieval Factions Pagínas de comando 7/%d == +ConfigListPageOne ===== Lista de configurações 1/2 ===== +ConfigListPageTwo ===== Lista de configurações 2/2 ===== +CreatingGateCancelled Criação de portão cancelada. +CreatingGateClickWithHoe Criando portão. Clique em um bloco com uma enxada de ouro para selecionar o primeiro ponto. +CuboidDisallowed1 Erro ao colocar o ponto 1: você não pode colocar um bloco. +CuboidDisallowed2 Erro ao colocar o ponto 2: você não pode colocar um bloco. +CurrentLanguageID Linguagem atual ID: %s +CurrentlyNoFactions Atualmente não há facções. +CurrentPowerLevel %s's nível de poder atual é %d/%d. +Defeated %s foi derrotado por %s em um duelo. +DemesneSize Tamanho: %d/%d +Description Descrição: %s +DescriptionSet Descrição definida. +DesignatedFactionNotFound Uma das facções designadas não foi encontrada. +DesiredPowerMustBeANumber O poder desejado deve ser um número. +DeveloperList Desenvolvedores: %s +DisbandmentDueToZeroPower %s foi deletada devido ao seu poder cumulativo chegar a zero. +DoesntExist %s Não existe. +Done Pronto. +DoubleSet Definição dupla. +DuelChallengeCancelled O desafio foi cancelado. +DuelEndedInTie %s e %s's se empataram no duelo. +DynmapIntegrationSuccessful A integração de Dynmap foi um sucesso. +ERROR ERROR: +ErrorAddingAreaMarker Erro ao adicionar a área marcada %s +ErrorChunkRemoval Ocorreu um erro durante a remoção da terra reivindicada. +ErrorClaimedChunkRemoval Ocorreu um erro durante a remoção da terra reivindicada. +ErrorCouldNotFindGatesFaction Error: Não foi possível encontrar facção para o portão'%s'. +ErrorCouldNotLoadFactionGate ERROR: Não foi possível carregar o portão da facção.\n +ErrorCreatingMarkerSet Erro ao criar os marcadores. +ErrorIntegratingWithDynmap Erro ao integrar com o dynmap: +ErrorPlayerPowerRecordForUUIDNotFound ERROR: O registro de poder do jogador para uuid não foi encontrado. Não foi possível obter o nível de poder cumulativo. +ErrorSettingAreaMarkerColor Erro ao definir a cor do marcador de área para '%s'. +FactionAlreadyAlly Está facção já é sua aliada. +FactionAlreadyExists Desculpe. Esta facção já existe. +FactionAndPlayerSingleQuotesRequirement Facção e jogador devem ser designados entre aspas simples. +FactionAndVassalSingleQuotesRequirement Facção e vassalo a serem removidos devem ser designados entre aspas simples. +FactionCreated Facção criada. +FactionCurrentlyEnemyMustMakePeace Essa facção é atualmente sua inimiga. Faça as pazes antes de tentar se aliar a eles. +FactionDataLoadedSuccessfuly Dados de facção carregados com sucesso +FactionDoesNotExist Desculpe. Esta facção não existe. +FactionDoesNotHaveLaws Esta facção não tem nenhuma lei. +FactionGates Portões da Facção +FactionHomeLoadError Ocorreu um erro ao carregar a home da facção. +FactionHomeNotSetYet A home da facção ainda não existe. +FactionHomeSet Home da facção definida. +FactionInfo %s Informação da facção +FactionIsNotVassal Esta facção não é sua vassala. +FactionMustBeDesignatedInsideSingleQuotes A facção deve ser designada entre aspas simples. +FactionNameChanged Nome da facção definido. +FactionNameNotRecognized O nome dessa facção não é reconhecido. +FactionNameTooLong Esse nome é muito longo. +FactionNotEnemy Esta facção não é sua inimiga. +FactionNotFound Esta facção não foi encontrada +FactionsSuccessfullyLoaded Facção carregada com sucesso. +FactionsTitle == Factions == +FactionSuccessfullyDisbanded Facção deletada com sucesso. +FactionSuccessfullyLoaded Facção carregada com sucesso. +FileLoadError Um erro ocorreu carregando este arquivo. +FollowingPlayersHaveAccess Os membros a seguir tem acesso a este bloco: +GateCreated Portão criado com sucesso. +HasAttemptedToMakePeaceWith %s tentou fazer as pazes com %s. +HasBeenKickedFrom %s foi expulso por %s +HasDeclaredIndependence %s declarou independência de %s. +HasDeclaredWarAgainst %s declarou guerra contra %s. +HasJoined %s entrou em %s +HelpAddLaw /mf addlaw - adiciona uma lei a sua facção. +HelpAlly /mf ally - Tenta criar aliança com uma facção. +HelpAutoclaim /mf autoclaim - Ativa/desativa a reivindicação automática, tornando a reivindicação de terras mais fácil. +HelpBreakAlliance /mf breakalliance - Quebra a aliança com uma facção. +HelpBypass /mf bypass - Bypass proteções. +HelpChat /mf chat - Ativa/desativa o chat com a facção. +HelpCheckAccess /mf checkaccess - Checa quem tem acesso a um bloco bloqueado. +HelpCheckClaim /mf checkclaim - Checa se a terra é reinvindicada ou não. +HelpClaim /mf claim - Reinvindica uma terra para sua facção. +HelpConfigSet /mf config set (option) (value) - Define uma configuração. +HelpConfigShow /mf config show - Mostra os (value) de configuração. +HelpCreate /mf create (name) - Cria uma nova fação. +HelpDeclareIndependence /mf declareindependence - Declara independência contra seu soberano. +HelpDeclareWar /mf declarewar - Declara guerra contra outra facção. +HelpDemote /mf demote - Rebaixa um oficial ao status de membro. +HelpDesc /mf desc (desc) - Define a descrição da sua facção. +HelpDisband /mf disband - Deleta sua facção (Precisa ser dono). +HelpDuelAccept /mf duel accept (player) Aceita um duelo +HelpDuelCancel /mf duel cancel Cancela o duelo +HelpDuelChallenge /mf duel challenge (player) (time limit in seconds) +HelpEditLaw /mf editlaw - Edita uma lei já existente em sua facção +HelpFlagsSet /mf flags set (option) (value) - Definir uma flag de facção. +HelpFlagsShow /mf flags show - Mostra as flags da facção. +HelpForce /mf force - Força o plugin a fazer certas ações. +HelpForceBonusPower /mf force bonuspower 'faction' 'number' +HelpForceClaim /mf force claim 'faction name' Força uma facção a reinvindar uma terra. +HelpForceCreate /mf force create 'factionName' Força a criação de uma facção. +HelpForceDemote /mf force demote (player) Força um jogador a ser rebaixado. +HelpForceFlag /mf force 'facção' 'opção' 'valor' +HelpForceJoin /mf force join 'player' 'faction2' Força um jogador a entrar em uma facção. +HelpForceKick /mf force kick (player) Força a expulsão de um jogador. +HelpForceLoad /mf force load Força o carregamento. +HelpForcePeace /mf force peace 'faction1' 'faction2' Força a paz entre 2 facções. +HelpForcePower /mf force power 'player' 'number' Força o poder em um jogador. +HelpForceRemoveVassal /mf force removevassal 'faction' 'vassal' Força a remoção de um vassalo. +HelpForceRename /mf force rename 'faction' 'new name' Força o renomeamento de uma facção. +HelpForceRenounce /mf force renounce (faction) Força a renuncia de um facção +HelpForceSave /mf force save Força um save. +HelpForceTransfer /mf force transfer 'faction' 'player' Força a transferência de um jogador para uma facção. +HelpForceUnlock /mf force unlock Força o destravamento. +HelpGateCancel /mf gate cancel Cancela a criação de um portão. +HelpGateCreate /mf gate create (name) Inicia a criação de um portão. +HelpGateList /mf gate list Lista os portões existentes. +HelpGateName /mf gate name (name) Define um nome para o portão. +HelpGateRemove /mf gate remove Remove o portão. +HelpGrantAccess /mf grantaccess - Garante o acesso de alguem a um bloco bloqueado. +HelpGrantIndependence /mf grantindependence - Conceda a independência vassalo de uma vação. +HelpHelp /mf help # - Mostra listas de comandos úteis. +HelpHome /mf home - Teleporta até a home da sua facção. +HelpInfo /mf info - Veja a sua facção ou as informações de outra facção. +HelpInvite /mf invite (player) - Convida um jogador para sua facção. +HelpInvoke /mf invoke (ally) (enemy) - Chama um aliado para a guerra.. +HelpJoin /mf join (faction) - Entra na facção foi foi convidado. +HelpKick /mf kick - Expulsa um jogador da sua facção. +HelpLaws /mf laws - Veja as leis da sua facção. +HelpLeave /mf leave - Sair da facção atual. +HelpList /mf list - Lista todas as facções do servidor. +HelpLock /mf lock - Tranca uma porta ou bau. +HelpMakePeace /mf makepeace - Manda uma oferta de paz para outra facção. +HelpMap /mf map - Exibe um mapa das reivindicações perto de seus arredores. +HelpMembers /mf members - Lista os membros de sua facção ou de outra facção. +HelpPower /mf power - Checa o seu nivel de poder. +HelpPrefix /mf prefix (prefix) - Defina o prefixo da sua facção. +HelpPromote /mf promote - Promove um membro ao titulo de Oficial. +HelpRemoveLaw /mf removelaw - Remove uma lei da sua facção. +HelpRename /mf rename - Renomeia a sua facção +HelpResetPowerLevels /mf resetpowerlevels - Redefina os registros de poder do jogador e os níveis de poder cumulativos das facções. +HelpRevokeAccess /mf revokeaccess - Revoga o acesso do jogador sobre algum bloco bloqueado. +HelpSetHome /mf sethome - Define a home da sua facção. +HelpSwearFealty /mf swearfealty - Jure fidelidade a uma facção. +HelpTransfer /mf transfer - Transfira a propriedade de sua facção para outro jogador.\n +HelpUnclaim /mf unclaim - Abandona terras da sua facção. +HelpUnclaimall /mf unclaimall - Abandona todas as terras da sua facção. +HelpUnlock /mf unlock Desbloqueia uma porta ou bau. +HelpVassalize /mf vassalize - Ofereça-se para vassalizar uma facção. +HelpVersion /mf version - Checa a versão do plugin. +HelpWho /mf who - Veja as informações da facção de um jogador específico. +HomeClaimedByAnotherFaction A home foi reivindicado por outra facção e foi perdida. +HomeIsInUnclaimedChunk A home está em uma terra não reinvindicada e não está disponível. +HourlySaveAlert Medieval Factions esta salvando. Isso vai acontecer a cada 1 hora. +IntegerSet Integer set. +InvitationExpired Sey convite para %s expirou. +InvitationSent Convite enviado. +KeysLoaded Keys loaded: %d +LandAlreadyClaimedBy Esta terra já foi reinvindicada por +LandAlreadyClaimedByYourFaction Esta terra já foi reinvindicada por sua facção. +LandClaimedBy Esta terra esta reinvindicada por %s. +LandClaimedUsingAdminBypass Terra abandonada usando uma admin bypass. +LandIsNotClaimed Esta terra não esta reinvindicada. +LandIsUnclaimed Esta terra esta abandonada. +LandNotCurrentlyClaimed Esta terra atualmente não esta reinvindicada. +LandUnclaimed Terra abandonada. +LawAdded Lei adicionada. +LawEdited Lei modificada. +LawRemoved Lei removida. +LawsTitle == Leis de %s == +LeverSuccessfullyLinked Criando portão 4/4: Alavanca linkada com sucesso. +Liege Soberano: %s +ListLegend P: Poder, M: Membros, L: Terra +LoadingClaimedChunks Carregando chunks das terras... +LoadingLockedBLocks Carregando blocos bloqueados... +LoadingPlayerPowerRecords Carregando registros de poder... +Locked Bloqueado. +LockedBlockSuccessfullyLoaded Bloco Bloqueado carregado com sucesso. +LockedBy Bloqueado por %s +LockingCancelled Bloqueamento cancelado. +LockRemovalError Um erro ocorreu durante a remoção do bloqueio. +MaterialsMismatch1 Erro ao colocar ponto 1: Materiais incompatíveis. +MaterialsMismatch2 Erro ao colocar ponto 2: Materiais incompatíveis. +MedievalFactionsStringRight Medieval-Factions-%s +MedievalFactionsTitle == Medieval Factions %s == +MembersOf Membro de %s +MissingFactionGatesJSONCollection Não foi possível carregar os gates porque a coleção 'factionGates' não existia no arquivo JSON das facções. Você está atualizando de uma versão anterior? A configuração padrão foi definida. +MovementDetectedTeleportCancelled Movimento detectado. Teleporte cancelado. +MustBeAtWarOrFactionMustBeInactive Você já Deve estar em guerra com a facção alvo ou a facção alvo deve esta inativa. +MustBeInFaction Desculpe, você precisa estar em uma facção para fazer isso. +MustBeOwner Desculpe, você precisa ser dono de uma facção para utilizar esse comando. +MustOwnFactionOrBeOfficer Você precisa ser dono de uma facção ou ser oficial de uma facção para usar este comando. +MustTransferOwnership Desculpa. Você deve transferir a propriedade ou expulsar todos em sua facção para sair. +Name Nome: %s +NameAlreadyTaken Este nome já esta em uso. +NeutralityDisabled Sua neutralidade foi desabilitada. +NoBlockDetectedToCheckForGate Nenhum bloco detectado para verificar o portão. +NoFactionsDesignatedSingleQuotesRequired Nenhuma facção designada. Deve ser indicado entre aspas simples. +NoLongerBypassingProtections Você não está mais contornando as bypassings fornecidas pelas facções medievais. +NoLongerInFactionChat Você não esta mais no chat da facção +NotAMemberOfAnyFaction Você não é membro de nenhuma facção. +NotAnAlly %s Não é seu aliado. +NotAnAllyOrVassal %s Não é seu aliado ou seu vassalo. +NotAtWarWith Você não esta em guerra com %s +NotAVassalOfAFaction Você não é vassalo de uma facção. NotEnoughArgumentsDesignatedSingleQuotesRequired Argumentos insuficientes designados. Deve ser designado entre aspas simples. -NotTheOwnerOfThisBlock Você não é dono deste bloco. -NotTheOwnerOfThisFaction Você não é dono desta facção. -NoVassalOrLiegeReferences Não há referências de vassalos ou vassalos associados a essa facção. -NowBypassingProtections Agora você tem as proteções bypassing dadas por Medieval Factions. -NowSpeakingInFactionChat Agora você esta falando no chat da facção. -OnlyPlayersCanUseCommand Somente jogadores podem usar esse comando. -OnlyUseLeversInClaimedTerritory Error: Você só pode usar alavancas em terras reinvindicadas. -Owner Dono: %s -OwnershipTransferred O dono de %s transferiou o cardo de dono para você. -OwnerShipTransferredTo Cargo de dono transferido para %s -PermissionNeeded Desculpa. Para usar este comando, você precisa da seguinte permissão: ''%s' -PlayerAlreadyDueling %s Já esta duelando com alguém. -PlayerAlreadyInFaction Este jogador já esta em uma facção. -PlayerAlreadyOfficer Este membro já é um oficial. -PlayerAndDesiredPowerSingleQuotesRequirement O jogador e o poder desejado devem ser designados entre aspas simples. -PlayerByNameNotFound Desculpe. o jogador de nome %s não pode ser encontrado. -PlayerCantBePromotedBecauseOfLimit O membro não pode ser promovido porque você atingiu seu limite. Limite: %d -PlayerDemoted Membro rebaixado. -PlayerIsNotInAFaction Este jogador não esta em uma facção. -PlayerIsNotInYourFaction Este jogador não esta na sua facção. -PlayerIsNotMemberOfFaction Este jogador não é membro da sua facção. -PlayerIsNotOfficerOfFaction Este jogador não é oficial em sua facção. -PlayerNotFound Jogador não encontrado. -PlayerPowerRecordsLoaded Registros de poder do jogador carregados. -PlayerPromoted Membro promovido. -PleaseWaitGate Este é o portão %s, por favor espere. -PluginDisabled Medieval Factions plugin desativado. -PluginDisabling Medieval Factions plugin desativando.... -PluginEnabled Medieval Factions plugin ativado. -PluginEnabling Medieval Factions plugin ativando.... -PluginLoading Medieval Factions plugin esta carregando... -PluginSaving Medieval Factions plugin esta salvando... -Point1PlacementSuccessful Criando portão 1/4: Ponto 1 definido com sucesso. -Point2PlacedSuccessfully Criando portão 2/4: Ponto 2 definido com sucesso. -Population População: %d -PowerHasDecayed Seu poder decaiu por %d desde a última vez que você saiu. Seu poder agora é %d. -PowerLevel Nível de poder: %s -PowerLevelHasBeenSetTo O nivel de poder deste jogador foi definido para %d -PowerLevelHasIncreased Seu nível de poder aumentou. -PowerLevelResetting Resetando nivel de poder... -PrefixesDisabled Prefixos estão desativados. -PrefixSet Prefixo definido. -PrefixTaken Este prefixo já esta sendo usado. -ProblemLoadingClaimedChunks Ocorreu um problema ao carregar as chunks reinvindicadas. -ProblemLoadingFactions Ocorreu um problema carregando as facções. -ProblemLoadingPowerRecords Ocorreu um problema ao carregar os registros dos jogares. -PromotedToOfficer Você foi promovido aos status de oficial em sua facção. -RadiusRequirement O raio deve estar entre 0 e %d. -RemovedGate o portão '%s' foi removido. -ResettingIndividualPowerRecords Reiniciando os registros individuais dos jogadores. -RightClickCheckAccess Clique com o botão direito em um bloco bloqueado para verificar quem tem acesso a ele. escreva '/mf checkaccess cancel' para cancelar. -RightClickForceUnlock Clique com o botão direito em um baú ou porta para destrancar com força! (Escreva /mf force unlock cancel para cancelar) -RightClickGrantAccess Clique com o botão direito em um baú ou porta para garantir a %s o acesso. Escreva /mf grantaccess cancel para cancelar. -RightClickLock Clique com o botão direito para bloquea-lo. (Escreva /mf lock cancel para cancelar) -RightClickRevokeAccess Clique com o botão direito para remover o acesso de um membro. Escreva '/mf revokeaccess cancel' para cancelar. -RightClickUnlock Clique com o botão direito para desbloquear um bloco. (Escreva /mf unlock cancel para cancelar) -SchedulingHourlyAutoSave Agendamento de salvamento automático de hora em hora... -SchedulingPowerDecrease Diminuição de poder programado... -SchedulingPowerIncrease Aumento de poder programado... -SingleQuotesAlliedWarring Facção aliada e facção em guerra devem ser designadas entre aspas simples. -StringSet String definida. -SubCommands Sub-comandos: -SuccessFactionMemberRemoval Sucesso. Se o jogador estava em uma facção, ele não é mais um membro. -SuccessForceJoin Sucesso o jogador foi forçado a entra em uma facção. -SuccessfulDisbandment %s foi abandonada com sucesso. -SuccessOfficerRemoval Sucesso se o jogador era considerado oficial em alguma facção, ele não é mais. -SuccessReferencesRemoved As referências foram removidas com sucesso. -SupportedLanguageIDList Línguas suportadas idlist: %s -SurroundedChunkProtected A facção alvo tentou reivindicar as terras ao norte, leste, sul e oeste desta terra. Elas não podem ser conquistadas. -TargetBlockNotPartOfGate O bloco alvo não faz parte de um portão. -TargetFactionNotOverClaiming A facção alvo não tem mais terras do que seu limite de propriedade. -TeleportingAlert Teleportando em 3 segundos... -ThreeBlockRequirement Erro ao definir o ponto 2: O portão deve ter 3 blocos ou mais. -TriggerBlockNotLever O bloco de gatilho não era uma alavanca. Posicionamento do portão cancelado. -UsageAddLaw Usage: /mf addlaw (Nova Lei) -UsageAlly Usage: /mf ally (Nome da facção) -UsageBreakAlliance Usage: /mf breakalliance (Nome da facção) -UsageClaimRadius Usage: /mf claim (raio) -UsageConfigSet Usage: /mf config set (option) (value) -UsageConfigShow Usage: /mf config show ( 1 | 2 ) -UsageCreate Usage: /mf create [Nome da facção] -UsageDeclareWar Usage: /mf declarewar (Nome da facção) -UsageDemote Usage: /mf demote (Nome do jogador) -UsageDesc Usage: /mf desc (Descrição) -UsageEditLaw Usage: /mf editlaw (número) (lei) -UsageFlagsSet Usage: /mf flags set (option) (value) -UsageForceBonusPower Usage: /mf force bonuspower 'facção' 'número' -UsageForceClaim Usage: /mf force claim 'nome da facção' -UsageForceCreate Usage: /mf force create 'nome da facção' -UsageForceDemote Usage: /mf force demote (jogador) -UsageForceFlag Usage: /mf force 'facção' 'opção' 'valor' -UsageForceJoin Usage: /mf force join 'jogador' 'facção' -UsageForceKick Usage: /mf force kick (jogador) -UsageForcePeace Usage: /mf force peace 'facção-1' 'facção-2' -UsageForcePower Usage: /mf force power 'jogador' 'número' -UsageForceRemoveVassal /mf force removevassal 'facção-1' 'facção-2' -UsageForceRename Usage: /mf force rename 'facção' 'novo nome' -UsageForceRenounce Usage: /mf force renounce 'facção' -UsageForceTransfer Usage: /mf force transfer 'nome da facção' 'jogador' -UsageGrantAccess Usage: /mf grantaccess (nome do jogador) -UsageGrantIndependence Usage: /mf grantindependence (nome da facção) -UsageInvite Usage: /mf invite (nome do jogador) -UsageInvoke Usage: /mf invoke '(nome da facção aliada)' '(facção em guerra)' -UsageJoin Usage: /mf join (nome da facção) -UsageKick Usage: /mf kick (nome do jogador) -UsageMakePeace Usage: /mf makepeace (nome da facção) -UsagePrefix Usage: /mf prefix (novo prefixo) -UsagePromote Usage: /mf promote (nome do jogador) -UsageRemoveLaw Usage: /mf removelaw (número) -UsageRename Usage: /mf rename (novo nome) -UsageRevokeAccess Usage: /mf revokeaccess (nome do jogador) -UsageSwearFealty Usage: /mf swearfealty (nome da facção) -UsageTransfer Usage: /mf transfer (nome do jogador) -UsageVassalize Usage: /mf vassalize (nome da facção) -UsageWho Usage: /mf who (nome do jogador) -ValidSubCommandsShowSet Sub-comandos validos: show, set -VassalContribution Bonus de poder do vassalo: %d -Vassals Vassals: %s -WarningPlayerAlreadyStartedCreatingGate Perigo: O jogador já esta criando um portão. startCreatingGate() chamada ignorada. -WasntFound %s' não foi encontrada. -WelcomeBackLastLogout Bem-vindo de volta %s. seu ultimo login foi a %s atrás. -WikiLink Wiki: https://github.com/DansPlugins/Medieval-Factions/wiki -Wilderness Wilderness -WorldsMismatch1 Erro ao definir o ponto 1: Mundos incompatíveis. -WorldsMismatch2 Erro ao definir o ponto 2: Mundos incompatíveis. \ No newline at end of file +NotTheOwnerOfThisBlock Você não é dono deste bloco. +NotTheOwnerOfThisFaction Você não é dono desta facção. +NoVassalOrLiegeReferences Não há referências de vassalos ou vassalos associados a essa facção. +NowBypassingProtections Agora você tem as proteções bypassing dadas por Medieval Factions. +NowSpeakingInFactionChat Agora você esta falando no chat da facção. +OnlyPlayersCanUseCommand Somente jogadores podem usar esse comando. +OnlyUseLeversInClaimedTerritory Error: Você só pode usar alavancas em terras reinvindicadas. +Owner Dono: %s +OwnershipTransferred O dono de %s transferiou o cardo de dono para você. +OwnerShipTransferredTo Cargo de dono transferido para %s +PermissionNeeded Desculpa. Para usar este comando, você precisa da seguinte permissão: ''%s' +PlayerAlreadyDueling %s Já esta duelando com alguém. +PlayerAlreadyInFaction Este jogador já esta em uma facção. +PlayerAlreadyOfficer Este membro já é um oficial. +PlayerAndDesiredPowerSingleQuotesRequirement O jogador e o poder desejado devem ser designados entre aspas simples. +PlayerByNameNotFound Desculpe. o jogador de nome %s não pode ser encontrado. +PlayerCantBePromotedBecauseOfLimit O membro não pode ser promovido porque você atingiu seu limite. Limite: %d +PlayerDemoted Membro rebaixado. +PlayerIsNotInAFaction Este jogador não esta em uma facção. +PlayerIsNotInYourFaction Este jogador não esta na sua facção. +PlayerIsNotMemberOfFaction Este jogador não é membro da sua facção. +PlayerIsNotOfficerOfFaction Este jogador não é oficial em sua facção. +PlayerNotFound Jogador não encontrado. +PlayerPowerRecordsLoaded Registros de poder do jogador carregados. +PlayerPromoted Membro promovido. +PleaseWaitGate Este é o portão %s, por favor espere. +PluginDisabled Medieval Factions plugin desativado. +PluginDisabling Medieval Factions plugin desativando.... +PluginEnabled Medieval Factions plugin ativado. +PluginEnabling Medieval Factions plugin ativando.... +PluginLoading Medieval Factions plugin esta carregando... +PluginSaving Medieval Factions plugin esta salvando... +Point1PlacementSuccessful Criando portão 1/4: Ponto 1 definido com sucesso. +Point2PlacedSuccessfully Criando portão 2/4: Ponto 2 definido com sucesso. +Population População: %d +PowerHasDecayed Seu poder decaiu por %d desde a última vez que você saiu. Seu poder agora é %d. +PowerLevel Nível de poder: %s +PowerLevelHasBeenSetTo O nivel de poder deste jogador foi definido para %d +PowerLevelHasIncreased Seu nível de poder aumentou. +PowerLevelResetting Resetando nivel de poder... +PrefixesDisabled Prefixos estão desativados. +PrefixSet Prefixo definido. +PrefixTaken Este prefixo já esta sendo usado. +ProblemLoadingClaimedChunks Ocorreu um problema ao carregar as chunks reinvindicadas. +ProblemLoadingFactions Ocorreu um problema carregando as facções. +ProblemLoadingPowerRecords Ocorreu um problema ao carregar os registros dos jogares. +PromotedToOfficer Você foi promovido aos status de oficial em sua facção. +RadiusRequirement O raio deve estar entre 0 e %d. +RemovedGate o portão '%s' foi removido. +ResettingIndividualPowerRecords Reiniciando os registros individuais dos jogadores. +RightClickCheckAccess Clique com o botão direito em um bloco bloqueado para verificar quem tem acesso a ele. escreva '/mf checkaccess cancel' para cancelar. +RightClickForceUnlock Clique com o botão direito em um baú ou porta para destrancar com força! (Escreva /mf force unlock cancel para cancelar) +RightClickGrantAccess Clique com o botão direito em um baú ou porta para garantir a %s o acesso. Escreva /mf grantaccess cancel para cancelar. +RightClickLock Clique com o botão direito para bloquea-lo. (Escreva /mf lock cancel para cancelar) +RightClickRevokeAccess Clique com o botão direito para remover o acesso de um membro. Escreva '/mf revokeaccess cancel' para cancelar. +RightClickUnlock Clique com o botão direito para desbloquear um bloco. (Escreva /mf unlock cancel para cancelar) +SchedulingHourlyAutoSave Agendamento de salvamento automático de hora em hora... +SchedulingPowerDecrease Diminuição de poder programado... +SchedulingPowerIncrease Aumento de poder programado... +SingleQuotesAlliedWarring Facção aliada e facção em guerra devem ser designadas entre aspas simples. +StringSet String definida. +SubCommands Sub-comandos: +SuccessFactionMemberRemoval Sucesso. Se o jogador estava em uma facção, ele não é mais um membro. +SuccessForceJoin Sucesso o jogador foi forçado a entra em uma facção. +SuccessfulDisbandment %s foi abandonada com sucesso. +SuccessOfficerRemoval Sucesso se o jogador era considerado oficial em alguma facção, ele não é mais. +SuccessReferencesRemoved As referências foram removidas com sucesso. +SupportedLanguageIDList Línguas suportadas idlist: %s +SurroundedChunkProtected A facção alvo tentou reivindicar as terras ao norte, leste, sul e oeste desta terra. Elas não podem ser conquistadas. +TargetBlockNotPartOfGate O bloco alvo não faz parte de um portão. +TargetFactionNotOverClaiming A facção alvo não tem mais terras do que seu limite de propriedade. +TeleportingAlert Teleportando em 3 segundos... +ThreeBlockRequirement Erro ao definir o ponto 2: O portão deve ter 3 blocos ou mais. +TriggerBlockNotLever O bloco de gatilho não era uma alavanca. Posicionamento do portão cancelado. +UsageAddLaw Usage: /mf addlaw (Nova Lei) +UsageAlly Usage: /mf ally (Nome da facção) +UsageBreakAlliance Usage: /mf breakalliance (Nome da facção) +UsageClaimRadius Usage: /mf claim (raio) +UsageConfigSet Usage: /mf config set (option) (value) +UsageConfigShow Usage: /mf config show ( 1 | 2 ) +UsageCreate Usage: /mf create [Nome da facção] +UsageDeclareWar Usage: /mf declarewar (Nome da facção) +UsageDemote Usage: /mf demote (Nome do jogador) +UsageDesc Usage: /mf desc (Descrição) +UsageEditLaw Usage: /mf editlaw (número) (lei) +UsageFlagsSet Usage: /mf flags set (option) (value) +UsageForceBonusPower Usage: /mf force bonuspower 'facção' 'número' +UsageForceClaim Usage: /mf force claim 'nome da facção' +UsageForceCreate Usage: /mf force create 'nome da facção' +UsageForceDemote Usage: /mf force demote (jogador) +UsageForceFlag Usage: /mf force 'facção' 'opção' 'valor' +UsageForceJoin Usage: /mf force join 'jogador' 'facção' +UsageForceKick Usage: /mf force kick (jogador) +UsageForcePeace Usage: /mf force peace 'facção-1' 'facção-2' +UsageForcePower Usage: /mf force power 'jogador' 'número' +UsageForceRemoveVassal /mf force removevassal 'facção-1' 'facção-2' +UsageForceRename Usage: /mf force rename 'facção' 'novo nome' +UsageForceRenounce Usage: /mf force renounce 'facção' +UsageForceTransfer Usage: /mf force transfer 'nome da facção' 'jogador' +UsageGrantAccess Usage: /mf grantaccess (nome do jogador) +UsageGrantIndependence Usage: /mf grantindependence (nome da facção) +UsageInvite Usage: /mf invite (nome do jogador) +UsageInvoke Usage: /mf invoke '(nome da facção aliada)' '(facção em guerra)' +UsageJoin Usage: /mf join (nome da facção) +UsageKick Usage: /mf kick (nome do jogador) +UsageMakePeace Usage: /mf makepeace (nome da facção) +UsagePrefix Usage: /mf prefix (novo prefixo) +UsagePromote Usage: /mf promote (nome do jogador) +UsageRemoveLaw Usage: /mf removelaw (número) +UsageRename Usage: /mf rename (novo nome) +UsageRevokeAccess Usage: /mf revokeaccess (nome do jogador) +UsageSwearFealty Usage: /mf swearfealty (nome da facção) +UsageTransfer Usage: /mf transfer (nome do jogador) +UsageVassalize Usage: /mf vassalize (nome da facção) +UsageWho Usage: /mf who (nome do jogador) +ValidSubCommandsShowSet Sub-comandos validos: show, set +VassalContribution Bonus de poder do vassalo: %d +Vassals Vassals: %s +WarningPlayerAlreadyStartedCreatingGate Perigo: O jogador já esta criando um portão. startCreatingGate() chamada ignorada. +WasntFound %s' não foi encontrada. +WelcomeBackLastLogout Bem-vindo de volta %s. seu ultimo login foi a %s atrás. +WikiLink Wiki: https://github.com/DansPlugins/Medieval-Factions/wiki +Wilderness Wilderness +WorldsMismatch1 Erro ao definir o ponto 1: Mundos incompatíveis. +WorldsMismatch2 Erro ao definir o ponto 2: Mundos incompatíveis. \ No newline at end of file diff --git a/src/main/resources/ru.tsv b/src/main/resources/ru.tsv index 20e515539..02a33a4b7 100644 --- a/src/main/resources/ru.tsv +++ b/src/main/resources/ru.tsv @@ -1,551 +1,551 @@ -AcceptedChallengeDuelHasBegun Вы приняли вызов %s, дуэль началась. -AlertAccessGrantedTo Доступ был предоставлен %s -AlertAccessRevokedFor Доступ у %s был отозван -AlertAllianceHasBeenBroken %s разорвал союз с Вашей фракцией. -AlertAlreadyAtWarWith Ваша фракция уже воюет с %s. -AlertAlreadyCreatingGate Вы уже в режиме создания ворот. -AlertAlreadyDueling Вы уже участвуете в дуэли. -AlertAlreadyDuelingPlayer Вы уже сражаетесь с %s. -AlertAlreadyDuelingSomeone Вы уже сражаетесь с кем-то. -AlertAlreadyGrantingAccess Вы уже предоставляете доступ кому-то. Введите /mf grantacess cancel, чтобы отозвать его. -AlertAlreadyInFaction Вы уже во фракции, извините. -AlertAlreadyRequestedAlliance Вы уже запросили союз с этой фракцией. -AlertAlreadyRequestedPeace Вы уже запросили заключение мира с этой фракцией. -AlertAttemptedAlliance %s попытался вступить в союз с %s. -AlertAttemptedVassalization %s попытался вассализировать вашу фракцию. Если вы являетесь её владельцем, введите '/mf swearfealty %s', чтобы принять. -AlertBeenInvited Вас пригласили в %s. Чтобы присоединиться, введите /mf join %s. -AlertCalledToWar1 %s призвал Вашу фракцию к войне с %s. -AlertCalledToWar2 %s призвал %s на войну с вашей фракцией. -AlertCalledToWar3 Ваша фракция призвала %s на войну с %s. -AlertChallengedToDuel %s вызвал %s на дуэль. -AlertChallengedToDuelPlusHowTo %s вызвал вас на дуэль. Введите /mf duel accept, чтобы начать. -AlertChallengeIssued Вы вызвали %s на дуэль. -AlertChallengeWasAccepted %s принял Ваш вызов, дуэль началась. -AlertChangedGateName Имя ворот изменено на '%s'. -AlertCurrentPowerLevel Ваш текущий уровень мощности составляет %d/%d. -AlertDecreasingThePowerOfInactivePlayers Medieval Factions снижает силу каждого игрока на %d, если он не был в сети более %d минут. Это будет происходить каждые %d минут. -AlertDemotion Вы были понижены до статуса члена вашей фракции. -AlertDisbandmentDueToZeroPower Ваша фракция была расформирована, так как ее совокупная сила достигла нуля. -AlertFactionAttemptedToVassalize Ваша фракция попыталась вассализировать %s. -AlertFactionHasBeenVassalized Ваша фракция была вассализирована, и у нее теперь новый сюзерен: %s -AlertFactionHasNewVassal У вашей фракции появился новый вассал: %s -AlertFactionHomeRemoved Дом вашей фракции был удален. -AlertFactionIsWeakened У вашей фракции меньше половины максимальной силы. Он больше не будет получать дополнительную силу от вассалов, и ваши вассалы теперь уязвимы. -AlertForcedDemotion Вы были уволены со звания офицера в вашей фракции. -AlertForcedKick Вас выгнали из фракции. -AlertForcedLoad Medieval Factions был загружен. -AlertForcedSave Medieval Factions был сохранён вручную. -AlertForcedToJoinFaction Вас вынудили вступить во фракцию. -AlertGate Это ворота под названием '%s'. -AlertGrantedIndependence %s предоставил вашей фракции независимость. -AlertIncreasingThePowerOfEveryPlayer Medieval Factions увеличивает силу каждого игрока на %d. Это будет происходить каждые %d минут. -AlertJoinedFaction Вы вступили во фракцию. -AlertKicked %s выгнал Вас из Вашей фракции. -AlertLandClaimed Эта земля была присвоена. Размер владения: %d/%d -AlertLandConqueredFromAnotherFaction Земля, завоеванная %s. Размер владения: %d/%d -AlertLandConqueredFromYourFaction %s захватил земли вашей фракции. -AlertLeftFaction Вы покинули свою фракцию. -AlertLeftFactionAndItGotDeleted Вы покинули свою фракцию. Она был удалена, так как никто не был её участником. -AlertMoreClaimedChunksThanPower У вашей фракции больше присвоенных земель, чем её мощь. Вашу землю можно завоевать. -AlertMustBeAtWarToConquer Ваши фракции должны вести войну, чтобы вы могли завоевать её землю. -AlertMustBeInFactionToUseCommand Чтобы использовать эту команду, Вы должны принадлежать к какой-либо фракции. -AlertMustBeMemberToCreateGate Вы должны быть членом этой фракции, чтобы создать ворота. -AlertMustBeOfficerOrOwnerToClaimLand Вы должны быть офицером или владельцем фракции, чтобы присвоить землю. -AlertMustBeOwnerOrOfficerToCreateGate Чтобы создать ворота, Вы должны быть владельцем или офицером фракции. -AlertMustBeOwnerOrOfficerToUseCommand Чтобы использовать эту команду, Вы должны быть владельцем фракции или её офицером. -AlertMustBeOwnerToInvokeAlliance Чтобы создать альянс, Вы должны быть владельцем своей фракции. -AlertMustBeOwnerToUseCommand Чтобы использовать эту команду, вы должны быть владельцем фракции. -AlertMustKickAllPlayers Вам нужно выгнать всех игроков, прежде чем вы сможете распустить свою фракцию. -AlertNoGatesDefined У Вашей фракции нет ворот. -AlertNoLaws У Вашей фракции нет законов. -AlertNoLongerVassalFaction %s больше не является вассальной фракцией. -AlertNonOwnership Вам это не принадлежит. -AlertNoPendingChallenges У Вас нет незавершенных задач, которые можно отменить. -AlertNotAllied Ваша фракция не состоит в союзе с %s. -AlertNotBeenChallenged Вас никто не вызывал на дуэль. -AlertNotBeenChallengedByPlayer %s не вызывал Вас на дуэль. -AlertNotInFaction Вы не состоите во фракции. -AlertNotInvitedToFaction Вы не приглашены в эту фракцию. -AlertNotOfferedVassalizationBy Эта фракция не предлагала Вам стать её вассалом. -AlertNowAlliedWith Ваша фракция теперь в союзе с %s. -AlertNowAtPeaceWith %s теперь в мире с %s. -AlertPlayerAlreadyOwner Этот игрок уже является владельцем этой фракции. -AlertPlayerNotInFaction Этот игрок не входит в эту фракцию. -AlertPowerLevelDecreased Ваш уровень мощности снизился. -AlertPowerLevelIncreasedBy Вы чувствуете себя сильнее. Ваша сила увеличилась на %d. -AlertReachedDemesne Вы достигли предела своих владений. Пригласите больше игроков, чтобы увеличить его. -AlertUnlocked Разблокирован. -AlertUnlockingCancelled Разблокировка отменена. -AllianceBrokenWith Альянс с %s был разорван. -AlliedWith В союзе с: %s -AllLandUnclaimed Все земли стали независимыми. -AllLandUnclaimedFrom Все земли %s обрели независимость. -AlreadyEnteredCheckAccess Вы уже используете эту команду. Введите '/mf checkacesss cancel' чтобы прекратить. -AlreadyEnteredRevokeAccess Вы уже используете эту команду. Введите '/mf revokeaccess cancel' чтобы прекратить. -AlreadyInFaction Извините, но Вы уже состоите во фракции. Покиньте её, если хотите создать другую. -ArgumentMustBeNumber Аргумент должен быть числом. -ArgumentsSingleQuotesRequirement Аргументы необходимо заключать в одинарные кавычки. -AssignedToRandomFaction Вы попали в случайную фракцию. -AttemptedAlliance Попытка вступить в союз с %s -AttemptedPeace Попытка заключить мир с %s -AtWarWith В состоянии войны с: %s -AutoclaimToggled Автоприсоединение земель отключено. -BlockAlreadyLocked Этот блок уже заблокирован. -BlockIsNotLocked Этот блок не заблокирован. -BlockIsPartOfGateMustRemoveGate Этот блок является частью ворот под названием '%s'. Вы должны сначала удалить эти ворота. -BonusPower Бонусная сила от админов: %d -BooleanSet Булевый тип установлен. -Cancelled Отменено. -CancelledGatePlacement1 Ошибка размещения точки 1. Размещение ворот отменено. -CancelledGatePlacement2 Ошибка размещения точки 2. Размещение ворот отменено. -CancelledGatePlacementErrorLinking Ошибка привязки к рычагу. Размещение ворот отменено. -CannotAllyWithSelf Вы не можете вступить в союз с собственной фракцией. -CannotAttackFactionMember Вы не можете атаковать другого игрока, если состоите с ним в одной фракции. -CannotAttackNonWarringPlayer Вы не можете атаковать другого игрока, если ваши фракции не воюют. -CannotBreakAllianceWithSelf Вы не можете разорвать союз с собственной фракцией. -CannotBringNeutralFactionIntoWar Нельзя вовлекать нейтральные фракции в войну. -CannotCancelActiveDuel Нельзя отменить активную дуэль. -CannotDeclareWarIfLiegeNotWeakened Вы не можете объявить войну вассальной фракции, если их сюзерен не ослаблен. -CannotDeclareWarIfNeutralFaction Нейтральные фракции не могут объявлять войну. -CannotDeclareWarOnAlly Вы не можете объявить войну своему союзнику. -CannotDeclareWarOnLiege Вы не можете объявить войну своему сюзерену. Используйте вместо этого команду '/mf declareindeperence'. -CannotDeclareWarOnNeutralFaction Вы не можете объявить войну нейтральной фракции. -CannotDeclareWarOnVassal Вы не можете объявить войну своему вассалу. -CannotDeclareWarOnYourself Вы не можете объявить войну самому себе. -CannotDemoteSelf Вы не можете понизить себя. -CannotDuelSelf Вы не можете сражаться с собой. -CannotFindDynmap Не могу найти динамическую карту. -CannotForciblyKickOwner Невозможно исключить владельца из его собственной фракции. Попробуйте распустить фракцию. -CannotGrantAccessToSelf Вы не можете предоставить себе доступ. -CannotKickOwner Нельзя выгнать владельца. -CannotKickSelf Вы не можете выгнать самого себя. -CannotMakePeaceWithSelf Вы не можете заключить мир со своей собственной фракцией. -CannotPlaceChestsNextToUnownedLockedChests Вы не можете размещать сундуки рядом с другими заблокированными сундуками, которыми вы не владеете. -CannotPlaceHoppersNextToUnownedLockedChests Вы не можете размещать воронки рядом, под или над закрытыми сундуками, которыми вы не владеете. -CannotPromoteSelf Вы не можете продвигать себя. -CannotRevokeAccessFromSelf Вы не можете запретить себе доступ. -CannotSetFactionHomeInWilderness Вы не можете разместить столицу свой фракции на земле, которая не в её владениях. -CannotSetVersion Не могу установить версию. -CannotTransferToSelf Вы не можете передать владение вашей фракцией самому себе. -CannotVassalizeLiege Вы не можете вассализировать своего сюзерена. -CannotVassalizeSelf Вы не можете вассализировать свою фракцию. -CannotVassalizeVassal Вы не можете вассализировать ту фракцию, у которой уже есть сюзерен. -CanOnlyCreateGatesInClaimedTerritory Вы можете создавать ворота только на своей территории. -CanOnlyLockBlocksInClaimedTerritory Вы можете блокировать блоки только на земле, которой владеет ваша фракция. -CanOnlyLockInFactionTerritory Вы можете запирать вещи только на территории вашей фракции. -CanOnlyLockSpecificBlocks Вы можете запирать только сундуки, двери, бочки, люки, печи, наковальни или ворота. -ClaimedChunksLoaded Владения фракций загружены. -ClaimedChunksSuccessfullyLoaded Владения фракций успешно загружены. -ClickOnTriggerLever Нажмите на рычаг... -ClickToPlaceSecondCorner Щелкните, чтобы разместить второй угол... -CmdAddLaw addlaw -CmdAlly ally -CmdAutoClaim autoclaim -CmdBreakAlliance breakalliance -CmdBypass bypass -CmdChat chat -CmdCheckAccess checkaccess -CmdCheckClaim checkclaim -CmdClaim claim -CmdConfig config -CmdConfigSet set -CmdConfigShow show -CmdCreate create -CmdDeclareIndependence declareindependence -CmdDeclareWar declarewar -CmdDemote demote -CmdDesc desc -CmdDisband disband -CmdDuel duel -CmdDuelAccept accept -CmdDuelCancel cancel -CmdDuelChallenge challenge -CmdEditLaw editlaw -CmdFlags flags -CmdFlagsSet set -CmdFlagsShow show -CmdForce force -CmdForceBonusPower bonuspower -CmdForceClaim claim -CmdForceCreate create -CmdForceDemote demote -CmdForceFlag flag -CmdForceJoin join -CmdForceKick kick -CmdForceLoad load -CmdForcePeace peace -CmdForcePower power -CmdForceRename rename -CmdForceRenounce renounce -CmdForceSave save -CmdForceTransfer transfer -CmdForceUnlock unlock -CmdGate gate -CmdGateCancel cancel -CmdGateCreate create -CmdGateList list -CmdGateName name -CmdGateRemove remove -CmdGrantAccess grantaccess -CmdGrantIndependence grantindependence -CmdHelp help -CmdHome home -CmdInfo info -CmdInvite invite -CmdInvoke invoke -CmdJoin join -CmdKick kick -CmdLaws laws -CmdLeave leave -CmdList list -CmdLock lock -CmdMakePeace makepeace -CmdMembers members -CmdPower power -CmdPrefix prefix -CmdPromote promote -CmdRemoveLaw removelaw -CmdRename rename -CmdResetPowerLevels resetpowerlevels -CmdRevokeAccess revokeaccess -CmdSetHome sethome -CmdSwearFealty swearfealty -CmdTransfer transfer -CmdUnclaim unclaim -CmdUnclaimall unclaimall -CmdUnlock unlock -CmdVassalize vassalize -CmdVersion version -CmdWho who -CommandCancelled Команда отменена. -CommandNotRecognized Medieval Factions не распознал эту команду. -CommandsPage1 == Команды Medieval Factions Страница 1/%d == -CommandsPage2 == Команды Medieval Factions Страница 2/%d == -CommandsPage3 == Команды Medieval Factions Страница 3/%d == -CommandsPage4 == Команды Medieval Factions Страница 4/%d == -CommandsPage5 == Команды Medieval Factions Страница 5/%d == -CommandsPage6 == Команды Medieval Factions Страница 6/%d == -CommandsPage7 == Команды средневековых фракций Страница 7 /% d == -ConfigListPageOne ===== Страница списка конфигураций 1/2 ===== -ConfigListPageTwo ===== Страница списка конфигураций 2/2 ===== -CreatingGateCancelled Создание ворот отменено. -CreatingGateClickWithHoe Создание ворот. Нажмите на блок с золотой мотыгой в руке чтобы выбрать первую точку. -CuboidDisallowed1 Ошибка размещения точки 1: невозможно разместить кубоид. -CuboidDisallowed2 Ошибка размещения точки 2: невозможно разместить кубоид. -CurrentLanguageID Текущий ID языка: %s -CurrentlyNoFactions На данный момент фракций нет. -CurrentPowerLevel Текущий уровень мощи %s составляет %d/%d. -Defeated %s победил %s на дуэли. -DemesneSize Размер владения: %d/%d -Description Описание: %s -DescriptionSet Описание установлено. -DesignatedFactionNotFound Одна из указанных фракций не найдена. -DesiredPowerMustBeANumber Заданная мощь должна быть числом. -DeveloperList Разработчики: %s -DisbandmentDueToZeroPower %s была расформирована из-за того, что её совокупная мощь достигла нуля. -DoesntExist %s не существует. -Done Сделанный. -DoubleSet Двойной установлен. -DuelChallengeCancelled Вызов на дуэль отменен. -DuelEndedInTie Дуэль %s и %s закончилась вничью. -DynmapIntegrationSuccessful Интеграция с динамической картой прошла успешно. -ERROR ОШИБКА: -ErrorAddingAreaMarker Ошибка при добавлении маркера области %s -ErrorChunkRemoval При удалении запрошенного участка произошла ошибка. -ErrorClaimedChunkRemoval При удалении запрошенного участка произошла ошибка. -ErrorCouldNotFindGatesFaction Ошибка: не удалось найти фракцию для ворот '%s'. -ErrorCouldNotLoadFactionGate ОШИБКА: не удалось загрузить ворота фракции. \n -ErrorCreatingMarkerSet Ошибка при создании маркера. -ErrorIntegratingWithDynmap Ошибка интеграции с динамической картой: -ErrorPlayerPowerRecordForUUIDNotFound ОШИБКА: запись мощи игрока для uuid не найдена. Не удалось получить совокупный уровень мощи. -ErrorSettingAreaMarkerColor Ошибка при установке цвета маркера области на '%s'. -FactionAlreadyAlly Эта фракция уже является вашим союзником. -FactionAlreadyExists Извините. Эта фракция уже существует. -FactionAndPlayerSingleQuotesRequirement Фракцию и игрока следует указывать в одинарных кавычках. -FactionAndVassalSingleQuotesRequirement Фракция и вассал, подлежащие удалению, должны быть заключены в одинарные кавычки. -FactionCreated Фракция создана. -FactionCurrentlyEnemyMustMakePeace Эта фракция в настоящее время является Вашим врагом. Заключите мир, прежде чем попытаться вступить с ними в союз. -FactionDataLoadedSuccessfuly Данные фракций успешно загружены -FactionDoesNotExist Извините. Такой фракции не существует. -FactionDoesNotHaveLaws У этой фракции нет никаких законов. -FactionGates Врата фракций -FactionHomeLoadError Произошла ошибка при загрузке домашней позиции фракции. -FactionHomeNotSetYet Дом фракции еще не установлен. -FactionHomeSet Домашняя точка фракции установлена. -FactionInfo Информация о фракции %s -FactionIsNotVassal Эта фракция не является вашим вассалом. -FactionMustBeDesignatedInsideSingleQuotes Фракцию необходимо обозначать в одинарных кавычках. -FactionNameChanged Название фракции изменено. -FactionNameNotRecognized Это название фракции не было распознано. -FactionNameTooLong Это имя слишком длинное. -FactionNotEnemy Эта фракция Вам не враг. -FactionNotFound Эта фракция не найдена. -FactionsSuccessfullyLoaded Фракции успешно загружены. -FactionsTitle == Фракции == -FactionSuccessfullyDisbanded Фракция была успешно расформирована. -FactionSuccessfullyLoaded Фракция успешно загружена. -FileLoadError Произошла ошибка при загрузке файла -FollowingPlayersHaveAccess К этому блоку имеют доступ следующие игроки: -GateCreated Ворота успешно созданы. -HasAttemptedToMakePeaceWith %s попытался заключить мир с %s. -HasBeenKickedFrom %s исключен из %s -HasDeclaredIndependence %s заявил о своей независимости от %s. -HasDeclaredWarAgainst %s объявил войну %s. -HasJoined %s присоединился к %s -HelpAddLaw /mf addlaw - Добавить закон в вашу фракцию. -HelpAlly /mf ally - Вступить в союз с фракцией. -HelpAutoclaim /mf autoclaim - Включить автоматическое присвоение земель, чтобы упростить процесс расширения владений. -HelpBreakAlliance /mf breakalliance - Разорвать союз с фракцией. -HelpBypass /mf bypass - Обход защиты. -HelpChat /mf chat - Переключить чат фракции. -HelpCheckAccess /mf checkaccess - Проверить, у кого есть доступ к заблокированному блоку. -HelpCheckClaim /mf checkclaim - Проверить, кому принадлежит какая-нибудь земля. -HelpClaim /mf claim - Присоединить землю к своей фракции. -HelpConfigSet /mf config set (вариант) (значение) - Установить значение конфигурации. -HelpConfigShow /mf config show - Показать значения конфигурации. -HelpCreate /mf create (имя) - Создать новую фракцию. -HelpDeclareIndependence /mf declareindependence - Объявить независимость от вашего сюзерена. -HelpDeclareWar /mf declarewar - Объявить войну другой фракции. -HelpDemote /mf demote - Понизить офицера до звания участника. -HelpDesc /mf desc (описание) - Установить описание вашей фракции. -HelpDisband /mf disband - Распустить фракцию (Вы должны быть её владельцем). -HelpDuelAccept /mf duel accept (<необязательно> игрок) -HelpDuelCancel /mf duel cancel -HelpDuelChallenge /mf duel challenge (игрок) (<необязательно> ограничение по времени в секундах) -HelpEditLaw /mf editlaw - Редактировать уже существующий закон в Вашей фракции. -HelpFlagsSet /mf flags set (опция) (значение) - Установить флаг фракции. -HelpFlagsShow /mf flags show - Показать флаги фракций. -HelpForce /mf force - Заставить плагин выполнять определенные действия. -HelpForceBonusPower /mf force bonuspower 'фракция' число' -HelpForceClaim /mf force claim 'название фракции' -HelpForceCreate /mf force create 'фракция' -HelpForceDemote /mf force demote (игрок) -HelpForceFlag /mf force flag 'фракция' 'опция' 'значение' -HelpForceJoin /mf force join 'игрок' фракция 2 ' -HelpForceKick /mf force kick (игрок) -HelpForceLoad /mf force load -HelpForcePeace /mf force peace 'фракция1' фракция2 -HelpForcePower /mf force power 'игрок' 'номер' -HelpForceRemoveVassal /mf force removevassal 'фракция' 'вассал' -HelpForceRename /mf force rename 'фракцию' новое имя' -HelpForceRenounce /mf force renounce (фракция) -HelpForceSave /mf force save -HelpForceTransfer /mf force transfer 'фракция' 'игрок' -HelpForceUnlock /mf force unlock -HelpGateCancel /mf gate cancel -HelpGateCreate /mf gate create (<необязательно> название) -HelpGateList /mf gate list -HelpGateName /mf gate name (<необязательно> название) -HelpGateRemove /mf gate remove -HelpGrantAccess /mf grantaccess - Дать кому-то доступ к заблокированному блоку. -HelpGrantIndependence /mf grantindependence - Дать независимость вассалу. -HelpHelp /mf help # - Показать список полезных команд. -HelpHome /mf home - Телепортироваться на домашнюю точку Вашей фракции. -HelpInfo /mf info - Посмотреть информацию о Вашей или чужой фракции. -HelpInvite /mf invite (игрок) - Пригласить игрока в Вашу фракцию. -HelpInvoke /mf invoke (союзник) (враг) - Призвать союзную фракцию на войну. -HelpJoin /mf join (фракция) - Присоединиться к фракции по приглашению. -HelpKick /mf kick - Выгнать игрока из фракции. -HelpLaws /mf laws - Просмотреть законы своей фракции. -HelpLeave /mf leave - Покинуть фракцию. -HelpList /mf list - Список всех фракций на сервере. -HelpLock /mf lock - Заблокировать сундук или дверь. -HelpMakePeace /mf makepeace - Предложить другой фракции мир. -HelpMap /mf map - отобразить карту претензий рядом с вашим окружением. -HelpMembers /mf members - Список участников Вашей или чужой фракции. -HelpPower /mf power - Проверить уровень Вашей мощи. -HelpPrefix /mf prefix (префикс) - Установить префикс Вашей фракции -HelpPromote /mf promote - Повысить игрока до офицерского звания -HelpRemoveLaw /mf removelaw - Удалить закон Вашей фракции. -HelpRename /mf rename - Переименовать Вашу фракцию -HelpResetPowerLevels /mf resetpowerlevels - Сбросить записи мощи игроков и совокупной мощи фракции. -HelpRevokeAccess /mf revokeaccess - Отозвать доступ к заблокированному блоку у кого-либо. -HelpSetHome /mf sethome - Установить домашнюю точку фракции. -HelpSwearFealty /mf swearfealty - Поклясться в верности какой-либо фракции. -HelpTransfer /mf transfer - Передать владение Вашей фракцией другому игроку\n -HelpUnclaim /mf unclaim - Дать независимость какому-либо участку земли у Вашей фракции. -HelpUnclaimall /mf unclaimall - Дать независимость всем землям Вашей фракции. -HelpUnlock /mf unlock - Разблокировать сундук или дверь. -HelpVassalize /mf vassalize - Предложить какой-либо фракции стать Вашим вассалом. -HelpVersion /mf version - Проверить версию плагина. -HelpWho /mf who - Показать информацию о фракции указанного игрока. -HomeClaimedByAnotherFaction Домашняя точка захвачена другой фракцией и была потеряна. -HomeIsInUnclaimedChunk Домашняя точка находится на незанятой Вашей фракцией земле и поэтому недоступна. -HourlySaveAlert Medieval Factions сохраняется... Сохранение будет происходить каждый час. -IntegerSet Целые числа установлены. -InvitationExpired Срок действия Вашего приглашения %s истек. -InvitationSent Приглашение отправлено. -KeysLoaded Загружено ключей: %d -LandAlreadyClaimedBy Эта земля уже захвачена фракцией -LandAlreadyClaimedByYourFaction Эта земля уже занята Вашей фракцией. -LandClaimedBy Эта земля захвачена фракцией %s. -LandClaimedUsingAdminBypass Земля стала независимой благодаря администратору. -LandIsNotClaimed Эта земля никем не занята. -LandIsUnclaimed Эта земля не занята. -LandNotCurrentlyClaimed Эта земля в настоящее время никем не занята. -LandUnclaimed Земля не захвачена. -LawAdded Закон добавлен. -LawEdited Закон был отредактирован. -LawRemoved Закон удален. -LawsTitle == Законы %s == -LeverSuccessfullyLinked Создание ворот 4/4: Рычаг успешно соединён. -Liege Сюзерен: %s -ListLegend P: сила, M: участники, L: земли -LoadingClaimedChunks Загрузка захваченных земель... -LoadingLockedBLocks Загрузка заблокированных блоков... -LoadingPlayerPowerRecords Загрузка записей о мощи игроков... -Locked Заблокировано. -LockedBlockSuccessfullyLoaded Заблокированные блоки успешно загружены. -LockedBy Заблокировано игроком %s -LockingCancelled Блокировка отменена. -LockRemovalError Произошла ошибка при снятии блокировки. -MaterialsMismatch1 Ошибка размещения точки 1: Несоответствие материалов. -MaterialsMismatch2 Ошибка размещения пункта 2: Несоответствие материалов. -MedievalFactionsStringRight Medieval Factions-%s -MedievalFactionsTitle == Medieval Factions %s == -MembersOf Участники фракции %s -MissingFactionGatesJSONCollection Не удалось загрузить врата, потому что коллекция 'factionGates' не существует в JSON файле фракций. Вы обновились с предыдущей версии? Установка по умолчанию... -MovementDetectedTeleportCancelled Обнаружено движение. Телепорт отменён. -MustBeAtWarOrFactionMustBeInactive Должны быть в состоянии войны с указанной фракцией или же указанная фракция должна быть неактивной. -MustBeInFaction Извините, вы должны состоять в какой-либо фракции, чтобы использовать эту команду. -MustBeOwner К сожалению, для использования этой команды вы должны быть владельцем фракции. -MustOwnFactionOrBeOfficer Чтобы использовать эту команду, Вы должны быть владельцем фракции или её офицером. -MustTransferOwnership Сожалею. Вы должны передать право собственности или выгнать всех в вашей фракции, чтобы покинуть ее. -Name Имя: %s -NameAlreadyTaken Это имя уже занято. -NeutralityDisabled Нейтралитет в настоящее время отключен. -NoBlockDetectedToCheckForGate Не обнаружено блока для проверки ворот. -NoFactionsDesignatedSingleQuotesRequired Фракции не указаны. Нужно обязательно заключать их в одинарные кавычки. -NoLongerBypassingProtections Вы больше не обходите защиту Medieval Factions. -NoLongerInFactionChat Вы больше не в чате фракции. -NotAMemberOfAnyFaction Вы не состоите ни в какой фракции. -NotAnAlly %s не является Вашим союзником. -NotAnAllyOrVassal %s не является вашим союзником или вассалом. -NotAtWarWith Вы не воюете с %s -NotAVassalOfAFaction Вы не являетесь вассалом какой-либо фракции. +AcceptedChallengeDuelHasBegun Вы приняли вызов %s, дуэль началась. +AlertAccessGrantedTo Доступ был предоставлен %s +AlertAccessRevokedFor Доступ у %s был отозван +AlertAllianceHasBeenBroken %s разорвал союз с Вашей фракцией. +AlertAlreadyAtWarWith Ваша фракция уже воюет с %s. +AlertAlreadyCreatingGate Вы уже в режиме создания ворот. +AlertAlreadyDueling Вы уже участвуете в дуэли. +AlertAlreadyDuelingPlayer Вы уже сражаетесь с %s. +AlertAlreadyDuelingSomeone Вы уже сражаетесь с кем-то. +AlertAlreadyGrantingAccess Вы уже предоставляете доступ кому-то. Введите /mf grantacess cancel, чтобы отозвать его. +AlertAlreadyInFaction Вы уже во фракции, извините. +AlertAlreadyRequestedAlliance Вы уже запросили союз с этой фракцией. +AlertAlreadyRequestedPeace Вы уже запросили заключение мира с этой фракцией. +AlertAttemptedAlliance %s попытался вступить в союз с %s. +AlertAttemptedVassalization %s попытался вассализировать вашу фракцию. Если вы являетесь её владельцем, введите '/mf swearfealty %s', чтобы принять. +AlertBeenInvited Вас пригласили в %s. Чтобы присоединиться, введите /mf join %s. +AlertCalledToWar1 %s призвал Вашу фракцию к войне с %s. +AlertCalledToWar2 %s призвал %s на войну с вашей фракцией. +AlertCalledToWar3 Ваша фракция призвала %s на войну с %s. +AlertChallengedToDuel %s вызвал %s на дуэль. +AlertChallengedToDuelPlusHowTo %s вызвал вас на дуэль. Введите /mf duel accept, чтобы начать. +AlertChallengeIssued Вы вызвали %s на дуэль. +AlertChallengeWasAccepted %s принял Ваш вызов, дуэль началась. +AlertChangedGateName Имя ворот изменено на '%s'. +AlertCurrentPowerLevel Ваш текущий уровень мощности составляет %d/%d. +AlertDecreasingThePowerOfInactivePlayers Medieval Factions снижает силу каждого игрока на %d, если он не был в сети более %d минут. Это будет происходить каждые %d минут. +AlertDemotion Вы были понижены до статуса члена вашей фракции. +AlertDisbandmentDueToZeroPower Ваша фракция была расформирована, так как ее совокупная сила достигла нуля. +AlertFactionAttemptedToVassalize Ваша фракция попыталась вассализировать %s. +AlertFactionHasBeenVassalized Ваша фракция была вассализирована, и у нее теперь новый сюзерен: %s +AlertFactionHasNewVassal У вашей фракции появился новый вассал: %s +AlertFactionHomeRemoved Дом вашей фракции был удален. +AlertFactionIsWeakened У вашей фракции меньше половины максимальной силы. Он больше не будет получать дополнительную силу от вассалов, и ваши вассалы теперь уязвимы. +AlertForcedDemotion Вы были уволены со звания офицера в вашей фракции. +AlertForcedKick Вас выгнали из фракции. +AlertForcedLoad Medieval Factions был загружен. +AlertForcedSave Medieval Factions был сохранён вручную. +AlertForcedToJoinFaction Вас вынудили вступить во фракцию. +AlertGate Это ворота под названием '%s'. +AlertGrantedIndependence %s предоставил вашей фракции независимость. +AlertIncreasingThePowerOfEveryPlayer Medieval Factions увеличивает силу каждого игрока на %d. Это будет происходить каждые %d минут. +AlertJoinedFaction Вы вступили во фракцию. +AlertKicked %s выгнал Вас из Вашей фракции. +AlertLandClaimed Эта земля была присвоена. Размер владения: %d/%d +AlertLandConqueredFromAnotherFaction Земля, завоеванная %s. Размер владения: %d/%d +AlertLandConqueredFromYourFaction %s захватил земли вашей фракции. +AlertLeftFaction Вы покинули свою фракцию. +AlertLeftFactionAndItGotDeleted Вы покинули свою фракцию. Она был удалена, так как никто не был её участником. +AlertMoreClaimedChunksThanPower У вашей фракции больше присвоенных земель, чем её мощь. Вашу землю можно завоевать. +AlertMustBeAtWarToConquer Ваши фракции должны вести войну, чтобы вы могли завоевать её землю. +AlertMustBeInFactionToUseCommand Чтобы использовать эту команду, Вы должны принадлежать к какой-либо фракции. +AlertMustBeMemberToCreateGate Вы должны быть членом этой фракции, чтобы создать ворота. +AlertMustBeOfficerOrOwnerToClaimLand Вы должны быть офицером или владельцем фракции, чтобы присвоить землю. +AlertMustBeOwnerOrOfficerToCreateGate Чтобы создать ворота, Вы должны быть владельцем или офицером фракции. +AlertMustBeOwnerOrOfficerToUseCommand Чтобы использовать эту команду, Вы должны быть владельцем фракции или её офицером. +AlertMustBeOwnerToInvokeAlliance Чтобы создать альянс, Вы должны быть владельцем своей фракции. +AlertMustBeOwnerToUseCommand Чтобы использовать эту команду, вы должны быть владельцем фракции. +AlertMustKickAllPlayers Вам нужно выгнать всех игроков, прежде чем вы сможете распустить свою фракцию. +AlertNoGatesDefined У Вашей фракции нет ворот. +AlertNoLaws У Вашей фракции нет законов. +AlertNoLongerVassalFaction %s больше не является вассальной фракцией. +AlertNonOwnership Вам это не принадлежит. +AlertNoPendingChallenges У Вас нет незавершенных задач, которые можно отменить. +AlertNotAllied Ваша фракция не состоит в союзе с %s. +AlertNotBeenChallenged Вас никто не вызывал на дуэль. +AlertNotBeenChallengedByPlayer %s не вызывал Вас на дуэль. +AlertNotInFaction Вы не состоите во фракции. +AlertNotInvitedToFaction Вы не приглашены в эту фракцию. +AlertNotOfferedVassalizationBy Эта фракция не предлагала Вам стать её вассалом. +AlertNowAlliedWith Ваша фракция теперь в союзе с %s. +AlertNowAtPeaceWith %s теперь в мире с %s. +AlertPlayerAlreadyOwner Этот игрок уже является владельцем этой фракции. +AlertPlayerNotInFaction Этот игрок не входит в эту фракцию. +AlertPowerLevelDecreased Ваш уровень мощности снизился. +AlertPowerLevelIncreasedBy Вы чувствуете себя сильнее. Ваша сила увеличилась на %d. +AlertReachedDemesne Вы достигли предела своих владений. Пригласите больше игроков, чтобы увеличить его. +AlertUnlocked Разблокирован. +AlertUnlockingCancelled Разблокировка отменена. +AllianceBrokenWith Альянс с %s был разорван. +AlliedWith В союзе с: %s +AllLandUnclaimed Все земли стали независимыми. +AllLandUnclaimedFrom Все земли %s обрели независимость. +AlreadyEnteredCheckAccess Вы уже используете эту команду. Введите '/mf checkacesss cancel' чтобы прекратить. +AlreadyEnteredRevokeAccess Вы уже используете эту команду. Введите '/mf revokeaccess cancel' чтобы прекратить. +AlreadyInFaction Извините, но Вы уже состоите во фракции. Покиньте её, если хотите создать другую. +ArgumentMustBeNumber Аргумент должен быть числом. +ArgumentsSingleQuotesRequirement Аргументы необходимо заключать в одинарные кавычки. +AssignedToRandomFaction Вы попали в случайную фракцию. +AttemptedAlliance Попытка вступить в союз с %s +AttemptedPeace Попытка заключить мир с %s +AtWarWith В состоянии войны с: %s +AutoclaimToggled Автоприсоединение земель отключено. +BlockAlreadyLocked Этот блок уже заблокирован. +BlockIsNotLocked Этот блок не заблокирован. +BlockIsPartOfGateMustRemoveGate Этот блок является частью ворот под названием '%s'. Вы должны сначала удалить эти ворота. +BonusPower Бонусная сила от админов: %d +BooleanSet Булевый тип установлен. +Cancelled Отменено. +CancelledGatePlacement1 Ошибка размещения точки 1. Размещение ворот отменено. +CancelledGatePlacement2 Ошибка размещения точки 2. Размещение ворот отменено. +CancelledGatePlacementErrorLinking Ошибка привязки к рычагу. Размещение ворот отменено. +CannotAllyWithSelf Вы не можете вступить в союз с собственной фракцией. +CannotAttackFactionMember Вы не можете атаковать другого игрока, если состоите с ним в одной фракции. +CannotAttackNonWarringPlayer Вы не можете атаковать другого игрока, если ваши фракции не воюют. +CannotBreakAllianceWithSelf Вы не можете разорвать союз с собственной фракцией. +CannotBringNeutralFactionIntoWar Нельзя вовлекать нейтральные фракции в войну. +CannotCancelActiveDuel Нельзя отменить активную дуэль. +CannotDeclareWarIfLiegeNotWeakened Вы не можете объявить войну вассальной фракции, если их сюзерен не ослаблен. +CannotDeclareWarIfNeutralFaction Нейтральные фракции не могут объявлять войну. +CannotDeclareWarOnAlly Вы не можете объявить войну своему союзнику. +CannotDeclareWarOnLiege Вы не можете объявить войну своему сюзерену. Используйте вместо этого команду '/mf declareindeperence'. +CannotDeclareWarOnNeutralFaction Вы не можете объявить войну нейтральной фракции. +CannotDeclareWarOnVassal Вы не можете объявить войну своему вассалу. +CannotDeclareWarOnYourself Вы не можете объявить войну самому себе. +CannotDemoteSelf Вы не можете понизить себя. +CannotDuelSelf Вы не можете сражаться с собой. +CannotFindDynmap Не могу найти динамическую карту. +CannotForciblyKickOwner Невозможно исключить владельца из его собственной фракции. Попробуйте распустить фракцию. +CannotGrantAccessToSelf Вы не можете предоставить себе доступ. +CannotKickOwner Нельзя выгнать владельца. +CannotKickSelf Вы не можете выгнать самого себя. +CannotMakePeaceWithSelf Вы не можете заключить мир со своей собственной фракцией. +CannotPlaceChestsNextToUnownedLockedChests Вы не можете размещать сундуки рядом с другими заблокированными сундуками, которыми вы не владеете. +CannotPlaceHoppersNextToUnownedLockedChests Вы не можете размещать воронки рядом, под или над закрытыми сундуками, которыми вы не владеете. +CannotPromoteSelf Вы не можете продвигать себя. +CannotRevokeAccessFromSelf Вы не можете запретить себе доступ. +CannotSetFactionHomeInWilderness Вы не можете разместить столицу свой фракции на земле, которая не в её владениях. +CannotSetVersion Не могу установить версию. +CannotTransferToSelf Вы не можете передать владение вашей фракцией самому себе. +CannotVassalizeLiege Вы не можете вассализировать своего сюзерена. +CannotVassalizeSelf Вы не можете вассализировать свою фракцию. +CannotVassalizeVassal Вы не можете вассализировать ту фракцию, у которой уже есть сюзерен. +CanOnlyCreateGatesInClaimedTerritory Вы можете создавать ворота только на своей территории. +CanOnlyLockBlocksInClaimedTerritory Вы можете блокировать блоки только на земле, которой владеет ваша фракция. +CanOnlyLockInFactionTerritory Вы можете запирать вещи только на территории вашей фракции. +CanOnlyLockSpecificBlocks Вы можете запирать только сундуки, двери, бочки, люки, печи, наковальни или ворота. +ClaimedChunksLoaded Владения фракций загружены. +ClaimedChunksSuccessfullyLoaded Владения фракций успешно загружены. +ClickOnTriggerLever Нажмите на рычаг... +ClickToPlaceSecondCorner Щелкните, чтобы разместить второй угол... +CmdAddLaw addlaw +CmdAlly ally +CmdAutoClaim autoclaim +CmdBreakAlliance breakalliance +CmdBypass bypass +CmdChat chat +CmdCheckAccess checkaccess +CmdCheckClaim checkclaim +CmdClaim claim +CmdConfig config +CmdConfigSet set +CmdConfigShow show +CmdCreate create +CmdDeclareIndependence declareindependence +CmdDeclareWar declarewar +CmdDemote demote +CmdDesc desc +CmdDisband disband +CmdDuel duel +CmdDuelAccept accept +CmdDuelCancel cancel +CmdDuelChallenge challenge +CmdEditLaw editlaw +CmdFlags flags +CmdFlagsSet set +CmdFlagsShow show +CmdForce force +CmdForceBonusPower bonuspower +CmdForceClaim claim +CmdForceCreate create +CmdForceDemote demote +CmdForceFlag flag +CmdForceJoin join +CmdForceKick kick +CmdForceLoad load +CmdForcePeace peace +CmdForcePower power +CmdForceRename rename +CmdForceRenounce renounce +CmdForceSave save +CmdForceTransfer transfer +CmdForceUnlock unlock +CmdGate gate +CmdGateCancel cancel +CmdGateCreate create +CmdGateList list +CmdGateName name +CmdGateRemove remove +CmdGrantAccess grantaccess +CmdGrantIndependence grantindependence +CmdHelp help +CmdHome home +CmdInfo info +CmdInvite invite +CmdInvoke invoke +CmdJoin join +CmdKick kick +CmdLaws laws +CmdLeave leave +CmdList list +CmdLock lock +CmdMakePeace makepeace +CmdMembers members +CmdPower power +CmdPrefix prefix +CmdPromote promote +CmdRemoveLaw removelaw +CmdRename rename +CmdResetPowerLevels resetpowerlevels +CmdRevokeAccess revokeaccess +CmdSetHome sethome +CmdSwearFealty swearfealty +CmdTransfer transfer +CmdUnclaim unclaim +CmdUnclaimall unclaimall +CmdUnlock unlock +CmdVassalize vassalize +CmdVersion version +CmdWho who +CommandCancelled Команда отменена. +CommandNotRecognized Medieval Factions не распознал эту команду. +CommandsPage1 == Команды Medieval Factions Страница 1/%d == +CommandsPage2 == Команды Medieval Factions Страница 2/%d == +CommandsPage3 == Команды Medieval Factions Страница 3/%d == +CommandsPage4 == Команды Medieval Factions Страница 4/%d == +CommandsPage5 == Команды Medieval Factions Страница 5/%d == +CommandsPage6 == Команды Medieval Factions Страница 6/%d == +CommandsPage7 == Команды средневековых фракций Страница 7 /% d == +ConfigListPageOne ===== Страница списка конфигураций 1/2 ===== +ConfigListPageTwo ===== Страница списка конфигураций 2/2 ===== +CreatingGateCancelled Создание ворот отменено. +CreatingGateClickWithHoe Создание ворот. Нажмите на блок с золотой мотыгой в руке чтобы выбрать первую точку. +CuboidDisallowed1 Ошибка размещения точки 1: невозможно разместить кубоид. +CuboidDisallowed2 Ошибка размещения точки 2: невозможно разместить кубоид. +CurrentLanguageID Текущий ID языка: %s +CurrentlyNoFactions На данный момент фракций нет. +CurrentPowerLevel Текущий уровень мощи %s составляет %d/%d. +Defeated %s победил %s на дуэли. +DemesneSize Размер владения: %d/%d +Description Описание: %s +DescriptionSet Описание установлено. +DesignatedFactionNotFound Одна из указанных фракций не найдена. +DesiredPowerMustBeANumber Заданная мощь должна быть числом. +DeveloperList Разработчики: %s +DisbandmentDueToZeroPower %s была расформирована из-за того, что её совокупная мощь достигла нуля. +DoesntExist %s не существует. +Done Сделанный. +DoubleSet Двойной установлен. +DuelChallengeCancelled Вызов на дуэль отменен. +DuelEndedInTie Дуэль %s и %s закончилась вничью. +DynmapIntegrationSuccessful Интеграция с динамической картой прошла успешно. +ERROR ОШИБКА: +ErrorAddingAreaMarker Ошибка при добавлении маркера области %s +ErrorChunkRemoval При удалении запрошенного участка произошла ошибка. +ErrorClaimedChunkRemoval При удалении запрошенного участка произошла ошибка. +ErrorCouldNotFindGatesFaction Ошибка: не удалось найти фракцию для ворот '%s'. +ErrorCouldNotLoadFactionGate ОШИБКА: не удалось загрузить ворота фракции. \n +ErrorCreatingMarkerSet Ошибка при создании маркера. +ErrorIntegratingWithDynmap Ошибка интеграции с динамической картой: +ErrorPlayerPowerRecordForUUIDNotFound ОШИБКА: запись мощи игрока для uuid не найдена. Не удалось получить совокупный уровень мощи. +ErrorSettingAreaMarkerColor Ошибка при установке цвета маркера области на '%s'. +FactionAlreadyAlly Эта фракция уже является вашим союзником. +FactionAlreadyExists Извините. Эта фракция уже существует. +FactionAndPlayerSingleQuotesRequirement Фракцию и игрока следует указывать в одинарных кавычках. +FactionAndVassalSingleQuotesRequirement Фракция и вассал, подлежащие удалению, должны быть заключены в одинарные кавычки. +FactionCreated Фракция создана. +FactionCurrentlyEnemyMustMakePeace Эта фракция в настоящее время является Вашим врагом. Заключите мир, прежде чем попытаться вступить с ними в союз. +FactionDataLoadedSuccessfuly Данные фракций успешно загружены +FactionDoesNotExist Извините. Такой фракции не существует. +FactionDoesNotHaveLaws У этой фракции нет никаких законов. +FactionGates Врата фракций +FactionHomeLoadError Произошла ошибка при загрузке домашней позиции фракции. +FactionHomeNotSetYet Дом фракции еще не установлен. +FactionHomeSet Домашняя точка фракции установлена. +FactionInfo Информация о фракции %s +FactionIsNotVassal Эта фракция не является вашим вассалом. +FactionMustBeDesignatedInsideSingleQuotes Фракцию необходимо обозначать в одинарных кавычках. +FactionNameChanged Название фракции изменено. +FactionNameNotRecognized Это название фракции не было распознано. +FactionNameTooLong Это имя слишком длинное. +FactionNotEnemy Эта фракция Вам не враг. +FactionNotFound Эта фракция не найдена. +FactionsSuccessfullyLoaded Фракции успешно загружены. +FactionsTitle == Фракции == +FactionSuccessfullyDisbanded Фракция была успешно расформирована. +FactionSuccessfullyLoaded Фракция успешно загружена. +FileLoadError Произошла ошибка при загрузке файла +FollowingPlayersHaveAccess К этому блоку имеют доступ следующие игроки: +GateCreated Ворота успешно созданы. +HasAttemptedToMakePeaceWith %s попытался заключить мир с %s. +HasBeenKickedFrom %s исключен из %s +HasDeclaredIndependence %s заявил о своей независимости от %s. +HasDeclaredWarAgainst %s объявил войну %s. +HasJoined %s присоединился к %s +HelpAddLaw /mf addlaw - Добавить закон в вашу фракцию. +HelpAlly /mf ally - Вступить в союз с фракцией. +HelpAutoclaim /mf autoclaim - Включить автоматическое присвоение земель, чтобы упростить процесс расширения владений. +HelpBreakAlliance /mf breakalliance - Разорвать союз с фракцией. +HelpBypass /mf bypass - Обход защиты. +HelpChat /mf chat - Переключить чат фракции. +HelpCheckAccess /mf checkaccess - Проверить, у кого есть доступ к заблокированному блоку. +HelpCheckClaim /mf checkclaim - Проверить, кому принадлежит какая-нибудь земля. +HelpClaim /mf claim - Присоединить землю к своей фракции. +HelpConfigSet /mf config set (вариант) (значение) - Установить значение конфигурации. +HelpConfigShow /mf config show - Показать значения конфигурации. +HelpCreate /mf create (имя) - Создать новую фракцию. +HelpDeclareIndependence /mf declareindependence - Объявить независимость от вашего сюзерена. +HelpDeclareWar /mf declarewar - Объявить войну другой фракции. +HelpDemote /mf demote - Понизить офицера до звания участника. +HelpDesc /mf desc (описание) - Установить описание вашей фракции. +HelpDisband /mf disband - Распустить фракцию (Вы должны быть её владельцем). +HelpDuelAccept /mf duel accept (<необязательно> игрок) +HelpDuelCancel /mf duel cancel +HelpDuelChallenge /mf duel challenge (игрок) (<необязательно> ограничение по времени в секундах) +HelpEditLaw /mf editlaw - Редактировать уже существующий закон в Вашей фракции. +HelpFlagsSet /mf flags set (опция) (значение) - Установить флаг фракции. +HelpFlagsShow /mf flags show - Показать флаги фракций. +HelpForce /mf force - Заставить плагин выполнять определенные действия. +HelpForceBonusPower /mf force bonuspower 'фракция' число' +HelpForceClaim /mf force claim 'название фракции' +HelpForceCreate /mf force create 'фракция' +HelpForceDemote /mf force demote (игрок) +HelpForceFlag /mf force flag 'фракция' 'опция' 'значение' +HelpForceJoin /mf force join 'игрок' фракция 2 ' +HelpForceKick /mf force kick (игрок) +HelpForceLoad /mf force load +HelpForcePeace /mf force peace 'фракция1' фракция2 +HelpForcePower /mf force power 'игрок' 'номер' +HelpForceRemoveVassal /mf force removevassal 'фракция' 'вассал' +HelpForceRename /mf force rename 'фракцию' новое имя' +HelpForceRenounce /mf force renounce (фракция) +HelpForceSave /mf force save +HelpForceTransfer /mf force transfer 'фракция' 'игрок' +HelpForceUnlock /mf force unlock +HelpGateCancel /mf gate cancel +HelpGateCreate /mf gate create (<необязательно> название) +HelpGateList /mf gate list +HelpGateName /mf gate name (<необязательно> название) +HelpGateRemove /mf gate remove +HelpGrantAccess /mf grantaccess - Дать кому-то доступ к заблокированному блоку. +HelpGrantIndependence /mf grantindependence - Дать независимость вассалу. +HelpHelp /mf help # - Показать список полезных команд. +HelpHome /mf home - Телепортироваться на домашнюю точку Вашей фракции. +HelpInfo /mf info - Посмотреть информацию о Вашей или чужой фракции. +HelpInvite /mf invite (игрок) - Пригласить игрока в Вашу фракцию. +HelpInvoke /mf invoke (союзник) (враг) - Призвать союзную фракцию на войну. +HelpJoin /mf join (фракция) - Присоединиться к фракции по приглашению. +HelpKick /mf kick - Выгнать игрока из фракции. +HelpLaws /mf laws - Просмотреть законы своей фракции. +HelpLeave /mf leave - Покинуть фракцию. +HelpList /mf list - Список всех фракций на сервере. +HelpLock /mf lock - Заблокировать сундук или дверь. +HelpMakePeace /mf makepeace - Предложить другой фракции мир. +HelpMap /mf map - отобразить карту претензий рядом с вашим окружением. +HelpMembers /mf members - Список участников Вашей или чужой фракции. +HelpPower /mf power - Проверить уровень Вашей мощи. +HelpPrefix /mf prefix (префикс) - Установить префикс Вашей фракции +HelpPromote /mf promote - Повысить игрока до офицерского звания +HelpRemoveLaw /mf removelaw - Удалить закон Вашей фракции. +HelpRename /mf rename - Переименовать Вашу фракцию +HelpResetPowerLevels /mf resetpowerlevels - Сбросить записи мощи игроков и совокупной мощи фракции. +HelpRevokeAccess /mf revokeaccess - Отозвать доступ к заблокированному блоку у кого-либо. +HelpSetHome /mf sethome - Установить домашнюю точку фракции. +HelpSwearFealty /mf swearfealty - Поклясться в верности какой-либо фракции. +HelpTransfer /mf transfer - Передать владение Вашей фракцией другому игроку\n +HelpUnclaim /mf unclaim - Дать независимость какому-либо участку земли у Вашей фракции. +HelpUnclaimall /mf unclaimall - Дать независимость всем землям Вашей фракции. +HelpUnlock /mf unlock - Разблокировать сундук или дверь. +HelpVassalize /mf vassalize - Предложить какой-либо фракции стать Вашим вассалом. +HelpVersion /mf version - Проверить версию плагина. +HelpWho /mf who - Показать информацию о фракции указанного игрока. +HomeClaimedByAnotherFaction Домашняя точка захвачена другой фракцией и была потеряна. +HomeIsInUnclaimedChunk Домашняя точка находится на незанятой Вашей фракцией земле и поэтому недоступна. +HourlySaveAlert Medieval Factions сохраняется... Сохранение будет происходить каждый час. +IntegerSet Целые числа установлены. +InvitationExpired Срок действия Вашего приглашения %s истек. +InvitationSent Приглашение отправлено. +KeysLoaded Загружено ключей: %d +LandAlreadyClaimedBy Эта земля уже захвачена фракцией +LandAlreadyClaimedByYourFaction Эта земля уже занята Вашей фракцией. +LandClaimedBy Эта земля захвачена фракцией %s. +LandClaimedUsingAdminBypass Земля стала независимой благодаря администратору. +LandIsNotClaimed Эта земля никем не занята. +LandIsUnclaimed Эта земля не занята. +LandNotCurrentlyClaimed Эта земля в настоящее время никем не занята. +LandUnclaimed Земля не захвачена. +LawAdded Закон добавлен. +LawEdited Закон был отредактирован. +LawRemoved Закон удален. +LawsTitle == Законы %s == +LeverSuccessfullyLinked Создание ворот 4/4: Рычаг успешно соединён. +Liege Сюзерен: %s +ListLegend P: сила, M: участники, L: земли +LoadingClaimedChunks Загрузка захваченных земель... +LoadingLockedBLocks Загрузка заблокированных блоков... +LoadingPlayerPowerRecords Загрузка записей о мощи игроков... +Locked Заблокировано. +LockedBlockSuccessfullyLoaded Заблокированные блоки успешно загружены. +LockedBy Заблокировано игроком %s +LockingCancelled Блокировка отменена. +LockRemovalError Произошла ошибка при снятии блокировки. +MaterialsMismatch1 Ошибка размещения точки 1: Несоответствие материалов. +MaterialsMismatch2 Ошибка размещения пункта 2: Несоответствие материалов. +MedievalFactionsStringRight Medieval Factions-%s +MedievalFactionsTitle == Medieval Factions %s == +MembersOf Участники фракции %s +MissingFactionGatesJSONCollection Не удалось загрузить врата, потому что коллекция 'factionGates' не существует в JSON файле фракций. Вы обновились с предыдущей версии? Установка по умолчанию... +MovementDetectedTeleportCancelled Обнаружено движение. Телепорт отменён. +MustBeAtWarOrFactionMustBeInactive Должны быть в состоянии войны с указанной фракцией или же указанная фракция должна быть неактивной. +MustBeInFaction Извините, вы должны состоять в какой-либо фракции, чтобы использовать эту команду. +MustBeOwner К сожалению, для использования этой команды вы должны быть владельцем фракции. +MustOwnFactionOrBeOfficer Чтобы использовать эту команду, Вы должны быть владельцем фракции или её офицером. +MustTransferOwnership Сожалею. Вы должны передать право собственности или выгнать всех в вашей фракции, чтобы покинуть ее. +Name Имя: %s +NameAlreadyTaken Это имя уже занято. +NeutralityDisabled Нейтралитет в настоящее время отключен. +NoBlockDetectedToCheckForGate Не обнаружено блока для проверки ворот. +NoFactionsDesignatedSingleQuotesRequired Фракции не указаны. Нужно обязательно заключать их в одинарные кавычки. +NoLongerBypassingProtections Вы больше не обходите защиту Medieval Factions. +NoLongerInFactionChat Вы больше не в чате фракции. +NotAMemberOfAnyFaction Вы не состоите ни в какой фракции. +NotAnAlly %s не является Вашим союзником. +NotAnAllyOrVassal %s не является вашим союзником или вассалом. +NotAtWarWith Вы не воюете с %s +NotAVassalOfAFaction Вы не являетесь вассалом какой-либо фракции. NotEnoughArgumentsDesignatedSingleQuotesRequired Указано недостаточно аргументов. Нужно обязательно заключать их в одинарные кавычки. -NotTheOwnerOfThisBlock Вы не являетесь владельцем этого блока. -NotTheOwnerOfThisFaction Вы не являетесь владельцем этой фракции. -NoVassalOrLiegeReferences С этой фракцией нет связанных вассалов или сюзеренов. -NowBypassingProtections Теперь Вы обходите защиту Medieval Factions. -NowSpeakingInFactionChat Теперь Вы говорите в чате фракции. -OnlyPlayersCanUseCommand Только игроки могут использовать эту команду. -OnlyUseLeversInClaimedTerritory Ошибка: можно использовать рычаги только на территории своей фракции. -Owner Владелец: %s -OwnershipTransferred Право собственности на %s было передано Вам. -OwnerShipTransferredTo Право собственности передано %s -PermissionNeeded Извините. Чтобы использовать эту команду, Вам необходимо следующее разрешение: '%s' -PlayerAlreadyDueling %s уже сражается с кем-то. -PlayerAlreadyInFaction Этот игрок уже состоит во фракции, извините. -PlayerAlreadyOfficer Игрок уже является офицером. -PlayerAndDesiredPowerSingleQuotesRequirement Игрок и желаемая мощь должны быть указаны в одинарных кавычках. -PlayerByNameNotFound Извините. Игрок с именем %s не найден. -PlayerCantBePromotedBecauseOfLimit Игрока нельзя повысить, потому что вы достигли своего лимита. Лимит: %d -PlayerDemoted Игрок был понижен в звании. -PlayerIsNotInAFaction Этот игрок не состоит во фракции. -PlayerIsNotInYourFaction Этого игрока нет в Вашей фракции. -PlayerIsNotMemberOfFaction Этот игрок не является участником Вашей фракции. -PlayerIsNotOfficerOfFaction Этот игрок не является офицером Вашей фракции. -PlayerNotFound Игрок не найден. -PlayerPowerRecordsLoaded Загружены записи мощи игроков. -PlayerPromoted Игрок был повышен. -PleaseWaitGate Эти ворота %s, пожалуйста подождите. -PluginDisabled Плагин Medieval Factions был отключен. -PluginDisabling Отключение плагина Medieval Factions... -PluginEnabled Плагин Medieval Factions включен. -PluginEnabling Плагин Medieval Factions включается... -PluginLoading Плагин Medieval Factions загружается... -PluginSaving Плагин Medieval Factions сохраняется... -Point1PlacementSuccessful Создание ворот 1/4: точка 1 размещена успешно. -Point2PlacedSuccessfully Создание ворот 2/4: точка 2 размещена успешно. -Population Население: %d -PowerHasDecayed Ваша мощность снизилась на %d с момента последнего выхода из игры. Теперь Ваша мощь %d. -PowerLevel Уровень мощи: %s -PowerLevelHasBeenSetTo Уровень мощи этого игрока был установлен на %d -PowerLevelHasIncreased Ваш уровень мощи был повышен. -PowerLevelResetting Уровень мощи сбрасывается... -PrefixesDisabled Префиксы в настоящее время отключены. -PrefixSet Префикс установлен. -PrefixTaken Этот префикс уже занят. -ProblemLoadingClaimedChunks Возникла проблема с загрузкой земель фракций. -ProblemLoadingFactions Возникла проблема с загрузкой фракций. -ProblemLoadingPowerRecords Возникла проблема с загрузкой записей о мощи игроков. -PromotedToOfficer Вы были повышены до звания офицера в Вашей фракции. -RadiusRequirement Радиус должен быть между 0 и %d -RemovedGate Удалены ворота '%s' -ResettingIndividualPowerRecords Сброс записей индивидуальной мощи игроков -RightClickCheckAccess Нажмите правой кнопкой мыши на заблокированный блок, чтобы посмотреть кто имеет к нему доступ. Введите '/mf checkaccess cancel' чтобы остановить проверку. -RightClickForceUnlock Щелкните правой кнопкой мыши сундук или дверь, чтобы разблокировать их! (Введите / mf force unlock cancel для отмены) -RightClickGrantAccess Нажмите правой кнопкой мыши по сундуку или двери, чтобы дать %s доступ. Введите /mf grantaccess cancel чтобы прекратить выдачу доступа. -RightClickLock Нажмите правой кнопкой мыши по сундуку или двери, чтобы заблокировать. (Введите /mf lock cancel чтобы прекратить блокировку) -RightClickRevokeAccess Нажмите правой кнопкой мыши на заблокированный блок, чтобы отозвать доступ игрока к нему. Введите '/mf revokeaccess cancel' чтобы прекратить это. -RightClickUnlock Нажмите правой кнопкой мыши на сундук или дверь, чтобы разблокировать. (Type /mf unlock cancel чтобы прекратить разблокировку) -SchedulingHourlyAutoSave Планирование ежечасного автосохранения... -SchedulingPowerDecrease Планирование понижения мощи... -SchedulingPowerIncrease Планирование увеличения мощи... -SingleQuotesAlliedWarring Союзная и воюющая фракции должны быть обозначены в одинарных кавычках. -StringSet Строка установлена. -SubCommands Подкоманды: -SuccessFactionMemberRemoval Успех. Если игрок состоял во фракции, то он больше не является её участником. -SuccessForceJoin Успех. Игрок был принуждён ко вступлению во фракцию. -SuccessfulDisbandment %s была успешно расформирована. -SuccessOfficerRemoval Успех. Если игрок был офицером во фракции, то он больше таковым не является. -SuccessReferencesRemoved ссылки успешно удалены. -SupportedLanguageIDList ID поддерживаемых языков: %s -SurroundedChunkProtected Фракция-цель владеет землями к северу, востоку, югу и западу от этого участка. Его нельзя захватить. -TargetBlockNotPartOfGate Указанный блок не является частью врат. -TargetFactionNotOverClaiming Фракция-цель не имеет земель больше их лимита. -TeleportingAlert Телепортирование через 3 секунды... -ThreeBlockRequirement Ошибка установки точки 2: Ворота должны быть в высоту 3 или больше блоков. -TriggerBlockNotLever Активирующий блок не является рычагом. Отмена размещения ворот. -UsageAddLaw Использование: /mf addlaw (новый закон) -UsageAlly Использование: /mf ally (фракция) -UsageBreakAlliance Использование: /mf breakalliance (фракция) -UsageClaimRadius Использование: /mf claim (радиус) -UsageConfigSet Использование: /mf config set (опция) (значение) -UsageConfigShow Использование: /mf config show (1 | 2) -UsageCreate Использование: /mf create [фракция] -UsageDeclareWar Использование: /mf declarewar (фракция) -UsageDemote Использование: /mf demote (имя игрока) -UsageDesc Использование: /mf desc (описание) -UsageEditLaw Использование: /mf editlaw (номер) (отредактированный закон) -UsageFlagsSet Использование: /mf flags set (опция) (значение) -UsageForceBonusPower Использование: /mf force bonuspower 'фракция' число' -UsageForceClaim Использование: /mf force claim 'название фракции' -UsageForceCreate Применение : /mf force create 'фракция' -UsageForceDemote Использование: /mf force demote (игрок) -UsageForceFlag Использование: /mf force flag 'faction' 'option' 'value' -UsageForceJoin Использование: /mf force join 'player' 'faction' -UsageForceKick Использование: /mf force kick (игрок) -UsageForcePeace Использование: /mf force peace 'фракция-1' 'фракция-2 -UsageForcePower Использование: /mf force power 'игрок' 'число' -UsageForceRemoveVassal /mf force removevassal 'фракция-1' 'фракция-2' -UsageForceRename Использование: /mf force rename 'фракцию' новое имя' -UsageForceRenounce Использование: /mf force renounce 'фракция' -UsageForceTransfer Использование: /mf force transfer 'имяФракции' 'игрок' -UsageGrantAccess Использование: /mf grantaccess (имя игрока) -UsageGrantIndependence Использование: /mf grantindependence (фракция) -UsageInvite Использование: /mf invite (имя игрока) -UsageInvoke Использование: /mf invoke '(название союзной фракции)' '(враждебная фракция)' -UsageJoin Использование: /mf join (фракция) -UsageKick Использование: /mf kick (имя игрока) -UsageMakePeace Использование: /mf makepeace (фракция) -UsagePrefix Использование: /mf prefix (new prefix) -UsagePromote Использование: /mf promote (имя игрока) -UsageRemoveLaw Использование: /mf removelaw (номер) -UsageRename Использование: /mf rename (новоеИмя) -UsageRevokeAccess Использование: /mf revokeaccess (имя игрока) -UsageSwearFealty Использование: /mf swearfealty (фракция) -UsageTransfer Использование: /mf transfer (имя игрока) -UsageVassalize Использование: /mf vassalize (фракция) -UsageWho Использование: /mf who (имя игрока) -ValidSubCommandsShowSet Допустимые подкоманды: show, set -VassalContribution Дополнительная сила от вассалов:% d -Vassals Вассалы: %s -WarningPlayerAlreadyStartedCreatingGate ВНИМАНИЕ: Игрок уже начал создавать ворота. Вызов startCreatingGate() игнорируется. -WasntFound '%s' не найдено. -WelcomeBackLastLogout С возвращением, %s. Последний раз Вы были в сети %s назад. -WikiLink Вики: https://github.com/dmccoystephenson/Medieval-Factions/wiki -Wilderness Дикие земли -WorldsMismatch1 Ошибка размещения точки 1: Несоответствие миров. -WorldsMismatch2 Ошибка размещения точки 2: Несоответствие миров. \ No newline at end of file +NotTheOwnerOfThisBlock Вы не являетесь владельцем этого блока. +NotTheOwnerOfThisFaction Вы не являетесь владельцем этой фракции. +NoVassalOrLiegeReferences С этой фракцией нет связанных вассалов или сюзеренов. +NowBypassingProtections Теперь Вы обходите защиту Medieval Factions. +NowSpeakingInFactionChat Теперь Вы говорите в чате фракции. +OnlyPlayersCanUseCommand Только игроки могут использовать эту команду. +OnlyUseLeversInClaimedTerritory Ошибка: можно использовать рычаги только на территории своей фракции. +Owner Владелец: %s +OwnershipTransferred Право собственности на %s было передано Вам. +OwnerShipTransferredTo Право собственности передано %s +PermissionNeeded Извините. Чтобы использовать эту команду, Вам необходимо следующее разрешение: '%s' +PlayerAlreadyDueling %s уже сражается с кем-то. +PlayerAlreadyInFaction Этот игрок уже состоит во фракции, извините. +PlayerAlreadyOfficer Игрок уже является офицером. +PlayerAndDesiredPowerSingleQuotesRequirement Игрок и желаемая мощь должны быть указаны в одинарных кавычках. +PlayerByNameNotFound Извините. Игрок с именем %s не найден. +PlayerCantBePromotedBecauseOfLimit Игрока нельзя повысить, потому что вы достигли своего лимита. Лимит: %d +PlayerDemoted Игрок был понижен в звании. +PlayerIsNotInAFaction Этот игрок не состоит во фракции. +PlayerIsNotInYourFaction Этого игрока нет в Вашей фракции. +PlayerIsNotMemberOfFaction Этот игрок не является участником Вашей фракции. +PlayerIsNotOfficerOfFaction Этот игрок не является офицером Вашей фракции. +PlayerNotFound Игрок не найден. +PlayerPowerRecordsLoaded Загружены записи мощи игроков. +PlayerPromoted Игрок был повышен. +PleaseWaitGate Эти ворота %s, пожалуйста подождите. +PluginDisabled Плагин Medieval Factions был отключен. +PluginDisabling Отключение плагина Medieval Factions... +PluginEnabled Плагин Medieval Factions включен. +PluginEnabling Плагин Medieval Factions включается... +PluginLoading Плагин Medieval Factions загружается... +PluginSaving Плагин Medieval Factions сохраняется... +Point1PlacementSuccessful Создание ворот 1/4: точка 1 размещена успешно. +Point2PlacedSuccessfully Создание ворот 2/4: точка 2 размещена успешно. +Population Население: %d +PowerHasDecayed Ваша мощность снизилась на %d с момента последнего выхода из игры. Теперь Ваша мощь %d. +PowerLevel Уровень мощи: %s +PowerLevelHasBeenSetTo Уровень мощи этого игрока был установлен на %d +PowerLevelHasIncreased Ваш уровень мощи был повышен. +PowerLevelResetting Уровень мощи сбрасывается... +PrefixesDisabled Префиксы в настоящее время отключены. +PrefixSet Префикс установлен. +PrefixTaken Этот префикс уже занят. +ProblemLoadingClaimedChunks Возникла проблема с загрузкой земель фракций. +ProblemLoadingFactions Возникла проблема с загрузкой фракций. +ProblemLoadingPowerRecords Возникла проблема с загрузкой записей о мощи игроков. +PromotedToOfficer Вы были повышены до звания офицера в Вашей фракции. +RadiusRequirement Радиус должен быть между 0 и %d +RemovedGate Удалены ворота '%s' +ResettingIndividualPowerRecords Сброс записей индивидуальной мощи игроков +RightClickCheckAccess Нажмите правой кнопкой мыши на заблокированный блок, чтобы посмотреть кто имеет к нему доступ. Введите '/mf checkaccess cancel' чтобы остановить проверку. +RightClickForceUnlock Щелкните правой кнопкой мыши сундук или дверь, чтобы разблокировать их! (Введите / mf force unlock cancel для отмены) +RightClickGrantAccess Нажмите правой кнопкой мыши по сундуку или двери, чтобы дать %s доступ. Введите /mf grantaccess cancel чтобы прекратить выдачу доступа. +RightClickLock Нажмите правой кнопкой мыши по сундуку или двери, чтобы заблокировать. (Введите /mf lock cancel чтобы прекратить блокировку) +RightClickRevokeAccess Нажмите правой кнопкой мыши на заблокированный блок, чтобы отозвать доступ игрока к нему. Введите '/mf revokeaccess cancel' чтобы прекратить это. +RightClickUnlock Нажмите правой кнопкой мыши на сундук или дверь, чтобы разблокировать. (Type /mf unlock cancel чтобы прекратить разблокировку) +SchedulingHourlyAutoSave Планирование ежечасного автосохранения... +SchedulingPowerDecrease Планирование понижения мощи... +SchedulingPowerIncrease Планирование увеличения мощи... +SingleQuotesAlliedWarring Союзная и воюющая фракции должны быть обозначены в одинарных кавычках. +StringSet Строка установлена. +SubCommands Подкоманды: +SuccessFactionMemberRemoval Успех. Если игрок состоял во фракции, то он больше не является её участником. +SuccessForceJoin Успех. Игрок был принуждён ко вступлению во фракцию. +SuccessfulDisbandment %s была успешно расформирована. +SuccessOfficerRemoval Успех. Если игрок был офицером во фракции, то он больше таковым не является. +SuccessReferencesRemoved ссылки успешно удалены. +SupportedLanguageIDList ID поддерживаемых языков: %s +SurroundedChunkProtected Фракция-цель владеет землями к северу, востоку, югу и западу от этого участка. Его нельзя захватить. +TargetBlockNotPartOfGate Указанный блок не является частью врат. +TargetFactionNotOverClaiming Фракция-цель не имеет земель больше их лимита. +TeleportingAlert Телепортирование через 3 секунды... +ThreeBlockRequirement Ошибка установки точки 2: Ворота должны быть в высоту 3 или больше блоков. +TriggerBlockNotLever Активирующий блок не является рычагом. Отмена размещения ворот. +UsageAddLaw Использование: /mf addlaw (новый закон) +UsageAlly Использование: /mf ally (фракция) +UsageBreakAlliance Использование: /mf breakalliance (фракция) +UsageClaimRadius Использование: /mf claim (радиус) +UsageConfigSet Использование: /mf config set (опция) (значение) +UsageConfigShow Использование: /mf config show (1 | 2) +UsageCreate Использование: /mf create [фракция] +UsageDeclareWar Использование: /mf declarewar (фракция) +UsageDemote Использование: /mf demote (имя игрока) +UsageDesc Использование: /mf desc (описание) +UsageEditLaw Использование: /mf editlaw (номер) (отредактированный закон) +UsageFlagsSet Использование: /mf flags set (опция) (значение) +UsageForceBonusPower Использование: /mf force bonuspower 'фракция' число' +UsageForceClaim Использование: /mf force claim 'название фракции' +UsageForceCreate Применение : /mf force create 'фракция' +UsageForceDemote Использование: /mf force demote (игрок) +UsageForceFlag Использование: /mf force flag 'faction' 'option' 'value' +UsageForceJoin Использование: /mf force join 'player' 'faction' +UsageForceKick Использование: /mf force kick (игрок) +UsageForcePeace Использование: /mf force peace 'фракция-1' 'фракция-2 +UsageForcePower Использование: /mf force power 'игрок' 'число' +UsageForceRemoveVassal /mf force removevassal 'фракция-1' 'фракция-2' +UsageForceRename Использование: /mf force rename 'фракцию' новое имя' +UsageForceRenounce Использование: /mf force renounce 'фракция' +UsageForceTransfer Использование: /mf force transfer 'имяФракции' 'игрок' +UsageGrantAccess Использование: /mf grantaccess (имя игрока) +UsageGrantIndependence Использование: /mf grantindependence (фракция) +UsageInvite Использование: /mf invite (имя игрока) +UsageInvoke Использование: /mf invoke '(название союзной фракции)' '(враждебная фракция)' +UsageJoin Использование: /mf join (фракция) +UsageKick Использование: /mf kick (имя игрока) +UsageMakePeace Использование: /mf makepeace (фракция) +UsagePrefix Использование: /mf prefix (new prefix) +UsagePromote Использование: /mf promote (имя игрока) +UsageRemoveLaw Использование: /mf removelaw (номер) +UsageRename Использование: /mf rename (новоеИмя) +UsageRevokeAccess Использование: /mf revokeaccess (имя игрока) +UsageSwearFealty Использование: /mf swearfealty (фракция) +UsageTransfer Использование: /mf transfer (имя игрока) +UsageVassalize Использование: /mf vassalize (фракция) +UsageWho Использование: /mf who (имя игрока) +ValidSubCommandsShowSet Допустимые подкоманды: show, set +VassalContribution Дополнительная сила от вассалов:% d +Vassals Вассалы: %s +WarningPlayerAlreadyStartedCreatingGate ВНИМАНИЕ: Игрок уже начал создавать ворота. Вызов startCreatingGate() игнорируется. +WasntFound '%s' не найдено. +WelcomeBackLastLogout С возвращением, %s. Последний раз Вы были в сети %s назад. +WikiLink Вики: https://github.com/dmccoystephenson/Medieval-Factions/wiki +Wilderness Дикие земли +WorldsMismatch1 Ошибка размещения точки 1: Несоответствие миров. +WorldsMismatch2 Ошибка размещения точки 2: Несоответствие миров. \ No newline at end of file diff --git a/src/main/resources/test.tsv b/src/main/resources/test.tsv index 7dd8fa6f4..6e5d7bbdd 100644 --- a/src/main/resources/test.tsv +++ b/src/main/resources/test.tsv @@ -1,547 +1,547 @@ -AcceptedChallengeDuelHasBegun TestAcceptedChallengeDuelHasBegun -AlertAccessGrantedTo TestAlertAccessGrantedTo -AlertAccessRevokedFor TestAlertAccessRevokedFor -AlertAllianceHasBeenBroken TestAlertAllianceHasBeenBroken -AlertAlreadyAtWarWith TestAlertAlreadyAtWarWith -AlertAlreadyCreatingGate TestAlertAlreadyCreatingGate -AlertAlreadyDueling TestAlertAlreadyDueling -AlertAlreadyDuelingPlayer TestAlertAlreadyDuelingPlayer -AlertAlreadyDuelingSomeone TestAlertAlreadyDuelingSomeone -AlertAlreadyGrantingAccess TestAlertAlreadyGrantingAccess -AlertAlreadyInFaction TestAlertAlreadyInFaction -AlertAlreadyRequestedAlliance TestAlertAlreadyRequestedAlliance -AlertAlreadyRequestedPeace TestAlertAlreadyRequestedPeace -AlertAttemptedAlliance TestAlertAttemptedAlliance -AlertAttemptedVassalization TestAlertAttemptedVassalization -AlertBeenInvited TestAlertBeenInvited -AlertCalledToWar1 TestAlertCalledToWar1 -AlertCalledToWar2 TestAlertCalledToWar2 -AlertCalledToWar3 TestAlertCalledToWar3 -AlertChallengedToDuel TestAlertChallengedToDuel -AlertChallengedToDuelPlusHowTo TestAlertChallengedToDuelPlusHowTo -AlertChallengeIssued TestAlertChallengeIssued -AlertChallengeWasAccepted TestAlertChallengeWasAccepted -AlertChangedGateName TestAlertChangedGateName -AlertCurrentPowerLevel TestAlertCurrentPowerLevel -AlertDecreasingThePowerOfInactivePlayers TestAlertDecreasingThePowerOfInactivePlayers -AlertDemotion TestAlertDemotion -AlertDisbandmentDueToZeroPower TestAlertDisbandmentDueToZeroPower -AlertFactionAttemptedToVassalize TestAlertFactionAttemptedToVassalize -AlertFactionHasBeenVassalized TestAlertFactionHasBeenVassalized -AlertFactionHasNewVassal TestAlertFactionHasNewVassal -AlertFactionHomeRemoved TestAlertFactionHomeRemoved -AlertFactionIsWeakened TestAlertFactionIsWeakened -AlertForcedDemotion TestAlertForcedDemotion -AlertForcedKick TestAlertForcedKick -AlertForcedLoad TestAlertForcedLoad -AlertForcedSave TestAlertForcedSave -AlertForcedToJoinFaction TestAlertForcedToJoinFaction -AlertGate TestAlertGate -AlertGrantedIndependence TestAlertGrantedIndependence -AlertIncreasingThePowerOfEveryPlayer TestAlertIncreasingThePowerOfEveryPlayer -AlertJoinedFaction TestAlertJoinedFaction -AlertKicked TestAlertKicked -AlertLandClaimed TestAlertLandClaimed -AlertLandConqueredFromAnotherFaction TestAlertLandConqueredFromAnotherFaction -AlertLandConqueredFromYourFaction TestAlertLandConqueredFromYourFaction -AlertLeftFaction TestAlertLeftFaction -AlertLeftFactionAndItGotDeleted TestAlertLeftFactionAndItGotDeleted -AlertMoreClaimedChunksThanPower TestAlertMoreClaimedChunksThanPower -AlertMustBeAtWarToConquer TestAlertMustBeAtWarToConquer -AlertMustBeInFactionToUseCommand TestAlertMustBeInFactionToUseCommand -AlertMustBeMemberToCreateGate TestAlertMustBeMemberToCreateGate -AlertMustBeOfficerOrOwnerToClaimLand TestAlertMustBeOfficerOrOwnerToClaimLand -AlertMustBeOwnerOrOfficerToCreateGate TestAlertMustBeOwnerOrOfficerToCreateGate -AlertMustBeOwnerOrOfficerToUseCommand TestAlertMustBeOwnerOrOfficerToUseCommand -AlertMustBeOwnerToInvokeAlliance TestAlertMustBeOwnerToInvokeAlliance -AlertMustBeOwnerToUseCommand TestAlertMustBeOwnerToUseCommand -AlertMustKickAllPlayers TestAlertMustKickAllPlayers -AlertNoGatesDefined TestAlertNoGatesDefined -AlertNoLaws TestAlertNoLaws -AlertNoLongerVassalFaction TestAlertNoLongerVassalFaction -AlertNonOwnership TestAlertNonOwnership -AlertNoPendingChallenges TestAlertNoPendingChallenges -AlertNotAllied TestAlertNotAllied -AlertNotBeenChallenged TestAlertNotBeenChallenged -AlertNotBeenChallengedByPlayer TestAlertNotBeenChallengedByPlayer -AlertNotInFaction TestAlertNotInFaction -AlertNotInvitedToFaction TestAlertNotInvitedToFaction -AlertNotOfferedVassalizationBy TestAlertNotOfferedVassalizationBy -AlertNowAlliedWith TestAlertNowAlliedWith -AlertNowAtPeaceWith TestAlertNowAtPeaceWith -AlertPlayerAlreadyOwner TestAlertPlayerAlreadyOwner -AlertPlayerNotInFaction TestAlertPlayerNotInFaction -AlertPowerLevelDecreased TestAlertPowerLevelDecreased -AlertPowerLevelIncreasedBy TestAlertPowerLevelIncreasedBy -AlertReachedDemesne TestAlertReachedDemesne -AlertUnlocked TestAlertUnlocked -AlertUnlockingCancelled TestAlertUnlockingCancelled -AllianceBrokenWith TestAllianceBrokenWith -AlliedWith TestAlliedWith -AllLandUnclaimed TestAllLandUnclaimed -AllLandUnclaimedFrom TestAllLandUnclaimedFrom -AlreadyEnteredCheckAccess TestAlreadyEnteredCheckAccess -AlreadyEnteredRevokeAccess TestAlreadyEnteredRevokeAccess -AlreadyInFaction TestAlreadyInFaction -ArgumentMustBeNumber TestArgumentMustBeNumber -ArgumentsSingleQuotesRequirement TestArgumentsSingleQuotesRequirement -AssignedToRandomFaction TestAssignedToRandomFaction -AttemptedAlliance TestAttemptedAlliance -AttemptedPeace TestAttemptedPeace -AtWarWith TestAtWarWith -AutoclaimToggled TestAutoclaimToggled -BlockAlreadyLocked TestBlockAlreadyLocked -BlockIsNotLocked TestBlockIsNotLocked -BlockIsPartOfGateMustRemoveGate TestBlockIsPartOfGateMustRemoveGate -BonusPower TestBonusPower -BooleanSet TestBooleanSet -Cancelled TestCancelled -CancelledGatePlacement1 TestCancelledGatePlacement1 -CancelledGatePlacement2 TestCancelledGatePlacement2 -CancelledGatePlacementErrorLinking TestCancelledGatePlacementErrorLinking -CannotAllyWithSelf TestCannotAllyWithSelf -CannotAttackFactionMember TestCannotAttackFactionMember -CannotAttackNonWarringPlayer TestCannotAttackNonWarringPlayer -CannotBreakAllianceWithSelf TestCannotBreakAllianceWithSelf -CannotBringNeutralFactionIntoWar TestCannotBringNeutralFactionIntoWar -CannotCancelActiveDuel TestCannotCancelActiveDuel -CannotDeclareWarIfLiegeNotWeakened TestCannotDeclareWarIfLiegeNotWeakened -CannotDeclareWarIfNeutralFaction TestCannotDeclareWarIfNeutralFaction -CannotDeclareWarOnAlly TestCannotDeclareWarOnAlly -CannotDeclareWarOnLiege TestCannotDeclareWarOnLiege -CannotDeclareWarOnNeutralFaction TestCannotDeclareWarOnNeutralFaction -CannotDeclareWarOnVassal TestCannotDeclareWarOnVassal -CannotDeclareWarOnYourself TestCannotDeclareWarOnYourself -CannotDemoteSelf TestCannotDemoteSelf -CannotDuelSelf TestCannotDuelSelf -CannotFindDynmap TestCannotFindDynmap -CannotForciblyKickOwner TestCannotForciblyKickOwner -CannotGrantAccessToSelf TestCannotGrantAccessToSelf -CannotKickOwner TestCannotKickOwner -CannotKickSelf TestCannotKickSelf -CannotMakePeaceWithSelf TestCannotMakePeaceWithSelf -CannotPlaceChestsNextToUnownedLockedChests TestCannotPlaceChestsNextToUnownedLockedChests -CannotPlaceHoppersNextToUnownedLockedChests TestCannotPlaceHoppersNextToUnownedLockedChests -CannotPromoteSelf TestCannotPromoteSelf -CannotRevokeAccessFromSelf TestCannotRevokeAccessFromSelf -CannotSetFactionHomeInWilderness TestCannotSetFactionHomeInWilderness -CannotSetVersion TestCannotSetVersion -CannotTransferToSelf TestCannotTransferToSelf -CannotVassalizeLiege TestCannotVassalizeLiege -CannotVassalizeSelf TestCannotVassalizeSelf -CannotVassalizeVassal TestCannotVassalizeVassal -CanOnlyCreateGatesInClaimedTerritory TestCanOnlyCreateGatesInClaimedTerritory -CanOnlyLockBlocksInClaimedTerritory TestCanOnlyLockBlocksInClaimedTerritory -CanOnlyLockInFactionTerritory TestCanOnlyLockInFactionTerritory -CanOnlyLockSpecificBlocks TestCanOnlyLockSpecificBlocks -ClaimedChunksLoaded TestClaimedChunksLoaded -ClaimedChunksSuccessfullyLoaded TestClaimedChunksSuccessfullyLoaded -ClickOnTriggerLever TestClickOnTriggerLever -ClickToPlaceSecondCorner TestClickToPlaceSecondCorner -CmdAddLaw TestCmdAddLaw -CmdAlly TestCmdAlly -CmdAutoClaim TestCmdAutoClaim -CmdBreakAlliance TestCmdBreakAlliance -CmdBypass TestCmdBypass -CmdChat TestCmdChat -CmdCheckAccess TestCmdCheckAccess -CmdCheckClaim TestCmdCheckClaim -CmdClaim TestCmdClaim -CmdConfig TestCmdConfig -CmdConfigSet TestCmdConfigSet -CmdConfigShow TestCmdConfigShow -CmdCreate TestCmdCreate -CmdDeclareIndependence TestCmdDeclareIndependence -CmdDeclareWar TestCmdDeclareWar -CmdDemote TestCmdDemote -CmdDesc TestCmdDesc -CmdDisband TestCmdDisband -CmdDuel TestCmdDuel -CmdDuelAccept TestCmdDuelAccept -CmdDuelCancel TestCmdDuelCancel -CmdDuelChallenge TestCmdDuelChallenge -CmdEditLaw TestCmdEditLaw -CmdFlags TestCmdFlags -CmdFlagsSet TestCmdFlagsSet -CmdFlagsShow TestCmdFlagsShow -CmdForce TestCmdForce -CmdForceBonusPower TestCmdForceBonusPower -CmdForceClaim TestCmdForceClaim -CmdForceCreate TestCmdForceCreate -CmdForceDemote TestCmdForceDemote -CmdForceJoin TestCmdForceJoin -CmdForceKick TestCmdForceKick -CmdForceLoad TestCmdForceLoad -CmdForcePeace TestCmdForcePeace -CmdForcePower TestCmdForcePower -CmdForceRename TestCmdForceRename -CmdForceRenounce TestCmdForceRenounce -CmdForceSave TestCmdForceSave -CmdForceTransfer TestCmdForceTransfer -CmdForceUnlock TestCmdForceUnlock -CmdGate TestCmdGate -CmdGateCancel TestCmdGateCancel -CmdGateCreate TestCmdGateCreate -CmdGateList TestCmdGateList -CmdGateName TestCmdGateName -CmdGateRemove TestCmdGateRemove -CmdGrantAccess TestCmdGrantAccess -CmdGrantIndependence TestCmdGrantIndependence -CmdHelp TestCmdHelp -CmdHome TestCmdHome -CmdInfo TestCmdInfo -CmdInvite TestCmdInvite -CmdInvoke TestCmdInvoke -CmdJoin TestCmdJoin -CmdKick TestCmdKick -CmdLaws TestCmdLaws -CmdLeave TestCmdLeave -CmdList TestCmdList -CmdLock TestCmdLock -CmdMakePeace TestCmdMakePeace -CmdMembers TestCmdMembers -CmdPower TestCmdPower -CmdPrefix TestCmdPrefix -CmdPromote TestCmdPromote -CmdRemoveLaw TestCmdRemoveLaw -CmdRename TestCmdRename -CmdResetPowerLevels TestCmdResetPowerLevels -CmdRevokeAccess TestCmdRevokeAccess -CmdSetHome TestCmdSetHome -CmdSwearFealty TestCmdSwearFealty -CmdTransfer TestCmdTransfer -CmdUnclaim TestCmdUnclaim -CmdUnclaimall TestCmdUnclaimall -CmdUnlock TestCmdUnlock -CmdVassalize TestCmdVassalize -CmdVersion TestCmdVersion -CmdWho TestCmdWho -CommandCancelled TestCommandCancelled -CommandNotRecognized TestCommandNotRecognized -CommandsPage1 TestCommandsPage1 -CommandsPage2 TestCommandsPage2 -CommandsPage3 TestCommandsPage3 -CommandsPage4 TestCommandsPage4 -CommandsPage5 TestCommandsPage5 -CommandsPage6 TestCommandsPage6 -CommandsPage7 TestCommandsPage7 -ConfigListPageOne TestConfigListPageOne -ConfigListPageTwo TestConfigListPageTwo -CreatingGateCancelled TestCreatingGateCancelled -CreatingGateClickWithHoe TestCreatingGateClickWithHoe -CuboidDisallowed1 TestCuboidDisallowed1 -CuboidDisallowed2 TestCuboidDisallowed2 -CurrentLanguageID TestCurrentLanguageID -CurrentlyNoFactions TestCurrentlyNoFactions -CurrentPowerLevel TestCurrentPowerLevel -Defeated TestDefeated -DemesneSize TestDemesneSize -Description TestDescription -DescriptionSet TestDescriptionSet -DesignatedFactionNotFound TestDesignatedFactionNotFound -DesiredPowerMustBeANumber TestDesiredPowerMustBeANumber -DeveloperList TestDeveloperList -DisbandmentDueToZeroPower TestDisbandmentDueToZeroPower -DoesntExist TestDoesntExist -Done TestDone -DoubleSet TestDoubleSet -DuelChallengeCancelled TestDuelChallengeCancelled -DuelEndedInTie TestDuelEndedInTie -DynmapIntegrationSuccessful TestDynmapIntegrationSuccessful -ERROR TestERROR -ErrorAddingAreaMarker TestErrorAddingAreaMarker -ErrorChunkRemoval TestErrorChunkRemoval -ErrorClaimedChunkRemoval TestErrorClaimedChunkRemoval -ErrorCouldNotFindGatesFaction TestErrorCouldNotFindGatesFaction -ErrorCouldNotLoadFactionGate TestErrorCouldNotLoadFactionGate -ErrorCreatingMarkerSet TestErrorCreatingMarkerSet -ErrorIntegratingWithDynmap TestErrorIntegratingWithDynmap -ErrorPlayerPowerRecordForUUIDNotFound TestErrorPlayerPowerRecordForUUIDNotFound -ErrorSettingAreaMarkerColor TestErrorSettingAreaMarkerColor -FactionAlreadyAlly TestFactionAlreadyAlly -FactionAlreadyExists TestFactionAlreadyExists -FactionAndPlayerSingleQuotesRequirement TestFactionAndPlayerSingleQuotesRequirement -FactionAndVassalSingleQuotesRequirement TestFactionAndVassalSingleQuotesRequirement -FactionCreated TestFactionCreated -FactionCurrentlyEnemyMustMakePeace TestFactionCurrentlyEnemyMustMakePeace -FactionDataLoadedSuccessfuly TestFactionDataLoadedSuccessfuly -FactionDoesNotExist TestFactionDoesNotExist -FactionDoesNotHaveLaws TestFactionDoesNotHaveLaws -FactionGates TestFactionGates -FactionHomeLoadError TestFactionHomeLoadError -FactionHomeNotSetYet TestFactionHomeNotSetYet -FactionHomeSet TestFactionHomeSet -FactionInfo TestFactionInfo -FactionIsNotVassal TestFactionIsNotVassal -FactionMustBeDesignatedInsideSingleQuotes TestFactionMustBeDesignatedInsideSingleQuotes -FactionNameChanged TestFactionNameChanged -FactionNameNotRecognized TestFactionNameNotRecognized -FactionNotEnemy TestFactionNotEnemy -FactionNotFound TestFactionNotFound -FactionsSuccessfullyLoaded TestFactionsSuccessfullyLoaded -FactionsTitle TestFactionsTitle -FactionSuccessfullyDisbanded TestFactionSuccessfullyDisbanded -FactionSuccessfullyLoaded TestFactionSuccessfullyLoaded -FileLoadError TestFileLoadError -FollowingPlayersHaveAccess TestFollowingPlayersHaveAccess -GateCreated TestGateCreated -HasAttemptedToMakePeaceWith TestHasAttemptedToMakePeaceWith -HasBeenKickedFrom TestHasBeenKickedFrom -HasDeclaredIndependence TestHasDeclaredIndependence -HasDeclaredWarAgainst TestHasDeclaredWarAgainst -HasJoined TestHasJoined -HelpAddLaw TestHelpAddLaw -HelpAlly TestHelpAlly -HelpAutoclaim TestHelpAutoclaim -HelpBreakAlliance TestHelpBreakAlliance -HelpBypass TestHelpBypass -HelpChat TestHelpChat -HelpCheckAccess TestHelpCheckAccess -HelpCheckClaim TestHelpCheckClaim -HelpClaim TestHelpClaim -HelpConfigSet TestHelpConfigSet -HelpConfigShow TestHelpConfigShow -HelpCreate TestHelpCreate -HelpDeclareIndependence TestHelpDeclareIndependence -HelpDeclareWar TestHelpDeclareWar -HelpDemote TestHelpDemote -HelpDesc TestHelpDesc -HelpDisband TestHelpDisband -HelpDuelAccept TestHelpDuelAccept -HelpDuelCancel TestHelpDuelCancel -HelpDuelChallenge TestHelpDuelChallenge -HelpEditLaw TestHelpEditLaw -HelpFlagsSet TestHelpFlagsSet -HelpFlagsShow TestHelpFlagsShow -HelpForce TestHelpForce -HelpForceBonusPower TestHelpForceBonusPower -HelpForceClaim TestHelpForceClaim -HelpForceCreate TestHelpForceCreate -HelpForceDemote TestHelpForceDemote -HelpForceJoin TestHelpForceJoin -HelpForceKick TestHelpForceKick -HelpForceLoad TestHelpForceLoad -HelpForcePeace TestHelpForcePeace -HelpForcePower TestHelpForcePower -HelpForceRemoveVassal TestHelpForceRemoveVassal -HelpForceRename TestHelpForceRename -HelpForceRenounce TestHelpForceRenounce -HelpForceSave TestHelpForceSave -HelpForceTransfer TestHelpForceTransfer -HelpForceUnlock TestHelpForceUnlock -HelpGateCancel TestHelpGateCancel -HelpGateCreate TestHelpGateCreate -HelpGateList TestHelpGateList -HelpGateName TestHelpGateName -HelpGateRemove TestHelpGateRemove -HelpGrantAccess TestHelpGrantAccess -HelpGrantIndependence TestHelpGrantIndependence -HelpHelp TestHelpHelp -HelpHome TestHelpHome -HelpInfo TestHelpInfo -HelpInvite TestHelpInvite -HelpInvoke TestHelpInvoke -HelpJoin TestHelpJoin -HelpKick TestHelpKick -HelpLaws TestHelpLaws -HelpLeave TestHelpLeave -HelpList TestHelpList -HelpLock TestHelpLock -HelpMakePeace TestHelpMakePeace -HelpMap TestHelpMap -HelpMembers TestHelpMembers -HelpPower TestHelpPower -HelpPrefix TestHelpPrefix -HelpPromote TestHelpPromote -HelpRemoveLaw TestHelpRemoveLaw -HelpRename TestHelpRename -HelpResetPowerLevels TestHelpResetPowerLevels -HelpRevokeAccess TestHelpRevokeAccess -HelpSetHome TestHelpSetHome -HelpSwearFealty TestHelpSwearFealty -HelpTransfer TestHelpTransfer -HelpUnclaim TestHelpUnclaim -HelpUnclaimall TestHelpUnclaimall -HelpUnlock TestHelpUnlock -HelpVassalize TestHelpVassalize -HelpVersion TestHelpVersion -HelpWho TestHelpWho -HomeClaimedByAnotherFaction TestHomeClaimedByAnotherFaction -HomeIsInUnclaimedChunk TestHomeIsInUnclaimedChunk -HourlySaveAlert TestHourlySaveAlert -IntegerSet TestIntegerSet -InvitationExpired TestInvitationExpired -InvitationSent TestInvitationSent -KeysLoaded TestKeysLoaded -LandAlreadyClaimedBy TestLandAlreadyClaimedBy -LandAlreadyClaimedByYourFaction TestLandAlreadyClaimedByYourFaction -LandClaimedBy TestLandClaimedBy -LandClaimedUsingAdminBypass TestLandClaimedUsingAdminBypass -LandIsNotClaimed TestLandIsNotClaimed -LandIsUnclaimed TestLandIsUnclaimed -LandNotCurrentlyClaimed TestLandNotCurrentlyClaimed -LandUnclaimed TestLandUnclaimed -LawAdded TestLawAdded -LawEdited TestLawEdited -LawRemoved TestLawRemoved -LawsTitle TestLawsTitle -LeverSuccessfullyLinked TestLeverSuccessfullyLinked -Liege TestLiege -ListLegend TestListLegend -LoadingClaimedChunks TestLoadingClaimedChunks -LoadingLockedBLocks TestLoadingLockedBLocks -LoadingPlayerPowerRecords TestLoadingPlayerPowerRecords -Locked TestLocked -LockedBlockSuccessfullyLoaded TestLockedBlockSuccessfullyLoaded -LockedBy TestLockedBy -LockingCancelled TestLockingCancelled -LockRemovalError TestLockRemovalError -MaterialsMismatch1 TestMaterialsMismatch1 -MaterialsMismatch2 TestMaterialsMismatch2 -MedievalFactionsStringRight TestMedievalFactionsStringRight -MedievalFactionsTitle TestMedievalFactionsTitle -MembersOf TestMembersOf -MissingFactionGatesJSONCollection TestMissingFactionGatesJSONCollection -MovementDetectedTeleportCancelled TestMovementDetectedTeleportCancelled -MustBeAtWarOrFactionMustBeInactive TestMustBeAtWarOrFactionMustBeInactive -MustBeInFaction TestMustBeInFaction -MustBeOwner TestMustBeOwner -MustOwnFactionOrBeOfficer TestMustOwnFactionOrBeOfficer -MustTransferOwnership TestMustTransferOwnership -Name TestName -NameAlreadyTaken TestNameAlreadyTaken -NeutralityDisabled TestNeutralityDisabled -NoBlockDetectedToCheckForGate TestNoBlockDetectedToCheckForGate -NoFactionsDesignatedSingleQuotesRequired TestNoFactionsDesignatedSingleQuotesRequired -NoLongerBypassingProtections TestNoLongerBypassingProtections -NoLongerInFactionChat TestNoLongerInFactionChat -NotAMemberOfAnyFaction TestNotAMemberOfAnyFaction -NotAnAlly TestNotAnAlly -NotAnAllyOrVassal TestNotAnAllyOrVassal -NotAtWarWith TestNotAtWarWith -NotAVassalOfAFaction TestNotAVassalOfAFaction +AcceptedChallengeDuelHasBegun TestAcceptedChallengeDuelHasBegun +AlertAccessGrantedTo TestAlertAccessGrantedTo +AlertAccessRevokedFor TestAlertAccessRevokedFor +AlertAllianceHasBeenBroken TestAlertAllianceHasBeenBroken +AlertAlreadyAtWarWith TestAlertAlreadyAtWarWith +AlertAlreadyCreatingGate TestAlertAlreadyCreatingGate +AlertAlreadyDueling TestAlertAlreadyDueling +AlertAlreadyDuelingPlayer TestAlertAlreadyDuelingPlayer +AlertAlreadyDuelingSomeone TestAlertAlreadyDuelingSomeone +AlertAlreadyGrantingAccess TestAlertAlreadyGrantingAccess +AlertAlreadyInFaction TestAlertAlreadyInFaction +AlertAlreadyRequestedAlliance TestAlertAlreadyRequestedAlliance +AlertAlreadyRequestedPeace TestAlertAlreadyRequestedPeace +AlertAttemptedAlliance TestAlertAttemptedAlliance +AlertAttemptedVassalization TestAlertAttemptedVassalization +AlertBeenInvited TestAlertBeenInvited +AlertCalledToWar1 TestAlertCalledToWar1 +AlertCalledToWar2 TestAlertCalledToWar2 +AlertCalledToWar3 TestAlertCalledToWar3 +AlertChallengedToDuel TestAlertChallengedToDuel +AlertChallengedToDuelPlusHowTo TestAlertChallengedToDuelPlusHowTo +AlertChallengeIssued TestAlertChallengeIssued +AlertChallengeWasAccepted TestAlertChallengeWasAccepted +AlertChangedGateName TestAlertChangedGateName +AlertCurrentPowerLevel TestAlertCurrentPowerLevel +AlertDecreasingThePowerOfInactivePlayers TestAlertDecreasingThePowerOfInactivePlayers +AlertDemotion TestAlertDemotion +AlertDisbandmentDueToZeroPower TestAlertDisbandmentDueToZeroPower +AlertFactionAttemptedToVassalize TestAlertFactionAttemptedToVassalize +AlertFactionHasBeenVassalized TestAlertFactionHasBeenVassalized +AlertFactionHasNewVassal TestAlertFactionHasNewVassal +AlertFactionHomeRemoved TestAlertFactionHomeRemoved +AlertFactionIsWeakened TestAlertFactionIsWeakened +AlertForcedDemotion TestAlertForcedDemotion +AlertForcedKick TestAlertForcedKick +AlertForcedLoad TestAlertForcedLoad +AlertForcedSave TestAlertForcedSave +AlertForcedToJoinFaction TestAlertForcedToJoinFaction +AlertGate TestAlertGate +AlertGrantedIndependence TestAlertGrantedIndependence +AlertIncreasingThePowerOfEveryPlayer TestAlertIncreasingThePowerOfEveryPlayer +AlertJoinedFaction TestAlertJoinedFaction +AlertKicked TestAlertKicked +AlertLandClaimed TestAlertLandClaimed +AlertLandConqueredFromAnotherFaction TestAlertLandConqueredFromAnotherFaction +AlertLandConqueredFromYourFaction TestAlertLandConqueredFromYourFaction +AlertLeftFaction TestAlertLeftFaction +AlertLeftFactionAndItGotDeleted TestAlertLeftFactionAndItGotDeleted +AlertMoreClaimedChunksThanPower TestAlertMoreClaimedChunksThanPower +AlertMustBeAtWarToConquer TestAlertMustBeAtWarToConquer +AlertMustBeInFactionToUseCommand TestAlertMustBeInFactionToUseCommand +AlertMustBeMemberToCreateGate TestAlertMustBeMemberToCreateGate +AlertMustBeOfficerOrOwnerToClaimLand TestAlertMustBeOfficerOrOwnerToClaimLand +AlertMustBeOwnerOrOfficerToCreateGate TestAlertMustBeOwnerOrOfficerToCreateGate +AlertMustBeOwnerOrOfficerToUseCommand TestAlertMustBeOwnerOrOfficerToUseCommand +AlertMustBeOwnerToInvokeAlliance TestAlertMustBeOwnerToInvokeAlliance +AlertMustBeOwnerToUseCommand TestAlertMustBeOwnerToUseCommand +AlertMustKickAllPlayers TestAlertMustKickAllPlayers +AlertNoGatesDefined TestAlertNoGatesDefined +AlertNoLaws TestAlertNoLaws +AlertNoLongerVassalFaction TestAlertNoLongerVassalFaction +AlertNonOwnership TestAlertNonOwnership +AlertNoPendingChallenges TestAlertNoPendingChallenges +AlertNotAllied TestAlertNotAllied +AlertNotBeenChallenged TestAlertNotBeenChallenged +AlertNotBeenChallengedByPlayer TestAlertNotBeenChallengedByPlayer +AlertNotInFaction TestAlertNotInFaction +AlertNotInvitedToFaction TestAlertNotInvitedToFaction +AlertNotOfferedVassalizationBy TestAlertNotOfferedVassalizationBy +AlertNowAlliedWith TestAlertNowAlliedWith +AlertNowAtPeaceWith TestAlertNowAtPeaceWith +AlertPlayerAlreadyOwner TestAlertPlayerAlreadyOwner +AlertPlayerNotInFaction TestAlertPlayerNotInFaction +AlertPowerLevelDecreased TestAlertPowerLevelDecreased +AlertPowerLevelIncreasedBy TestAlertPowerLevelIncreasedBy +AlertReachedDemesne TestAlertReachedDemesne +AlertUnlocked TestAlertUnlocked +AlertUnlockingCancelled TestAlertUnlockingCancelled +AllianceBrokenWith TestAllianceBrokenWith +AlliedWith TestAlliedWith +AllLandUnclaimed TestAllLandUnclaimed +AllLandUnclaimedFrom TestAllLandUnclaimedFrom +AlreadyEnteredCheckAccess TestAlreadyEnteredCheckAccess +AlreadyEnteredRevokeAccess TestAlreadyEnteredRevokeAccess +AlreadyInFaction TestAlreadyInFaction +ArgumentMustBeNumber TestArgumentMustBeNumber +ArgumentsSingleQuotesRequirement TestArgumentsSingleQuotesRequirement +AssignedToRandomFaction TestAssignedToRandomFaction +AttemptedAlliance TestAttemptedAlliance +AttemptedPeace TestAttemptedPeace +AtWarWith TestAtWarWith +AutoclaimToggled TestAutoclaimToggled +BlockAlreadyLocked TestBlockAlreadyLocked +BlockIsNotLocked TestBlockIsNotLocked +BlockIsPartOfGateMustRemoveGate TestBlockIsPartOfGateMustRemoveGate +BonusPower TestBonusPower +BooleanSet TestBooleanSet +Cancelled TestCancelled +CancelledGatePlacement1 TestCancelledGatePlacement1 +CancelledGatePlacement2 TestCancelledGatePlacement2 +CancelledGatePlacementErrorLinking TestCancelledGatePlacementErrorLinking +CannotAllyWithSelf TestCannotAllyWithSelf +CannotAttackFactionMember TestCannotAttackFactionMember +CannotAttackNonWarringPlayer TestCannotAttackNonWarringPlayer +CannotBreakAllianceWithSelf TestCannotBreakAllianceWithSelf +CannotBringNeutralFactionIntoWar TestCannotBringNeutralFactionIntoWar +CannotCancelActiveDuel TestCannotCancelActiveDuel +CannotDeclareWarIfLiegeNotWeakened TestCannotDeclareWarIfLiegeNotWeakened +CannotDeclareWarIfNeutralFaction TestCannotDeclareWarIfNeutralFaction +CannotDeclareWarOnAlly TestCannotDeclareWarOnAlly +CannotDeclareWarOnLiege TestCannotDeclareWarOnLiege +CannotDeclareWarOnNeutralFaction TestCannotDeclareWarOnNeutralFaction +CannotDeclareWarOnVassal TestCannotDeclareWarOnVassal +CannotDeclareWarOnYourself TestCannotDeclareWarOnYourself +CannotDemoteSelf TestCannotDemoteSelf +CannotDuelSelf TestCannotDuelSelf +CannotFindDynmap TestCannotFindDynmap +CannotForciblyKickOwner TestCannotForciblyKickOwner +CannotGrantAccessToSelf TestCannotGrantAccessToSelf +CannotKickOwner TestCannotKickOwner +CannotKickSelf TestCannotKickSelf +CannotMakePeaceWithSelf TestCannotMakePeaceWithSelf +CannotPlaceChestsNextToUnownedLockedChests TestCannotPlaceChestsNextToUnownedLockedChests +CannotPlaceHoppersNextToUnownedLockedChests TestCannotPlaceHoppersNextToUnownedLockedChests +CannotPromoteSelf TestCannotPromoteSelf +CannotRevokeAccessFromSelf TestCannotRevokeAccessFromSelf +CannotSetFactionHomeInWilderness TestCannotSetFactionHomeInWilderness +CannotSetVersion TestCannotSetVersion +CannotTransferToSelf TestCannotTransferToSelf +CannotVassalizeLiege TestCannotVassalizeLiege +CannotVassalizeSelf TestCannotVassalizeSelf +CannotVassalizeVassal TestCannotVassalizeVassal +CanOnlyCreateGatesInClaimedTerritory TestCanOnlyCreateGatesInClaimedTerritory +CanOnlyLockBlocksInClaimedTerritory TestCanOnlyLockBlocksInClaimedTerritory +CanOnlyLockInFactionTerritory TestCanOnlyLockInFactionTerritory +CanOnlyLockSpecificBlocks TestCanOnlyLockSpecificBlocks +ClaimedChunksLoaded TestClaimedChunksLoaded +ClaimedChunksSuccessfullyLoaded TestClaimedChunksSuccessfullyLoaded +ClickOnTriggerLever TestClickOnTriggerLever +ClickToPlaceSecondCorner TestClickToPlaceSecondCorner +CmdAddLaw TestCmdAddLaw +CmdAlly TestCmdAlly +CmdAutoClaim TestCmdAutoClaim +CmdBreakAlliance TestCmdBreakAlliance +CmdBypass TestCmdBypass +CmdChat TestCmdChat +CmdCheckAccess TestCmdCheckAccess +CmdCheckClaim TestCmdCheckClaim +CmdClaim TestCmdClaim +CmdConfig TestCmdConfig +CmdConfigSet TestCmdConfigSet +CmdConfigShow TestCmdConfigShow +CmdCreate TestCmdCreate +CmdDeclareIndependence TestCmdDeclareIndependence +CmdDeclareWar TestCmdDeclareWar +CmdDemote TestCmdDemote +CmdDesc TestCmdDesc +CmdDisband TestCmdDisband +CmdDuel TestCmdDuel +CmdDuelAccept TestCmdDuelAccept +CmdDuelCancel TestCmdDuelCancel +CmdDuelChallenge TestCmdDuelChallenge +CmdEditLaw TestCmdEditLaw +CmdFlags TestCmdFlags +CmdFlagsSet TestCmdFlagsSet +CmdFlagsShow TestCmdFlagsShow +CmdForce TestCmdForce +CmdForceBonusPower TestCmdForceBonusPower +CmdForceClaim TestCmdForceClaim +CmdForceCreate TestCmdForceCreate +CmdForceDemote TestCmdForceDemote +CmdForceJoin TestCmdForceJoin +CmdForceKick TestCmdForceKick +CmdForceLoad TestCmdForceLoad +CmdForcePeace TestCmdForcePeace +CmdForcePower TestCmdForcePower +CmdForceRename TestCmdForceRename +CmdForceRenounce TestCmdForceRenounce +CmdForceSave TestCmdForceSave +CmdForceTransfer TestCmdForceTransfer +CmdForceUnlock TestCmdForceUnlock +CmdGate TestCmdGate +CmdGateCancel TestCmdGateCancel +CmdGateCreate TestCmdGateCreate +CmdGateList TestCmdGateList +CmdGateName TestCmdGateName +CmdGateRemove TestCmdGateRemove +CmdGrantAccess TestCmdGrantAccess +CmdGrantIndependence TestCmdGrantIndependence +CmdHelp TestCmdHelp +CmdHome TestCmdHome +CmdInfo TestCmdInfo +CmdInvite TestCmdInvite +CmdInvoke TestCmdInvoke +CmdJoin TestCmdJoin +CmdKick TestCmdKick +CmdLaws TestCmdLaws +CmdLeave TestCmdLeave +CmdList TestCmdList +CmdLock TestCmdLock +CmdMakePeace TestCmdMakePeace +CmdMembers TestCmdMembers +CmdPower TestCmdPower +CmdPrefix TestCmdPrefix +CmdPromote TestCmdPromote +CmdRemoveLaw TestCmdRemoveLaw +CmdRename TestCmdRename +CmdResetPowerLevels TestCmdResetPowerLevels +CmdRevokeAccess TestCmdRevokeAccess +CmdSetHome TestCmdSetHome +CmdSwearFealty TestCmdSwearFealty +CmdTransfer TestCmdTransfer +CmdUnclaim TestCmdUnclaim +CmdUnclaimall TestCmdUnclaimall +CmdUnlock TestCmdUnlock +CmdVassalize TestCmdVassalize +CmdVersion TestCmdVersion +CmdWho TestCmdWho +CommandCancelled TestCommandCancelled +CommandNotRecognized TestCommandNotRecognized +CommandsPage1 TestCommandsPage1 +CommandsPage2 TestCommandsPage2 +CommandsPage3 TestCommandsPage3 +CommandsPage4 TestCommandsPage4 +CommandsPage5 TestCommandsPage5 +CommandsPage6 TestCommandsPage6 +CommandsPage7 TestCommandsPage7 +ConfigListPageOne TestConfigListPageOne +ConfigListPageTwo TestConfigListPageTwo +CreatingGateCancelled TestCreatingGateCancelled +CreatingGateClickWithHoe TestCreatingGateClickWithHoe +CuboidDisallowed1 TestCuboidDisallowed1 +CuboidDisallowed2 TestCuboidDisallowed2 +CurrentLanguageID TestCurrentLanguageID +CurrentlyNoFactions TestCurrentlyNoFactions +CurrentPowerLevel TestCurrentPowerLevel +Defeated TestDefeated +DemesneSize TestDemesneSize +Description TestDescription +DescriptionSet TestDescriptionSet +DesignatedFactionNotFound TestDesignatedFactionNotFound +DesiredPowerMustBeANumber TestDesiredPowerMustBeANumber +DeveloperList TestDeveloperList +DisbandmentDueToZeroPower TestDisbandmentDueToZeroPower +DoesntExist TestDoesntExist +Done TestDone +DoubleSet TestDoubleSet +DuelChallengeCancelled TestDuelChallengeCancelled +DuelEndedInTie TestDuelEndedInTie +DynmapIntegrationSuccessful TestDynmapIntegrationSuccessful +ERROR TestERROR +ErrorAddingAreaMarker TestErrorAddingAreaMarker +ErrorChunkRemoval TestErrorChunkRemoval +ErrorClaimedChunkRemoval TestErrorClaimedChunkRemoval +ErrorCouldNotFindGatesFaction TestErrorCouldNotFindGatesFaction +ErrorCouldNotLoadFactionGate TestErrorCouldNotLoadFactionGate +ErrorCreatingMarkerSet TestErrorCreatingMarkerSet +ErrorIntegratingWithDynmap TestErrorIntegratingWithDynmap +ErrorPlayerPowerRecordForUUIDNotFound TestErrorPlayerPowerRecordForUUIDNotFound +ErrorSettingAreaMarkerColor TestErrorSettingAreaMarkerColor +FactionAlreadyAlly TestFactionAlreadyAlly +FactionAlreadyExists TestFactionAlreadyExists +FactionAndPlayerSingleQuotesRequirement TestFactionAndPlayerSingleQuotesRequirement +FactionAndVassalSingleQuotesRequirement TestFactionAndVassalSingleQuotesRequirement +FactionCreated TestFactionCreated +FactionCurrentlyEnemyMustMakePeace TestFactionCurrentlyEnemyMustMakePeace +FactionDataLoadedSuccessfuly TestFactionDataLoadedSuccessfuly +FactionDoesNotExist TestFactionDoesNotExist +FactionDoesNotHaveLaws TestFactionDoesNotHaveLaws +FactionGates TestFactionGates +FactionHomeLoadError TestFactionHomeLoadError +FactionHomeNotSetYet TestFactionHomeNotSetYet +FactionHomeSet TestFactionHomeSet +FactionInfo TestFactionInfo +FactionIsNotVassal TestFactionIsNotVassal +FactionMustBeDesignatedInsideSingleQuotes TestFactionMustBeDesignatedInsideSingleQuotes +FactionNameChanged TestFactionNameChanged +FactionNameNotRecognized TestFactionNameNotRecognized +FactionNotEnemy TestFactionNotEnemy +FactionNotFound TestFactionNotFound +FactionsSuccessfullyLoaded TestFactionsSuccessfullyLoaded +FactionsTitle TestFactionsTitle +FactionSuccessfullyDisbanded TestFactionSuccessfullyDisbanded +FactionSuccessfullyLoaded TestFactionSuccessfullyLoaded +FileLoadError TestFileLoadError +FollowingPlayersHaveAccess TestFollowingPlayersHaveAccess +GateCreated TestGateCreated +HasAttemptedToMakePeaceWith TestHasAttemptedToMakePeaceWith +HasBeenKickedFrom TestHasBeenKickedFrom +HasDeclaredIndependence TestHasDeclaredIndependence +HasDeclaredWarAgainst TestHasDeclaredWarAgainst +HasJoined TestHasJoined +HelpAddLaw TestHelpAddLaw +HelpAlly TestHelpAlly +HelpAutoclaim TestHelpAutoclaim +HelpBreakAlliance TestHelpBreakAlliance +HelpBypass TestHelpBypass +HelpChat TestHelpChat +HelpCheckAccess TestHelpCheckAccess +HelpCheckClaim TestHelpCheckClaim +HelpClaim TestHelpClaim +HelpConfigSet TestHelpConfigSet +HelpConfigShow TestHelpConfigShow +HelpCreate TestHelpCreate +HelpDeclareIndependence TestHelpDeclareIndependence +HelpDeclareWar TestHelpDeclareWar +HelpDemote TestHelpDemote +HelpDesc TestHelpDesc +HelpDisband TestHelpDisband +HelpDuelAccept TestHelpDuelAccept +HelpDuelCancel TestHelpDuelCancel +HelpDuelChallenge TestHelpDuelChallenge +HelpEditLaw TestHelpEditLaw +HelpFlagsSet TestHelpFlagsSet +HelpFlagsShow TestHelpFlagsShow +HelpForce TestHelpForce +HelpForceBonusPower TestHelpForceBonusPower +HelpForceClaim TestHelpForceClaim +HelpForceCreate TestHelpForceCreate +HelpForceDemote TestHelpForceDemote +HelpForceJoin TestHelpForceJoin +HelpForceKick TestHelpForceKick +HelpForceLoad TestHelpForceLoad +HelpForcePeace TestHelpForcePeace +HelpForcePower TestHelpForcePower +HelpForceRemoveVassal TestHelpForceRemoveVassal +HelpForceRename TestHelpForceRename +HelpForceRenounce TestHelpForceRenounce +HelpForceSave TestHelpForceSave +HelpForceTransfer TestHelpForceTransfer +HelpForceUnlock TestHelpForceUnlock +HelpGateCancel TestHelpGateCancel +HelpGateCreate TestHelpGateCreate +HelpGateList TestHelpGateList +HelpGateName TestHelpGateName +HelpGateRemove TestHelpGateRemove +HelpGrantAccess TestHelpGrantAccess +HelpGrantIndependence TestHelpGrantIndependence +HelpHelp TestHelpHelp +HelpHome TestHelpHome +HelpInfo TestHelpInfo +HelpInvite TestHelpInvite +HelpInvoke TestHelpInvoke +HelpJoin TestHelpJoin +HelpKick TestHelpKick +HelpLaws TestHelpLaws +HelpLeave TestHelpLeave +HelpList TestHelpList +HelpLock TestHelpLock +HelpMakePeace TestHelpMakePeace +HelpMap TestHelpMap +HelpMembers TestHelpMembers +HelpPower TestHelpPower +HelpPrefix TestHelpPrefix +HelpPromote TestHelpPromote +HelpRemoveLaw TestHelpRemoveLaw +HelpRename TestHelpRename +HelpResetPowerLevels TestHelpResetPowerLevels +HelpRevokeAccess TestHelpRevokeAccess +HelpSetHome TestHelpSetHome +HelpSwearFealty TestHelpSwearFealty +HelpTransfer TestHelpTransfer +HelpUnclaim TestHelpUnclaim +HelpUnclaimall TestHelpUnclaimall +HelpUnlock TestHelpUnlock +HelpVassalize TestHelpVassalize +HelpVersion TestHelpVersion +HelpWho TestHelpWho +HomeClaimedByAnotherFaction TestHomeClaimedByAnotherFaction +HomeIsInUnclaimedChunk TestHomeIsInUnclaimedChunk +HourlySaveAlert TestHourlySaveAlert +IntegerSet TestIntegerSet +InvitationExpired TestInvitationExpired +InvitationSent TestInvitationSent +KeysLoaded TestKeysLoaded +LandAlreadyClaimedBy TestLandAlreadyClaimedBy +LandAlreadyClaimedByYourFaction TestLandAlreadyClaimedByYourFaction +LandClaimedBy TestLandClaimedBy +LandClaimedUsingAdminBypass TestLandClaimedUsingAdminBypass +LandIsNotClaimed TestLandIsNotClaimed +LandIsUnclaimed TestLandIsUnclaimed +LandNotCurrentlyClaimed TestLandNotCurrentlyClaimed +LandUnclaimed TestLandUnclaimed +LawAdded TestLawAdded +LawEdited TestLawEdited +LawRemoved TestLawRemoved +LawsTitle TestLawsTitle +LeverSuccessfullyLinked TestLeverSuccessfullyLinked +Liege TestLiege +ListLegend TestListLegend +LoadingClaimedChunks TestLoadingClaimedChunks +LoadingLockedBLocks TestLoadingLockedBLocks +LoadingPlayerPowerRecords TestLoadingPlayerPowerRecords +Locked TestLocked +LockedBlockSuccessfullyLoaded TestLockedBlockSuccessfullyLoaded +LockedBy TestLockedBy +LockingCancelled TestLockingCancelled +LockRemovalError TestLockRemovalError +MaterialsMismatch1 TestMaterialsMismatch1 +MaterialsMismatch2 TestMaterialsMismatch2 +MedievalFactionsStringRight TestMedievalFactionsStringRight +MedievalFactionsTitle TestMedievalFactionsTitle +MembersOf TestMembersOf +MissingFactionGatesJSONCollection TestMissingFactionGatesJSONCollection +MovementDetectedTeleportCancelled TestMovementDetectedTeleportCancelled +MustBeAtWarOrFactionMustBeInactive TestMustBeAtWarOrFactionMustBeInactive +MustBeInFaction TestMustBeInFaction +MustBeOwner TestMustBeOwner +MustOwnFactionOrBeOfficer TestMustOwnFactionOrBeOfficer +MustTransferOwnership TestMustTransferOwnership +Name TestName +NameAlreadyTaken TestNameAlreadyTaken +NeutralityDisabled TestNeutralityDisabled +NoBlockDetectedToCheckForGate TestNoBlockDetectedToCheckForGate +NoFactionsDesignatedSingleQuotesRequired TestNoFactionsDesignatedSingleQuotesRequired +NoLongerBypassingProtections TestNoLongerBypassingProtections +NoLongerInFactionChat TestNoLongerInFactionChat +NotAMemberOfAnyFaction TestNotAMemberOfAnyFaction +NotAnAlly TestNotAnAlly +NotAnAllyOrVassal TestNotAnAllyOrVassal +NotAtWarWith TestNotAtWarWith +NotAVassalOfAFaction TestNotAVassalOfAFaction NotEnoughArgumentsDesignatedSingleQuotesRequired TestNotEnoughArgumentsDesignatedSingleQuotesRequired -NotTheOwnerOfThisBlock TestNotTheOwnerOfThisBlock -NotTheOwnerOfThisFaction TestNotTheOwnerOfThisFaction -NoVassalOrLiegeReferences TestNoVassalOrLiegeReferences -NowBypassingProtections TestNowBypassingProtections -NowSpeakingInFactionChat TestNowSpeakingInFactionChat -OnlyPlayersCanUseCommand TestOnlyPlayersCanUseCommand -OnlyUseLeversInClaimedTerritory TestOnlyUseLeversInClaimedTerritory -Owner TestOwner -OwnershipTransferred TestOwnershipTransferred -OwnerShipTransferredTo TestOwnerShipTransferredTo -PermissionNeeded TestPermissionNeeded -PlayerAlreadyDueling TestPlayerAlreadyDueling -PlayerAlreadyInFaction TestPlayerAlreadyInFaction -PlayerAlreadyOfficer TestPlayerAlreadyOfficer -PlayerAndDesiredPowerSingleQuotesRequirement TestPlayerAndDesiredPowerSingleQuotesRequirement -PlayerByNameNotFound TestPlayerByNameNotFound -PlayerCantBePromotedBecauseOfLimit TestPlayerCantBePromotedBecauseOfLimit -PlayerDemoted TestPlayerDemoted -PlayerIsNotInAFaction TestPlayerIsNotInAFaction -PlayerIsNotInYourFaction TestPlayerIsNotInYourFaction -PlayerIsNotMemberOfFaction TestPlayerIsNotMemberOfFaction -PlayerIsNotOfficerOfFaction TestPlayerIsNotOfficerOfFaction -PlayerNotFound TestPlayerNotFound -PlayerPowerRecordsLoaded TestPlayerPowerRecordsLoaded -PlayerPromoted TestPlayerPromoted -PleaseWaitGate TestPleaseWaitGate -PluginDisabled TestPluginDisabled -PluginDisabling TestPluginDisabling -PluginEnabled TestPluginEnabled -PluginEnabling TestPluginEnabling -PluginLoading TestPluginLoading -PluginSaving TestPluginSaving -Point1PlacementSuccessful TestPoint1PlacementSuccessful -Point2PlacedSuccessfully TestPoint2PlacedSuccessfully -Population TestPopulation -PowerHasDecayed TestPowerHasDecayed -PowerLevel TestPowerLevel -PowerLevelHasBeenSetTo TestPowerLevelHasBeenSetTo -PowerLevelHasIncreased TestPowerLevelHasIncreased -PowerLevelResetting TestPowerLevelResetting -PrefixesDisabled TestPrefixesDisabled -PrefixSet TestPrefixSet -PrefixTaken TestPrefixTaken -ProblemLoadingClaimedChunks TestProblemLoadingClaimedChunks -ProblemLoadingFactions TestProblemLoadingFactions -ProblemLoadingPowerRecords TestProblemLoadingPowerRecords -PromotedToOfficer TestPromotedToOfficer -RadiusRequirement TestRadiusRequirement -RemovedGate TestRemovedGate -ResettingIndividualPowerRecords TestResettingIndividualPowerRecords -RightClickCheckAccess TestRightClickCheckAccess -RightClickForceUnlock TestRightClickForceUnlock -RightClickGrantAccess TestRightClickGrantAccess -RightClickLock TestRightClickLock -RightClickRevokeAccess TestRightClickRevokeAccess -RightClickUnlock TestRightClickUnlock -SchedulingHourlyAutoSave TestSchedulingHourlyAutoSave -SchedulingPowerDecrease TestSchedulingPowerDecrease -SchedulingPowerIncrease TestSchedulingPowerIncrease -SingleQuotesAlliedWarring TestSingleQuotesAlliedWarring -StringSet TestStringSet -SubCommands TestSubCommands -SuccessFactionMemberRemoval TestSuccessFactionMemberRemoval -SuccessForceJoin TestSuccessForceJoin -SuccessfulDisbandment TestSuccessfulDisbandment -SuccessOfficerRemoval TestSuccessOfficerRemoval -SuccessReferencesRemoved TestSuccessReferencesRemoved -SupportedLanguageIDList TestSupportedLanguageIDList -SurroundedChunkProtected TestSurroundedChunkProtected -TargetBlockNotPartOfGate TestTargetBlockNotPartOfGate -TargetFactionNotOverClaiming TestTargetFactionNotOverClaiming -TeleportingAlert TestTeleportingAlert -ThreeBlockRequirement TestThreeBlockRequirement -TriggerBlockNotLever TestTriggerBlockNotLever -UsageAddLaw TestUsageAddLaw -UsageAlly TestUsageAlly -UsageBreakAlliance TestUsageBreakAlliance -UsageClaimRadius TestUsageClaimRadius -UsageConfigSet TestUsageConfigSet -UsageConfigShow TestUsageConfigShow -UsageCreate TestUsageCreate -UsageDeclareWar TestUsageDeclareWar -UsageDemote TestUsageDemote -UsageDesc TestUsageDesc -UsageEditLaw TestUsageEditLaw -UsageFlagsSet TestUsageFlagsSet -UsageForceBonusPower TestUsageForceBonusPower -UsageForceClaim TestUsageForceClaim -UsageForceCreate TestUsageForceCreate -UsageForceDemote TestUsageForceDemote -UsageForceJoin TestUsageForceJoin -UsageForceKick TestUsageForceKick -UsageForcePeace TestUsageForcePeace -UsageForcePower TestUsageForcePower -UsageForceRemoveVassal TestUsageForceRemoveVassal -UsageForceRename TestUsageForceRename -UsageForceRenounce TestUsageForceRenounce -UsageForceTransfer TestUsageForceTransfer -UsageGrantAccess TestUsageGrantAccess -UsageGrantIndependence TestUsageGrantIndependence -UsageInvite TestUsageInvite -UsageInvoke TestUsageInvoke -UsageJoin TestUsageJoin -UsageKick TestUsageKick -UsageMakePeace TestUsageMakePeace -UsagePrefix TestUsagePrefix -UsagePromote TestUsagePromote -UsageRemoveLaw TestUsageRemoveLaw -UsageRename TestUsageRename -UsageRevokeAccess TestUsageRevokeAccess -UsageSwearFealty TestUsageSwearFealty -UsageTransfer TestUsageTransfer -UsageVassalize TestUsageVassalize -UsageWho TestUsageWho -ValidSubCommandsShowSet TestValidSubCommandsShowSet -VassalContribution TestVassalContribution -Vassals TestVassals -WarningPlayerAlreadyStartedCreatingGate TestWarningPlayerAlreadyStartedCreatingGate -WasntFound TestWasntFound -WelcomeBackLastLogout TestWelcomeBackLastLogout -WikiLink TestWikiLink -Wilderness TestWilderness -WorldsMismatch1 TestWorldsMismatch1 -WorldsMismatch2 TestWorldsMismatch2 \ No newline at end of file +NotTheOwnerOfThisBlock TestNotTheOwnerOfThisBlock +NotTheOwnerOfThisFaction TestNotTheOwnerOfThisFaction +NoVassalOrLiegeReferences TestNoVassalOrLiegeReferences +NowBypassingProtections TestNowBypassingProtections +NowSpeakingInFactionChat TestNowSpeakingInFactionChat +OnlyPlayersCanUseCommand TestOnlyPlayersCanUseCommand +OnlyUseLeversInClaimedTerritory TestOnlyUseLeversInClaimedTerritory +Owner TestOwner +OwnershipTransferred TestOwnershipTransferred +OwnerShipTransferredTo TestOwnerShipTransferredTo +PermissionNeeded TestPermissionNeeded +PlayerAlreadyDueling TestPlayerAlreadyDueling +PlayerAlreadyInFaction TestPlayerAlreadyInFaction +PlayerAlreadyOfficer TestPlayerAlreadyOfficer +PlayerAndDesiredPowerSingleQuotesRequirement TestPlayerAndDesiredPowerSingleQuotesRequirement +PlayerByNameNotFound TestPlayerByNameNotFound +PlayerCantBePromotedBecauseOfLimit TestPlayerCantBePromotedBecauseOfLimit +PlayerDemoted TestPlayerDemoted +PlayerIsNotInAFaction TestPlayerIsNotInAFaction +PlayerIsNotInYourFaction TestPlayerIsNotInYourFaction +PlayerIsNotMemberOfFaction TestPlayerIsNotMemberOfFaction +PlayerIsNotOfficerOfFaction TestPlayerIsNotOfficerOfFaction +PlayerNotFound TestPlayerNotFound +PlayerPowerRecordsLoaded TestPlayerPowerRecordsLoaded +PlayerPromoted TestPlayerPromoted +PleaseWaitGate TestPleaseWaitGate +PluginDisabled TestPluginDisabled +PluginDisabling TestPluginDisabling +PluginEnabled TestPluginEnabled +PluginEnabling TestPluginEnabling +PluginLoading TestPluginLoading +PluginSaving TestPluginSaving +Point1PlacementSuccessful TestPoint1PlacementSuccessful +Point2PlacedSuccessfully TestPoint2PlacedSuccessfully +Population TestPopulation +PowerHasDecayed TestPowerHasDecayed +PowerLevel TestPowerLevel +PowerLevelHasBeenSetTo TestPowerLevelHasBeenSetTo +PowerLevelHasIncreased TestPowerLevelHasIncreased +PowerLevelResetting TestPowerLevelResetting +PrefixesDisabled TestPrefixesDisabled +PrefixSet TestPrefixSet +PrefixTaken TestPrefixTaken +ProblemLoadingClaimedChunks TestProblemLoadingClaimedChunks +ProblemLoadingFactions TestProblemLoadingFactions +ProblemLoadingPowerRecords TestProblemLoadingPowerRecords +PromotedToOfficer TestPromotedToOfficer +RadiusRequirement TestRadiusRequirement +RemovedGate TestRemovedGate +ResettingIndividualPowerRecords TestResettingIndividualPowerRecords +RightClickCheckAccess TestRightClickCheckAccess +RightClickForceUnlock TestRightClickForceUnlock +RightClickGrantAccess TestRightClickGrantAccess +RightClickLock TestRightClickLock +RightClickRevokeAccess TestRightClickRevokeAccess +RightClickUnlock TestRightClickUnlock +SchedulingHourlyAutoSave TestSchedulingHourlyAutoSave +SchedulingPowerDecrease TestSchedulingPowerDecrease +SchedulingPowerIncrease TestSchedulingPowerIncrease +SingleQuotesAlliedWarring TestSingleQuotesAlliedWarring +StringSet TestStringSet +SubCommands TestSubCommands +SuccessFactionMemberRemoval TestSuccessFactionMemberRemoval +SuccessForceJoin TestSuccessForceJoin +SuccessfulDisbandment TestSuccessfulDisbandment +SuccessOfficerRemoval TestSuccessOfficerRemoval +SuccessReferencesRemoved TestSuccessReferencesRemoved +SupportedLanguageIDList TestSupportedLanguageIDList +SurroundedChunkProtected TestSurroundedChunkProtected +TargetBlockNotPartOfGate TestTargetBlockNotPartOfGate +TargetFactionNotOverClaiming TestTargetFactionNotOverClaiming +TeleportingAlert TestTeleportingAlert +ThreeBlockRequirement TestThreeBlockRequirement +TriggerBlockNotLever TestTriggerBlockNotLever +UsageAddLaw TestUsageAddLaw +UsageAlly TestUsageAlly +UsageBreakAlliance TestUsageBreakAlliance +UsageClaimRadius TestUsageClaimRadius +UsageConfigSet TestUsageConfigSet +UsageConfigShow TestUsageConfigShow +UsageCreate TestUsageCreate +UsageDeclareWar TestUsageDeclareWar +UsageDemote TestUsageDemote +UsageDesc TestUsageDesc +UsageEditLaw TestUsageEditLaw +UsageFlagsSet TestUsageFlagsSet +UsageForceBonusPower TestUsageForceBonusPower +UsageForceClaim TestUsageForceClaim +UsageForceCreate TestUsageForceCreate +UsageForceDemote TestUsageForceDemote +UsageForceJoin TestUsageForceJoin +UsageForceKick TestUsageForceKick +UsageForcePeace TestUsageForcePeace +UsageForcePower TestUsageForcePower +UsageForceRemoveVassal TestUsageForceRemoveVassal +UsageForceRename TestUsageForceRename +UsageForceRenounce TestUsageForceRenounce +UsageForceTransfer TestUsageForceTransfer +UsageGrantAccess TestUsageGrantAccess +UsageGrantIndependence TestUsageGrantIndependence +UsageInvite TestUsageInvite +UsageInvoke TestUsageInvoke +UsageJoin TestUsageJoin +UsageKick TestUsageKick +UsageMakePeace TestUsageMakePeace +UsagePrefix TestUsagePrefix +UsagePromote TestUsagePromote +UsageRemoveLaw TestUsageRemoveLaw +UsageRename TestUsageRename +UsageRevokeAccess TestUsageRevokeAccess +UsageSwearFealty TestUsageSwearFealty +UsageTransfer TestUsageTransfer +UsageVassalize TestUsageVassalize +UsageWho TestUsageWho +ValidSubCommandsShowSet TestValidSubCommandsShowSet +VassalContribution TestVassalContribution +Vassals TestVassals +WarningPlayerAlreadyStartedCreatingGate TestWarningPlayerAlreadyStartedCreatingGate +WasntFound TestWasntFound +WelcomeBackLastLogout TestWelcomeBackLastLogout +WikiLink TestWikiLink +Wilderness TestWilderness +WorldsMismatch1 TestWorldsMismatch1 +WorldsMismatch2 TestWorldsMismatch2 \ No newline at end of file