virt-mirrors/Sit
1
0
Fork 1
mirror of https://github.com/Oth3r/Sit.git synced 2025-09-19 16:03:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix ! (not) item tags not working correctly

Browse source
This commit is contained in:
Oth3r 2024-08-07 12:46:21 -05:00
commit e2cdc9d1d4
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/one/oth3r/sit/utl/Utl.java
View file

@ -114,15 +114,24 @@ public class Utl {
// if there is a match for the item, return true immediately // if there is a match for the item, return true immediately
if (id.equalsIgnoreCase(itemId)) return true; if (id.equalsIgnoreCase(itemId)) return true;
} }
// a boolean to check if one of the items are in a filtered tag
boolean tagCheck = false;
// check the custom item tags // check the custom item tags
for (String tag : filter.getCustomTags()) { for (String tag : filter.getCustomTags()) {
// substring to remove # and if needed, ! // substring to remove # and if needed, !
// if there is a math for the NOT(!) tag, return false // if a NOT tag
if (tag.startsWith("!") && itemStack.isIn(TagKey.of(Registries.ITEM.getKey(), Identifier.of(tag.substring(2))))) return false; if (tag.startsWith("!")) {
// if there is a match, return true // if there is a math for the NOT(!) tag, return false
if (itemStack.isIn(TagKey.of(Registries.ITEM.getKey(), Identifier.of(tag.substring(1))))) return true; if (itemStack.isIn(TagKey.of(Registries.ITEM.getKey(), Identifier.of(tag.substring(2))))) return false;
}
// else (normal tag), if there is a match, set tagCheck to true
else if (itemStack.isIn(TagKey.of(Registries.ITEM.getKey(), Identifier.of(tag.substring(1))))) tagCheck = true;
} }
// if the item is in the tag, the boolean is true, return true
// not returning true in the loop because there might be a (!) not tag that the item might fall into, after the item was already in another tag
if (tagCheck) return tagCheck;
// if none of the custom were met, try the default conditions // if none of the custom were met, try the default conditions
// get the use actions for the filters // get the use actions for the filters