Merge pull request #350 from BentoBoxWorld/349_hiding_block_in_value_panel

349 hiding block in value panel

Author: tastybento

pom.xml

@@ -67,7 +67,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.19.0</build.version>
+        <build.version>2.19.1</build.version>
         <sonar.projectKey>BentoBoxWorld_Level</sonar.projectKey>
         <sonar.organization>bentobox-world</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>

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);
     }
 
     /**

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))));