Replace TaskConstraintSet with EnumSet implementation

Add constraint set to some task types:
- enchanting
- essentials_moneyearn
- expearn
- NPC interact task types
- playerpoints_earn

Author: Krakenied

bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/EnchantingTaskType.java

@@ -4,6 +4,7 @@
 import com.leonardobishop.quests.bukkit.item.QuestItem;
 import com.leonardobishop.quests.bukkit.tasktype.BukkitTaskType;
 import com.leonardobishop.quests.bukkit.util.TaskUtils;
+import com.leonardobishop.quests.bukkit.util.constraint.TaskConstraintSet;
 import com.leonardobishop.quests.common.player.QPlayer;
 import com.leonardobishop.quests.common.player.questprogressfile.TaskProgress;
 import com.leonardobishop.quests.common.quest.Quest;
@@ -42,7 +43,7 @@ public void onEnchant(EnchantItemEvent e) {
             return;
         }
 
-        for (TaskUtils.PendingTask pendingTask : TaskUtils.getApplicableTasks(player, qPlayer, this)) {
+        for (TaskUtils.PendingTask pendingTask : TaskUtils.getApplicableTasks(player, qPlayer, this, TaskConstraintSet.ALL)) {
             Quest quest = pendingTask.quest();
             Task task = pendingTask.task();
             TaskProgress taskProgress = pendingTask.taskProgress();

bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ExpEarnTaskType.java

@@ -3,6 +3,7 @@
 import com.leonardobishop.quests.bukkit.BukkitQuestsPlugin;
 import com.leonardobishop.quests.bukkit.tasktype.BukkitTaskType;
 import com.leonardobishop.quests.bukkit.util.TaskUtils;
+import com.leonardobishop.quests.bukkit.util.constraint.TaskConstraintSet;
 import com.leonardobishop.quests.common.player.QPlayer;
 import com.leonardobishop.quests.common.player.questprogressfile.TaskProgress;
 import com.leonardobishop.quests.common.quest.Quest;
@@ -35,7 +36,7 @@ public void onExpEarn(PlayerExpChangeEvent e) {
             return;
         }
 
-        for (TaskUtils.PendingTask pendingTask : TaskUtils.getApplicableTasks(player, qPlayer, this)) {
+        for (TaskUtils.PendingTask pendingTask : TaskUtils.getApplicableTasks(player, qPlayer, this, TaskConstraintSet.ALL)) {
             Quest quest = pendingTask.quest();
             Task task = pendingTask.task();
             TaskProgress taskProgress = pendingTask.taskProgress();

bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EssentialsMoneyEarnTaskType.java

@@ -3,6 +3,7 @@
 import com.leonardobishop.quests.bukkit.BukkitQuestsPlugin;
 import com.leonardobishop.quests.bukkit.tasktype.BukkitTaskType;
 import com.leonardobishop.quests.bukkit.util.TaskUtils;
+import com.leonardobishop.quests.bukkit.util.constraint.TaskConstraintSet;
 import com.leonardobishop.quests.common.player.QPlayer;
 import com.leonardobishop.quests.common.player.questprogressfile.TaskProgress;
 import com.leonardobishop.quests.common.quest.Quest;
@@ -38,7 +39,7 @@ public void onUserBalanceUpdate(UserBalanceUpdateEvent event) {
             return;
         }
 
-        for (TaskUtils.PendingTask pendingTask : TaskUtils.getApplicableTasks(player, qPlayer, this)) {
+        for (TaskUtils.PendingTask pendingTask : TaskUtils.getApplicableTasks(player, qPlayer, this, TaskConstraintSet.ALL)) {
             Quest quest = pendingTask.quest();
             Task task = pendingTask.task();
             TaskProgress taskProgress = pendingTask.taskProgress();

bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/InteractTaskType.java

@@ -4,6 +4,7 @@
 import com.leonardobishop.quests.bukkit.tasktype.BukkitTaskType;
 import com.leonardobishop.quests.bukkit.util.TaskUtils;
 import com.leonardobishop.quests.bukkit.util.chat.Chat;
+import com.leonardobishop.quests.bukkit.util.constraint.TaskConstraintSet;
 import com.leonardobishop.quests.common.config.ConfigProblem;
 import com.leonardobishop.quests.common.player.QPlayer;
 import com.leonardobishop.quests.common.player.questprogressfile.TaskProgress;
@@ -40,7 +41,7 @@ public void handle(Player player, T npcId, String npcName, BukkitQuestsPlugin pl
 
         boolean nameCorrected = false;
 
-        for (TaskUtils.PendingTask pendingTask : TaskUtils.getApplicableTasks(player, qPlayer, this)) {
+        for (TaskUtils.PendingTask pendingTask : TaskUtils.getApplicableTasks(player, qPlayer, this, TaskConstraintSet.ALL)) {
             Quest quest = pendingTask.quest();
             Task task = pendingTask.task();
             TaskProgress taskProgress = pendingTask.taskProgress();

bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/PlayerPointsEarnTaskType.java

@@ -3,6 +3,7 @@
 import com.leonardobishop.quests.bukkit.BukkitQuestsPlugin;
 import com.leonardobishop.quests.bukkit.tasktype.BukkitTaskType;
 import com.leonardobishop.quests.bukkit.util.TaskUtils;
+import com.leonardobishop.quests.bukkit.util.constraint.TaskConstraintSet;
 import com.leonardobishop.quests.common.player.QPlayer;
 import com.leonardobishop.quests.common.player.questprogressfile.TaskProgress;
 import com.leonardobishop.quests.common.quest.Quest;
@@ -42,7 +43,7 @@ public void onPlayerPointsChange(PlayerPointsChangeEvent event) {
             return;
         }
 
-        for (TaskUtils.PendingTask pendingTask : TaskUtils.getApplicableTasks(player, qPlayer, this)) {
+        for (TaskUtils.PendingTask pendingTask : TaskUtils.getApplicableTasks(player, qPlayer, this, TaskConstraintSet.ALL)) {
             Quest quest = pendingTask.quest();
             Task task = pendingTask.task();
             TaskProgress taskProgress = pendingTask.taskProgress();

bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/TaskUtils.java

@@ -39,6 +39,7 @@
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.UUID;
 import java.util.function.Supplier;
@@ -273,7 +274,7 @@ public static List<PendingTask> getApplicableTasks(Player player, QPlayer qPlaye
         return getApplicableTasks(player, qPlayer, type, TaskConstraintSet.NONE);
     }
 
-    public static List<PendingTask> getApplicableTasks(Player player, QPlayer qPlayer, TaskType type, TaskConstraintSet constraintSet) {
+    public static List<PendingTask> getApplicableTasks(Player player, QPlayer qPlayer, TaskType type, EnumSet<TaskConstraint> constraintSet) {
         List<PendingTask> tasks = new ArrayList<>();
 
         // Cache it as getting it requires some complex math

bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/constraint/TaskConstraint.java

@@ -1,16 +1,7 @@
 package com.leonardobishop.quests.bukkit.util.constraint;
 
 public enum TaskConstraint {
-    WORLD(0b00000001),
-    BIOME(0x00000010);
-
-    private final int value;
-
-    TaskConstraint(final int value) {
-        this.value = value;
-    }
-
-    public int getValue() {
-        return this.value;
-    }
+    WORLD,
+    BIOME,
+    REGION
 }

bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/constraint/TaskConstraintSet.java

@@ -1,30 +1,12 @@
 package com.leonardobishop.quests.bukkit.util.constraint;
 
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
-public final class TaskConstraintSet {
-
-    public static final TaskConstraintSet ALL = new TaskConstraintSet(TaskConstraint.values());
-    public static final TaskConstraintSet NONE = new TaskConstraintSet();
-    private final int rawValue;
-
-    public TaskConstraintSet(final @NotNull TaskConstraint... constraints) {
-        int rawValue = 0;
-        for (final TaskConstraint constraint : constraints) {
-            rawValue |= constraint.getValue();
-        }
-        this.rawValue = rawValue;
-    }
+import java.util.EnumSet;
 
-    public TaskConstraintSet(final @NotNull TaskConstraint constraint) {
-        this.rawValue = constraint.getValue();
-    }
-
-    public TaskConstraintSet(final int rawValue) {
-        this.rawValue = rawValue;
-    }
+@NullMarked
+public final class TaskConstraintSet {
 
-    public boolean contains(final @NotNull TaskConstraint constraint) {
-        return (this.rawValue & constraint.getValue()) != 0;
-    }
+    public static final EnumSet<TaskConstraint> ALL = EnumSet.allOf(TaskConstraint.class);
+    public static final EnumSet<TaskConstraint> NONE = EnumSet.noneOf(TaskConstraint.class);
 }