From 3a53e51494523871870491617ae6add9b3fe87fe Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Thu, 13 Jun 2024 21:46:56 -0400
Subject: 1.21

---
 src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java | 4 +++-
 src/main/java/de/hysky/skyblocker/skyblock/end/EnderNodes.java   | 3 ++-
 src/main/java/de/hysky/skyblocker/skyblock/end/TheEnd.java       | 5 +++--
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/main/java/de/hysky/skyblocker/skyblock/end')

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 53c4336e..0d9822fe 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java
@@ -9,6 +9,8 @@ import net.minecraft.component.type.ProfileComponent;
 import net.minecraft.enchantment.Enchantments;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
+import net.minecraft.registry.BuiltinRegistries;
+import net.minecraft.registry.RegistryKeys;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
@@ -35,7 +37,7 @@ public class EndHudWidget extends Widget {
 
     static {
         ENDERMAN_HEAD.set(DataComponentTypes.PROFILE, new ProfileComponent(Optional.of("MHF_Enderman"), Optional.empty(), new PropertyMap()));
-        POPPY.addEnchantment(Enchantments.INFINITY, 1);
+        POPPY.addEnchantment(BuiltinRegistries.createWrapperLookup().getWrapperOrThrow(RegistryKeys.ENCHANTMENT).getOptional(Enchantments.INFINITY).get(), 1);
 
         INSTANCE.setX(SkyblockerConfigManager.get().otherLocations.end.x);
         INSTANCE.setY(SkyblockerConfigManager.get().otherLocations.end.y);
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/end/EnderNodes.java b/src/main/java/de/hysky/skyblocker/skyblock/end/EnderNodes.java
index b0282a69..e5a3a9fa 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/end/EnderNodes.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/end/EnderNodes.java
@@ -1,6 +1,7 @@
 package de.hysky.skyblocker.skyblock.end;
 
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.utils.ColorUtils;
 import de.hysky.skyblocker.utils.Utils;
 import de.hysky.skyblocker.utils.scheduler.Scheduler;
 import de.hysky.skyblocker.utils.waypoint.Waypoint;
@@ -117,7 +118,7 @@ public class EnderNodes {
         private long lastConfirmed;
 
         private EnderNode(BlockPos pos) {
-            super(pos, () -> SkyblockerConfigManager.get().uiAndVisuals.waypoints.waypointType, DyeColor.CYAN.getColorComponents(), false);
+            super(pos, () -> SkyblockerConfigManager.get().uiAndVisuals.waypoints.waypointType, ColorUtils.getFloatComponents(DyeColor.CYAN), false);
         }
 
         private void updateParticles() {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/end/TheEnd.java b/src/main/java/de/hysky/skyblocker/skyblock/end/TheEnd.java
index ac961dd8..872d2823 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/end/TheEnd.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/end/TheEnd.java
@@ -5,6 +5,7 @@ import com.google.gson.JsonObject;
 import de.hysky.skyblocker.SkyblockerMod;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.events.HudRenderEvents;
+import de.hysky.skyblocker.utils.ColorUtils;
 import de.hysky.skyblocker.utils.Utils;
 import de.hysky.skyblocker.utils.waypoint.Waypoint;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientChunkEvents;
@@ -73,7 +74,7 @@ public class TheEnd {
         });
 
 
-        HudRenderEvents.AFTER_MAIN_HUD.register((drawContext, tickDelta) -> {
+        HudRenderEvents.AFTER_MAIN_HUD.register((drawContext, tickCounter) -> {
             if (!Utils.isInTheEnd()) return;
             if (!SkyblockerConfigManager.get().otherLocations.end.hudEnabled) return;
 
@@ -268,7 +269,7 @@ public class TheEnd {
 
     public record ProtectorLocation(int x, int z, Text name, Waypoint waypoint) {
         public ProtectorLocation(int x, int z, Text name) {
-            this(x, z, name, new Waypoint(new BlockPos(x, 0, z), Waypoint.Type.WAYPOINT, DyeColor.MAGENTA.getColorComponents()));
+            this(x, z, name, new Waypoint(new BlockPos(x, 0, z), Waypoint.Type.WAYPOINT, ColorUtils.getFloatComponents(DyeColor.MAGENTA)));
         }
     }
 }
-- 
cgit