Syntax Simplification

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

@@ -13,6 +13,7 @@
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.util.Kleenean;
+import org.skriptlang.skript.lang.simplification.Simplifiable;
 
 @Name("Alphanumeric")
 @Description({"Checks if the given string is alphanumeric."})
@@ -42,7 +43,13 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 	public boolean check(Event e) {
 		return isNegated() ^ strings.check(e, StringUtils::isAlphanumeric);
 	}
-
+
+	@Override
+	public Condition simplify(Step step, @Nullable Simplifiable<?> source) {
+		strings = simplifyChild(strings, step, source);
+		return this;
+	}
+
 	@Override
 	public String toString(@Nullable Event e, boolean debug) {
 		return strings.toString(e, debug) + " is" + (isNegated() ? "n't" : "") + " alphanumeric";

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

@@ -13,6 +13,7 @@
 import org.bukkit.World;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.simplification.Simplifiable;
 
 @Name("Do Respawn Anchors Work")
 @Description("Checks whether or not respawn anchors work in a world.")
@@ -42,6 +43,12 @@ public boolean check(Event event) {
 		return worlds.check(event, World::isRespawnAnchorWorks, isNegated());
 	}
 
+	@Override
+	public Condition simplify(Step step, @Nullable Simplifiable<?> source) {
+		worlds = simplifyChild(worlds, step, source);
+		return this;
+	}
+
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
 		return "respawn anchors " + (isNegated() ? " do" : " don't") + " work in " + worlds.toString(event, debug);

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

@@ -19,6 +19,7 @@
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.log.ErrorQuality;
 import ch.njol.util.Kleenean;
+import org.skriptlang.skript.lang.simplification.Simplifiable;
 
 /**
  * @author Peter Güttinger
@@ -72,7 +73,14 @@ public boolean check(Event e) {
 							t -> t.getItem().addTo(buf));
 				}, isNegated());
 	}
-
+
+	@Override
+	public Condition simplify(Step step, @Nullable Simplifiable<?> source) {
+		invis = simplifyChild(invis, step, source);
+		items = simplifyChild(items, step, source);
+		return this;
+	}
+
 	@Override
 	public String toString(@Nullable Event e, boolean debug) {
 		return PropertyCondition.toString(this, PropertyType.CAN, e, debug, invis,

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

@@ -12,6 +12,7 @@
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.simplification.Simplifiable;
 
 @Name("Can See")
 @Description("Checks whether the given players can see the provided entities.")
@@ -61,6 +62,13 @@ public boolean check(Event event) {
 				), isNegated());
 	}
 
+	@Override
+	public Condition simplify(Step step, @Nullable Simplifiable<?> source) {
+		viewers = simplifyChild(viewers, step, source);
+		entities = simplifyChild(entities, step, source);
+		return this;
+	}
+
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
 		return PropertyCondition.toString(this, PropertyType.CAN, event, debug, viewers,

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

@@ -12,6 +12,7 @@
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.util.Kleenean;
+import org.skriptlang.skript.lang.simplification.Simplifiable;
 
 /**
  * @author Peter Güttinger
@@ -49,7 +50,13 @@ public boolean check(final Event e) {
 			return false;
 		return Math.random() < (percent ? n.doubleValue() / 100 : n.doubleValue());
 	}
-
+
+	@Override
+	public Condition simplify(Step step, @Nullable Simplifiable<?> source) {
+		chance = simplifyChild(chance, step, source);
+		return this;
+	}
+
 	@Override
 	public String toString(final @Nullable Event e, final boolean debug) {
 		return "chance of " + chance.toString(e, debug) + (percent ? "%" : "");

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

@@ -10,6 +10,7 @@
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.simplification.Simplifiable;
 
 @Name("Can See Messages")
 @Description("Checks whether a player can see specific message types in chat.")
@@ -68,6 +69,12 @@ public boolean check(Event event) {
 		};
 	}
 
+	@Override
+	public Condition simplify(Step step, @Nullable Simplifiable<?> source) {
+		player = simplifyChild(player, step, source);
+		return this;
+	}
+
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
 		return switch (pattern) {

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

@@ -30,6 +30,7 @@
 import ch.njol.skript.util.Patterns;
 import ch.njol.skript.util.Utils;
 import ch.njol.util.Kleenean;
+import org.skriptlang.skript.lang.simplification.Simplifiable;
 import org.skriptlang.skript.lang.util.Cyclical;
 
 import java.util.function.Predicate;
@@ -404,6 +405,14 @@ private boolean compareLists(Event event) {
 		return shouldMatch;
 	}
 
+	@Override
+	public Condition simplify(Step step, @Nullable Simplifiable<?> source) {
+		first = simplifyChild(first, step, source);
+		second = simplifyChild(second, step, source);
+		third = simplifyChild(third, step, source);
+		return this;
+	}
+
 	@Override
 	public String toString(final @Nullable Event event, final boolean debug) {
 		String s;

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

@@ -21,6 +21,7 @@
 import org.bukkit.inventory.ItemStack;
 import org.skriptlang.skript.lang.converter.Converters;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.simplification.Simplifiable;
 
 import java.util.Arrays;
 import java.util.Objects;
@@ -156,6 +157,13 @@ public boolean check(Event event) {
 		};
 	}
 
+	@Override
+	public Condition simplify(Step step, @Nullable Simplifiable<?> source) {
+		containers = simplifyChild(containers, step, source);
+		items = simplifyChild(items, step, source);
+		return this;
+	}
+
 	@Override
 	public String toString(@Nullable Event e, boolean debug) {
 		return containers.toString(e, debug) + (isNegated() ? " doesn't contain " : " contains ") + items.toString(e, debug);

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

@@ -14,6 +14,7 @@
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.util.Kleenean;
+import org.skriptlang.skript.lang.simplification.Simplifiable;
 
 /**
  * @author Peter Güttinger
@@ -63,7 +64,13 @@ public boolean check(final Event e) {
 				other -> cause == other,
 				isNegated());
 	}
-
+
+	@Override
+	public Condition simplify(Step step, @Nullable Simplifiable<?> source) {
+		expected = simplifyChild(expected, step, source);
+		return this;
+	}
+
 	@Override
 	public String toString(final @Nullable Event e, final boolean debug) {
 		return "damage was" + (isNegated() ? " not" : "") + " caused by " + expected.toString(e, debug);

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

@@ -14,6 +14,7 @@
 import ch.njol.skript.util.Date;
 import ch.njol.skript.util.Timespan;
 import ch.njol.util.Kleenean;
+import org.skriptlang.skript.lang.simplification.Simplifiable;
 
 /**
  * @author Peter Güttinger
@@ -58,7 +59,14 @@ public boolean check(final Event e) {
 						timespan -> now - date.getTime() >= timespan.getAs(Timespan.TimePeriod.MILLISECOND)
 				), isNegated());
 	}
-
+
+	@Override
+	public Condition simplify(Step step, @Nullable Simplifiable<?> source) {
+		date = simplifyChild(date, step, source);
+		delta = simplifyChild(delta, step, source);
+		return this;
+	}
+
 	@Override
 	public String toString(final @Nullable Event e, final boolean debug) {
 		return date.toString(e, debug) + " was " + (isNegated() ? "less" : "more") + " than " + delta.toString(e, debug) + " ago";

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

@@ -15,6 +15,7 @@
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.simplification.Simplifiable;
 
 @Name("Has Item Cooldown")
 @Description("Check whether a cooldown is active on the specified material for a specific player.")
@@ -53,7 +54,14 @@ public boolean check(Event event) {
 				)
 		);
 	}
-
+
+	@Override
+	public Condition simplify(Step step, @Nullable Simplifiable<?> source) {
+		players = simplifyChild(players, step, source);
+		itemtypes = simplifyChild(itemtypes, step, source);
+		return this;
+	}
+
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
 		return PropertyCondition.toString(this, PropertyType.HAVE, event, debug, players,

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

@@ -14,6 +14,7 @@
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.simplification.Simplifiable;
 
 @Name("Has Line of Sight")
 @Description("Checks whether living entities have an unobstructed line of sight to other entities or locations.")
@@ -56,6 +57,13 @@ public boolean check(Event event) {
 		}, isNegated());
 	}
 
+	@Override
+	public Condition simplify(Step step, @Nullable Simplifiable<?> source) {
+		viewers = simplifyChild(viewers, step, source);
+		targets = simplifyChild(targets, step, source);
+		return this;
+	}
+
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
 		return viewers.toString(event, debug) + " has" + (isNegated() ? " no" : "") + " line of sight to " + targets.toString(event,debug);

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

@@ -14,6 +14,7 @@
 import org.bukkit.event.Event;
 import org.bukkit.metadata.Metadatable;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.simplification.Simplifiable;
 
 @Name("Has Metadata")
 @Description("Checks whether a metadata holder has a metadata tag.")
@@ -49,6 +50,13 @@ public boolean check(Event e) {
 				), isNegated());
 	}
 
+	@Override
+	public Condition simplify(Step step, @Nullable Simplifiable<?> source) {
+		holders = simplifyChild(holders, step, source);
+		values = simplifyChild(values, step, source);
+		return this;
+	}
+
 	@Override
 	public String toString(@Nullable Event e, boolean debug) {
 		return PropertyCondition.toString(this, PropertyType.HAVE, e, debug, holders,

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

@@ -15,6 +15,7 @@
 import org.bukkit.event.Event;
 import org.bukkit.potion.PotionEffectType;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.simplification.Simplifiable;
 
 @Name("Has Potion")
 @Description("Checks whether the given living entities have specific potion effects.")
@@ -52,6 +53,13 @@ public boolean check(Event e) {
 				), isNegated());
 	}
 
+	@Override
+	public Condition simplify(Step step, @Nullable Simplifiable<?> source) {
+		livingEntities = simplifyChild(livingEntities, step, source);
+		potionEffects = simplifyChild(potionEffects, step, source);
+		return this;
+	}
+
 	@Override
 	public String toString(@Nullable Event e, boolean debug) {
 		return PropertyCondition.toString(this, PropertyType.HAVE, e, debug, livingEntities,

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

@@ -1,13 +1,5 @@
 package ch.njol.skript.conditions;
 
-import java.util.Arrays;
-import java.util.List;
-
-import org.bukkit.entity.Entity;
-import org.bukkit.event.Event;
-import org.jetbrains.annotations.Nullable;
-
-import ch.njol.skript.Skript;
 import ch.njol.skript.conditions.base.PropertyCondition;
 import ch.njol.skript.conditions.base.PropertyCondition.PropertyType;
 import ch.njol.skript.doc.Description;
@@ -18,6 +10,13 @@
 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;
+import org.skriptlang.skript.lang.simplification.Simplifiable;
+
+import java.util.Arrays;
+import java.util.List;
 
 @Name("Has Scoreboard Tag")
 @Description("Checks whether the given entities has the given <a href='expressions.html#ExprScoreboardTags'>scoreboard tags</a>.")
@@ -50,7 +49,14 @@ public boolean check(Event e) {
 				entity -> entity.getScoreboardTags().containsAll(tagsList),
 				isNegated());
 	}
-
+
+	@Override
+	public Condition simplify(Step step, @Nullable Simplifiable<?> source) {
+		entities = simplifyChild(entities, step, source);
+		tags = simplifyChild(tags, step, source);
+		return this;
+	}
+
 	@Override
 	public String toString(@Nullable Event e, boolean debug) {
 		return PropertyCondition.toString(this, PropertyType.HAVE, e, debug, entities,

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

@@ -16,6 +16,7 @@
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.log.ErrorQuality;
 import ch.njol.util.Kleenean;
+import org.skriptlang.skript.lang.simplification.Simplifiable;
 
 @Name("Is Incendiary")
 @Description("Checks if an entity will create fire when it explodes. This condition is also usable in an explosion prime event.")
@@ -63,6 +64,12 @@ public boolean check(Event e) {
 		return entities.check(e, entity -> entity instanceof Explosive && ((Explosive) entity).isIncendiary(), isNegated());
 	}
 
+	@Override
+	public Condition simplify(Step step, @Nullable Simplifiable<?> source) {
+		entities = simplifyChild(entities, step, source);
+		return this;
+	}
+
 	@Override
 	public String toString(@Nullable Event e, boolean debug) {
 		if (isEvent)