Add salmon type to entity_spec

Author: PseudoKnight

src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCSalmon.java

@@ -0,0 +1,25 @@
+package com.laytonsmith.abstraction.bukkit.entities;
+
+import com.laytonsmith.abstraction.entities.MCSalmon;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Salmon;
+
+public class BukkitMCSalmon extends BukkitMCLivingEntity implements MCSalmon {
+
+	Salmon entity;
+
+	public BukkitMCSalmon(Entity be) {
+		super(be);
+		this.entity = (Salmon) be;
+	}
+
+	@Override
+	public Variant getVariant() {
+		return Variant.valueOf(this.entity.getVariant().name());
+	}
+
+	@Override
+	public void setVariant(Variant size) {
+		this.entity.setVariant(Salmon.Variant.valueOf(size.name()));
+	}
+}

src/main/java/com/laytonsmith/abstraction/entities/MCSalmon.java

@@ -0,0 +1,16 @@
+package com.laytonsmith.abstraction.entities;
+
+import com.laytonsmith.abstraction.MCLivingEntity;
+
+public interface MCSalmon extends MCLivingEntity {
+
+	Variant getVariant();
+	void setVariant(Variant size);
+
+	enum Variant {
+		SMALL,
+		MEDIUM,
+		LARGE
+	}
+
+}

src/main/java/com/laytonsmith/core/functions/EntityManagement.java

@@ -80,6 +80,7 @@
 import com.laytonsmith.abstraction.entities.MCProjectile;
 import com.laytonsmith.abstraction.entities.MCPufferfish;
 import com.laytonsmith.abstraction.entities.MCRabbit;
+import com.laytonsmith.abstraction.entities.MCSalmon;
 import com.laytonsmith.abstraction.entities.MCSheep;
 import com.laytonsmith.abstraction.entities.MCShulker;
 import com.laytonsmith.abstraction.entities.MCShulkerBullet;
@@ -2258,6 +2259,12 @@ public Mixed exec(Target t, Environment environment, Mixed... args) throws Confi
 					MCRabbit rabbit = (MCRabbit) entity;
 					specArray.set(entity_spec.KEY_RABBIT_TYPE, new CString(rabbit.getRabbitType().name(), t), t);
 					break;
+				case SALMON:
+					MCSalmon salmon = (MCSalmon) entity;
+					if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_21_3)) {
+						specArray.set(entity_spec.KEY_SALMON_TYPE, new CString(salmon.getVariant().name(), t), t);
+					}
+					break;
 				case SHEEP:
 					MCSheep sheep = (MCSheep) entity;
 					specArray.set(entity_spec.KEY_SHEEP_COLOR, new CString(sheep.getColor().name(), t), t);
@@ -2525,6 +2532,7 @@ public MSVersion since() {
 		private static final String KEY_RABBIT_TYPE = "type";
 		private static final String KEY_PRIMED_TNT_FUSETICKS = "fuseticks";
 		private static final String KEY_PRIMED_TNT_SOURCE = "source";
+		private static final String KEY_SALMON_TYPE = "type";
 		private static final String KEY_SHEEP_COLOR = "color";
 		private static final String KEY_SHEEP_SHEARED = "sheared";
 		private static final String KEY_SHULKER_COLOR = "color";
@@ -3695,6 +3703,24 @@ public Mixed exec(Target t, Environment environment, Mixed... args) throws Confi
 						}
 					}
 					break;
+				case SALMON:
+					MCSalmon salmon = (MCSalmon) entity;
+					for(String index : specArray.stringKeySet()) {
+						switch(index.toLowerCase()) {
+							case entity_spec.KEY_SALMON_TYPE:
+								if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_21_3)) {
+									try {
+										salmon.setVariant(MCSalmon.Variant.valueOf(specArray.get(index, t).val()));
+									} catch (IllegalArgumentException exception) {
+										throw new CREFormatException("Invalid salmon type: " + specArray.get(index, t).val(), t);
+									}
+								}
+								break;
+							default:
+								throwException(index, t);
+						}
+					}
+					break;
 				case SHEEP:
 					MCSheep sheep = (MCSheep) entity;
 					for(String index : specArray.stringKeySet()) {

src/main/resources/functionDocs/entity_spec

@@ -268,6 +268,10 @@ without knowing the rotations on the other axis or of other body parts beforehan
 |
 * %KEY_RABBIT_TYPE%: The type of the rabbit (can be %RABBIT_TYPE%).
 |-
+| SALMON
+|
+* %KEY_SALMON_TYPE%: The size type of salmon. Must be one of the sizes: SMALL, MEDIUM, or LARGE. (MC 1.21.3+)
+|-
 | SHEEP
 | 
 * %KEY_SHEEP_COLOR%: The color of the sheep (can be %DYE_COLOR%).
@@ -290,7 +294,7 @@ without knowing the rotations on the other axis or of other body parts beforehan
 |-
 | SLIME
 | 
-* %KEY_SLIME_SIZE%: The size of the slime.
+* %KEY_SLIME_SIZE%: The size of the slime. Must be an integer (0 - 126) where 0 is small, 1 is medium, and 3 is large.
 |-
 | SNOWMAN
 |