-
-
Notifications
You must be signed in to change notification settings - Fork 400
Add potion effect tier #4632
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+93
−0
Merged
Add potion effect tier #4632
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
2713063
add potion effect tier
Ankoki c9282f5
license header thing
Ankoki fcb64eb
return empty array when effect is null and add 1 to the amplifier bef…
Ankoki 0a7d60c
return 0 when player doesn't have the effect.
Ankoki 6916800
Update src/main/java/ch/njol/skript/expressions/ExprPotionEffectTier.…
Ankoki b6c0bb6
Update src/main/java/ch/njol/skript/expressions/ExprPotionEffectTier.…
Ankoki ab4f76e
Update src/main/java/ch/njol/skript/expressions/ExprPotionEffectTier.…
Ankoki e2697b9
Update src/main/java/ch/njol/skript/expressions/ExprPotionEffectTier.…
Ankoki c571966
Update src/main/java/ch/njol/skript/expressions/ExprPotionEffectTier.…
Ankoki e1cc832
Add 'on' to the pattern.
Ankoki 3ea1dd1
Return Integer instead of Number, suppress unchecked warnings in the …
Ankoki 8a0ce0c
Support multiple types and entities.
Ankoki 836afc1
Update src/main/java/ch/njol/skript/expressions/ExprPotionEffectTier.…
Ankoki 7732381
Update src/main/java/ch/njol/skript/expressions/ExprPotionEffectTier.…
Ankoki a0dcd51
Merge branch 'master' into potion-tier
TheLimeGlass 4fc167e
Merge branch 'master' into potion-tier
TheLimeGlass File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
93 changes: 93 additions & 0 deletions
93
src/main/java/ch/njol/skript/expressions/ExprPotionEffectTier.java
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,93 @@ | ||
/** | ||
* This file is part of Skript. | ||
* | ||
* Skript is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU General Public License as published by | ||
* the Free Software Foundation, either version 3 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* Skript is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License | ||
* along with Skript. If not, see <http://www.gnu.org/licenses/>. | ||
* | ||
* Copyright Peter Güttinger, SkriptLang team and contributors | ||
*/ | ||
package ch.njol.skript.expressions; | ||
|
||
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.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.entity.LivingEntity; | ||
import org.bukkit.event.Event; | ||
import org.bukkit.potion.PotionEffect; | ||
import org.bukkit.potion.PotionEffectType; | ||
import org.eclipse.jdt.annotation.Nullable; | ||
|
||
import java.util.ArrayList; | ||
import java.util.List; | ||
|
||
@Name("Potion Effect Tier") | ||
@Description("An expression to obtain the amplifier of a potion effect applied to an entity.") | ||
@Examples("if the amplifier of haste of player >= 3:") | ||
@Since("INSERT VERSION") | ||
public class ExprPotionEffectTier extends SimpleExpression<Integer> { | ||
|
||
static { | ||
Skript.registerExpression(ExprPotionEffectTier.class, Integer.class, ExpressionType.COMBINED, | ||
"[the] [potion] (tier|amplifier|level) of %potioneffecttypes% (of|for|on) %livingentities%" | ||
); | ||
} | ||
|
||
private Expression<PotionEffectType> typeExpr; | ||
private Expression<LivingEntity> entityExpr; | ||
|
||
@Override | ||
@SuppressWarnings("unchecked") | ||
public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) { | ||
typeExpr = (Expression<PotionEffectType>) exprs[0]; | ||
entityExpr = (Expression<LivingEntity>) exprs[1]; | ||
return true; | ||
} | ||
|
||
@Override | ||
@Nullable | ||
protected Integer[] get(Event event) { | ||
PotionEffectType[] types = typeExpr.getArray(event); | ||
LivingEntity[] entities = entityExpr.getArray(event); | ||
List<Integer> result = new ArrayList<>(); | ||
for (LivingEntity entity : entities) { | ||
for (PotionEffectType type : types) { | ||
PotionEffect effect = entity.getPotionEffect(type); | ||
result.add(effect == null ? 0 : effect.getAmplifier() + 1); | ||
} | ||
} | ||
return result.toArray(new Integer[0]); | ||
} | ||
|
||
@Override | ||
public boolean isSingle() { | ||
return true; | ||
} | ||
|
||
@Override | ||
public Class<? extends Integer> getReturnType() { | ||
return Integer.class; | ||
} | ||
|
||
@Override | ||
public String toString(@Nullable Event event, boolean debug) { | ||
return "potion tier of " + typeExpr.toString(event, debug) + " of " + entityExpr.toString(event, debug); | ||
} | ||
Ankoki marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
} |
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.
Uh oh!
There was an error while loading. Please reload this page.