Version 1.4.1

Author: Asleeepp

build.gradle

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

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

@@ -28,6 +28,9 @@ public class CondGetAction extends Condition {
 
     @Override
     public boolean check(Event e) {
+        if (!(e instanceof CustomBlockInteractEvent)) {
+            return false;
+        }
         CustomBlockInteractEvent event = (CustomBlockInteractEvent) e;
         if (isLeft) {
             return event.getAction() == Action.LEFT_CLICK_BLOCK;
@@ -36,14 +39,20 @@ public boolean check(Event e) {
         }
     }
 
+
     @Override
     public String toString(@Nullable Event e, boolean debug) {
         return "interact action is " + (isLeft ? "left" : "right") + " click";
     }
 
     @Override
     public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
+        if (!getParser().isCurrentEvent(CustomBlockInteractEvent.class)) {
+            Skript.error("You can't use 'interact action is (:right|:left) click' outside of a custom block interact event!");
+            return false;
+        }
         isLeft = parseResult.hasTag("left");
         return true;
     }
+
 }

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

@@ -42,7 +42,12 @@ public String toString(@Nullable Event e, boolean debug) {
 
     @Override
     public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
+        if (!getParser().isCurrentEvent(CustomBlockInteractEvent.class)) {
+            Skript.error("You can't use 'the block clicked is ...' outside of a custom block interact event!");
+            return false;
+        }
         block = (Expression<String>) exprs[0];
         return true;
     }
+
 }

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

@@ -28,17 +28,25 @@ public class CondGetBlockFace extends Condition {
 
     @Override
     public boolean check(Event e) {
+        if (!(e instanceof CustomBlockInteractEvent)) {
+            return false;
+        }
         CustomBlockInteractEvent event = (CustomBlockInteractEvent) e;
         return event.getBlockFace() == face;
     }
 
+
     @Override
     public String toString(@Nullable Event e, boolean debug) {
         return "clicked block face is " + face.toString();
     }
 
     @Override
     public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
+        if (!getParser().isCurrentEvent(CustomBlockInteractEvent.class)) {
+            Skript.error("You can't use 'clicked block face is (:down|:north|:south|:east|:west|:up)' outside of a custom block interact event!");
+            return false;
+        }
         if (parseResult.hasTag("north")) {
             face = BlockFace.NORTH;
         } else if (parseResult.hasTag("south")) {

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

@@ -34,8 +34,8 @@ protected void execute(Event e) {
         Location loc = location.getSingle(e);
         if (id != null && loc != null) {
             CustomFurniture existingFurniture = CustomFurniture.byAlreadySpawned(loc.getBlock());
-            if (existingFurniture != null) {
-                existingFurniture.replaceFurniture(id);
+                if (existingFurniture != null) {
+                    existingFurniture.replaceFurniture(id);
             }
         }
     }

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

@@ -13,6 +13,7 @@
 import dev.lone.itemsadder.api.CustomBlock;
 import dev.lone.itemsadder.api.Events.CustomBlockBreakEvent;
 import dev.lone.itemsadder.api.Events.CustomBlockInteractEvent;
+import org.bukkit.block.Block;
 import org.bukkit.event.Event;
 
 import javax.annotation.Nullable;
@@ -26,14 +27,15 @@ public class EvtCustomBlockInteract extends SkriptEvent {
 
     static {
         Skript.registerEvent("Custom Block Interact", EvtCustomBlockInteract.class, CustomBlockInteractEvent.class, "interact with (custom|ia|itemsadder) block [%string%]");
-        EventValues.registerEventValue(CustomBlockBreakEvent.class, CustomBlock.class, new Getter<CustomBlock, CustomBlockBreakEvent>() {
+        EventValues.registerEventValue(CustomBlockInteractEvent.class, Block.class, new Getter<Block, CustomBlockInteractEvent>() {
             @Override
-            public CustomBlock get(CustomBlockBreakEvent event) {
-                return CustomBlock.byAlreadyPlaced(event.getBlock());
+            public Block get(CustomBlockInteractEvent event) {
+                return event.getBlockClicked();
             }
         }, 0);
     }
 
+
     @SuppressWarnings("unchecked")
     @Override
     public boolean init(Literal<?>[] args, int matchedPattern, SkriptParser.ParseResult parseResult) {

src/main/java/me/asleepp/SkriptItemsAdder/elements/events/EvtCustomBlockInteract.java

@@ -51,6 +51,11 @@ public String toString(@Nullable Event e, boolean debug) {
 
     @Override
     public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
+        if (!getParser().isCurrentEvent(CustomBlockInteractEvent.class)) {
+            Skript.error("You can't use 'the item linked/associated with the block' outside of a custom block interact event!");
+            return false;
+        }
         return true;
     }
+
 }

src/main/java/me/asleepp/SkriptItemsAdder/elements/expressions/ExprGetCustomBlockItem.java

@@ -2,6 +2,6 @@ name: skript-itemsadder
 authors: [Asleepp]
 description: A Skript Addon that adds useful syntax to be used in conjunction with ItemsAdder
 api-version: 1.13
-version: 1.4
+version: 1.4.1
 main: me.asleepp.SkriptItemsAdder.SkriptItemsAdder
 depend: [Skript, ItemsAdder]