Final Commit (hopefully)

Author: Asleeepp

build.gradle.kts

@@ -97,7 +97,6 @@ tasks {
 
         downloadPlugins {
             url("https://download.luckperms.net/1552/bukkit/loader/LuckPerms-Bukkit-5.4.137.jar")
-            url("https://ci.lucko.me/job/spark/439/artifact/spark-bukkit/build/libs/spark-1.10.93-bukkit.jar")
             url("https://github.com/SkriptLang/Skript/releases/download/2.9.1/Skript-2.9.1.jar")
             url("https://github.com/dmulloy2/ProtocolLib/releases/download/5.2.0/ProtocolLib.jar")
             url("https://github.com/LoneDev6/SpigotUtilities/raw/master/LoneLibs.jar")

src/main/java/me/asleepp/SkriptItemsAdder/SkriptItemsAdder.java

@@ -4,20 +4,18 @@
 
 import ch.njol.skript.util.Version;
 import lombok.Getter;
-import lombok.Setter;
-import me.asleepp.SkriptItemsAdder.other.aliases.AliasesGenerator;
-import me.asleepp.SkriptItemsAdder.other.listeners.ItemsAdderEventListener;
-import me.asleepp.SkriptItemsAdder.other.util.Metrics;
-import me.asleepp.SkriptItemsAdder.other.util.SkriptItemsAdderCommand;
-import me.asleepp.SkriptItemsAdder.other.util.UpdateChecker;
-import me.asleepp.SkriptItemsAdder.other.util.Util;
+import me.asleepp.SkriptItemsAdder.aliases.AliasesGenerator;
+import me.asleepp.SkriptItemsAdder.listeners.ItemsAdderEventListener;
+import me.asleepp.SkriptItemsAdder.util.Metrics;
+import me.asleepp.SkriptItemsAdder.util.SkriptItemsAdderCommand;
+import me.asleepp.SkriptItemsAdder.util.UpdateChecker;
+import me.asleepp.SkriptItemsAdder.util.Util;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.SkriptAddon;
-import org.bukkit.scheduler.BukkitRunnable;
 
 import javax.annotation.Nullable;
 
@@ -49,7 +47,7 @@ public void onEnable() {
             getLogger().severe("Could not find Skript! Disabling...");
             manager.disablePlugin(this);
             return;
-        } else if (Skript.getVersion().compareTo(new Version(2, 7, 0)) < 0) {
+        } else if (Skript.getVersion().isSmallerThan(new Version(2, 7, 0))) {
             getLogger().severe("You are running an unsupported version of Skript. Disabling...");
             manager.disablePlugin(this);
             return;

src/main/java/me/asleepp/SkriptItemsAdder/other/aliases/AliasesGenerator.java renamed to src/main/java/me/asleepp/SkriptItemsAdder/aliases/AliasesGenerator.java

@@ -1,4 +1,4 @@
-package me.asleepp.SkriptItemsAdder.other.aliases;
+package me.asleepp.SkriptItemsAdder.aliases;
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.aliases.Aliases;

src/main/java/me/asleepp/SkriptItemsAdder/other/aliases/CustomItemType.java renamed to src/main/java/me/asleepp/SkriptItemsAdder/aliases/CustomItemType.java

@@ -1,4 +1,4 @@
-package me.asleepp.SkriptItemsAdder.other.aliases;
+package me.asleepp.SkriptItemsAdder.aliases;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -13,6 +13,8 @@ public class CustomItemType {
 
     private String namespacedID;
 
+    public CustomItemType() { }
+
     public CustomItemType(String namespacedID) {
         this.namespacedID = namespacedID;
     }

src/main/java/me/asleepp/SkriptItemsAdder/elements/conditions/CondCooldown.java

@@ -33,7 +33,7 @@ public boolean check(Event event) {
         String id = hudID.getSingle(event);
         Player[] playersArray = players != null ? players.getArray(event) : new Player[]{};
 
-        if (id != null && playersArray.length > 0) {
+        if (id != null) {
             for (Player player : playersArray) {
                 PlayerHudsHolderWrapper hudHolder = new PlayerHudsHolderWrapper(player);
                 PlayerHudWrapper hudWrapper = new PlayerHudWrapper(hudHolder, id);

src/main/java/me/asleepp/SkriptItemsAdder/elements/conditions/CondGetAction.java

@@ -1,6 +1,11 @@
 package me.asleepp.SkriptItemsAdder.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.RequiredPlugins;
+import ch.njol.skript.doc.Since;
 import ch.njol.skript.lang.Condition;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser;
@@ -12,6 +17,11 @@
 
 import javax.annotation.Nullable;
 
+@Name("HUD Is Visible")
+@Description("Determines whether players can see a hud/if a hud is active.")
+@Examples("if player can see itemsadder hud \"namespaced:id\"")
+@Since("1.6")
+@RequiredPlugins("ItemsAdder")
 public class CondHUDIsVisible extends Condition {
 
     private Expression<Player> players;
@@ -33,7 +43,7 @@ public boolean check(Event event) {
         Player[] p = players.getArray(event);
         String id = hudID.getSingle(event);
 
-        if (p != null && id != null) {
+        if (id != null) {
             for (Player players : p) {
                 PlayerHudsHolderWrapper hudsHolder = new PlayerHudsHolderWrapper(players);
                 PlayerHudWrapper hudWrapper = new PlayerHudWrapper(hudsHolder, id);
@@ -46,6 +56,6 @@ public boolean check(Event event) {
 
     @Override
     public String toString(@Nullable Event event, boolean debug) {
-        return "player(s) " + players.toString(event, debug) + "can view itemsadder hud " + hudID.toString(event, debug);
+        return players.toString(event, debug) + "can view itemsadder hud " + hudID.toString(event, debug);
     }
 }

src/main/java/me/asleepp/SkriptItemsAdder/elements/conditions/CondGetBlockFace.java

@@ -11,12 +11,11 @@
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.util.Kleenean;
 import dev.lone.itemsadder.api.CustomBlock;
-import me.asleepp.SkriptItemsAdder.other.aliases.CustomItemType;
+import me.asleepp.SkriptItemsAdder.aliases.CustomItemType;
 import org.bukkit.block.Block;
 import org.bukkit.event.Event;
 
 import javax.annotation.Nullable;
-import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -39,7 +38,7 @@ public class CondIsCustomBlock extends Condition {
     static {
         Skript.registerCondition(CondIsCustomBlock.class,
                 "%blocks% (is [a[n]]|are) [custom] (ia|itemsadder) block[s] [[with id] %-customitemtypes/strings%]",
-                "%blocks% (is[n't| not]) [a] [custom] (ia|itemsadder) block[s] [[with id] %-customitemtypes/strings%]");
+                "%blocks% (isn't|is not|aren't|are not) [a] [custom] (ia|itemsadder) block[s] [[with id] %-customitemtypes/strings%]");
     }
 
     @SuppressWarnings("unchecked")
@@ -53,7 +52,7 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
 
     @Override
     public boolean check(Event event) {
-        List<String> expectedIds = Arrays.stream(ids.getArray(event))
+        List<String> expectedIds = ids.stream(event)
                 .map(id -> {
                     if (id instanceof CustomItemType) {
                         return ((CustomItemType) id).getNamespacedID();