Deprecate boolean expressions #8619
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| package org.skriptlang.skript.bukkit.entity.elements.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.Entity; | ||
| import org.skriptlang.skript.registration.SyntaxRegistry; | ||
|
|
||
| @Name("Has Gravity") | ||
| @Description("Checks whether or not an entity experiences gravity.") | ||
| @Example("send whether player has gravity") | ||
| @Since("INSERT VERSION") | ||
| public class CondHasGravity extends PropertyCondition<Entity> { | ||
|
|
||
| public static void register(SyntaxRegistry registry) { | ||
| registry.register( | ||
| SyntaxRegistry.CONDITION, | ||
| infoBuilder( | ||
| CondHasGravity.class, | ||
| PropertyType.HAVE, | ||
| "gravity", | ||
| "entities" | ||
| ) | ||
|
Comment on lines
+22
to
+25
Member
There was a problem hiding this comment. has gravity is ok but |
||
| .supplier(CondHasGravity::new) | ||
| .build() | ||
| ); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean check(Entity entity) { | ||
| return entity.hasGravity(); | ||
| } | ||
|
|
||
| @Override | ||
| protected String getPropertyName() { | ||
| return "gravity"; | ||
| } | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| package org.skriptlang.skript.bukkit.entity.elements.conditions; | ||
|
|
||
| import ch.njol.skript.conditions.base.PropertyCondition; | ||
| import ch.njol.skript.doc.*; | ||
| import org.bukkit.entity.Entity; | ||
| import org.skriptlang.skript.registration.SyntaxRegistry; | ||
|
|
||
| @Name("Is Glowing") | ||
| @Description("Checks whether or not an entity is glowing.") | ||
| @Example(""" | ||
| command /glow: | ||
| trigger: | ||
| if player is glowing: | ||
| make player stop glowing | ||
| else: | ||
| make player glow | ||
| """) | ||
| @Since("INSERT VERSION") | ||
| public class CondIsGlowing extends PropertyCondition<Entity> { | ||
|
|
||
| public static void register(SyntaxRegistry registry) { | ||
| registry.register( | ||
| SyntaxRegistry.CONDITION, | ||
| infoBuilder( | ||
| CondIsGlowing.class, | ||
| PropertyType.BE, | ||
| "glowing", | ||
| "entities" | ||
| ) | ||
| .supplier(CondIsGlowing::new) | ||
| .build() | ||
| ); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean check(Entity entity) { | ||
| return entity.isGlowing(); | ||
| } | ||
|
|
||
| @Override | ||
| protected String getPropertyName() { | ||
| return "glowing"; | ||
| } | ||
|
|
||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| package org.skriptlang.skript.bukkit.entity.elements.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 ch.njol.skript.lang.Expression; | ||
| import ch.njol.skript.lang.SkriptParser; | ||
| import ch.njol.util.Kleenean; | ||
| import org.bukkit.entity.AbstractArrow; | ||
| import org.bukkit.entity.Projectile; | ||
| import org.skriptlang.skript.log.runtime.RuntimeErrorProducer; | ||
| import org.skriptlang.skript.registration.SyntaxRegistry; | ||
|
|
||
| @Name("Projectile Is Critical") | ||
| @Description(""" | ||
| Check whether a projectile is in its critical state. When in critical state the projectile will have a trail of particles and deal more damage. | ||
| Currently this only applies to arrows and tridents. | ||
| """) | ||
| @Example(""" | ||
| on shoot: | ||
| if event-projectile is not in projectile critical state: | ||
| enable projectile critical state of event-projectile | ||
| """) | ||
| @Since("INSERT VERSION") | ||
| public class CondProjectileIsCritical extends PropertyCondition<Projectile> implements RuntimeErrorProducer { | ||
|
|
||
| public static void register(SyntaxRegistry registry) { | ||
| registry.register( | ||
| SyntaxRegistry.CONDITION, | ||
| infoBuilder( | ||
| CondProjectileIsCritical.class, | ||
| PropertyType.BE, | ||
| "in (projectile|arrow) critical (state|mode)", | ||
| "projectiles" | ||
| ) | ||
|
Comment on lines
+34
to
+37
Member
There was a problem hiding this comment. this is awkward |
||
| .supplier(CondProjectileIsCritical::new) | ||
| .build() | ||
| ); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) { | ||
| setNegated(matchedPattern == 1); | ||
| return super.init(exprs, matchedPattern, isDelayed, parseResult); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean check(Projectile projectile) { | ||
| if (projectile instanceof AbstractArrow abstractArrow) { | ||
| return abstractArrow.isCritical(); | ||
| } | ||
| warning("This projectile is not supported. Critical projectile state only applies to arrows and tridents."); | ||
|
Member
There was a problem hiding this comment. Need to include what projectile it is in the message |
||
| return false; | ||
| } | ||
|
|
||
| protected String getPropertyName() { | ||
| return "projectile critical state"; | ||
| } | ||
|
|
||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This needs to be more forceful and informative. Apply to all deprecation warnings