Baritone Soft Dependency and even more mixins

Avanatiker · Avanatiker · commit a05bb881c37e · 2025-12-17T04:58:19.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -176,7 +176,7 @@ dependencies {
 
     // Add mods
     /*modImplementation("com.github.rfresh2:baritone-fabric:$minecraftVersion") */
-    modImplementation("com.github.rfresh2:baritone-fabric:1.21.10-SNAPSHOT") // ToDo: Move to 1.21.11
+    modCompileOnly("com.github.rfresh2:baritone-fabric:1.21.10-SNAPSHOT") // ToDo: Move to 1.21.11
     modCompileOnly("maven.modrinth:sodium:$sodiumVersion")
     modCompileOnly("maven.modrinth:malilib:$maLiLibVersion")
     modCompileOnly("maven.modrinth:litematica:$litematicaVersion")
diff --git a/src/main/java/com/lambda/mixin/client/sound/SoundSystemMixin.java b/src/main/java/com/lambda/mixin/client/sound/SoundSystemMixin.java
@@ -25,13 +25,14 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(SoundSystem.class)
 public class SoundSystemMixin {
-    @Inject(method = "play(Lnet/minecraft/client/sound/SoundInstance;)V", at = @At("HEAD"), cancellable = true)
-    public void onPlay(SoundInstance sound, CallbackInfo ci) {
+    @Inject(method = "play(Lnet/minecraft/client/sound/SoundInstance;)Lnet/minecraft/client/sound/SoundSystem$PlayResult;", at = @At("HEAD"), cancellable = true)
+    public void onPlay(SoundInstance sound, CallbackInfoReturnable<SoundSystem.PlayResult> cir) {
         if (EventFlow.post(new ClientEvent.Sound(sound)).isCanceled()) {
-            ci.cancel();
+            cir.setReturnValue(SoundSystem.PlayResult.NOT_STARTED);
         }
     }
 }
diff --git a/src/main/java/com/lambda/mixin/entity/ClientPlayInteractionManagerMixin.java b/src/main/java/com/lambda/mixin/entity/ClientPlayInteractionManagerMixin.java
@@ -121,9 +121,9 @@ private void cancelBlockBreakingPre(CallbackInfo ci) {
         if (EventFlow.post(new PlayerEvent.Breaking.Cancel(currentBreakingProgress)).isCanceled()) ci.cancel();
     }
 
-    @WrapMethod(method = "createPlayer(Lnet/minecraft/client/world/ClientWorld;Lnet/minecraft/stat/StatHandler;Lnet/minecraft/client/recipebook/ClientRecipeBook;ZZ)Lnet/minecraft/client/network/ClientPlayerEntity;")
-    private ClientPlayerEntity injectCreatePlayer(ClientWorld world, StatHandler statHandler, ClientRecipeBook recipeBook, boolean lastSneaking, boolean lastSprinting, Operation<ClientPlayerEntity> original) {
-        var player = original.call(world, statHandler, recipeBook, lastSneaking, lastSprinting);
+    @WrapMethod(method = "createPlayer(Lnet/minecraft/client/world/ClientWorld;Lnet/minecraft/stat/StatHandler;Lnet/minecraft/client/recipebook/ClientRecipeBook;)Lnet/minecraft/client/network/ClientPlayerEntity;")
+    private ClientPlayerEntity wrapCreatePlayer(ClientWorld world, StatHandler statHandler, ClientRecipeBook recipeBook, Operation<ClientPlayerEntity> original) {
+        var player = original.call(world, statHandler, recipeBook);
         InventoryManager.INSTANCE.setScreenHandler(player.playerScreenHandler);
         return player;
     }
diff --git a/src/main/java/com/lambda/mixin/entity/LivingEntityMixin.java b/src/main/java/com/lambda/mixin/entity/LivingEntityMixin.java
@@ -170,9 +170,9 @@ private float rotHead(LivingEntity entity, Operation<Float> original) {
         return (yaw == null) ? original.call(entity) : yaw;
     }
 
-    @ModifyConstant(method = "getHandSwingDuration", constant = @Constant(intValue = 6))
-    private int getHandSwingDuration(int constant) {
-        if (lambda$instance != Lambda.getMc().player || ViewModel.INSTANCE.isDisabled()) return constant;
+    @WrapMethod(method = "getHandSwingDuration")
+    private int getHandSwingDuration(Operation<Integer> original) {
+        if (lambda$instance != Lambda.getMc().player || ViewModel.INSTANCE.isDisabled()) return original.call();
 
         return ViewModel.INSTANCE.getSwingDuration();
     }
diff --git a/src/main/java/com/lambda/mixin/entity/PlayerEntityMixin.java b/src/main/java/com/lambda/mixin/entity/PlayerEntityMixin.java
@@ -47,13 +47,13 @@ private float wrapHeadYaw(PlayerEntity instance, Operation<Float> original) {
         return (yaw != null) ? yaw : original.call(instance);
     }
 
-    @WrapOperation(method = "attack", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;getYaw()F"))
-    private float wrapAttackYaw(PlayerEntity instance, Operation<Float> original) {
-        if ((Object) this != Lambda.getMc().player) {
-            return original.call(instance);
-        }
-
-        Float yaw = RotationManager.getMovementYaw();
-        return (yaw != null) ? yaw : original.call(instance);
-    }
+//    @WrapOperation(method = "attack", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;getYaw()F"))
+//    private float wrapAttackYaw(PlayerEntity instance, Operation<Float> original) {
+//        if ((Object) this != Lambda.getMc().player) {
+//            return original.call(instance);
+//        }
+//
+//        Float yaw = RotationManager.getMovementYaw();
+//        return (yaw != null) ? yaw : original.call(instance);
+//    }
 }
diff --git a/src/main/java/com/lambda/mixin/input/MouseMixin.java b/src/main/java/com/lambda/mixin/input/MouseMixin.java
@@ -25,6 +25,7 @@
 import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import net.minecraft.client.Mouse;
+import net.minecraft.client.input.MouseInput;
 import net.minecraft.client.option.SimpleOption;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -36,10 +37,10 @@ public class MouseMixin {
 
     @Shadow private double y;
 
-    @WrapMethod(method = "onMouseButton(JIII)V")
-    private void onMouseButton(long window, int button, int action, int mods, Operation<Void> original) {
-        if (!EventFlow.post(new MouseEvent.Click(button, action, mods)).isCanceled())
-            original.call(window, button, action, mods);
+    @WrapMethod(method = "onMouseButton")
+    private void onMouseButton(long window, MouseInput input, int action, Operation<Void> original) {
+        if (!EventFlow.post(new MouseEvent.Click(input.button(), action, input.modifiers())).isCanceled())
+            original.call(window, input, action);
     }
 
     @WrapMethod(method = "onMouseScroll(JDD)V")
diff --git a/src/main/java/com/lambda/mixin/network/ClientPlayNetworkHandlerMixin.java b/src/main/java/com/lambda/mixin/network/ClientPlayNetworkHandlerMixin.java
@@ -53,7 +53,7 @@ void injectPlayerList(PlayerListS2CPacket.Action action, PlayerListS2CPacket.Ent
         } else EventFlow.post(new WorldEvent.Player.Leave(name, uuid, currentEntry));
     }
 
-    @Inject(method = "onUpdateSelectedSlot", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/NetworkThreadUtils;forceMainThread(Lnet/minecraft/network/packet/Packet;Lnet/minecraft/network/listener/PacketListener;Lnet/minecraft/util/thread/ThreadExecutor;)V", shift = At.Shift.AFTER), cancellable = true)
+    @Inject(method = "onUpdateSelectedSlot", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/NetworkThreadUtils;forceMainThread(Lnet/minecraft/network/packet/Packet;Lnet/minecraft/network/listener/PacketListener;Lnet/minecraft/network/PacketApplyBatcher;)V", shift = At.Shift.AFTER), cancellable = true)
     private void onUpdateSelectedSlot(UpdateSelectedSlotS2CPacket packet, CallbackInfo ci) {
         if (EventFlow.post(new InventoryEvent.HotbarSlot.Sync(packet.slot())).isCanceled()) ci.cancel();
     }
diff --git a/src/main/java/com/lambda/mixin/render/AbstractSignBlockEntityRendererMixin.java b/src/main/java/com/lambda/mixin/render/AbstractSignBlockEntityRendererMixin.java
@@ -21,6 +21,8 @@
 import net.minecraft.block.entity.SignText;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.block.entity.AbstractSignBlockEntityRenderer;
+import net.minecraft.client.render.block.entity.state.SignBlockEntityRenderState;
+import net.minecraft.client.render.command.OrderedRenderCommandQueue;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.math.BlockPos;
 import org.spongepowered.asm.mixin.Mixin;
@@ -31,7 +33,7 @@
 @Mixin(AbstractSignBlockEntityRenderer.class)
 public class AbstractSignBlockEntityRendererMixin {
     @Inject(method = "renderText", at = @At("HEAD"), cancellable = true)
-    private void injectRenderText(BlockPos pos, SignText text, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int textLineHeight, int maxTextWidth, boolean front, CallbackInfo ci) {
+    private void injectRenderText(SignBlockEntityRenderState renderState, MatrixStack matrices, OrderedRenderCommandQueue queue, boolean front, CallbackInfo ci) {
         if (NoRender.INSTANCE.isEnabled() && NoRender.getNoSignText()) ci.cancel();
     }
 }
diff --git a/src/main/java/com/lambda/mixin/render/CameraMixin.java b/src/main/java/com/lambda/mixin/render/CameraMixin.java
@@ -26,6 +26,7 @@
 import net.minecraft.client.render.Camera;
 import net.minecraft.entity.Entity;
 import net.minecraft.world.BlockView;
+import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -42,14 +43,7 @@ public abstract class CameraMixin {
     public abstract void setRotation(float yaw, float pitch);
 
     @Inject(method = "update", at = @At("TAIL"))
-    private void onUpdate(
-            BlockView area,
-            Entity focusedEntity,
-            boolean thirdPerson,
-            boolean inverseView,
-            float tickDelta,
-            CallbackInfo ci
-    ) {
+    private void onUpdate(World area, Entity focusedEntity, boolean thirdPerson, boolean inverseView, float tickProgress, CallbackInfo ci) {
         if (!Freecam.INSTANCE.isEnabled()) return;
 
         Freecam.updateCam();
@@ -66,7 +60,7 @@ private void onUpdate(
      * }</pre>
      */
     @Inject(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/Camera;setPos(DDD)V", shift = At.Shift.AFTER))
-    private void injectQuickPerspectiveSwap(BlockView area, Entity focusedEntity, boolean thirdPerson, boolean inverseView, float tickDelta, CallbackInfo ci) {
+    private void injectQuickPerspectiveSwap(World area, Entity focusedEntity, boolean thirdPerson, boolean inverseView, float tickProgress, CallbackInfo ci) {
         var rot = RotationManager.getLockRotation();
         if (rot == null) return;
         setRotation(rot.getYawF(), rot.getPitchF());
diff --git a/src/main/java/com/lambda/mixin/render/EntityRendererMixin.java b/src/main/java/com/lambda/mixin/render/EntityRendererMixin.java
@@ -19,12 +19,12 @@
 
 import com.lambda.module.modules.render.NoRender;
 import net.minecraft.client.render.Frustum;
-import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.command.OrderedRenderCommandQueue;
 import net.minecraft.client.render.entity.EntityRenderer;
 import net.minecraft.client.render.entity.state.EntityRenderState;
+import net.minecraft.client.render.state.CameraRenderState;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.Entity;
-import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -39,7 +39,7 @@ private void injectShouldRender(Entity entity, Frustum frustum, double x, double
     }
 
     @Inject(method = "renderLabelIfPresent", at = @At("HEAD"), cancellable = true)
-    private void injectRenderLabelIfPresent(EntityRenderState state, Text text, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo ci) {
+    private void injectRenderLabelIfPresent(EntityRenderState state, MatrixStack matrices, OrderedRenderCommandQueue queue, CameraRenderState cameraRenderState, CallbackInfo ci) {
         if (NoRender.INSTANCE.isEnabled() && NoRender.getNoNametags()) ci.cancel();
     }
 }
diff --git a/src/main/java/com/lambda/mixin/render/HandledScreenMixin.java b/src/main/java/com/lambda/mixin/render/HandledScreenMixin.java
@@ -18,6 +18,7 @@
 package com.lambda.mixin.render;
 
 import com.lambda.module.modules.render.ContainerPreview;
+import net.minecraft.client.gui.Click;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -27,18 +28,18 @@
 @Mixin(HandledScreen.class)
 public class HandledScreenMixin {
     @Inject(method = "mouseClicked", at = @At("HEAD"), cancellable = true)
-    private void onMouseClicked(double mouseX, double mouseY, int button, CallbackInfoReturnable<Boolean> cir) {
+    private void onMouseClicked(Click click, boolean doubled, CallbackInfoReturnable<Boolean> cir) {
         if (ContainerPreview.INSTANCE.isEnabled() && ContainerPreview.isLocked()) {
-            if (ContainerPreview.isMouseOverLockedTooltip((int) mouseX, (int) mouseY)) {
+            if (ContainerPreview.isMouseOverLockedTooltip((int) click.x(), (int) click.y())) {
                 cir.setReturnValue(true);
             }
         }
     }
 
     @Inject(method = "mouseReleased", at = @At("HEAD"), cancellable = true)
-    private void onMouseReleased(double mouseX, double mouseY, int button, CallbackInfoReturnable<Boolean> cir) {
+    private void onMouseReleased(Click click, CallbackInfoReturnable<Boolean> cir) {
         if (ContainerPreview.INSTANCE.isEnabled() && ContainerPreview.isLocked()) {
-            if (ContainerPreview.isMouseOverLockedTooltip((int) mouseX, (int) mouseY)) {
+            if (ContainerPreview.isMouseOverLockedTooltip((int) click.x(), (int) click.y())) {
                 cir.setReturnValue(true);
             }
         }
diff --git a/src/main/java/com/lambda/mixin/render/ScreenMixin.java b/src/main/java/com/lambda/mixin/render/ScreenMixin.java
@@ -25,6 +25,7 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.input.KeyInput;
 import org.lwjgl.glfw.GLFW;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -35,8 +36,8 @@
 @Mixin(Screen.class)
 public class ScreenMixin {
     @Inject(method = "keyPressed", at = @At("HEAD"), cancellable = true)
-    private void onKeyPressed(int keyCode, int scanCode, int modifiers, CallbackInfoReturnable<Boolean> cir) {
-        if (keyCode == GLFW.GLFW_KEY_ESCAPE && QuickSearch.INSTANCE.isOpen()) {
+    private void onKeyPressed(KeyInput input, CallbackInfoReturnable<Boolean> cir) {
+        if (input.key() == GLFW.GLFW_KEY_ESCAPE && QuickSearch.INSTANCE.isOpen()) {
             QuickSearch.INSTANCE.close();
             cir.setReturnValue(true);
         }
diff --git a/src/main/kotlin/com/lambda/event/events/MouseEvent.kt b/src/main/kotlin/com/lambda/event/events/MouseEvent.kt
@@ -21,6 +21,7 @@ import com.lambda.config.settings.complex.Bind
 import com.lambda.event.callback.Cancellable
 import com.lambda.event.callback.ICancellable
 import com.lambda.util.math.Vec2d
+import net.minecraft.client.input.MouseInput
 
 sealed class MouseEvent {
     /**
diff --git a/src/main/kotlin/com/lambda/interaction/BaritoneManager.kt b/src/main/kotlin/com/lambda/interaction/BaritoneManager.kt
@@ -28,15 +28,18 @@ import com.lambda.context.Automated
 import com.lambda.config.AutomationConfig
 import com.lambda.util.BlockUtils.blockPos
 import com.lambda.util.NamedEnum
+import net.fabricmc.loader.api.FabricLoader
 
 object BaritoneManager : Configurable(LambdaConfig), Automated by AutomationConfig.Companion.DEFAULT {
     override val name = "baritone"
 
-    private val baritone = BaritoneAPI.getProvider()
-    val baritoneSettings: Settings = BaritoneAPI.getSettings()
+    val isBaritoneLoaded = FabricLoader.getInstance().isModLoaded("baritone")
+
+    private val baritone = if (isBaritoneLoaded) BaritoneAPI.getProvider() else null
+    val baritoneSettings: Settings? = if (isBaritoneLoaded) BaritoneAPI.getSettings() else null
 
     @JvmStatic
-    val primary: IBaritone = baritone.primaryBaritone
+    val primary: IBaritone? = baritone?.primaryBaritone
 
     private enum class Group(override val displayName: String) : NamedEnum {
         General("General"),
@@ -72,7 +75,8 @@ object BaritoneManager : Configurable(LambdaConfig), Automated by AutomationConf
 
     init {
         // ToDo: Dont actually save the settings as its duplicate data
-        with(baritoneSettings) {
+        if (isBaritoneLoaded) {
+            with(baritoneSettings!!) {
 
             // GENERAL
             setting("Log As Toast", logAsToast.value).group(Group.General, SubGroup.ChatAndControl).onValueChange { _, it -> logAsToast.value = it }
@@ -334,29 +338,36 @@ object BaritoneManager : Configurable(LambdaConfig), Automated by AutomationConf
             setting("Allow Land On Nether Fortress", elytraAllowLandOnNetherFortress.value).group(Group.Elytra).onValueChange { _, it -> elytraAllowLandOnNetherFortress.value = it }
             setting("Terms Accepted", elytraTermsAccepted.value).group(Group.Elytra).onValueChange { _, it -> elytraTermsAccepted.value = it }
             setting("Chat Spam", elytraChatSpam.value).group(Group.Elytra).onValueChange { _, it -> elytraChatSpam.value = it }
+            }
         }
     }
 
     /**
      * Whether Baritone is currently pathing
      */
     val isPathing: Boolean
-        get() = primary.pathingBehavior.isPathing
+        get() = isBaritoneLoaded && primary?.pathingBehavior?.isPathing == true
 
     /**
      * Whether Baritone is active (pathing, calculating goal, etc.)
      */
     val isActive: Boolean
-        get() = primary.customGoalProcess.isActive || primary.pathingBehavior.isPathing || primary.pathingControlManager.mostRecentInControl()
-            .orElse(null)?.isActive == true
+        get() = isBaritoneLoaded && (primary?.customGoalProcess?.isActive == true || primary?.pathingBehavior?.isPathing == true || primary?.pathingControlManager?.mostRecentInControl()
+            ?.orElse(null)?.isActive == true)
 
     /**
      * Sets the current Baritone goal and starts pathing
      */
-    fun setGoalAndPath(goal: Goal) = primary.customGoalProcess.setGoalAndPath(goal)
+    fun setGoalAndPath(goal: Goal) {
+        if (!isBaritoneLoaded) return
+        primary?.customGoalProcess?.setGoalAndPath(goal)
+    }
 
     /**
      * Force cancel Baritone
      */
-    fun cancel() = primary.pathingBehavior.cancelEverything()
+    fun cancel() {
+        if (!isBaritoneLoaded) return
+        primary?.pathingBehavior?.cancelEverything()
+    }
 }
diff --git a/src/main/kotlin/com/lambda/module/hud/Baritone.kt b/src/main/kotlin/com/lambda/module/hud/Baritone.kt
@@ -18,7 +18,7 @@
 package com.lambda.module.hud
 
 import com.lambda.gui.dsl.ImGuiBuilder
-import com.lambda.interaction.BaritoneManager.primary
+import com.lambda.interaction.BaritoneManager
 import com.lambda.interaction.construction.simulation.BuildGoal
 import com.lambda.module.HudModule
 import com.lambda.module.tag.ModuleTag
@@ -29,7 +29,12 @@ object Baritone : HudModule(
     tag = ModuleTag.HUD,
 ) {
     override fun ImGuiBuilder.buildLayout() {
-        primary.customGoalProcess.goal?.let {
+        if (!BaritoneManager.isBaritoneLoaded) {
+            text("Baritone is not loaded")
+            return
+        }
+
+        BaritoneManager.primary?.customGoalProcess?.goal?.let {
             when(it) {
                 is BuildGoal -> text("Lambda Simulation: ${it.sim}")
                 else -> text("Baritone: $it")
diff --git a/src/main/kotlin/com/lambda/module/modules/player/Nuker.kt b/src/main/kotlin/com/lambda/module/modules/player/Nuker.kt
@@ -64,13 +64,13 @@ object Nuker : Module(
                     .filter { !flatten || it.y >= player.blockPos.y }
                     .filter { pos ->
                         if (!baritoneSelection) true
-                        else BaritoneManager.primary.selectionManager.selections.any {
+                        else BaritoneManager.primary?.selectionManager?.selections?.any {
                             val min = it.min()
                             val max = it.max()
                             pos.x >= min.x && pos.x <= max.x
                                     && pos.y >= min.y && pos.y <= max.y
                                     && pos.z >= min.z && pos.z <= max.z
-                        }
+                        } ?: false
                     }
                     .associateWith { if (fillFluids) TargetState.Air else TargetState.Empty }
 
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -29,7 +29,9 @@
     "minecraft": "~$minecraftVersion",
     "fabric-api": ">=$fabricApiVersion+$minecraftVersion",
     "fabric-language-kotlin": ">=$kotlinFabricVersion",
-    "java": ">=$javaVersion",
+    "java": ">=$javaVersion"
+  },
+  "recommends": {
     "baritone": "*"
   }
 }
diff --git a/src/main/resources/lambda.mixins.common.json b/src/main/resources/lambda.mixins.common.json
@@ -6,8 +6,6 @@
   "client": [
     "CrashReportMixin",
     "MinecraftClientMixin",
-    "baritone.MixinBaritonePlayerContext",
-    "baritone.MixinLookBehavior",
     "client.sound.SoundSystemMixin",
     "entity.ClientPlayerEntityMixin",
     "entity.ClientPlayInteractionManagerMixin",
@@ -83,9 +81,14 @@
     "world.ClientChunkManagerMixin",
     "world.ClientWorldMixin",
     "world.StructureTemplateMixin",
-    "world.WorldMixin"
+    "world.WorldMixin",
+    "baritone.MixinBaritonePlayerContext",
+    "baritone.MixinLookBehavior"
   ],
   "injectors": {
-    "defaultRequire": 1
+    "defaultRequire": 0
+  },
+  "overwrites": {
+    "conformVisibility": true
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -25,13 +25,14 @@`
`25`	`25`	`import org.spongepowered.asm.mixin.injection.At;`
`26`	`26`	`import org.spongepowered.asm.mixin.injection.Inject;`
`27`	`27`	`import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;`
	`28`	`+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;`
`28`	`29`
`29`	`30`	`@Mixin(SoundSystem.class)`
`30`	`31`	`public class SoundSystemMixin {`
`31`		`- @Inject(method = "play(Lnet/minecraft/client/sound/SoundInstance;)V", at = @At("HEAD"), cancellable = true)`
`32`		`- public void onPlay(SoundInstance sound, CallbackInfo ci) {`
	`32`	`+ @Inject(method = "play(Lnet/minecraft/client/sound/SoundInstance;)Lnet/minecraft/client/sound/SoundSystem$PlayResult;", at = @At("HEAD"), cancellable = true)`
	`33`	`+ public void onPlay(SoundInstance sound, CallbackInfoReturnable<SoundSystem.PlayResult> cir) {`
`33`	`34`	`if (EventFlow.post(new ClientEvent.Sound(sound)).isCanceled()) {`
`34`		`- ci.cancel();`
	`35`	`+ cir.setReturnValue(SoundSystem.PlayResult.NOT_STARTED);`
`35`	`36`	`}`
`36`	`37`	`}`
`37`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,9 +121,9 @@ private void cancelBlockBreakingPre(CallbackInfo ci) {`
`121`	`121`	`if (EventFlow.post(new PlayerEvent.Breaking.Cancel(currentBreakingProgress)).isCanceled()) ci.cancel();`
`122`	`122`	`}`
`123`	`123`
`124`		`- @WrapMethod(method = "createPlayer(Lnet/minecraft/client/world/ClientWorld;Lnet/minecraft/stat/StatHandler;Lnet/minecraft/client/recipebook/ClientRecipeBook;ZZ)Lnet/minecraft/client/network/ClientPlayerEntity;")`
`125`		`- private ClientPlayerEntity injectCreatePlayer(ClientWorld world, StatHandler statHandler, ClientRecipeBook recipeBook, boolean lastSneaking, boolean lastSprinting, Operation<ClientPlayerEntity> original) {`
`126`		`- var player = original.call(world, statHandler, recipeBook, lastSneaking, lastSprinting);`
	`124`	`+ @WrapMethod(method = "createPlayer(Lnet/minecraft/client/world/ClientWorld;Lnet/minecraft/stat/StatHandler;Lnet/minecraft/client/recipebook/ClientRecipeBook;)Lnet/minecraft/client/network/ClientPlayerEntity;")`
	`125`	`+ private ClientPlayerEntity wrapCreatePlayer(ClientWorld world, StatHandler statHandler, ClientRecipeBook recipeBook, Operation<ClientPlayerEntity> original) {`
	`126`	`+ var player = original.call(world, statHandler, recipeBook);`
`127`	`127`	`InventoryManager.INSTANCE.setScreenHandler(player.playerScreenHandler);`
`128`	`128`	`return player;`
`129`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -170,9 +170,9 @@ private float rotHead(LivingEntity entity, Operation<Float> original) {`
`170`	`170`	`return (yaw == null) ? original.call(entity) : yaw;`
`171`	`171`	`}`
`172`	`172`
`173`		`- @ModifyConstant(method = "getHandSwingDuration", constant = @Constant(intValue = 6))`
`174`		`- private int getHandSwingDuration(int constant) {`
`175`		`- if (lambda$instance != Lambda.getMc().player \|\| ViewModel.INSTANCE.isDisabled()) return constant;`
	`173`	`+ @WrapMethod(method = "getHandSwingDuration")`
	`174`	`+ private int getHandSwingDuration(Operation<Integer> original) {`
	`175`	`+ if (lambda$instance != Lambda.getMc().player \|\| ViewModel.INSTANCE.isDisabled()) return original.call();`
`176`	`176`
`177`	`177`	`return ViewModel.INSTANCE.getSwingDuration();`
`178`	`178`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ void injectPlayerList(PlayerListS2CPacket.Action action, PlayerListS2CPacket.Ent`
`53`	`53`	`} else EventFlow.post(new WorldEvent.Player.Leave(name, uuid, currentEntry));`
`54`	`54`	`}`
`55`	`55`
`56`		`- @Inject(method = "onUpdateSelectedSlot", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/NetworkThreadUtils;forceMainThread(Lnet/minecraft/network/packet/Packet;Lnet/minecraft/network/listener/PacketListener;Lnet/minecraft/util/thread/ThreadExecutor;)V", shift = At.Shift.AFTER), cancellable = true)`
	`56`	`+ @Inject(method = "onUpdateSelectedSlot", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/NetworkThreadUtils;forceMainThread(Lnet/minecraft/network/packet/Packet;Lnet/minecraft/network/listener/PacketListener;Lnet/minecraft/network/PacketApplyBatcher;)V", shift = At.Shift.AFTER), cancellable = true)`
`57`	`57`	`private void onUpdateSelectedSlot(UpdateSelectedSlotS2CPacket packet, CallbackInfo ci) {`
`58`	`58`	`if (EventFlow.post(new InventoryEvent.HotbarSlot.Sync(packet.slot())).isCanceled()) ci.cancel();`
`59`	`59`	`}`