virt/Sit
1
0
Fork 0
forked from virt-mirrors/Sit
Code Pull requests Activity

better block tag checker

Browse source
This commit is contained in:
Oth3r 2024-09-21 18:44:58 -05:00
commit c7183506e4
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/one/oth3r/sit/file/CustomBlock.java
View file

@ -78,14 +78,20 @@ public class CustomBlock {
// if there is a match for the block, return true immediately // if there is a match for the block, return true immediately
if (id.equalsIgnoreCase(Utl.getBlockID(blockState))) return true; if (id.equalsIgnoreCase(Utl.getBlockID(blockState))) return true;
} }
// a boolean to check if one of the blocks are in a filtered tag
boolean tagCheck = false;
// for all the entered tags // for all the entered tags
for (String tag : blockTags) { for (String tag : blockTags) {
// substring to remove # and if needed, ! // substring to remove # and if needed, !
// if there is a math for the NOT(!) tag, return false // if there is a math for the NOT(!) tag, return false
if (tag.startsWith("!") && blockState.isIn(TagKey.of(Registries.BLOCK.getKey(), Identifier.of(tag.substring(2))))) return false; if (tag.startsWith("!") && blockState.isIn(TagKey.of(Registries.BLOCK.getKey(), Identifier.of(tag.substring(2))))) return false;
// if there is a match, return true // if there is a match, return true
if (blockState.isIn(TagKey.of(Registries.BLOCK.getKey(), Identifier.of(tag.substring(1))))) return true; if (blockState.isIn(TagKey.of(Registries.BLOCK.getKey(), Identifier.of(tag.substring(1))))) tagCheck = true;
} }
return false;
// not returning true in the loop because there might be a (!) not tag that the block might fall into, after the block was already in another tag
return tagCheck;
} }
} }