Skip to content

Commit 9ce190f

Browse files
committed
Fix hiding of blocks in value panel. #349
Also fix hiding of non-vanilla blocks.
1 parent 19412f6 commit 9ce190f

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

src/main/java/world/bentobox/level/config/BlockConfig.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,9 @@ public Integer getValue(World world, Object obj) {
238238
* @return true if hidden
239239
*/
240240
public boolean isHiddenBlock(Object obj) {
241-
if (obj instanceof Material m) {
241+
if (obj instanceof String s) {
242+
return hiddenBlocks.contains(s);
243+
} else if (obj instanceof Material m) {
242244
return hiddenBlocks.contains(m.name());
243245
}
244246
return hiddenBlocks.contains(Material.SPAWNER.name());
@@ -250,11 +252,7 @@ public boolean isHiddenBlock(Object obj) {
250252
* @return false if hidden
251253
*/
252254
public boolean isNotHiddenBlock(Object obj) {
253-
if (obj instanceof Material m) {
254-
return !hiddenBlocks.contains(m.name());
255-
} else {
256-
return !hiddenBlocks.contains(Material.SPAWNER.name());
257-
}
255+
return !isHiddenBlock(obj);
258256
}
259257

260258
/**

src/main/java/world/bentobox/level/panels/ValuePanel.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ private ValuePanel(Level addon,
135135
this.activeFilter = Filter.NAME_ASC;
136136

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

0 commit comments

Comments
 (0)