Merge pull request #669 from SkyblockerMod/1.20.5

1.20.5 & 1.20.6

83 files changed, 897 insertions, 739 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java b/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java
index 5cdca216..e04a30ef 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java
@@ -3,10 +3,11 @@ package de.hysky.skyblocker.skyblock;
 import com.google.gson.JsonObject;
 import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
-import de.hysky.skyblocker.mixin.accessor.HandledScreenAccessor;
-import de.hysky.skyblocker.mixin.accessor.ScreenAccessor;
+import de.hysky.skyblocker.mixins.accessors.HandledScreenAccessor;
+import de.hysky.skyblocker.mixins.accessors.ScreenAccessor;
 import de.hysky.skyblocker.skyblock.item.tooltip.ItemTooltip;
 import de.hysky.skyblocker.skyblock.item.tooltip.TooltipInfoType;
+import de.hysky.skyblocker.utils.ItemUtils;
 import de.hysky.skyblocker.utils.Utils;
 import it.unimi.dsi.fastutil.longs.LongBooleanPair;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
@@ -15,7 +16,6 @@ import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.ingame.GenericContainerScreen;
 import net.minecraft.client.gui.tooltip.Tooltip;
 import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.item.TooltipContext;
 import net.minecraft.item.ItemStack;
 import net.minecraft.screen.GenericContainerScreenHandler;
 import net.minecraft.screen.slot.Slot;
@@ -206,7 +206,7 @@ public class ChestValue {
 	 * Searches for a specific string of characters in the name and lore of an item
 	 */
 	private static String searchLoreFor(ItemStack stack, MinecraftClient client, String searchString) {
-		return stack.getTooltip(client.player, TooltipContext.BASIC).stream().map(Text::getString).filter(line -> line.contains(searchString)).findAny().orElse(null);
+		return ItemUtils.getLoreLineIf(stack, line -> line.contains(searchString));
 	}
 
 	static Text getProfitText(long profit, boolean hasIncompleteData) {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/StatusBarTracker.java b/src/main/java/de/hysky/skyblocker/skyblock/StatusBarTracker.java
index c3483102..c31e2107 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/StatusBarTracker.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/StatusBarTracker.java
@@ -21,6 +21,7 @@ public class StatusBarTracker {
     private int defense = 0;
 
     public void init() {
+        ClientReceiveMessageEvents.ALLOW_GAME.register(this::allowOverlayMessage);
         ClientReceiveMessageEvents.MODIFY_GAME.register(this::onOverlayMessage);
     }
 
@@ -65,6 +66,11 @@ public class StatusBarTracker {
         return str;
     }
 
+    private boolean allowOverlayMessage(Text text, boolean overlay) {
+        onOverlayMessage(text, overlay);
+        return true;
+    }
+
     private Text onOverlayMessage(Text text, boolean overlay) {
         if (!overlay || !Utils.isOnSkyblock() || !SkyblockerConfigManager.get().general.bars.enableBars || Utils.isInTheRift()) {
             return text;
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java b/src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java
index e572d9dc..f7f9836c 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java
@@ -9,6 +9,7 @@ import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.entity.attribute.EntityAttributes;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.util.hit.BlockHitResult;
@@ -27,7 +28,7 @@ public class TeleportOverlay {
         if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().general.teleportOverlay.enableTeleportOverlays && client.player != null && client.world != null) {
             ItemStack heldItem = client.player.getMainHandStack();
             String itemId = ItemTooltip.getInternalNameFromNBT(heldItem, true);
-            NbtCompound extraAttributes = ItemUtils.getExtraAttributes(heldItem);
+            NbtCompound customData = ItemUtils.getCustomData(heldItem);
 
             if (itemId != null) {
                 switch (itemId) {
@@ -42,20 +43,20 @@ public class TeleportOverlay {
                         }
                     }
                     case "ASPECT_OF_THE_END", "ASPECT_OF_THE_VOID" -> {
-                        if (SkyblockerConfigManager.get().general.teleportOverlay.enableEtherTransmission && client.options.sneakKey.isPressed() && extraAttributes != null && extraAttributes.getInt("ethermerge") == 1) {
-                            render(wrc, extraAttributes, 57);
+                        if (SkyblockerConfigManager.get().general.teleportOverlay.enableEtherTransmission && client.options.sneakKey.isPressed() && customData != null && customData.getInt("ethermerge") == 1) {
+                            render(wrc, customData, 57);
                         } else if (SkyblockerConfigManager.get().general.teleportOverlay.enableInstantTransmission) {
-                            render(wrc, extraAttributes, 8);
+                            render(wrc, customData, 8);
                         }
                     }
                     case "ETHERWARP_CONDUIT" -> {
                         if (SkyblockerConfigManager.get().general.teleportOverlay.enableEtherTransmission) {
-                            render(wrc, extraAttributes, 57);
+                            render(wrc, customData, 57);
                         }
                     }
                     case "SINSEEKER_SCYTHE" -> {
                         if (SkyblockerConfigManager.get().general.teleportOverlay.enableSinrecallTransmission) {
-                            render(wrc, extraAttributes, 4);
+                            render(wrc, customData, 4);
                         }
                     }
                     case "NECRON_BLADE", "ASTRAEA", "HYPERION", "SCYLLA", "VALKYRIE" -> {
@@ -71,8 +72,8 @@ public class TeleportOverlay {
     /**
      * Renders the teleport overlay with a given base range and the tuned transmission stat.
      */
-    private static void render(WorldRenderContext wrc, NbtCompound extraAttributes, int baseRange) {
-        render(wrc, extraAttributes != null && extraAttributes.contains("tuned_transmission") ? baseRange + extraAttributes.getInt("tuned_transmission") : baseRange);
+    private static void render(WorldRenderContext wrc, NbtCompound customData, int baseRange) {
+        render(wrc, customData != null && customData.contains("tuned_transmission") ? baseRange + customData.getInt("tuned_transmission") : baseRange);
     }
 
     /**
@@ -83,7 +84,7 @@ public class TeleportOverlay {
     private static void render(WorldRenderContext wrc, int range) {
         if (client.crosshairTarget != null && client.crosshairTarget.getType() == HitResult.Type.BLOCK && client.crosshairTarget instanceof BlockHitResult blockHitResult && client.crosshairTarget.squaredDistanceTo(client.player) < range * range) {
             render(wrc, blockHitResult);
-        } else if (client.interactionManager != null && range > client.interactionManager.getReachDistance()) {
+        } else if (client.interactionManager != null && range > client.player.getAttributeInstance(EntityAttributes.PLAYER_BLOCK_INTERACTION_RANGE).getValue()) {
             @SuppressWarnings("DataFlowIssue")
             HitResult result = client.player.raycast(range, wrc.tickDelta(), false);
             if (result.getType() == HitResult.Type.BLOCK && result instanceof BlockHitResult blockHitResult) {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/WarpAutocomplete.java b/src/main/java/de/hysky/skyblocker/skyblock/WarpAutocomplete.java
index 8862185f..a44a3102 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/WarpAutocomplete.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/WarpAutocomplete.java
@@ -20,7 +20,7 @@ import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.arg
 import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
 
 /**
- * the mixin {@link de.hysky.skyblocker.mixin.CommandTreeS2CPacketMixin}
+ * the mixin {@link de.hysky.skyblocker.mixins.CommandTreeS2CPacketMixin}
  */
 public class WarpAutocomplete {
     private static final Logger LOGGER = LoggerFactory.getLogger(WarpAutocomplete.class);
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakeBagHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakeBagHelper.java
index e0d67fbe..9b2080a3 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakeBagHelper.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakeBagHelper.java
@@ -3,12 +3,12 @@ package de.hysky.skyblocker.skyblock.accessories.newyearcakes;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.utils.render.gui.ColorHighlight;
 import de.hysky.skyblocker.utils.render.gui.ContainerSolver;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import net.minecra