Add arrow particle color to entity_spec

Author: PseudoKnight

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

@@ -1,15 +1,18 @@
 package com.laytonsmith.abstraction.bukkit.entities;
 
 import com.laytonsmith.PureUtilities.Common.ReflectionUtils;
+import com.laytonsmith.abstraction.MCColor;
 import com.laytonsmith.abstraction.MCLivingEntity;
 import com.laytonsmith.abstraction.MCPotionData;
+import com.laytonsmith.abstraction.bukkit.BukkitMCColor;
 import com.laytonsmith.abstraction.bukkit.BukkitMCPotionData;
 import com.laytonsmith.abstraction.entities.MCArrow;
 import com.laytonsmith.abstraction.enums.MCPotionType;
 import com.laytonsmith.abstraction.enums.MCVersion;
 import com.laytonsmith.abstraction.enums.bukkit.BukkitMCPotionEffectType;
 import com.laytonsmith.abstraction.enums.bukkit.BukkitMCPotionType;
 import com.laytonsmith.core.Static;
+import org.bukkit.Color;
 import org.bukkit.entity.AbstractArrow;
 import org.bukkit.entity.Arrow;
 import org.bukkit.entity.Entity;
@@ -137,4 +140,22 @@ public MCArrow.PickupStatus getPickupStatus() {
 	public void setPickupStatus(MCArrow.PickupStatus status) {
 		arrow.setPickupStatus(AbstractArrow.PickupStatus.valueOf(status.name()));
 	}
+
+	@Override
+	public MCColor getColor() {
+		Color c = arrow.getColor();
+		if(c == null) {
+			return null;
+		}
+		return BukkitMCColor.GetMCColor(c);
+	}
+
+	@Override
+	public void setColor(MCColor color) {
+		if(color == null) {
+			arrow.setColor(null);
+		} else {
+			arrow.setColor(BukkitMCColor.GetColor(color));
+		}
+	}
 }

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

@@ -1,5 +1,6 @@
 package com.laytonsmith.abstraction.entities;
 
+import com.laytonsmith.abstraction.MCColor;
 import com.laytonsmith.abstraction.MCLivingEntity;
 import com.laytonsmith.abstraction.MCPotionData;
 import com.laytonsmith.abstraction.enums.MCPotionType;
@@ -42,6 +43,10 @@ public interface MCArrow extends MCProjectile {
 
 	void setPickupStatus(PickupStatus status);
 
+	MCColor getColor();
+
+	void setColor(MCColor color);
+
 	enum PickupStatus {
 		ALLOWED,
 		DISALLOWED,

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

@@ -1942,7 +1942,13 @@ public Mixed exec(Target t, Environment environment, Mixed... args) throws Confi
 					} else {
 						tippedmeta.set("base", ObjectGenerator.GetGenerator().potionData(arrow.getBasePotionData(), t), t);
 					}
-					specArray.set(entity_spec.KEY_TIPPEDARROW_POTIONMETA, tippedmeta, t);
+					specArray.set(entity_spec.KEY_ARROW_POTIONMETA, tippedmeta, t);
+					MCColor arrowColor = arrow.getColor();
+					if(arrowColor == null) {
+						specArray.set(entity_spec.KEY_ARROW_COLOR, CNull.NULL, t);
+					} else {
+						specArray.set(entity_spec.KEY_ARROW_COLOR, ObjectGenerator.GetGenerator().color(arrowColor, t), t);
+					}
 					break;
 				case ARMOR_STAND:
 					MCArmorStand stand = (MCArmorStand) entity;
@@ -2433,6 +2439,8 @@ public MSVersion since() {
 		private static final String KEY_ARROW_DAMAGE = "damage";
 		private static final String KEY_ARROW_PIERCE_LEVEL = "piercelevel";
 		private static final String KEY_ARROW_PICKUP = "pickup";
+		private static final String KEY_ARROW_POTIONMETA = "potionmeta";
+		private static final String KEY_ARROW_COLOR = "color";
 		private static final String KEY_ARMORSTAND_ARMS = "arms";
 		private static final String KEY_ARMORSTAND_BASEPLATE = "baseplate";
 		private static final String KEY_ARMORSTAND_GRAVITY = "gravity";
@@ -2542,7 +2550,6 @@ public MSVersion since() {
 		private static final String KEY_SPECTRAL_ARROW_GLOWING_TICKS = "glowingticks";
 		private static final String KEY_SPLASH_POTION_ITEM = "item";
 		private static final String KEY_STEERABLE_SADDLED = "saddled";
-		private static final String KEY_TIPPEDARROW_POTIONMETA = "potionmeta";
 		private static final String KEY_TROPICALFISH_COLOR = "color";
 		private static final String KEY_TROPICALFISH_PATTERN = "pattern";
 		private static final String KEY_TROPICALFISH_PATTERNCOLOR = "patterncolor";
@@ -2747,7 +2754,7 @@ public Mixed exec(Target t, Environment environment, Mixed... args) throws Confi
 											+ specArray.get(index, t).val(), t);
 								}
 								break;
-							case entity_spec.KEY_TIPPEDARROW_POTIONMETA:
+							case entity_spec.KEY_ARROW_POTIONMETA:
 								Mixed c = specArray.get(index, t);
 								if(c.isInstanceOf(CArray.TYPE)) {
 									CArray meta = (CArray) c;
@@ -2782,7 +2789,18 @@ public Mixed exec(Target t, Environment environment, Mixed... args) throws Confi
 										}
 									}
 								} else {
-									throw new CRECastException("TippedArrow potion meta must be an array", t);
+									throw new CRECastException("Arrow potion meta must be an array", t);
+								}
+								break;
+							case entity_spec.KEY_ARROW_COLOR:
+								Mixed colorMixed = specArray.get(index, t);
+								if(colorMixed instanceof CNull) {
+									arrow.setColor(null);
+								} else if(colorMixed.isInstanceOf(CArray.TYPE)) {
+									CArray color = (CArray) colorMixed;
+									arrow.setColor(ObjectGenerator.GetGenerator().color(color, t));
+								} else {
+									throw new CRECastException("Arrow color must be an array", t);
 								}
 								break;
 							default:

src/main/resources/functionDocs/entity_spec

@@ -27,7 +27,8 @@ Can also accept a particle array for specific particle data. See spawn_particle(
 * %KEY_ARROW_DAMAGE%: The amount of damage. (double)
 * %KEY_ARROW_PIERCE_LEVEL%: The remaining times that this arrow can pierce through an entity. (int from 0 and 127)
 * %KEY_ARROW_PICKUP%: Whether picking up this arrow is ALLOWED, DISALLOWED, or CREATIVE_ONLY.
-* %KEY_TIPPEDARROW_POTIONMETA%: An associative array of potion item meta for a tipped arrow.
+* %KEY_ARROW_POTIONMETA%: An associative array of potion item meta for a tipped arrow.
+* %KEY_ARROW_COLOR%: Overrides the color of the arrow potion particles. Must be a color array or null.
 |-
 | ARMOR_STAND
 |