fix: Update to get/add waypoint groups (does not run) #1059

Author: BlayTheNinth

common/src/main/java/net/blay09/mods/waystones/compat/JourneyMapIntegration.java

@@ -14,7 +14,8 @@
 import journeymap.api.v2.common.waypoint.WaypointGroup;
 import net.blay09.mods.balm.api.Balm;
 import net.blay09.mods.waystones.Waystones;
-import net.blay09.mods.waystones.api.*;
+import net.blay09.mods.waystones.api.Waystone;
+import net.blay09.mods.waystones.api.WaystoneTypes;
 import net.blay09.mods.waystones.api.event.WaystoneRemoveReceivedEvent;
 import net.blay09.mods.waystones.api.event.WaystoneUpdateReceivedEvent;
 import net.blay09.mods.waystones.api.event.WaystonesListReceivedEvent;
@@ -73,8 +74,17 @@ public void initialize(IClientAPI iClientAPI) {
         // This fires after all waypoints have been loaded
         ClientEventRegistry.MAPPING_EVENT.subscribe(Waystones.MOD_ID, this::onMappingEvent);
 
-        waystonesGroup = WaypointFactory.createWaypointGroup(Waystones.MOD_ID, "waystones");
-        sharestonesGroup = WaypointFactory.createWaypointGroup(Waystones.MOD_ID, "sharestones");
+        waystonesGroup = api.getWaypointGroupByName(Waystones.MOD_ID, "waystones");
+        if (waystonesGroup == null) {
+            waystonesGroup = WaypointFactory.createWaypointGroup(Waystones.MOD_ID, "waystones");
+            api.addWaypointGroup(waystonesGroup);
+        }
+
+        sharestonesGroup = api.getWaypointGroupByName(Waystones.MOD_ID, "sharestones");
+        if (sharestonesGroup == null) {
+            sharestonesGroup = WaypointFactory.createWaypointGroup(Waystones.MOD_ID, "sharestones");
+            api.addWaypointGroup(sharestonesGroup);
+        }
     }
 
     /**

fabric/dependencies.gradle

@@ -7,8 +7,8 @@ dependencies {
         modLocalRuntime "mezz.jei:jei-$jei_minecraft_version-fabric:$jei_version"
     }
     modCompileOnly group: 'info.journeymap', name: 'journeymap-api-fabric', version: project.journeymap_api_version, changing: true, transitive: false
-	// modLocalRuntime "mysticdrew:common-networking-fabric:$journeymap_networking_version"
-	// modLocalRuntime "curse.maven:journeymap-${project.journeymap_project_id}:${project.journeymap_fabric_file_id}"
+	modLocalRuntime "curse.maven:common-network-806044:6713234"
+	modLocalRuntime "curse.maven:journeymap-${project.journeymap_project_id}:${project.journeymap_fabric_file_id}"
 
     modCompileOnly "com.terraformersmc:modmenu:$modmenu_version"
     modCompileOnly "curse.maven:jade-324717:$jade_fabric_version"

gradle.properties

@@ -18,9 +18,9 @@ modrinth_project_id = LOpKHB2A
 
 # Journeymap
 journeymap_project_id=32274
-journeymap_forge_file_id=5512462
-journeymap_neoforge_file_id=5512464
-journeymap_fabric_file_id=5512463
+journeymap_forge_file_id=6689204
+journeymap_neoforge_file_id=6689206
+journeymap_fabric_file_id=6689205
 journeymap_api_version=2.0.0-1.21.1-SNAPSHOT
 journeymap_networking_version=1.0.11-1.21