Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ public boolean execute(User user, String label, List<String> args) {
return false;
}

// Handle "hand" subcommand
if (!args.isEmpty() && "hand".equalsIgnoreCase(args.get(0))) {
// Handle "hand" subcommand (accepts English "hand" or the localized keyword)
if (!args.isEmpty() && isHandKeyword(user, args.get(0))) {
return handleHandDonation(user, island, args);
}

Expand Down Expand Up @@ -145,15 +145,21 @@ private void performHandDonation(User user, Island island, Material material, in
@Override
public Optional<List<String>> tabComplete(User user, String alias, List<String> args) {
String lastArg = !args.isEmpty() ? args.get(args.size() - 1) : "";
String handKeyword = user.getTranslation("island.donate.hand.keyword");
if (args.size() <= 1) {
return Optional.of(Util.tabLimit(List.of("hand"), lastArg));
return Optional.of(Util.tabLimit(List.of(handKeyword), lastArg));
}
if (args.size() == 2 && "hand".equalsIgnoreCase(args.get(0)) && user.isPlayer()) {
if (args.size() == 2 && isHandKeyword(user, args.get(0)) && user.isPlayer()) {
int held = user.getPlayer().getInventory().getItemInMainHand().getAmount();
if (held > 0) {
return Optional.of(Util.tabLimit(List.of(String.valueOf(held)), lastArg));
}
}
return Optional.of(List.of());
}

private boolean isHandKeyword(User user, String arg) {
String localized = user.getTranslation("island.donate.hand.keyword");
return "hand".equalsIgnoreCase(arg) || localized.equalsIgnoreCase(arg);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ public boolean execute(User user, String label, List<String> args) {
}

String arg = args.get(0);
if ("HAND".equalsIgnoreCase(arg)) {
String handKeyword = user.getTranslation("island.donate.hand.keyword");
if ("HAND".equalsIgnoreCase(arg) || handKeyword.equalsIgnoreCase(arg)) {
executeHandCommand(user);
return true;
}
Expand Down Expand Up @@ -158,7 +159,7 @@ public Optional<List<String>> tabComplete(User user, String alias, List<String>
List<String> options = new ArrayList<>(
Arrays.stream(Material.values()).filter(Material::isBlock).map(Material::name).map(String::toLowerCase).toList());

options.add("HAND");
options.add(user.getTranslation("island.donate.hand.keyword"));

return Optional.of(Util.tabLimit(options, lastArg));
}
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/locales/cs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ island:
no-permission: "<red>You do not have permission to donate blocks on this island."
no-value: "<red>That block has no level value."
invalid-amount: "<red>Invalid amount. Use a positive number."
invalid-item: "<red>Darovat lze pouze bloky s nakonfigurovanou hodnotou úrovně."
empty: "<red>There are no valid blocks to donate."
cancelled: "<yellow>Donation cancelled. Items returned."
success: "<green>Donated [number] blocks for <aqua>[points]<green> points! These points are permanent."
Expand All @@ -62,6 +63,7 @@ island:
gui-info: "<gold>Donate blocks to your island|<gray>Currently donated: <gold>[points]<gray> points|<red>Warning: donated items are|<red>destroyed and cannot be returned!"
preview: "<yellow>Points to add: <gold>[points]|<red>These items will be destroyed!"
hand:
keyword: "ruka"
success: "<green>Donated [number] x [material] for <aqua>[points]<green> permanent points!"
not-block: "<red>You must be holding a placeable block to donate."
confirm-prompt: "<red>About to DESTROY <gold>[number] x [material]<red> for <aqua>[points]<red> permanent points."
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/locales/de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ island:
no-permission: "<red>You do not have permission to donate blocks on this island."
no-value: "<red>That block has no level value."
invalid-amount: "<red>Invalid amount. Use a positive number."
invalid-item: "<red>Es können nur Blöcke mit einem konfigurierten Levelwert gespendet werden."
empty: "<red>There are no valid blocks to donate."
cancelled: "<yellow>Donation cancelled. Items returned."
success: "<green>Donated [number] blocks for <aqua>[points]<green> points! These points are permanent."
Expand All @@ -63,6 +64,7 @@ island:
gui-info: "<gold>Donate blocks to your island|<gray>Currently donated: <gold>[points]<gray> points|<red>Warning: donated items are|<red>destroyed and cannot be returned!"
preview: "<yellow>Points to add: <gold>[points]|<red>These items will be destroyed!"
hand:
keyword: "hand"
success: "<green>Donated [number] x [material] for <aqua>[points]<green> permanent points!"
not-block: "<red>You must be holding a placeable block to donate."
confirm-prompt: "<red>About to DESTROY <gold>[number] x [material]<red> for <aqua>[points]<red> permanent points."
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/locales/en-US.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ island:
gui-info: "<gold>Donate blocks to your island|<gray>Currently donated: <gold>[points]<gray> points|<red>Warning: donated items are|<red>destroyed and cannot be returned!"
preview: "<yellow>Points to add: <gold>[points]|<red>These items will be destroyed!"
hand:
keyword: "hand"
success: "<green>Donated [number] x [material] for <aqua>[points]<green> permanent points!"
not-block: "<red>You must be holding a placeable block to donate."
confirm-prompt: "<red>About to DESTROY <gold>[number] x [material]<red> for <aqua>[points]<red> permanent points."
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/locales/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ island:
no-permission: "<red>You do not have permission to donate blocks on this island."
no-value: "<red>That block has no level value."
invalid-amount: "<red>Invalid amount. Use a positive number."
invalid-item: "<red>Solo se pueden donar bloques con un valor de nivel configurado."
empty: "<red>There are no valid blocks to donate."
cancelled: "<yellow>Donation cancelled. Items returned."
success: "<green>Donated [number] blocks for <aqua>[points]<green> points! These points are permanent."
Expand All @@ -60,6 +61,7 @@ island:
gui-info: "<gold>Donate blocks to your island|<gray>Currently donated: <gold>[points]<gray> points|<red>Warning: donated items are|<red>destroyed and cannot be returned!"
preview: "<yellow>Points to add: <gold>[points]|<red>These items will be destroyed!"
hand:
keyword: "mano"
success: "<green>Donated [number] x [material] for <aqua>[points]<green> permanent points!"
not-block: "<red>You must be holding a placeable block to donate."
confirm-prompt: "<red>About to DESTROY <gold>[number] x [material]<red> for <aqua>[points]<red> permanent points."
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/locales/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ island:
no-permission: "<red>You do not have permission to donate blocks on this island."
no-value: "<red>That block has no level value."
invalid-amount: "<red>Invalid amount. Use a positive number."
invalid-item: "<red>Seuls les blocs avec une valeur de niveau configurée peuvent être donnés."
empty: "<red>There are no valid blocks to donate."
cancelled: "<yellow>Donation cancelled. Items returned."
success: "<green>Donated [number] blocks for <aqua>[points]<green> points! These points are permanent."
Expand All @@ -62,6 +63,7 @@ island:
gui-info: "<gold>Donate blocks to your island|<gray>Currently donated: <gold>[points]<gray> points|<red>Warning: donated items are|<red>destroyed and cannot be returned!"
preview: "<yellow>Points to add: <gold>[points]|<red>These items will be destroyed!"
hand:
keyword: "main"
success: "<green>Donated [number] x [material] for <aqua>[points]<green> permanent points!"
not-block: "<red>You must be holding a placeable block to donate."
confirm-prompt: "<red>About to DESTROY <gold>[number] x [material]<red> for <aqua>[points]<red> permanent points."
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/locales/hu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ island:
no-permission: "<red>You do not have permission to donate blocks on this island."
no-value: "<red>That block has no level value."
invalid-amount: "<red>Invalid amount. Use a positive number."
invalid-item: "<red>Csak konfigurált szintértékkel rendelkező blokkok adományozhatók."
empty: "<red>There are no valid blocks to donate."
cancelled: "<yellow>Donation cancelled. Items returned."
success: "<green>Donated [number] blocks for <aqua>[points]<green> points! These points are permanent."
Expand All @@ -63,6 +64,7 @@ island:
gui-info: "<gold>Donate blocks to your island|<gray>Currently donated: <gold>[points]<gray> points|<red>Warning: donated items are|<red>destroyed and cannot be returned!"
preview: "<yellow>Points to add: <gold>[points]|<red>These items will be destroyed!"
hand:
keyword: "kez"
success: "<green>Donated [number] x [material] for <aqua>[points]<green> permanent points!"
not-block: "<red>You must be holding a placeable block to donate."
confirm-prompt: "<red>About to DESTROY <gold>[number] x [material]<red> for <aqua>[points]<red> permanent points."
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/locales/id.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ island:
no-permission: "<red>You do not have permission to donate blocks on this island."
no-value: "<red>That block has no level value."
invalid-amount: "<red>Invalid amount. Use a positive number."
invalid-item: "<red>Hanya blok dengan nilai level yang dikonfigurasi yang dapat didonasikan."
empty: "<red>There are no valid blocks to donate."
cancelled: "<yellow>Donation cancelled. Items returned."
success: "<green>Donated [number] blocks for <aqua>[points]<green> points! These points are permanent."
Expand All @@ -60,6 +61,7 @@ island:
gui-info: "<gold>Donate blocks to your island|<gray>Currently donated: <gold>[points]<gray> points|<red>Warning: donated items are|<red>destroyed and cannot be returned!"
preview: "<yellow>Points to add: <gold>[points]|<red>These items will be destroyed!"
hand:
keyword: "tangan"
success: "<green>Donated [number] x [material] for <aqua>[points]<green> permanent points!"
not-block: "<red>You must be holding a placeable block to donate."
confirm-prompt: "<red>About to DESTROY <gold>[number] x [material]<red> for <aqua>[points]<red> permanent points."
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/locales/ko.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ island:
no-permission: "<red>You do not have permission to donate blocks on this island."
no-value: "<red>That block has no level value."
invalid-amount: "<red>Invalid amount. Use a positive number."
invalid-item: "<red>설정된 레벨 값이 있는 블록만 기부할 수 있습니다."
empty: "<red>There are no valid blocks to donate."
cancelled: "<yellow>Donation cancelled. Items returned."
success: "<green>Donated [number] blocks for <aqua>[points]<green> points! These points are permanent."
Expand All @@ -63,6 +64,7 @@ island:
gui-info: "<gold>Donate blocks to your island|<gray>Currently donated: <gold>[points]<gray> points|<red>Warning: donated items are|<red>destroyed and cannot be returned!"
preview: "<yellow>Points to add: <gold>[points]|<red>These items will be destroyed!"
hand:
keyword: "hand"
success: "<green>Donated [number] x [material] for <aqua>[points]<green> permanent points!"
not-block: "<red>You must be holding a placeable block to donate."
confirm-prompt: "<red>About to DESTROY <gold>[number] x [material]<red> for <aqua>[points]<red> permanent points."
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/locales/lv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ island:
no-permission: "<red>You do not have permission to donate blocks on this island."
no-value: "<red>That block has no level value."
invalid-amount: "<red>Invalid amount. Use a positive number."
invalid-item: "<red>Var ziedot tikai blokus ar konfigurētu līmeņa vērtību."
empty: "<red>There are no valid blocks to donate."
cancelled: "<yellow>Donation cancelled. Items returned."
success: "<green>Donated [number] blocks for <aqua>[points]<green> points! These points are permanent."
Expand All @@ -63,6 +64,7 @@ island:
gui-info: "<gold>Donate blocks to your island|<gray>Currently donated: <gold>[points]<gray> points|<red>Warning: donated items are|<red>destroyed and cannot be returned!"
preview: "<yellow>Points to add: <gold>[points]|<red>These items will be destroyed!"
hand:
keyword: "roka"
success: "<green>Donated [number] x [material] for <aqua>[points]<green> permanent points!"
not-block: "<red>You must be holding a placeable block to donate."
confirm-prompt: "<red>About to DESTROY <gold>[number] x [material]<red> for <aqua>[points]<red> permanent points."
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/locales/nl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ island:
no-permission: "<red>You do not have permission to donate blocks on this island."
no-value: "<red>That block has no level value."
invalid-amount: "<red>Invalid amount. Use a positive number."
invalid-item: "<red>Alleen blokken met een geconfigureerde niveauwaarde kunnen worden gedoneerd."
empty: "<red>There are no valid blocks to donate."
cancelled: "<yellow>Donation cancelled. Items returned."
success: "<green>Donated [number] blocks for <aqua>[points]<green> points! These points are permanent."
Expand All @@ -60,6 +61,7 @@ island:
gui-info: "<gold>Donate blocks to your island|<gray>Currently donated: <gold>[points]<gray> points|<red>Warning: donated items are|<red>destroyed and cannot be returned!"
preview: "<yellow>Points to add: <gold>[points]|<red>These items will be destroyed!"
hand:
keyword: "hand"
success: "<green>Donated [number] x [material] for <aqua>[points]<green> permanent points!"
not-block: "<red>You must be holding a placeable block to donate."
confirm-prompt: "<red>About to DESTROY <gold>[number] x [material]<red> for <aqua>[points]<red> permanent points."
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/locales/pl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ island:
no-permission: "<red>You do not have permission to donate blocks on this island."
no-value: "<red>That block has no level value."
invalid-amount: "<red>Invalid amount. Use a positive number."
invalid-item: "<red>Można darować tylko bloki ze skonfigurowaną wartością poziomu."
empty: "<red>There are no valid blocks to donate."
cancelled: "<yellow>Donation cancelled. Items returned."
success: "<green>Donated [number] blocks for <aqua>[points]<green> points! These points are permanent."
Expand All @@ -60,6 +61,7 @@ island:
gui-info: "<gold>Donate blocks to your island|<gray>Currently donated: <gold>[points]<gray> points|<red>Warning: donated items are|<red>destroyed and cannot be returned!"
preview: "<yellow>Points to add: <gold>[points]|<red>These items will be destroyed!"
hand:
keyword: "reka"
success: "<green>Donated [number] x [material] for <aqua>[points]<green> permanent points!"
not-block: "<red>You must be holding a placeable block to donate."
confirm-prompt: "<red>About to DESTROY <gold>[number] x [material]<red> for <aqua>[points]<red> permanent points."
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/locales/pt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ island:
no-permission: "<red>You do not have permission to donate blocks on this island."
no-value: "<red>That block has no level value."
invalid-amount: "<red>Invalid amount. Use a positive number."
invalid-item: "<red>Apenas blocos com um valor de nível configurado podem ser doados."
empty: "<red>There are no valid blocks to donate."
cancelled: "<yellow>Donation cancelled. Items returned."
success: "<green>Donated [number] blocks for <aqua>[points]<green> points! These points are permanent."
Expand All @@ -63,6 +64,7 @@ island:
gui-info: "<gold>Donate blocks to your island|<gray>Currently donated: <gold>[points]<gray> points|<red>Warning: donated items are|<red>destroyed and cannot be returned!"
preview: "<yellow>Points to add: <gold>[points]|<red>These items will be destroyed!"
hand:
keyword: "mao"
success: "<green>Donated [number] x [material] for <aqua>[points]<green> permanent points!"
not-block: "<red>You must be holding a placeable block to donate."
confirm-prompt: "<red>About to DESTROY <gold>[number] x [material]<red> for <aqua>[points]<red> permanent points."
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/locales/ru.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ island:
no-permission: "<red>You do not have permission to donate blocks on this island."
no-value: "<red>That block has no level value."
invalid-amount: "<red>Invalid amount. Use a positive number."
invalid-item: "<red>Можно жертвовать только блоки с настроенным значением уровня."
empty: "<red>There are no valid blocks to donate."
cancelled: "<yellow>Donation cancelled. Items returned."
success: "<green>Donated [number] blocks for <aqua>[points]<green> points! These points are permanent."
Expand All @@ -63,6 +64,7 @@ island:
gui-info: "<gold>Donate blocks to your island|<gray>Currently donated: <gold>[points]<gray> points|<red>Warning: donated items are|<red>destroyed and cannot be returned!"
preview: "<yellow>Points to add: <gold>[points]|<red>These items will be destroyed!"
hand:
keyword: "рука"
success: "<green>Donated [number] x [material] for <aqua>[points]<green> permanent points!"
not-block: "<red>You must be holding a placeable block to donate."
confirm-prompt: "<red>About to DESTROY <gold>[number] x [material]<red> for <aqua>[points]<red> permanent points."
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/locales/tr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ island:
no-permission: "<red>You do not have permission to donate blocks on this island."
no-value: "<red>That block has no level value."
invalid-amount: "<red>Invalid amount. Use a positive number."
invalid-item: "<red>Yalnızca yapılandırılmış seviye değerine sahip bloklar bağışlanabilir."
empty: "<red>There are no valid blocks to donate."
cancelled: "<yellow>Donation cancelled. Items returned."
success: "<green>Donated [number] blocks for <aqua>[points]<green> points! These points are permanent."
Expand All @@ -67,6 +68,7 @@ island:
gui-info: "<gold>Donate blocks to your island|<gray>Currently donated: <gold>[points]<gray> points|<red>Warning: donated items are|<red>destroyed and cannot be returned!"
preview: "<yellow>Points to add: <gold>[points]|<red>These items will be destroyed!"
hand:
keyword: "el"
success: "<green>Donated [number] x [material] for <aqua>[points]<green> permanent points!"
not-block: "<red>You must be holding a placeable block to donate."
confirm-prompt: "<red>About to DESTROY <gold>[number] x [material]<red> for <aqua>[points]<red> permanent points."
Expand Down
Loading
Loading