Fixed small bugs

gradle.properties

@@ -6,7 +6,7 @@ minecraft_version=1.21.1
 yarn_mappings=1.21.1+build.3
 loader_version=0.16.2
 # Mod Properties
-mod_version=1.8.3
+mod_version=1.8.4
 maven_group=net.toshimichi
 archives_base_name=thymine
 # Dependencies

src/main/java/net/toshimichi/thymine/ThymineMod.java

@@ -26,7 +26,7 @@ public class ThymineMod implements ModInitializer {
     public void onInitialize() {
         sprintKeyBinding = new KeyBinding("thymine.options.toggleSprint", GLFW.GLFW_KEY_R, "thymine");
         KeyBindingHelper.registerKeyBinding(sprintKeyBinding);
-        ClientTickEvents.START_CLIENT_TICK.register(new SprintStartTick());
+        ClientTickEvents.START_CLIENT_TICK.register(new ToggleSprintTick());
     }
 
     public static ThymineOptions getOptions() {

src/main/java/net/toshimichi/thymine/SprintStartTick.java → src/main/java/net/toshimichi/thymine/ToggleSprintTick.java

@@ -4,22 +4,21 @@
 import net.minecraft.client.MinecraftClient;
 import net.toshimichi.thymine.options.ThymineOptions;
 
-public class SprintStartTick implements ClientTickEvents.StartTick {
+public class ToggleSprintTick implements ClientTickEvents.StartTick {
 
     private boolean lastPressed;
 
     @Override
     public void onStartTick(MinecraftClient client) {
         ThymineOptions opt = ThymineMod.getOptions();
-        if (!opt.toggleSprint) return;
+        if (!opt.toggleSprint) {
+            opt.sprint = false;
+            return;
+        }
         boolean pressed = ThymineMod.getSprintKeyBinding().isPressed();
         if (pressed && !lastPressed) {
             opt.sprint = !opt.sprint;
-            if (!opt.sprint)
-                client.options.sprintKey.setPressed(false);
         }
-        lastPressed = pressed;
-        if (opt.sprint)
-            client.options.sprintKey.setPressed(true);
+        this.lastPressed = pressed;
     }
-}
+}

src/main/java/net/toshimichi/thymine/mixin/GameRendererMixin.java

@@ -1,23 +1,17 @@
 package net.toshimichi.thymine.mixin;
 
+import net.minecraft.client.option.SimpleOption;
 import net.minecraft.client.render.GameRenderer;
-import net.minecraft.client.util.math.MatrixStack;
 import net.toshimichi.thymine.ThymineMod;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(GameRenderer.class)
 abstract public class GameRendererMixin {
 
-    @Redirect(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/GameRenderer;bobView(Lnet/minecraft/client/util/math/MatrixStack;F)V"), method = "renderWorld")
-    public void bobView(GameRenderer instance, MatrixStack matrices, float tickDelta) {
-        if (!ThymineMod.getOptions().noScreenBobbing) {
-            bobView(matrices, tickDelta);
-        }
+    @Redirect(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/option/SimpleOption;getValue()Ljava/lang/Object;", ordinal = 0), method = "renderWorld", require = 0)
+    public Object bobView(SimpleOption<Boolean> instance) {
+        return !ThymineMod.getOptions().noScreenBobbing;
     }
-
-    @Shadow
-    protected abstract void bobView(MatrixStack matrices, float tickDelta);
 }

src/main/java/net/toshimichi/thymine/mixin/KeyBindingMixin.java

@@ -0,0 +1,25 @@
+package net.toshimichi.thymine.mixin;
+
+import net.minecraft.client.option.KeyBinding;
+import net.toshimichi.thymine.ThymineMod;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(KeyBinding.class)
+public class KeyBindingMixin {
+
+    @Final
+    @Shadow
+    private String translationKey;
+
+    @Inject(at = @At("HEAD"), method = "isPressed", cancellable = true)
+    public void isPressed(CallbackInfoReturnable<Boolean> cir) {
+        if (ThymineMod.getOptions().toggleSprint && translationKey.equals("key.sprint")) {
+            cir.setReturnValue(ThymineMod.getOptions().sprint);
+        }
+    }
+}

src/main/resources/thymine.mixins.json

@@ -14,6 +14,7 @@
     "HeldItemRendererMixin",
     "InGameHudMixin",
     "InGameOverlayRendererMixin",
+    "KeyBindingMixin",
     "LightmapTextureManagerMixin",
     "MinecraftClientMixin",
     "OptionsScreenMixin",