ExprArmorSlot - Body Armor

src/main/java/ch/njol/skript/expressions/ExprArmorSlot.java

@@ -18,6 +18,7 @@
  */
 package ch.njol.skript.expressions;
 
+import ch.njol.skript.Skript;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
 import ch.njol.skript.doc.Keywords;
@@ -30,39 +31,53 @@
 import ch.njol.skript.util.slot.EquipmentSlot.EquipSlot;
 import ch.njol.skript.util.slot.Slot;
 import ch.njol.util.Kleenean;
-import org.bukkit.entity.LivingEntity;
+import org.bukkit.Material;
+import org.bukkit.entity.*;
 import org.bukkit.event.Event;
 import org.bukkit.inventory.EntityEquipment;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Arrays;
-import java.util.Locale;
+import java.util.*;
 import java.util.stream.Stream;
 
-@Name("Armour Slot")
-@Description("Equipment of living entities, i.e. the boots, leggings, chestplate or helmet.")
+@Name("Armor Slot")
+@Description({
+	"Equipment of living entities, i.e. the boots, leggings, chestplate or helmet.",
+	"Body armor is a special slot that can only be used for:",
+	"<ul>",
+	"<li>Horses: Horse armour (doesn't work on zombie or skeleton horses)</li>",
+	"<li>Wolves: Wolf Armor</li>",
+	"<li>Llamas (regular or trader): Carpet</li>",
+	"</ul>"
+})
 @Examples({
 	"set chestplate of the player to a diamond chestplate",
 	"helmet of player is neither a helmet nor air # player is wearing a block, e.g. from another plugin"
 })
 @Keywords("armor")
-@Since("1.0, 2.8.0 (Armour)")
+@Since("1.0, 2.8.0 (armor), INSERT VERSION (body armor)")
 public class ExprArmorSlot extends PropertyExpression<LivingEntity, Slot> {
 
+	private static final Set<Class<?>> bodyEntities = new HashSet<>(Arrays.asList(Horse.class, Llama.class, TraderLlama.class));
+
 	static {
-		register(ExprArmorSlot.class, Slot.class, "((boots:(boots|shoes)|leggings:leg[ging]s|chestplate:chestplate[s]|helmet:helmet[s]) [(item|:slot)]|armour:armo[u]r[s])", "livingentities");
+		if (Material.getMaterial("WOLF_ARMOR") != null)
+			bodyEntities.add(Wolf.class);
+
+		register(ExprArmorSlot.class, Slot.class, "((boots:(boots|shoes)|leggings:leg[ging]s|chestplate:chestplate[s]|helmet:helmet[s]) [(item|:slot)]|armour:armo[u]r[s]|bodyarmor:body armo[u]r)", "livingentities");
 	}
 
-	@Nullable
-	private EquipSlot slot;
+	private @Nullable EquipSlot slot;
 	private boolean explicitSlot;
 	private boolean isArmor;
+	private boolean isBody;
 
 	@Override
 	@SuppressWarnings("unchecked")
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		isBody = parseResult.hasTag("bodyarmor");
 		isArmor = parseResult.hasTag("armour");
-		slot = isArmor ? null : EquipSlot.valueOf(parseResult.tags.get(0).toUpperCase(Locale.ENGLISH));
+		slot = (isArmor || isBody) ? null : EquipSlot.valueOf(parseResult.tags.get(0).toUpperCase(Locale.ENGLISH));
 		explicitSlot = parseResult.hasTag("slot"); // User explicitly asked for SLOT, not item
 		setExpr((Expression<? extends LivingEntity>) exprs[0]);
 		return true;
@@ -76,6 +91,11 @@ protected Slot[] get(Event event, LivingEntity[] source) {
 					.flatMap(equipment -> {
 						if (equipment == null)
 							return null;
+						if (isBody) {
+							if (!bodyEntities.contains(equipment.getHolder().getType().getEntityClass()))
+								return null;
+							return Stream.of(new EquipmentSlot(equipment, EquipSlot.BODY, explicitSlot));
+						}
 						return Stream.of(
 								new EquipmentSlot(equipment, EquipSlot.HELMET, explicitSlot),
 								new EquipmentSlot(equipment, EquipSlot.CHESTPLATE, explicitSlot),
@@ -96,7 +116,7 @@ protected Slot[] get(Event event, LivingEntity[] source) {
 
 	@Override
 	public boolean isSingle() {
-		return !isArmor && super.isSingle();
+		return isBody || (!isArmor && super.isSingle());
 	}
 
 	@Override

src/main/java/ch/njol/skript/util/slot/EquipmentSlot.java

@@ -110,6 +110,18 @@ public ItemStack get(final EntityEquipment e) {
 			public void set(final EntityEquipment e, final @Nullable ItemStack item) {
 				e.setBoots(item);
 			}
+		},
+
+		BODY() {
+			@Override
+			public @Nullable ItemStack get(EntityEquipment equipment) {
+				return equipment.getItem(org.bukkit.inventory.EquipmentSlot.BODY);
+			}
+
+			@Override
+			public void set(EntityEquipment equipment, @Nullable ItemStack item) {
+				equipment.setItem(org.bukkit.inventory.EquipmentSlot.BODY, item);
+			}
 		};
 
 		public final int slotNumber;

src/test/skript/tests/syntaxes/expressions/ExprArmorSlot.sk

@@ -12,3 +12,21 @@ test "armour slot":
 		clear armour of event-entity
 		assert armour of event-entity does not contain dirt block, diamond chestplate, iron leggings and gold boots with "Failed to clear EquipmentSlots"
 		delete event-entity
+
+test "body armor wolf" when running minecraft "1.20.5":
+	spawn wolf at spawn of world "world":
+		set {_entity} to event-entity
+
+	set body armor of {_entity} to wolf armor
+	assert body armor of {_entity} is wolf armor with "Body armor of entity is not wolf armor"
+	clear body armor of {_entity}
+	assert body armor of {_entity} is air with "Body armor of entity did not get cleared"
+	clear entity within {_entity}
+
+test "invalid body armor":
+	loop a zombie, a skeleton, a zombie horse and a skeleton horse:
+		spawn loop-value at spawn of world "world":
+			assert (body armor of event-entity) is not set with "Entity body armor is accessible"
+			set body armor of event-entity to diamond armor
+			assert (body armor of event-entity) is not set with "Entity body armor is accessible"
+			clear event-entity