Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2025-01-11 02:47:39 +01:00
Code Issues Projects Releases Wiki Activity

Added some [name] text variables in register/unregister messages

Browse Source 
and made some minor tweaks in en-US.yml
This commit is contained in:
Florian CUNY 2020-04-27 01:30:32 +02:00
parent 1a4e56b4f8
commit 4e7a31b0a3
3 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/world/bentobox/bentobox/api/commands/admin/AdminRegisterCommand.java
View File

@ -67,14 +67,13 @@ public class AdminRegisterCommand extends ConfirmableCommand {
}
// Check if island is spawn
if (island.map(Island::isSpawn).orElse(false)) {
askConfirmation(user, user.getTranslation("commands.admin.register.island-is-spawn"), () -> register(user, targetUUID, island, closestIsland));
askConfirmation(user, user.getTranslation("commands.admin.register.island-is-spawn"), () -> register(user, args.get(0), targetUUID, island, closestIsland));
return false;
}
return register(user, targetUUID, island, closestIsland);
return register(user, args.get(0),targetUUID, island, closestIsland);
}
private boolean register(User user, UUID targetUUID, Optional<Island> island, Location closestIsland) {
private boolean register(User user, String targetName, UUID targetUUID, Optional<Island> island, Location closestIsland) {
// Register island if it exists
if (!island.map(i -> {
// Island exists
@ -82,7 +81,8 @@ public class AdminRegisterCommand extends ConfirmableCommand {
if (i.isSpawn()) {
getIslands().clearSpawn(i.getWorld());
}
user.sendMessage("commands.admin.register.registered-island", "[xyz]", Util.xyz(i.getCenter().toVector()));
user.sendMessage("commands.admin.register.registered-island", "[xyz]", Util.xyz(i.getCenter().toVector()),
TextVariables.NAME, targetName);
user.sendMessage("general.success");
// Build and call event
IslandEvent.builder()
@ -113,7 +113,8 @@ public class AdminRegisterCommand extends ConfirmableCommand {
getIslands().setOwner(user, targetUUID, i);
i.setReserved(true);
i.getCenter().getBlock().setType(Material.BEDROCK);
user.sendMessage("commands.admin.register.reserved-island", "[xyz]", Util.xyz(i.getCenter().toVector()));
user.sendMessage("commands.admin.register.reserved-island", "[xyz]", Util.xyz(i.getCenter().toVector()),
TextVariables.NAME, targetName);
// Build and fire event
IslandEvent.builder()
.island(i)
@ -126,7 +127,6 @@ public class AdminRegisterCommand extends ConfirmableCommand {
return false;
}
return true;
}
@Override

7
src/main/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommand.java
View File

@ -52,11 +52,11 @@ public class AdminUnregisterCommand extends ConfirmableCommand {
// Get target
UUID targetUUID = getPlayers().getUUID(args.get(0));
// Everything's fine, we can set the island as spawn :)
askConfirmation(user, () -> unregisterPlayer(user, targetUUID));
askConfirmation(user, () -> unregisterPlayer(user, args.get(0), targetUUID));
return true;
}
void unregisterPlayer(User user, UUID targetUUID) {
void unregisterPlayer(User user, String targetName, UUID targetUUID) {
// Unregister island
Island oldIsland = getIslands().getIsland(getWorld(), targetUUID);
if (oldIsland == null) return;
@ -82,7 +82,8 @@ public class AdminUnregisterCommand extends ConfirmableCommand {
// Remove all island players that reference this island
oldIsland.getMembers().clear();
getIslands().save(oldIsland);
user.sendMessage("commands.admin.unregister.unregistered-island", "[xyz]", Util.xyz(oldIsland.getCenter().toVector()));
user.sendMessage("commands.admin.unregister.unregistered-island", "[xyz]", Util.xyz(oldIsland.getCenter().toVector()),
TextVariables.NAME, targetName);
}
@Override

22
src/main/resources/locales/en-US.yml
View File

@ -87,8 +87,8 @@ commands:
protect:
description: "toggle island purge protection"
move-to-island: "&c Move to an island first!"
protecting: "&a Purge-protecting island"
unprotecting: "&a Removing purge protection"
protecting: "&a Protecting island from purge."
unprotecting: "&a Removing purge protection."
stop:
description: "stop a purge in progress"
stopping: "Stopping the purge"
@ -125,7 +125,7 @@ commands:
already-owner: "&c [name] is already the owner of this island!"
success: "&b [name]&a is now the owner of this island."
range:
description: "Admin island range command"
description: "admin island range command"
invalid-value:
too-low: "&c The protection range must be greater than &b 1&c !"
too-high: "&c The protection range should be equal or less than &b [number]&c !"
@ -159,8 +159,8 @@ commands:
register:
parameters: "<player>"
description: "register player to unowned island you are on"
registered-island: "&a Registered player to island at [xyz]."
reserved-island: "&a Reserved island at [xyz] for player."
registered-island: "&a Registered [name] to island at [xyz]."
reserved-island: "&a Reserved island at [xyz] for [name]."
already-owned: "&c Island is already owned by another player!"
no-island-here: "&c There is no island here. Confirm to make one."
in-deletion: "&c This island space is currently being deleted. Try later."
@ -169,7 +169,7 @@ commands:
unregister:
parameters: "<owner>"
description: "unregister owner from island, but keep island blocks"
unregistered-island: "&a Unregistered player from island at [xyz]."
unregistered-island: "&a Unregistered [name] from island at [xyz]."
info:
parameters: "<player>"
description: "get info on where you are or player's island"
@ -241,7 +241,7 @@ commands:
not-possible: "&c Rank must be higher than visitor."
rank-set: "&a Rank set from &b [from] &a to &b [to] &a on &b [name]&a 's island."
setspawn:
description: "set an island as spawn for this world"
description: "set an island as spawn for this gamemode"
already-spawn: "&c This island is already a spawn!"
no-island-here: "&c There is no island here."
confirmation: "&c Are you sure you want to set this island as the spawn for this world?"
@ -450,7 +450,7 @@ commands:
spawn:
description: "teleport you to the spawn"
teleporting: "&a Teleporting you to the spawn."
no-spawn: "&c There is no spawn in this world."
no-spawn: "&c There is no spawn in this gamemode."
create:
description: "create an island, using optional blueprint (requires permission)"
parameters: "<blueprint>"
@ -568,14 +568,14 @@ commands:
success: "&b [name] &a is no longer trusted on your island."
invite:
description: "invite a player to join your island"
invitation-sent: "&a Invitation sent to [name]"
removing-invite: "&c Removing invite"
invitation-sent: "&a Invitation sent to &b[name]&a."
removing-invite: "&c Removing invite."
name-has-invited-you: "&a [name] has invited you to join their island."
to-accept-or-reject: "&a Do /[label] team accept to accept, or /[label] team reject to reject"
you-will-lose-your-island: "&c WARNING! You will lose your island if you accept!"
errors:
cannot-invite-self: "&c You cannot invite yourself!"
cooldown: "&c You cannot invite that person for another [number] seconds"
cooldown: "&c You cannot invite that person for another [number] seconds."
island-is-full: "&c Your island is full, you can't invite anyone else."
none-invited-you: "&c No one invited you :c."
you-already-are-in-team: "&c You are already on a team!"