From 0886f176b3280e0bbb902c265c3d3e4ef160b488 Mon Sep 17 00:00:00 2001
From: Brady <zeromemesdev@gmail.com>
Date: Sun, 18 Jun 2023 21:46:03 -0500
Subject: [PATCH] Make elytra API changes

---
 .../api/behavior/IElytraBehavior.java         | 17 ++++++-------
 .../baritone/behavior/ElytraBehavior.java     | 25 ++++++-------------
 .../command/defaults/ElytraCommand.java       |  2 +-
 .../defaults/ExecutionControlCommands.java    |  2 --
 4 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/src/api/java/baritone/api/behavior/IElytraBehavior.java b/src/api/java/baritone/api/behavior/IElytraBehavior.java
index dc44eacda..3c3b91466 100644
--- a/src/api/java/baritone/api/behavior/IElytraBehavior.java
+++ b/src/api/java/baritone/api/behavior/IElytraBehavior.java
@@ -17,19 +17,16 @@
 
 package baritone.api.behavior;
 
+import net.minecraft.util.math.BlockPos;
+
 public interface IElytraBehavior extends IBehavior {
-    /**
-     * Pause the current {@link IElytraBehavior} if it is pathing.
-     */
-    void pause();
+
+    void pathTo(BlockPos destination);
+
+    void cancel();
 
     /**
-     * Resume the current {@link IElytraBehavior} if it is paused.
-     */
-    void resume();
-
-    /**
-     * Returns true if the current {@link IElytraBehavior} is actively pathing and not paused.
+     * Returns {@code true} if the current {@link IElytraBehavior} is actively pathing.
      */
     boolean isActive();
 }
diff --git a/src/main/java/baritone/behavior/ElytraBehavior.java b/src/main/java/baritone/behavior/ElytraBehavior.java
index 77f414776..12723a001 100644
--- a/src/main/java/baritone/behavior/ElytraBehavior.java
+++ b/src/main/java/baritone/behavior/ElytraBehavior.java
@@ -64,7 +64,6 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
     private final NetherPathfinderContext context;
     private final PathManager pathManager;
     private int sinceFirework;
-    private boolean pawsed = false;
 
     public ElytraBehavior(Baritone baritone) {
         super(baritone);
@@ -180,6 +179,7 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
             this.path = Collections.emptyList();
             this.playerNear = 0;
             this.completePath = true;
+            this.destination = null;
         }
 
         private void setPath(final UnpackedSegment segment) {
@@ -305,33 +305,22 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
                 .forEach(this.context::queueForPacking);
     }
 
-    public void path(BlockPos destination) {
-        pawsed = false;
+    @Override
+    public void pathTo(BlockPos destination) {
         this.pathManager.pathToDestination(destination);
     }
 
+    @Override
     public void cancel() {
         this.visiblePath = Collections.emptyList();
         this.pathManager.clear();
         this.aimPos = null;
         this.sinceFirework = 0;
-        pawsed = false;
     }
 
+    @Override
     public boolean isActive() {
-        return !this.pathManager.getPath().isEmpty() && !isPaused();
-    }
-
-    public void pause() {
-        this.pawsed = true;
-    }
-
-    public void resume() {
-        this.pawsed = false;
-    }
-
-    public boolean isPaused() {
-        return this.pawsed;
+        return !this.pathManager.getPath().isEmpty();
     }
 
     @Override
@@ -339,7 +328,7 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
         if (event.getType() == TickEvent.Type.OUT) {
             return;
         }
-        if (isPaused()) return;
+
         this.clearLines.clear();
         this.blockedLines.clear();
 
diff --git a/src/main/java/baritone/command/defaults/ElytraCommand.java b/src/main/java/baritone/command/defaults/ElytraCommand.java
index 7c101fd3b..f96901b9b 100644
--- a/src/main/java/baritone/command/defaults/ElytraCommand.java
+++ b/src/main/java/baritone/command/defaults/ElytraCommand.java
@@ -64,7 +64,7 @@ public class ElytraCommand extends Command {
         if (y <= 0 || y >= 128) {
             throw new CommandInvalidStateException("The y of the goal is not between 0 and 128");
         }
-        ((Baritone) baritone).getElytraBehavior().path(new BlockPos(x, y, z));
+        ((Baritone) baritone).getElytraBehavior().pathTo(new BlockPos(x, y, z));
     }
 
     @Override
diff --git a/src/main/java/baritone/command/defaults/ExecutionControlCommands.java b/src/main/java/baritone/command/defaults/ExecutionControlCommands.java
index 6ca324ad7..ef566bb8d 100644
--- a/src/main/java/baritone/command/defaults/ExecutionControlCommands.java
+++ b/src/main/java/baritone/command/defaults/ExecutionControlCommands.java
@@ -89,7 +89,6 @@ public class ExecutionControlCommands {
                     throw new CommandInvalidStateException("Already paused");
                 }
                 paused[0] = true;
-                baritone.getElytraBehavior().pause();
                 logDirect("Paused");
             }
 
@@ -124,7 +123,6 @@ public class ExecutionControlCommands {
                     throw new CommandInvalidStateException("Not paused");
                 }
                 paused[0] = false;
-                baritone.getElytraBehavior().resume();
                 logDirect("Resumed");
             }