Add ChestCount HUD and update Baritone build logic

Introduces a new ChestCount HUD element to display the number of chests in render distance. Updates BetterBaritoneBuild to improve event handling and pathing logic, and changes Baritone dependency to compileOnly. Also bumps mod version to 1.1.4.

Author: Omega172

build.gradle.kts

@@ -36,7 +36,7 @@ dependencies {
     modImplementation("meteordevelopment:meteor-client:$meteorClientVersion-SNAPSHOT")
 
     // Baritone
-    modImplementation("meteordevelopment:baritone:$minecraftVersion-SNAPSHOT")
+    modCompileOnly("meteordevelopment:baritone:$minecraftVersion-SNAPSHOT")
 }
 
 tasks {

gradle.properties

@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx2G
 org.gradle.configuration-cache=true
 
 # Mod Global Properties
-mod_version=1.1.3
+mod_version=1.1.4
 maven_group=xyz.omegaware
 archives_base_name=OmegaWare Addons
 

src/main/java/xyz/omegaware/addon/OmegawareAddons.java

@@ -9,6 +9,7 @@
 import net.fabricmc.loader.api.metadata.ModMetadata;
 import xyz.omegaware.addon.commands.LinkCommand;
 import xyz.omegaware.addon.commands.ShulkerQueueCommand;
+import xyz.omegaware.addon.hud.ChestCount;
 import xyz.omegaware.addon.hud.OnlineTSRMembersHUD;
 import xyz.omegaware.addon.modules.*;
 import com.mojang.logging.LogUtils;
@@ -28,7 +29,7 @@ public class OmegawareAddons extends MeteorAddon {
     public static final Category CATEGORY = new Category("OmegaWare");
     public static final HudGroup HUD_GROUP = new HudGroup("OmegaWare");
 
-    public static final BetterBaritoneBuild BETTER_BARITONE_BUILD = new BetterBaritoneBuild();
+    public static BetterBaritoneBuild BETTER_BARITONE_BUILD = null;
 
     public static File GetConfigFile(String key, String filename) {
         return new File(new File(new File(new File(MeteorClient.FOLDER, "omegaware"), key), Utils.getFileWorldName()), filename);
@@ -52,13 +53,15 @@ public void onInitialize() {
         }
 
         if (BaritoneUtils.IS_AVAILABLE) {
+            BETTER_BARITONE_BUILD = new BetterBaritoneBuild();
             Modules.get().add(BETTER_BARITONE_BUILD);
         }
 
         Commands.add(new LinkCommand());
         Commands.add(new ShulkerQueueCommand());
 
         Hud.get().register(OnlineTSRMembersHUD.INFO);
+        Hud.get().register(ChestCount.INFO);
     }
 
     @Override

src/main/java/xyz/omegaware/addon/hud/ChestCount.java

@@ -0,0 +1,47 @@
+package xyz.omegaware.addon.hud;
+
+import meteordevelopment.meteorclient.settings.SettingGroup;
+import meteordevelopment.meteorclient.systems.hud.HudElement;
+import meteordevelopment.meteorclient.systems.hud.HudElementInfo;
+import meteordevelopment.meteorclient.systems.hud.HudRenderer;
+import meteordevelopment.meteorclient.utils.Utils;
+import meteordevelopment.meteorclient.utils.render.color.Color;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.ChestBlock;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.block.entity.ChestBlockEntity;
+import net.minecraft.block.enums.ChestType;
+import xyz.omegaware.addon.OmegawareAddons;
+
+import static meteordevelopment.meteorclient.MeteorClient.mc;
+
+public class ChestCount extends HudElement {
+    public static final HudElementInfo<ChestCount> INFO = new HudElementInfo<>(OmegawareAddons.HUD_GROUP, "Dubs Count", "Displays how many dubs are in render distance", ChestCount::new);
+
+    public ChestCount() {
+        super(INFO);
+    }
+
+    @Override
+    public void render(HudRenderer renderer) {
+        if (mc.player == null || mc.world == null) return;
+
+        int count = 0;
+        for (BlockEntity blockEntity : Utils.blockEntities()) {
+            if (!(blockEntity instanceof ChestBlockEntity chestBlock)) continue;
+
+            BlockState blockState = chestBlock.getCachedState();
+            ChestType chestType = blockState.get(ChestBlock.CHEST_TYPE);
+
+            // Only count left chests to avoid double counting
+            if (chestType.equals(ChestType.SINGLE) || chestType.equals(ChestType.RIGHT)) continue;
+
+            count++;
+        }
+
+        renderer.text("Dubs: ", x, y, Color.WHITE, true);
+        renderer.text("" + count, x + renderer.textWidth("Dubs: ", true), y, Color.LIGHT_GRAY, true);
+
+        setSize(renderer.textWidth("Dubs: " + count, true), renderer.textHeight(true) + 1);
+    }
+}

src/main/java/xyz/omegaware/addon/modules/BetterBaritoneBuild.java

@@ -651,7 +651,7 @@ public void onServerConnectEnd(ServerConnectEndEvent event) {
     }
 
     @EventHandler
-    private void onTickPost(TickEvent.Post event) {
+    private void onTickPre(TickEvent.Pre event) {
         if (!isActive()) return;
 
         if (!EventRegistry.INSTANCE.isEmpty() && currentEvent == null) {
@@ -662,6 +662,7 @@ private void onTickPost(TickEvent.Post event) {
             if (debugMode.get()) {
                 Logger.info("Executing event: %s", currentEvent.type.toString());
             }
+
             if (currentEvent.bWaitOnPath && baritone.getPathingBehavior().hasPath() || baritone.getPathingBehavior().isPathing()) {
                 // Wait for Baritone to finish pathing
                 return;
@@ -670,7 +671,11 @@ private void onTickPost(TickEvent.Post event) {
             currentEvent.callback.run();
             currentEvent = null;
         }
-        // Home shit
+    }
+
+    @EventHandler
+    private void onTickPost(TickEvent.Post event) {
+        // Home Shit and anti-stuck shit
     }
 
     @EventHandler
@@ -889,7 +894,8 @@ private void onInventory(InventoryEvent event) {
                     FetchRegistry.INSTANCE.update();
 
                     if (FetchRegistry.INSTANCE.isEmpty()) {
-                        EventRegistry.INSTANCE.push(new EventRegistry.Event(EventRegistry.Event.EventType.Resume, true, () -> baritone.getCommandManager().execute(buildCommand)));
+                        baritone.getPathingBehavior().cancelEverything();
+                        EventRegistry.INSTANCE.push(new EventRegistry.Event(EventRegistry.Event.EventType.Resume, false, () -> baritone.getCommandManager().execute(buildCommand)));
                     }
                 });
             });