Cleaned up mixins

1 files changed, 16 insertions, 15 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java
index d9001ba7..c137e6c8 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java
@@ -10,7 +10,6 @@ import me.xmrvizzy.skyblocker.skyblock.dungeon.DungeonMap;
 import me.xmrvizzy.skyblocker.utils.Utils;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawableHelper;
 import net.minecraft.client.gui.hud.InGameHud;
 import net.minecraft.client.util.math.MatrixStack;
@@ -18,9 +17,9 @@ import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -28,17 +27,19 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 @Environment(EnvType.CLIENT)
 @Mixin(InGameHud.class)
 public abstract class InGameHudMixin extends DrawableHelper {
+    @Unique
     private static final Identifier SLOT_LOCK = new Identifier(SkyblockerMod.NAMESPACE, "textures/gui/slot_lock.png");
+    @Unique
 
     private final StatusBarTracker statusBarTracker = SkyblockerMod.getInstance().statusBarTracker;
+    @Unique
     private final FancyStatusBars statusBars = new FancyStatusBars();
+    @Unique
     private MatrixStack hotbarMatrices;
+    @Unique
     private int hotbarSlotIndex;
 
     @Shadow
-    @Final
-    private MinecraftClient client;
-    @Shadow
     private int scaledHeight;
     @Shadow
     private int scaledWidth;
@@ -48,7 +49,7 @@ public abstract class InGameHudMixin extends DrawableHelper {
     }
 
     @Inject(method = "setOverlayMessage(Lnet/minecraft/text/Text;Z)V", at = @At("HEAD"), cancellable = true)
-    private void onSetOverlayMessage(Text message, boolean tinted, CallbackInfo ci) {
+    private void skyblocker$onSetOverlayMessage(Text message, boolean tinted, CallbackInfo ci) {
         if (!Utils.isOnSkyblock || !SkyblockerConfig.get().general.bars.enableBars)
             return;
         String msg = message.getString();
@@ -61,7 +62,7 @@ public abstract class InGameHudMixin extends DrawableHelper {
     }
 
     @Inject(method = "renderHotbar", at = @At("HEAD"))
-    public void renderHotbar(float f, MatrixStack matrices, CallbackInfo ci) {
+    public void skyblocker$renderHotbar(float f, MatrixStack matrices, CallbackInfo ci) {
         if (Utils.isOnSkyblock) {
             hotbarMatrices = matrices;
             hotbarSlotIndex = 0;
@@ -69,27 +70,27 @@ public abstract class InGameHudMixin extends DrawableHelper {
     }
 
     @Inject(method = "renderHotbarItem", at = @At("HEAD"))
-    public void renderHotbarItem(MatrixStack matrices, int i, int j, float f, PlayerEntity player, ItemStack stack, int seed, CallbackInfo ci) {
+    public void skyblocker$renderHotbarItem(MatrixStack matrices, int i, int j, float f, PlayerEntity player, ItemStack stack, int seed, CallbackInfo ci) {
         if (Utils.isOnSkyblock) {
             if (HotbarSlotLock.isLocked(hotbarSlotIndex)) {
-                RenderSystem.setShaderTexture(0,SLOT_LOCK);
-                DrawableHelper.drawTexture(hotbarMatrices, i, j, 0, 0,16, 16);
+                RenderSystem.setShaderTexture(0, SLOT_LOCK);
+                DrawableHelper.drawTexture(hotbarMatrices, i, j, 0, 0, 16, 16);
             }
             hotbarSlotIndex++;
         }
     }
 
     @Inject(method = "renderExperienceBar", at = @At("HEAD"), cancellable = true)
-    private void renderExperienceBar(MatrixStack matrices, int x, CallbackInfo ci) {
+    private void skyblocker$renderExperienceBar(MatrixStack matrices, int x, CallbackInfo ci) {
         if (Utils.isOnSkyblock && SkyblockerConfig.get().general.bars.enableBars)
             ci.cancel();
     }
 
     @Inject(method = "renderStatusBars", at = @At("HEAD"), cancellable = true)
-    private void renderStatusBars(MatrixStack matrices, CallbackInfo ci) {
-        if(!Utils.isOnSkyblock)
+    private void skyblocker$renderStatusBars(MatrixStack matrices, CallbackInfo ci) {
+        if (!Utils.isOnSkyblock)
             return;
-        if(statusBars.render(matrices, scaledWidth, scaledHeight))
+        if (statusBars.render(matrices, scaledWidth, scaledHeight))
             ci.cancel();
 
         if (Utils.isInDungeons && SkyblockerConfig.get().locations.dungeons.enableMap)
@@ -99,7 +100,7 @@ public abstract class InGameHudMixin extends DrawableHelper {
     }
 
     @Inject(method = "renderMountHealth", at = @At("HEAD"), cancellable = true)
-    private void renderMountHealth(MatrixStack matrices, CallbackInfo ci) {
+    private void skyblocker$renderMountHealth(MatrixStack matrices, CallbackInfo ci) {
         if (Utils.isOnSkyblock && SkyblockerConfig.get().general.bars.enableBars)
             ci.cancel();
     }