Add elytra boost event, firework type and firework syntaxes #5956
There are no files selected for viewing
This file contains 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 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 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 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,57 @@ | ||
| package org.skriptlang.skript.elements.fireworks; | ||
|
|
||
| import org.bukkit.event.Event; | ||
| import org.eclipse.jdt.annotation.Nullable; | ||
|
|
||
| import com.destroystokyo.paper.event.player.PlayerElytraBoostEvent; | ||
|
|
||
| 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.Condition; | ||
| import ch.njol.skript.lang.Expression; | ||
| import ch.njol.skript.lang.SkriptParser.ParseResult; | ||
| import ch.njol.util.Kleenean; | ||
|
|
||
| @Name("Elytra Boost Will Consume") | ||
| @Description("Checks if the firework will be consumed in an <a href='events.html#elytra_boost'>elytra boost event</a>.") | ||
| @Examples({ | ||
| "on player elytra boost:", | ||
| "\twill consume firework", | ||
| "\tset to consume the firework" | ||
| }) | ||
| @Since("INSERT VERSION") | ||
| public class CondElytraBoostConsume extends Condition { | ||
|
|
||
| static { | ||
| if (Skript.classExists("com.destroystokyo.paper.event.player.PlayerElytraBoostEvent")) | ||
| Skript.registerCondition(CondElytraBoostConsume.class, "[event] (will [:not]|not:won't) consume [the] firework"); | ||
|
There was a problem hiding this comment. I think it should be forced to include what is consuming the firework: |
||
| } | ||
|
|
||
| private boolean negate; | ||
|
|
||
| @Override | ||
| public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) { | ||
| if (getParser().isCurrentEvent(PlayerElytraBoostEvent.class)) { | ||
| Skript.error("You can only use the 'will consume firework' condition in the 'on elytra boost' event!"); | ||
TheLimeGlass marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return false; | ||
| } | ||
| negate = parseResult.hasTag("not"); | ||
| return true; | ||
TheLimeGlass marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| @Override | ||
| public boolean check(Event event) { | ||
| if (!(event instanceof PlayerElytraBoostEvent)) | ||
| return false; | ||
| return negate && !((PlayerElytraBoostEvent) event).shouldConsume(); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString(@Nullable Event event, boolean debug) { | ||
| return "will " + (negate ? " not " : "") + "consume the firework"; | ||
| } | ||
|
|
||
| } | ||
This file contains 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,72 @@ | ||
| package org.skriptlang.skript.elements.fireworks; | ||
|
|
||
| import org.bukkit.event.Event; | ||
| import org.eclipse.jdt.annotation.Nullable; | ||
|
|
||
| import com.destroystokyo.paper.event.player.PlayerElytraBoostEvent; | ||
|
|
||
| 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; | ||
|
|
||
| @Name("Elytra Boost Consume") | ||
| @Description("Change if the firework will be consumed in an <a href='events.html#elytra_boost'>elytra boost event</a>.") | ||
| @Examples({ | ||
| "on player elytra boost:", | ||
| "\twill consume firework", | ||
| "\tset to consume the firework" | ||
|
|
||
| }) | ||
| @Since("INSERT VERSION") | ||
| public class EffElytraBoostConsume extends Effect { | ||
|
|
||
| static { | ||
| if (Skript.classExists("com.destroystokyo.paper.event.player.PlayerElytraBoostEvent")) | ||
| Skript.registerEffect(EffElytraBoostConsume.class, "(set|change) [[the] event] to [:not] consume [the] firework", "[not:do not] consume firework", "set consume firework to %boolean%"); | ||
TheLimeGlass marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| @Nullable | ||
| private Expression<Boolean> expression; | ||
| private boolean consume; | ||
|
|
||
| @Override | ||
| @SuppressWarnings("unchecked") | ||
| public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) { | ||
| if (getParser().isCurrentEvent(PlayerElytraBoostEvent.class)) { | ||
| Skript.error("You can only use the 'consume firework' effect in the 'on elytra boost' event!"); | ||
TheLimeGlass marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return false; | ||
| } | ||
| if (matchedPattern == 2) { | ||
| expression = (Expression<Boolean>) exprs[0]; | ||
| } else { | ||
| consume = !parseResult.hasTag("not"); | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| protected void execute(Event event) { | ||
| if (!(event instanceof PlayerElytraBoostEvent)) | ||
| return; | ||
| PlayerElytraBoostEvent elytraBoostEvent = (PlayerElytraBoostEvent) event; | ||
| if (expression != null) { | ||
| Boolean consume = expression.getSingle(event); | ||
| if (consume == null) | ||
| return; | ||
| elytraBoostEvent.setShouldConsume(consume); | ||
| } else { | ||
| elytraBoostEvent.setShouldConsume(consume); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public String toString(@Nullable Event event, boolean debug) { | ||
| return expression == null ? (consume ? "consume" : "do not consume") + " firework" : "set consume firework to " + expression.toString(event, debug); | ||
| } | ||
|
|
||
| } | ||
Oops, something went wrong.
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.
invalid example