1 files changed, 58 insertions, 14 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/waypoint/Waypoints.java b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/Waypoints.java
index 8eeae2aa..18096117 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/waypoint/Waypoints.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/Waypoints.java
@@ -2,19 +2,25 @@ package de.hysky.skyblocker.skyblock.waypoint;
 
 import com.google.common.collect.Multimap;
 import com.google.common.collect.MultimapBuilder;
+import com.google.common.collect.Multimaps;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
+import com.google.gson.JsonSyntaxException;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.JsonOps;
 import de.hysky.skyblocker.SkyblockerMod;
+import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.utils.Utils;
+import de.hysky.skyblocker.utils.scheduler.Scheduler;
 import de.hysky.skyblocker.utils.waypoint.WaypointCategory;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.toast.SystemToast;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -24,19 +30,26 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Base64;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
+import java.util.function.Function;
+
+import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
 
 public class Waypoints {
-    private static final Logger LOGGER = LoggerFactory.getLogger(Waypoints.class);
+    public static final Logger LOGGER = LoggerFactory.getLogger(Waypoints.class);
     private static final Codec<List<WaypointCategory>> CODEC = WaypointCategory.CODEC.listOf();
     private static final Codec<List<WaypointCategory>> SKYTILS_CODEC = WaypointCategory.SKYTILS_CODEC.listOf();
+    protected static final SystemToast.Type WAYPOINTS_TOAST_TYPE = new SystemToast.Type();
+
     private static final Path waypointsFile = FabricLoader.getInstance().getConfigDir().resolve(SkyblockerMod.NAMESPACE).resolve("waypoints.json");
-    static final Multimap<String, WaypointCategory> waypoints = MultimapBuilder.hashKeys().arrayListValues().build();
+    protected static final Multimap<String, WaypointCategory> waypoints = MultimapBuilder.hashKeys().arrayListValues().build();
 
     public static void init() {
         loadWaypoints();
         ClientLifecycleEvents.CLIENT_STOPPING.register(Waypoints::saveWaypoints);
         WorldRenderEvents.AFTER_TRANSLUCENT.register(Waypoints::render);
+        ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> dispatcher.register(literal(SkyblockerMod.NAMESPACE).then(literal("waypoints").executes(Scheduler.queueOpenScreenCommand(() -> new WaypointsScreen(MinecraftClient.getInstance().currentScreen))))));
     }
 
     public static void loadWaypoints() {
@@ -49,22 +62,47 @@ public class Waypoints {
         }
     }
 
-    public static List<WaypointCategory> fromSkytilsBase64(String base64) {
-        return fromSkytilsJson(new String(Base64.getDecoder().decode(base64)));
+    public static List<WaypointCategory> fromSkytilsBase64(String base64, String defaultIsland) {
+        try {
+            if (base64.startsWith("<Skytils-Waypoint-Data>(V")) {
+                int version = Integer.parseInt(base64.substring(26, base64.indexOf(')')));
+                if (version == 1) {
+                    return fromSkytilsJson(new String(Base64.getDecoder().decode(base64.substring(base64.indexOf(':') + 1))), defaultIsland);
+                } else {
+                    LOGGER.error("[Skyblocker Waypoints] Unknown Skytils waypoint data version: " + version);
+                }
+            } else return fromSkytilsJson(new String(Base64.getDecoder().decode(base64)), defaultIsland);
+        } catch (NumberFormatException e) {
+            LOGGER.error("[Skyblocker Waypoints] Encountered exception while parsing Skytils waypoint data version", e);
+        } catch (IllegalArgumentException e) {
+            LOGGER.error("[Skyblocker Waypoints] Encountered exception while decoding Skytils waypoint data", e);
+        }
+        return Collections.emptyList();
     }
 
-    public static List<WaypointCategory> fromSkytilsJson(String waypointCategories) {
-        return SKYTILS_CODEC.parse(JsonOps.INSTANCE, SkyblockerMod.GSON.fromJson(waypointCategories, JsonObject.class).getAsJsonArray("categories")).resultOrPartial(LOGGER::error).orElseThrow();
+    public static List<WaypointCategory> fromSkytilsJson(String waypointCategories, String defaultIsland) {
+        JsonArray waypointCategoriesJson;
+        try {
+            waypointCategoriesJson = SkyblockerMod.GSON.fromJson(waypointCategories, JsonObject.class).getAsJsonArray("categories");
+        } catch (JsonSyntaxException e) {
+            JsonObject waypointCategoryJson = new JsonObject();
+            waypointCategoryJson.addProperty("name", "New Category");
+            waypointCategoryJson.addProperty("island", defaultIsland);
+            waypointCategoryJson.add("waypoints", SkyblockerMod.GSON.fromJson(waypointCategories, JsonArray.class));
+            waypointCategoriesJson = new JsonArray();
+            waypointCategoriesJson.add(waypointCategoryJson);
+        }
+        return SKYTILS_CODEC.parse(JsonOps.INSTANCE, waypointCategoriesJson).resultOrPartial(LOGGER::error).orElseThrow();
     }
 
-    public static String toSkytilsBase64(Collection<WaypointCategory> waypointCategories) {
+    public static String toSkytilsBase64(List<WaypointCategory> waypointCategories) {
         return Base64.getEncoder().encodeToString(toSkytilsJson(waypointCategories).getBytes());
     }
 
-    public static String toSkytilsJson(Collection<WaypointCategory> waypointCategories) {
+    public static String toSkytilsJson(List<WaypointCategory> waypointCategories) {
         JsonObject waypointCategoriesJson = new JsonObject();
-        waypointCategoriesJson.add("categories", SKYTILS_CODEC.encodeStart(JsonOps.INSTANCE, List.copyOf(waypointCategories)).resultOrPartial(LOGGER::error).orElseThrow());
-        return SkyblockerMod.GSON.toJson(waypointCategoriesJson);
+        waypointCategoriesJson.add("categories", SKYTILS_CODEC.encodeStart(JsonOps.INSTANCE, waypointCategories).resultOrPartial(LOGGER::error).orElseThrow());
+        return SkyblockerMod.GSON_COMPACT.toJson(waypointCategoriesJson);
     }
 
     public static void saveWaypoints(MinecraftClient client) {
@@ -77,11 +115,17 @@ public class Waypoints {
         }
     }
 
+    public static Multimap<String, WaypointCategory> waypointsDeepCopy() {
+        return waypoints.values().stream().map(WaypointCategory::deepCopy).collect(Multimaps.toMultimap(WaypointCategory::island, Function.identity(), () -> MultimapBuilder.hashKeys().arrayListValues().build()));
+    }
+
     public static void render(WorldRenderContext context) {
-        Collection<WaypointCategory> categories = waypoints.get(Utils.getLocationRaw());
-        for (WaypointCategory category : categories) {
-            if (category != null) {
-                category.render(context);
+        if (SkyblockerConfigManager.get().uiAndVisuals.waypoints.enableWaypoints) {
+            Collection<WaypointCategory> categories = waypoints.get(Utils.getLocationRaw());
+            for (WaypointCategory category : categories) {
+                if (category != null) {
+                    category.render(context);
+                }
             }
         }
     }