Merge pull request #669 from SkyblockerMod/1.20.5

1.20.5 & 1.20.6

15 files changed, 214 insertions, 160 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorAnimatedDyes.java b/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorAnimatedDyes.java
index b011b2b0..4440cd84 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorAnimatedDyes.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorAnimatedDyes.java
@@ -22,8 +22,8 @@ import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallba
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 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;
 import net.minecraft.util.math.MathHelper;
 
@@ -62,7 +62,7 @@ public class CustomArmorAnimatedDyes {
 		ItemStack heldItem = source.getPlayer().getMainHandStack();
 
 		if (Utils.isOnSkyblock() && heldItem != null && !heldItem.isEmpty()) {
-			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/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..65e1b138 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorTrims.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorTrims.java
@@ -5,8 +5,8 @@ import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.suggestion.SuggestionProvider;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.debug.Debug;
 import de.hysky.skyblocker.events.SkyblockEvents;
 import de.hysky.skyblocker.utils.Constants;
 import de.hysky.skyblocker.utils.ItemUtils;
@@ -17,6 +17,7 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 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.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.command.CommandRegistryAccess;
@@ -25,20 +26,19 @@ import net.minecraft.command.argument.IdentifierArgumentType;
 import net.minecraft.item.ArmorItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.trim.ArmorTrim;
-import net.minecraft.nbt.NbtCompound;
-import net.minecraft.nbt.NbtOps;
+import net.minecraft.item.trim.ArmorTrimMaterial;
+import net.minecraft.item.trim.ArmorTrimPattern;
 import net.minecraft.registry.*;
+import net.minecraft.registry.entry.RegistryEntry.Reference;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 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() {
@@ -48,24 +48,18 @@ public class CustomArmorTrims {
 
 	private static void initializeTrimCache() {
 		ClientPlayerEntity player = MinecraftClient.getInstance().player;
-		if (trimsInitialized || player == null) {
+		FabricLoader loader = FabricLoader.getInstance();
+		if (trimsInitialized || (player == null && !Debug.debugEnabled())) {
 			return;
 		}
 		try {
 			TRIMS_CACHE.clear();
-			DynamicRegistryManager registryManager = player.networkHandler.getRegistryManager();
-			for (Identifier material : registryManager.get(RegistryKeys.TRIM_MATERIAL).getIds()) {
-				for (Identifier pattern : registryManager.get(RegistryKeys.TRIM_PATTERN).getIds()) {
-					NbtCompound compound = new NbtCompound();
-					compound.putString("material", material.toString());
-					compound.putString("pattern", pattern.toString());
-
-					ArmorTrim trim = ArmorTrim.CODEC.parse(RegistryOps.of(NbtOps.INSTANCE, registryManager), compound).resultOrPartial(LOGGER::error).orElse(null);
+			RegistryWrapper.WrapperLookup wrapperLookup = getWrapperLookup(loader, player); 
+			for (Reference<ArmorTrimMaterial> material : wrapperLookup.getWrapperOrThrow(RegistryKeys.TRIM_MATERIAL).streamEntries().toList()) {
+				for (Reference<ArmorTrimPattern> pattern : wrapperLookup.getWrapperOrThrow(RegistryKeys.TRIM_PATTERN).streamEntries().toList()) {
+					ArmorTrim trim = new ArmorTrim(material, pattern);
 
-					// 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.registryKey().getValue(), pattern.registryKey().getValue()), trim);
 				}
 			}
 
@@ -76,6 +70,10 @@ public class CustomArmorTrims {
 		}
 	}
 
+	private static RegistryWrapper.WrapperLookup getWrapperLookup(FabricLoader loader, ClientPlayerEntity player) {
+		return !Debug.debugEnabled() ? player.networkHandler.getRegistryManager() : BuiltinRegistries.createWrapperLookup();
+	}
+
 	private static void registerCommand(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandRegistryAccess registryAccess) {
 		dispatcher.register(ClientCommandManager.literal("skyblocker")
 				.then(ClientCommandManager.literal("custom")
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/CustomItemNames.java b/src/main/java/de/hysky/skyblocker/skyblock/item/CustomItemNames.java
index e47444cf..e1af788e 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/CustomItemNames.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/CustomItemNames.java
@@ -26,7 +26,7 @@ public class CustomItemNames {
 				.then(ClientCommandManager.literal("custom")
 						.then(ClientCommandManager.literal("renameItem")
 								.executes(context -> renameItem(context.getSource(), null))
-								.then(ClientCommandManager.argument("textComponent", TextArgumentType.text())
+								.then(ClientCommandManager.argument("textComponent", TextArgumentType.text(registryAccess))
 										.executes(context -> renameItem(context.getSource(), context.getArgument("textComponent", Text.class)))))));
 	}
 
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/ItemRarityBackgrounds.java b/src/main/java/de/hysky/skyblocker/skyblock/item/ItemRarityBackgrounds.java
index d4bf3d52..8a23ea6d 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/ItemRarityBackgrounds.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/ItemRarityBackgrounds.java
@@ -17,7 +17,6 @@ import it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.item.TooltipContext;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.texture.Sprite;
 import net.minecraft.item.ItemStack;
@@ -48,7 +47,7 @@ public class ItemRarityBackgrounds {
 		ScreenEvents.BEFORE_INIT.register((client, screen, scaledWidth, scaledHeight) -> {
 			String title = screen.getTitle().getString();
 
-			if (Utils.isOnSkyblock() && (title.equals("The Hex") || title.equals("Craft Item") || title.equals("Anvil") || title.equals("Reforge Anvil"))) {
+			if (Utils.isOnSkyblock() && (title.contains("The Hex") || title.equals("Craft Item") || title.equals("Anvil") || title.equals("Reforge Anvil"))) {
 				ScreenEvents.remove(screen).register(screen1 -> CACHE.clear());
 			}
 		});
@@ -74,8 +73,8 @@ public class ItemRarityBackgrounds {
 
 		if (CACHE.containsKey(hashCode)) return CACHE.get(hashCode);
 
-		List<Text> tooltip = stack.getTooltip(player, TooltipContext.BASIC);
-		String[] stringifiedTooltip = tooltip.stream().map(Text::getString).toArray(String[]::new);
+		List<Text> lore = ItemUtils.getLore(stack);
+		String[] stringifiedTooltip = lore.stream().map(Text::getString).toArray(String[]::new);
 
 		for (String rarityString : LORE_RARITIES.keySet()) {
 			if (Arrays.stream(stringifiedTooltip).anyMatch(line -> line.contains(rarityString))) {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/MuseumItemCache.java b/src/main/java/de/hysky/skyblocker/skyblock/item/MuseumItemCache.java
index ae908245..c78724ca 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/MuseumItemCache.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/MuseumItemCache.java
@@ -3,13 +3,16 @@ package de.hysky.skyblocker.skyblock.item;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import com.google.gson.reflect.TypeToken;
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.JsonOps;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.mojang.util.UndashedUuid;
 import de.hysky.skyblocker.SkyblockerMod;
 import de.hysky.skyblocker.utils.Http;
 import de.hysky.skyblocker.utils.Http.ApiResponse;
 import de.hysky.skyblocker.utils.Utils;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 import net.minecraft.client.MinecraftClient;
@@ -21,7 +24,6 @@ import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.lang.reflect.Type;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
@@ -32,8 +34,7 @@ import java.util.concurrent.CompletableFuture;
 public class MuseumItemCache {
 	private static final Logger LOGGER = LoggerFactory.getLogger(MuseumItemCache.class);
 	private static final Path CACHE_FILE = SkyblockerMod.CONFIG_DIR.resolve("museum_item_cache.json");
-	private static final Object2ObjectOpenHashMap<String, Object2ObjectOpenHashMap<String, ProfileMuseumData>> MUSEUM_ITEM_CACHE = new Object2ObjectOpenHashMap<>();
-	private static final Type MAP_TYPE = new TypeToken<Object2ObjectOpenHashMap<String, Object2ObjectOpenHashMap<String, ProfileMuseumData>>>() {}.getType();
+	private static final Map<String, Object2ObjectOpenHashMap<String, ProfileMuseumData>> MUSEUM_ITEM_CACHE = new Object2ObjectOpenHashMap<>();
 	private static final String ERROR_LOG_TEMPLATE = "[Skyblocker] Failed to refresh museum item data for profile {}";
 
 	private static CompletableFuture<Void> loaded;
@@ -45,7 +46,7 @@ public class MuseumItemCache {
 	private static void load(MinecraftClient client) {
 		loaded = CompletableFuture.runAsync(() -> {
 			try (BufferedReader reader = Files.newBufferedReader(CACHE_FILE)) {
-				Object2ObjectOpenHashMap<String, Object2ObjectOpenHashMap<String, ProfileMuseumData>> cachedData = SkyblockerMod.GSON.fromJson(reader, MAP_TYPE);
+				Map<String, Object2ObjectOpenHashMap<String, ProfileMuseumData>> cachedData = ProfileMuseumData.SERIALIZATION_CODEC.parse(JsonOps.INSTANCE, JsonParser.parseReader(reader)).getOrThrow();
 
 				MUSEUM_ITEM_CACHE.putAll(cachedData);
 				LOGGER.info("[Skyblocker] Loaded museum items cache");
@@ -59,7 +60,7 @@ public class MuseumItemCache {
 	private static void save() {
 		CompletableFuture.runAsync(() -> {
 			try (BufferedWriter writer = Files.newBufferedWriter(CACHE_FILE)) {
-				SkyblockerMod.GSON.toJson(MUSEUM_ITEM_CACHE, writer);
+				SkyblockerMod.GSON.toJson(ProfileMuseumData.SERIALIZATION_CODEC.encodeStart(JsonOps.INSTANCE, MUSEUM_ITEM_CACHE).getOrThrow(), writer);
 			} catch (IOException e) {
 				LOGGER.error("[Skyblocker] Failed to save cached museum items!", e);
 			}
@@ -68,7 +69,7 @@ public class MuseumItemCache {
 
 	private static void updateData4ProfileMember(String uuid, String profileId) {
 		CompletableFuture.runAsync(() -> {
-			try (ApiResponse response = Http.sendHypixelRequest("skyblock/museum", "?profile=" + profileId)) {				
+			try (ApiResponse response = Http.sendHypixelRequest("skyblock/museum", "?profile=" + profileId)) {
 				//The request was successful
 				if (response.ok()) {
 					JsonObject profileData = JsonParser.parseString(response.content()).getAsJsonObject();
@@ -86,7 +87,7 @@ public class MuseumItemCache {
 						for (Map.Entry<String, JsonElement> donatedSet : donatedSets.entrySet()) {
 							//Item is plural here because the nbt is a list
 							String itemsData = donatedSet.getValue().getAsJsonObject().get("items").getAsJsonObject().get("data").getAsString();
-							NbtList items = NbtIo.readCompressed(new ByteArrayInputStream(Base64.getDecoder().decode(itemsData)), NbtTagSizeTracker.ofUnlimitedBytes()).getList("i", NbtElement.COMPOUND_TYPE);
+							NbtList items = NbtIo.readCompressed(new ByteArrayInputStream(Base64.getDecoder().decode(itemsData)), NbtSizeTracker.ofUnlimitedBytes()).getList("i", NbtElement.COMPOUND_TYPE);
 
 							for (int i = 0; i < items.size(); i++) {
 								NbtCompound tag = items.getCompound(i).getCompound("tag");
@@ -135,7 +136,7 @@ public class MuseumItemCache {
 	public static void tick(String profileId) {
 		if (loaded.isDone()) {
 			String uuid = UndashedUuid.toString(MinecraftClient.getInstance().getSession().getUuidOrNull());
-			Object2ObjectOpenHashMap<String, ProfileMuseumData> playerData = MUSEUM_ITEM_CACHE.computeIfAbsent(uuid, _uuid -> new Object2ObjectOpenHashMap<>());
+			Map<String, ProfileMuseumData> playerData = MUSEUM_ITEM_CACHE.computeIfAbsent(uuid, _uuid -> new Object2ObjectOpenHashMap<>());
 			playerData.putIfAbsent(profileId, ProfileMuseumData.EMPTY);
 
 			if (playerData.get(profileId).stale()) updateData4ProfileMember(uuid, profileId);
@@ -152,6 +153,17 @@ public class MuseumItemCache {
 	private record ProfileMuseumData(long lastUpdated, ObjectOpenHashSet<String> collectedItemIds) {
 		private static final ProfileMuseumData EMPTY = new ProfileMuseumData(0L, null);
 		private static final long MAX_AGE = 86_400_000;
+		private static final Codec<ProfileMuseumData> CODEC = RecordCodecBuilder.create(instance -> instance.group(
+				Codec.LONG.fieldOf("lastUpdated").forGetter(ProfileMuseumData::lastUpdated),
+				Codec.STRING.listOf()
+						.xmap(ObjectOpenHashSet::new, ObjectArrayList::new)
+						.fieldOf("collectedItemIds")
+						.forGetter(i -> new ObjectOpenHashSet<>(i.collectedItemIds()))
+		).apply(instance, ProfileMuseumData::new));
+		//Mojang's internal Codec implementation uses ImmutableMaps so we'll just xmap those away and type safety while we're at it :')
+		private static final Codec<Map<String, Object2ObjectOpenHashMap<String, ProfileMuseumData>>> SERIALIZATION_CODEC = Codec.unboundedMap(Codec.STRING, Codec.unboundedMap(Codec.STRING, CODEC)
+				.xmap(Object2ObjectOpenHashMap::new, Object2ObjectOpenHashMap::new)
+		).xmap(Object2ObjectOpenHashMap::new, Object2ObjectOpenHashMap::new);
 
 		private boolean stale() {
 			return System.currentTimeMillis() > lastUpdated + MAX_AGE;
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/PlayerHeadHashCache.java b/src/main/java/de/hysky/skyblocker/skyblock/item/PlayerHeadHashCache.java
index 2a1688fc..da832164 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/PlayerHeadHashCache.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/PlayerHeadHashCache.java
@@ -1,7 +1,6 @@
 package de.hysky.skyblocker.skyblock.item;
 
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
 import java.util.Base64;
 import java.util.concurrent.CompletableFuture;
 
@@ -50,8 +49,8 @@ public class PlayerHeadHashCache {
 	//From MinecraftProfileTexture#getHash
 	public static String getSkinHash(String url) {
 		try {
-			return FilenameUtils.getBaseName(new URL(url).getPath());
-		} catch (MalformedURLException e) {
+			return FilenameUtils.getBaseName(new URI(url).getPath());
+		} catch (Exception e) {
 			LOGGER.error("[Skyblocker Player Head Hash Cache] Malformed Skin URL! URL: {}", url, e);
 		}
 
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockCraftingTableScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockCraftingTableScreen.java
index 14ddb238..a09b260a 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockCraftingTableScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockCraftingTableScreen.java
@@ -1,5 +1,7 @@
 package de.hysky.skyblocker.skyblock.item;
 
+import java.time.Duration;
+
 import de.hysky.skyblocker.SkyblockerMod;
 import de.hysky.skyblocker.skyblock.itemlist.ItemListWidget;
 import net.minecraft.client.gui.DrawContext;
@@ -21,6 +23,7 @@ import net.minecraft.screen.AbstractRecipeScreenHandler;
 import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.screen.slot.SlotActionType;
+import net.minecraft.text.OrderedText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 
@@ -54,11 +57,13 @@ public class SkyblockCraftingTableScreen extends HandledScreen<SkyblockCraftingT
             button.setPosition(this.x + 5, this.height / 2 - 49);
             if (moreCraftsButton != null) moreCraftsButton.setPosition(this.x + 174, this.y + 62);
         }));
-        moreCraftsButton = new TexturedButtonWidget(this.x + 174, y + 62, 16, 16, MORE_CRAFTS_TEXTURES,
-                button -> this.onMouseClick(handler.slots.get(26), handler.slots.get(26).id, 0, SlotActionType.PICKUP));
-        moreCraftsButton.setTooltipDelay(250);
-        moreCraftsButton.setTooltip(Tooltip.of(Text.literal("More Crafts")));
-        this.addDrawableChild(moreCraftsButton);
+        if (!handler.mirrorverse) {
+            moreCraftsButton = new TexturedButtonWidget(this.x + 174, y + 62, 16, 16, MORE_CRAFTS_TEXTURES,
+                    button -> this.onMouseClick(handler.slots.get(26), handler.slots.get(26).id, 0, SlotActionType.PICKUP));
+            moreCraftsButton.setTooltipDelay(Duration.ofMillis(250L));
+            moreCraftsButton.setTooltip(Tooltip.of(Text.literal("More Crafts")));
+            this.addDrawableChild(moreCraftsButton);
+        }
         assert (client != null ? client.player : null) != null;
         client.player.currentScreenHandler = handler; // recipe book replaces it with the Dummy one fucking DUMBASS
         this.addSelectableChild(this.recipeBook);
@@ -101,7 +106,7 @@ public class SkyblockCraftingTableScreen extends HandledScreen<SkyblockCraftingT
         int i = this.x;
         int j = (this.height - this.backgroundHeight) / 2;
         context.drawTexture(TEXTURE, i, j, 0, 0, this.backgroundWidth, this.backgroundHeight);
-        context.drawGuiTexture(QUICK_CRAFT, i + 173, j, 0, 25, 84);
+        if (!handler.mirrorverse) context.drawGuiTexture(QUICK_CRAFT, i + 173, j, 0, 25, 84);
     }
 
     @Override
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockCraftingTableScreenHandler.java b/src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockCraftingTableScreenHandler.java
index 04974ade..c3704d8c 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockCraftingTableScreenHandler.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockCraftingTableScreenHandler.java
@@ -1,5 +1,6 @@
 package de.hysky.skyblocker.skyblock.item;
 
+import de.hysky.skyblocker.utils.Utils;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.Inventory;
 import net.minecraft.screen.GenericContainerScreenHandler;
@@ -16,11 +17,22 @@ public class SkyblockCraftingTableScreenHandler extends GenericContainerScreenHa
             28, 29, 30,     34
     };
 
+    private static final int[] riftNormalSlots = new int[]{
+            11, 12, 13,
+            20, 21, 22, 24,
+            29, 30, 31
+    };
+
+    public final boolean mirrorverse;
+
     public SkyblockCraftingTableScreenHandler(ScreenHandlerType<?> type, int syncId, PlayerInventory playerInventory, Inventory inventory, int rows) {
         super(type, syncId, playerInventory, inventory, rows);
+        mirrorverse = Utils.getIslandArea().toLowerCase().contains("mirrorverse");
+        int[] activeSlots = mirrorverse ? riftNormalSlots: normalSlots;
+
         for (int i = 0; i < rows * 9; i++) {
             Slot originalSlot = slots.get(i);
-            if (Arrays.binarySearch(normalSlots, i) >= 0) {
+            if (Arrays.binarySearch(activeSlots, i) >= 0) {
                 int[] coords = getCoords(i);
                 Slot slot = new Slot(originalSlot.inventory, originalSlot.getIndex(), coords[0], coords[1]);
                 slot.id = i;
@@ -45,14 +57,21 @@ public class SkyblockCraftingTableScreenHandler extends GenericContainerScreenHa
     }
 
     private int[] getCoords(int slot) {
-        if (slot == 23) return new int[]{124, 35};
-        if (slot == 16 || slot == 25 || slot == 34) {
-            int y = (slot / 9 - 1) * 18 + 8;
-            return new int[]{174, y};
+        if (mirrorverse) {
+            if (slot == 24) return new int[]{124, 35};
+            int gridX = slot % 9 - 2;
+            int gridY = slot / 9 - 1;
+            return new int[]{30 + gridX * 18, 17 + gridY * 18};
+        } else {
+            if (slot == 23) return new int[]{124, 35};
+            if (slot == 16 || slot == 25 || slot == 34) {
+                int y = (slot / 9 - 1) * 18 + 8;
+                return new int[]{174, y};
+            }
+            int gridX = slot % 9 - 1;
+            int gridY = slot / 9 - 1;
+            return new int[]{30 + gridX * 18, 17 + gridY * 18};
         }
-        int gridX = slot % 9 - 1;
-        int gridY = slot / 9 - 1;
-        return new int[]{30 + gridX * 18, 17 + gridY * 18};
     }
 
     public static class DisabledSlot extends Slot {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/WikiLookup.java b/src/main/java/de/hysky/skyblocker/skyblock/item/WikiLookup.java
index 5815c11f..109e5503 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/WikiLookup.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/WikiLookup.java
@@ -2,7 +2,9 @@ package de.hysky.skyblocker.skyblock.item;
 
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.skyblock.itemlist.ItemRepository;
+import de.hysky.skyblocker.utils.Constants;
 import de.hysky.skyblocker.utils.ItemUtils;
+import de.hysky.skyblocker.utils.Utils;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.InputUtil;
@@ -10,6 +12,7 @@ import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.text.Text;
 import net.minecraft.util.Util;
+import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFW;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,7 +22,6 @@ import java.util.concurrent.CompletableFuture;
 public class WikiLookup {
     private static final Logger LOGGER = LoggerFactory.getLogger(WikiLookup.class);
     public static KeyBinding wikiLookup;
-    private static String id;
 
     public static void init() {
         wikiLookup = KeyBindingHelper.registerKeyBinding(new KeyBinding(
@@ -30,24 +32,15 @@ public class WikiLookup {
         ));
     }
 
-    public static void getSkyblockId(Slot slot) {
-        //Grabbing the skyblock NBT data
-        ItemUtils.getItemIdOptional(slot.getStack()).ifPresent(newId -> id = newId);
-    }
+    public static void openWiki(@NotNull Slot slot, @NotNull PlayerEntity player) {
+        if (!Utils.isOnSkyblock() || !SkyblockerConfigManager.get().general.wikiLookup.enableWikiLookup) return;
 
-    public static void openWiki(Slot slot, PlayerEntity player) {
-        if (SkyblockerConfigManager.get().general.wikiLookup.enableWikiLookup) {
-            getSkyblockId(slot);
-            try {
-                String wikiLink = ItemRepository.getWikiLink(id, player);
-                if (wikiLink != null) CompletableFuture.runAsync(() -> Util.getOperatingSystem().open(wikiLink));
-            } catch (IndexOutOfBoundsException | IllegalStateException e) {
-                LOGGER.error("[Skyblocker] Error while retrieving wiki article...", e);
-                if (player != null) {
-                    player.sendMessage(Text.of("[Skyblocker] Error while retrieving wiki article, see logs..."), false);
-                }
-            }
-        }
+        ItemUtils.getItemIdOptional(slot.getStack())
+                .map(ItemRepository::getWikiLink)
+                .ifPresentOrElse(wikiLink -> CompletableFuture.runAsync(() -> Util.getOperatingSystem().open(wikiLink)).exceptionally(e -> {
+                    LOGGER.error("[Skyblocker] Error while retrieving wiki article...", e);
+                    player.sendMessage(Constants.PREFIX.get().append("Error while retrieving wiki article, see logs..."), false);
+                    return null;
+                }), () -> player.sendMessage(Constants.PREFIX.get().append(Text.translatable("skyblocker.wikiLookup.noArticleFound")), false));
     }
-
 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/AccessoriesHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/AccessoriesHelper.java
index b4d47617..06601f80 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/AccessoriesHelper.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/AccessoriesHelper.java
@@ -75,7 +75,7 @@ public class AccessoriesHelper {
 	private static void load() {
 		loaded = CompletableFuture.runAsync(() -> {
 			try (BufferedReader reader = Files.newBufferedReader(FILE)) {
-				COLLECTED_ACCESSORIES.putAll(ProfileAccessoryData.SERIALIZATION_CODEC.parse(JsonOps.COMPRESSED, JsonParser.parseReader(reader)).result().orElseThrow());
+				COLLECTED_ACCESSORIES.putAll(ProfileAccessoryData.SERIALIZATION_CODEC.parse(JsonOps.COMPRESSED, JsonParser.parseReader(reader)).getOrThrow());
 			} catch (NoSuchFileException ignored) {
 			} catch (Exception e) {
 				LOGGER.error("[Skyblocker Accessory Helper] Failed to load accessory file!", e);
@@ -85,7 +85,7 @@ public class AccessoriesHelper {
 
 	private static void save() {
 		try (BufferedWriter writer = Files.newBufferedWriter(FILE)) {
-			SkyblockerMod.GSON.toJson(ProfileAccessoryData.SERIALIZATION_CODEC.encodeStart(JsonOps.COMPRESSED, COLLECTED_ACCESSORIES).result().orElseThrow(), writer);
+			SkyblockerMod.GSON.toJson(ProfileAccessoryData.SERIALIZATION_CODEC.encodeStart(JsonOps.COMPRESSED, COLLECTED_ACCESSORIES).getOrThrow(), writer);
 		} catch (Exception e) {
 			LOGGER.error("[Skyblocker Accessory Helper] Failed to save accessory file!", e);
 		}
@@ -166,7 +166,7 @@ public class AccessoriesHelper {
 
 	static void refreshData(JsonObject data) {
 		try {
-			ACCESSORY_DATA = Accessory.MAP_CODEC.parse(JsonOps.INSTANCE, data).result().orElseThrow();
+			ACCESSORY_DATA = Accessory.MAP_CODEC.parse(JsonOps.INSTANCE, data).getOrThrow();
 		} catch (Exception e) {
 			LOGGER.error("[Skyblocker Accessory Helper] Failed to parse data!", e);
 		}
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..50772789 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,9 +1,13 @@
 package de.hysky.skyblocker.skyblock.item.tooltip;
 
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import de.hysky.skyblocker.SkyblockerMod;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.skyblock.item.ItemProtection;
 import de.hysky.skyblocker.skyblock.item.ItemRarityBackgrounds;
+import de.hysky.skyblocker.utils.ItemUtils;
 import de.hysky.skyblocker.utils.Utils;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
 import net.minecraft.client.MinecraftClient;
@@ -15,23 +19,26 @@ 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.nbt.NbtOps;
+import net.minecraft.nbt.StringNbtReader;
+import net.minecraft.nbt.visitor.StringNbtWriter;
 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;
+import java.util.stream.Collectors;
 
 public class BackpackPreview {
     private static final Logger LOGGER = LoggerFactory.getLogger(BackpackPreview.class);
+    private static final Identifier ITEM_PROTECTION = new Identifier(SkyblockerMod.NAMESPACE, "textures/gui/item_protection.png");
     private static final Identifier TEXTURE = new Identifier("textures/gui/container/generic_54.png");
     private static final Pattern ECHEST_PATTERN = Pattern.compile("Ender Chest.*\\((\\d+)/\\d+\\)");
     private static final Pattern BACKPACK_PATTERN = Pattern.compile("Backpack.*\\(Slot #(\\d+)\\)");
@@ -61,8 +68,13 @@ public class BackpackPreview {
             String id = MinecraftClient.getInstance().getSession().getUuidOrNull().toString().replaceAll("-", "") + "/" + Utils.getProfileId();
             if (!id.equals(loaded)) {
                 saveDir = SkyblockerMod.CONFIG_DIR.resolve("backpack-preview/" + id);
-                //noinspection ResultOfMethodCallIgnored
-                saveDir.toFile().mkdirs();
+
+                try {
+                    Files.createDirectories(saveDir);
+                } catch (Exception e) {
+                    LOGGER.error("[Skyblocker] Failed to create the backpack preview save directory! Path: {}", saveDir, e);
+                }
+
                 // load storage again because profile id changed
                 loaded = id;
                 loadStorages();
@@ -75,10 +87,10 @@ public class BackpackPreview {
             storages[index] = null;
             Path storageFile = saveDir.resolve(index + ".nbt");
             if (Files.isRegularFile(storageFile)) {
-                try {
-                    storages[index] = Storage.fromNbt(Objects.requireNonNull(NbtIo.read(storageFile)));
+                try (BufferedReader reader = Files.newBufferedReader(storageFile)) {
+                    storages[index] = Storage.CODEC.parse(NbtOps.INSTANCE, StringNbtReader.parse(re