Fixed PlayerInventory mixin

Author: emyfops

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

@@ -38,7 +38,7 @@ public class PlayerInventoryMixin {
 
     @Shadow @Final public PlayerEntity player;
 
-    @Inject(method = "getMainStacks", at = @At(value = "HEAD"), cancellable = true)
+    @Inject(method = "getSelectedStack", at = @At(value = "HEAD"), cancellable = true)
     public void handleSpoofedMainHandStack(CallbackInfoReturnable<ItemStack> cir) {
         MinecraftClient mc = MinecraftClient.getInstance();
         ClientPlayerInteractionManager interaction = mc.interactionManager;

src/main/kotlin/com/lambda/util/player/SlotUtils.kt

@@ -23,10 +23,10 @@ import net.minecraft.item.ItemStack
 import net.minecraft.screen.slot.SlotActionType
 
 object SlotUtils {
-    val ClientPlayerEntity.hotbar: List<ItemStack> get() = inventory.main.slice(0..8)
-    val ClientPlayerEntity.storage: List<ItemStack> get() = inventory.main.slice(9..35)
+    val ClientPlayerEntity.hotbar: List<ItemStack> get() = inventory.mainStacks.slice(0..8)
+    val ClientPlayerEntity.storage: List<ItemStack> get() = inventory.mainStacks.slice(9..35)
     val ClientPlayerEntity.equipment: List<ItemStack> get() = inventory.equipment.map.map { it.value }
-    val ClientPlayerEntity.hotbarAndStorage: List<ItemStack> get() = inventory.main
+    val ClientPlayerEntity.hotbarAndStorage: List<ItemStack> get() = inventory.mainStacks
     val ClientPlayerEntity.combined: List<ItemStack> get() = hotbarAndStorage + equipment
 
 

src/main/resources/lambda.accesswidener

@@ -36,7 +36,6 @@ accessible field net/minecraft/entity/player/PlayerInventory equipment Lnet/mine
 accessible method net/minecraft/client/network/ClientPlayerEntity applyMovementSpeedFactors (Lnet/minecraft/util/math/Vec2f;)Lnet/minecraft/util/math/Vec2f;
 accessible field net/minecraft/entity/EntityEquipment map Ljava/util/EnumMap;
 accessible method net/minecraft/entity/LivingEntity getHandSwingDuration ()I
-accessible field net/minecraft/entity/player/PlayerInventory main Lnet/minecraft/util/collection/DefaultedList;
 
 # Camera
 accessible method net/minecraft/client/render/Camera setPos (DDD)V