Added EntityTag.State Property for Armadillo Rolling

plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/EntityHelper.java

@@ -5,6 +5,7 @@
 import com.denizenscript.denizen.objects.EntityTag;
 import com.denizenscript.denizen.objects.LocationTag;
 import com.denizenscript.denizen.utilities.Utilities;
+import com.denizenscript.denizencore.objects.Mechanism;
 import com.denizenscript.denizencore.objects.core.ElementTag;
 import com.denizenscript.denizencore.objects.core.MapTag;
 import net.kyori.adventure.nbt.CompoundBinaryTag;
@@ -514,4 +515,12 @@ public void onEntityMount(EntityDismountEvent event) {
     public Class<? extends EntityExitsVehicleScriptEvent> getExitsVehicleEventImpl() { // TODO: once 1.20 is the minimum supported version, implement in the ScriptEvent class as usual
         return EntityExitsVehicleScriptEventImpl.class;
     }
+
+    public ElementTag getArmadilloState(Armadillo entity) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void setArmadilloState(Armadillo entity, Mechanism mechanism, ElementTag state) {
+        throw new UnsupportedOperationException();
+    }
 }

plugin/src/main/java/com/denizenscript/denizen/objects/properties/PropertyRegistry.java

@@ -173,6 +173,9 @@ public static void registerMainProperties() {
         }
         PropertyParser.registerProperty(EntitySpeed.class, EntityTag.class);
         PropertyParser.registerProperty(EntitySpell.class, EntityTag.class);
+        if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_20)) {
+            PropertyParser.registerProperty(EntityState.class, EntityTag.class);
+        }
         if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_19)) {
             PropertyParser.registerProperty(EntityStepHeight.class, EntityTag.class);
         }

plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityState.java

@@ -0,0 +1,43 @@
+package com.denizenscript.denizen.objects.properties.entity;
+
+import com.denizenscript.denizen.nms.NMSHandler;
+import com.denizenscript.denizen.objects.EntityTag;
+import com.denizenscript.denizencore.objects.Mechanism;
+import com.denizenscript.denizencore.objects.core.ElementTag;
+import org.bukkit.entity.Armadillo;
+
+public class EntityState extends EntityProperty<ElementTag> {
+
+    // <--[property]
+    // @object EntityTag
+    // @name state
+    // @input ElementTag
+    // @description
+    // Controls the current state of an armadillo.
+    // Valid states are IDLE, ROLLING, SCARED, and UNROLLING.
+    // The entity may roll or unroll due to normal vanilla conditions. If this is not desired, disable <@link mechanism EntityTag.has_ai>.
+    // -->
+
+    public static boolean describes(EntityTag entity) {
+          return entity.getBukkitEntity() instanceof Armadillo;
+    }
+
+    @Override
+    public ElementTag getPropertyValue() {
+        return NMSHandler.entityHelper.getArmadilloState(as(Armadillo.class));
+    }
+
+    @Override
+    public void setPropertyValue(ElementTag param, Mechanism mechanism) {
+        NMSHandler.entityHelper.setArmadilloState(as(Armadillo.class), mechanism, param);
+    }
+
+    @Override
+    public String getPropertyId() {
+        return "state";
+    }
+
+    public static void register() {
+        autoRegister("state", EntityState.class, ElementTag.class, false);
+    }
+}

v1_20/src/main/java/com/denizenscript/denizen/nms/v1_20/helpers/EntityHelperImpl.java

@@ -8,7 +8,9 @@
 import com.denizenscript.denizen.objects.EntityTag;
 import com.denizenscript.denizen.utilities.Utilities;
 import com.denizenscript.denizen.utilities.packets.NetworkInterceptHelper;
+import com.denizenscript.denizencore.objects.Mechanism;
 import com.denizenscript.denizencore.objects.ObjectTag;
+import com.denizenscript.denizencore.objects.core.ElementTag;
 import com.denizenscript.denizencore.objects.core.MapTag;
 import com.denizenscript.denizencore.scripts.commands.core.ReflectionSetCommand;
 import com.denizenscript.denizencore.utilities.ReflectionHelper;
@@ -43,6 +45,7 @@
 import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.entity.ai.goal.Goal;
 import net.minecraft.world.entity.ai.navigation.PathNavigation;
+import net.minecraft.world.entity.animal.armadillo.Armadillo;
 import net.minecraft.world.entity.item.FallingBlockEntity;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.item.PrimedTnt;
@@ -848,4 +851,18 @@ public void modifyRawNBT(Entity entity, CompoundBinaryTag tag) {
         nmsEntity.load(nmsMergedTag);
         nmsEntity.setUUID(uuid);
     }
+
+    @Override
+    public ElementTag getArmadilloState(org.bukkit.entity.Armadillo entity) {
+        net.minecraft.world.entity.animal.armadillo.Armadillo armadillo = (Armadillo) ((CraftEntity) entity).getHandle();
+        return new ElementTag(armadillo.getState());
+    }
+
+    @Override
+    public void setArmadilloState(org.bukkit.entity.Armadillo entity, Mechanism mechanism, ElementTag state) {
+        if (mechanism.requireEnum(Armadillo.ArmadilloState.class)) {
+            net.minecraft.world.entity.animal.armadillo.Armadillo armadillo = (Armadillo) ((CraftEntity) entity).getHandle();
+            armadillo.switchToState(state.asEnum(Armadillo.ArmadilloState.class));
+        }
+    }
 }

v1_21/src/main/java/com/denizenscript/denizen/nms/v1_21/helpers/EntityHelperImpl.java

@@ -9,7 +9,9 @@
 import com.denizenscript.denizen.objects.EntityTag;
 import com.denizenscript.denizen.utilities.Utilities;
 import com.denizenscript.denizen.utilities.packets.NetworkInterceptHelper;
+import com.denizenscript.denizencore.objects.Mechanism;
 import com.denizenscript.denizencore.objects.ObjectTag;
+import com.denizenscript.denizencore.objects.core.ElementTag;
 import com.denizenscript.denizencore.objects.core.MapTag;
 import com.denizenscript.denizencore.scripts.commands.core.ReflectionSetCommand;
 import com.denizenscript.denizencore.utilities.ReflectionHelper;
@@ -45,6 +47,7 @@
 import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.entity.ai.goal.Goal;
 import net.minecraft.world.entity.ai.navigation.PathNavigation;
+import net.minecraft.world.entity.animal.armadillo.Armadillo;
 import net.minecraft.world.entity.item.FallingBlockEntity;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.item.PrimedTnt;
@@ -843,4 +846,18 @@ public void modifyRawNBT(Entity entity, CompoundBinaryTag tag) {
         Handler.useValueInput(nmsMergedTag, nmsEntity::load);
         nmsEntity.setUUID(uuid);
     }
+
+    @Override
+    public ElementTag getArmadilloState(org.bukkit.entity.Armadillo entity) {
+        net.minecraft.world.entity.animal.armadillo.Armadillo armadillo = (Armadillo) ((CraftEntity) entity).getHandle();
+        return new ElementTag(armadillo.getState());
+    }
+
+    @Override
+    public void setArmadilloState(org.bukkit.entity.Armadillo entity, Mechanism mechanism, ElementTag state) {
+        if (mechanism.requireEnum(Armadillo.ArmadilloState.class)) {
+            net.minecraft.world.entity.animal.armadillo.Armadillo armadillo = (Armadillo) ((CraftEntity) entity).getHandle();
+            armadillo.switchToState(state.asEnum(Armadillo.ArmadilloState.class));
+        }
+    }
 }