From 39a2ff2af4d194f270d5e9ecdace43be4cb8bf1d Mon Sep 17 00:00:00 2001
From: Integer Limit <103940576+IntegerLimit@users.noreply.github.com>
Date: Tue, 15 Oct 2024 20:03:25 +1100
Subject: [PATCH] Add Optional Fluid Task

---
 .../core/proxies/CommonProxy.java             |  1 +
 .../questing/tasks/TaskOptionalFluid.java     | 25 ++++++++++++++++
 .../factory/FactoryTaskOptionalFluid.java     | 30 +++++++++++++++++++
 .../assets/betterquesting/lang/en_us.lang     |  1 +
 4 files changed, 57 insertions(+)
 create mode 100644 src/main/java/betterquesting/questing/tasks/TaskOptionalFluid.java
 create mode 100644 src/main/java/betterquesting/questing/tasks/factory/FactoryTaskOptionalFluid.java

diff --git a/src/main/java/betterquesting/core/proxies/CommonProxy.java b/src/main/java/betterquesting/core/proxies/CommonProxy.java
index a4b0ce2d5..9c6e8e921 100644
--- a/src/main/java/betterquesting/core/proxies/CommonProxy.java
+++ b/src/main/java/betterquesting/core/proxies/CommonProxy.java
@@ -54,6 +54,7 @@ public void registerExpansion() {
         taskReg.register(FactoryTaskInteractEntity.INSTANCE);
         taskReg.register(FactoryTaskTrigger.INSTANCE);
         taskReg.register(FactoryTaskOptionalRetrieval.INSTANCE);
+        taskReg.register(FactoryTaskOptionalFluid.INSTANCE);
 
         IRegistry<IFactoryData<IReward, NBTTagCompound>, IReward> rewardReg = QuestingAPI.getAPI(ApiReference.REWARD_REG);
         rewardReg.register(FactoryRewardChoice.INSTANCE);
diff --git a/src/main/java/betterquesting/questing/tasks/TaskOptionalFluid.java b/src/main/java/betterquesting/questing/tasks/TaskOptionalFluid.java
new file mode 100644
index 000000000..59e7c4681
--- /dev/null
+++ b/src/main/java/betterquesting/questing/tasks/TaskOptionalFluid.java
@@ -0,0 +1,25 @@
+package betterquesting.questing.tasks;
+
+import betterquesting.core.BetterQuesting;
+import betterquesting.questing.tasks.factory.FactoryTaskOptionalFluid;
+import net.minecraft.util.ResourceLocation;
+
+import java.util.UUID;
+
+public class TaskOptionalFluid extends TaskFluid {
+
+    @Override
+    public String getUnlocalisedName() {
+        return BetterQuesting.MODID_STD + ".task.optional_fluid";
+    }
+
+    @Override
+    public ResourceLocation getFactoryID() {
+        return FactoryTaskOptionalFluid.INSTANCE.getRegistryName();
+    }
+
+    @Override
+    public boolean ignored(UUID uuid) {
+        return true;
+    }
+}
diff --git a/src/main/java/betterquesting/questing/tasks/factory/FactoryTaskOptionalFluid.java b/src/main/java/betterquesting/questing/tasks/factory/FactoryTaskOptionalFluid.java
new file mode 100644
index 000000000..7a0ad13a8
--- /dev/null
+++ b/src/main/java/betterquesting/questing/tasks/factory/FactoryTaskOptionalFluid.java
@@ -0,0 +1,30 @@
+package betterquesting.questing.tasks.factory;
+
+import betterquesting.api.questing.tasks.ITask;
+import betterquesting.api2.registry.IFactoryData;
+import betterquesting.core.BetterQuesting;
+import betterquesting.questing.tasks.TaskOptionalFluid;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.ResourceLocation;
+
+public class FactoryTaskOptionalFluid implements IFactoryData<ITask, NBTTagCompound> {
+
+    public static final FactoryTaskOptionalFluid INSTANCE = new FactoryTaskOptionalFluid();
+
+    @Override
+    public ResourceLocation getRegistryName() {
+        return new ResourceLocation(BetterQuesting.MODID_STD + ":optional_fluid");
+    }
+
+    @Override
+    public TaskOptionalFluid createNew() {
+        return new TaskOptionalFluid();
+    }
+
+    @Override
+    public TaskOptionalFluid loadFromData(NBTTagCompound json) {
+        TaskOptionalFluid task = new TaskOptionalFluid();
+        task.readFromNBT(json);
+        return task;
+    }
+}
diff --git a/src/main/resources/assets/betterquesting/lang/en_us.lang b/src/main/resources/assets/betterquesting/lang/en_us.lang
index bde9a5d2b..ce6a99834 100644
--- a/src/main/resources/assets/betterquesting/lang/en_us.lang
+++ b/src/main/resources/assets/betterquesting/lang/en_us.lang
@@ -258,6 +258,7 @@ bq_standard.task.hunt=Mob Hunt Task
 bq_standard.task.scoreboard=Scoreboard Task
 bq_standard.task.location=Location Task
 bq_standard.task.fluid=Fluid Task
+bq_standard.task.optional_fluid=Optional Fluid Task
 bq_standard.task.meeting=Meeting Task
 bq_standard.task.xp=Experience Task
 bq_standard.task.block_break=Break Block Task