Merge pull request #820 from TonytheMacaroni/main

Add more block-related conditions

core/src/main/java/com/nisovin/magicspells/castmodifiers/conditions/BuildableCondition.java

@@ -0,0 +1,30 @@
+package com.nisovin.magicspells.castmodifiers.conditions;
+
+import org.bukkit.Location;
+import org.bukkit.entity.LivingEntity;
+
+import com.nisovin.magicspells.castmodifiers.Condition;
+
+public class BuildableCondition extends Condition {
+
+	@Override
+	public boolean initialize(String var) {
+		return true;
+	}
+
+	@Override
+	public boolean check(LivingEntity livingEntity) {
+		return false;
+	}
+
+	@Override
+	public boolean check(LivingEntity livingEntity, LivingEntity target) {
+		return false;
+	}
+
+	@Override
+	public boolean check(LivingEntity livingEntity, Location location) {
+		return location.getBlock().isBuildable();
+	}
+
+}

core/src/main/java/com/nisovin/magicspells/castmodifiers/conditions/BurnableCondition.java

@@ -0,0 +1,30 @@
+package com.nisovin.magicspells.castmodifiers.conditions;
+
+import org.bukkit.Location;
+import org.bukkit.entity.LivingEntity;
+
+import com.nisovin.magicspells.castmodifiers.Condition;
+
+public class BurnableCondition extends Condition {
+
+	@Override
+	public boolean initialize(String var) {
+		return true;
+	}
+
+	@Override
+	public boolean check(LivingEntity livingEntity) {
+		return false;
+	}
+
+	@Override
+	public boolean check(LivingEntity livingEntity, LivingEntity target) {
+		return false;
+	}
+
+	@Override
+	public boolean check(LivingEntity livingEntity, Location location) {
+		return location.getBlock().isBurnable();
+	}
+
+}

core/src/main/java/com/nisovin/magicspells/castmodifiers/conditions/CollidableCondition.java

@@ -0,0 +1,30 @@
+package com.nisovin.magicspells.castmodifiers.conditions;
+
+import org.bukkit.Location;
+import org.bukkit.entity.LivingEntity;
+
+import com.nisovin.magicspells.castmodifiers.Condition;
+
+public class CollidableCondition extends Condition {
+
+	@Override
+	public boolean initialize(String var) {
+		return true;
+	}
+
+	@Override
+	public boolean check(LivingEntity livingEntity) {
+		return false;
+	}
+
+	@Override
+	public boolean check(LivingEntity livingEntity, LivingEntity target) {
+		return false;
+	}
+
+	@Override
+	public boolean check(LivingEntity livingEntity, Location location) {
+		return location.getBlock().isCollidable();
+	}
+
+}

core/src/main/java/com/nisovin/magicspells/castmodifiers/conditions/PassableCondition.java

@@ -0,0 +1,30 @@
+package com.nisovin.magicspells.castmodifiers.conditions;
+
+import org.bukkit.Location;
+import org.bukkit.entity.LivingEntity;
+
+import com.nisovin.magicspells.castmodifiers.Condition;
+
+public class PassableCondition extends Condition {
+
+	@Override
+	public boolean initialize(String var) {
+		return true;
+	}
+
+	@Override
+	public boolean check(LivingEntity livingEntity) {
+		return false;
+	}
+
+	@Override
+	public boolean check(LivingEntity livingEntity, LivingEntity target) {
+		return false;
+	}
+
+	@Override
+	public boolean check(LivingEntity livingEntity, Location location) {
+		return location.getBlock().isPassable();
+	}
+
+}

core/src/main/java/com/nisovin/magicspells/castmodifiers/conditions/ReplaceableCondition.java

@@ -0,0 +1,30 @@
+package com.nisovin.magicspells.castmodifiers.conditions;
+
+import org.bukkit.Location;
+import org.bukkit.entity.LivingEntity;
+
+import com.nisovin.magicspells.castmodifiers.Condition;
+
+public class ReplaceableCondition extends Condition {
+
+	@Override
+	public boolean initialize(String var) {
+		return true;
+	}
+
+	@Override
+	public boolean check(LivingEntity livingEntity) {
+		return false;
+	}
+
+	@Override
+	public boolean check(LivingEntity livingEntity, LivingEntity target) {
+		return false;
+	}
+
+	@Override
+	public boolean check(LivingEntity livingEntity, Location location) {
+		return location.getBlock().isReplaceable();
+	}
+
+}

core/src/main/java/com/nisovin/magicspells/castmodifiers/conditions/SolidCondition.java

@@ -0,0 +1,30 @@
+package com.nisovin.magicspells.castmodifiers.conditions;
+
+import org.bukkit.Location;
+import org.bukkit.entity.LivingEntity;
+
+import com.nisovin.magicspells.castmodifiers.Condition;
+
+public class SolidCondition extends Condition {
+
+	@Override
+	public boolean initialize(String var) {
+		return true;
+	}
+
+	@Override
+	public boolean check(LivingEntity livingEntity) {
+		return false;
+	}
+
+	@Override
+	public boolean check(LivingEntity livingEntity, LivingEntity target) {
+		return false;
+	}
+
+	@Override
+	public boolean check(LivingEntity livingEntity, Location location) {
+		return location.getBlock().isSolid();
+	}
+
+}

core/src/main/java/com/nisovin/magicspells/util/managers/ConditionManager.java

@@ -178,6 +178,12 @@ private void initialize() {
 		addCondition("ownedloopactive", OwnedLoopActiveCondition.class);
 		addCondition("always", AlwaysCondition.class);
 		addCondition("velocityactive", VelocityActiveCondition.class);
+		addCondition("buildable", BuildableCondition.class);
+		addCondition("burnable", BurnableCondition.class);
+		addCondition("collidable", CollidableCondition.class);
+		addCondition("passable", PassableCondition.class);
+		addCondition("replaceable", ReplaceableCondition.class);
+		addCondition("solid", SolidCondition.class);
 	}
 
 }