Skip to content
Merged
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
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<mock-bukkit.version>v1.21-SNAPSHOT</mock-bukkit.version>
<!-- More visible way how to change dependency versions -->
<paper.version>1.21.11-R0.1-SNAPSHOT</paper.version>
<bentobox.version>3.14.1-SNAPSHOT</bentobox.version>
<bentobox.version>3.15.0-SNAPSHOT</bentobox.version>
<!-- Warps addon version -->
<warps.version>1.12.0</warps.version>
<!-- Visit addon version -->
Expand All @@ -69,7 +69,7 @@
<!-- Do not change unless you want different name for local builds. -->
<build.number>-LOCAL</build.number>
<!-- This allows to change between versions. -->
<build.version>2.24.1</build.version>
<build.version>2.25.0</build.version>
<sonar.projectKey>BentoBoxWorld_Level</sonar.projectKey>
<sonar.organization>bentobox-world</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/world/bentobox/level/Level.java
Original file line number Diff line number Diff line change
Expand Up @@ -515,4 +515,12 @@ public boolean isNexo() {
&& Bukkit.getPluginManager().isPluginEnabled("Nexo");
}

/**
* @return true if the CraftEngine plugin is hooked and not disabled in config
*/
public boolean isCraftEngine() {
return !getSettings().getDisabledPluginHooks().contains("CraftEngine")
&& getPlugin().getHooks().getHook("CraftEngine").isPresent();
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import us.lynuxcraft.deadsilenceiv.advancedchests.chest.gui.page.ChestPage;
import world.bentobox.bentobox.BentoBox;
import world.bentobox.bentobox.database.objects.Island;
import world.bentobox.bentobox.hooks.CraftEngineHook;
import world.bentobox.bentobox.hooks.ItemsAdderHook;
import world.bentobox.bentobox.hooks.OraxenHook;
import world.bentobox.bentobox.util.Pair;
Expand Down Expand Up @@ -562,11 +563,11 @@ private void processBlock(ChunkPair cp, int x, int y, int z, int globalX, int gl
// Create a Location object only when needed for more complex checks.
Location loc = null;

// === Custom Block Hooks (ItemsAdder, Oraxen, Nexo) ===
// === Custom Block Hooks (ItemsAdder, Oraxen, Nexo, CraftEngine) ===
// These hooks can define custom blocks that override vanilla behavior.
// They must be checked first.
if (addon.isItemsAdder() || BentoBox.getInstance().getHooks().getHook("Oraxen").isPresent()
|| addon.isNexo()) {
|| addon.isNexo() || addon.isCraftEngine()) {
loc = new Location(cp.world, globalX, y, globalZ);
String customBlockId = null;
if (addon.isItemsAdder()) {
Expand All @@ -584,6 +585,9 @@ private void processBlock(ChunkPair cp, int x, int y, int z, int globalX, int gl
customBlockId = "nexo:" + nexoMechanic.getItemID();
}
}
if (customBlockId == null && addon.isCraftEngine()) {
customBlockId = CraftEngineHook.getBlockId(loc);
}

if (customBlockId != null) {
// If a custom block is found, count it and stop further processing for this block.
Expand Down
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
7 changes: 6 additions & 1 deletion src/main/java/world/bentobox/level/config/BlockConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.nexomc.nexo.api.NexoItems;

import world.bentobox.bentobox.BentoBox;
import world.bentobox.bentobox.hooks.CraftEngineHook;
import world.bentobox.bentobox.hooks.ItemsAdderHook;
import world.bentobox.bentobox.hooks.OraxenHook;
import world.bentobox.level.Level;
Expand Down Expand Up @@ -111,7 +112,11 @@ private boolean isOther(String key) {
return NexoItems.exists(key.substring(5));
}
// Check ItemsAdder
return addon.isItemsAdder() && ItemsAdderHook.isInRegistry(key);
if (addon.isItemsAdder() && ItemsAdderHook.isInRegistry(key)) {
return true;
}
// Check CraftEngine — block IDs are already namespaced (e.g. "mynamespace:my_block")
return addon.isCraftEngine() && CraftEngineHook.exists(key);
}

private boolean isSpawner(String key) {
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
Loading
Loading