Made thirst sprint prevention configurable

Glitchfiend · Dec 31, 2023 · 479a50a · 479a50a
1 parent 193a6fd
commit 479a50a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 22 deletions.
diff --git a/common/src/main/java/toughasnails/config/ThirstConfig.java b/common/src/main/java/toughasnails/config/ThirstConfig.java
@@ -14,6 +14,7 @@ public class ThirstConfig extends Config
 {
     public boolean enableThirst;
     public boolean enableHandDrinking;
+    public boolean thirstPreventSprint;
     public double thirstExhaustionThreshold;
     public int handDrinkingThirst;
     public double handDrinkingHydration;
@@ -29,6 +30,7 @@ public void load()
         // Toggles
         enableThirst = add("toggles.enable_thirst", true, "Enable or disable thirst.");
         enableHandDrinking = add("toggles.enable_hand_drinking", false, "Enable or disable hand drinking.");
+        thirstPreventSprint = add("toggles.thirst_prevent_sprint", true, "Prevent sprinting when thirsty.");
 
         // General options
         thirstExhaustionThreshold = addNumber("general.exhaustion_threshold", 8.0D, 0.0D, Double.MAX_VALUE, "The threshold at which exhaustion causes a reduction in hydration and the thirst bar.");

diff --git a/common/src/main/java/toughasnails/thirst/ThirstHooksClient.java b/common/src/main/java/toughasnails/thirst/ThirstHooksClient.java
@@ -7,28 +7,10 @@
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.world.entity.player.Player;
 import toughasnails.api.thirst.ThirstHelper;
+import toughasnails.init.ModConfig;
 
-public class ThirstHooksClient {
-    public static void onAiStep(LocalPlayer player)
-    {
-        if (player.isSprinting())
-        {
-            boolean sprintingAllowable = canSprintWithThirst(player);
-
-            if (player.isSwimming())
-            {
-                if (!player.onGround() && !player.input.shiftKeyDown && !sprintingAllowable || !player.isInWater())
-                {
-                    player.setSprinting(false);
-                }
-            }
-            else if (!sprintingAllowable)
-            {
-                player.setSprinting(false);
-            }
-        }
-    }
-
+public class ThirstHooksClient
+{
     public static void onAiStepSetSprinting(LocalPlayer player, boolean sprinting)
     {
         // Don't allow sprinting if the player has insufficient thirst
@@ -40,6 +22,6 @@ public static void onAiStepSetSprinting(LocalPlayer player, boolean sprinting)
 
     private static boolean canSprintWithThirst(LocalPlayer player)
     {
-        return ThirstHelper.getThirst(player).getThirst() > 6 || player.getAbilities().mayfly;
+        return !ModConfig.thirst.thirstPreventSprint || ThirstHelper.getThirst(player).getThirst() > 6 || player.getAbilities().mayfly;
     }
 }