Add /waypoints opendoors

CitizensDev · Jul 12, 2019 · 0e328ee · 0e328ee
1 parent 0547176
commit 0e328ee
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/commands/WaypointCommands.java b/main/src/main/java/net/citizensnpcs/commands/WaypointCommands.java
@@ -1,5 +1,7 @@
 package net.citizensnpcs.commands;
 
+import org.bukkit.command.CommandSender;
+
 import net.citizensnpcs.Citizens;
 import net.citizensnpcs.api.command.Command;
 import net.citizensnpcs.api.command.CommandContext;
@@ -10,8 +12,6 @@
 import net.citizensnpcs.trait.waypoint.Waypoints;
 import net.citizensnpcs.util.Messages;
 
-import org.bukkit.command.CommandSender;
-
 @Requirements(ownership = true, selected = true)
 public class WaypointCommands {
     public WaypointCommands(Citizens plugin) {
@@ -31,6 +31,21 @@ public void disableTeleporting(CommandContext args, CommandSender sender, NPC np
         Messaging.sendTr(sender, Messages.WAYPOINT_TELEPORTING_DISABLED);
     }
 
+    @Command(
+            aliases = { "waypoints", "waypoint", "wp" },
+            usage = "opendoors",
+            desc = "Enables opening doors when pathfinding (temporary command)",
+            modifiers = { "opendoors" },
+            min = 1,
+            max = 1,
+            permission = "citizens.waypoints.opendoors")
+    public void openDoors(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
+        boolean opensDoors = !npc.data().get(NPC.PATHFINDER_OPEN_DOORS_METADATA, false);
+        npc.data().setPersistent(NPC.PATHFINDER_OPEN_DOORS_METADATA, opensDoors);
+        Messaging.sendTr(sender,
+                opensDoors ? Messages.PATHFINDER_OPEN_DOORS_ENABLED : Messages.PATHFINDER_OPEN_DOORS_DISABLED);
+    }
+
     @Command(
             aliases = { "waypoints", "waypoint", "wp" },
             usage = "provider [provider name] (-d)",

diff --git a/main/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java b/main/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java
@@ -56,9 +56,6 @@ public class CitizensNavigator implements Navigator, Runnable {
     public CitizensNavigator(NPC npc) {
         this.npc = npc;
         defaultParams.examiner(new SwimmingExaminer(npc));
-        if (Setting.NEW_PATHFINDER_OPENS_DOORS.asBoolean()) {
-            defaultParams.examiner(new DoorExaminer());
-        }
     }
 
     @Override
@@ -329,6 +326,10 @@ private void stopNavigating(CancelReason reason) {
 
     private void switchParams() {
         localParams = defaultParams.clone();
+        if (!npc.data().has(NPC.PATHFINDER_OPEN_DOORS_METADATA) ? Setting.NEW_PATHFINDER_OPENS_DOORS.asBoolean()
+                : npc.data().<Boolean> get(NPC.PATHFINDER_OPEN_DOORS_METADATA)) {
+            localParams.examiner(new DoorExaminer());
+        }
     }
 
     private void switchStrategyTo(PathStrategy newStrategy) {

diff --git a/main/src/main/java/net/citizensnpcs/util/Messages.java b/main/src/main/java/net/citizensnpcs/util/Messages.java
@@ -208,6 +208,8 @@ public class Messages {
     public static final String PARROT_VARIANT_SET = "citizens.commands.npc.parrot.variant-set";
     public static final String PASSIVE_SET = "citizens.commands.npc.passive.set";
     public static final String PASSIVE_UNSET = "citizens.commands.npc.passive.unset";
+    public static final String PATHFINDER_OPEN_DOORS_DISABLED = "citizens.commands.waypoints.opendoors.disabled";
+    public static final String PATHFINDER_OPEN_DOORS_ENABLED = "citizens.commands.waypoints.opendoors.enabled";
     public static final String PATHFINDING_OPTIONS_ATTACK_RANGE_SET = "citizens.commands.npc.pathopt.attack-range-set";
     public static final String PATHFINDING_OPTIONS_AVOID_WATER_SET = "citizens.commands.npc.pathopt.avoid-water-set";
     public static final String PATHFINDING_OPTIONS_AVOID_WATER_UNSET = "citizens.commands.npc.pathopt.avoid-water-unset";

diff --git a/main/src/main/resources/messages_en.properties b/main/src/main/resources/messages_en.properties
@@ -221,6 +221,8 @@ citizens.commands.traitc.missing=Trait not found.
 citizens.commands.traitc.not-configurable=That trait is not configurable.
 citizens.commands.traitc.not-on-npc=The NPC doesn''t have that trait.
 citizens.commands.unknown-command=Unknown command. Did you mean:
+citizens.commands.waypoints.opendoors.enabled=[[{0}]] will now open doors while pathfinding.
+citizens.commands.waypoints.opendoors.disabled=[[{0}]] will no longer doors while pathfinding.
 citizens.commands.wolf.traits-updated=[[{0}]]''s Traits were updated. Angry:[[{1}]], Sitting:[[{2}]], Tamed:[[{3}]], Collar Color:[[{4}]] 
 citizens.conversations.selection.invalid-choice=[[{0}]] is not a valid option.
 citizens.economy.error-loading=Unable to use economy handling. Has Vault been enabled?