Merge branch 'master' into utils-cleanup

23 files changed, 487 insertions, 100 deletions

diff --git a/.github/workflows/webhook_translate.yml b/.github/workflows/webhook_translate.yml
new file mode 100644
index 00000000..6d072634
--- /dev/null
+++ b/.github/workflows/webhook_translate.yml
@@ -0,0 +1,22 @@
+name: translate update
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - src/main/resources/assets/skyblocker/lang/en_us.json
+
+jobs:
+  webhook:
+    if: github.repository_owner == 'SkyblockerMod'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Translate notification
+        shell: bash
+        run: |
+          OUTPUT="
+          <@&1134566053138145330>
+          New Strings available at https://translate.hysky.de/projects/Skyblocker/skyblocker"
+
+          curl -H "Content-Type: application/json" -d '{"content":"'"${OUTPUT//$'\n'/\\n}"'", "flags": 4}' "${{ secrets.DISCORD_TRANSLATE_WEBHOOK }}"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 876a18e0..e374e898 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,37 @@
+# Release 1.13.0 (Dungeon Update)
+
+## Highlight
+* Dungeon Secrets by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/246
+* Tic Tac Toe Solver by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/253
+* Starred Mob Glow by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/260
+* Blaze Solver draws a line to the next blaze by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/248
+* durability bar for Pickonimbus by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/259
+* Fully configureable Fancy Tab HUD with ressourcepack by @msg-programs in https://github.com/SkyblockerMod/Skyblocker/pull/230
+* Attribute Shard Info Display by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/263
+
+## What's Changed
+* Blaze Solver Enhancements by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/248
+* add issue templates by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/251
+* small quicknav storage cause work in rift now by @Julienraptor01 in https://github.com/SkyblockerMod/Skyblocker/pull/252
+* Add alternate hypixel address argument by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/255
+* Fix Croesus Helper by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/257
+* Tic Tac Toe Solver! by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/253
+* Very important fix by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/261
+* Starred Mob Glow by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/260
+* improve DungeonBlaze.java by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/254
+* fix 258 and add durability bar for Pickonimbus by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/259
+* Catch exceptions in CustomArmorTrims#initializeTrimCache by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/262
+* Fully configureable Fancy Tab HUD by @msg-programs in https://github.com/SkyblockerMod/Skyblocker/pull/230
+* Dungeon Secrets by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/246
+* Attribute Shard Info Display by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/263
+* Translations update from hysky translate by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/245
+* Create webhook_translate.yml by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/264
+* Update webhook_translate.yml by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/265
+* Fix minion widget displaying wrong info when player has 11/12 minions by @msg-programs in https://github.com/SkyblockerMod/Skyblocker/pull/267
+
+
+**Full Changelog**: https://github.com/SkyblockerMod/Skyblocker/compare/v1.12.0...v1.13.0
+___
 # Release 1.12.0
 
 ## Highlight
diff --git a/FEATURES.md b/FEATURES.md
index 44525a4f..983eb873 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -1,9 +1,12 @@
 * Bars: Health and absorption, Mana, Defense, XP (moving fancy bars)
 * Hide Messages: Ability Cooldown, Heal, AOTE, Implosion, Molten Wave, Teleport Pad Messages
 * Dungeon Minimap
+* Dungeon Secrets
+* Starred Mob Glow
 * Dungeon Puzzle Solver:
     * Three Weirdos
     * Blaze
+    * Tic Tac Toe
     * Croesus
     * Terminal:
         * Order
@@ -14,7 +17,7 @@
 * Experiments Solvers
 * Slayer helper:
     * Vampire : Effigy Waypoints, Healing Melon Indicator, Twinclaws Ice Indicator, Steak Stake Indicator
-* Drill Fuel in Item Durability Bar
+* Drill Fuel and Pickonimbus 2000 in Item Durability Bar
 * Hotbar Slot Lock Keybind (Select the hotbar slot you want to lock/unlock and press the lockbutton)
 * Price tooltip: npc, motes, bazaar (avg, lbin), ah, museum
 * reparty: write /rp to reparty + auto rejoin
@@ -28,10 +31,11 @@
 * Update notification
 * Commission HUD: Dwarven Mines quests
 * 1.8 hitbox for lever and farmland
-* Custom Tab HUD
+* Custom Tab HUD + Fully configureable with ressourcepack
 * Roughly enough items (REI) Support
 * Fishing Helper + sound notification
 * Mirrorverse Waypoints
+* Attribute Shard Info Display
 * Item and Armour customisation:
     * Item Renaming
     * Custom Armour Dye Colours
diff --git a/README.md b/README.md
index 38d1e129..73e72ba0 100644
--- a/README.md
+++ b/README.md
@@ -20,9 +20,12 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in
 * Bars: Health and absorption, Mana, Defense, XP (moving fancy bars)
 * Hide Messages: Ability Cooldown, Heal, AOTE, Implosion, Molten Wave, Teleport Pad Messages
 * Dungeon Minimap
+* Dungeon Secrets
+* Starred Mob Glow
 * Dungeon Puzzle Solver:
     * Three Weirdos
     * Blaze
+    * Tic Tac Toe
     * Croesus
     * Terminal:
         * Order
@@ -33,7 +36,7 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in
 * Experiments Solvers
 * Slayer helper:
     * Vampire : Effigy Waypoints, Healing Melon Indicator, Twinclaws Ice Indicator, Steak Stake Indicator
-* Drill Fuel in Item Durability Bar
+* Drill Fuel and Pickonimbus 2000 in Item Durability Bar
 * Hotbar Slot Lock Keybind (Select the hotbar slot you want to lock/unlock and press the lockbutton)
 * Price tooltip: npc, motes, bazaar (avg, lbin), ah, museum
 * reparty: write /rp to reparty + auto rejoin
@@ -47,10 +50,11 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in
 * Update notification
 * Commission HUD: Dwarven Mines quests
 * 1.8 hitbox for lever and farmland
-* Custom Tab HUD
+* Custom Tab HUD + Fully configureable with ressourcepack
 * Roughly enough items (REI) Support
 * Fishing Helper + sound notification
 * Mirrorverse Waypoints
+* Attribute Shard Info Display
 * Item and Armour customisation:
     * Item Renaming
     * Custom Armour Dye Colours
@@ -123,14 +127,14 @@ information.
 
 German ([LifeIsAParadox](https://github.com/LifeIsAParadox) & [msg-programs](https://github.com/msg-programs)) \
 Indonesian ([null2264](https://github.com/null2264)) \
-Russian ([HyperSoop](https://github.com/HyperSoop) & [Azuremane](https://github.com/Azuremane) & [CrimsonIsle](https://github.com/CrimsonIsle))\
-French ([edgarogh](https://github.com/edgarogh) & [Julienraptor01](https://github.com/Julienraptor01) & [viciscat](https://github.com/viciscat)) \
+Russian ([HyperSoop](https://github.com/HyperSoop) & [CrimsonIsle](https://github.com/CrimsonIsle))\
+French ([edgarogh](https://github.com/edgarogh) & [Julienraptor01](https://github.com/Julienraptor01) & [viciscat](https://github.com/viciscat) & [Kiverty](https://github.com/Kiverty)) \
 Japanese ([hirochisan](https://github.com/hirochisan)) \
 Chinese ([catandA](https://github.com/catandA)) \
+Chinese (Simplified) ([catandA](https://github.com/catandA) & [PumpkinXD](https://github.com/PumpkinXD) & [user123321111](https://github.com/user123321111) & [sunnytia](https://github.com/sunnytia)) \
 Korean ([lantice3720](https://github.com/lantice3720)) \
 Spanish ([IngeSebastian](https://github.com/IngeSebastian)) \
 Norwegian Bokmål ([KdGaming0](https://github.com/KdGaming0)) \
 Norwegian Nynorsk ([KdGaming0](https://github.com/KdGaming0)) \
 Turkish ([Fix3dll](https://github.com/Fix3dll)) \
-Chinese (Simplified) ([catandA](https://github.com/catandA) & [PumpkinXD](https://github.com/PumpkinXD)) \
 Canadian English ([AzureAaron](https://github.com/AzureAaron))
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index f47fe78d..2b3f6150 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,7 +29,7 @@ betterinject_version=0.1.3
 occlusionculling_version = 0.0.7-SNAPSHOT
 
 # Mod Properties
-mod_version = 1.12.0
+mod_version = 1.13.0
 maven_group = me.xmrvizzy
 archives_base_name = skyblocker
 modrinth_id=y6DuFGwJ
\ No newline at end of file
diff --git a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
index 8033e4a2..5c7f2a99 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
@@ -100,6 +100,7 @@ public class SkyblockerMod implements ClientModInitializer {
         CustomArmorDyeColors.init();
         CustomArmorTrims.init();
         TicTacToe.init();
+        QuiverWarning.init();
         containerSolverManager.init();
         statusBarTracker.init();
         scheduler.scheduleCyclic(Utils::update, 20);
diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index 55fffa9c..577c87e4 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -174,6 +174,10 @@ public class SkyblockerConfig implements ConfigData {
         @ConfigEntry.Gui.CollapsibleObject()
         public Shortcuts shortcuts = new Shortcuts();
 
+        @ConfigEntry.Category("quiverWarning")
+        @ConfigEntry.Gui.CollapsibleObject()
+        public QuiverWarning quiverWarning = new QuiverWarning();
+
         @ConfigEntry.Category("itemList")
         @ConfigEntry.Gui.CollapsibleObject()
         public ItemList itemList = new ItemList();
@@ -181,6 +185,10 @@ public class SkyblockerConfig implements ConfigData {
         @ConfigEntry.Category("itemTooltip")
         @ConfigEntry.Gui.CollapsibleObject()
         public ItemTooltip itemTooltip = new ItemTooltip();
+        
+        @ConfigEntry.Category("itemInfoDisplay")
+        @ConfigEntry.Gui.CollapsibleObject
+        public ItemInfoDisplay itemInfoDisplay = new ItemInfoDisplay();
 
         @ConfigEntry.Category("hitbox")
         @ConfigEntry.Gui.CollapsibleObject()
@@ -298,6 +306,12 @@ public class SkyblockerConfig implements ConfigData {
         public boolean enableCommandArgShortcuts = true;
     }
 
+    public static class QuiverWarning {
+        public boolean enableQuiverWarning = true;
+        public boolean enableQuiverWarningInDungeons = true;
+        public boolean enableQuiverWarningAfterDungeon = true;
+    }
+
     public static class Hitbox {
         public boolean oldFarmlandHitbox = true;
         public boolean oldLeverHitbox = false;
@@ -387,6 +401,11 @@ public class SkyblockerConfig implements ConfigData {
         public boolean enableBazaarPrice = true;
         public boolean enableMuseumDate = true;
     }
+    
+    public static class ItemInfoDisplay {
+    	@ConfigEntry.Gui.Tooltip
+        public boolean attributeShardInfo = true;
+    }
 
     public static class Locations {
         @ConfigEntry.Category("barn")
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/DrawContextMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/DrawContextMixin.java
index 6c059741..0a1084cf 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/DrawContextMixin.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/DrawContextMixin.java
@@ -1,12 +1,16 @@
 package me.xmrvizzy.skyblocker.mixin;
 
+import com.llamalad7.mixinextras.sugar.Local;
+import com.llamalad7.mixinextras.sugar.ref.LocalRef;
 import com.mojang.blaze3d.systems.RenderSystem;
 
 import dev.cbyrne.betterinject.annotations.Arg;
 import dev.cbyrne.betterinject.annotations.Inject;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import me.xmrvizzy.skyblocker.skyblock.item.AttributeShards;
 import me.xmrvizzy.skyblocker.utils.ItemUtils;
 import me.xmrvizzy.skyblocker.utils.Utils;
+import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.util.math.MatrixStack;
@@ -14,6 +18,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.math.ColorHelper;
+
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -30,6 +36,9 @@ public abstract class DrawContextMixin {
 
     @Shadow
     public abstract void fill(RenderLayer layer, int x1, int x2, int y1, int y2, int color);
+    
+    @Shadow
+    public abstract int drawText(TextRenderer textRenderer, @Nullable String text, int x, int y, int color, boolean shadow);
 
     @Inject(method = "drawItemInSlot(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V", at = @At("HEAD"))
     public void skyblocker$renderItemBar(@Arg ItemStack stack, @Arg(ordinal = 0) int x, @Arg(ordinal = 1) int y) {
@@ -87,4 +96,38 @@ public abstract class DrawContextMixin {
         matrices.pop();
         RenderSystem.enableDepthTest();
     }
+    
+    @Inject(method = "drawItemInSlot(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V", at = @At("HEAD"))
+    private void skyblocker$renderAttributeShardDisplay(@Arg TextRenderer textRenderer, @Arg ItemStack stack, @Arg(ordinal = 0) int x, @Arg(ordinal = 1) int y, @Local(argsOnly = true) LocalRef<String> countOverride) {
+    	if (!SkyblockerConfig.get().general.itemInfoDisplay.attributeShardInfo) return;
+    	
+    	NbtCompound nbt = stack.getNbt();
+    			
+    	if (Utils.isOnSkyblock() && nbt != null && nbt.contains("ExtraAttributes")) {
+    		NbtCompound extraAttributes = nbt.getCompound("ExtraAttributes");
+    		
+    		if (extraAttributes.getString("id").equals("ATTRIBUTE_SHARD")) {
+    			NbtCompound attributesTag = extraAttributes.getCompound("attributes");
+    			String[] attributes = attributesTag.getKeys().toArray(String[]::new);
+    			
+    			if (attributes.length != 0) {
+    				String attributeId = attributes[0];
+    				int attributeLevel = attributesTag.getInt(attributeId);
+    				
+    				//Set item count
+    				countOverride.set(Integer.toString(attributeLevel));
+    				
+    				//Draw the attribute name
+    				this.matrices.push();
+    				this.matrices.translate(0f, 0f, 200f);
+    				
+    				String attributeInitials = AttributeShards.getShortName(attributeId);
+    				
+    				this.drawText(textRenderer, attributeInitials, x, y, Formatting.AQUA.getColorValue(), true); 
+    				
+    				this.matrices.pop();
+    			}
+    		}
+    	}
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/QuiverWarning.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/QuiverWarning.java
new file mode 100644
index 00000000..cf793461
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/QuiverWarning.java
@@ -0,0 +1,66 @@
+package me.xmrvizzy.skyblocker.skyblock;
+
+import me.xmrvizzy.skyblocker.SkyblockerMod;
+import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import me.xmrvizzy.skyblocker.utils.Utils;
+import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.hud.InGameHud;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+import org.jetbrains.annotations.Nullable;
+
+public class QuiverWarning {
+    @Nullable
+    private static Type warning = null;
+
+    public static void init() {
+        ClientReceiveMessageEvents.ALLOW_GAME.register(QuiverWarning::onChatMessage);
+        SkyblockerMod.getInstance().scheduler.scheduleCyclic(QuiverWarning::update, 10);
+    }
+
+    public static boolean onChatMessage(Text text, boolean overlay) {
+        String message = text.getString();
+        if (SkyblockerConfig.get().general.quiverWarning.enableQuiverWarning && message.endsWith("left in your Quiver!")) {
+            MinecraftClient.getInstance().inGameHud.setDefaultTitleFade();
+            if (message.startsWith("You only have 50")) {
+                onChatMessage(Type.FIFTY_LEFT);
+            } else if (message.startsWith("You only have 10")) {
+                onChatMessage(Type.TEN_LEFT);
+            } else if (message.startsWith("You don't have any more")) {
+                onChatMessage(Type.EMPTY);
+            }
+        }
+        return true;
+    }
+
+    private static void onChatMessage(Type warning) {
+        if (!Utils.isInDungeons()) {
+            MinecraftClient.getInstance().inGameHud.setTitle(Text.translatable(warning.key).formatted(Formatting.RED));
+        } else if (SkyblockerConfig.get().general.quiverWarning.enableQuiverWarningInDungeons) {
+            MinecraftClient.getInstance().inGameHud.setTitle(Text.translatable(warning.key).formatted(Formatting.RED));
+            QuiverWarning.warning = warning;
+        }
+    }
+
+    public static void update() {
+        if (warning != null && SkyblockerConfig.get().general.quiverWarning.enableQuiverWarning && SkyblockerConfig.get().general.quiverWarning.enableQuiverWarningAfterDungeon && !Utils.isInDungeons()) {
+            InGameHud inGameHud = MinecraftClient.getInstance().inGameHud;
+            inGameHud.setDefaultTitleFade();
+            inGameHud.setTitle(Text.translatable(warning.key).formatted(Formatting.RED));
+            warning = null;
+        }
+    }
+
+    private enum Type {
+        NONE(""),
+        FIFTY_LEFT("50Left"),
+        TEN_LEFT("10Left"),
+        EMPTY("empty");
+        private final String key;
+
+        Type(String key) {
+            this.key = "skyblocker.quiverWarning." + key;
+        }
+    }
+}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/AttributeShards.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/AttributeShards.java
new file mode 100644
index 00000000..0f106cdf
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/AttributeShards.java
@@ -0,0 +1,59 @@
+package me.xmrvizzy.skyblocker.skyblock.item;
+
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+
+public class AttributeShards {
+	private static final Object2ObjectOpenHashMap<String, String> ID_2_SHORT_NAME = new Object2ObjectOpenHashMap<>();
+	
+	static {
+		//Weapons
+		ID_2_SHORT_NAME.put("arachno", "A");
+		ID_2_SHORT_NAME.put("attack_speed", "AS");
+		ID_2_SHORT_NAME.put("blazing", "BL");
+		ID_2_SHORT_NAME.put("combo", "C");
+		ID_2_SHORT_NAME.put("elite", "E");
+		ID_2_SHORT_NAME.put("ender", "EN");
+		ID_2_SHORT_NAME.put("ignition", "I");
+		ID_2_SHORT_NAME.put("life_recovery", "LR");
+		ID_2_SHORT_NAME.put("mana_steal", "MS");
+		ID_2_SHORT_NAME.put("midas_touch", "MT");
+		ID_2_SHORT_NAME.put("undead", "U");
+		
+		//Swords & Bows
+		ID_2_SHORT_NAME.put("warrior", "W");
+		ID_2_SHORT_NAME.put("deadeye", "DE");
+		
+		//Armor or Equipment
+		ID_2_SHORT_NAME.put("arachno_resistance", "AR");
+		ID_2_SHORT_NAME.put("blazing_resistance", "BR");
+		ID_2_SHORT_NAME.put("breeze", "B");
+		ID_2_SHORT_NAME.put("dominance", "D");
+		ID_2_SHORT_NAME.put("ender_resistance", "ER");
+		ID_2_SHORT_NAME.put("experience", "XP");
+		ID_2_SHORT_NAME.put("fortitude", "F");
+		ID_2_SHORT_NAME.put("life_regeneration", "HR"); //Health regeneration
+		ID_2_SHORT_NAME.put("lifeline", "L");
+		ID_2_SHORT_NAME.put("magic_find", "MF");
+		ID_2_SHORT_NAME.put("mana_pool", "MP");
+		ID_2_SHORT_NAME.put("mana_regeneration", "MR");
+		ID_2_SHORT_NAME.put("mending", "V"); //Vitality
+		ID_2_SHORT_NAME.put("speed", "S");
+		ID_2_SHORT_NAME.put("undead_resistance", "UR");
+		ID_2_SHORT_NAME.put("veteran", "V");
+		
+		//Fishing Gear
+		ID_2_SHORT_NAME.put("blazing_fortune", "BF");
+		ID_2_SHORT_NAME.put("fishing_experience", "FE");
+		ID_2_SHORT_NAME.put("infection", "IF");
+		ID_2_SHORT_NAME.put("double_hook", "DH");
+		ID_2_SHORT_NAME.put("fisherman", "FM");
+		ID_2_SHORT_NAME.put("fishing_speed", "FS");
+		ID_2_SHORT_NAME.put("hunter", "H");
+		ID_2_SHORT_NAME.put("trophy_hunter", "TH");
+		
+	}
+	
+	public static String getShortName(String id) {
+		return ID_2_SHORT_NAME.getOrDefault(id, "");
+	}
+}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/MinionWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/MinionWidget.java
index 039871b2..579828d4 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/MinionWidget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/MinionWidget.java
@@ -97,29 +97,13 @@ public class MinionWidget extends Widget {
 
     @Override
     public void updateContent() {
-        for (int i = 48; i < 59; i++) {
-            Matcher m = PlayerListMgr.regexAt(i, MINION_PATTERN);
-            if (m != null) {
-
-                String min = m.group("name");
-                String lvl = m.group("level");
-                String stat = m.group("status");
-
-                MutableText mt = Text.literal(min + " " + lvl).append(Text.literal(": "));
 
-                Formatting format = Formatting.RED;
-                if (stat.equals("ACTIVE")) {
-                    format = Formatting.GREEN;
-                } else if (stat.equals("SLOW")) {
-                    format = Formatting.YELLOW;
-                }
-                // makes "BLOCKED" also red. in reality, it's some kind of crimson
-                mt.append(Text.literal(stat).formatted(format));
+        // this looks a bit weird because if we used regex mismatch as a stop condition,
+        //   it'd spam the chat.
+        // not sure if not having that debug output is worth the cleaner solution here...
 
-                IcoTextComponent itc = new IcoTextComponent(MIN_ICOS.get(min), mt);
-                this.addComponent(itc);
-
-            } else {
+        for (int i = 48; i < 59; i++) {
+            if (!this.addMinionComponent(i)) {
                 break;
             }
         }
@@ -128,8 +112,39 @@ public class MinionWidget extends Widget {
         // a "And X more..." text is shown
         // look for that and add it to the widget
         String more = PlayerListMgr.strAt(59);
-        if (more != null) {
+        if (more == null) {
+            return;
+        } else if (more.startsWith("And ")) {
             this.addComponent(new PlainTextComponent(Text.of(more)));
+        } else {
+            this.addMinionComponent(59);
+        }
+    }
+
+    public boolean addMinionComponent(int i) {
+        Matcher m = PlayerListMgr.regexAt(i, MINION_PATTERN);
+        if (m != null) {
+
+            String min = m.group("name");
+            String lvl = m.group("level");
+            String stat = m.group("status");
+
+            MutableText mt = Text.literal(min + " " + lvl).append(Text.literal(": "));
+
+            Formatting format = Formatting.RED;
+            if (stat.equals("ACTIVE")) {
+                format = Formatting.GREEN;
+            } else if (stat.equals("SLOW")) {
+                format = Formatting.YELLOW;
+            }
+            // makes "BLOCKED" also red. in reality, it's some kind of crimson
+            mt.append(Text.literal(stat).formatted(format));
+
+            IcoTextComponent itc = new IcoTextComponent(MIN_ICOS.get(min), mt);
+            this.addComponent(itc);
+            return true;
+        } else {
+            return false;
         }
     }
 
diff --git a/src/main/resources/assets/skyblocker/lang/de_de.json b/src/main/resources/assets/skyblocker/lang/de_de.json
index 4a84719c..e815af0d 100644
--- a/src/main/resources/assets/skyblocker/lang/de_de.json
+++ b/src/main/resources/assets/skyblocker/lang/de_de.json
@@ -10,7 +10,6 @@
     "text.autoconfig.skyblocker.option.general.tabHud.tabHudScale.@Tooltip": "Wert in %, relativ zur Skalierung des Vanilla-GUIs",
     "text.autoconfig.skyblocker.option.general.bars.enableBars": "Balken aktivieren",
     "text.autoconfig.skyblocker.option.general.hideEmptyTooltips": "Leere Item-Tooltips in Menüs verstecken",
-
     "text.autoconfig.skyblocker.category.locations": "Standorte",
     "text.autoconfig.skyblocker.option.locations.dungeons": "Dungeons",
     "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Karte aktivieren",
@@ -33,10 +32,16 @@
     "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "Nachricht über Molten Wave ausblenden",
     "text.autoconfig.skyblocker.option.messages.hideAds": "Werbung im öffentlichen Chat ausblenden",
     "key.wikiLookup": "Wiki-Abfrage",
-    "key.skyblocker.playerTgl": "Tab-HUD auf Spielerliste umstellen",
     "key.skyblocker.defaultTgl": "Tab-HUD auf Standard umstellen",
-    "key.skyblocker.genericTgl": "Tab-HUD auf allgemeine Infos umstellen",
     "text.autoconfig.skyblocker.option.general.bars.barpositions.RIGHT": "Rechts",
-    "text.autoconfig.skyblocker.option.general.quicknav": "Schnellnavigation",
-    "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "Schnellnavigation Einschalten"
+    "key.skyblocker.toggleB": "HUD auf Tab B umschalten",
+    "key.skyblocker.toggleA": "HUD auf Tab A umschalten",
+    "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER1": "Ebene 1",
+    "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER2": "Ebene 2",
+    "text.autoconfig.skyblocker.option.general.bars.barpositions.NONE": "Ausgeschaltet",
+    "text.autoconfig.skyblocker.option.general.experiments.enableSuperpairsSolver": "Superpairs Solver aktivieren",
+    "text.autoconfig.skyblocker.option.general.experiments.enableUltrasequencerSolver": "Ultrasequencer Solver aktivieren",
+    "text.autoconfig.skyblocker.option.general.bars.barpositions": "Balkenposition Bearbeiten",
+    "text.autoconfig.skyblocker.option.general.acceptReparty": "Automatische Annahme von Reparty",
+    "text.autoconfig.skyblocker.option.general.bars.barpositions.healthBarPosition": "Gesundheitsposition"
 }
diff --git a/src/main/resources/assets/skyblocker/lang/en_ca.json b/src/main/resources/assets/skyblocker/lang/en_ca.json
index fb708354..ca98bba9 100644
--- a/src/main/resources/assets/skyblocker/lang/en_ca.json
+++ b/src/main/resources/assets/skyblocker/lang/en_ca.json
@@ -7,5 +7,18 @@
     "text.autoconfig.skyblocker.option.locations.dungeons.lividColor.lividColorText": "Livid Colour Text",
     "text.autoconfig.skyblocker.option.locations.dungeons.lividColor.lividColorText.@Tooltip": "Text which will be sent in the chat during the Livid boss fight. The string \"[color]\" will be replaced with the livid colour.",
     "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "Solve Select Coloured",
-    "text.autoconfig.skyblocker.option.general.bars.barpositions.defenceBarPosition": "Defence Bar Position"
+    "text.autoconfig.skyblocker.option.general.bars.barpositions.defenceBarPosition": "Defence Bar Position",
+    "skyblocker.customDyeColors.notDyeable": "§b[§6Skyblocker§b] §cThis item isn't a dyeable armour piece!",
+    "skyblocker.customDyeColors.added": "§b[§6Skyblocker§b] §fSet a custom dye colour for your currently held item!",
+    "skyblocker.customDyeColors.noItemUuid": "§b[§6Skyblocker§b] §cYou must be holding an item that has a uuid in order to set a custom dye colour!",
+    "skyblocker.customArmorTrims.neverHad": "§b[§6Skyblocker§b] §fThis item doesn't have an armour trim set, but why not add one? ;)",
+    "skyblocker.customArmorTrims.added": "§b[§6Skyblocker§b] §fSet a custom armour trim for your currently held item!",
+    "skyblocker.customArmorTrims.unableToSetTrim": "§b[§6Skyblocker§b] §cUnable to set a custom armour trim :( (Are you in skyblock?, are you holding an item?)",
+    "skyblocker.customDyeColors.invalidHex": "§b[§6Skyblocker§b] §cInvalid HEX colour code!",
+    "skyblocker.customDyeColors.removed": "§b[§6Skyblocker§b] §fRemoved this item's custom dye colour.",
+    "skyblocker.customDyeColors.neverHad": "§b[§6Skyblocker§b] §fThis item doesn't have a custom dye colour set, but why not add one? ;)",
+    "skyblocker.customDyeColors.unableToSetColor": "§b[§6Skyblocker§b] §cUnable to set a custom dye colour :( (Are you in skyblock?, are you holding an item?)",
+    "skyblocker.customArmorTrims.notAnArmorPiece": "§b[§6Skyblocker§b] §cThis item isn't an armour piece!",
+    "skyblocker.customArmorTrims.removed": "§b[§6Skyblocker§b] §fRemoved this item's custom armour trim.",
+    "skyblocker.customArmorTrims.noItemUuid": "§b[§6Skyblocker§b] §cYou must be holding an item that has a uuid in order to set a custom armour trim!"
 }
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index 2c2a4a9c..33f6ff9c 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -37,8 +37,10 @@
   "text.autoconfig.skyblocker.option.general.shortcuts.enableCommandShortcuts.@Tooltip": "Shortcuts for commands consisting of only one word. Edit shortcuts with \"/skyblocker shortcuts\". Shortcuts must be enabled for this to take effect.",
   "text.autoconfig.skyblocker.option.general.shortcuts.enableCommandArgShortcuts": "Enable Command Argument Shortcuts",
   "text.autoconfig.skyblocker.option.general.shortcuts.enableCommandArgShortcuts.@Tooltip": "Shortcuts that replace one or more word(s)/argument(s) of a command which has multiple words/arguments. Edit shortcuts with \"/skyblocker shortcuts\". Shortcuts must be enabled for this to take effect.",
-  "text.autoconfig.skyblocker.option.general.quicknav": "Quicknav",
-  "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "Enable Quicknav",
+  "text.autoconfig.skyblocker.option.general.quiverWarning": "Quiver Warning",
+  "text.autoconfig.skyblocker.option.general.quiverWarning.enableQuiverWarning": "Enable Quiver Warning",
+  "text.autoconfig.skyblocker.option.general.quiverWarning.enableQuiverWarningInDungeons": "Enable Quiver Warning In Dungeons",
+  "text.autoconfig.skyblocker.option.general.quiverWarning.enableQuiverWarningAfterDungeon": "Enable Quiver Warning After a Dungeon",
   "text.autoconfig.skyblocker.option.general.backpackPreviewWithoutShift": "View backpack preview without holding Shift",
   "text.autoconfig.skyblocker.option.general.tabHud": "Fancy tab HUD",
   "text.autoconfig.skyblocker.option.general.tabHud.tabHudEnabled": "Enable fancy tab HUD",
@@ -61,6 +63,9 @@
   "text.autoconfig.skyblocker.option.general.itemTooltip.enableLowestBIN": "Enable Lowest BIN Price",
   "text.autoconfig.skyblocker.option.general.itemTooltip.enableBazaarPrice": "Enable Bazaar buy/sell Price",
   "text.autoconfig.skyblocker.option.general.itemTooltip.enableMuseumDate": "Enable Museum & Date",
+  "text.autoconfig.skyblocker.option.general.itemInfoDisplay": "Item Info Display",
+  "text.autoconfig.skyblocker.option.general.itemInfoDisplay.attributeShardInfo": "Attribute Shard Info",
+  "text.autoconfig.skyblocker.option.general.itemInfoDisplay.attributeShardInfo.@Tooltip": "Displays the attribute's level as the stack count and the initials of the attribute's name.",
   "text.autoconfig.skyblocker.option.general.hitbox": "Hitboxes",
   "text.autoconfig.skyb