Fix dependencies and implement reading JourneyMap shared waypoints in Xaero's

Author: BluSpring

build.gradle.kts

@@ -17,6 +17,7 @@ repositories {
 	maven("https://maven.parchmentmc.org")
 	maven("https://mvn.devos.one/snapshots")
 	maven("https://maven.bawnorton.com/releases") // MixinSquared
+	maven("https://maven.ladysnake.org/releases")
 }
 
 //All dependencies and their versions are in ./gradle/libs.versions.toml
@@ -49,6 +50,7 @@ dependencies {
 
 	modImplementation("io.github.moonlight_maya:Grappling-Hook:0.7.3-1.21.1")
 	modImplementation("com.moulberry:lattice:1.2.10")
+	modImplementation("maven.modrinth:xaeros-minimap:25.2.10_Fabric_1.21")
 }
 
 // Write the version to the fabric.mod.json

gradle/libs.versions.toml

@@ -9,7 +9,7 @@ mixinconstraints = "1.0.9"
 mixinsquared = "0.3.3"
 modmenu = "11.0.3"
 sodium = "mc1.21.1-0.6.13-fabric"
-flashback = "0.36.0"
+flashback = "hQkBepoB"
 trinkets = "3.10.0"
 
 [libraries]
@@ -24,7 +24,7 @@ minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
 modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu" }
 sodium = { module = "maven.modrinth:sodium", version.ref = "sodium" }
 flashback = { module = "maven.modrinth:flashback", version.ref = "flashback" }
-trinkets = { module = "maven.modrinth:trinkets", version.ref = "trinkets" }
+trinkets = { module = "dev.emi:trinkets", version.ref = "trinkets" }
 
 [bundles]
 dev_mods = [ "sodium", "modmenu" ]

src/main/java/one/devos/nautical/winterssummerfixes/mixin/compat/client/xaeros_minimap/ClientEventsMixin.java

@@ -0,0 +1,32 @@
+package one.devos.nautical.winterssummerfixes.mixin.compat.client.xaeros_minimap;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.moulberry.mixinconstraints.annotations.IfModLoaded;
+import net.minecraft.network.chat.Component;
+import one.devos.nautical.winterssummerfixes.utils.ConversionKt;
+import org.apache.commons.lang3.StringUtils;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import xaero.common.events.ClientEvents;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@IfModLoaded("xaerominimap")
+@Mixin(ClientEvents.class)
+public abstract class ClientEventsMixin {
+    @WrapOperation(method = "handleChatMessage", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/chat/Component;getString()Ljava/lang/String;"))
+    private String tryConvertToXaerosFormat(Component instance, Operation<String> original) {
+        var string = original.call(instance);
+
+        // JM format: [x:0,z:0]
+        if (string.contains("[") && string.contains("]") && string.contains(",")) {
+            return ConversionKt.convertJourneyMapToXaeros(string);
+        }
+
+        return string;
+    }
+}

src/main/kotlin/one/devos/nautical/winterssummerfixes/utils/Conversion.kt

@@ -1,5 +1,53 @@
 package one.devos.nautical.winterssummerfixes.utils
 
+import org.apache.commons.lang3.StringUtils
+
 fun convertHexStringAsAnInt(hexString: String): Int {
     return hexString.removePrefix("#").toInt(16)
+}
+
+fun convertJourneyMapToXaeros(text: String): String {
+    val raw = text.replace(Regex("[\\[\\]]"), "")
+
+    val nameMatch = StringUtils.substringsBetween(text, "\"", "\"")
+    var name = if (nameMatch != null && nameMatch.size > 0)
+        nameMatch[0]
+    else
+        null
+
+    var x: Int? = null
+    var y = 63
+    var z: Int? = null
+    var dim = "minecraft:overworld"
+
+    for (part in raw.split(",")) {
+        if (part.contains(":")) {
+            val prop = part.split(":")
+            if (prop.size == 2 || (prop.size == 3 && part.contains("dim:"))) {
+                val key = prop[0].trim().lowercase()
+                val value = prop[1].trim()
+
+                try {
+                    when (key) {
+                        "x" -> x = value.toInt()
+                        "y" -> y = value.toInt()
+                        "z" -> z = value.toInt()
+                        "dim" -> dim = "$value:${prop[2].trim()}"
+                        "name" -> {
+                            if (name == null)
+                                name = value.replace("\"", "")
+                        }
+                    }
+                } catch (_: Throwable) {}
+            }
+        }
+    }
+
+    if (x == null || z == null)
+        return text
+
+    if (name == null)
+        name = "$x,$z"
+
+    return "xaero-waypoint:$name:W:$x:$y:$z:16:false:0:Internal-dim%${dim.replace(":", "$")}-waypoints"
 }

src/main/resources/winterssummerfixes.mixins.json

@@ -1,16 +1,17 @@
 {
-  "required": true,
-  "package": "one.devos.nautical.winterssummerfixes.mixin",
-  "compatibilityLevel": "JAVA_21",
-  "plugin": "com.moulberry.mixinconstraints.ConstraintsMixinPlugin",
-  "injectors": {
-    "defaultRequire": 1
-  },
-  "mixins": [
-  ],
-  "client": [
-    "compat.client.flashback.FlashbackReplayIncompatibleModsMixin",
-    "compat.client.flashback.FlashbackReplayIncompatibleModsTitleScreenMixin",
-    "compat.client.limitsgrapple.LimitsGrappleInGameHudColorMixin"
+    "required": true,
+    "package": "one.devos.nautical.winterssummerfixes.mixin",
+    "compatibilityLevel": "JAVA_21",
+    "plugin": "com.moulberry.mixinconstraints.ConstraintsMixinPlugin",
+    "injectors": {
+        "defaultRequire": 1
+    },
+    "mixins": [
+        "compat.client.xaeros_minimap.ClientEventsMixin"
+    ],
+    "client": [
+        "compat.client.flashback.FlashbackReplayIncompatibleModsMixin",
+        "compat.client.flashback.FlashbackReplayIncompatibleModsTitleScreenMixin",
+        "compat.client.limitsgrapple.LimitsGrappleInGameHudColorMixin"
   ]
 }