Add hotbar spoof test and fix dsync issues

Author: Avanatiker

common/src/main/java/com/lambda/mixin/entity/PlayerInventoryMixin.java

@@ -17,11 +17,15 @@
 
 package com.lambda.mixin.entity;
 
+import net.minecraft.block.BlockState;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerInteractionManager;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.ItemStack;
+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;
@@ -30,6 +34,8 @@
 
 @Mixin(PlayerInventory.class)
 public class PlayerInventoryMixin {
+    @Shadow @Final public PlayerEntity player;
+
     @Inject(method = "getMainHandStack", at = @At(value = "HEAD"), cancellable = true)
     public void handleSpoofedMainHandStack(CallbackInfoReturnable<ItemStack> cir) {
         PlayerInventory instance = (PlayerInventory) (Object) this;
@@ -44,4 +50,9 @@ public void handleSpoofedMainHandStack(CallbackInfoReturnable<ItemStack> cir) {
                 isValidHotbarIndex(actualSlot) ? instance.main.get(actualSlot) : ItemStack.EMPTY
         );
     }
+
+    @Inject(method = "getBlockBreakingSpeed", at = @At(value = "HEAD"), cancellable = true)
+    public void handleSpoofedBlockBreakingSpeed(BlockState block, CallbackInfoReturnable<Float> cir) {
+        cir.setReturnValue(player.getMainHandStack().getMiningSpeedMultiplier(block));
+    }
 }

common/src/main/kotlin/com/lambda/interaction/construction/context/BreakContext.kt

@@ -83,7 +83,7 @@ data class BreakContext(
     }
 
     fun getBlockBreakingProgress(breakingTicks: Int, player: PlayerEntity, world: BlockView): Int {
-        val currentItemStack = HotbarManager.mainHandStack ?: return -1
+        val currentItemStack = player.mainHandStack ?: return -1
         val breakDelta = checkedState.calcItemBlockBreakingDelta(player, world, expectedPos, currentItemStack)
         val progress = breakDelta * breakingTicks
         return if (progress > 0.0f)

common/src/main/kotlin/com/lambda/interaction/request/hotbar/HotbarManager.kt

@@ -28,10 +28,7 @@ import com.lambda.util.player.SlotUtils.hotbar
 object HotbarManager : RequestHandler<HotbarRequest>(), Loadable {
     val serverSlot get() = runSafe {
         interaction.lastSelectedSlot
-    } ?: -1
-    val mainHandStack get() = runSafe {
-        player.hotbar.getOrNull(serverSlot - 1)
-    }
+    } ?: 0
 
     override fun load() = "Loaded Hotbar Manager"
 

common/src/main/kotlin/com/lambda/module/modules/debug/SilentSwap.kt

@@ -0,0 +1,51 @@
+/*
+ * Copyright 2024 Lambda
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lambda.module.modules.debug
+
+import com.lambda.config.groups.HotbarSettings
+import com.lambda.event.events.PlayerEvent
+import com.lambda.event.events.RenderEvent
+import com.lambda.event.events.WorldEvent
+import com.lambda.event.listener.SafeListener.Companion.listen
+import com.lambda.graphics.renderer.esp.builders.ofBox
+import com.lambda.interaction.request.hotbar.HotbarRequest
+import com.lambda.module.Module
+import com.lambda.module.tag.ModuleTag
+import com.lambda.util.Communication.info
+import com.lambda.util.world.blockSearch
+import net.minecraft.block.Blocks
+import net.minecraft.util.math.Vec3i
+import java.awt.Color
+
+object SilentSwap : Module(
+    name = "SilentSwap",
+    description = "SilentSwap",
+    defaultTags = setOf(ModuleTag.DEBUG),
+) {
+    private val hotbar = HotbarSettings(this)
+
+    init {
+        listen<PlayerEvent.Attack.Block> {
+            if (!hotbar.request(HotbarRequest(0)).done) {
+                it.cancel()
+                return@listen
+            }
+            info("${interaction.lastSelectedSlot} ${player.mainHandStack}")
+        }
+    }
+}

common/src/main/kotlin/com/lambda/task/tasks/BuildTask.kt

@@ -103,7 +103,7 @@ class BuildTask @Ta5kBuilder constructor(
 
     init {
         listen<TickEvent.Pre> {
-            val currentItemStack = HotbarManager.mainHandStack ?: return@listen
+            val currentItemStack = player.mainHandStack ?: return@listen
 
             currentInteraction?.let { context ->
 //                TaskFlowModule.drawables = listOf(context)
@@ -389,7 +389,7 @@ class BuildTask @Ta5kBuilder constructor(
     private fun SafeContext.breakBlock(ctx: BreakContext): Boolean {
         if (player.isBlockBreakingRestricted(world, ctx.expectedPos, interaction.currentGameMode)) return false
 
-        if (HotbarManager.mainHandStack?.item?.canMine(ctx.checkedState, world, ctx.expectedPos, player) == false)
+        if (!player.mainHandStack.item.canMine(ctx.checkedState, world, ctx.expectedPos, player))
             return false
         val block = ctx.checkedState.block
         if (block is OperatorBlock && !player.isCreativeLevelTwoOp) return false
@@ -441,9 +441,8 @@ class BuildTask @Ta5kBuilder constructor(
             blockState.onBlockBreakStart(world, ctx.expectedPos, player)
         }
 
-        val currentItemStack = HotbarManager.mainHandStack ?: return false
-
-        if (notAir && blockState.calcItemBlockBreakingDelta(player, world, ctx.expectedPos, currentItemStack) >= build.breakThreshold) {
+        val breakingDelta = blockState.calcItemBlockBreakingDelta(player, world, ctx.expectedPos, player.mainHandStack)
+        if (notAir && breakingDelta >= build.breakThreshold) {
             onBlockBreak(ctx)
             return true
         } else {