Add ominous item spawner to entity_spec()

Author: PseudoKnight

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

@@ -0,0 +1,45 @@
+package com.laytonsmith.abstraction.bukkit.entities;
+
+import com.laytonsmith.abstraction.MCItemStack;
+import com.laytonsmith.abstraction.bukkit.BukkitMCItemStack;
+import com.laytonsmith.abstraction.entities.MCOminousItemSpawner;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.OminousItemSpawner;
+import org.bukkit.inventory.ItemStack;
+
+public class BukkitMCOminousItemSpawner extends BukkitMCEntity implements MCOminousItemSpawner {
+
+	OminousItemSpawner spawner;
+
+	public BukkitMCOminousItemSpawner(Entity e) {
+		super(e);
+		this.spawner = (OminousItemSpawner) e;
+	}
+
+	@Override
+	public MCItemStack getItem() {
+		if(this.spawner.getItem() == null) {
+			return null;
+		}
+		return new BukkitMCItemStack(this.spawner.getItem());
+	}
+
+	@Override
+	public void setItem(MCItemStack item) {
+		if(item == null) {
+			this.spawner.setItem(null);
+		} else {
+			this.spawner.setItem((ItemStack) item.getHandle());
+		}
+	}
+
+	@Override
+	public long getDelay() {
+		return this.spawner.getSpawnItemAfterTicks();
+	}
+
+	@Override
+	public void setDelay(long delay) {
+		this.spawner.setSpawnItemAfterTicks(delay);
+	}
+}

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

@@ -0,0 +1,15 @@
+package com.laytonsmith.abstraction.entities;
+
+import com.laytonsmith.abstraction.MCEntity;
+import com.laytonsmith.abstraction.MCItemStack;
+
+public interface MCOminousItemSpawner extends MCEntity {
+
+	MCItemStack getItem();
+
+	void setItem(MCItemStack item);
+
+	long getDelay();
+
+	void setDelay(long delay);
+}

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

@@ -68,6 +68,7 @@
 import com.laytonsmith.abstraction.entities.MCLlama.MCLlamaColor;
 import com.laytonsmith.abstraction.entities.MCMinecart;
 import com.laytonsmith.abstraction.entities.MCMushroomCow;
+import com.laytonsmith.abstraction.entities.MCOminousItemSpawner;
 import com.laytonsmith.abstraction.entities.MCPainting;
 import com.laytonsmith.abstraction.entities.MCPanda;
 import com.laytonsmith.abstraction.entities.MCParrot;
@@ -2168,6 +2169,11 @@ public Mixed exec(Target t, Environment environment, Mixed... args) throws Confi
 					MCMushroomCow cow = (MCMushroomCow) entity;
 					specArray.set(entity_spec.KEY_MUSHROOM_COW_TYPE, cow.getVariant().name(), t);
 					break;
+				case OMINOUS_ITEM_SPAWNER:
+					MCOminousItemSpawner spawner = (MCOminousItemSpawner) entity;
+					specArray.set(entity_spec.KEY_OMINOUS_SPAWNER_ITEM, ObjectGenerator.GetGenerator().item(spawner.getItem(), t), t);
+					specArray.set(entity_spec.KEY_OMINOUS_SPAWNER_DELAY, new CInt(spawner.getDelay(), t), t);
+					break;
 				case PAINTING:
 					MCPainting painting = (MCPainting) entity;
 					specArray.set(entity_spec.KEY_PAINTING_ART, new CString(painting.getArt().name(), t), t);
@@ -2462,6 +2468,8 @@ public MSVersion since() {
 		private static final String KEY_MINECART_COMMAND_COMMAND = "command";
 		private static final String KEY_MINECART_COMMAND_CUSTOMNAME = "customname";
 		private static final String KEY_MUSHROOM_COW_TYPE = "type";
+		private static final String KEY_OMINOUS_SPAWNER_ITEM = "item";
+		private static final String KEY_OMINOUS_SPAWNER_DELAY = "delay";
 		private static final String KEY_PAINTING_ART = "type";
 		private static final String KEY_PANDA_MAINGENE = "maingene";
 		private static final String KEY_PANDA_HIDDENGENE = "hiddengene";
@@ -3460,6 +3468,21 @@ public Mixed exec(Target t, Environment environment, Mixed... args) throws Confi
 						}
 					}
 					break;
+				case OMINOUS_ITEM_SPAWNER:
+					MCOminousItemSpawner spawner = (MCOminousItemSpawner) entity;
+					for(String index : specArray.stringKeySet()) {
+						switch(index.toLowerCase()) {
+							case entity_spec.KEY_OMINOUS_SPAWNER_ITEM:
+								spawner.setItem(ObjectGenerator.GetGenerator().item(specArray.get(index, t), t));
+								break;
+							case entity_spec.KEY_OMINOUS_SPAWNER_DELAY:
+								spawner.setDelay(ArgumentValidation.getInt(specArray.get(index, t), t));
+								break;
+							default:
+								throwException(index, t);
+						}
+					}
+					break;
 				case PAINTING:
 					MCPainting painting = (MCPainting) entity;
 					for(String index : specArray.stringKeySet()) {

src/main/resources/functionDocs/entity_spec

@@ -215,6 +215,11 @@ without knowing the rotations on the other axis or of other body parts beforehan
 | 
 * %KEY_MUSHROOM_COW_TYPE%: The type of mushroom cow. (can be %MUSHROOM_COW_TYPE%).
 |-
+| OMINOUS_ITEM_SPAWNER
+|
+* %KEY_OMINOUS_SPAWNER_ITEM%: The item that will be shown and then spawned after a delay (can be null). If the item is a projectile type, it will be shot as one downwards.
+* %KEY_OMINOUS_SPAWNER_DELAY%: The number of ticks before the item will be spawned. (will play "about_to_spawn_item" sound at 37 ticks)
+|-
 | PAINTING
 | 
 * %KEY_PAINTING_ART%: The art on the painting (can be %ART%).