Merge branch 'master' into 1.17

# Conflicts:
#	gradle.properties
#	src/main/java/carpet/script/value/ValueConversions.java

src/main/java/carpet/mixins/StatePredicate_scarpetMixin.java

@@ -0,0 +1,57 @@
+package carpet.mixins;
+
+import carpet.fakes.BlockPredicateInterface;
+import carpet.script.value.StringValue;
+import carpet.script.value.Value;
+import carpet.script.value.ValueConversions;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.state.property.Property;
+import net.minecraft.tag.Tag;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@Mixin(targets = "net.minecraft.command.argument.BlockPredicateArgumentType$StatePredicate")
+public class StatePredicate_scarpetMixin implements BlockPredicateInterface
+{
+
+    @Shadow @Final private BlockState state;
+
+    @Shadow @Final /*@Nullable*/ private CompoundTag nbt;
+
+    @Shadow @Final private Set<Property<?>> properties;
+
+    @Override
+    public BlockState getCMBlockState()
+    {
+        return state;
+    }
+
+    @Override
+    public Tag<Block> getCMBlockTag()
+    {
+        return null;
+    }
+
+    @Override
+    public Map<Value, Value> getCMProperties()
+    {
+        return properties.stream().collect(Collectors.toMap(
+                p -> StringValue.of(p.getName()),
+                p -> ValueConversions.fromProperty(state, p),
+                (a, b) -> b
+        ));
+    }
+
+    @Override
+    public CompoundTag getCMDataTag()
+    {
+        return nbt;
+    }
+}

src/main/java/carpet/mixins/TagPredicate_scarpetMixin.java

@@ -0,0 +1,52 @@
+package carpet.mixins;
+
+import carpet.fakes.BlockPredicateInterface;
+import carpet.script.value.StringValue;
+import carpet.script.value.Value;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.tag.Tag;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Mixin(targets = "net.minecraft.command.argument.BlockPredicateArgumentType$TagPredicate")
+public class TagPredicate_scarpetMixin implements BlockPredicateInterface
+{
+    @Shadow @Final private Tag<Block> tag;
+
+    @Shadow @Final private Map<String, String> properties;
+
+    @Shadow @Final /*@Nullable*/ private CompoundTag nbt;
+
+    @Override
+    public BlockState getCMBlockState()
+    {
+        return null;
+    }
+
+    @Override
+    public Tag<Block> getCMBlockTag()
+    {
+        return tag;
+    }
+
+    @Override
+    public Map<Value, Value> getCMProperties()
+    {
+        return properties.entrySet().stream().collect(Collectors.toMap(
+                e -> new StringValue(e.getKey()),
+                e -> new StringValue(e.getValue())
+        ));
+    }
+
+    @Override
+    public CompoundTag getCMDataTag()
+    {
+        return nbt;
+    }
+}