From 19412f6f5a553558e641c034593d66f5ab603ea2 Mon Sep 17 00:00:00 2001 From: tastybento Date: Tue, 11 Mar 2025 22:08:33 -0700 Subject: [PATCH 1/2] Version 2.19.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0c0aefab..1114ac6a 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ -LOCAL - 2.19.0 + 2.19.1 BentoBoxWorld_Level bentobox-world https://sonarcloud.io From 9ce190f86c09494a70965344660caa70a87c567a Mon Sep 17 00:00:00 2001 From: tastybento Date: Tue, 11 Mar 2025 22:17:13 -0700 Subject: [PATCH 2/2] Fix hiding of blocks in value panel. #349 Also fix hiding of non-vanilla blocks. --- .../java/world/bentobox/level/config/BlockConfig.java | 10 ++++------ .../java/world/bentobox/level/panels/ValuePanel.java | 1 + 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/world/bentobox/level/config/BlockConfig.java b/src/main/java/world/bentobox/level/config/BlockConfig.java index 7cfecece..63dccfa7 100644 --- a/src/main/java/world/bentobox/level/config/BlockConfig.java +++ b/src/main/java/world/bentobox/level/config/BlockConfig.java @@ -238,7 +238,9 @@ public Integer getValue(World world, Object obj) { * @return true if hidden */ public boolean isHiddenBlock(Object obj) { - if (obj instanceof Material m) { + if (obj instanceof String s) { + return hiddenBlocks.contains(s); + } else if (obj instanceof Material m) { return hiddenBlocks.contains(m.name()); } return hiddenBlocks.contains(Material.SPAWNER.name()); @@ -250,11 +252,7 @@ public boolean isHiddenBlock(Object obj) { * @return false if hidden */ public boolean isNotHiddenBlock(Object obj) { - if (obj instanceof Material m) { - return !hiddenBlocks.contains(m.name()); - } else { - return !hiddenBlocks.contains(Material.SPAWNER.name()); - } + return !isHiddenBlock(obj); } /** diff --git a/src/main/java/world/bentobox/level/panels/ValuePanel.java b/src/main/java/world/bentobox/level/panels/ValuePanel.java index 172c8b01..a976defa 100644 --- a/src/main/java/world/bentobox/level/panels/ValuePanel.java +++ b/src/main/java/world/bentobox/level/panels/ValuePanel.java @@ -135,6 +135,7 @@ 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))));