Another hour, another pre-release!

Test failsafe: = Bug fixes Visitors Macro: + Ignoring visitors when you don't have enough inventory space
JellyLabScripts · Mar 17, 2024 · 7966721 · 7966721
1 parent 3a12186
commit 7966721
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 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.0-pre9
+version=2.5.0-pre10
 shouldRelease=true
diff --git a/src/main/java/com/jelly/farmhelperv2/config/FarmHelperConfig.java b/src/main/java/com/jelly/farmhelperv2/config/FarmHelperConfig.java
@@ -458,7 +458,8 @@ public class FarmHelperConfig extends Config {
             FailsafeManager.getInstance().possibleDetection(FailsafeManager.getInstance().failsafes.get(testFailsafeTypeSelected));
         else if (testFailsafeTypeSelected != 6)
             LowerAvgBpsFailsafe.getInstance().clearQueue(); // Clear the queue to avoid false positives
-        FailsafeManager.getInstance().possibleDetection(FailsafeManager.getInstance().failsafes.get(testFailsafeTypeSelected + 2));
+        else
+            FailsafeManager.getInstance().possibleDetection(FailsafeManager.getInstance().failsafes.get(testFailsafeTypeSelected + 2));
     };
 
     @Dropdown(

diff --git a/src/main/java/com/jelly/farmhelperv2/failsafe/impl/RotationFailsafe.java b/src/main/java/com/jelly/farmhelperv2/failsafe/impl/RotationFailsafe.java
@@ -233,6 +233,8 @@ public void resetStates() {
     }
 
     private boolean checkIfRotatedBack() {
+        if (rotationBeforeReacting == null) // Test failsafe
+            return true;
         if ((Math.abs(AngleUtils.get360RotationYaw(rotationBeforeReacting.getYaw()) - AngleUtils.get360RotationYaw()) < 0.1)
                 && (Math.abs(AngleUtils.get360RotationYaw(rotationBeforeReacting.getPitch()) - mc.thePlayer.rotationPitch) < 0.1)) {
             FailsafeManager.getInstance().stopFailsafes();

diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/VisitorsMacro.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/VisitorsMacro.java
@@ -1448,6 +1448,14 @@ public void onReceiveChat(ClientChatReceivedEvent event) {
             PlayerUtils.closeScreen();
             delayClock.schedule(getRandomDelay());
         }
+        if (msg.startsWith("[Bazaar] You don't have enough inventory space")) {
+            LogUtils.sendWarning("[Visitors Macro] You don't have enough inventory space! Ignoring that visitor...");
+            servedCustomers.remove(currentVisitor.get());
+            ignoredNPCs.add(currentVisitor.get());
+            setVisitorsState(VisitorsState.ROTATE_TO_VISITOR);
+            PlayerUtils.closeScreen();
+            delayClock.schedule(getRandomDelay());
+        }
     }
 
     public enum MainState {