Merge pull request #9 from Asleeepp/1.5-test

Version 1.5

Author: Asleeepp

build.gradle

@@ -15,7 +15,7 @@ compileJava {
 }
 
 group = 'me.Asleepp'
-version = '1.4.1'
+version = '1.5'
 
 repositories {
     mavenCentral()

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

@@ -0,0 +1,95 @@
+package me.asleepp.SkriptItemsAdder;
+
+import ch.njol.skript.util.Version;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;
+
+// Credits to ShaneBee, yoinked his Update Checker code from SkBee
+
+public class UpdateChecker implements Listener {
+
+    private static Version UPDATE_VERSION;
+
+    public static void checkForUpdate(JavaPlugin plugin, String pluginVersion) {
+        plugin.getLogger().info("Checking for update...");
+        getLatestReleaseVersion(version -> {
+            Version plugVer = new Version(pluginVersion);
+            Version curVer = new Version(version);
+            if (curVer.compareTo(plugVer) <= 0) {
+                plugin.getLogger().info("Plugin is up to date!");
+            } else {
+                plugin.getLogger().warning("Plugin is not up to date!");
+                plugin.getLogger().warning(" - Current version: " + pluginVersion);
+                plugin.getLogger().warning(" - Available update: " + version);
+                plugin.getLogger().warning(" - Download available at: https://github.com/Asleeepp/skript-itemsadder/releases");
+                UPDATE_VERSION = curVer;
+            }
+        }, plugin);
+    }
+
+    private static void getLatestReleaseVersion(final Consumer<String> consumer, JavaPlugin plugin) {
+        try {
+            URL url = new URL("https://api.github.com/repos/Asleeepp/skript-itemsadder/releases/latest");
+            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+            connection.setRequestMethod("GET");
+            JsonObject jsonObject = new JsonParser().parse(new InputStreamReader(connection.getInputStream())).getAsJsonObject();
+            String tag_name = jsonObject.get("tag_name").getAsString();
+            consumer.accept(tag_name);
+        } catch (Exception e) {
+            plugin.getLogger().severe("Checking for update failed: " + e.getMessage());
+        }
+    }
+
+
+    private final SkriptItemsAdder plugin;
+
+    public UpdateChecker(SkriptItemsAdder plugin) {
+        this.plugin = plugin;
+    }
+
+    @EventHandler
+    private void onJoin(PlayerJoinEvent event) {
+        Player player = event.getPlayer();
+        if (!player.hasPermission("skript-itemsadder.update.check")) return;
+
+        String currentVersion = this.plugin.getDescription().getVersion();
+        CompletableFuture<Version> updateVersion = getUpdateVersion(currentVersion);
+
+        Bukkit.getScheduler().runTaskLater(this.plugin, () -> updateVersion.thenApply(version -> {
+            player.sendMessage("[skript-itemsadder] update available: " + version);
+            player.sendMessage("[skript-itemsadder] download at https://github.com/Asleeepp/skript-itemsadder/releases");
+            return true;
+        }), 30);
+    }
+
+    private CompletableFuture<Version> getUpdateVersion(String currentVersion) {
+        CompletableFuture<Version> future = new CompletableFuture<>();
+        if (UPDATE_VERSION != null) {
+            future.complete(UPDATE_VERSION);
+        } else {
+            Bukkit.getScheduler().runTaskAsynchronously(this.plugin, () -> getLatestReleaseVersion(version -> {
+                Version plugVer = new Version(currentVersion);
+                Version curVer = new Version(version);
+                if (curVer.compareTo(plugVer) <= 0) {
+                    future.cancel(true);
+                } else {
+                    UPDATE_VERSION = curVer;
+                    future.complete(UPDATE_VERSION);
+                }
+            }, this.plugin));
+        }
+        return future;
+    }
+}

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

@@ -4,6 +4,7 @@
 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;
@@ -16,8 +17,12 @@
 import javax.annotation.Nullable;
 @Name("Is Action")
 @Description({"This condition checks if the player has interacted with a custom block with either a left or a right click."})
-@Examples({"on interact with custom block: /tif interact action is right click: /t/tkill event-player "})
+@Examples({
+    "on interact with custom block:",
+        "\tif interact action is right click:",
+            "\t\tkill event-player"})
 @Since("1.4")
+@RequiredPlugins("ItemsAdder")
 public class CondGetAction extends Condition {
 
     static {

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

@@ -4,6 +4,7 @@
 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;
@@ -15,8 +16,12 @@
 import javax.annotation.Nullable;
 @Name("Is Block Clicked")
 @Description({"This condition checks what block the player clicked."})
-@Examples({"on interact with custom block: /tif clicked block is \"diamond_tiles\" /t/tsend \"That's quite valuable.\" "})
+@Examples({
+    "on interact with custom block:",
+        "\tif clicked block is \"diamond_tiles\"",
+            "\t\tsend \"That's quite valuable.\" "})
 @Since("1.4")
+@RequiredPlugins("ItemsAdder")
 public class CondGetBlockClicked extends Condition {
 
     private Expression<String> block;

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

@@ -4,6 +4,7 @@
 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;
@@ -16,8 +17,12 @@
 import javax.annotation.Nullable;
 @Name("Is Block Face")
 @Description({"This condition checks what face of a block the player has interacted with."})
-@Examples({"on interact with custom block: /tif clicked block face is south: /t/tsend \"Why are you doing that?\" "})
+@Examples({
+    "on interact with custom block:",
+        "\tif clicked block face is south:",
+            "\t\tsend \"Why are you doing that?\""})
 @Since("1.4")
+@RequiredPlugins("ItemsAdder")
 public class CondGetBlockFace extends Condition {
 
     static {

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

@@ -4,6 +4,8 @@
 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;
@@ -16,42 +18,55 @@
 @Name("Is ItemsAdder Block")
 @Description({"Checks if the block is an ItemsAdder block."})
 @Examples({
-        "on break:",
-        "\tif event-block is a custom block",
-        "\t\tkill player"})
+    "on break:",
+        "\tif event-block is a custom block with id \"iasurvival:ruby_block\":",
+            "\t\tkill player",
+        "\telse if event-block isn't a custom block:",
+            "\t\tsend \"Good Job!\" to player"})
+@Since("1.0, 1.5 (Negative Comparison)")
+@RequiredPlugins("ItemsAdder")
 public class CondIsCustomBlock extends Condition {
     private Expression<Block> block;
+    private Expression<String> blockId;
 
     static {
-        Skript.registerCondition(CondIsCustomBlock.class, "%blocks% (is [a[n]]|are) (custom|ia|itemsadder) block[s]");
+        Skript.registerCondition(CondIsCustomBlock.class, "%blocks% (is [a[n]]|are) (custom|ia|itemsadder) block[s] [[with id] %-string%]", "%blocks% (is[n't| not]) [a] (custom|ia|itemsadder) block[s] [[with id] %-string%]");
     }
 
     @SuppressWarnings("unchecked")
     @Override
     public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
         block = (Expression<Block>) exprs[0];
+        blockId = (Expression<String>) exprs[1];
+        setNegated(matchedPattern == 1);
         return true;
     }
 
     @Override
     public boolean check(Event e) {
         Block[] blocks = block.getArray(e);
         if (blocks == null) {
-            return false;
+            return isNegated();
         }
 
         for (Block b : blocks) {
             CustomBlock customBlock = CustomBlock.byAlreadyPlaced(b);
-            if (customBlock != null) {
-                return true;
+            if (customBlock == null) {
+                return isNegated();
+            }
+            if (blockId != null) {
+                String id = blockId.getSingle(e);
+                if (id == null || !customBlock.getId().equals(id)) {
+                    return isNegated();
+                }
             }
         }
-        return false;
+        return !isNegated();
     }
 
-
     @Override
     public String toString(@Nullable Event e, boolean debug) {
-        return block.toString(e, debug) + " is an ItemsAdder block";
+        return block.toString(e, debug) + (isNegated() ? " isn't" : " is") + " a custom block" + (blockId != null ? " with id " + blockId.toString(e, debug) : "");
     }
 }
+

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

@@ -4,6 +4,8 @@
 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;
@@ -16,37 +18,50 @@
 @Name("Is ItemsAdder Entity")
 @Description({"Checks if the entity is an ItemsAdder entity."})
 @Examples({
-        "on damage:",
-        "\tif event-entity is a custom entity",
-        "\t\tsend \"how could you?\" to player"})
+    "on damage:",
+        "\tif event-entity is a custom entity:",
+            "\t\tsend \"how could you?\" to player",
+        "\tif event-entity is not a custom entity:",
+            "\t\t send \"Incredible!\" to player "})
+@Since("1.0, 1.5 (Negative Comparison)")
+@RequiredPlugins("ItemsAdder")
 public class CondIsCustomEntity extends Condition {
 
     private Expression<Entity> entities;
-
+    private Expression<String> entityId;
 
     static {
-        Skript.registerCondition(CondIsCustomEntity.class, new String[] {"%entities% (is [a[n]]|are) (custom|ia|itemsadder) entit(y|ies)"});
+        Skript.registerCondition(CondIsCustomEntity.class, new String[] {"%entities% (is [a[n]]|are) (custom|ia|itemsadder) entit(y|ies) [[with id] %-string%]", "%entities% (is[n't| not]) [a] (custom|ia|itemsadder) entit(y|ies) [[with id] %-string%]"});
     }
 
     @SuppressWarnings("unchecked")
     @Override
     public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
         entities = (Expression<Entity>) exprs[0];
+        entityId = (Expression<String>) exprs[1];
+        setNegated(matchedPattern == 1);
         return true;
     }
 
     @Override
     public boolean check(Event e) {
         for (Entity entity : entities.getArray(e)) {
-            if (!CustomEntity.isCustomEntity(entity)) {
-                return false;
+            CustomEntity customEntity = CustomEntity.byAlreadySpawned(entity);
+            if (customEntity == null) {
+                return isNegated();
+            }
+            if (entityId != null) {
+                String id = entityId.getSingle(e);
+                if (id == null || !customEntity.getId().equals(id)) {
+                    return isNegated();
+                }
             }
         }
-        return true;
+        return !isNegated();
     }
 
     @Override
     public String toString(@Nullable Event e, boolean debug) {
-        return entities.toString(e, debug) + " is an ItemsAdder entity";
+        return entities.toString(e, debug) + (isNegated() ? " isn't" : " is") + " a custom entity" + (entityId != null ? " with id " + entityId.toString(e, debug) : "");
     }
 }

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

@@ -5,6 +5,8 @@
 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;
@@ -18,53 +20,55 @@
 @Name("Is ItemsAdder Item")
 @Description({"Checks if the item is an ItemsAdder item."})
 @Examples({"if player's tool is a custom item", "if player's tool is a custom item \"icon_arrow_chest\""})
+@Since("1.0, 1.5 (Negative comparison)")
+@RequiredPlugins("ItemsAdder")
 public class CondIsCustomItem extends Condition {
 
     private Expression<ItemType> item;
     private Expression<String> itemId;
 
     static{
-        Skript.registerCondition(CondIsCustomItem.class, new String[] {"%itemtypes% (is [a[n]]|are) (custom|ia|itemsadder) item[s] [[with id] %-string%]"});
+        Skript.registerCondition(CondIsCustomItem.class, new String[] {"%itemtypes% (is [a[n]]|are) (custom|ia|itemsadder) item[s] [[with id] %-string%]", "%itemtypes% (is[n't| not]) [a] (custom|ia|itemsadder) item[s] [[with id] %-string%]"});
     }
 
     @SuppressWarnings("unchecked")
     @Override
     public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
         item = (Expression<ItemType>) exprs[0];
         itemId = (Expression<String>) exprs[1];
+        setNegated(matchedPattern == 1);
         return true;
     }
 
     @Override
     public boolean check(Event e) {
         ItemType[] items = item.getArray(e);
         if (items == null) {
-            return false;
+            return isNegated();
         }
 
         for (ItemType itemType : items) {
             ItemStack itemStack = itemType.getRandom();
             if (itemStack == null) {
-                return false;
+                return isNegated();
             }
             CustomStack customStack = CustomStack.byItemStack(itemStack);
             if (customStack == null) {
-                return false;
+                return isNegated();
             }
             if (itemId != null) {
                 String id = itemId.getSingle(e);
                 if (id == null || !customStack.getId().equals(id)) {
-                    return false;
+                    return isNegated();
                 }
             }
         }
-        return true;
+        return !isNegated();
     }
 
-
     @Override
     public String toString(@Nullable Event e, boolean debug) {
-        return item.toString(e, debug) + " is a custom item" + (itemId != null ? " with id " + itemId.toString(e, debug) : "");
+        return item.toString(e, debug) + (isNegated() ? " isn't" : " is") + " a custom item" + (itemId != null ? " with id " + itemId.toString(e, debug) : "");
     }
-
 }
+