Firework effect section

src/main/java/ch/njol/skript/entity/EntityData.java

@@ -40,6 +40,7 @@
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.ApiStatus.ScheduledForRemoval;
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.SkriptAPIException;
@@ -674,8 +675,14 @@ protected boolean deserialize(final String s) {
 		return false;
 	}
 
-	@SuppressWarnings({"unchecked", "deprecation"})
-	protected static <E extends Entity> @Nullable E spawn(Location location, Class<E> type, Consumer<E> consumer) {
+	/**
+	 * Utility method to handle Bukkit changing from org.bukkit.util.Consumer to java Consumer.
+	 * Subject to removal in the future, when some older versions get dropped.
+	 */
+	@Deprecated
+	@ScheduledForRemoval
+	@SuppressWarnings("unchecked")
+	public static <E extends Entity> @Nullable E spawn(Location location, Class<E> type, Consumer<E> consumer) {
 		World world = location.getWorld();
 		if (world == null)
 			return null;

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

@@ -20,9 +20,6 @@
 
 import java.lang.reflect.Array;
 
-import ch.njol.skript.effects.EffFireworkLaunch;
-import ch.njol.skript.sections.EffSecSpawn;
-import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Firework;
 import org.bukkit.entity.Item;
@@ -44,12 +41,18 @@
 import ch.njol.skript.lang.Literal;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.skript.sections.EffSecFireworkLaunch;
+import ch.njol.skript.sections.EffSecSpawn;
 import ch.njol.util.Kleenean;
 
 @Name("Last Spawned Entity")
-@Description("Holds the entity that was spawned most recently with the spawn effect (section), dropped with the <a href='../effects/#EffDrop'>drop effect</a>, shot with the <a href='../effects/#EffShoot'>shoot effect</a> or created with the <a href='../effects/#EffLightning'>lightning effect</a>. " +
-		"Please note that even though you can spawn multiple mobs simultaneously (e.g. with 'spawn 5 creepers'), only the last spawned mob is saved and can be used. " +
-		"If you spawn an entity, shoot a projectile and drop an item you can however access all them together.")
+@Description({
+	"Holds the entity that was spawned most recently with the spawn effect (section), dropped with the <a href='../effects/#EffDrop'>drop effect</a>,",
+	"shot with the <a href='../effects/#EffShoot'>shoot effect</a>, launched firework <a href='../sections/#EffSecFireworkLaunch'>firework launch effect section</a>,",
+	"or created with the <a href='../effects/#EffLightning'>lightning effect</a>.",
+	"Please note that even though you can spawn multiple mobs simultaneously (e.g. with 'spawn 5 creepers'), only the last spawned mob is saved and can be used.",
+	"If you spawn an entity, shoot a projectile and drop an item you can however access all them together."
+})
 @Examples({
 	"spawn a priest",
 	"set {healer::%spawned priest%} to true",
@@ -62,16 +65,15 @@
 })
 @Since("1.3 (spawned entity), 2.0 (shot entity), 2.2-dev26 (dropped item), 2.7 (struck lightning, firework)")
 public class ExprLastSpawnedEntity extends SimpleExpression<Entity> {
-	
+
 	static {
 		Skript.registerExpression(ExprLastSpawnedEntity.class, Entity.class, ExpressionType.SIMPLE,
-			"[the] [last[ly]] (0:spawned|1:shot) %*entitydata%",
-			"[the] [last[ly]] dropped (2:item)",
-			"[the] [last[ly]] (created|struck) (3:lightning)",
-			"[the] [last[ly]] (launched|deployed) (4:firework)");
+				"[the] [last[ly]] (0:spawned|1:shot) %*entitydata%",
+				"[the] [last[ly]] dropped (2:item)",
+				"[the] [last[ly]] (created|struck) (3:lightning)",
+				"[the] [last[ly]] (launched|deployed) (4:firework)");
 	}
-
-	@SuppressWarnings("NotNullFieldNotInitialized")
+
 	private EntityData<?> type;
 	private int from;
 
@@ -90,51 +92,51 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 		}
 		return true;
 	}
-	
+
 	@Override
 	@Nullable
 	protected Entity[] get(Event event) {
-		Entity en;
+		Entity entity;
 		switch (from) {
 			case 0:
-				en = EffSecSpawn.lastSpawned;
+				entity = EffSecSpawn.lastSpawned;
 				break;
 			case 1:
-				en = EffShoot.lastSpawned;
+				entity = EffShoot.lastSpawned;
 				break;
 			case 2:
-				en = EffDrop.lastSpawned;
+				entity = EffDrop.lastSpawned;
 				break;
 			case 3:
-				en = EffLightning.lastSpawned;
+				entity = EffLightning.lastSpawned;
 				break;
 			case 4:
-				en = EffFireworkLaunch.lastSpawned;
+				entity = EffSecFireworkLaunch.lastSpawned;
 				break;
 			default:
-				en = null;
+				entity = null;
 		}
 
-		if (en == null)
+		if (entity == null)
 			return null;
-		if (!type.isInstance(en))
+		if (!type.isInstance(entity))
 			return null;
 
 		Entity[] one = (Entity[]) Array.newInstance(type.getType(), 1);
-		one[0] = en;
+		one[0] = entity;
 		return one;
 	}
-	
+
 	@Override
 	public boolean isSingle() {
 		return true;
 	}
-	
+
 	@Override
 	public Class<? extends Entity> getReturnType() {
 		return type.getType();
 	}
-	
+
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
 		String word = "";
@@ -157,7 +159,7 @@ public String toString(@Nullable Event event, boolean debug) {
 			default:
 				assert false;
 		}
-		return "the last " + word + " " + type;
+		return "last " + word + " " + type;
 	}
-	
+
 }