Merge branch 'dev/feature' into dev/ExprCenterLocations

Author: erenkarakal

src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java

@@ -4,6 +4,7 @@
 import ch.njol.skript.aliases.ItemType;
 import ch.njol.skript.bukkitutil.InventoryUtils;
 import ch.njol.skript.command.CommandEvent;
+import ch.njol.skript.entity.EntityData;
 import ch.njol.skript.events.bukkit.ScriptEvent;
 import ch.njol.skript.events.bukkit.SkriptStartEvent;
 import ch.njol.skript.events.bukkit.SkriptStopEvent;
@@ -170,6 +171,8 @@ public final class BukkitEventValues {
 			"Use 'attacker' and/or 'victim' in damage/death events", EntityDamageEvent.class, EntityDeathEvent.class);
 		EventValues.registerEventValue(EntityEvent.class, World.class, event -> event.getEntity().getWorld());
 		EventValues.registerEventValue(EntityEvent.class, Location.class, event -> event.getEntity().getLocation());
+		EventValues.registerEventValue(EntityEvent.class, EntityData.class, event -> EntityData.fromEntity(event.getEntity()),
+			TIME_NOW, "Use 'type of attacker/victim' in damage/death events.", EntityDamageEvent.class, EntityDeathEvent.class);
 		// EntityDamageEvent
 		EventValues.registerEventValue(EntityDamageEvent.class, DamageCause.class, EntityDamageEvent::getCause);
 		EventValues.registerEventValue(EntityDamageByEntityEvent.class, Projectile.class, event -> {

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

@@ -0,0 +1,34 @@
+package ch.njol.skript.conditions;
+
+import ch.njol.skript.conditions.base.PropertyCondition;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Example;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.Since;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Strider;
+
+@Name("Strider Is Shivering")
+@Description("Whether a strider is shivering.")
+@Example("""
+	if last spawned strider is shivering:
+		make last spawned strider stop shivering
+	""")
+@Since("INSERT VERSION")
+public class CondStriderIsShivering extends PropertyCondition<LivingEntity> {
+
+	static {
+		register(CondStriderIsShivering.class, "shivering", "livingentities");
+	}
+
+	@Override
+	public boolean check(LivingEntity entity) {
+		return entity instanceof Strider strider && strider.isShivering();
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "shivering";
+	}
+
+}

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

@@ -1,75 +1,70 @@
 package ch.njol.skript.effects;
 
-import org.bukkit.entity.Entity;
-import org.bukkit.event.Event;
-import org.bukkit.util.Vector;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.doc.Description;
-import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Example;
 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.skript.util.Direction;
 import ch.njol.util.Kleenean;
+import org.bukkit.entity.Entity;
+import org.bukkit.event.Event;
+import org.bukkit.util.Vector;
+import org.jetbrains.annotations.Nullable;
 
-/**
- * @author Peter Güttinger
- */
 @Name("Push")
 @Description("Push entities around.")
-@Examples({"push the player upwards",
-		"push the victim downwards at speed 0.5"})
+@Example("push the player upwards")
+@Example("push the victim downwards at speed 0.5")
+@Example("push player along vector from player to player's target at speed 2")
 @Since("1.4.6")
 public class EffPush extends Effect {
+
 	static {
-		Skript.registerEffect(EffPush.class, "(push|thrust) %entities% %direction% [(at|with) (speed|velocity|force) %-number%]");
+		Skript.registerEffect(EffPush.class, "(push|thrust) %entities% [along] %direction% [(at|with) (speed|velocity|force) %-number%]");
 	}
-	
-	@SuppressWarnings("null")
+
 	private Expression<Entity> entities;
-	@SuppressWarnings("null")
 	private Expression<Direction> direction;
-	@Nullable
-	private Expression<Number> speed = null;
+	private @Nullable Expression<Number> speed = null;
 
 	@SuppressWarnings({"unchecked", "null"})
 	@Override
-	public boolean init(final Expression<?>[] exprs, final int matchedPattern, final Kleenean isDelayed, final ParseResult parseResult) {
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
 		entities = (Expression<Entity>) exprs[0];
 		direction = (Expression<Direction>) exprs[1];
 		speed = (Expression<Number>) exprs[2];
 		return true;
 	}
 
 	@Override
-	protected void execute(final Event e) {
-		final Direction d = direction.getSingle(e);
-		if (d == null)
+	protected void execute(Event event) {
+		Direction direction = this.direction.getSingle(event);
+		if (direction == null)
 			return;
-		final Number v = speed != null ? speed.getSingle(e) : null;
-		if (speed != null && v == null)
+		Number speed = this.speed != null ? this.speed.getSingle(event) : null;
+		if (this.speed != null && speed == null)
 			return;
-		final Entity[] ents = entities.getArray(e);
-		for (final Entity en : ents) {
-			assert en != null;
-			final Vector mod = d.getDirection(en);
-			if (v != null)
-				mod.normalize().multiply(v.doubleValue());
-			if (!(Double.isFinite(mod.getX()) && Double.isFinite(mod.getY()) && Double.isFinite(mod.getZ()))) {
+		Entity[] entities = this.entities.getArray(event);
+		for (Entity entity : entities) {
+			Vector pushDirection = direction.getDirection(entity);
+			if (speed != null)
+				pushDirection.normalize().multiply(speed.doubleValue());
+			if (!(Double.isFinite(pushDirection.getX()) && Double.isFinite(pushDirection.getY()) && Double.isFinite(pushDirection.getZ()))) {
 				// Some component of the mod vector is not finite, so just stop
 				return;
 			}
-			en.setVelocity(en.getVelocity().add(mod)); // REMIND add NoCheatPlus exception to players
+			entity.setVelocity(entity.getVelocity().add(pushDirection));
 		}
 	}
 
 	@Override
-	public String toString(final @Nullable Event e, final boolean debug) {
-		return "push " + entities.toString(e, debug) + " " + direction.toString(e, debug) + (speed != null ? " at speed " + speed.toString(e, debug) : "");
+	public String toString(@Nullable Event event, boolean debug) {
+		return "push " + entities.toString(event, debug) + " " + direction.toString(event, debug) +
+				(speed != null ? " at speed " + speed.toString(event, debug) : "");
 	}
 
 }

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

@@ -0,0 +1,67 @@
+package ch.njol.skript.effects;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Example;
+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.skript.lang.SyntaxStringBuilder;
+import ch.njol.util.Kleenean;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Strider;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Strider Shivering")
+@Description("Make a strider start/stop shivering.")
+@Example("""
+	if last spawned strider is shivering:
+		make last spawned strider stop shivering
+	""")
+@Since("INSERT VERSION")
+public class EffStriderShivering extends Effect {
+
+	static {
+		Skript.registerEffect(EffStriderShivering.class,
+			"make %livingentities% start shivering",
+			"force %livingentities% to start shivering",
+			"make %livingentities% stop shivering",
+			"force %livingentities% to stop shivering");
+	}
+
+	private Expression<LivingEntity> entities;
+	private boolean start;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		//noinspection unchecked
+		entities = (Expression<LivingEntity>) exprs[0];
+		start = matchedPattern <= 1;
+		return true;
+	}
+
+	@Override
+	protected void execute(Event event) {
+		for (LivingEntity entity : entities.getArray(event)) {
+			if (entity instanceof Strider strider) {
+				strider.setShivering(start);
+			}
+		}
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		SyntaxStringBuilder builder = new SyntaxStringBuilder(event, debug);
+		builder.append("make", entities);
+		if (start) {
+			builder.append("start");
+		} else {
+			builder.append("stop");
+		}
+		builder.append("shivering");
+		return builder.toString();
+	}
+}

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

@@ -0,0 +1,85 @@
+package ch.njol.skript.entity;
+
+import ch.njol.skript.lang.Literal;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.entity.Strider;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+
+public class StriderData extends EntityData<Strider> {
+
+	static {
+		register(StriderData.class, "strider", Strider.class, 1,
+			"warm strider", "strider", "shivering strider");
+	}
+
+	private Kleenean shivering = Kleenean.UNKNOWN;
+
+	public StriderData() {}
+
+	public StriderData(Kleenean shivering) {
+		this.shivering = shivering;
+	}
+
+	@Override
+	protected boolean init(Literal<?>[] exprs, int matchedPattern, ParseResult parseResult) {
+		shivering = Kleenean.get(matchedPattern - 1);
+		return true;
+	}
+
+	@Override
+	protected boolean init(@Nullable Class<? extends Strider> entityClass, @Nullable Strider entity) {
+		shivering = Kleenean.get(entity == null ? 0 : (entity.isShivering() ? 1 : -1));
+		return true;
+	}
+
+	@Override
+	public void set(Strider entity) {
+		entity.setShivering(shivering.isTrue());
+	}
+
+	@Override
+	protected boolean match(Strider entity) {
+		return shivering.isUnknown() || (this.shivering.isTrue() == entity.isShivering());
+	}
+
+	@Override
+	public boolean isSupertypeOf(EntityData<?> entityData) {
+		return entityData instanceof StriderData striderData
+			&& (this.shivering.isUnknown() || striderData.shivering.is(shivering).isTrue());
+	}
+
+	@Override
+	public Class<? extends Strider> getType() {
+		return Strider.class;
+	}
+
+	@Override
+	public EntityData<? super Strider> getSuperType() {
+		return new StriderData(shivering);
+	}
+
+	@Override
+	protected int hashCode_i() {
+		return Objects.hash(shivering);
+	}
+
+	@Override
+	protected boolean equals_i(EntityData<?> entityData) {
+		return entityData instanceof StriderData striderData
+			&& striderData.shivering == this.shivering;
+	}
+
+	@Override
+	public String toString(int flags) {
+		StringBuilder builder = new StringBuilder();
+		switch (shivering) {
+			case TRUE -> builder.append("shivering ");
+			case FALSE -> builder.append("warm ");
+		};
+		return builder.append("strider").toString();
+	}
+
+}

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

@@ -0,0 +1,59 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Example;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.Since;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Last Caught Errors")
+@Description("Gets the last caught runtime errors from a 'catch runtime errors' section.")
+@Example("""
+	catch runtime errors:
+		set worldborder center of {_border} to location(0, 0, NaN value)
+	if last caught runtime errors contains "Your location can't have a NaN value as one of its components":
+		set worldborder center of {_border} to location(0, 0, 0)
+	""")
+@Since("INSERT VERSION")
+public class ExprCaughtErrors extends SimpleExpression<String> {
+
+	static {
+		Skript.registerExpression(ExprCaughtErrors.class, String.class, ExpressionType.SIMPLE,
+			"[the] last caught [run[ ]time] errors");
+	}
+
+	public static String[] lastErrors;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		return true;
+	}
+
+	@Override
+	protected String @Nullable [] get(Event event) {
+		return lastErrors;
+	}
+
+	@Override
+	public boolean isSingle() {
+		return false;
+	}
+
+	@Override
+	public Class<? extends String> getReturnType() {
+		return String.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "last caught runtime errors";
+	}
+
+}