AutoGap eat before potion effects expire (#5666)

Author: IExploitableMan

src/main/java/meteordevelopment/meteorclient/systems/modules/player/AutoGap.java

@@ -73,6 +73,22 @@ public class AutoGap extends Module {
     );
 
     // Potions
+    private final Setting<Boolean> beforeExpiry = sgPotions.add(new BoolSetting.Builder()
+        .name("before-expiry")
+        .description("If it should eat before potion effects expire.")
+        .defaultValue(false)
+        .build()
+    );
+
+    private final Setting<Integer> expiryThreshold = sgPotions.add(new IntSetting.Builder()
+        .name("expiry-threshold")
+        .description("Time in ticks before the potion effect expires to start eating.")
+        .defaultValue(60)
+        .min(0)
+        .sliderMax(200)
+        .visible(beforeExpiry::get)
+        .build()
+    );
 
     private final Setting<Boolean> potionsRegeneration = sgPotions.add(new BoolSetting.Builder()
         .name("potions-regeneration")
@@ -255,18 +271,27 @@ private boolean shouldEatPotions() {
         Map<RegistryEntry<StatusEffect>, StatusEffectInstance> effects = mc.player.getActiveStatusEffects();
 
         // Regeneration
-        if (potionsRegeneration.get() && !effects.containsKey(StatusEffects.REGENERATION)) return true;
+        if (potionsRegeneration.get()) {
+            StatusEffectInstance effect = effects.get(StatusEffects.REGENERATION);
+            if (effect == null || (beforeExpiry.get() && effect.getDuration() <= expiryThreshold.get())) return true;
+        }
 
         // Fire resistance
-        if (potionsFireResistance.get() && !effects.containsKey(StatusEffects.FIRE_RESISTANCE)) {
-            requiresEGap = true;
-            return true;
+        if (potionsFireResistance.get()) {
+            StatusEffectInstance effect = effects.get(StatusEffects.FIRE_RESISTANCE);
+            if (effect == null || (beforeExpiry.get() && effect.getDuration() <= expiryThreshold.get())) {
+                requiresEGap = true;
+                return true;
+            }
         }
 
         // Absorption
-        if (potionsAbsorption.get() && !effects.containsKey(StatusEffects.ABSORPTION)) {
-            requiresEGap = true;
-            return true;
+        if (potionsAbsorption.get()) {
+            StatusEffectInstance effect = effects.get(StatusEffects.ABSORPTION);
+            if (effect == null || (beforeExpiry.get() && effect.getDuration() <= expiryThreshold.get())) {
+                requiresEGap = true;
+                return true;
+            }
         }
 
         return false;