Fix ItemStack Matcher (#362)

IntegerLimit · web-flow · commit 266c1dc4e662 · 2025-12-16T13:16:14.000+01:00
diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/vanilla/ItemStackMixinExpansion.java b/src/main/java/com/cleanroommc/groovyscript/compat/vanilla/ItemStackMixinExpansion.java
@@ -66,7 +66,7 @@ default ItemStackMixinExpansion exactCopy() {
 
     @Override
     default boolean test(ItemStack stack) {
-        if (!OreDictionary.itemMatches(grs$getItemStack(), stack, false) && (grs$getMatcher() == null || !grs$getMatcher().test(stack))) {
+        if (!OreDictionary.itemMatches(grs$getItemStack(), stack, false) || (grs$getMatcher() != null && !grs$getMatcher().test(stack))) {
             return false;
         }
         if (grs$getNbtMatcher() != null) {

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ default ItemStackMixinExpansion exactCopy() {`
`66`	`66`
`67`	`67`	`@Override`
`68`	`68`	`default boolean test(ItemStack stack) {`
`69`		`- if (!OreDictionary.itemMatches(grs$getItemStack(), stack, false) && (grs$getMatcher() == null \|\| !grs$getMatcher().test(stack))) {`
	`69`	`+ if (!OreDictionary.itemMatches(grs$getItemStack(), stack, false) \|\| (grs$getMatcher() != null && !grs$getMatcher().test(stack))) {`
`70`	`70`	`return false;`
`71`	`71`	`}`
`72`	`72`	`if (grs$getNbtMatcher() != null) {`