Merge pull request #625 from AzureAaron/ordered-waypoints

Ordered Waypoints
SkyblockerMod · Apr 6, 2024 · eadb318 · eadb318
2 parents bbf544b + 9d7f6ae
commit eadb318
Show file tree

Hide file tree

Showing 6 changed files with 515 additions and 2 deletions.
diff --git a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
@@ -40,6 +40,7 @@
 import de.hysky.skyblocker.skyblock.tabhud.util.PlayerListMgr;
 import de.hysky.skyblocker.skyblock.waypoint.FairySouls;
 import de.hysky.skyblocker.skyblock.waypoint.MythologicalRitual;
+import de.hysky.skyblocker.skyblock.waypoint.OrderedWaypoints;
 import de.hysky.skyblocker.skyblock.waypoint.Relics;
 import de.hysky.skyblocker.utils.ApiUtils;
 import de.hysky.skyblocker.utils.NEURepoManager;
@@ -109,6 +110,7 @@ public void onInitializeClient() {
         FairySouls.init();
         Relics.init();
         MythologicalRitual.init();
+        OrderedWaypoints.init();
         BackpackPreview.init();
         QuickNav.init();
         ItemCooldowns.init();

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorDyeColors.java b/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorDyeColors.java
@@ -73,7 +73,7 @@ private static int customizeDyeColor(FabricClientCommandSource source, String he
 		return Command.SINGLE_SUCCESS;
 	}
 
-	private static boolean isHexadecimalColor(String s) {
+	public static boolean isHexadecimalColor(String s) {
 		return s.replace("#", "").chars().allMatch(c -> "0123456789ABCDEFabcdef".indexOf(c) >= 0) && s.replace("#", "").length() == 6;
 	}
 }