Skip to content

Commit 6afc898

Browse files
committed
maybe v1
1 parent 8f57483 commit 6afc898

1 file changed

Lines changed: 10 additions & 1 deletion

File tree

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import de.hysky.skyblocker.SkyblockerMod;
66
import de.hysky.skyblocker.annotations.Init;
77
import de.hysky.skyblocker.config.SkyblockerConfigManager;
8+
import de.hysky.skyblocker.mixins.accessors.AbstractContainerScreenAccessor;
89
import de.hysky.skyblocker.utils.Constants;
910
import de.hysky.skyblocker.utils.Location;
1011
import de.hysky.skyblocker.utils.Utils;
@@ -16,13 +17,15 @@
1617
import net.minecraft.client.KeyMapping;
1718
import net.minecraft.client.Minecraft;
1819
import net.minecraft.client.gui.GuiGraphicsExtractor;
20+
import net.minecraft.client.gui.screens.Screen;
1921
import net.minecraft.client.player.LocalPlayer;
2022
import net.minecraft.client.renderer.RenderPipelines;
2123
import net.minecraft.commands.CommandBuildContext;
2224
import net.minecraft.network.chat.Component;
2325
import net.minecraft.resources.Identifier;
2426
import net.minecraft.world.InteractionHand;
2527
import net.minecraft.world.InteractionResult;
28+
import net.minecraft.world.inventory.Slot;
2629
import net.minecraft.world.entity.Entity;
2730
import net.minecraft.world.entity.decoration.ItemFrame;
2831
import net.minecraft.world.entity.player.Player;
@@ -124,7 +127,13 @@ public static void handleKeyPressed(ItemStack heldItem) {
124127
}
125128

126129
public static void handleHotbarKeyPressed(LocalPlayer player) {
127-
if (Minecraft.getInstance().screen != null) return;
130+
Screen currentScreen = Minecraft.getInstance().screen;
131+
if (currentScreen instanceof AbstractContainerScreenAccessor containerScreen) {
132+
Slot hoveredSlot = containerScreen.getFocusedSlot();
133+
if (hoveredSlot == null || hoveredSlot.container != player.getInventory()) return;
134+
} else if (currentScreen != null) {
135+
return;
136+
}
128137
while (itemProtection.consumeClick()) {
129138
ItemStack heldItem = player.getMainHandItem();
130139
handleKeyPressed(heldItem);

0 commit comments

Comments
 (0)