Migrate to SimpleWaypoints

build.gradle

@@ -61,6 +61,7 @@ dependencies {
 
 	include modImplementation("dev.xpple:clientarguments:${project.clientarguments_version}")
 	include modImplementation("dev.xpple:betterconfig-fabric:${project.betterconfig_version}")
+	include modImplementation("dev.xpple:simplewaypoints:${project.simplewaypoints_version}")
 
 	includedLibrary "com.seedfinding:mc_feature:${project.seedfinding_feature_version}"
 	includedLibrary "com.seedfinding:mc_biome:${project.seedfinding_biome_version}"
@@ -181,6 +182,7 @@ modrinth {
 	dependencies {
 		required.project 'fabric-api'
 		embedded.project 'betterconfig'
+		embedded.project 'simplewaypoints'
 	}
 }
 tasks.modrinth.onlyIf {

gradle.properties

@@ -7,12 +7,12 @@ org.gradle.jvmargs=-Xmx2G
 	minecraft_version_dependency=>=1.21.6 <=1.21.8
 	minecraft_version_list=1.21.6,1.21.7,1.21.8
 	minecraft_version_list_presentable=1.21.6 - 1.21.8
-	loader_version=0.16.14
-	loom_version=1.10-SNAPSHOT
+	loader_version=0.17.2
+	loom_version=1.11-SNAPSHOT
 
 	# check these on https://maven.parchmentmc.org/org/parchmentmc/data/
-	parchment_mcversion=1.21.6
-	parchment_version=2025.06.29
+	parchment_mcversion=1.21.8
+	parchment_version=2025.07.20
 
 # Mod Properties
 	mod_version=2.11.3
@@ -21,17 +21,18 @@ org.gradle.jvmargs=-Xmx2G
 
 # Dependencies
 	# also check this on https://fabricmc.net/develop/
-	fabric_version=0.129.0+1.21.8
-	clientarguments_version=1.11.3
+	fabric_version=0.131.0+1.21.8
+	clientarguments_version=1.11.4
 	betterconfig_version=2.4.0
+	simplewaypoints_version=1.0.0-alpha.4
 	seedfinding_core_version=1.210.0
 	seedfinding_biome_version=1.171.1
 	seedfinding_feature_version=1.171.10
 	seedfinding_seed_version=1.171.2
 	latticg_version=1.07
 	mapping_io_version=0.7.1
 	devauth_version=1.2.1
-	checkstyle_version=10.26.1
+	checkstyle_version=11.0.0
 
 	jazzer_junit_version=0.24.0
-	junit_version=5.13.2
+	junit_version=5.13.4

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

src/main/java/net/earthcomputer/clientcommands/ClientCommands.java

@@ -7,6 +7,7 @@
 import com.mojang.logging.LogUtils;
 import dev.xpple.betterconfig.api.BetterConfigAPI;
 import dev.xpple.betterconfig.api.ModConfigBuilder;
+import dev.xpple.simplewaypoints.api.SimpleWaypointsAPI;
 import net.earthcomputer.clientcommands.command.*;
 import net.earthcomputer.clientcommands.event.ClientConnectionEvents;
 import net.earthcomputer.clientcommands.features.CommandExecutionCustomPayload;
@@ -15,6 +16,7 @@
 import net.earthcomputer.clientcommands.features.PlayerRandCracker;
 import net.earthcomputer.clientcommands.features.Relogger;
 import net.earthcomputer.clientcommands.features.ServerBrandManager;
+import net.earthcomputer.clientcommands.features.Waypoints;
 import net.earthcomputer.clientcommands.render.RenderQueue;
 import net.earthcomputer.clientcommands.util.MappingsHelper;
 import net.fabricmc.api.ClientModInitializer;
@@ -70,6 +72,9 @@ public void onInitializeClient() {
             }
         });
 
+        Waypoints.migrateWaypoints();
+        SimpleWaypointsAPI.getInstance().registerCommandAlias("cwaypoint");
+
         MappingsHelper.load();
 
         // Registration
@@ -82,7 +87,6 @@ public void onInitializeClient() {
         FishingCracker.registerEvents();
         PlayerRandCracker.registerEvents();
         ServerBrandManager.registerEvents();
-        WaypointCommand.registerEvents();
     }
 
     private static void setupScrambleWindowTitle() {
@@ -186,7 +190,6 @@ public static void registerCommands(CommandDispatcher<FabricClientCommandSource>
         UsageTreeCommand.register(dispatcher);
         UuidCommand.register(dispatcher);
         VarCommand.register(dispatcher);
-        WaypointCommand.register(dispatcher);
         WeatherCommand.register(dispatcher);
         WhisperEncryptedCommand.register(dispatcher);
         WikiCommand.register(dispatcher);