Merge branch 'main' into comeback-time

.github/ISSUE_TEMPLATE/major_bug_report.md

@@ -0,0 +1,17 @@
+---
+name: Major Bug report
+about: Report a bug that permanently STOPS the bot from progressing/requires HUMAN input to continue
+title: ''
+labels: 'major bug'
+assignees: ''
+
+---
+
+## Steps to Reproduce (as best as you can)
+
+## Expected Behavior
+
+## Actual Behavior (What lead to the bot getting permanently stuck)
+
+## Crashlogs and Screenshots (if applicable)
+_(you may drag + drop text logs and images here, thanks GitHub)_

.github/ISSUE_TEMPLATE/bug_report.md → .github/ISSUE_TEMPLATE/minor_bug_report.md

@@ -1,14 +1,12 @@
 ---
-name: Bug report
-about: Create a report to help squash bugs
+name: Minor Bug report
+about: Report a bug that TEMPORARILY interrupts the bot and/or wastes time, but does NOT permanently stop the bot/require human input to proceed.
 title: ''
-labels: ''
+labels: 'minor bug'
 assignees: ''
 
 ---
 
-## Bug Description
-
 ## Steps to Reproduce (as best as you can)
 
 ## Expected Behavior

src/main/java/adris/altoclef/Settings.java

@@ -51,6 +51,11 @@ public class Settings implements IFailableConfigFile {
     private boolean showTaskChains = true;
 
     /**
+     * If true, it will show a timer displaying how long the task was running.
+     * if false, it display the showTaskChains (if enabled) without the timer
+     */
+    private boolean showTimer = true;
+
      * The delay between moving items for crafting/furnace/any kind of inventory movement.
      */
     private float containerItemMoveDelay = 0.2f;
@@ -72,7 +77,7 @@ public class Settings implements IFailableConfigFile {
 
     /**
      * amount of food to collect when the food in inventory
-     * is lower than the value of foodUnitsThreshold
+     * is lower than the value of minimumFoodAllowed
      */
     private int foodUnitsToCollect = 0;
 
@@ -422,6 +427,9 @@ private static boolean idArrayContainsItem(Item item, int[] ids) {
     public boolean shouldShowTaskChain() {
         return showTaskChains;
     }
+    public boolean shouldShowTimer() {
+        return showTimer;
+    }
 
     public float getResourcePickupRange() {
         return resourcePickupDropRange;

src/main/java/adris/altoclef/chains/FoodChain.java

@@ -119,7 +119,7 @@ private void startEat(AltoClef mod, Item food) {
         //Debug.logInternal("EATING " + toUse.getTranslationKey() + " : " + test);
         _isTryingToEat = true;
         _requestFillup = true;
-        mod.getSlotHandler().forceEquipItem(food);
+        mod.getSlotHandler().forceEquipItem(food, true); //"true" because it's food
         mod.getInputControls().hold(Input.CLICK_RIGHT);
         mod.getExtraBaritoneSettings().setInteractionPaused(true);
     }

src/main/java/adris/altoclef/chains/PlayerInteractionFixChain.java

@@ -8,6 +8,7 @@
 import adris.altoclef.util.helpers.StorageHelper;
 import adris.altoclef.util.slots.PlayerInventorySlot;
 import adris.altoclef.util.slots.Slot;
+import adris.altoclef.util.slots.PlayerSlot;
 import baritone.api.utils.input.Input;
 import net.minecraft.block.BlockState;
 import net.minecraft.item.ItemStack;

src/main/java/adris/altoclef/chains/WorldSurvivalChain.java

@@ -53,7 +53,7 @@ public float getPriority(AltoClef mod) {
         handleDrowning(mod);
 
         // Lava Escape
-        if (isInLavaOhShit(mod)) {
+        if (isInLavaOhShit(mod) && mod.getBehaviour().shouldEscapeLava()) {
             setTask(new EscapeFromLavaTask());
             return 100;
         }

src/main/java/adris/altoclef/tasks/misc/speedrun/KillEnderDragonWithBedsTask.java

@@ -58,7 +58,6 @@ Get in position (XZ)
             }
         }
 
-
         if (!mod.getEntityTracker().entityFound(EnderDragonEntity.class)) {
             setDebugState("No dragon found.");
             return new GetToXZTask(0, 0);

src/main/java/adris/altoclef/tasks/misc/speedrun/LocateStrongholdTask.java

@@ -215,10 +215,15 @@ else if (_cachedEyeDirection != null) {
                     _netherGoalPos = new BlockPos(_strongholdEstimatePos.multiply(0.125, 0, 0.125));
                     _netherGoalPos = _netherGoalPos.add(0, PORTAL_TARGET_HEIGHT, 0);
                 }
+                if(mod.getPlayer().getPos().getX() - _netherGoalPos.getX() < Math.abs(15) && mod.getPlayer().getZ() - _netherGoalPos.getZ() < Math.abs(15) && mod.getPlayer().getPos().getY() > _netherGoalPos.getY()){
+                    _netherGoalPos = new BlockPos(mod.getPlayer().getBlockPos().getX(), mod.getPlayer().getBlockPos().getY() + 1, mod.getPlayer().getBlockPos().getZ()); // ensure that baritone doesn't get lost over the lava since it has a hard time pathing large gaps of air blocks.
+                    // Also ensures that we don't have to break blocks we are standing on to place the portal. Gets within 120 blocks of the stronghold.
+                }
                 if (_constructTask.isActive() && !_constructTask.isFinished(mod) || _netherGoalPos.isWithinDistance(mod.getPlayer().getPos(), _portalBuildRange)) {
                     if (_portalBuildRange == 2) {
                         _portalBuildRange = 20;
                     }
+
                     if (mod.getBlockTracker().getNearestWithinRange(mod.getPlayer().getPos(), _portalBuildRange, Blocks.NETHER_PORTAL) != null) {
                         _cachedEducatedPortal = mod.getBlockTracker().getNearestWithinRange(mod.getPlayer().getPos(), _portalBuildRange, Blocks.NETHER_PORTAL);
                     }

src/main/java/adris/altoclef/ui/CommandStatusOverlay.java

@@ -1,16 +1,25 @@
 package adris.altoclef.ui;
 
 import adris.altoclef.AltoClef;
+import adris.altoclef.Debug;
 import adris.altoclef.tasksystem.Task;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.util.math.MatrixStack;
 
 import java.util.Collections;
 import java.util.List;
+import java.time.Instant;
+import java.time.format.DateTimeFormatter;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
 
 public class CommandStatusOverlay {
 
+    //For the ingame timer
+    private long _timeRunning;
+    private long _lastTime = 0;
+
     public void render(AltoClef mod, MatrixStack matrixstack) {
         if (mod.getModSettings().shouldShowTaskChain()) {
             List<Task> tasks = Collections.emptyList();
@@ -19,16 +28,25 @@ public void render(AltoClef mod, MatrixStack matrixstack) {
             }
 
             int color = 0xFFFFFFFF;
-            drawTaskChain(MinecraftClient.getInstance().textRenderer, matrixstack, 0, 0, color, 10, tasks);
+            drawTaskChain(MinecraftClient.getInstance().textRenderer, matrixstack, 0, 0, color, 10, tasks, mod);
         }
     }
-
-    private void drawTaskChain(TextRenderer renderer, MatrixStack stack, float dx, float dy, int color, int maxLines, List<Task> tasks) {
+    private DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("HH:mm:ss.SSS").withZone(ZoneId.from(ZoneOffset.of("+00:00"))); // The date formatter
+    private void drawTaskChain(TextRenderer renderer, MatrixStack stack, float dx, float dy, int color, int maxLines, List<Task> tasks, AltoClef mod) {
         if (tasks.size() == 0) {
             renderer.draw(stack, " (no task running) ", dx, dy, color);
+            if (_lastTime+10000 < Instant.now().toEpochMilli() && mod.getModSettings().shouldShowTimer()) {//if it doesn't run any task in 10 secs
+                _timeRunning = Instant.now().toEpochMilli();//reset the timer
+            }
         } else {
             float fontHeight = renderer.fontHeight;
-
+            if (mod.getModSettings().shouldShowTimer()) { //If it's enabled
+                _lastTime = Instant.now().toEpochMilli(); //keep the last time for the timer reset
+                String _realTime = DATE_TIME_FORMATTER.format(Instant.now().minusMillis(_timeRunning)); //Format the running time to string
+                renderer.draw(stack, "<"+_realTime+">", dx, dy, color);//Draw the timer before drawing tasks list
+                dx += 8;//Do the same thing to list the tasks
+                dy += fontHeight + 2;
+            }
             if (tasks.size() > maxLines) {
                 for (int i = 0; i < tasks.size(); ++i) {
                     // Skip over the next tasks

src/main/java/adris/altoclef/util/control/BotBehaviour.java

@@ -34,8 +34,26 @@ public BotBehaviour(AltoClef mod) {
         push();
     }
 
+    // Getter(s)
+    /**
+     * Returns the current state of Behaviour for escapeLava
+     * @return The current state of Behaviour for escapeLava
+     */
+    public boolean shouldEscapeLava() {
+        return current().escapeLava;
+    }
+
     /// Parameters
 
+    /**
+     * If the bot should escape lava or not, part of WorldSurvivalChain
+     * @param allow True if the bot should escape lava
+     */
+    public void setEscapeLava(boolean allow) {
+        current().escapeLava = allow;
+        current().applyState();
+    }
+
     public void setFollowDistance(double distance) {
         current().followOffsetDistance = distance;
         current().applyState();
@@ -235,6 +253,9 @@ class State {
         // Hard coded stuff
         public RaycastContext.FluidHandling rayFluidHandling;
 
+        // Other necessary stuff
+        public boolean escapeLava = true;
+
         public State() {
             this(null);
         }
@@ -253,6 +274,7 @@ public State(State toCopy) {
                 avoidDodgingProjectile.addAll(toCopy.avoidDodgingProjectile);
                 excludeFromForceField.addAll(toCopy.excludeFromForceField);
                 forceFieldPlayers = toCopy.forceFieldPlayers;
+                escapeLava = toCopy.escapeLava;
             }
         }
 

src/main/java/adris/altoclef/util/control/SlotHandler.java

@@ -102,6 +102,10 @@ public boolean forceEquipItem(Item toEquip) {
         Debug.logWarning("Failed to equip item " + toEquip.getTranslationKey());
         return false;
     }
+    //Default forceEquipItem, will not force to equip item if the bot eat
+    public boolean forceEquipItem(Item toEquip) {
+            return forceEquipItem(toEquip, false);
+    }
     public boolean forceDeequipHitTool() {
         return forceDeequip(stack -> stack.getItem() instanceof ToolItem);
     }