From 41e8c69db9718a2032fb109ce1f4d34de3b5a41a Mon Sep 17 00:00:00 2001
From: Babbaj <babbaj45@gmail.com>
Date: Sun, 16 Jul 2023 18:58:42 -0400
Subject: [PATCH] consistent elytra setting naming

---
 src/api/java/baritone/api/Settings.java             | 10 +++++-----
 src/main/java/baritone/behavior/ElytraBehavior.java | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/api/java/baritone/api/Settings.java b/src/api/java/baritone/api/Settings.java
index e203a0ebf..2ec56b1a4 100644
--- a/src/api/java/baritone/api/Settings.java
+++ b/src/api/java/baritone/api/Settings.java
@@ -1366,23 +1366,23 @@ public final class Settings {
     /**
      * If enabled, avoids using fireworks when descending along the flight path.
      */
-    public final Setting<Boolean> conserveFireworks = new Setting<>(true);
+    public final Setting<Boolean> elytraConserveFireworks = new Setting<>(true);
 
     /**
      * Renders the raytraces that are performed by the elytra fly calculation.
      */
-    public final Setting<Boolean> renderRaytraces = new Setting<>(false);
+    public final Setting<Boolean> elytraRenderRaytraces = new Setting<>(false);
 
     /**
      * Renders the raytraces that are used in the hitbox part of the elytra fly calculation.
-     * Requires {@link #renderRaytraces}.
+     * Requires {@link #elytraRenderRaytraces}.
      */
-    public final Setting<Boolean> renderHitboxRaytraces = new Setting<>(false);
+    public final Setting<Boolean> elytraRenderHitboxRaytraces = new Setting<>(false);
 
     /**
      * Renders the best elytra flight path that was simulated each tick.
      */
-    public final Setting<Boolean> renderElytraSimulation = new Setting<>(false);
+    public final Setting<Boolean> elytraRenderSimulation = new Setting<>(false);
 
     /**
      * Automatically path to and jump off of ledges to initiate elytra flight when grounded.
diff --git a/src/main/java/baritone/behavior/ElytraBehavior.java b/src/main/java/baritone/behavior/ElytraBehavior.java
index b9bbd65e7..1f969dc23 100644
--- a/src/main/java/baritone/behavior/ElytraBehavior.java
+++ b/src/main/java/baritone/behavior/ElytraBehavior.java
@@ -391,21 +391,21 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
         if (this.aimPos != null) {
             PathRenderer.drawGoal(ctx.player(), new GoalBlock(this.aimPos), event.getPartialTicks(), Color.GREEN);
         }
-        if (!this.clearLines.isEmpty() && settings.renderRaytraces.value) {
+        if (!this.clearLines.isEmpty() && settings.elytraRenderRaytraces.value) {
             IRenderer.startLines(Color.GREEN, settings.pathRenderLineWidthPixels.value, settings.renderPathIgnoreDepth.value);
             for (Pair<Vec3d, Vec3d> line : this.clearLines) {
                 IRenderer.emitLine(line.first(), line.second());
             }
             IRenderer.endLines(settings.renderPathIgnoreDepth.value);
         }
-        if (!this.blockedLines.isEmpty() && Baritone.settings().renderRaytraces.value) {
+        if (!this.blockedLines.isEmpty() && Baritone.settings().elytraRenderRaytraces.value) {
             IRenderer.startLines(Color.BLUE, settings.pathRenderLineWidthPixels.value, settings.renderPathIgnoreDepth.value);
             for (Pair<Vec3d, Vec3d> line : this.blockedLines) {
                 IRenderer.emitLine(line.first(), line.second());
             }
             IRenderer.endLines(settings.renderPathIgnoreDepth.value);
         }
-        if (this.simulationLine != null && Baritone.settings().renderElytraSimulation.value) {
+        if (this.simulationLine != null && Baritone.settings().elytraRenderSimulation.value) {
             IRenderer.startLines(new Color(0x36CCDC), settings.pathRenderLineWidthPixels.value, settings.renderPathIgnoreDepth.value);
             final Vec3d offset = new Vec3d(
                     ctx.player().prevPosX + (ctx.player().posX - ctx.player().prevPosX) * event.getPartialTicks(),
@@ -753,7 +753,7 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
             logDebug("waiting for elytraFireworkSetbackUseDelay: " + this.remainingSetBackTicks);
             return;
         }
-        final boolean useOnDescend = !Baritone.settings().conserveFireworks.value || ctx.player().posY < goingTo.y + 5;
+        final boolean useOnDescend = !Baritone.settings().elytraConserveFireworks.value || ctx.player().posY < goingTo.y + 5;
         final double currentSpeed = new Vec3d(
                 ctx.player().motionX,
                 // ignore y component if we are BOTH below where we want to be AND descending
@@ -984,7 +984,7 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
         };
 
         // Use non-batching method without early failure
-        if (Baritone.settings().renderHitboxRaytraces.value) {
+        if (Baritone.settings().elytraRenderHitboxRaytraces.value) {
             boolean clear = true;
             for (int i = 0; i < 8; i++) {
                 final Vec3d s = new Vec3d(src[i * 3], src[i * 3 + 1], src[i * 3 + 2]);
@@ -1009,7 +1009,7 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
             clear = ctx.world().rayTraceBlocks(start, dest, false, false, false) == null;
         }
 
-        if (Baritone.settings().renderRaytraces.value) {
+        if (Baritone.settings().elytraRenderRaytraces.value) {
             (clear ? this.clearLines : this.blockedLines).add(new Pair<>(start, dest));
         }
         return clear;