use more fireworks

src/api/java/baritone/api/Settings.java

@@ -51,6 +51,8 @@ public final class Settings {
     public final Setting<Integer> elytraSimulationTicks = new Setting<>(20);
     public final Setting<Integer> elytraPitchRange = new Setting<>(25);
     public final Setting<Double> elytraFireworkSpeed = new Setting<>(0.6);
+    public final Setting<Boolean> wasteFireworks = new Setting<>(false);
+    public final Setting<Boolean> renderRaytraces = new Setting<>(false);
 
     /**
      * Allow Baritone to break blocks

src/main/java/baritone/Elytra.java

@@ -24,6 +24,7 @@ import baritone.api.utils.Rotation;
 import baritone.api.utils.RotationUtils;
 import baritone.behavior.Behavior;
 import baritone.utils.BlockStateInterface;
+import com.mojang.realmsclient.util.Pair;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.item.EntityFireworkRocket;
 import net.minecraft.util.EnumHand;
@@ -64,6 +65,9 @@ public class Elytra extends Behavior implements Helper {
     public int sinceFirework;
     public BlockPos goal;
 
+
+    public List<Pair<Vec3d, Vec3d>> lines = new ArrayList<>();
+
     protected Elytra(Baritone baritone) {
         super(baritone);
     }
@@ -76,7 +80,7 @@ public class Elytra extends Behavior implements Helper {
         }
         fixNearPlayer();
         baritone.getInputOverrideHandler().clearAllKeys();
-
+        lines.clear();
         if (ctx.player().isElytraFlying()) {
             if (ctx.player().collidedHorizontally) {
                 logDirect("hbonk");
@@ -89,7 +93,7 @@ public class Elytra extends Behavior implements Helper {
             sinceFirework++;
             if (!firework
                     && sinceFirework > 10
-                    && ctx.player().posY < path.get(goingTo).y + 5 // don't firework if trying to descend
+                    && (Baritone.settings().wasteFireworks.value && ctx.player().posY < path.get(goingTo).y + 5) // don't firework if trying to descend
                     && (ctx.player().posY < path.get(goingTo).y - 5 || ctx.playerFeetAsVec().distanceTo(new Vec3d(path.get(goingTo).x, ctx.player().posY, path.get(goingTo).z)) > 5) // UGH!!!!!!!
                     && new Vec3d(ctx.player().motionX, ctx.player().posY < path.get(goingTo).y ? Math.max(0, ctx.player().motionY) : ctx.player().motionY, ctx.player().motionZ).length() < Baritone.settings().elytraFireworkSpeed.value // ignore y component if we are BOTH below where we want to be AND descending
             ) {
@@ -101,7 +105,7 @@ public class Elytra extends Behavior implements Helper {
             for (int relaxation = 0; relaxation < 3; relaxation++) { // try for a strict solution first, then relax more and more (if we're in a corner or near some blocks, it will have to relax its constraints a bit)
                 int[] heights = firework ? new int[]{20, 10, 5, 0} : new int[]{0}; // attempt to gain height, if we can, so as not to waste the boost
                 boolean requireClear = relaxation == 0;
-                int steps = relaxation < 2 ? Baritone.settings().elytraSimulationTicks.value : 3;
+                int steps = relaxation < 2 ? firework ? 5 : Baritone.settings().elytraSimulationTicks.value : 3;
                 int lookahead = relaxation == 0 ? 2 : 3; // ideally this would be expressed as a distance in blocks, rather than a number of voxel steps
                 //int minStep = Math.max(0, playerNear - relaxation);
                 int minStep = playerNear;
@@ -160,6 +164,7 @@ public class Elytra extends Behavior implements Helper {
     }
 
     private boolean clearView(Vec3d start, Vec3d dest) {
+        lines.add(Pair.of(start, dest));
         RayTraceResult result = ctx.world().rayTraceBlocks(start, dest, true, false, true);
         return result == null || result.typeOfHit == RayTraceResult.Type.MISS;
     }

src/main/java/baritone/utils/PathRenderer.java

@@ -17,6 +17,7 @@
 
 package baritone.utils;
 
+import baritone.Baritone;
 import baritone.Elytra;
 import baritone.api.BaritoneAPI;
 import baritone.api.event.events.RenderEvent;
@@ -26,6 +27,7 @@ import baritone.api.utils.Helper;
 import baritone.api.utils.interfaces.IGoalRenderPos;
 import baritone.behavior.PathingBehavior;
 import baritone.pathing.path.PathExecutor;
+import com.mojang.realmsclient.util.Pair;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.tileentity.TileEntityBeaconRenderer;
@@ -35,6 +37,7 @@ import net.minecraft.init.Blocks;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.Vec3d;
 
 import java.awt.*;
 import java.util.Collection;
@@ -107,6 +110,18 @@ public final class PathRenderer implements IRenderer {
         if (behavior.baritone.elytra.goal != null) {
             drawDankLitGoalBox(renderView, new GoalBlock(behavior.baritone.elytra.goal), partialTicks, Color.GREEN);
         }
+        if (!behavior.baritone.elytra.lines.isEmpty() && Baritone.settings().renderRaytraces.value) {
+            IRenderer.startLines(Color.BLUE, settings.pathRenderLineWidthPixels.value, settings.renderPathIgnoreDepth.value);
+            boolean orig = settings.renderPathAsLine.value;
+            settings.renderPathAsLine.value = true;
+            for (Pair<Vec3d, Vec3d> line : behavior.baritone.elytra.lines) {
+                drawLine(line.first().x, line.first().y, line.first().z, line.second().x, line.second().y, line.second().z);
+                tessellator.draw();
+            }
+            settings.renderPathAsLine.value = orig;
+            IRenderer.endLines(settings.renderPathIgnoreDepth.value);
+        }
+
 
         // If there is a path calculation currently running, render the path calculation process
         behavior.getInProgress().ifPresent(currentlyRunning -> {