Merge branch 'master' into 1.17

src/main/java/carpet/script/api/WorldAccess.java

@@ -114,6 +114,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.BiFunction;
+import java.util.function.BiPredicate;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -133,7 +134,7 @@ public class WorldAccess {
             Context c,
             String name,
             List<Value> params,
-            BiFunction<BlockState, BlockPos, Boolean> test
+            BiPredicate<BlockState, BlockPos> test
     )
     {
         CarpetContext cc = (CarpetContext) c;
@@ -141,9 +142,9 @@ public class WorldAccess {
             throw new InternalExpressionException("'" + name + "' requires at least one parameter");
         Value v0 = params.get(0);
         if (v0 instanceof BlockValue)
-            return BooleanValue.of(test.apply(((BlockValue) v0).getBlockState(), ((BlockValue) v0).getPos()));
+            return BooleanValue.of(test.test(((BlockValue) v0).getBlockState(), ((BlockValue) v0).getPos()));
         BlockValue block = BlockArgument.findIn(cc, params, 0).block;
-        return BooleanValue.of(test.apply(block.getBlockState(), block.getPos()));
+        return BooleanValue.of(test.test(block.getBlockState(), block.getPos()));
     }
 
     private static Value stateStringQuery(