Merge pull request #312 from mqtze/feature/custom-failsafe-recordings

Added custom failsafe recordings support

Author: onixiya1337

gradle.properties

@@ -4,5 +4,5 @@ baseGroup=com.jelly.farmhelperv2
 mcVersion=1.8.9
 modid=farmhelperv2
 modName=FarmHelper
-version=2.9.6-pre1
+version=2.9.7-pre1
 shouldRelease=true

src/main/java/com/jelly/farmhelperv2/config/FarmHelperConfig.java

@@ -526,6 +526,69 @@ public class FarmHelperConfig extends Config {
             min = 5, max = 15)
     public static float minBpsThreshold = 10f;
 
+    // Custom Reactions
+    @Info(
+            text = "You need to place the .movement files in .minecraft/farmhelper/movrec",
+            type = InfoType.WARNING,
+            category = FAILSAFE,
+            subcategory = "Custom Reactions",
+            size = 2
+    )
+    public static boolean customReactionsWarning1;
+
+    @Info(
+            text = "It will fall back to the default recordings if the folder is missing or there are no files in it.",
+            type = InfoType.WARNING,
+            category = FAILSAFE,
+            subcategory = "Custom Reactions",
+            size = 2
+    )
+    public static boolean customReactionsWarning2;
+
+    @Info(
+            text = "You need to restart the game after changing the files.",
+            type = InfoType.WARNING,
+            category = FAILSAFE,
+            subcategory = "Custom Reactions",
+            size = 2
+    )
+    public static boolean customReactionsWarning3;
+
+    @Info(
+            text = "You need to provide files for each check.",
+            type = InfoType.WARNING,
+            category = FAILSAFE,
+            subcategory = "Custom Reactions",
+            size = 2
+    )
+    public static boolean customReactionsWarning4;
+
+    @Info(
+            text = "Default recordings at: https://github.com/JellyLabScripts/FarmHelper/tree/master/src/main/resources/farmhelper/movrec",
+            type = InfoType.WARNING,
+            category = FAILSAFE,
+            subcategory = "Custom Reactions",
+            size = 2
+    )
+    public static boolean customReactionsWarning5;
+
+    @Switch(name = "Enable Custom Reactions", category = FAILSAFE,
+            subcategory = "Custom Reactions",
+            description = "Enable custom failsafe reactions"
+    )
+    public static boolean enableCustomReactions = false;
+
+    /*
+        @Info(
+            text = "If you want to use your own WAV file, rename it to 'farmhelper_sound.wav' and put it in your Minecraft directory.",
+            type = InfoType.WARNING,
+            category = FAILSAFE,
+            subcategory = "Failsafe Trigger Sound",
+            size = 2
+    )
+    public static boolean customFailsafeSoundWarning;
+     */
+
     // Failsafe Testing
     @Button(name = "Test Failsafe", category = FAILSAFE, subcategory = "Testing",
             description = "Simulate a failsafe trigger",

src/main/java/com/jelly/farmhelperv2/feature/impl/MovRecPlayer.java

@@ -1,6 +1,7 @@
 package com.jelly.farmhelperv2.feature.impl;
 
 import com.jelly.farmhelperv2.FarmHelper;
+import com.jelly.farmhelperv2.config.FarmHelperConfig;
 import com.jelly.farmhelperv2.failsafe.FailsafeManager;
 import com.jelly.farmhelperv2.feature.IFeature;
 import com.jelly.farmhelperv2.handler.MacroHandler;
@@ -18,10 +19,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.awt.*;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.*;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -63,9 +61,31 @@ public static MovRecPlayer getInstance() {
     }
 
     public MovRecPlayer() {
-        List<String> resourceFiles;
+        List<String> resourceFiles = new ArrayList<>();
         try {
-            resourceFiles = getResourceFiles("/farmhelper/movrec");
+            if (FarmHelperConfig.enableCustomReactions) {
+                File userFolder = new File(Minecraft.getMinecraft().mcDataDir + "/farmhelper/movrec");
+                if (!userFolder.exists()) {
+                    userFolder.mkdirs();
+                    FailsafeUtils.getInstance().sendNotification("No user recordings found. Created folder at: " + userFolder.getAbsolutePath(), TrayIcon.MessageType.WARNING);
+                    LogUtils.sendWarning("No user recordings found. Created folder at: " + userFolder.getAbsolutePath());
+                }
+
+                for (File file : Objects.requireNonNull(userFolder.listFiles())) {
+                    if (file.isFile() && file.getName().endsWith(".movement")) {
+                        resourceFiles.add(file.getAbsolutePath());
+                    }
+                }
+
+                if (resourceFiles.isEmpty()) {
+                    FailsafeUtils.getInstance().sendNotification("No user recordings found. Falling back to default recordings.", TrayIcon.MessageType.WARNING);
+                    LogUtils.sendError("No user recordings found. Falling back to default recordings.");
+                    resourceFiles = getResourceFiles("/farmhelper/movrec");
+                    FarmHelperConfig.enableCustomReactions = false;
+                }
+            } else {
+                resourceFiles = getResourceFiles("/farmhelper/movrec");
+            }
             if (resourceFiles.isEmpty()) {
                 FailsafeUtils.getInstance().sendNotification("Resource folder not found! Report this to #bug-reports!", TrayIcon.MessageType.WARNING);
                 LogUtils.sendError("Resource folder not found! Report this to #bug-reports!");
@@ -78,7 +98,13 @@ public MovRecPlayer() {
                 if (file.contains("/build/classes/")) {
                     file = file.split("/build/classes/java/main")[1];
                 }
-                InputStream inputStream = FarmHelper.class.getResourceAsStream(file);
+                InputStream inputStream;
+
+                if (FarmHelperConfig.enableCustomReactions) {
+                    inputStream = new FileInputStream(file);
+                } else {
+                    inputStream = FarmHelper.class.getResourceAsStream(file);
+                }
 
                 if (inputStream != null) {
                     BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));