Adding entity expressions & conditions

src/main/java/ch/njol/skript/conditions/CondFromMobSpawner.java

@@ -0,0 +1,45 @@
+package ch.njol.skript.conditions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.conditions.base.PropertyCondition;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.entity.Entity;
+
+@Name("Is From A Mob Spawner")
+@Description("Checks if an entity was spawned from a mob spawner.")
+@Examples("send whether target is from a mob spawner")
+@RequiredPlugins("PaperMC")
+@Since("INSERT VERSION")
+public class CondFromMobSpawner extends PropertyCondition<Entity> {
+
+	static {
+		if (Skript.methodExists(Entity.class, "fromMobSpawner"))
+			Skript.registerCondition(CondFromMobSpawner.class,
+				"%entities% (is|are) from a [mob] spawner",
+				"%entities% (isn't|aren't|is not|are not) from a [mob] spawner",
+				"%entities% (was|were) spawned (from|by) a [mob] spawner",
+				"%entities% (wasn't|weren't|was not|were not) spawned (from|by) a [mob] spawner");
+	}
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		setNegated(matchedPattern == 1 || matchedPattern == 3);
+		setExpr((Expression<Entity>) exprs[0]);
+		return true;
+	}
+
+	@Override
+	public boolean check(Entity entity) {
+		return entity.fromMobSpawner();
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "from a mob spawner";
+	}
+
+}
+

src/main/java/ch/njol/skript/conditions/CondIsCustomNameVisible.java

@@ -0,0 +1,46 @@
+package ch.njol.skript.conditions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.conditions.base.PropertyCondition;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.Since;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.entity.Entity;
+
+@Name("Is Custom Name Visible")
+@Description("Checks if an entity's custom name is visible.")
+@Examples("send true if target's custom name is visible")
+@Since("INSERT VERSION")
+public class CondIsCustomNameVisible extends PropertyCondition<Entity> {
+
+	static {
+		Skript.registerCondition(CondIsCustomNameVisible.class,
+			"%entities%'[s] custom name[s] (is|are) visible",
+			"%entities%'[s] custom name[s] (isn't|is not|are not|aren't) visible",
+			"custom name of %entities% (is|are) visible",
+			"custom name of %entities% (isn't|is not|are not|aren't) visible");
+	}
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		setNegated(matchedPattern == 1 || matchedPattern == 3);
+		setExpr((Expression<Entity>) exprs[0]);
+		return true;
+	}
+
+	@Override
+	public boolean check(Entity entity) {
+		return entity.isCustomNameVisible();
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "custom name";
+	}
+
+}
+

src/main/java/ch/njol/skript/conditions/CondIsTicking.java

@@ -0,0 +1,31 @@
+package ch.njol.skript.conditions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.conditions.base.PropertyCondition;
+import ch.njol.skript.doc.*;
+import org.bukkit.entity.Entity;
+
+@Name("Is Ticking")
+@Description("Checks if an entity is ticking.")
+@Examples("send true if target is ticking")
+@RequiredPlugins("PaperMC")
+@Since("INSERT VERSION")
+public class CondIsTicking extends PropertyCondition<Entity> {
+
+	static {
+		if (Skript.methodExists(Entity.class, "isTicking"))
+			register(CondIsTicking.class, "ticking", "entities");
+	}
+
+	@Override
+	public boolean check(Entity entity) {
+		return entity.isTicking();
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "ticking";
+	}
+
+}
+

src/main/java/ch/njol/skript/effects/EffCustomName.java

@@ -0,0 +1,53 @@
+package ch.njol.skript.effects;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.Since;
+import ch.njol.skript.lang.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.entity.Entity;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Toggle Custom Name Visibility")
+@Description("Toggles the custom name visibility of an entity.")
+@Examples({
+	"show the custom name of event-entity",
+	"hide target's display name"
+})
+@Since("INSERT VERSION")
+public class EffCustomName extends Effect {
+
+	static {
+		Skript.registerEffect(EffCustomName.class,
+			"(:show|hide) [the] (custom|display)[ ]name of %entities%",
+			"(:show|hide) %entities%'[s] (custom|display)[ ]name");
+	}
+
+	private boolean showCustomName;
+	private Expression<Entity> entities;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		showCustomName = parseResult.hasTag("show");
+		entities = (Expression<Entity>) exprs[0];
+		return true;
+	}
+
+	@Override
+	protected void execute(Event event) {
+		for (Entity entity : entities.getArray(event)) {
+			entity.setCustomNameVisible(showCustomName);
+		}
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return showCustomName ? "show" : "hide" + " the custom name of " + entities.toString(event, debug);
+	}
+
+}

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

@@ -24,32 +24,52 @@
 import ch.njol.skript.doc.Name;
 import ch.njol.skript.doc.Since;
 import ch.njol.skript.expressions.base.SimplePropertyExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.util.Timespan;
+import ch.njol.skript.util.Timespan.TimePeriod;
+import ch.njol.util.Kleenean;
 import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.entity.Entity;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
 
 @Name("Entity Fire Burn Duration")
 @Description("How much time an entity will be burning for.")
-@Examples({"send \"You will stop burning in %fire time of player%\""})
-@Since("2.7")
+@Examples({
+	"send \"You will stop burning in %fire time of player%\"",
+	"send the max burn time of target"
+})
+@Since("2.7, INSERT VERSION (maximum)")
 public class ExprFireTicks extends SimplePropertyExpression<Entity, Timespan> {
 
 	static {
-		register(ExprFireTicks.class, Timespan.class, "(burn[ing]|fire) (time|duration)", "entities");
+		register(ExprFireTicks.class, Timespan.class, "[:max[imum]] (burn[ing]|fire) (time|duration)", "entities");
+	}
+
+	private boolean max;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		max = (parseResult.hasTag("max"));
+		return true;
 	}
 
 	@Override
 	@Nullable
 	public Timespan convert(Entity entity) {
-		return Timespan.fromTicks(Math.max(entity.getFireTicks(), 0));
+		return new Timespan(TimePeriod.TICK, (max ? entity.getMaxFireTicks() : Math.max(entity.getFireTicks(), 0)));
 	}
 
 	@Override
 	@Nullable
 	public Class<?>[] acceptChange(ChangeMode mode) {
-		return (mode != ChangeMode.REMOVE_ALL) ? CollectionUtils.array(Timespan.class) :  null;
+		if (max)
+			return null;
+		return switch (mode) {
+			case ADD, SET, RESET, DELETE, REMOVE -> CollectionUtils.array(Timespan.class);
+			default -> null;
+		};
 	}
 
 	@Override

src/test/skript/tests/syntaxes/conditions/CondIsCustomNameVisible.sk

@@ -0,0 +1,20 @@
+test "custom name visibility":
+	spawn an adult zombie at (spawn of world "world"):
+		set {_z} to entity
+
+	assert {_z}'s custom name isn't visible with "A zombie shouldn't be spawned with a visible display name"
+
+	set {_z}'s display name to "aaa"
+
+	assert {_z}'s custom name is visible with "Setting an entity's display name sets the visibility to true"
+
+	hide {_z}'s custom name
+
+	assert {_z}'s custom name isn't visible with "New effect should hide the custom name"
+
+	show {_z}'s custom name
+
+	assert {_z}'s custom name is visible with "New effect should show the custom name"
+
+	delete entity within {_z}
+

src/test/skript/tests/syntaxes/conditions/CondIsTicking.sk

@@ -0,0 +1,14 @@
+test "is entity ticking":
+
+	spawn an adult zombie at location(512, 1, 512):
+		add entity to {_z::*}
+
+	spawn an adult zombie at (spawn of world "world"):
+		add entity to {_z::*}
+
+	assert {_z::1} isn't ticking with "Chunk isn't loaded, therefore should not tick"
+
+	assert {_z::2} is ticking with "Chunk is loaded, therefore should tick"
+
+	delete entities within {_z::*}
+