Skip to content

Added value support #385 #387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tastybento merged 1 commit into from
Sep 22, 2025
Merged

Added value support #385 #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 additions & 1 deletion src/main/java/world/bentobox/level/commands/IslandValueCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@
import org.bukkit.inventory.PlayerInventory;
import org.eclipse.jdt.annotation.NonNull;

import world.bentobox.bentobox.BentoBox;
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.hooks.ItemsAdderHook;
import world.bentobox.bentobox.hooks.OraxenHook;
import world.bentobox.bentobox.util.Util;
import world.bentobox.level.Level;
import world.bentobox.level.objects.IslandLevels;
Expand Down Expand Up @@ -77,6 +79,15 @@ private void executeHandCommand(User user) {
return;
}

// Oraxen
if (BentoBox.getInstance().getHooks().getHook("Oraxen").isPresent()) {
String id = OraxenHook.getIdByItem(mainHandItem);
if (id != null) {
printValue(user, "oraxen:" + id);
return;
}
}
// ItemsAdder
if (addon.isItemsAdder()) {
Optional<String> id = ItemsAdderHook.getNamespacedId(mainHandItem);
if (id.isPresent()) {
Expand Down Expand Up @@ -145,7 +156,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).toList());
Arrays.stream(Material.values()).filter(Material::isBlock).map(Material::name).map(String::toLowerCase).toList());

options.add("HAND");

Expand Down
78 changes: 69 additions & 9 deletions src/main/java/world/bentobox/level/panels/ValuePanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@
import org.bukkit.Material;
import org.bukkit.NamespacedKey;
import org.bukkit.Registry;
import org.bukkit.Tag;
import org.bukkit.World;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;

import com.google.common.base.Enums;

import world.bentobox.bentobox.BentoBox;
import world.bentobox.bentobox.api.localization.TextVariables;
import world.bentobox.bentobox.api.panels.PanelItem;
import world.bentobox.bentobox.api.panels.TemplatedPanel;
Expand Down Expand Up @@ -134,11 +136,12 @@ private ValuePanel(Level addon,

this.activeFilter = Filter.NAME_ASC;

addon.getBlockConfig().getBlockValues().entrySet().stream().filter(en -> this.getIcon(en.getKey()) != null)
.filter(en -> addon.getBlockConfig().isNotHiddenBlock(en.getKey()))
.forEach(en -> blockRecordList
.add(new BlockRecord(en.getKey(), Objects.requireNonNullElse(en.getValue(), 0),
Objects.requireNonNullElse(addon.getBlockConfig().getLimit(en.getKey()), 0))));
addon.getBlockConfig().getBlockValues().entrySet().stream()
.filter(en -> this.getIcon(en.getKey()) != null)
.filter(en -> addon.getBlockConfig().isNotHiddenBlock(en.getKey()))
.forEach(en -> blockRecordList
.add(new BlockRecord(en.getKey(), Objects.requireNonNullElse(en.getValue(), 0),
Objects.requireNonNullElse(addon.getBlockConfig().getLimit(en.getKey()), 0))));

this.elementList = new ArrayList<>();
this.searchText = "";
Expand Down Expand Up @@ -649,7 +652,7 @@ private PanelItem createMaterialButton(ItemTemplateRecord template, TemplatedPan
{
if (this.elementList.isEmpty())
{
// Does not contain any generators.
// Does not contain any.
return null;
}

Expand All @@ -665,16 +668,71 @@ private PanelItem createMaterialButton(ItemTemplateRecord template, TemplatedPan
}

private Material getIcon(String key) {
// Filter out some names
key = key.replaceAll("wall_", "");
key = key.replaceAll("_hanging", "");
Material icon = Registry.MATERIAL.get(NamespacedKey.fromString(key));
if (icon == null && key.endsWith("_spawner")) {
icon = Registry.MATERIAL.get(NamespacedKey.fromString(key.substring(0, key.length() - 2) + "_egg"));
}
// ItemsAdder
if (icon == null && addon.isItemsAdder() && ItemsAdderHook.isInRegistry(key)) {
icon = ItemsAdderHook.getItemStack(key).map(ItemStack::getType).orElse(null);
}
if (icon != null && icon.isItem()) {
return icon;
}
// Not an item, but maybe still something
if (icon != null) {
switch (icon) {
case BUBBLE_COLUMN: return Material.WATER_BUCKET;
case NETHER_PORTAL: return Material.PURPLE_STAINED_GLASS_PANE;
case END_GATEWAY: return Material.BLACK_STAINED_GLASS_PANE;
case END_PORTAL: return Material.BLACK_STAINED_GLASS_PANE;
case SOUL_FIRE: return Material.SOUL_TORCH;
case WALL_TORCH: return Material.TORCH;
case TWISTING_VINES_PLANT: return Material.VINE;
case CAVE_VINES_PLANT: return Material.VINE;
case BAMBOO_SAPLING: return Material.BAMBOO;
case KELP_PLANT: return Material.KELP;
case SWEET_BERRY_BUSH: return Material.SWEET_BERRIES;
case LAVA, FIRE: return Material.LAVA_BUCKET;
case PISTON_HEAD: return Material.PISTON;
case REDSTONE_WIRE: return Material.REDSTONE;
case TORCHFLOWER_CROP: return Material.TORCHFLOWER_SEEDS;
case TALL_SEAGRASS: return Material.SEAGRASS;
case WATER: return Material.WATER_BUCKET;
case VOID_AIR: return Material.BARRIER;
case COCOA: return Material.COCOA_BEANS;
case TRIPWIRE: return Material.TRIPWIRE_HOOK;
case BEETROOTS: return Material.BEETROOT_SEEDS;
case POTATOES: return Material.POTATO;
case CARROTS: return Material.CARROT;
case PITCHER_CROP: return Material.PITCHER_POD;
case BIG_DRIPLEAF_STEM: return Material.BIG_DRIPLEAF;
default: {}
}
if (Tag.FLOWER_POTS.isTagged(icon)) {
return Material.FLOWER_POT;
}
if (Tag.WALL_SIGNS.isTagged(icon) || Tag.ALL_HANGING_SIGNS.isTagged(icon)) {
return Material.OAK_SIGN;
}
if (Tag.CANDLE_CAKES.isTagged(icon)) {
return Material.CAKE;
}
if (Tag.CAULDRONS.isTagged(icon)) {
return Material.CAULDRON;
}
if (Tag.ICE.isTagged(icon)) {
return Material.ICE;
}

}
// Try Oraxen
if (key.startsWith("oraxen:") && BentoBox.getInstance().getHooks().getHook("Oraxen").isPresent()) {
return Material.PAPER;
}
return null;
}

Expand Down Expand Up @@ -702,13 +760,15 @@ private PanelItem createMaterialButton(ItemTemplateRecord template, BlockRecord
String.valueOf(blockValue));
String limitTranslation = blockLimit > 0
? this.user.getTranslationOrNothing(baseKey + "limit", TextVariables.NUMBER, String.valueOf(blockLimit))
: "";
: "";

// Determine icon and display material text
Material icon = getIcon(key);
builder.icon((icon == null || icon == Material.AIR) ? Material.PAPER : icon);

String displayMaterial = (icon == null) ? Util.prettifyText(key) : Utils.prettifyObject(icon, user);
if (key.startsWith("oraxen:")) {
key = key.substring(7);
}
String displayMaterial = (icon == null) ? Util.prettifyText(key) : Utils.prettifyObject(key, user);
// Special handling for spawn eggs
if (icon != null && icon.name().endsWith("_SPAWN_EGG")) {
displayMaterial = Util.prettifyText(key);
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/world/bentobox/level/util/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,10 @@ public static String prettifyObject(Object object, User user) {
key = ((Enum<?>) object).name().toLowerCase();
} else {
key = (String) object;
// Remove prefix
if (key.startsWith("oraxen:")) {
key = key.substring(7);
}
}

// Try our translations for Material.
Expand All @@ -177,7 +181,7 @@ public static String prettifyObject(Object object, User user) {
// Fallback to our hook for Material.
return LangUtilsHook.getMaterialName((Material) object, user);
} else {
return key;
return world.bentobox.bentobox.util.Util.prettifyText(key);
}
} else if (object instanceof EntityType) {
String key = ((Enum<?>) object).name().toLowerCase();
Expand Down