Replace trySetSkipped variants with a set of parts

Author: Yeregorix

src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageStep.java

@@ -26,9 +26,11 @@
 
 import org.spongepowered.api.event.Cause;
 
+import java.util.EnumSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.OptionalDouble;
+import java.util.Set;
 
 /**
  * A step represent an operation made by the platform (vanilla and mods) or modifiers added by plugins.
@@ -70,65 +72,45 @@ public interface DamageStep {
     void setSkipped(boolean skipped);
 
     /**
-     * Sets whether this step is skipped.
-     * This has no effect if the step has already finished.
+     * Skips this step.
      *
      * @see #isSkipped()
+     * @throws IllegalStateException if called after the step has finished.
      */
-    default void trySetSkipped(boolean skipped) {
-        if (this.damageAfterSelf().isEmpty()) {
-            this.setSkipped(skipped);
-        }
+    default void skip() {
+        this.setSkipped(true);
     }
 
     /**
-     * Sets whether the children before this step are skipped.
+     * Sets whether parts of this step are skipped.
      * This has no effect on steps already finished.
      *
      * @see #isSkipped()
      */
-    default void trySetChildrenBeforeSkipped(boolean skipped) {
-        if (this.damageBeforeSelf().isEmpty()) {
+    default void trySetSkipped(Set<Part> parts, boolean skipped) {
+        if (parts.contains(Part.CHILDREN_BEFORE) && this.damageBeforeSelf().isEmpty()) {
             for (DamageStep child : this.childrenBefore()) {
-                child.trySetSkipped(skipped);
+                child.trySetSkipped(Part.ALL, skipped);
             }
         }
-    }
-
-    /**
-     * Sets whether the children after this step are skipped.
-     * This has no effect on steps already finished.
-     *
-     * @see #isSkipped()
-     */
-    default void trySetChildrenAfterSkipped(boolean skipped) {
-        if (this.damageAfterChildren().isEmpty()) {
+        if (parts.contains(Part.SELF) && this.damageAfterSelf().isEmpty()) {
+            this.setSkipped(skipped);
+        }
+        if (parts.contains(Part.CHILDREN_AFTER) && this.damageAfterChildren().isEmpty()) {
             for (DamageStep child : this.childrenAfter()) {
-                child.trySetSkipped(skipped);
+                child.trySetSkipped(Part.ALL, skipped);
             }
         }
     }
 
     /**
-     * Sets whether this step and its children are skipped.
+     * Skips parts of this step.
      * This has no effect on steps already finished.
      *
      * @see #isSkipped()
      */
-    default void trySetAllSkipped(boolean skipped) {
-        this.trySetChildrenBeforeSkipped(skipped);
-        this.trySetSkipped(skipped);
-        this.trySetChildrenAfterSkipped(skipped);
-    }
-
-    /**
-     * Skips this step.
-     *
-     * @see #isSkipped()
-     * @throws IllegalStateException if called after the step has finished.
-     */
-    default void skip() {
-        this.setSkipped(true);
+    default void trySkip(Set<Part> parts) {
+        this.trySetSkipped(parts, true);
     }
 
     /**
@@ -205,4 +187,13 @@ default DamageStep root() {
      * @return The list of children steps
      */
     List<DamageStep> childrenAfter();
+
+    /**
+     * The parts composing a step.
+     */
+    enum Part {
+        SELF, CHILDREN_BEFORE, CHILDREN_AFTER;
+
+        public static final EnumSet<Part> ALL = EnumSet.allOf(Part.class);
+    }
 }