Merge pull request #99 from ThebestkillerTBK/master

ToggleSprintHud: better compatibility and text improvements
DarkKronicle · Oct 31, 2022 · 9c68765 · 9c68765
2 parents 50a084a + eda7685
commit 9c68765
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 35 deletions.
diff --git a/src/main/java/io/github/darkkronicle/kronhud/gui/hud/ToggleSprintHud.java b/src/main/java/io/github/darkkronicle/kronhud/gui/hud/ToggleSprintHud.java
@@ -56,9 +56,9 @@ private void loadRandomPlaceholder() {
         try {
             BufferedReader bufferedReader = new BufferedReader(
                     new InputStreamReader(MinecraftClient.getInstance()
-                                                         .getResourceManager()
-                                                         .getResourceOrThrow(new Identifier("texts/splashes.txt"))
-                                                         .getInputStream(), StandardCharsets.UTF_8)
+                            .getResourceManager()
+                            .getResourceOrThrow(new Identifier("texts/splashes.txt"))
+                            .getInputStream(), StandardCharsets.UTF_8)
             );
             String string;
             while ((string = bufferedReader.readLine()) != null) {
@@ -98,20 +98,18 @@ public boolean movable() {
 
     @Override
     public String getValue() {
-
-        if (client.options.sneakKey.isPressed()) {
-            return I18n.translate("texts.kronhud.togglesprint.sneaking_pressed");
-        }
-        if (client.options.sprintKey.isPressed()) {
-            return I18n.translate("texts.kronhud.togglesprint.sprinting_pressed");
-        }
-
         if (toggleSneak.getValue() && sneakToggled.getValue()) {
             return I18n.translate("texts.kronhud.togglesprint.sneaking_toggled");
+        } else if (client.player.isSneaking()) {
+            return I18n.translate("texts.kronhud.togglesprint.sneaking");
         }
+
         if (toggleSprint.getValue() && sprintToggled.getValue()) {
             return I18n.translate("texts.kronhud.togglesprint.sprinting_toggled");
+        } else if (client.player.isSprinting()) {
+            return I18n.translate("texts.kronhud.togglesprint.sprinting");
         }
+
         return getPlaceholder();
     }
 

diff --git a/src/main/java/io/github/darkkronicle/kronhud/mixins/MixinClientPlayerEntity.java b/src/main/java/io/github/darkkronicle/kronhud/mixins/MixinClientPlayerEntity.java
@@ -2,30 +2,19 @@
 
 import io.github.darkkronicle.kronhud.gui.HudManager;
 import io.github.darkkronicle.kronhud.gui.hud.ToggleSprintHud;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.client.option.KeyBinding;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ClientPlayerEntity.class)
 public abstract class MixinClientPlayerEntity {
-
-    /**
-     * @param sprintKey the sprint key that the user has bound
-     * @return whether the user should try to sprint
-     * @author DragonEggBedrockBreaking
-     * @license MPL-2.0
-     */
-    @Redirect(
-            method = "tickMovement",
-            at = @At(
-                    value = "INVOKE",
-                    target = "Lnet/minecraft/client/option/KeyBinding;isPressed()Z"
-            )
-    )
-    private boolean alwaysPressed(KeyBinding sprintKey) {
+    @Inject(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/option/KeyBinding;isPressed()Z"))
+    private void alwaysPressed(CallbackInfo info) {
         ToggleSprintHud hud = (ToggleSprintHud) HudManager.getInstance().get(ToggleSprintHud.ID);
-        return hud.getSprintToggled().getValue() || sprintKey.isPressed();
+        MinecraftClient mc = MinecraftClient.getInstance();
+        mc.player.setSprinting(hud.getSprintToggled().getValue() || mc.options.sprintKey.isPressed());
     }
 }
diff --git a/src/main/resources/assets/kronhud/lang/de_de.json b/src/main/resources/assets/kronhud/lang/de_de.json
@@ -122,9 +122,9 @@
   "option.kronhud.reachhud.decimalplaces": "Nachkommastellen",
   "keys.kronhud.toggleSprint": "Toggle Sprint",
   "keys.kronhud.toggleSneak": "Toggle Sneak",
-  "texts.kronhud.togglesprint.sprinting_pressed": "Sprinting [Taste gedrückt]",
+  "texts.kronhud.togglesprint.sprinting": "Sprinting",
   "texts.kronhud.togglesprint.sprinting_toggled": "Sprinting [Toggled]",
-  "texts.kronhud.togglesprint.sneaking_pressed": "Sneaking [Taste gedrückt]",
+  "texts.kronhud.togglesprint.sneaking": "Sneaking",
   "texts.kronhud.togglesprint.sneaking_toggled": "Sneaking [Toggled]",
   "hud.kronhud.armorhud.info": "Ein Hud-Element zur anzeige von Rüstung un dem gerade gehaltenen Item",
   "hud.kronhud.arrowhead.info": "Ein HUD-Element zur Anzeige der übrigen Pfeile im Inventar",

diff --git a/src/main/resources/assets/kronhud/lang/en_us.json b/src/main/resources/assets/kronhud/lang/en_us.json
@@ -124,9 +124,9 @@
   "button.kronhud.snapping.on": "Snapping: ON",
   "button.kronhud.enabled": "§2Enabled",
   "button.kronhud.disabled": "§4Disabled",
-  "texts.kronhud.togglesprint.sprinting_pressed": "Sprinting [Key Held]",
+  "texts.kronhud.togglesprint.sprinting": "Sprinting",
   "texts.kronhud.togglesprint.sprinting_toggled": "Sprinting [Toggled]",
-  "texts.kronhud.togglesprint.sneaking_pressed": "Sneaking [Key Held]",
+  "texts.kronhud.togglesprint.sneaking": "Sneaking",
   "texts.kronhud.togglesprint.sneaking_toggled": "Sneaking [Toggled]",
   "hud.kronhud.armorhud.info": "A HUD component to show held items and armor",
   "hud.kronhud.arrowhead.info": "A HUD component to show the amount of arrows in your inventory",

diff --git a/src/main/resources/assets/kronhud/lang/ko_kr.json b/src/main/resources/assets/kronhud/lang/ko_kr.json
@@ -122,9 +122,9 @@
   "button.kronhud.snapping.on": "레이아웃 배열 맞추기: 켜짐",
   "button.kronhud.enabled": "§2사용함",
   "button.kronhud.disabled": "§4사용 안 함",
-  "texts.kronhud.togglesprint.sprinting_pressed": "달리는 중 [키 눌림]",
+  "texts.kronhud.togglesprint.sprinting": "달리는 중",
   "texts.kronhud.togglesprint.sprinting_toggled": "달리는 중 [토글됨]",
-  "texts.kronhud.togglesprint.sneaking_pressed": "은신 중 [키 눌림]",
+  "texts.kronhud.togglesprint.sneaking": "은신 중",
   "texts.kronhud.togglesprint.sneaking_toggled": "은신 중 [토글됨]",
   "hud.kronhud.armorhud.info": "들고 있는 아이템, 방어구를 표시하는 HUD 구성요소",
   "hud.kronhud.arrowhead.info": "인벤토리 내 화살 개수를 표시하는 HUD 구성요소",