maybe v2

Author: legentpc

src/main/java/de/hysky/skyblocker/mixins/AbstractContainerScreenMixin.java

@@ -131,7 +131,9 @@ protected AbstractContainerScreenMixin(Component title) {
 			//item protection
 			if (ItemProtection.itemProtection.matches(input)) {
 				ItemProtection.itemProtection.consumeClick();
-				if (this.hoveredSlot.container == this.minecraft.player.getInventory()) {
+				boolean ownItem = this.hoveredSlot.container == this.minecraft.player.getInventory()
+						|| ItemProtection.isPersonalStorage(this.getTitle().getString());
+				if (ownItem) {
 					ItemProtection.handleKeyPressed(this.hoveredSlot.getItem());
 				}
 			}

src/main/java/de/hysky/skyblocker/skyblock/item/ItemProtection.java

@@ -5,7 +5,6 @@
 import de.hysky.skyblocker.SkyblockerMod;
 import de.hysky.skyblocker.annotations.Init;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
-import de.hysky.skyblocker.mixins.accessors.AbstractContainerScreenAccessor;
 import de.hysky.skyblocker.utils.Constants;
 import de.hysky.skyblocker.utils.Location;
 import de.hysky.skyblocker.utils.Utils;
@@ -17,15 +16,13 @@
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
-import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.commands.CommandBuildContext;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.Identifier;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
-import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.decoration.ItemFrame;
 import net.minecraft.world.entity.player.Player;
@@ -127,19 +124,20 @@ public static void handleKeyPressed(ItemStack heldItem) {
 	}
 
 	public static void handleHotbarKeyPressed(LocalPlayer player) {
-		Screen currentScreen = Minecraft.getInstance().screen;
-		if (currentScreen instanceof AbstractContainerScreenAccessor containerScreen) {
-			Slot hoveredSlot = containerScreen.getFocusedSlot();
-			if (hoveredSlot == null || hoveredSlot.container != player.getInventory()) return;
-		} else if (currentScreen != null) {
-			return;
-		}
 		while (itemProtection.consumeClick()) {
 			ItemStack heldItem = player.getMainHandItem();
 			handleKeyPressed(heldItem);
 		}
 	}
 
+	public static boolean isPersonalStorage(String screenTitle) {
+		return screenTitle.equals("Storage") || screenTitle.startsWith("Storage (")
+				|| screenTitle.equals("Rift Storage") || screenTitle.startsWith("Rift Storage (")
+				|| screenTitle.startsWith("Ender Chest")
+				|| screenTitle.startsWith("Chest")
+				|| (screenTitle.contains("Backpack") && screenTitle.contains("(Slot #"));
+	}
+
 	private static InteractionResult onEntityInteract(Player playerEntity, Level world, InteractionHand hand, Entity entity, @Nullable EntityHitResult entityHitResult) {
 		if (!Utils.isOnSkyblock() || !world.isClientSide()) return InteractionResult.PASS;