Changed ConditionList to support AND and OR.

Added ORCondition
Xemorr · Sep 24, 2021 · b3a2fb0 · b3a2fb0
1 parent 17e6446
commit b3a2fb0
Show file tree

Hide file tree

Showing 9 changed files with 72 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -118,7 +118,7 @@
         <dependency>
             <groupId>me.xemor</groupId>
             <artifactId>configurationdata</artifactId>
-            <version>1.17-SNAPSHOT</version>
+            <version>1.17.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/skillslibrary.iml b/skillslibrary.iml
@@ -38,7 +38,7 @@
     <orderEntry type="library" scope="RUNTIME" name="Maven: net.kyori:adventure-text-serializer-gson-legacy-impl:4.9.1" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: net.kyori:adventure-platform-facet:4.0.0-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: net.kyori:adventure-platform-viaversion:4.0.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: me.xemor:configurationdata:1.17-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: me.xemor:configurationdata:1.17.2-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: it.unimi.dsi:fastutil:8.1.0" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains:annotations:20.1.0" level="project" />
     <orderEntry type="library" name="Maven: net.kyori:adventure-api:4.9.1" level="project" />

diff --git a/src/main/java/me/xemor/skillslibrary2/Skill.java b/src/main/java/me/xemor/skillslibrary2/Skill.java
@@ -31,7 +31,7 @@ public Skill(ConfigurationSection skillSection) {
     }
 
     public boolean handleEffects(Entity entity, Object... objects) {
-        if (trigger.getConditions().areConditionsTrue(entity, objects)) {
+        if (trigger.getConditions().ANDConditions(entity, false, objects)) {
             return effects.handleEffects(entity, objects);
         }
         return false;

diff --git a/src/main/java/me/xemor/skillslibrary2/conditions/ConditionList.java b/src/main/java/me/xemor/skillslibrary2/conditions/ConditionList.java
@@ -41,10 +41,15 @@ private void loadConditions(ConfigurationSection conditionsSection) {
         }
     }
 
+    @Deprecated
     public boolean areConditionsTrue(Entity entity, Object... objects) {
+        return ANDConditions(entity, false, objects);
+    }
+
+    public boolean ANDConditions(Entity entity, boolean exact, Object... objects) {
         Object otherObject = objects.length == 0 ? null : objects[0];
         for (Condition condition : conditions) {
-            if (condition instanceof EntityCondition && condition.getMode().runs(Mode.SELF)) {
+            if (condition instanceof EntityCondition && condition.getMode().runs(Mode.SELF) && (!exact || otherObject == null)) {
                 EntityCondition entityCondition = (EntityCondition) condition;
                 boolean result = entityCondition.isTrue(entity);
                 if (!result) return false;
@@ -63,6 +68,28 @@ else if (condition instanceof LocationCondition && otherObject instanceof Locati
         return true;
     }
 
+    public boolean ORConditions(Entity entity, boolean exact, Object... objects) {
+        Object otherObject = objects.length == 0 ? null : objects[0];
+        for (Condition condition : conditions) {
+            if (condition instanceof EntityCondition && condition.getMode().runs(Mode.SELF) && (!exact || otherObject == null)) {
+                EntityCondition entityCondition = (EntityCondition) condition;
+                boolean result = entityCondition.isTrue(entity);
+                if (result) return true;
+            }
+            if (condition instanceof TargetCondition && otherObject instanceof Entity && condition.getMode().runs(Mode.OTHER)) {
+                TargetCondition targetCondition = (TargetCondition) condition;
+                boolean result = targetCondition.isTrue(entity, (Entity) objects[0]);
+                if (result) return true;
+            }
+            else if (condition instanceof LocationCondition && otherObject instanceof Location && condition.getMode().runs(Mode.LOCATION)) {
+                LocationCondition locationCondition = (LocationCondition) condition;
+                boolean result = locationCondition.isTrue(entity, (Location) objects[0]);
+                if (!result) return true;
+            }
+        }
+        return false;
+    }
+
     public void addCondition(Condition condition) {
         conditions.add(0, condition);
     }

diff --git a/src/main/java/me/xemor/skillslibrary2/conditions/Conditions.java b/src/main/java/me/xemor/skillslibrary2/conditions/Conditions.java
@@ -32,6 +32,7 @@ public class Conditions {
         register("HEIGHT", HeightCondition.class);
         register("BLOCK", BlockCondition.class);
         register("ITEM", ItemComparisonCondition.class);
+        register("OR", ORCondition.class);
     }
 
     public static void register(String name, Class<? extends Condition> triggerDataClass) {

diff --git a/src/main/java/me/xemor/skillslibrary2/conditions/ORCondition.java b/src/main/java/me/xemor/skillslibrary2/conditions/ORCondition.java
@@ -0,0 +1,37 @@
+package me.xemor.skillslibrary2.conditions;
+
+import org.bukkit.Location;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.Entity;
+import org.bukkit.inventory.ItemStack;
+
+public class ORCondition extends Condition implements EntityCondition, TargetCondition, LocationCondition, ItemStackCondition {
+
+    private final ConditionList conditions;
+
+    public ORCondition(int condition, ConfigurationSection configurationSection) {
+        super(condition, configurationSection);
+        conditions = new ConditionList(configurationSection.getConfigurationSection("conditions"));
+    }
+
+    @Override
+    public boolean isTrue(Entity entity) {
+        return conditions.ORConditions(entity, true);
+    }
+
+    @Override
+    public boolean isTrue(Entity entity, ItemStack itemStack) {
+        return conditions.ORConditions(entity, true, itemStack);
+    }
+
+    @Override
+    public boolean isTrue(Entity entity, Location location) {
+        return conditions.ORConditions(entity, true, location);
+    }
+
+    @Override
+    public boolean isTrue(Entity entity, Entity target) {
+        return conditions.ORConditions(entity, true, target);
+    }
+
+}
diff --git a/src/main/java/me/xemor/skillslibrary2/effects/NearestEffect.java b/src/main/java/me/xemor/skillslibrary2/effects/NearestEffect.java
@@ -36,6 +36,7 @@ public boolean useEffect(Entity entity) {
     @Override
     public boolean useEffect(Entity livingEntity, Entity target) {
         LivingEntity nearest = getNearest(livingEntity, target.getLocation());
+        if (nearest == null) return false;
         return handleEffects(livingEntity, nearest);
     }
 

diff --git a/src/main/java/me/xemor/skillslibrary2/effects/SwitcherooWrapperEffect.java b/src/main/java/me/xemor/skillslibrary2/effects/SwitcherooWrapperEffect.java
@@ -11,8 +11,7 @@ public SwitcherooWrapperEffect(int effect, ConfigurationSection configurationSec
 
     @Override
     public boolean useEffect(Entity entity, Entity target) {
-        handleEffects(target, entity);
-        return false;
+        return handleEffects(target, entity);
     }
 
 }
diff --git a/src/main/java/me/xemor/skillslibrary2/effects/WrapperEffect.java b/src/main/java/me/xemor/skillslibrary2/effects/WrapperEffect.java
@@ -25,13 +25,10 @@ public WrapperEffect(int effect, ConfigurationSection configurationSection) {
         else {
             effects = new EffectList();
         }
-
-
-
     }
 
     public boolean handleEffects(Entity entity, Object... objects) {
-        if (conditions.areConditionsTrue(entity, objects)) {
+        if (conditions.ANDConditions(entity, false, objects)) {
             return effects.handleExactEffects(entity, objects);
         }
         return false;