24w09a

19 files changed, 196 insertions, 192 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CroesusHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CroesusHelper.java
index 01422770..5bd44707 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CroesusHelper.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CroesusHelper.java
@@ -1,8 +1,10 @@
 package de.hysky.skyblocker.skyblock.dungeon;
 
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.utils.ItemUtils;
 import de.hysky.skyblocker.utils.render.gui.ColorHighlight;
 import de.hysky.skyblocker.utils.render.gui.ContainerSolver;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.item.ItemStack;
 
 import java.util.ArrayList;
@@ -25,10 +27,10 @@ public class CroesusHelper extends ContainerSolver {
         List<ColorHighlight> highlights = new ArrayList<>();
         for (Map.Entry<Integer, ItemStack> entry : slots.entrySet()) {
             ItemStack stack = entry.getValue();
-            if (stack != null && stack.getNbt() != null) {
-                if (stack.getNbt().toString().contains("Opened Chest:")) {
+            if (stack != null && stack.contains(DataComponentTypes.LORE)) {
+                if (ItemUtils.getLoreLineIf(stack, s -> s.contains("Opened Chest:")) != null) {
                     highlights.add(ColorHighlight.gray(entry.getKey()));
-                } else if (stack.getNbt().toString().contains("No more Chests to open!")) {
+                } else if (ItemUtils.getLoreLineIf(stack, s -> s.contains("No more Chests to open!")) != null) {
                     highlights.add(ColorHighlight.red(entry.getKey()));
                 }
             }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CroesusProfit.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CroesusProfit.java
index ca166915..8933a447 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CroesusProfit.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CroesusProfit.java
@@ -6,6 +6,7 @@ import de.hysky.skyblocker.skyblock.item.tooltip.TooltipInfoType;
 import de.hysky.skyblocker.utils.ItemUtils;
 import de.hysky.skyblocker.utils.render.gui.ColorHighlight;
 import de.hysky.skyblocker.utils.render.gui.ContainerSolver;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.item.ItemStack;
 import net.minecraft.text.Text;
 import org.jetbrains.annotations.NotNull;
@@ -37,7 +38,7 @@ public class CroesusProfit extends ContainerSolver {
 
         for (Map.Entry<Integer, ItemStack> entry : slots.entrySet()) {
             ItemStack stack = entry.getValue();
-            if (stack != null && stack.getNbt() != null && stack.getName().toString().contains("Chest")) {
+            if (stack != null && stack.contains(DataComponentTypes.LORE) && ItemUtils.getLoreLineIf(stack, s -> s.contains("Chest")) != null) {
                 long value = valueChest(stack);
                 if (value > bestValue) {
                     secondBestChest = bestChest;
@@ -53,7 +54,7 @@ public class CroesusProfit extends ContainerSolver {
 
         for (Map.Entry<Integer, ItemStack> entry : slots.entrySet()) {
             ItemStack stack = entry.getValue();
-            if (stack != null && stack.getNbt() != null) {
+            if (stack != null && stack.contains(DataComponentTypes.LORE)) {
                 if (stack.equals(bestChest)) {
                     highlights.add(ColorHighlight.green(entry.getKey()));
                 } else if (stack.equals(secondBestChest) && secondBestValue > dungeonKeyPriceData) {
@@ -71,7 +72,7 @@ public class CroesusProfit extends ContainerSolver {
         List<String> chestItems = new ArrayList<>();
 
         boolean processingContents = false;
-        for (Text line : ItemUtils.getNbtTooltips(chest)) {
+        for (Text line : ItemUtils.getLore(chest)) {
             String lineString = line.getString();
             if (lineString.contains("Contents")) {
                 processingContents = true;
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMap.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMap.java
index 878b7a35..7a6cdcd0 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMap.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMap.java
@@ -14,14 +14,16 @@ import net.minecraft.client.render.LightmapTextureManager;
 import net.minecraft.client.render.MapRenderer;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.MapIdComponent;
 import net.minecraft.item.FilledMapItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.item.map.MapState;
 
 public class DungeonMap {
-    private static final int DEFAULT_MAP_ID = 1024;
-    private static Integer cachedMapId = null;
+    private static final MapIdComponent DEFAULT_MAP_ID_COMPONENT = new MapIdComponent(1024);
+    private static MapIdComponent cachedMapIdComponent = null;
 
     public static void init() {
     	HudRenderEvents.AFTER_MAIN_HUD.register((context, tickDelta) -> render(context));
@@ -35,11 +37,11 @@ public class DungeonMap {
         ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> reset());
     }
 
-    private static void render(MatrixStack matrices) {
+    public static void render(MatrixStack matrices) {
         MinecraftClient client = MinecraftClient.getInstance();
         if (client.player == null || client.world == null) return;
 
-        int mapId = getMapId(client.player.getInventory().main.get(8));
+        MapIdComponent mapId = getMapIdComponent(client.player.getInventory().main.get(8));
 
         MapState state = FilledMapItem.getMapState(mapId, client.world);
         if (state == null) return;
@@ -58,13 +60,12 @@ public class DungeonMap {
         matrices.pop();
     }
 
-    public static int getMapId(ItemStack stack) {
-        if (stack.isOf(Items.FILLED_MAP)) {
-            @SuppressWarnings("DataFlowIssue")
-            int mapId = FilledMapItem.getMapId(stack);
-            cachedMapId = mapId;
-            return mapId;
-        } else return cachedMapId != null ? cachedMapId : DEFAULT_MAP_ID;
+    public static MapIdComponent getMapIdComponent(ItemStack stack) {
+        if (stack.isOf(Items.FILLED_MAP) && stack.contains(DataComponentTypes.MAP_ID)) {
+            MapIdComponent mapIdComponent = stack.get(DataComponentTypes.MAP_ID);
+            cachedMapIdComponent = mapIdComponent;
+            return mapIdComponent;
+        } else return cachedMapIdComponent != null ? cachedMapIdComponent : DEFAULT_MAP_ID_COMPONENT;
     }
 
     private static void render(DrawContext context) {
@@ -74,6 +75,6 @@ public class DungeonMap {
     }
 
     private static void reset() {
-        cachedMapId = null;
+        cachedMapIdComponent = null;
     }
 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/OptionDropdownWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/OptionDropdownWidget.java
index 64e45283..19241d58 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/OptionDropdownWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/OptionDropdownWidget.java
@@ -29,7 +29,6 @@ public class OptionDropdownWidget extends ElementListWidget<OptionDropdownWidget
         this.screen = screen;
         this.slotId = slotId;
         setX(x);
-        setRenderBackground(false);
         setRenderHeader(true, 25);
         this.name = name;
         this.selectedOption = selectedOption;
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntry.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntry.java
index b53047d8..ab77d122 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntry.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntry.java
@@ -1,6 +1,6 @@
 package de.hysky.skyblocker.skyblock.dungeon.partyfinder;
 
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.authlib.properties.PropertyMap;
 import de.hysky.skyblocker.SkyblockerMod;
 import de.hysky.skyblocker.mixin.accessor.SkullBlockEntityAccessor;
 import net.minecraft.client.MinecraftClient;
@@ -12,10 +12,10 @@ import net.minecraft.client.gui.Selectable;
 import net.minecraft.client.gui.widget.ElementListWidget;
 import net.minecraft.client.util.DefaultSkinHelper;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.ProfileComponent;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
-import net.minecraft.nbt.NbtCompound;
-import net.minecraft.nbt.StringNbtReader;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
 import net.minecraft.text.TextColor;
@@ -25,6 +25,8 @@ import net.minecraft.util.Identifier;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -38,7 +40,7 @@ public class PartyEntry extends ElementListWidget.Entry<PartyEntry> {
     String floor = "???";
     String dungeon = "???";
     String note = "";
-    NbtCompound floorSkullNBT = new NbtCompound();
+    PropertyMap floorSkullProperties = new PropertyMap();
     Identifier partyLeaderSkin = DefaultSkinHelper.getTexture();
     Player[] partyMembers = new Player[4];
 
@@ -87,14 +89,14 @@ public class PartyEntry extends ElementListWidget.Entry<PartyEntry> {
                 if (PartyFinderScreen.floorIconsMaster == null || PartyFinderScreen.floorIconsNormal == null) continue;
                 if (dungeon.contains("Master Mode")) {
                     try {
-                        floorSkullNBT = StringNbtReader.parse(PartyEntryListWidget.BASE_SKULL_NBT.replace("%TEXTURE%", PartyFinderScreen.floorIconsMaster.getOrDefault(floor.toLowerCase(), "")));
-                    } catch (CommandSyntaxException e) {
+                        floorSkullProperties = PartyFinderScreen.floorIconsMaster.getOrDefault(floor.toLowerCase(), new PropertyMap());
+                    } catch (Exception e) {
                         throw new RuntimeException(e);
                     }
                 } else {
                     try {
-                        floorSkullNBT = StringNbtReader.parse(PartyEntryListWidget.BASE_SKULL_NBT.replace("%TEXTURE%", PartyFinderScreen.floorIconsNormal.getOrDefault(floor.toLowerCase(), "")));
-                    } catch (CommandSyntaxException e) {
+                    	floorSkullProperties = PartyFinderScreen.floorIconsNormal.getOrDefault(floor.toLowerCase(), new PropertyMap());
+                    } catch (Exception e) {
                         throw new RuntimeException(e);
                     }
                 }
@@ -226,7 +228,7 @@ public class PartyEntry extends ElementListWidget.Entry<PartyEntry> {
             }
         }
         ItemStack stack = new ItemStack(Items.PLAYER_HEAD);
-        stack.setNbt(floorSkullNBT);
+        stack.set(DataComponentTypes.PROFILE, new ProfileComponent("SkyblockerCustomPF", Optional.of(UUID.randomUUID()), floorSkullProperties));
         context.drawItem(stack, 317, 3);
 
         int textWidth = textRenderer.getWidth(floor);
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyFinderScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyFinderScreen.java
index 16be2b67..98ab88c0 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyFinderScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyFinderScreen.java
@@ -1,7 +1,10 @@
 package de.hysky.skyblocker.skyblock.dungeon.partyfinder;
 
 import com.google.gson.JsonObject;
+import com.mojang.authlib.properties.PropertyMap;
+
 import de.hysky.skyblocker.SkyblockerMod;
+import de.hysky.skyblocker.utils.ItemUtils;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 import net.minecraft.block.entity.SignBlockEntity;
 import net.minecraft.client.MinecraftClient;
@@ -99,8 +102,8 @@ public class PartyFinderScreen extends Screen {
 
     private boolean waitingForServer = false;
 
-    public static Map<String, String> floorIconsNormal = null;
-    public static Map<String, String> floorIconsMaster = null;
+    public static Map<String, PropertyMap> floorIconsNormal = null;
+    public static Map<String, PropertyMap> floorIconsMaster = null;
 
     public static void initClass() {
         ClientLifecycleEvents.CLIENT_STARTED.register(client -> {
@@ -110,8 +113,8 @@ public class PartyFinderScreen extends Screen {
                 floorIconsMaster = new HashMap<>();
                 try (BufferedReader skullTextureReader = client.getResourceManager().openAsReader(new Identifier(SkyblockerMod.NAMESPACE, "dungeons/catacombs/floorskulls.json"))) {
                     JsonObject json = SkyblockerMod.GSON.fromJson(skullTextureReader, JsonObject.class);
-                    json.getAsJsonObject("normal").asMap().forEach((s, jsonElement) -> floorIconsNormal.put(s, jsonElement.getAsString()));
-                    json.getAsJsonObject("master").asMap().forEach((s, jsonElement) -> floorIconsMaster.put(s, jsonElement.getAsString()));
+                    json.getAsJsonObject("normal").asMap().forEach((s, tex) -> floorIconsNormal.put(s, ItemUtils.propertyMapWithTexture(tex.getAsString())));
+                    json.getAsJsonObject("master").asMap().forEach((s, tex) -> floorIconsMaster.put(s, ItemUtils.propertyMapWithTexture(tex.getAsString())));
                     LOGGER.debug("[Skyblocker] Dungeons floor skull textures json loaded");
                 } catch (Exception e) {
                     LOGGER.error("[Skyblocker] Failed to load dungeons floor skull textures json", e);
@@ -136,7 +139,6 @@ public class PartyFinderScreen extends Screen {
         int widget_height = (int) (this.height * 0.8);
         int entryListTopY = Math.max(43, (int) (height * 0.1));
         this.partyEntryListWidget = new PartyEntryListWidget(client, width, widget_height, entryListTopY, 68);
-        partyEntryListWidget.setRenderBackground(false);
 
         // Search field
         this.searchField = new TextFieldWidget(textRenderer, partyEntryListWidget.getRowLeft() + 12, entryListTopY - 12, partyEntryListWidget.getRowWidth() - 12 * 3 - 6, 12, Text.literal("Search..."));
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/DungeonManager.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/DungeonManager.java
index c90f1134..8bb22e7e 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/DungeonManager.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/DungeonManager.java
@@ -40,6 +40,7 @@ import net.minecraft.command.CommandSource;
 import net.minecraft.command.argument.BlockPosArgumentType;
 import net.minecraft.command.argument.PosArgument;
 import net.minecraft.command.argument.TextArgumentType;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.LivingEntity;
@@ -462,7 +463,7 @@ public class DungeonManager {
                 context.getSource().sendError(Constants.PREFIX.get().append("§cFailed to get dungeon map."));
                 return Command.SINGLE_SUCCESS;
             }
-            MapState map = FilledMapItem.getMapState(FilledMapItem.getMapId(stack), client.world);
+            MapState map = FilledMapItem.getMapState(stack.get(DataComponentTypes.MAP_ID), client.world);
             if (map == null) {
                 context.getSource().sendError(Constants.PREFIX.get().append("§cFailed to get dungeon map state."));
                 return Command.SINGLE_SUCCESS;
@@ -539,7 +540,7 @@ public class DungeonManager {
             physicalEntrancePos = DungeonMapUtils.getPhysicalRoomPos(playerPos);
             currentRoom = newRoom(Room.Type.ENTRANCE, physicalEntrancePos);
         }
-        MapState map = FilledMapItem.getMapState(DungeonMap.getMapId(client.player.getInventory().main.get(8)), client.world);
+        MapState map = FilledMapItem.getMapState(DungeonMap.getMapIdComponent(client.player.getInventory().main.get(8)), client.world);
         if (map == null) {
             return;
         }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java
index 30de9a48..10dc2b5c 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java
@@ -4,6 +4,8 @@ import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.skyblock.tabhud.widget.Widget;
 import de.hysky.skyblocker.skyblock.tabhud.widget.component.IcoTextComponent;
 import de.hysky.skyblocker.skyblock.tabhud.widget.component.PlainTextComponent;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.ProfileComponent;
 import net.minecraft.enchantment.Enchantments;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
@@ -12,6 +14,9 @@ import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 
 import java.text.NumberFormat;
+import java.util.Optional;
+
+import com.mojang.authlib.properties.PropertyMap;
 
 public class EndHudWidget extends Widget {
     private static final MutableText TITLE = Text.literal("The End").formatted(Formatting.LIGHT_PURPLE, Formatting.BOLD);
@@ -29,7 +34,7 @@ public class EndHudWidget extends Widget {
     private static final ItemStack POPPY = new ItemStack(Items.POPPY);
 
     static {
-        ENDERMAN_HEAD.getOrCreateNbt().putString("SkullOwner", "MHF_Enderman");
+        ENDERMAN_HEAD.set(DataComponentTypes.PROFILE, new ProfileComponent("MHF_Enderman", Optional.empty(), new PropertyMap()));
         POPPY.addEnchantment(Enchantments.INFINITY, 1);
 
         INSTANCE.setX(SkyblockerConfigManager.get().locations.end.x);
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java b/src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java
index 12ae468f..9650e39b 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java
@@ -6,14 +6,15 @@ import de.hysky.skyblocker.skyblock.dungeon.LividColor;
 import de.hysky.skyblocker.utils.SlayerUtils;
 import de.hysky.skyblocker.utils.Utils;
 import de.hysky.skyblocker.utils.render.culling.OcclusionCulling;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.ProfileComponent;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.decoration.ArmorStandEntity;
 import net.minecraft.entity.mob.EndermanEntity;
 import net.minecraft.entity.passive.BatEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NbtCompound;
-import net.minecraft.nbt.NbtElement;
+import net.minecraft.item.Items;
 import net.minecraft.predicate.entity.EntityPredicates;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.math.Box;
@@ -21,6 +22,8 @@ import net.minecraft.world.World;
 
 import java.util.List;
 
+import com.mojang.authlib.properties.Property;
+
 public class MobGlow {
 
 	public static boolean shouldMobGlow(Entity entity) {
@@ -114,19 +117,18 @@ public class MobGlow {
 		for (ItemStack armorItem : entity.getArmorItems()) {
 			// hacky way to check if an item is a player head w/o
 			// some shenanigans
-			if (!armorItem.toString().startsWith("1 player_head"))
+			if (!armorItem.isOf(Items.PLAYER_HEAD))
 				continue;
 
 			// eb07594e2df273921a77c101d0bfdfa1115abed5b9b2029eb496ceba9bdbb4b3 is texture id for the nukekubi head,
 			// compare against it to exclusively find armorstands that are nukekubi heads
-			NbtCompound skullOwner = armorItem.getSubNbt("SkullOwner");
-			if (skullOwner != null) {
+			ProfileComponent profile = armorItem.get(DataComponentTypes.PROFILE);
+			if (profile != null) {
 				// get the texture of the nukekubi head item itself and compare it
-				String texture = skullOwner
-						.getCompound("Properties")
-						.getList("textures", NbtElement.COMPOUND_TYPE)
-						.getCompound(0)
-						.getString("Value");
+				String texture = profile.properties().get("textures").stream()
+						.map(Property::value)
+						.findFirst()
+						.orElse("None");
 
 				return texture.contains("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZWIwNzU5NGUyZGYyNzM5MjFhNzdjMTAxZDBiZmRmYTExMTVhYmVkNWI5YjIwMjllYjQ5NmNlYmE5YmRiYjRiMyJ9fX0=");
 			}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java
index 95c72241..374e9e12 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java
@@ -54,7 +54,7 @@ public class FarmingHud {
                 }
 
                 ItemStack stack = MinecraftClient.getInstance().player.getMainHandStack();
-                Matcher matcher = ItemUtils.getNbtTooltip(stack, FarmingHud.COUNTER);
+                Matcher matcher = ItemUtils.getLoreLineIfMatch(stack, FarmingHud.COUNTER);
                 if (matcher != null) {
                     try {
                         int count = NUMBER_FORMAT.parse(matcher.group("count")).intValue();
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/garden/VisitorHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/garden/VisitorHelper.java
index 6640d413..2805cb0e 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/garden/VisitorHelper.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/garden/VisitorHelper.java
@@ -2,6 +2,7 @@ package de.hysky.skyblocker.skyblock.garden;
 
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.skyblock.itemlist.ItemRepository;
+import de.hysky.skyblocker.utils.ItemUtils;
 import de.hysky.skyblocker.utils.NEURepoManager;
 import de.hysky.skyblocker.utils.Utils;
 import de.hysky.skyblocker.utils.scheduler.MessageScheduler;
@@ -12,14 +13,11 @@ import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NbtCompound;
-import net.minecraft.nbt.NbtElement;
-import net.minecraft.nbt.NbtList;
 import net.minecraft.screen.ScreenHandler;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.text.Text;
-import net.minecraft.text.Text.Serialization;
 import net.minecraft.util.Formatting;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -27,6 +25,7 @@ import org.slf4j.LoggerFactory;
 
 import java.text.NumberFormat;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
@@ -85,30 +84,27 @@ public class VisitorHelper {
 
     private static void processVisitorItem(String visitorName, ScreenHandler handler) {
         ItemStack visitorItem = handler.getSlot(13).getStack();
-        if (visitorItem == null || !visitorItem.hasNbt() || !visitorItem.getNbt().asString().contains("Times Visited")) return;
+        if (visitorItem == null || !visitorItem.contains(DataComponentTypes.LORE) || ItemUtils.getLoreLineIf(visitorItem, t -> t.contains("Times Visited")) == null) return;
         ItemStack acceptButton = handler.getSlot(29).getStack();
         if (acceptButton == null) return;
-        NbtCompound acceptButtonNbt = acceptButton.getSubNbt("display");
-        if (acceptButtonNbt == null || !acceptButtonNbt.contains("Lore", NbtElement.LIST_TYPE)) return;
-        processLore(visitorName, acceptButtonNbt.getList("Lore", NbtElement.STRING_TYPE));
+        processLore(visitorName, ItemUtils.getLore(acceptButton));
     }
 
-    private static void processLore(String visitorName, NbtList loreList) {
+    private static void processLore(String visitorName, List<Text> loreList) {
         boolean saveRequiredItems = false;
         for (int i = 0; i < loreList.size(); i++) {
-            String lore = loreList.getString(i);
+            String lore = loreList.get(i).getString();
             if (lore.contains("Items Required"))
                 saveRequiredItems = true;
             else if (lore.contains("Rewards"))
                 break;
             else if (saveRequiredItems)
-                updateItemMap(visitorName, lore);
+                updateItemMap(visitorName, loreList.get(i));
         }
     }
 
-    private static void updateItemMap(String visitorName, String lore) {
-        Text itemText = Serialization.fromJson(lore);
-        String[] splitItemText = itemText.getString().split(" x");
+    private static void updateItemMap(String visitorName, Text lore) {
+        String[] splitItemText = lore.getString().split(" x");
         String itemName = splitItemText[0].trim();
         if (itemName.isEmpty()) return;
         try {
@@ -117,7 +113,7 @@ public class VisitorHelper {
             visitorMap.putIfAbsent(itemName, amount);
             itemMap.putIfAbsent(visitorName, visitorMap);
         } catch (Exception e) {
-            LOGGER.error("[Skyblocker Visitor Helper] Failed to parse item: " + itemText.getString(), e);
+            LOGGER.error("[Skyblocker Visitor Helper] Failed to parse item: " + lore.getString(), e);
         }
     }
 
@@ -163,7 +159,7 @@ public class VisitorHelper {
     }
 
     private static void drawItemEntryWithHover(DrawContext context, TextRenderer textRenderer, @Nullable ItemStack stack, String itemName, int amount, int index, int mouseX, int mousseY) {
-        Text text = stack != null ? Serialization.fromJson(stack.getSubNbt("display").getString("Name")).append(" x" + amount) : Text.literal(itemName + " x" + amount);
+    	Text text = stack != null ? stack.getName().copy().append(" x" + amount) : Text.literal(itemName + " x" + amount);
         drawTextWithOptionalUnderline(context, textRenderer, text, TEXT_START_X + TEXT_INDENT, TEXT_START_Y + (index * (LINE_SPACING + textRenderer.fontHeight)), mouseX, mousseY);
         // drawItem adds 150 to the z, which puts our z at 350, above the item in the slot (250) and their text (300) and below the cursor stack (382) and their text (432)
         if (stack != null) {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorDyeColors.java b/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorDyeColors.java
index 639e98ed..97311220 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorDyeColors.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorDyeColors.java
@@ -12,8 +12,8 @@ import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.command.CommandRegistryAccess;
-import net.minecraft.item.DyeableItem;
 import net.minecraft.item.ItemStack;
+import net.minecraft.registry.tag.ItemTags;
 import net.minecraft.text.Text;
 
 public class CustomArmorDyeColors {
@@ -40,7 +40,7 @@ public class CustomArmorDyeColors {
 		}
 
 	if (Utils.isOnSkyblock() && heldItem != null) {
-			if (heldItem.getItem() instanceof DyeableItem) {
+			if (heldItem.isIn(ItemTags.DYEABLE)) {
 				String itemUuid = ItemUtils.getItemUuid(heldItem);
 
 				if (!itemUuid.isEmpty()) {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorTrims.java b/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorTrims.java
index 3434f026..270622ff 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorTrims.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorTrims.java
@@ -34,11 +34,9 @@ import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Optional;
-
 public class CustomArmorTrims {
 	private static final Logger LOGGER = LoggerFactory.getLogger(CustomArmorTrims.class);
-	public static final Object2ObjectOpenHashMap<ArmorTrimId, Optional<ArmorTrim>> TRIMS_CACHE = new Object2ObjectOpenHashMap<>();
+	public static final Object2ObjectOpenHashMap<ArmorTrimId, ArmorTrim> TRIMS_CACHE = new Object2ObjectOpenHashMap<>();
 	private static boolean trimsInitialized = false;
 
 	public static void init() {
@@ -65,7 +63,7 @@ public class CustomArmorTrims {
 					// Something went terribly wrong
 					if (trim == null) throw new IllegalStateException("Trim shouldn't be null! [" + "\"" + material + "\",\"" + pattern + "\"]");
 
-					TRIMS_CACHE.put(new ArmorTrimId(material, pattern), Optional.of(trim));
+					TRIMS_CACHE.put(new ArmorTrimId(material, pattern), trim);
 				}
 			}
 
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/BackpackPreview.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/BackpackPreview.java
index 37de58e6..77cbc953 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/BackpackPreview.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/BackpackPreview.java
@@ -1,6 +1,11 @@
 package de.hysky.skyblocker.skyblock.item.tooltip;
 
+import com.google.gson.JsonParser;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.JsonOps;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+
 import de.hysky.skyblocker.SkyblockerMod;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.skyblock.item.ItemRarityBackgrounds;
@@ -15,18 +20,16 @@ import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.inventory.Inventory;
 import net.minecraft.inventory.SimpleInventory;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NbtCompound;
-import net.minecraft.nbt.NbtInt;
-import net.minecraft.nbt.NbtIo;
-import net.minecraft.nbt.NbtList;
 import net.minecraft.util.Identifier;
-import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Objects;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -61,8 +64,13 @@ public class BackpackPreview {
             String id = MinecraftClient.getInstance().getSession().getUuidOrNull().toString().replaceAll("-", "") + "/" + Utils.getProfileId();
             if (!id.equals(loaded)) {
                 saveDir = SkyblockerMod.CONFIG_DIR