Touch-ups

Author: Asleeepp

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

@@ -19,9 +19,9 @@
 @Description({"Checks if the entity is an ItemsAdder entity."})
 @Examples({
     "on damage:",
-        "\tif event-entity is a custom entity:",
+        "\tif event-entity is an itemsadder entity:",
             "\t\tsend \"how could you?\" to player",
-        "\tif event-entity is not a custom entity:",
+        "\telse if event-entity is not an itemsadder entity:",
             "\t\t send \"Incredible!\" to player "})
 @Since("1.0, 1.5 (Negative Comparison)")
 @RequiredPlugins("ItemsAdder")

src/main/java/me/asleepp/SkriptItemsAdder/elements/effects/EffDamageEffect.java

@@ -1,16 +1,26 @@
 package me.asleepp.SkriptItemsAdder.elements.effects;
 
 import ch.njol.skript.Skript;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.RequiredPlugins;
+import ch.njol.skript.doc.Since;
 import ch.njol.skript.lang.Effect;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.util.Kleenean;
 import dev.lone.itemsadder.api.CustomEntity;
+import jdk.jfr.Description;
+import jdk.jfr.Name;
 import org.bukkit.entity.Entity;
 import org.bukkit.event.Event;
 
 import javax.annotation.Nullable;
 
+@Name("Damage Effect")
+@Description("Play the red damage effect on an ItemsAdder entity.")
+@Examples("play damage effect on custom itemsadder entity {_iaentity}")
+@Since("1.6")
+@RequiredPlugins("ItemsAdder")
 public class EffDamageEffect extends Effect {
 
     private Expression<Entity> entitiesExpr;

src/main/java/me/asleepp/SkriptItemsAdder/elements/effects/EffMakeEntityPlayAnimation.java

@@ -19,7 +19,7 @@
 @Description({"Makes an ItemsAdder entity play an animation."})
 @Examples({
     "on right click:",
-        "\tif clicked entity is a custom entity",
+        "\tif clicked entity is an itemsadder entity",
             "\t\tmake clicked entity play itemsadder animation \"fortnite:default_dance\""})
 @Since("1.0")
 @RequiredPlugins("ItemsAdder")

src/main/java/me/asleepp/SkriptItemsAdder/elements/effects/EffOpenCustomInventory.java

@@ -17,7 +17,7 @@
 import javax.annotation.Nullable;
 @Name("Open ItemsAdder Inventory")
 @Description("Opens an ItemsAdder inventory to a player(s), made using the ItemsAdder inventory section.")
-@Examples("open custom inventory {votegui} to all players")
+@Examples("open custom itemsadder inventory {votegui} to all players")
 @Since("1.5")
 @RequiredPlugins("ItemsAdder")
 public class EffOpenCustomInventory extends Effect {

src/main/java/me/asleepp/SkriptItemsAdder/elements/effects/EffSpawnCustomEntity.java

@@ -17,7 +17,7 @@
 import javax.annotation.Nullable;
 @Name("Spawn ItemsAdder Entity")
 @Description({"Spawns an ItemsAdder entity."})
-@Examples({"spawn custom entity \"bosses:john_wick\" at player's location"})
+@Examples({"spawn itemsadder entity \"bosses:john_wick\" at player's location"})
 @Since("1.0")
 @RequiredPlugins("ItemsAdder")
 public class EffSpawnCustomEntity extends Effect {

src/main/java/me/asleepp/SkriptItemsAdder/elements/effects/blocks/EffPlaceBlockOrCrop.java

@@ -26,7 +26,7 @@
 @Description({"Places a custom block or crop at a location."})
 @Examples({
         "set block at player's location to itemsadder block \"iasurvival:ruby_block\"",
-        "set block at player's location to custom crop \"bestcrops:best_seed\""})
+        "set block at player's location to custom itemsadder crop best seed"})
 @Since("1.0, 1.5 (Placing Crops & Syntax rework)")
 @RequiredPlugins("ItemsAdder")
 public class EffPlaceBlockOrCrop extends Effect {

src/main/java/me/asleepp/SkriptItemsAdder/elements/effects/blocks/EffSetBlocksBetween.java

@@ -13,7 +13,7 @@
 import dev.lone.itemsadder.api.CustomBlock;
 import me.asleepp.SkriptItemsAdder.SkriptItemsAdder;
 import me.asleepp.SkriptItemsAdder.other.aliases.AliasesGenerator;
-import me.asleepp.SkriptItemsAdder.other.aliases.CustomItemType;
+import me.asleepp.SkriptItemsAdder.other.util.Util;
 import org.bukkit.Location;
 import org.bukkit.event.Event;
 
@@ -24,7 +24,7 @@
 
 @Name("Set Custom Blocks Within")
 @Description({"Sets the blocks within 2 locations to ItemsAdder custom blocks."})
-@Examples({"set all blocks within location(0, 100, 0) and player's location to custom block \"iasurvival:ruby_block\""})
+@Examples({"set all blocks within location(0, 100, 0) and player's location to itemsadder block \"iasurvival:ruby_block\""})
 @Since("1.0")
 @RequiredPlugins("ItemsAdder")
 public class EffSetBlocksBetween extends Effect {
@@ -47,12 +47,7 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
                 .filter(expr -> expr instanceof Expression)
                 .map(expr -> {
                     Object value = ((Expression<?>) expr).getSingle(null);
-                    if (value instanceof CustomItemType) {
-                        return ((CustomItemType) value).getNamespacedID();
-                    } else if (value instanceof String) {
-                        return (String) value;
-                    }
-                    return null;
+                    return Util.getCustomBlockId(value);
                 })
                 .filter(name -> name != null)
                 .collect(Collectors.toList());
@@ -64,13 +59,7 @@ protected void execute(Event e) {
         Location location1 = location1Expr.getSingle(e);
         Location location2 = location2Expr.getSingle(e);
         Object customBlockIdObj = customBlockIdExpr.getSingle(e);
-        String customBlockId = null;
-
-        if (customBlockIdObj instanceof CustomItemType) {
-            customBlockId = ((CustomItemType) customBlockIdObj).getNamespacedID();
-        } else if (customBlockIdObj instanceof String) {
-            customBlockId = (String) customBlockIdObj;
-        }
+        String customBlockId = Util.getCustomBlockId(customBlockIdObj);
 
         if (location1 == null || location2 == null || customBlockId == null) {
             return;

src/main/java/me/asleepp/SkriptItemsAdder/elements/effects/furniture/EffPlaceCustomFurniture.java

@@ -10,46 +10,73 @@
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.util.Kleenean;
-import org.bukkit.entity.Entity;
-import org.bukkit.event.Event;
 import dev.lone.itemsadder.api.CustomFurniture;
+import me.asleepp.SkriptItemsAdder.other.util.Util;
 import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.event.Event;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitRunnable;
 
 import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.List;
 
 @Name("Place Custom Furniture")
-@Description({"Place a custom furniture at a location."})
-@Examples({"place custom furniture \"coolfurniture:comfy_chair\" at player's location"})
-@Since("1.3")
+@Description({
+        "Place a custom furniture at a location.",
+        "If there is a furniture at the same location, this effect will replace it."
+})
+@Examples({"place itemsadder furniture \"coolfurniture:comfy_chair\" at player's location"})
+@Since("1.3, 1.6 (Replacing)")
 @RequiredPlugins("ItemsAdder")
 public class EffPlaceCustomFurniture extends Effect {
 
-    private Expression<String> furnitureId;
-    private Expression<Location> location;
+    private Expression<?> furnitureIdExpr;
+    private Expression<Location> locationExpr;
     private JavaPlugin plugin;
 
     static {
-        Skript.registerEffect(EffPlaceCustomFurniture.class, "(set|place) [custom] (ia|itemsadder) furniture %string% at %location%");
+        Skript.registerEffect(EffPlaceCustomFurniture.class, "(set|place) [custom] (ia|itemsadder) furniture %customitemtypes/strings% at %location%");
     }
 
     @Override
     public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
-        furnitureId = (Expression<String>) exprs[0];
-        location = (Expression<Location>) exprs[1];
+        furnitureIdExpr = exprs[0];
+        locationExpr = (Expression<Location>) exprs[1];
         return true;
     }
 
     @Override
     protected void execute(Event e) {
-        String id = furnitureId.getSingle(e);
-        Location loc = location.getSingle(e);
+        if (furnitureIdExpr == null || locationExpr == null) {
+            return;
+        }
+
+        List<String> furnitureIds = new ArrayList<>();
+        if (furnitureIdExpr.isSingle()) {
+            Object itemType = furnitureIdExpr.getSingle(e);
+            furnitureIds.add(Util.getCustomBlockId(itemType));
+        } else {
+            for (Object itemType : furnitureIdExpr.getArray(e)) {
+                furnitureIds.add(Util.getCustomBlockId(itemType));
+            }
+        }
+
+        Location location = locationExpr.getSingle(e);
+        if (location == null) {
+            return;
+        }
+
+        for (String furnitureId : furnitureIds) {
+            if (furnitureId == null) {
+                Skript.error("Invalid custom furniture ID.");
+                continue;
+            }
 
-        CustomFurniture customFurniture = CustomFurniture.byAlreadySpawned(loc.getBlock());
-        if (id != null && loc != null) {
+            CustomFurniture customFurniture = CustomFurniture.byAlreadySpawned(location.getBlock());
             if (customFurniture == null) {
-                CustomFurniture.spawn(id, loc.getBlock());
+                CustomFurniture.spawn(furnitureId, location.getBlock());
             } else {
                 Entity armorStand = customFurniture.getArmorstand();
                 if (armorStand != null) {
@@ -58,7 +85,7 @@ protected void execute(Event e) {
                     new BukkitRunnable() {
                         @Override
                         public void run() {
-                            customFurniture.teleport(originalLocation);
+                            CustomFurniture.spawn(furnitureId, originalLocation.getBlock());
                         }
                     }.runTaskLater(plugin, 3);
                 }
@@ -68,7 +95,7 @@ public void run() {
 
     @Override
     public String toString(@Nullable Event e, boolean debug) {
-        return "(set|place) [custom] (ia|itemsadder) furniture " + furnitureId.toString(e, debug) + " at " + location.toString(e, debug);
+        return "(set|place) [custom] (ia|itemsadder) furniture " + furnitureIdExpr.toString(e, debug) + " at " + locationExpr.toString(e, debug);
     }
 
 }

src/main/java/me/asleepp/SkriptItemsAdder/elements/effects/furniture/EffRemoveCustomFurniture.java

@@ -11,35 +11,60 @@
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.util.Kleenean;
 import dev.lone.itemsadder.api.CustomFurniture;
+import me.asleepp.SkriptItemsAdder.other.util.Util;
 import org.bukkit.Location;
 import org.bukkit.event.Event;
 
 import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.List;
+
 @Name("Remove Custom Furniture")
 @Description({"If there is furniture at a location, this effect will remove it."})
-@Examples({"remove custom furniture at player's location"})
+@Examples({"remove itemsadder furniture at player's location"})
 @Since("1.4")
 @RequiredPlugins("ItemsAdder")
 public class EffRemoveCustomFurniture extends Effect {
 
     static {
-        Skript.registerEffect(EffRemoveCustomFurniture.class, "(remove|delete) [custom] (ia|itemsadder) furniture [%string%] at %locations%");
+        Skript.registerEffect(EffRemoveCustomFurniture.class, "(remove|delete) [custom] (ia|itemsadder) furniture [%customitemtypes/strings%] at %locations%");
     }
 
     private Expression<String> furnitureId;
     private Expression<Location> locations;
 
+    @SuppressWarnings("unchecked")
+    @Override
+    public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
+        furnitureId = (Expression<String>) exprs[0];
+        locations = (Expression<Location>) exprs[1];
+        return true;
+    }
+
     @Override
     protected void execute(Event e) {
         Location[] locs = locations.getAll(e);
-        String id = furnitureId != null ? furnitureId.getSingle(e) : null;
+        List<String> customFurnitureIds = new ArrayList<>();
+
+        if (furnitureId != null) {
+            if (furnitureId.isSingle()) {
+                Object itemType = furnitureId.getSingle(e);
+                customFurnitureIds.add(Util.getCustomBlockId(itemType));
+            } else {
+                for (Object itemType : furnitureId.getArray(e)) {
+                    customFurnitureIds.add(Util.getCustomBlockId(itemType));
+                }
+            }
+        }
 
         for (Location loc : locs) {
-            if (id != null && loc != null) {
-                CustomFurniture existingFurniture = CustomFurniture.byAlreadySpawned(loc.getBlock());
+            for (String id : customFurnitureIds) {
+                if (id != null && loc != null) {
+                    CustomFurniture existingFurniture = CustomFurniture.byAlreadySpawned(loc.getBlock());
 
-                if (existingFurniture != null) {
-                    existingFurniture.remove(false);
+                    if (existingFurniture != null) {
+                        existingFurniture.remove(false);
+                    }
                 }
             }
         }
@@ -49,12 +74,4 @@ protected void execute(Event e) {
     public String toString(@Nullable Event e, boolean debug) {
         return "remove custom furniture " + (furnitureId != null ? furnitureId.toString(e, debug) : "") + " at " + locations.toString(e, debug);
     }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
-        furnitureId = (Expression<String>) exprs[0];
-        locations = (Expression<Location>) exprs[1];
-        return true;
-    }
 }