diff options
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/mixin')
4 files changed, 11 insertions, 17 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..e7b3515f 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,14 +23,13 @@ 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) { @@ -42,13 +40,13 @@ 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) + @Inject(at = @At("HEAD"), method = "keyPressed") 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)){ + if (this.focusedSlot != null) { + if (keyCode != 256 && !this.client.options.inventoryKey.matchesKey(keyCode, scanCode)) { if (WikiLookup.wikiLookup.matchesKey(keyCode, scanCode)) WikiLookup.openWiki(this.focusedSlot); } } @@ -56,7 +54,7 @@ public abstract class HandledScreenMixin extends Screen { @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(); + 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; diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java index 60f4af53..d9001ba7 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java @@ -53,7 +53,7 @@ public abstract class InGameHudMixin extends DrawableHelper { return; String msg = message.getString(); String res = statusBarTracker.update(msg, SkyblockerConfig.get().messages.hideMana); - if (msg != res) { + if (!msg.equals(res)) { if (res != null) setOverlayMessage(Text.of(res), tinted); ci.cancel(); @@ -73,7 +73,7 @@ public abstract class InGameHudMixin extends DrawableHelper { if (Utils.isOnSkyblock) { if (HotbarSlotLock.isLocked(hotbarSlotIndex)) { RenderSystem.setShaderTexture(0,SLOT_LOCK); - this.drawTexture(hotbarMatrices, i, j, 0, 0,16, 16); + DrawableHelper.drawTexture(hotbarMatrices, i, j, 0, 0,16, 16); } hotbarSlotIndex++; } diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/InventoryScreenMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/InventoryScreenMixin.java index 4bff2779..0cba11c8 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/mixin/InventoryScreenMixin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/InventoryScreenMixin.java @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(InventoryScreen.class) public class InventoryScreenMixin { @Redirect( - method = "", + method = "<init>", at = @At( value = "NEW", target = "net/minecraft/client/gui/screen/recipebook/RecipeBookWidget" diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/ItemRendererMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/ItemRendererMixin.java index 1de2617b..aa0d8704 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/mixin/ItemRendererMixin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/ItemRendererMixin.java @@ -43,8 +43,6 @@ public abstract class ItemRendererMixin { } RenderSystem.disableDepthTest(); -// RenderSystem.disableTexture(); -// RenderSystem.disableAlphaTest(); RenderSystem.disableBlend(); float hue = Math.max(0.0F, 1.0F - (max - current) / max); int width = Math.round(current / max * 13.0F); @@ -52,8 +50,6 @@ public abstract class ItemRendererMixin { DrawableHelper.fill(matrices, x + 2, y + 13, x + 15, y + 15, 0xFF000000); DrawableHelper.fill(matrices, x + 2, y + 13, x + 2 + width, y + 14, rgb); RenderSystem.enableBlend(); -// RenderSystem.enableAlphaTest(); -// RenderSystem.enableTexture(); RenderSystem.enableDepthTest(); } } |