Skip to content

Commit

Permalink
1.3.2 release
Browse files Browse the repository at this point in the history 
Took 33 minutes
  • Loading branch information
@Ankoki
Ankoki committed Jun 30, 2021
1 parent bcb5202 commit de505b1
Show file tree
Hide file tree
Showing 3 changed files with 71 additions and 35 deletions.
20 changes: 15 additions & 5 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@
<id>destroystokyo-repo</id>
<url>https://repo.destroystokyo.com/content/repositories/snapshots/</url>
</repository>
<repository>
<id>papermc</id>
<url>https://papermc.io/repo/repository/maven-public/</url>
</repository>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>codemc-repo</id>
<url>https://repo.codemc.io/repository/maven-public/</url>
Expand Down Expand Up @@ -99,10 +107,6 @@
<groupId>net.milkbowl.vault</groupId>
<artifactId>Vault</artifactId>
</exclusion>
<exclusion>
<groupId>com.destroystokyo.paper</groupId>
<artifactId>paper-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand All @@ -117,10 +121,16 @@
<version>1.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.16.5-R0.1-SNAPSHOT</version>
<version>1.17-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
80 changes: 51 additions & 29 deletions src/main/java/com/ankoki/skjade/elements/conditions/CondIsWet.java
View file
Original file line number Diff line number Diff line change
@@ -1,77 +1,99 @@
package com.ankoki.skjade.elements.conditions;

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.doc.*;
import ch.njol.skript.lang.Condition;
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.entity.Player;
import org.bukkit.event.Event;
import org.jetbrains.annotations.Nullable;

@Name("Is Wet")
@Description("Checks if a player is in any type of liquid.")
@Description("Checks if a player (1.1.0) or an entity (1.3.2) is in any type of liquid.")
@Examples("if player is wet:")
@RequiredPlugins("Paper for anything but is in water.")
@Since("1.1.0")
public class CondIsWet extends Condition {

static {
Skript.registerCondition(CondIsWet.class,
"%player% is(1¦(n[']t| not)|) [standing] in water",
"%player% is(1¦(n[']t| not)|) [standing] in [the] rain",
"%player% is(1¦(n[']t| not)|) [standing] in a bubble column",
"%player% is(1¦(n[']t| not)|) [standing] in water or [a] bubble column",
"%player% is(1¦(n[']t| not)|) [standing] in [the] rain or [a] bubble column",
"%player% is(1¦(n[']t| not)|) (wet|soaked|moist|damp|drenched|sopping|soggy|dripping)",
"%player% is(1¦(n[']t| not)|) in lava",
"%player% is(1¦(n[']t| not)|) [standing] in lava or water",
"%player% is(1¦(n[']t| not)|) (in|touching) any [type of] liquid");
if (Skript.methodExists(Player.class, "isInRain")) {
Skript.registerCondition(CondIsWet.class,
"%entity% is(1¦(n[']t| not)|) [standing] in water",
"%entity% is(1¦(n[']t| not)|) [standing] in [the] rain",
"%entity% is(1¦(n[']t| not)|) [standing] in a bubble column",
"%entity% is(1¦(n[']t| not)|) [standing] in water or [a] bubble column",
"%entity% is(1¦(n[']t| not)|) [standing] in [the] rain or [a] bubble column",
"%entity% is(1¦(n[']t| not)|) (wet|soaked|moist|damp|drenched|sopping|soggy|dripping)",
"%entity% is(1¦(n[']t| not)|) in lava",
"%entity% is(1¦(n[']t| not)|) [standing] in lava or water",
"%entity% is(1¦(n[']t| not)|) (in|touching) any [type of] liquid");
} else {
Skript.registerCondition(CondIsWet.class,
"%player% is(1¦(n[']t| not)|) [standing] in water");
}
}

private Expression<Player> player;
private Expression<Entity> entityExpr;
private int pattern;
private boolean negate;

@Override
public boolean check(Event e) {
if (player == null) return false;
Player p = player.getSingle(e);
if (p == null) return false;
if (entityExpr == null) return false;
Entity entity = entityExpr.getSingle(e);
if (entity == null) return false;
switch (pattern) {
case 0:
return negate != p.isInWater();
return negate != entity.isInWater();
case 1:
return negate != p.isInRain();
return negate != entity.isInRain();
case 2:
return negate != p.isInBubbleColumn();
return negate != entity.isInBubbleColumn();
case 3:
return negate != p.isInWaterOrBubbleColumn();
return negate != entity.isInWaterOrBubbleColumn();
case 4:
return negate != (p.isInRain() || p.isInBubbleColumn());
return negate != (entity.isInRain() || entity.isInBubbleColumn());
case 5:
return negate != p.isInWaterOrRainOrBubbleColumn();
return negate != entity.isInWaterOrRainOrBubbleColumn();
case 6:
return negate != p.isInLava();
return negate != entity.isInLava();
case 7:
return negate != (p.isInWater() || p.isInLava());
return negate != (entity.isInWater() || entity.isInLava());
case 8:
return negate != (p.isInWaterOrRainOrBubbleColumn() || p.isInLava());
return negate != (entity.isInWaterOrRainOrBubbleColumn() || entity.isInLava());
}
return false;
}

@Override
public String toString(@Nullable Event e, boolean debug) {
switch (pattern) {
case 0:
return entityExpr.toString(e, debug) + " is" + (negate ? "n't " : " ") + "standing in water";
case 1:
return entityExpr.toString(e, debug) + " is" + (negate ? "n't " : " ") + "in rain";
case 2:
return entityExpr.toString(e, debug) + " is" + (negate ? "n't " : " ") + "in a bubble column";
case 3:
return entityExpr.toString(e, debug) + " is" + (negate ? "n't " : " ") + "in water or a bubble column";
case 4:
return entityExpr.toString(e, debug) + " is" + (negate ? "n't " : " ") + "wet";
case 5:
return entityExpr.toString(e, debug) + " is" + (negate ? "n't " : " ") + "in lava";
case 6:
return entityExpr.toString(e, debug) + " is" + (negate ? "n't " : " ") + "standing in lava or water";
case 7:
return entityExpr.toString(e, debug) + " is" + (negate ? "n't " : " ") + "touching any type of liquid";
}
return null;
}

@Override
public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
player = (Expression<Player>) exprs[0];
entityExpr = (Expression<Entity>) exprs[0];
pattern = matchedPattern;
negate = parseResult.mark == 1;
return true;
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/com/ankoki/skjade/elements/expressions/ExprGlowing.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemFlag;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;

@Name("Glowing ItemStack")
@Description("Makes a glowing(enchanted with no enchant flag) item.")
Expand Down Expand Up @@ -44,7 +45,10 @@ private ItemStack toShiny(ItemStack itemStack) {
} else {
itemStack.addUnsafeEnchantment(Enchantment.ARROW_INFINITE, 1);
}
itemStack.addItemFlags(ItemFlag.HIDE_ENCHANTS);
ItemMeta meta = itemStack.getItemMeta();
if (meta == null) return itemStack;
meta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
itemStack.setItemMeta(meta);
return itemStack;
}
}

0 comments on commit de505b1

Please sign in to comment.