From 02be04819268b5657766f9908c52db4c2cb39a65 Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sat, 15 Sep 2018 10:39:16 +0200 Subject: [PATCH] Removed "general.errors.unknown-player-name" : added a "[name]" textvariable in "general.errors.unknown-player" Closes #263 --- .../api/commands/admin/AdminClearResetsCommand.java | 3 ++- .../api/commands/admin/AdminDeleteCommand.java | 3 ++- .../api/commands/admin/AdminGetRankCommand.java | 2 +- .../api/commands/admin/AdminInfoCommand.java | 3 ++- .../api/commands/admin/AdminRegisterCommand.java | 3 ++- .../api/commands/admin/AdminSetRankCommand.java | 3 ++- .../api/commands/admin/AdminTeleportCommand.java | 3 ++- .../api/commands/admin/AdminUnregisterCommand.java | 3 ++- .../admin/range/AdminRangeResetCommand.java | 2 +- .../commands/admin/range/AdminRangeSetCommand.java | 2 +- .../commands/admin/team/AdminTeamAddCommand.java | 4 ++-- .../admin/team/AdminTeamDisbandCommand.java | 3 ++- .../commands/admin/team/AdminTeamKickCommand.java | 3 ++- .../admin/team/AdminTeamMakeLeaderCommand.java | 3 ++- .../api/commands/island/IslandBanCommand.java | 2 +- .../api/commands/island/IslandUnbanCommand.java | 2 +- .../commands/island/team/IslandTeamCoopCommand.java | 2 +- .../island/team/IslandTeamInviteCommand.java | 2 +- .../commands/island/team/IslandTeamKickCommand.java | 3 ++- .../island/team/IslandTeamPromoteCommand.java | 2 +- .../island/team/IslandTeamSetownerCommand.java | 3 ++- .../island/team/IslandTeamTrustCommand.java | 2 +- .../island/team/IslandTeamUncoopCommand.java | 2 +- .../island/team/IslandTeamUntrustCommand.java | 2 +- src/main/resources/locales/en-US.yml | 3 +-- src/main/resources/locales/jp-JP.yml | 1 - src/main/resources/locales/pl-PL.yml | 1 - .../commands/admin/AdminClearResetsCommandTest.java | 2 +- .../api/commands/admin/AdminDeleteCommandTest.java | 2 +- .../api/commands/admin/AdminInfoCommandTest.java | 2 +- .../commands/admin/AdminRegisterCommandTest.java | 2 +- .../commands/admin/AdminUnregisterCommandTest.java | 2 +- .../admin/range/AdminRangeResetCommandTest.java | 12 ++++-------- .../admin/range/AdminRangeSetCommandTest.java | 13 ++++--------- .../admin/team/AdminTeamAddCommandTest.java | 4 ++-- .../admin/team/AdminTeamDisbandCommandTest.java | 2 +- .../admin/team/AdminTeamKickCommandTest.java | 2 +- .../admin/team/AdminTeamMakeLeaderCommandTest.java | 2 +- .../api/commands/island/IslandBanCommandTest.java | 2 +- .../api/commands/island/IslandUnbanCommandTest.java | 2 +- .../island/team/IslandTeamCoopCommandTest.java | 2 +- .../island/team/IslandTeamInviteCommandTest.java | 2 +- .../island/team/IslandTeamKickCommandTest.java | 2 +- .../island/team/IslandTeamTrustCommandTest.java | 2 +- .../island/team/IslandTeamUncoopCommandTest.java | 2 +- .../island/team/IslandTeamUntrustCommandTest.java | 2 +- 46 files changed, 64 insertions(+), 64 deletions(-) diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminClearResetsCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminClearResetsCommand.java index 77c30d12a..1b7957e31 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminClearResetsCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminClearResetsCommand.java @@ -6,6 +6,7 @@ import java.util.Optional; import java.util.UUID; import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.util.Util; @@ -32,7 +33,7 @@ public class AdminClearResetsCommand extends CompositeCommand { // Get target UUID targetUUID = getPlayers().getUUID(args.get(0)); if (targetUUID == null) { - user.sendMessage("general.errors.unknown-player"); + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); return false; } if (!getIslands().hasIsland(getWorld(), targetUUID)) { diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommand.java index 6fe40f6c6..556fbf66e 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommand.java @@ -7,6 +7,7 @@ import java.util.UUID; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.commands.ConfirmableCommand; +import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.util.Util; @@ -34,7 +35,7 @@ public class AdminDeleteCommand extends ConfirmableCommand { // Get target UUID targetUUID = getPlayers().getUUID(args.get(0)); if (targetUUID == null) { - user.sendMessage("general.errors.unknown-player"); + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); return false; } if (!getIslands().hasIsland(getWorld(), targetUUID)) { diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminGetRankCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminGetRankCommand.java index a7a4077c4..8ccff5752 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminGetRankCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminGetRankCommand.java @@ -42,7 +42,7 @@ public class AdminGetRankCommand extends CompositeCommand { // Get target player UUID targetUUID = getPlayers().getUUID(args.get(0)); if (targetUUID == null) { - user.sendMessage("general.errors.unknown-player"); + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); return false; } if (!getIslands().hasIsland(getWorld(), targetUUID)) { diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminInfoCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminInfoCommand.java index f9c0dd9e9..b5888ef50 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminInfoCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminInfoCommand.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.UUID; import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; public class AdminInfoCommand extends CompositeCommand { @@ -38,7 +39,7 @@ public class AdminInfoCommand extends CompositeCommand { // Get target player UUID targetUUID = getPlayers().getUUID(args.get(0)); if (targetUUID == null) { - user.sendMessage("general.errors.unknown-player"); + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); return false; } if (!getIslands().hasIsland(getWorld(), targetUUID)) { diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminRegisterCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminRegisterCommand.java index 78abe8d85..d8a0c7350 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminRegisterCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminRegisterCommand.java @@ -10,6 +10,7 @@ import org.bukkit.Material; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.commands.ConfirmableCommand; +import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.util.Util; @@ -38,7 +39,7 @@ public class AdminRegisterCommand extends ConfirmableCommand { // Get target UUID targetUUID = getPlayers().getUUID(args.get(0)); if (targetUUID == null) { - user.sendMessage("general.errors.unknown-player"); + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); return false; } if (getIslands().hasIsland(getWorld(), targetUUID)) { diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSetRankCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSetRankCommand.java index 9e89fcf9c..28719e759 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSetRankCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSetRankCommand.java @@ -7,6 +7,7 @@ import java.util.UUID; import java.util.stream.Collectors; import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.managers.RanksManager; @@ -39,7 +40,7 @@ public class AdminSetRankCommand extends CompositeCommand { // Get target player UUID targetUUID = getPlayers().getUUID(args.get(0)); if (targetUUID == null) { - user.sendMessage("general.errors.unknown-player"); + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); return false; } if (!getPlugin().getIslands().hasIsland(getWorld(), targetUUID)) { diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportCommand.java index a310188c0..e56744604 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportCommand.java @@ -8,6 +8,7 @@ import java.util.UUID; import org.bukkit.Location; import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.util.Util; import world.bentobox.bentobox.util.teleport.SafeTeleportBuilder; @@ -37,7 +38,7 @@ public class AdminTeleportCommand extends CompositeCommand { // Convert name to a UUID final UUID targetUUID = getPlayers().getUUID(args.get(0)); if (targetUUID == null) { - user.sendMessage("general.errors.unknown-player"); + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); return false; } else { if (getIslands().hasIsland(getWorld(), targetUUID) || getIslands().inTeam(getWorld(), targetUUID)) { diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommand.java index 7df8a4131..74ca53aed 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommand.java @@ -6,6 +6,7 @@ import java.util.Optional; import java.util.UUID; import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.util.Util; @@ -32,7 +33,7 @@ public class AdminUnregisterCommand extends CompositeCommand { // Get target UUID targetUUID = getPlayers().getUUID(args.get(0)); if (targetUUID == null) { - user.sendMessage("general.errors.unknown-player"); + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); return false; } if (!getIslands().hasIsland(getWorld(), targetUUID)) { diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeResetCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeResetCommand.java index 24d649039..e835559a5 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeResetCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeResetCommand.java @@ -32,7 +32,7 @@ public class AdminRangeResetCommand extends CompositeCommand { // Get target player UUID targetUUID = getPlayers().getUUID(args.get(0)); if (targetUUID == null) { - user.sendMessage("general.errors.unknown-player"); + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); return false; } if (!getPlugin().getIslands().hasIsland(getWorld(), targetUUID)) { diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeSetCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeSetCommand.java index a99bc522e..db420855a 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeSetCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeSetCommand.java @@ -34,7 +34,7 @@ public class AdminRangeSetCommand extends CompositeCommand { // Get target player UUID targetUUID = getPlayers().getUUID(args.get(0)); if (targetUUID == null) { - user.sendMessage("general.errors.unknown-player"); + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); return false; } if (!getPlugin().getIslands().hasIsland(getWorld(), targetUUID)) { diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommand.java index 950be8380..75998f101 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommand.java @@ -30,12 +30,12 @@ public class AdminTeamAddCommand extends CompositeCommand { // Get leader and target UUID leaderUUID = getPlayers().getUUID(args.get(0)); if (leaderUUID == null) { - user.sendMessage("general.errors.unknown-player-name", TextVariables.NAME, args.get(0)); + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); return false; } UUID targetUUID = getPlayers().getUUID(args.get(1)); if (targetUUID == null) { - user.sendMessage("general.errors.unknown-player-name", TextVariables.NAME, args.get(1)); + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(1)); return false; } if (!getIslands().hasIsland(getWorld(), leaderUUID)) { diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamDisbandCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamDisbandCommand.java index 391edc62e..518667417 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamDisbandCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamDisbandCommand.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.UUID; import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; public class AdminTeamDisbandCommand extends CompositeCommand { @@ -29,7 +30,7 @@ public class AdminTeamDisbandCommand extends CompositeCommand { // Get target UUID targetUUID = getPlayers().getUUID(args.get(0)); if (targetUUID == null) { - user.sendMessage("general.errors.unknown-player"); + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); return false; } if (!getIslands().hasIsland(getWorld(), targetUUID)) { diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamKickCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamKickCommand.java index d143563f2..a295ae3e2 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamKickCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamKickCommand.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.UUID; import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; public class AdminTeamKickCommand extends CompositeCommand { @@ -30,7 +31,7 @@ public class AdminTeamKickCommand extends CompositeCommand { // Get target UUID targetUUID = getPlayers().getUUID(args.get(0)); if (targetUUID == null) { - user.sendMessage("general.errors.unknown-player"); + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); return false; } if (!getIslands().hasIsland(getWorld(), targetUUID)) { diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamMakeLeaderCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamMakeLeaderCommand.java index 31eb3e3b6..c2a786281 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamMakeLeaderCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamMakeLeaderCommand.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.UUID; import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; public class AdminTeamMakeLeaderCommand extends CompositeCommand { @@ -29,7 +30,7 @@ public class AdminTeamMakeLeaderCommand extends CompositeCommand { // Get target UUID targetUUID = getPlayers().getUUID(args.get(0)); if (targetUUID == null) { - user.sendMessage("general.errors.unknown-player"); + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); return false; } if (!getIslands().hasIsland(getWorld(), targetUUID)) { diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandBanCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandBanCommand.java index 6b139eac4..a4e94950b 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandBanCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandBanCommand.java @@ -51,7 +51,7 @@ public class IslandBanCommand extends CompositeCommand { // Get target player UUID targetUUID = getPlayers().getUUID(args.get(0)); if (targetUUID == null) { - user.sendMessage("general.errors.unknown-player"); + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); return false; } // Player cannot ban themselves diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommand.java index 755beaebf..13080fac3 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommand.java @@ -47,7 +47,7 @@ public class IslandUnbanCommand extends CompositeCommand { // Get target player UUID targetUUID = getPlayers().getUUID(args.get(0)); if (targetUUID == null) { - user.sendMessage("general.errors.unknown-player"); + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); return false; } // Player cannot unban themselves diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommand.java index fb9e8992c..b8a0a97a6 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommand.java @@ -51,7 +51,7 @@ public class IslandTeamCoopCommand extends CompositeCommand { // Get target player UUID targetUUID = getPlayers().getUUID(args.get(0)); if (targetUUID == null) { - user.sendMessage("general.errors.unknown-player"); + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); return false; } return (getSettings().getCoopCooldown() <= 0 || !checkCooldown(user, targetUUID)) && coopCmd(user, targetUUID); diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommand.java index 2b93caf37..651d9d1ee 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommand.java @@ -62,7 +62,7 @@ public class IslandTeamInviteCommand extends CompositeCommand { // Only online players can be invited UUID invitedPlayerUUID = getPlayers().getUUID(args.get(0)); if (invitedPlayerUUID == null) { - user.sendMessage("general.errors.unknown-player"); + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); return false; } User invitedPlayer = User.getInstance(invitedPlayerUUID); diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommand.java index 5656bae4a..b75f58ab7 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommand.java @@ -5,6 +5,7 @@ import java.util.UUID; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.commands.ConfirmableCommand; +import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; public class IslandTeamKickCommand extends ConfirmableCommand { @@ -40,7 +41,7 @@ public class IslandTeamKickCommand extends ConfirmableCommand { // Get target UUID targetUUID = getPlayers().getUUID(args.get(0)); if (targetUUID == null) { - user.sendMessage("general.errors.unknown-player"); + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); return false; } if (targetUUID.equals(user.getUniqueId())) { diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamPromoteCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamPromoteCommand.java index d21da3cbe..a6cbcf3cb 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamPromoteCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamPromoteCommand.java @@ -46,7 +46,7 @@ public class IslandTeamPromoteCommand extends CompositeCommand { // Get target User target = getPlayers().getUser(args.get(0)); if (target == null) { - user.sendMessage("general.errors.unknown-player"); + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); return true; } if (!inTeam(getWorld(), target) || !getTeamLeader(getWorld(), user).equals(getTeamLeader(getWorld(), target))) { diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamSetownerCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamSetownerCommand.java index 8929f3ed7..27e97d290 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamSetownerCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamSetownerCommand.java @@ -8,6 +8,7 @@ import java.util.UUID; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.api.events.team.TeamEvent; +import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.util.Util; @@ -42,7 +43,7 @@ public class IslandTeamSetownerCommand extends CompositeCommand { } UUID targetUUID = getPlayers().getUUID(args.get(0)); if (targetUUID == null) { - user.sendMessage("general.errors.unknown-player"); + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); return false; } if (!getIslands().inTeam(getWorld(), playerUUID)) { diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommand.java index c893f422e..f2a884fc4 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommand.java @@ -55,7 +55,7 @@ public class IslandTeamTrustCommand extends CompositeCommand { // Get target player UUID targetUUID = getPlayers().getUUID(args.get(0)); if (targetUUID == null) { - user.sendMessage("general.errors.unknown-player"); + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); return false; } return (getSettings().getTrustCooldown() <= 0 || !checkCooldown(user, targetUUID)) && trustCmd(user, targetUUID); diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommand.java index 6a2a00bcb..8149bd360 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommand.java @@ -55,7 +55,7 @@ public class IslandTeamUncoopCommand extends CompositeCommand { // Get target player UUID targetUUID = getPlayers().getUUID(args.get(0)); if (targetUUID == null) { - user.sendMessage("general.errors.unknown-player"); + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); return false; } // Uncoop diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommand.java index e1cd64a44..fec247592 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommand.java @@ -55,7 +55,7 @@ public class IslandTeamUntrustCommand extends CompositeCommand { // Get target player UUID targetUUID = getPlayers().getUUID(args.get(0)); if (targetUUID == null) { - user.sendMessage("general.errors.unknown-player"); + user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); return false; } // untrust diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml index 26c32886d..48879c015 100644 --- a/src/main/resources/locales/en-US.yml +++ b/src/main/resources/locales/en-US.yml @@ -26,8 +26,7 @@ general: not-leader: "&cYou are not the leader of your island!" not-in-team: "&cThat player is not in your team!" offline-player: "&cThat player is offline or doesn't exist." - unknown-player: "&cUnknown player!" - unknown-player-name: "&c[name] is an unknown player!" + unknown-player: "&c[name] is an unknown player!" general: "&cThat command is not ready yet - contact admin" unknown-command: "&cUnknown command. Do &b/[label] help &cfor help." warp-not-safe: "&cThat warp is not safe right now!" diff --git a/src/main/resources/locales/jp-JP.yml b/src/main/resources/locales/jp-JP.yml index 4910e5224..463f19d3b 100644 --- a/src/main/resources/locales/jp-JP.yml +++ b/src/main/resources/locales/jp-JP.yml @@ -26,7 +26,6 @@ general: not-in-team: "&cあの選手はあなたのチームにはいない!" offline-player: "&cそのプレイヤーはオフラインまたは存在しません。" unknown-player: "&c不明なプレイヤー!" - unknown-player-name: "&c[name]は不明なプレイヤーです!" general: "&cそのコマンドはまだ準備ができていません-お問い合わせ管理" unknown-command: "&c不明なコマンドです。/[label] help を表示します。" warp-not-safe: "&cワープは安全じゃない!" diff --git a/src/main/resources/locales/pl-PL.yml b/src/main/resources/locales/pl-PL.yml index 2ad61c8d5..b0e57b294 100644 --- a/src/main/resources/locales/pl-PL.yml +++ b/src/main/resources/locales/pl-PL.yml @@ -30,7 +30,6 @@ general: not-in-team: "&cTen gracz nie jest w twojej drużynie." offline-player: "&cTen gracz jest offline lub nie istnieje." unknown-player: "&cNieznany gracz!" - unknown-player-name: "&c[name] jest nieznanym graczem!" general: "&cTo polecenie nie jest jeszcze gotowe - skontaktuj się z administratorem" unknown-command: "&cNieznane polecenie. Wpisz &b/[label] help &caby wyświetlić pomoc." warp-not-safe: "&cTen warp nie jest teraz bezpieczny!" diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminClearResetsCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminClearResetsCommandTest.java index 23d51eb5d..b2ff5e63a 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminClearResetsCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminClearResetsCommandTest.java @@ -134,7 +134,7 @@ public class AdminClearResetsCommandTest { String[] name = {"tastybento"}; when(pm.getUUID(Mockito.any())).thenReturn(null); assertFalse(itl.execute(user, itl.getLabel(), Arrays.asList(name))); - Mockito.verify(user).sendMessage(Mockito.eq("general.errors.unknown-player")); + Mockito.verify(user).sendMessage("general.errors.unknown-player", "[name]", name[0]); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommandTest.java index ee41945c2..f63e72ab3 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommandTest.java @@ -142,7 +142,7 @@ public class AdminDeleteCommandTest { String[] name = {"tastybento"}; when(pm.getUUID(Mockito.any())).thenReturn(null); assertFalse(itl.execute(user, itl.getLabel(), Arrays.asList(name))); - Mockito.verify(user).sendMessage(Mockito.eq("general.errors.unknown-player")); + Mockito.verify(user).sendMessage("general.errors.unknown-player", "[name]", name[0]); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminInfoCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminInfoCommandTest.java index da5f86f5c..4f82e0ec0 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminInfoCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminInfoCommandTest.java @@ -137,7 +137,7 @@ public class AdminInfoCommandTest { String[] name = {"tastybento"}; when(pm.getUUID(Mockito.any())).thenReturn(null); assertFalse(itl.execute(user, itl.getLabel(), Arrays.asList(name))); - Mockito.verify(user).sendMessage(Mockito.eq("general.errors.unknown-player")); + Mockito.verify(user).sendMessage("general.errors.unknown-player", "[name]", name[0]); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminRegisterCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminRegisterCommandTest.java index ce4715244..4836c53cc 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminRegisterCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminRegisterCommandTest.java @@ -133,7 +133,7 @@ public class AdminRegisterCommandTest { String[] name = {"tastybento"}; when(pm.getUUID(Mockito.any())).thenReturn(null); assertFalse(itl.execute(user, itl.getLabel(), Arrays.asList(name))); - Mockito.verify(user).sendMessage(Mockito.eq("general.errors.unknown-player")); + Mockito.verify(user).sendMessage("general.errors.unknown-player", "[name]", name[0]); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommandTest.java index c6bd16a01..9694b1442 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommandTest.java @@ -131,7 +131,7 @@ public class AdminUnregisterCommandTest { String[] name = {"tastybento"}; when(pm.getUUID(Mockito.any())).thenReturn(null); assertFalse(itl.execute(user, itl.getLabel(), Arrays.asList(name))); - Mockito.verify(user).sendMessage(Mockito.eq("general.errors.unknown-player")); + Mockito.verify(user).sendMessage("general.errors.unknown-player", "[name]", name[0]); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeResetCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeResetCommandTest.java index 0974f6c9a..4dea167e7 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeResetCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeResetCommandTest.java @@ -6,10 +6,7 @@ package world.bentobox.bentobox.api.commands.admin.range; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.UUID; +import java.util.*; import org.bukkit.Bukkit; import org.bukkit.World; @@ -153,10 +150,9 @@ public class AdminRangeResetCommandTest { @Test public void testExecuteUnknownPlayer() { AdminRangeResetCommand arc = new AdminRangeResetCommand(ac); - List args = new ArrayList<>(); - args.add("tastybento"); - arc.execute(user, "", args); - Mockito.verify(user).sendMessage("general.errors.unknown-player"); + String[] name = {"tastybento"}; + arc.execute(user, "", Arrays.asList(name)); + Mockito.verify(user).sendMessage("general.errors.unknown-player", "[name]", name[0]); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeSetCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeSetCommandTest.java index 2716a71a9..bc0d197f2 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeSetCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeSetCommandTest.java @@ -6,10 +6,7 @@ package world.bentobox.bentobox.api.commands.admin.range; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.UUID; +import java.util.*; import org.bukkit.Bukkit; import org.bukkit.World; @@ -155,11 +152,9 @@ public class AdminRangeSetCommandTest { @Test public void testExecuteUnknownPlayer() { AdminRangeSetCommand arc = new AdminRangeSetCommand(ac); - List args = new ArrayList<>(); - args.add("tastybento"); - args.add("100"); - arc.execute(user, "", args); - Mockito.verify(user).sendMessage("general.errors.unknown-player"); + String[] args = {"tastybento", "100"}; + arc.execute(user, "", Arrays.asList(args)); + Mockito.verify(user).sendMessage("general.errors.unknown-player", "[name]", args[0]); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommandTest.java index 5e7b63345..eb1e8d6d2 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommandTest.java @@ -143,13 +143,13 @@ public class AdminTeamAddCommandTest { when(pm.getUUID(Mockito.eq("tastybento"))).thenReturn(null); when(pm.getUUID(Mockito.eq("poslovich"))).thenReturn(notUUID); assertFalse(itl.execute(user, ac.getLabel(), Arrays.asList(name))); - Mockito.verify(user).sendMessage("general.errors.unknown-player-name", "[name]", "tastybento"); + Mockito.verify(user).sendMessage("general.errors.unknown-player", "[name]", "tastybento"); // Unknown target when(pm.getUUID(Mockito.eq("tastybento"))).thenReturn(uuid); when(pm.getUUID(Mockito.eq("poslovich"))).thenReturn(null); assertFalse(itl.execute(user, ac.getLabel(), Arrays.asList(name))); - Mockito.verify(user).sendMessage("general.errors.unknown-player-name", "[name]", "poslovich"); + Mockito.verify(user).sendMessage("general.errors.unknown-player", "[name]", "poslovich"); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamDisbandCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamDisbandCommandTest.java index 92338e511..64eaaf59a 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamDisbandCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamDisbandCommandTest.java @@ -131,7 +131,7 @@ public class AdminTeamDisbandCommandTest { String[] name = {"tastybento"}; when(pm.getUUID(Mockito.any())).thenReturn(null); assertFalse(itl.execute(user, itl.getLabel(), Arrays.asList(name))); - Mockito.verify(user).sendMessage(Mockito.eq("general.errors.unknown-player")); + Mockito.verify(user).sendMessage("general.errors.unknown-player", "[name]", name[0]); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamKickCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamKickCommandTest.java index ca3147a8e..4c0fbfb0c 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamKickCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamKickCommandTest.java @@ -134,7 +134,7 @@ public class AdminTeamKickCommandTest { String[] name = {"tastybento"}; when(pm.getUUID(Mockito.any())).thenReturn(null); assertFalse(itl.execute(user, itl.getLabel(), Arrays.asList(name))); - Mockito.verify(user).sendMessage(Mockito.eq("general.errors.unknown-player")); + Mockito.verify(user).sendMessage("general.errors.unknown-player", "[name]", name[0]); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamMakeLeaderCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamMakeLeaderCommandTest.java index f24caa172..629f99b9a 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamMakeLeaderCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamMakeLeaderCommandTest.java @@ -132,7 +132,7 @@ public class AdminTeamMakeLeaderCommandTest { String[] name = {"tastybento"}; when(pm.getUUID(Mockito.any())).thenReturn(null); assertFalse(itl.execute(user, itl.getLabel(), Arrays.asList(name))); - Mockito.verify(user).sendMessage(Mockito.eq("general.errors.unknown-player")); + Mockito.verify(user).sendMessage("general.errors.unknown-player", "[name]", name[0]); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandBanCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandBanCommandTest.java index 0b0734171..ae63bfba2 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandBanCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandBanCommandTest.java @@ -172,7 +172,7 @@ public class IslandBanCommandTest { when(im.isOwner(Mockito.any(), Mockito.eq(uuid))).thenReturn(true); when(pm.getUUID(Mockito.anyString())).thenReturn(null); assertFalse(ibc.execute(user, ibc.getLabel(), Collections.singletonList("bill"))); - Mockito.verify(user).sendMessage("general.errors.unknown-player"); + Mockito.verify(user).sendMessage("general.errors.unknown-player", "[name]", "bill"); } @Test diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommandTest.java index 5ba479a33..5dc891ab6 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommandTest.java @@ -166,7 +166,7 @@ public class IslandUnbanCommandTest { when(im.isOwner(Mockito.any(), Mockito.eq(uuid))).thenReturn(true); when(pm.getUUID(Mockito.anyString())).thenReturn(null); assertFalse(iubc.execute(user, iubc.getLabel(), Collections.singletonList("bill"))); - Mockito.verify(user).sendMessage("general.errors.unknown-player"); + Mockito.verify(user).sendMessage("general.errors.unknown-player", "[name]", "bill"); } @Test diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommandTest.java index 0bac8bf5c..c37aa1a40 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommandTest.java @@ -169,7 +169,7 @@ public class IslandTeamCoopCommandTest { IslandTeamCoopCommand itl = new IslandTeamCoopCommand(ic); when(pm.getUUID(Mockito.any())).thenReturn(null); assertFalse(itl.execute(user, itl.getLabel(), Collections.singletonList("tastybento"))); - Mockito.verify(user).sendMessage(Mockito.eq("general.errors.unknown-player")); + Mockito.verify(user).sendMessage("general.errors.unknown-player", "[name]", "tastybento"); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommandTest.java index da66dba8d..f577642d6 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommandTest.java @@ -167,7 +167,7 @@ public class IslandTeamInviteCommandTest { String[] name = {"tastybento"}; when(pm.getUUID(Mockito.any())).thenReturn(null); assertFalse(itl.execute(user, itl.getLabel(), Arrays.asList(name))); - Mockito.verify(user).sendMessage(Mockito.eq("general.errors.unknown-player")); + Mockito.verify(user).sendMessage("general.errors.unknown-player", "[name]", name[0]); } diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommandTest.java index c0f0830c7..9b3791d4c 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommandTest.java @@ -168,7 +168,7 @@ public class IslandTeamKickCommandTest { String[] name = {"tastybento"}; when(pm.getUUID(Mockito.any())).thenReturn(null); assertFalse(itl.execute(user, itl.getLabel(), Arrays.asList(name))); - Mockito.verify(user).sendMessage(Mockito.eq("general.errors.unknown-player")); + Mockito.verify(user).sendMessage("general.errors.unknown-player", "[name]", name[0]); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommandTest.java index 882943cbd..1907ff39a 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommandTest.java @@ -169,7 +169,7 @@ public class IslandTeamTrustCommandTest { IslandTeamTrustCommand itl = new IslandTeamTrustCommand(ic); when(pm.getUUID(Mockito.any())).thenReturn(null); assertFalse(itl.execute(user, itl.getLabel(), Collections.singletonList("tastybento"))); - Mockito.verify(user).sendMessage(Mockito.eq("general.errors.unknown-player")); + Mockito.verify(user).sendMessage("general.errors.unknown-player", "[name]", "tastybento"); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommandTest.java index 414ec8794..b2a445571 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommandTest.java @@ -169,7 +169,7 @@ public class IslandTeamUncoopCommandTest { IslandTeamUncoopCommand itl = new IslandTeamUncoopCommand(ic); when(pm.getUUID(Mockito.any())).thenReturn(null); assertFalse(itl.execute(user, itl.getLabel(), Collections.singletonList("tastybento"))); - Mockito.verify(user).sendMessage(Mockito.eq("general.errors.unknown-player")); + Mockito.verify(user).sendMessage("general.errors.unknown-player", "[name]", "tastybento"); } /** diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommandTest.java index 9f175b813..fad5d8c2e 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommandTest.java @@ -169,7 +169,7 @@ public class IslandTeamUntrustCommandTest { IslandTeamUntrustCommand itl = new IslandTeamUntrustCommand(ic); when(pm.getUUID(Mockito.any())).thenReturn(null); assertFalse(itl.execute(user, itl.getLabel(), Collections.singletonList("tastybento"))); - Mockito.verify(user).sendMessage(Mockito.eq("general.errors.unknown-player")); + Mockito.verify(user).sendMessage("general.errors.unknown-player", "[name]", "tastybento"); } /**