Merge branch 'master' into feature/custom-failsafe-recordings

Author: onixiya1337

.gitignore

@@ -3,4 +3,4 @@
 run/
 build/
 .gradle/
-
+*.swp

build.gradle.kts

@@ -84,7 +84,7 @@ dependencies {
     compileOnly("org.projectlombok:lombok:1.18.34")
     annotationProcessor("org.projectlombok:lombok:1.18.34")
 
-    shadowImpl("org.java-websocket:Java-WebSocket:1.5.4")
+    shadowImpl("org.java-websocket:Java-WebSocket:1.5.7")
 
     implementation("me.djtheredstoner:DevAuth-forge-legacy:1.2.1")
 

src/main/java/com/jelly/farmhelperv2/command/FarmHelperMainCommand.java

@@ -7,6 +7,7 @@
 import com.jelly.farmhelperv2.FarmHelper;
 import com.jelly.farmhelperv2.config.FarmHelperConfig;
 import com.jelly.farmhelperv2.feature.impl.AutoWardrobe;
+import com.jelly.farmhelperv2.feature.impl.PestFarmer;
 import com.jelly.farmhelperv2.handler.GameStateHandler;
 import com.jelly.farmhelperv2.pathfinder.FlyPathFinderExecutor;
 import com.jelly.farmhelperv2.util.LogUtils;
@@ -87,13 +88,9 @@ public void update() {
         FarmHelperConfig.checkForUpdate();
     }
 
-    @SubCommand(aliases = {"stp"})
-    public void swapToPest() {
-        AutoWardrobe.instance.swapTo(FarmHelperConfig.pestFarmingSet0Slot, Arrays.asList(FarmHelperConfig.pestFarmingEq0.split("\\|")));
-    }
-
-    @SubCommand(aliases = {"stf"})
-    public void swapToFarm() {
-        AutoWardrobe.instance.swapTo(FarmHelperConfig.pestFarmingSet1Slot, Arrays.asList(FarmHelperConfig.pestFarmingEq1.split("\\|")));
+    @SubCommand(aliases = {"msc"})
+    public void markSpawnChanged() {
+        PestFarmer.instance.wasSpawnChanged = true;
+        System.out.println("Changed: " + PestFarmer.instance.wasSpawnChanged);
     }
 }

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

@@ -1303,11 +1303,6 @@ public class FarmHelperConfig extends Config {
     )
     public static int pestAdditionalGUIDelay = 0;
 
-    @Switch(
-            name = "Force Enable Pest Destroyer at X Pests", category = PESTS_DESTROYER, subcategory = "Pests Destroyer"
-    )
-    public static boolean pestForceEnable = false;
-
     @Switch(
             name = "Sprint while flying", category = PESTS_DESTROYER, subcategory = "Pests Destroyer",
             description = "Sprints while flying"
@@ -1512,7 +1507,7 @@ public static void triggerManuallyPestsDestroyer() {
 
     //<editor-fold desc="PEST FARMER">
     @Header(
-            text = "Read the comments below this page before using pest farmer.",
+            text = "Read the FarmHelper Guide to understand how to use this properly.",
             category = PEST_FARMER, size = 2
     )
     public static boolean ignored1;
@@ -1523,17 +1518,23 @@ public static void triggerManuallyPestsDestroyer() {
     )
     public static boolean pestFarming = false;
 
+    @Switch(
+            name = "Use Squeaky Mousemat To Set Angle", category = PEST_FARMER,
+            description = "Uses Squeaky Mousemat Ability to set Angle (Must be Preset)"
+    )
+    public static boolean pestFarmingUseMousemat = false;
+
     @Slider(
-            name = "Farming Armor Slot", category = PEST_FARMER,
+            name = "Fermento Armor Slot", category = PEST_FARMER,
             min = 1, max = 18
     )
-    public static int pestFarmingSet0Slot = 1;
+    public static int pestFarmingFermentoSlot = 1;
 
     @Slider(
-            name = "Pest Chance Armor Slot", category = PEST_FARMER,
+            name = "Biohazard Armor Slot", category = PEST_FARMER,
             min = 1, max = 18
     )
-    public static int pestFarmingSet1Slot = 1;
+    public static int pestFarmingBiohazardSlot = 1;
 
     @Slider(
             name = "Pest Spawn Timer (In seconds)", category = PEST_FARMER,
@@ -1542,26 +1543,32 @@ public static void triggerManuallyPestsDestroyer() {
     )
     public static int pestFarmingWaitTime = 255;
 
+    @Switch(
+        name = "Set Spawn After Armor Swap(Read Desc)", category = PEST_FARMER,
+        description = "Sets spawn after swapping armor. Sicne farmhelper does not have anything to farm shards, use this to kill manually while ensuring macro returns back to spawn automacially."
+    )
+    public static boolean pestFarmingSetSpawn = false;
+
     @Switch(
         name = "Swap Equipments", category = PEST_FARMER
     )
     public static boolean pestFarmingSwapEq = false;
 
     @Text(
         name = "Farming Fortune Equipments", category = PEST_FARMER, size=2,
-        description = "Separate Equipment Names With |", placeholder = "Lotus Necklace|Lotus Cloak|Lotus Belt"
+        description = "Separate Equipment Names With |", placeholder = "Ex: Lotus Necklace|Lotus Cloak|Lotus Belt|Lotus Bracelet"
     )
     public static String pestFarmingEq0 = "";
 
     @Text(
         name = "Pest Chance Equipments", category = PEST_FARMER, size=2,
-        description = "Separate Equipment Names With |", placeholder = "Pesthunter's Necklace|Pesthunter's Cloak|Pesthunter's Belt"
+        description = "Separate Equipment Names With |", placeholder = "Ex: Pesthunter's Necklace|Pesthunter's Belt|Pesthunter's Gloves|Pest Vest"
     )
     public static String pestFarmingEq1 = "";
 
     @Slider(
         name = "Equipment Click Delay", category = PEST_FARMER,
-        min = 50, max = 2000, step = 10
+        min = 300, max = 2000, step = 10
     )
     public static int pestFarmerEquipmentClickDelay = 400;
 
@@ -1571,7 +1578,7 @@ public static void triggerManuallyPestsDestroyer() {
     public static boolean pestFarmerKillPests = false;
 
     @Switch(
-        name = "Cast Rod After Warping", category = PEST_FARMER
+        name = "Cast Rod After Killing", category = PEST_FARMER
     )
     public static boolean pestFarmerCastRod = false;
 
@@ -1581,42 +1588,6 @@ public static void triggerManuallyPestsDestroyer() {
     )
     public static int pestFarmerStartKillAt = 1;
 
-    @Info(
-            text = "It's supposed to swap armor before pest spawns, swap back after pest spawns and kill with Pest Destryoer/the other one.",
-            type = InfoType.INFO, category = PEST_FARMER, size = 2
-    )
-    public static boolean ignored0;
-    @Info(
-            text = "Use this Auto-Pet Rule:",
-            type = InfoType.INFO, category = PEST_FARMER, size = 2
-    )
-    public static boolean ignored2;
-    @Info(
-            text = "    1. On Gain Crop Collection -> Farming Pet, Except if slug is Equipped",
-            type = InfoType.INFO, category = PEST_FARMER, size = 2
-    )
-    public static boolean ignored3;
-    @Info(
-            text = "    2. On Equip Farming Armor -> Farming Pet",
-            type = InfoType.INFO, category = PEST_FARMER, size = 2
-    )
-    public static boolean ignored4;
-    @Info(
-            text = "    3. On Equip Pest Chance Armor -> Slug Pet",
-            type = InfoType.INFO, category = PEST_FARMER, size = 2
-    )
-    public static boolean ignored5;
-    @Info(
-            text = "    4. On Enter Combat -> Hedgehog Pet",
-            type = InfoType.INFO, category = PEST_FARMER, size = 2
-    )
-    public static boolean ignored6;
-    @Info(
-            text = "Use Armor Swapper in Pest Destroyer. Swap to Farming Armor On Start Just in case Pest Farmer doesn't do that itself.",
-            type = InfoType.INFO, category = PEST_FARMER, size = 2
-    )
-    public static boolean ignored7;
-
     //</editor-fold>
     //<editor-fold desc="DISCORD INTEGRATION">
     //<editor-fold desc="Webhook Discord">
@@ -2501,6 +2472,11 @@ public static void triggerManuallyAutoComposter() {
     )
     public static boolean debugMode = false;
 
+    @Switch(
+        name = "New Fly", category = DEBUG
+    )
+    public static boolean debugNewFly = true;
+
     //</editor-fold>
 
     //<editor-fold desc="Debug Hud">
@@ -2788,7 +2764,17 @@ public FarmHelperConfig() {
         registerKeyBind(tpToInfestedPlot, () -> {
             List<Integer> infestedPlots = GameStateHandler.getInstance().getInfestedPlots();
             if (infestedPlots.isEmpty()) return;
-            mc.thePlayer.sendChatMessage("/plottp " + infestedPlots.get(0));
+
+            while (!infestedPlots.isEmpty()) {
+                int curr = infestedPlots.get(0);
+                if (curr == GameStateHandler.getInstance().getCurrentPlot()
+                    && GameStateHandler.getInstance().getPestsCount() == 0) {
+                    infestedPlots.remove(0);
+                    continue;
+                }
+                mc.thePlayer.sendChatMessage("/plottp " + curr);
+                break;
+            }
         });
 //        registerKeyBind(debugKeybind2, () -> {
 //            MovingObjectPosition objectMouseOver = Minecraft.getMinecraft().objectMouseOver;