1 files changed, 11 insertions, 13 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java
index 0cd82aad..44b1b5c8 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java
@@ -6,7 +6,6 @@ import me.xmrvizzy.skyblocker.skyblock.item.WikiLookup;
 import me.xmrvizzy.skyblocker.skyblock.quicknav.QuickNav;
 import me.xmrvizzy.skyblocker.skyblock.quicknav.QuickNavButton;
 import me.xmrvizzy.skyblocker.utils.Utils;
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.util.math.MatrixStack;
@@ -24,17 +23,16 @@ import java.util.List;
 
 @Mixin(HandledScreen.class)
 public abstract class HandledScreenMixin extends Screen {
-    @Shadow protected int backgroundWidth;
-    @Shadow protected int backgroundHeight;
-
     protected HandledScreenMixin(Text title) {
         super(title);
     }
+
     @Shadow
-    @Nullable protected Slot focusedSlot;
+    @Nullable
+    protected Slot focusedSlot;
 
     @Inject(method = "init()V", at = @At("TAIL"))
-    private void init(CallbackInfo ci) {
+    private void skyblocker$init(CallbackInfo ci) {
         // quicknav
         if (Utils.isOnSkyblock && SkyblockerConfig.get().quickNav.enableQuickNav) {
             String screenTitle = super.getTitle().getString().trim();
@@ -42,21 +40,21 @@ public abstract class HandledScreenMixin extends Screen {
             for (QuickNavButton button : buttons) super.addDrawableChild(button);
         }
         // backpack preview
-        BackpackPreview.updateStorage((HandledScreen<?>)(Object)this);
+        BackpackPreview.updateStorage((HandledScreen<?>) (Object) this);
     }
 
-    @Inject(at = @At("HEAD"), method = "keyPressed", cancellable = true)
-    public void keyPressed(int keyCode, int scanCode, int modifiers, CallbackInfoReturnable<Boolean> cir) {
-        if (this.focusedSlot != null){
-            if (keyCode != 256 && !this.client.options.inventoryKey.matchesKey(keyCode, scanCode)){
+    @Inject(at = @At("HEAD"), method = "keyPressed")
+    public void skyblocker$keyPressed(int keyCode, int scanCode, int modifiers, CallbackInfoReturnable<Boolean> cir) {
+        if (this.focusedSlot != null) {
+            if (keyCode != 256 && !this.client.options.inventoryKey.matchesKey(keyCode, scanCode)) {
                 if (WikiLookup.wikiLookup.matchesKey(keyCode, scanCode)) WikiLookup.openWiki(this.focusedSlot);
             }
         }
     }
 
     @Inject(at = @At("HEAD"), method = "drawMouseoverTooltip", cancellable = true)
-    public void drawMouseOverTooltip(MatrixStack matrices, int x, int y, CallbackInfo ci) {
-        String title = ((HandledScreen<?>)(Object)this).getTitle().getString();
+    public void skyblocker$drawMouseOverTooltip(MatrixStack matrices, int x, int y, CallbackInfo ci) {
+        String title = this.getTitle().getString();
         boolean shiftDown = SkyblockerConfig.get().general.backpackPreviewWithoutShift ^ Screen.hasShiftDown();
         if (shiftDown && title.equals("Storage") && this.focusedSlot != null) {
             if (this.focusedSlot.inventory == this.client.player.getInventory()) return;