AutoBazaar (Visitors):

= Fixed one issue with buying custom amount and not resetting after visitors macro stuck PDOTT: = Fixed rarely not detecting proper POV Profit Calculator: = Fixed BPS being counted even if macro is paused (during other features)
JellyLabScripts · Apr 14, 2024 · 8e11c4d · 8e11c4d
1 parent 807b591
commit 8e11c4d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,5 +4,5 @@ baseGroup=com.jelly.farmhelperv2
 mcVersion=1.8.9
 modid=farmhelperv2
 modName=FarmHelper
-version=2.5.17
+version=2.5.18
 shouldRelease=true
diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoBazaar.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoBazaar.java
@@ -276,7 +276,7 @@ private void handleBuyFromBz() {
                     Slot customAmount = InventoryUtils.getSlotOfItemInContainer("Custom Amount");
                     if (customAmount != null && customAmount.getHasStack()) {
                         this.buyState = BuyState.OPEN_SIGN;
-                        this.buyNowButtonSlot = customAmount.slotNumber;
+                        this.buyNowButtonSlot = 13;
                         LogUtils.sendDebug("[Auto Bazaar] Buying custom amount");
                         return;
                     }

diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/PestsDestroyerOnTheTrack.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/PestsDestroyerOnTheTrack.java
@@ -191,7 +191,7 @@ private Optional<Entity> getPest(boolean start) {
                         double zDiff = entityPosition.zCoord - playerPosition.zCoord;
 
                         float yaw = (float) Math.toDegrees(Math.atan2(zDiff, xDiff)) - 90F;
-                        float yawDiff = Math.abs(MathHelper.wrapAngleTo180_float(mc.thePlayer.rotationYaw) - yaw);
+                        float yawDiff = Math.abs(MathHelper.wrapAngleTo180_float(mc.thePlayer.rotationYaw) - MathHelper.wrapAngleTo180_float(yaw));
                         if (FarmHelperConfig.showDebugLogsAboutPDOTT)
                             LogUtils.sendDebug("Entity Pos: " + e.getPositionVector() + " | CurrenYaw: " + MathHelper.wrapAngleTo180_float(mc.thePlayer.rotationYaw) + " | YawNeeded: " + yaw + " | YawDiff: " + yawDiff + " | Dist: " + dist);
                         returnResult = dist <= vacuumRange - 0.5 && yawDiff <= FarmHelperConfig.pestsDestroyerOnTheTrackFOV / 2f;

diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/ProfitCalculator.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/ProfitCalculator.java
@@ -229,6 +229,7 @@ public void resetProfits() {
     @SubscribeEvent
     public void onTickUpdateBPS(MillisecondEvent event) {
         if (!MacroHandler.getInstance().isMacroToggled()) return;
+        if (MacroHandler.getInstance().isCurrentMacroPaused()) return;
 
         if (bpsClock.passed()) {
             bpsClock.schedule(1_000);
@@ -246,8 +247,7 @@ public void onTickUpdateBPS(MillisecondEvent event) {
     @SubscribeEvent
     public void onTickUpdateProfit(TickEvent.ClientTickEvent event) {
         if (!MacroHandler.getInstance().isMacroToggled()) return;
-        if (!MacroHandler.getInstance().isCurrentMacroEnabled()) return;
-        if (!GameStateHandler.getInstance().inGarden()) return;
+        if (MacroHandler.getInstance().isCurrentMacroPaused()) return;
 
         double profit = 0;
         ItemStack currentItem = mc.thePlayer.getHeldItem();

diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/VisitorsMacro.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/VisitorsMacro.java
@@ -170,6 +170,7 @@ public void stop() {
         manuallyStarted = false;
         LogUtils.sendWarning("[Visitors Macro] Macro stopped");
         rotation.reset();
+        AutoBazaar.getInstance().stop();
         PlayerUtils.closeScreen();
         KeyBindUtils.stopMovement();
         BaritoneHandler.stopPathing();
@@ -710,7 +711,7 @@ private void onVisitorsState() {
                 }
                 LogUtils.sendDebug("Position of visitor: " + result.entityCharacter.getPositionEyes(1));
                 if (mc.thePlayer.getDistanceToEntity(result.entityCharacter) > 3) {
-                    Vec3 closestVec = PlayerUtils.getClosestVecAround(result.entityCharacter, 1.35, 90, 45);
+                    Vec3 closestVec = PlayerUtils.getClosestVecAround(result.entityCharacter, 1.35, 45, 0);
                     if (closestVec == null) {
                         LogUtils.sendError("[Visitors Macro] Couldn't find a position to get closer");
                         stop();
@@ -1053,7 +1054,7 @@ private void onVisitorsState() {
                 }
                 LogUtils.sendDebug("Position of visitor: " + currentCharacter.get().getPositionEyes(1));
                 if (mc.thePlayer.getDistanceToEntity(currentCharacter.get()) > 3) {
-                    Vec3 closestVec = PlayerUtils.getClosestVecAround(currentCharacter.get(), 1.35, 90, 45);
+                    Vec3 closestVec = PlayerUtils.getClosestVecAround(currentCharacter.get(), 1.35, 45, 0);
                     if (closestVec == null) {
                         LogUtils.sendError("[Visitors Macro] Couldn't find a position to get closer");
                         stop();

diff --git a/src/main/java/com/jelly/farmhelperv2/util/PlayerUtils.java b/src/main/java/com/jelly/farmhelperv2/util/PlayerUtils.java
@@ -223,7 +223,7 @@ public static int getFarmingTool(FarmHelperConfig.CropEnum crop, boolean withErr
             }
         }
 
-        int gardeningHoe = InventoryUtils.getSlotIdOfItemInHotbar("Gardening Hoe");
+        int gardeningHoe = InventoryUtils.getSlotIdOfItemInHotbar("Gardening Hoe", "Gardening Axe");
         if (gardeningHoe != -1) {
             return gardeningHoe;
         }