+ Huge failsafe reactions update (BETA)

= Fixes
JellyLabScripts · Dec 29, 2023 · 65b2548 · 65b2548
1 parent 56e560b
commit 65b2548
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 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.4.0-pre2
+version=2.4.0-pre3
 shouldRelease=true
diff --git a/src/main/java/com/jelly/farmhelperv2/failsafe/impl/DirtFailsafe.java b/src/main/java/com/jelly/farmhelperv2/failsafe/impl/DirtFailsafe.java
@@ -107,7 +107,7 @@ else if (BlockUtils.getRelativeBlock(1, 1, 0).equals(Blocks.dirt))
                 if (dirtOnLeft)
                     MovRecPlayer.getInstance().playRandomRecording("DIRT_CHECK_Start_Left_");
                 else
-                    MovRecPlayer.getInstance().playRandomRecording("DIRT_CHECK_Start_Right");
+                    MovRecPlayer.getInstance().playRandomRecording("DIRT_CHECK_Start_Right_");
                 break;
             case WAIT_BEFORE_SENDING_MESSAGE:
                 dirtCheckState = DirtCheckState.SEND_MESSAGE;

diff --git a/src/main/java/com/jelly/farmhelperv2/failsafe/impl/RotationFailsafe.java b/src/main/java/com/jelly/farmhelperv2/failsafe/impl/RotationFailsafe.java
@@ -106,7 +106,7 @@ public void duringFailsafeTrigger() {
                 FailsafeManager.getInstance().scheduleRandomDelay(500, 500);
                 break;
             case LOOK_AROUND:
-                MovRecPlayer.getInstance().playRandomRecording("ROTATION_CHECK_Start");
+                MovRecPlayer.getInstance().playRandomRecording("ROTATION_CHECK_Start_");
                 rotationCheckState = RotationCheckState.WAIT_BEFORE_SENDING_MESSAGE_1;
                 FailsafeManager.getInstance().scheduleRandomDelay(2000, 3000);
                 break;
@@ -138,7 +138,7 @@ public void duringFailsafeTrigger() {
             case LOOK_AROUND_2:
                 if (rotation.isRotating())
                     break;
-                MovRecPlayer.getInstance().playRandomRecording("ROTATION_CHECK_Continue");
+                MovRecPlayer.getInstance().playRandomRecording("ROTATION_CHECK_Continue_");
                 rotationCheckState = RotationCheckState.WAIT_BEFORE_SENDING_MESSAGE_2;
                 FailsafeManager.getInstance().scheduleRandomDelay(2000, 3000);
                 break;

diff --git a/src/main/java/com/jelly/farmhelperv2/failsafe/impl/TeleportFailsafe.java b/src/main/java/com/jelly/farmhelperv2/failsafe/impl/TeleportFailsafe.java
@@ -124,7 +124,7 @@ public void duringFailsafeTrigger() {
                 FailsafeManager.getInstance().scheduleRandomDelay(500, 500);
                 break;
             case LOOK_AROUND:
-                MovRecPlayer.getInstance().playRandomRecording("ROTATION_CHECK_Start");
+                MovRecPlayer.getInstance().playRandomRecording("TELEPORT_CHECK_Start_");
                 teleportCheckState = TeleportCheckState.SEND_MESSAGE;
                 FailsafeManager.getInstance().scheduleRandomDelay(2000, 3000);
                 break;

diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/MovRecPlayer.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/MovRecPlayer.java
@@ -137,7 +137,7 @@ public void playRandomRecording(String pattern) {
         }
         if (filename.isEmpty()) {
             if (FailsafeManager.getInstance().triggeredFailsafe.isPresent()) {
-                LogUtils.sendWarning("RIP bozo, no recording found!");
+                LogUtils.sendWarning("RIP bozo, recording file name is empty! Send logs to #bug-reports!");
             }
             stop();
             resetStatesAfterMacroDisabled();
@@ -153,7 +153,7 @@ public void start() {
         if (recordingName.isEmpty()) {
             LogUtils.sendError("[Movement Recorder] No recording selected!");
             if (FailsafeManager.getInstance().triggeredFailsafe.isPresent())
-                LogUtils.sendWarning("RIP bozo, no recording found!");
+                LogUtils.sendWarning("RIP bozo, recording name is empty! Send logs to #bug-reports!");
             return;
         }
         if (isMovementPlaying) {
@@ -169,7 +169,7 @@ public void start() {
             lines = read();
             if (lines == null) {
                 if (FailsafeManager.getInstance().triggeredFailsafe.isPresent())
-                    LogUtils.sendWarning("RIP bozo, the recording is empty!");
+                    LogUtils.sendWarning("RIP bozo, the recording is empty! Send logs to #bug-reports!");
                 return;
             }
             for (String line : lines) {
@@ -181,7 +181,7 @@ public void start() {
             LogUtils.sendError("[Movement Recorder] An error occurred while playing the recording.");
             e.printStackTrace();
             if (FailsafeManager.getInstance().triggeredFailsafe.isPresent()) {
-                LogUtils.sendWarning("RIP bozo, we've got an error!");
+                LogUtils.sendWarning("RIP bozo, we've got an error! Send logs to #bug-reports!");
             }
             stop();
             resetStatesAfterMacroDisabled();