added support for block predicate argument support and tag_matches function. Fixes #563

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

@@ -40,6 +40,7 @@ import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.decoration.ArmorStandEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NbtHelper;
 import net.minecraft.nbt.StringTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.network.packet.s2c.play.PlaySoundIdS2CPacket;
@@ -405,13 +406,23 @@ public class Auxiliary {
                 Value parsed = ((NBTSerializableValue) v).toValue();
                 return (cc, tt) -> parsed;
             }
-            NBTSerializableValue ret = NBTSerializableValue.parseString(v.getString());
+            NBTSerializableValue ret = NBTSerializableValue.parseString(v.getString(), false);
             if (ret == null)
                 return LazyValue.NULL;
             Value parsed = ret.toValue();
             return (cc, tt) -> parsed;
         });
 
+        expression.addFunction("tag_matches", (lv) -> {
+            int numParam = lv.size();
+            if (numParam != 2 && numParam != 3) throw new InternalExpressionException("'tag_matches' requires 2 or 3 arguments");
+            if (lv.get(1).isNull()) return Value.TRUE;
+            if (lv.get(0).isNull()) return Value.FALSE;
+            Tag source = ((NBTSerializableValue)(NBTSerializableValue.fromValue(lv.get(0)))).getTag();
+            Tag match = ((NBTSerializableValue)(NBTSerializableValue.fromValue(lv.get(1)))).getTag();
+            return new NumericValue(NbtHelper.matches(match, source, numParam == 2 || lv.get(2).getBoolean()));
+        });
+
         expression.addLazyFunction("encode_nbt", -1, (c, t, lv) -> {
             int argSize = lv.size();
             if (argSize==0 || argSize > 2) throw new InternalExpressionException("'encode_nbt' requires 1 or 2 parameters");

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

@@ -137,7 +137,7 @@ public class Entities {
             {
                 Value nbt = lv.get(position.offset).evalValue(c);
                 NBTSerializableValue v = (nbt instanceof NBTSerializableValue) ? (NBTSerializableValue) nbt
-                        : NBTSerializableValue.parseString(nbt.getString());
+                        : NBTSerializableValue.parseString(nbt.getString(), true);
                 hasTag = true;
                 tag = v.getCompoundTag();
 

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

@@ -808,9 +808,7 @@ public class WorldAccess {
                     tag = ((NBTSerializableValue) tagValue).getCompoundTag();
                 else
                 {
-                    NBTSerializableValue readTag = NBTSerializableValue.parseString(tagValue.getString());
-                    if (readTag == null)
-                        throw new InternalExpressionException("Incorrect tag: "+tagValue.getString());
+                    NBTSerializableValue readTag = NBTSerializableValue.parseString(tagValue.getString(), true);
                     tag = readTag.getCompoundTag();
                 }
             }

src/main/java/carpet/script/command/CommandArgument.java

@@ -36,6 +36,7 @@ import net.minecraft.advancement.Advancement;
 import net.minecraft.command.CommandSource;
 import net.minecraft.command.argument.AngleArgumentType;
 import net.minecraft.command.argument.BlockPosArgumentType;
+import net.minecraft.command.argument.BlockPredicateArgumentType;
 import net.minecraft.command.argument.BlockStateArgument;
 import net.minecraft.command.argument.BlockStateArgumentType;
 import net.minecraft.command.argument.ColorArgumentType;
@@ -126,6 +127,9 @@ public abstract class CommandArgument
                     },
                     false
             ),
+            new VanillaUnconfigurableArgument( "blockpredicate", BlockPredicateArgumentType::blockPredicate,
+                    (c, p) -> ValueConversions.ofBlockPredicate(c.getSource().getMinecraftServer().getTagManager(), BlockPredicateArgumentType.getBlockPredicate(c, p)), false
+            ),
             // block_predicate todo - not sure about the returned format. Needs to match block tags used in the API (future)
             new VanillaUnconfigurableArgument("teamcolor", ColorArgumentType::color,
                     (c, p) -> {

src/main/java/carpet/script/value/NBTSerializableValue.java

@@ -104,7 +104,7 @@ public class NBTSerializableValue extends Value implements ContainerValueInterfa
         return id.toString();
     }
 
-    public static NBTSerializableValue parseString(String nbtString)
+    public static NBTSerializableValue parseString(String nbtString, boolean fail)
     {
         Tag tag;
         try
@@ -113,7 +113,8 @@ public class NBTSerializableValue extends Value implements ContainerValueInterfa
         }
         catch (CommandSyntaxException e)
         {
-           throw new InternalExpressionException("Incorrect NBT tag: nbtString");
+            if (fail) throw new InternalExpressionException("Incorrect NBT tag: "+ nbtString);
+            return null;
         }
         NBTSerializableValue value = new NBTSerializableValue(tag);
         value.nbtString = null;
@@ -331,7 +332,7 @@ public class NBTSerializableValue extends Value implements ContainerValueInterfa
             return v;
         if (v instanceof NullValue)
             return Value.NULL;
-        return NBTSerializableValue.parseString(v.getString());
+        return NBTSerializableValue.parseString(v.getString(), true);
     }
 
 

src/main/java/carpet/script/value/NumericValue.java

@@ -227,7 +227,7 @@ public class NumericValue extends Value
     }
     public NumericValue(boolean boolval)
     {
-        this(boolval?1.0D:0.0D);
+        this(boolval?1L:0L);
     }
 
     @Override

src/main/java/carpet/script/value/ValueConversions.java

@@ -1,9 +1,11 @@
 package carpet.script.value;
 
+import carpet.fakes.BlockPredicateInterface;
 import carpet.script.exception.InternalExpressionException;
 import carpet.utils.BlockInfo;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.MaterialColor;
+import net.minecraft.block.pattern.CachedBlockPosition;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.ai.brain.LookTarget;
 import net.minecraft.entity.ai.brain.WalkTarget;
@@ -21,6 +23,7 @@ import net.minecraft.server.world.ServerWorld;
 import net.minecraft.state.property.Property;
 import net.minecraft.structure.StructurePiece;
 import net.minecraft.structure.StructureStart;
+import net.minecraft.tag.TagManager;
 import net.minecraft.util.Identifier;
 
 import net.minecraft.util.StringIdentifiable;
@@ -40,6 +43,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 public class ValueConversions
@@ -379,4 +383,15 @@ public class ValueConversions
         if (ret == null) return ListValue.of(Value.NULL, NumericValue.of(itemSlot));
         return ret;
     }
+
+    public static Value ofBlockPredicate(TagManager tagManager, Predicate<CachedBlockPosition> blockPredicate)
+    {
+        BlockPredicateInterface predicateData = (BlockPredicateInterface) blockPredicate;
+        return ListValue.of(
+                predicateData.getCMBlockState()==null?Value.NULL:of(Registry.BLOCK.getId(predicateData.getCMBlockState().getBlock())),
+                predicateData.getCMBlockTag()==null?Value.NULL:of(tagManager.getBlocks().getTagId(predicateData.getCMBlockTag())),
+                MapValue.wrap(predicateData.getCMProperties()),
+                predicateData.getCMDataTag() == null?Value.NULL:new NBTSerializableValue(predicateData.getCMDataTag())
+        );
+    }
 }