Merge pull request #123 from kevinthegreat1/master

Support for 1.19.4 & Cleanup

40 files changed, 301 insertions, 323 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java
index e9af52f6..3d713727 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java
@@ -2,6 +2,7 @@ package me.xmrvizzy.skyblocker;
 
 import me.xmrvizzy.skyblocker.chat.ChatMessageListener;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import me.xmrvizzy.skyblocker.discord.DiscordRPCManager;
 import me.xmrvizzy.skyblocker.skyblock.HotbarSlotLock;
 import me.xmrvizzy.skyblocker.skyblock.api.StatsCommand;
 import me.xmrvizzy.skyblocker.skyblock.dwarven.DwarvenHud;
@@ -23,6 +24,6 @@ public class SkyblockerInitializer implements ClientModInitializer {
         DwarvenHud.init();
         ChatMessageListener.init();
         UpdateChecker.init();
-        SkyblockerMod.getInstance().discordRPCManager.init();
+        DiscordRPCManager.init();
     }
 }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/ChatPatternListener.java b/src/main/java/me/xmrvizzy/skyblocker/chat/ChatPatternListener.java
index 19237de4..8a32715e 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/chat/ChatPatternListener.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/chat/ChatPatternListener.java
@@ -6,7 +6,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public abstract class ChatPatternListener implements ChatMessageListener {
-    protected static String NUMBER = "-?[0-9]{1,3}(?>,[0-9]{3})*(?:\\.[1-9])?";
+    protected static final String NUMBER = "-?[0-9]{1,3}(?>,[0-9]{3})*(?:\\.[1-9])?";
     public final Pattern pattern;
 
     public ChatPatternListener(String pattern) {
diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AutopetFilter.java b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AutopetFilter.java
index f8af49ce..f1545db4 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AutopetFilter.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AutopetFilter.java
@@ -4,7 +4,6 @@ import me.xmrvizzy.skyblocker.chat.ChatFilterResult;
 import me.xmrvizzy.skyblocker.chat.ChatPatternListener;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.text.LiteralTextContent;
 import net.minecraft.text.Text;
 
 import java.util.Objects;
diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index e487c209..21322c81 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -15,74 +15,74 @@ public class SkyblockerConfig implements ConfigData {
 
     @ConfigEntry.Category("general")
     @ConfigEntry.Gui.TransitiveObject
-    public General general = new General();
+    public final General general = new General();
 
     @ConfigEntry.Category("locations")
     @ConfigEntry.Gui.TransitiveObject
-    public Locations locations = new Locations();
+    public final Locations locations = new Locations();
 
     @ConfigEntry.Category("messages")
     @ConfigEntry.Gui.TransitiveObject
-    public Messages messages = new Messages();
+    public final Messages messages = new Messages();
 
     @ConfigEntry.Category("richPresence")
     @ConfigEntry.Gui.TransitiveObject
-    public RichPresence richPresence = new RichPresence();
+    public final RichPresence richPresence = new RichPresence();
 
     @ConfigEntry.Category("quickNav")
     @ConfigEntry.Gui.TransitiveObject
-    public QuickNav quickNav = new QuickNav();
+    public final QuickNav quickNav = new QuickNav();
 
     public static class QuickNav {
-        public boolean enableQuickNav = true;
+        public final boolean enableQuickNav = true;
 
         @ConfigEntry.Category("button1")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public QuickNavItem button1 = new QuickNavItem(true, new ItemData("diamond_sword"), "Your Skills", "/skills");
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final QuickNavItem button1 = new QuickNavItem(true, new ItemData("diamond_sword"), "Your Skills", "/skills");
 
         @ConfigEntry.Category("button2")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public QuickNavItem button2 = new QuickNavItem(true, new ItemData("painting"), "Collection", "/collection");
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final QuickNavItem button2 = new QuickNavItem(true, new ItemData("painting"), "Collection", "/collection");
 
         @ConfigEntry.Category("button3")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public QuickNavItem button3 = new QuickNavItem(false, new ItemData("air"), "", "");
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final QuickNavItem button3 = new QuickNavItem(false, new ItemData("air"), "", "");
 
         @ConfigEntry.Category("button4")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public QuickNavItem button4 = new QuickNavItem(true, new ItemData("bone"), "Pets", "/pets");
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final QuickNavItem button4 = new QuickNavItem(true, new ItemData("bone"), "Pets", "/pets");
 
         @ConfigEntry.Category("button5")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public QuickNavItem button5 = new QuickNavItem(true, new ItemData("leather_chestplate", 1, "tag:{display:{color:8991416}}"), "Wardrobe", "/wardrobe");
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final QuickNavItem button5 = new QuickNavItem(true, new ItemData("leather_chestplate", 1, "tag:{display:{color:8991416}}"), "Wardrobe", "/wardrobe");
 
         @ConfigEntry.Category("button6")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public QuickNavItem button6 = new QuickNavItem(true, new ItemData("ender_chest"),  "Storage", "/storage");
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final QuickNavItem button6 = new QuickNavItem(true, new ItemData("ender_chest"),  "Storage", "/storage");
 
         @ConfigEntry.Category("button7")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public QuickNavItem button7 = new QuickNavItem(true, new ItemData("player_head", 1, "tag:{SkullOwner:{Id:[I;-300151517,-631415889,-1193921967,-1821784279],Properties:{textures:[{Value:\"e3RleHR1cmVzOntTS0lOOnt1cmw6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZDdjYzY2ODc0MjNkMDU3MGQ1NTZhYzUzZTA2NzZjYjU2M2JiZGQ5NzE3Y2Q4MjY5YmRlYmVkNmY2ZDRlN2JmOCJ9fX0=\"}]}}}"), "none", "/hub");
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final QuickNavItem button7 = new QuickNavItem(true, new ItemData("player_head", 1, "tag:{SkullOwner:{Id:[I;-300151517,-631415889,-1193921967,-1821784279],Properties:{textures:[{Value:\"e3RleHR1cmVzOntTS0lOOnt1cmw6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZDdjYzY2ODc0MjNkMDU3MGQ1NTZhYzUzZTA2NzZjYjU2M2JiZGQ5NzE3Y2Q4MjY5YmRlYmVkNmY2ZDRlN2JmOCJ9fX0=\"}]}}}"), "none", "/hub");
 
         @ConfigEntry.Category("button8")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public QuickNavItem button8 = new QuickNavItem(true, new ItemData("player_head", 1, "tag:{SkullOwner:{Id:[I;1605800870,415127827,-1236127084,15358548],Properties:{textures:[{Value:\"e3RleHR1cmVzOntTS0lOOnt1cmw6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzg5MWQ1YjI3M2ZmMGJjNTBjOTYwYjJjZDg2ZWVmMWM0MGExYjk0MDMyYWU3MWU3NTQ3NWE1NjhhODI1NzQyMSJ9fX0=\"}]}}}"), "none", "/warp dungeon_hub");
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final QuickNavItem button8 = new QuickNavItem(true, new ItemData("player_head", 1, "tag:{SkullOwner:{Id:[I;1605800870,415127827,-1236127084,15358548],Properties:{textures:[{Value:\"e3RleHR1cmVzOntTS0lOOnt1cmw6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzg5MWQ1YjI3M2ZmMGJjNTBjOTYwYjJjZDg2ZWVmMWM0MGExYjk0MDMyYWU3MWU3NTQ3NWE1NjhhODI1NzQyMSJ9fX0=\"}]}}}"), "none", "/warp dungeon_hub");
 
         @ConfigEntry.Category("button9")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public QuickNavItem button9 = new QuickNavItem(false, new ItemData("air"), "", "");
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final QuickNavItem button9 = new QuickNavItem(false, new ItemData("air"), "", "");
 
         @ConfigEntry.Category("button10")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public QuickNavItem button10 = new QuickNavItem(true, new ItemData("enchanting_table"), "Enchant", "/etable");
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final QuickNavItem button10 = new QuickNavItem(true, new ItemData("enchanting_table"), "Enchant", "/etable");
 
         @ConfigEntry.Category("button11")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public QuickNavItem button11 = new QuickNavItem(true, new ItemData("anvil"), "Anvil", "/anvil");
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final QuickNavItem button11 = new QuickNavItem(true, new ItemData("anvil"), "Anvil", "/anvil");
 
         @ConfigEntry.Category("button12")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public QuickNavItem button12 = new QuickNavItem(true, new ItemData("crafting_table"), "Craft Item", "/craft");
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final QuickNavItem button12 = new QuickNavItem(true, new ItemData("crafting_table"), "Craft Item", "/craft");
     }
 
     public static class QuickNavItem {
@@ -93,14 +93,14 @@ public class SkyblockerConfig implements ConfigData {
             this.uiTitle = uiTitle;
         }
 
-        public Boolean render;
+        public final Boolean render;
 
         @ConfigEntry.Category("item")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public ItemData item;
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final ItemData item;
 
-        public String uiTitle;
-        public String clickEvent;
+        public final String uiTitle;
+        public final String clickEvent;
     }
 
     public static class ItemData {
@@ -116,55 +116,55 @@ public class SkyblockerConfig implements ConfigData {
             this.nbt = "";
         }
 
-        public String itemName;
-        public int count;
-        public String nbt;
+        public final String itemName;
+        public final int count;
+        public final String nbt;
     }
 
     public static class General {
-        public boolean enableUpdateNotification = true;
-        public boolean backpackPreviewWithoutShift = false;
+        public final boolean enableUpdateNotification = true;
+        public final boolean backpackPreviewWithoutShift = false;
 
         @ConfigEntry.Gui.Excluded
         public String apiKey;
 
         @ConfigEntry.Category("bars")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public Bars bars = new Bars();
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final Bars bars = new Bars();
       
         @ConfigEntry.Category("itemList")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public ItemList itemList = new ItemList();
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final ItemList itemList = new ItemList();
 
         @ConfigEntry.Category("itemTooltip")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public ItemTooltip itemTooltip = new ItemTooltip();
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final ItemTooltip itemTooltip = new ItemTooltip();
 
         @ConfigEntry.Category("hitbox")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public Hitbox hitbox = new Hitbox();
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final Hitbox hitbox = new Hitbox();
 
         @ConfigEntry.Gui.Excluded
-        public List<Integer> lockedSlots = new ArrayList<>();
+        public final List<Integer> lockedSlots = new ArrayList<>();
     }
 
     public static class Bars {
-        public boolean enableBars = true;
+        public final boolean enableBars = true;
 
         @ConfigEntry.Category("barpositions")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public BarPositions barpositions = new BarPositions();
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final BarPositions barpositions = new BarPositions();
     }
 
     public static class BarPositions {
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
-        public BarPosition healthBarPosition = BarPosition.LAYER1;
+        public final BarPosition healthBarPosition = BarPosition.LAYER1;
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
-        public BarPosition manaBarPosition = BarPosition.LAYER1;
+        public final BarPosition manaBarPosition = BarPosition.LAYER1;
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
-        public BarPosition defenceBarPosition = BarPosition.LAYER1;
+        public final BarPosition defenceBarPosition = BarPosition.LAYER1;
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
-        public BarPosition experienceBarPosition = BarPosition.LAYER1;
+        public final BarPosition experienceBarPosition = BarPosition.LAYER1;
 
     }
 
@@ -195,21 +195,21 @@ public class SkyblockerConfig implements ConfigData {
     }
 
     public static class Hitbox {
-        public boolean oldFarmlandHitbox = true;
-        public boolean oldLeverHitbox = false;
+        public final boolean oldFarmlandHitbox = true;
+        public final boolean oldLeverHitbox = false;
     }
 
     public static class RichPresence {
-        public boolean enableRichPresence = false;
+        public final boolean enableRichPresence = false;
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
         @ConfigEntry.Gui.Tooltip()
-        public Info info = Info.LOCATION;
-        public boolean cycleMode = false;
+        public final Info info = Info.LOCATION;
+        public final boolean cycleMode = false;
         public String customMessage;
     }
 
     public static class ItemList {
-        public boolean enableItemList = true;
+        public final boolean enableItemList = true;
     }
 
     public enum Average {
@@ -228,79 +228,79 @@ public class SkyblockerConfig implements ConfigData {
     }
 
     public static class ItemTooltip {
-        public boolean enableNPCPrice = true;
-        public boolean enableAvgBIN = true;
+        public final boolean enableNPCPrice = true;
+        public final boolean enableAvgBIN = true;
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
         @ConfigEntry.Gui.Tooltip()
-        public Average avg = Average.THREE_DAY;
-        public boolean enableLowestBIN = true;
-        public boolean enableBazaarPrice = true;
-        public boolean enableMuseumDate = true;
+        public final Average avg = Average.THREE_DAY;
+        public final boolean enableLowestBIN = true;
+        public final boolean enableBazaarPrice = true;
+        public final boolean enableMuseumDate = true;
     }
 
     public static class Locations {
         @ConfigEntry.Category("dungeons")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public Dungeons dungeons = new Dungeons();
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final Dungeons dungeons = new Dungeons();
 
         @ConfigEntry.Category("dwarvenmines")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public DwarvenMines dwarvenMines = new DwarvenMines();
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final DwarvenMines dwarvenMines = new DwarvenMines();
     }
 
     public static class Dungeons {
         @ConfigEntry.Gui.Tooltip()
-        public boolean croesusHelper = true;
-        public boolean enableMap = true;
-        public boolean solveThreeWeirdos = true;
-        public boolean blazesolver = true;
-        public boolean solveTrivia = true;
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public Terminals terminals = new Terminals();
+        public final boolean croesusHelper = true;
+        public final boolean enableMap = true;
+        public final boolean solveThreeWeirdos = true;
+        public final boolean blazesolver = true;
+        public final boolean solveTrivia = true;
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final Terminals terminals = new Terminals();
     }
 
     public static class Terminals {
-        public boolean solveColor = true;
-        public boolean solveOrder = true;
-        public boolean solveStartsWith = true;
+        public final boolean solveColor = true;
+        public final boolean solveOrder = true;
+        public final boolean solveStartsWith = true;
     }
 
     public static class DwarvenMines {
-        public boolean enableDrillFuel = true;
-        public boolean solveFetchur = true;
-        public boolean solvePuzzler = true;
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public DwarvenHud dwarvenHud = new DwarvenHud();
+        public final boolean enableDrillFuel = true;
+        public final boolean solveFetchur = true;
+        public final boolean solvePuzzler = true;
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final DwarvenHud dwarvenHud = new DwarvenHud();
     }
 
     public static class DwarvenHud {
-        public boolean enabled = true;
-        public boolean enableBackground = true;
+        public final boolean enabled = true;
+        public final boolean enableBackground = true;
         public int x = 10;
         public int y = 10;
     }
 
     public static class Messages {
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
-        public ChatFilterResult hideAbility = ChatFilterResult.PASS;
+        public final ChatFilterResult hideAbility = ChatFilterResult.PASS;
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
-        public ChatFilterResult hideHeal = ChatFilterResult.PASS;
+        public final ChatFilterResult hideHeal = ChatFilterResult.PASS;
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
-        public ChatFilterResult hideAOTE = ChatFilterResult.PASS;
+        public final ChatFilterResult hideAOTE = ChatFilterResult.PASS;
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
-        public ChatFilterResult hideImplosion = ChatFilterResult.PASS;
+        public final ChatFilterResult hideImplosion = ChatFilterResult.PASS;
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
-        public ChatFilterResult hideMoltenWave = ChatFilterResult.PASS;
+        public final ChatFilterResult hideMoltenWave = ChatFilterResult.PASS;
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
-        public ChatFilterResult hideAds = ChatFilterResult.PASS;
+        public final ChatFilterResult hideAds = ChatFilterResult.PASS;
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
-        public ChatFilterResult hideTeleportPad = ChatFilterResult.PASS;
+        public final ChatFilterResult hideTeleportPad = ChatFilterResult.PASS;
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
-        public ChatFilterResult hideCombo = ChatFilterResult.PASS;
+        public final ChatFilterResult hideCombo = ChatFilterResult.PASS;
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
-        public ChatFilterResult hideAutopet = ChatFilterResult.PASS;
+        public final ChatFilterResult hideAutopet = ChatFilterResult.PASS;
         @ConfigEntry.Gui.Tooltip()
-        public boolean hideMana = false;
+        public final boolean hideMana = false;
     }
 
     public enum Info {
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/AccessorWorldRenderer.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/AccessorWorldRenderer.java
index 02990ea9..e9067851 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/AccessorWorldRenderer.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/AccessorWorldRenderer.java
@@ -8,8 +8,6 @@ import net.minecraft.client.render.WorldRenderer;
 
 @Mixin(WorldRenderer.class)
 public interface AccessorWorldRenderer {
-
     @Accessor
     Frustum getFrustum();
-
 }
\ No newline at end of file
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/ChatHudListenerMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/ChatHudListenerMixin.java
index eabf0b53..8176a810 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/ChatHudListenerMixin.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/ChatHudListenerMixin.java
@@ -17,14 +17,13 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ChatHud.class)
-public class ChatHudListenerMixin {
-
+public abstract class ChatHudListenerMixin {
     @Shadow
     @Final
     private MinecraftClient client;
 
     @Inject(method = "addMessage(Lnet/minecraft/text/Text;Lnet/minecraft/network/message/MessageSignatureData;ILnet/minecraft/client/gui/hud/MessageIndicator;Z)V", at = @At("HEAD"), cancellable = true)
-    public void onMessage(Text message, MessageSignatureData signature, int ticks, MessageIndicator indicator, boolean refresh, CallbackInfo ci) {
+    public void skyblocker$onMessage(Text message, MessageSignatureData signature, int ticks, MessageIndicator indicator, boolean refresh, CallbackInfo ci) {
         if (!Utils.isOnSkyblock)
             return;
         String asString = message.getString();
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/ClientPlayerEntityMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/ClientPlayerEntityMixin.java
index 033272db..237f6ba9 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/ClientPlayerEntityMixin.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/ClientPlayerEntityMixin.java
@@ -22,7 +22,7 @@ public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity
     }
 
     @Inject(method = "dropSelectedItem", at = @At("HEAD"), cancellable = true)
-    public void dropSelectedItem(boolean dropEntireStack, CallbackInfoReturnable<Boolean> cir) {
+    public void skyblocker$dropSelectedItem(boolean dropEntireStack, CallbackInfoReturnable<Boolean> cir) {
         if (Utils.isOnSkyblock) HotbarSlotLock.handleDropSelectedItem(this.getInventory().selectedSlot, cir);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/FarmlandBlockMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/FarmlandBlockMixin.java
index d7ca3686..29da4bd6 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/FarmlandBlockMixin.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/FarmlandBlockMixin.java
@@ -21,7 +21,7 @@ public abstract class FarmlandBlockMixin extends Block {
     }
 
     @Inject(method = "getOutlineShape", at = @At("HEAD"), cancellable = true)
-    public void onGetOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context, CallbackInfoReturnable<VoxelShape> cir) {
+    public void skyblocker$onGetOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context, CallbackInfoReturnable<VoxelShape> cir) {
         if (Utils.isOnSkyblock && SkyblockerConfig.get().general.hitbox.oldFarmlandHitbox)
             cir.setReturnValue(Block.createCuboidShape(0.0, 0.0, 0.0, 16.0, 16.0, 16.0));
     }
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)