From a0588bc0fce38990f06e66b5be9c89417217408f Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Mon, 5 Feb 2024 22:09:46 -0500
Subject: 24w05a/b

---
 src/main/java/de/hysky/skyblocker/mixin/ArmorTrimMixin.java   | 2 +-
 src/main/java/de/hysky/skyblocker/mixin/DrawContextMixin.java | 2 +-
 src/main/java/de/hysky/skyblocker/mixin/DyeableItemMixin.java | 2 +-
 src/main/java/de/hysky/skyblocker/mixin/InGameHudMixin.java   | 9 ++-------
 4 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'src/main/java/de/hysky/skyblocker/mixin')

diff --git a/src/main/java/de/hysky/skyblocker/mixin/ArmorTrimMixin.java b/src/main/java/de/hysky/skyblocker/mixin/ArmorTrimMixin.java
index b9bdb523..e13c41ee 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/ArmorTrimMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/ArmorTrimMixin.java
@@ -18,7 +18,7 @@ import java.util.Optional;
 public class ArmorTrimMixin {
 
 	@ModifyReturnValue(method = "getTrim", at = @At("RETURN"))
-	private static Optional<ArmorTrim> skyblocker$customArmorTrims(@SuppressWarnings("OptionalUsedAsFieldOrParameterType") Optional<ArmorTrim> original, @Local ItemStack stack) {
+	private static Optional<ArmorTrim> skyblocker$customArmorTrims(@SuppressWarnings("OptionalUsedAsFieldOrParameterType") Optional<ArmorTrim> original, @Local(argsOnly = true) ItemStack stack) {
 		if (Utils.isOnSkyblock()) {
 			Object2ObjectOpenHashMap<String, CustomArmorTrims.ArmorTrimId> customTrims = SkyblockerConfigManager.get().general.customArmorTrims;
 			String itemUuid = ItemUtils.getItemUuid(stack);
diff --git a/src/main/java/de/hysky/skyblocker/mixin/DrawContextMixin.java b/src/main/java/de/hysky/skyblocker/mixin/DrawContextMixin.java
index b33a8b23..e2979040 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/DrawContextMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/DrawContextMixin.java
@@ -65,7 +65,7 @@ public abstract class DrawContextMixin {
 
     @ModifyExpressionValue(method = "drawItemInSlot(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V",
             at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/ItemCooldownManager;getCooldownProgress(Lnet/minecraft/item/Item;F)F"))
-    private float skyblocker$modifyItemCooldown(float cooldownProgress, @Local ItemStack stack) {
+    private float skyblocker$modifyItemCooldown(float cooldownProgress, @Local(argsOnly = true) ItemStack stack) {
         return Utils.isOnSkyblock() && ItemCooldowns.isOnCooldown(stack) ? ItemCooldowns.getItemCooldownEntry(stack).getRemainingCooldownPercent() : cooldownProgress;
     }
 }
diff --git a/src/main/java/de/hysky/skyblocker/mixin/DyeableItemMixin.java b/src/main/java/de/hysky/skyblocker/mixin/DyeableItemMixin.java
index 64f6a452..b20b58b5 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/DyeableItemMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/DyeableItemMixin.java
@@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.At;
 @Mixin(DyeableItem.class)
 public interface DyeableItemMixin {
 	@ModifyReturnValue(method = "getColor", at = @At("RETURN"))
-	private int skyblocker$customDyeColor(int originalColor, ItemStack stack) {
+	private static int skyblocker$customDyeColor(int originalColor, ItemStack stack) {
 		if (Utils.isOnSkyblock()) {
 			String itemUuid = ItemUtils.getItemUuid(stack);
 
diff --git a/src/main/java/de/hysky/skyblocker/mixin/InGameHudMixin.java b/src/main/java/de/hysky/skyblocker/mixin/InGameHudMixin.java
index b0970b4b..fc0d58b7 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/InGameHudMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/InGameHudMixin.java
@@ -50,17 +50,12 @@ public abstract class InGameHudMixin {
     @Unique
     private final FancyStatusBars statusBars = new FancyStatusBars();
 
-    @Shadow
-    private int scaledHeight;
-    @Shadow
-    private int scaledWidth;
-
     @Shadow
     @Final
     private MinecraftClient client;
 
     @Inject(method = "renderHotbar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/InGameHud;renderHotbarItem(Lnet/minecraft/client/gui/DrawContext;IIFLnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/item/ItemStack;I)V", ordinal = 0))
-    public void skyblocker$renderHotbarItemLockOrRarityBg(float tickDelta, DrawContext context, CallbackInfo ci, @Local(ordinal = 4, name = "m") int index, @Local(ordinal = 5, name = "n") int x, @Local(ordinal = 6, name = "o") int y, @Local PlayerEntity player) {
+    public void skyblocker$renderHotbarItemLockOrRarityBg(CallbackInfo ci, @Local(argsOnly = true) DrawContext context, @Local(ordinal = 4, name = "m") int index, @Local(ordinal = 5, name = "n") int x, @Local(ordinal = 6, name = "o") int y, @Local PlayerEntity player) {
         if (Utils.isOnSkyblock()) {
             // slot lock
             if (SkyblockerConfigManager.get().general.itemInfoDisplay.itemRarityBackgrounds) ItemRarityBackgrounds.tryDraw(player.getInventory().main.get(index), context, x, y);
@@ -88,7 +83,7 @@ public abstract class InGameHudMixin {
     private void skyblocker$renderStatusBars(DrawContext context, CallbackInfo ci) {
         if (!Utils.isOnSkyblock())
             return;
-        if (statusBars.render(context, scaledWidth, scaledHeight))
+        if (statusBars.render(context, context.getScaledWindowWidth(), context.getScaledWindowHeight()))
             ci.cancel();
 
         if (Utils.isInDungeons() && DungeonScore.isDungeonStarted()) {
-- 
cgit