fix(Quiver): read potion contents from ItemStack and fix inventory scan and head check (#6714)

Author: Eccys

src/main/java/meteordevelopment/meteorclient/systems/modules/combat/Quiver.java

@@ -15,6 +15,7 @@
 import meteordevelopment.meteorclient.utils.entity.EntityUtils;
 import meteordevelopment.meteorclient.utils.player.FindItemResult;
 import meteordevelopment.meteorclient.utils.player.InvUtils;
+import meteordevelopment.meteorclient.utils.player.SlotUtils;
 import meteordevelopment.orbit.EventHandler;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -27,6 +28,7 @@
 import net.minecraft.world.item.BowItem;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
+import net.minecraft.world.item.alchemy.PotionContents;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
@@ -115,6 +117,10 @@ public Quiver() {
 
     @Override
     public void onActivate() {
+        wasMainhand = true;
+        wasHotbar = false;
+        prevSlot = -1;
+
         bow = InvUtils.find(Items.BOW);
         if (!shouldQuiver()) return;
 
@@ -126,21 +132,22 @@ public void onActivate() {
         timer = 0;
 
         if (!bow.isMainHand()) {
+            wasMainhand = false;
             if (wasHotbar) InvUtils.swap(bow.slot(), true);
             else InvUtils.move().from(mc.player.getInventory().getSelectedSlot()).to(prevSlot);
-        } else wasMainhand = true;
+        }
 
         arrowSlots.clear();
         Set<MobEffect> usedEffects = new HashSet<>();
 
-        for (int i = mc.player.getInventory().getContainerSize(); i > 0; i--) {
-            if (i == mc.player.getInventory().getSelectedSlot()) continue;
+        for (int i = SlotUtils.OFFHAND; i >= SlotUtils.HOTBAR_START; i--) {
+            if (SlotUtils.isArmor(i) || i == mc.player.getInventory().getSelectedSlot()) continue;
 
             ItemStack item = mc.player.getInventory().getItem(i);
 
             if (item.getItem() != Items.TIPPED_ARROW) continue;
 
-            Iterator<MobEffectInstance> effects = item.getItem().components().get(DataComponents.POTION_CONTENTS).getAllEffects().iterator();
+            Iterator<MobEffectInstance> effects = item.getOrDefault(DataComponents.POTION_CONTENTS, PotionContents.EMPTY).getAllEffects().iterator();
 
             if (!effects.hasNext()) continue;
 
@@ -157,9 +164,11 @@ public void onActivate() {
 
     @Override
     public void onDeactivate() {
+        mc.options.keyUse.setDown(false);
+
         if (!wasMainhand) {
             if (wasHotbar) InvUtils.swapBack();
-            else InvUtils.move().from(mc.player.getInventory().getSelectedSlot()).to(prevSlot);
+            else if (prevSlot != -1) InvUtils.move().from(mc.player.getInventory().getSelectedSlot()).to(prevSlot);
         }
     }
 
@@ -180,7 +189,7 @@ private void onTick(TickEvent.Pre event) {
         boolean charging = mc.options.keyUse.isDown();
 
         if (!charging) {
-            InvUtils.move().from(arrowSlots.getInt(0)).to(9);
+            if (arrowSlots.getInt(0) != 9) InvUtils.move().from(arrowSlots.getInt(0)).to(9);
             mc.options.keyUse.setDown(true);
         } else {
             if (BowItem.getPowerForTime(mc.player.getTicksUsingItem()) >= 0.12) {
@@ -231,11 +240,11 @@ private boolean shouldQuiver() {
     }
 
     private boolean headIsOpen() {
-        testPos.set(mc.player.blockPosition().offset(0, 1, 0));
+        testPos.setWithOffset(mc.player.blockPosition(), 0, 1, 0);
         BlockState pos1 = mc.level.getBlockState(testPos);
         if (((BlockBehaviourAccessor) pos1.getBlock()).meteor$isHasCollision()) return false;
 
-        testPos.offset(0, 1, 0);
+        testPos.move(0, 1, 0);
         BlockState pos2 = mc.level.getBlockState(testPos);
         return !((BlockBehaviourAccessor) pos2.getBlock()).meteor$isHasCollision();
     }
@@ -252,7 +261,7 @@ private boolean isSurrounded(Player target) {
         for (Direction dir : Direction.values()) {
             if (dir == Direction.UP || dir == Direction.DOWN) continue;
 
-            testPos.set(target.blockPosition()).relative(dir);
+            testPos.setWithOffset(target.blockPosition(), dir);
             Block block = mc.level.getBlockState(testPos).getBlock();
 
             if (block != Blocks.OBSIDIAN && block != Blocks.BEDROCK && block != Blocks.RESPAWN_ANCHOR