From d5cb4ecdc6ced041712932ac347476edf18fc40c Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Wed, 28 Dec 2016 18:40:09 +1000 Subject: $ Fixed the Slow Builders Ring. > It now uses a client-side state system, which can be hooked by anything to force sneaking or sprinting. --- .../core/handler/events/CustomMovementHandler.java | 9 +++++--- .../core/handler/events/SneakManager.java | 24 +++++++++++++++------- 2 files changed, 23 insertions(+), 10 deletions(-) (limited to 'src/Java/gtPlusPlus/core/handler') diff --git a/src/Java/gtPlusPlus/core/handler/events/CustomMovementHandler.java b/src/Java/gtPlusPlus/core/handler/events/CustomMovementHandler.java index e2eb1538e6..025d5fc8af 100644 --- a/src/Java/gtPlusPlus/core/handler/events/CustomMovementHandler.java +++ b/src/Java/gtPlusPlus/core/handler/events/CustomMovementHandler.java @@ -61,7 +61,10 @@ public class CustomMovementHandler { // // Check to see if Enabled - Added 6/17/14 to provide option to disable Sneak Toggle - if (SneakManager.Sneaking()) + boolean isSneaking = SneakManager.Sneaking(); + //Utils.LOG_INFO("Can sneak: "+isSneaking); + //Utils.LOG_INFO("Can sprint: "+SneakManager.Sprinting()); + if (isSneaking) { // Key Pressed if (settings.keyBindSneak.getIsKeyPressed() && !this.handledSneakPress) @@ -118,7 +121,7 @@ public class CustomMovementHandler { boolean enoughHunger = (float)thisPlayer.getFoodStats().getFoodLevel() > 6.0F || thisPlayer.capabilities.isFlying; boolean canSprint = !options.sneak && !thisPlayer.isRiding() && !thisPlayer.capabilities.isFlying && enoughHunger; - isDisabled = !SneakManager.canSprint; + isDisabled = !SneakManager.Sprinting(); canDoubleTap = SneakManager.optionDoubleTap; // Key Pressed @@ -147,7 +150,7 @@ public class CustomMovementHandler { } public void UpdateSprint(boolean newValue, boolean doubleTapped){ - if (SneakManager.SprintingDisabled()){ + if (!SneakManager.Sprinting()){ this.sprint = false; this.sprintDoubleTapped = doubleTapped; } diff --git a/src/Java/gtPlusPlus/core/handler/events/SneakManager.java b/src/Java/gtPlusPlus/core/handler/events/SneakManager.java index 9e783a3a4f..9edc962a6b 100644 --- a/src/Java/gtPlusPlus/core/handler/events/SneakManager.java +++ b/src/Java/gtPlusPlus/core/handler/events/SneakManager.java @@ -1,5 +1,6 @@ package gtPlusPlus.core.handler.events; +import gtPlusPlus.core.util.Utils; import net.minecraft.client.Minecraft; public class SneakManager { @@ -9,17 +10,17 @@ public class SneakManager { protected static final Minecraft mc = Minecraft.getMinecraft(); public static boolean canSprint = true; public static boolean isSneaking = true; - public static boolean optionDoubleTap = false; + public static boolean optionDoubleTap = true; public static boolean wasSprintDisabled = false; - private static State Sprinting = State.OFF; + private static State Sprinting = State.ON; private static State Crouching = State.OFF; public static boolean Sneaking(){ return Crouching.getState(); } - public static boolean SprintingDisabled(){ + public static boolean Sprinting(){ return Sprinting.getState(); } @@ -40,17 +41,26 @@ public class SneakManager { } private static State toggleState(State state){ + Utils.LOG_INFO("State Toggle"); if (state == State.ON) return state = State.OFF; return state = State.ON; } - public static State setStateON(State state1){ - return state1 = State.ON; + public static State setCrouchingStateON(){ + return Crouching = State.ON; } - public static State setStateOFF(State state1){ - return state1 = State.OFF; + public static State setCrouchingStateOFF(){ + return Crouching = State.OFF; + } + + public static State setSprintingStateON(){ + return Sprinting = State.ON; + } + + public static State setSprintingStateOFF(){ + return Sprinting = State.OFF; } public static enum State { -- cgit