Update to 26.1

common/src/main/java/io/github/skippyall/ruler/command/RuleSuggestionProvider.java

@@ -1,7 +1,9 @@
 package io.github.skippyall.ruler.command;
 
+import com.mojang.brigadier.LiteralMessage;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
 import com.mojang.brigadier.suggestion.SuggestionProvider;
 import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
@@ -12,10 +14,12 @@ import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
 public class RuleSuggestionProvider<S> implements SuggestionProvider<S> {
+    private final SimpleCommandExceptionType INVALID_RULE_PATH = new SimpleCommandExceptionType(new LiteralMessage("Invalid rule path"));
+
     @Override
     public CompletableFuture<Suggestions> getSuggestions(CommandContext<S> commandContext, SuggestionsBuilder suggestionsBuilder) throws CommandSyntaxException {
         return Ruler.getPlatform().runAsync(() -> {
-            String start = suggestionsBuilder.getInput();
+            String start = suggestionsBuilder.getRemaining();
             int last = start.lastIndexOf('.');
 
             String incomplete;

common/src/main/java/io/github/skippyall/ruler/rule/InvalidRulePathException.java

@@ -0,0 +1,15 @@
+package io.github.skippyall.ruler.rule;
+
+public class InvalidRulePathException extends RuntimeException {
+    public InvalidRulePathException(String message) {
+        super(message);
+    }
+
+    public InvalidRulePathException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public InvalidRulePathException(Throwable cause) {
+        super(cause);
+    }
+}

common/src/main/java/io/github/skippyall/ruler/rule/RuleUtils.java

@@ -39,9 +39,9 @@ public class RuleUtils {
                 Arrays.stream(path.split("\\.")).noneMatch(String::isEmpty);
     }
 
-    public static void checkValidRulePath(String path) throws InvalidRuleException {
+    public static void checkValidRulePath(String path) throws InvalidRulePathException {
         if(!isValidRulePath(path)) {
-            throw new InvalidRuleException("\"" + path + "\" is not a valid rule path");
+            throw new InvalidRulePathException("\"" + path + "\" is not a valid rule path");
         }
     }
 
@@ -49,7 +49,7 @@ public class RuleUtils {
         return path.toAbsolutePath().startsWith(getRoot());
     }
 
-    public static void checkDirectory(Path path) throws InvalidRuleException {
+    public static void checkDirectory(Path path) throws InvalidRulePathException {
         if(!isInDirectory(path)) {
             throw new InvalidRuleException("File path \"" + path.toString() + "\" is not in the root rule directory.");
         }
@@ -79,8 +79,15 @@ public class RuleUtils {
     public static String getRulePath(Path filePath) throws InvalidRuleException {
         checkDirectory(filePath);
 
-        Path relative = filePath.toAbsolutePath().relativize(getRoot());
+        Path relative = getRoot().relativize(filePath.toAbsolutePath());
-        String withoutExtension = FileUtils.removeExtension(relative).toString();
+        String relativeString = relative.toString();
+
+        String withoutExtension;
+        if(relativeString.endsWith(".config.json")) {
+            withoutExtension = relativeString.substring(0, relativeString.length() - ".config.json".length());
+        } else {
+            withoutExtension = FileUtils.removeExtension(relativeString);
+        }
         String path = withoutExtension.replace(FileSystems.getDefault().getSeparator(), ".");
 
         checkValidRulePath(path);
@@ -123,7 +130,7 @@ public class RuleUtils {
                             if (Files.isDirectory(path)) {
                                 return directories;
                             } else {
-                                return extension_to_serializer.containsKey(FileUtils.getExtension(path));
+                                return path.endsWith(".config.json") || extension_to_serializer.containsKey(FileUtils.getExtension(path));
                             }
                         })
                         .map(RuleUtils::getRulePath)

fabric/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.16-SNAPSHOT' apply true
+    id 'net.fabricmc.fabric-loom' version "1.16-SNAPSHOT" apply true
     id 'maven-publish'
     id 'com.gradleup.shadow' version '9.4.1'
 }
@@ -29,12 +29,11 @@ repositories {
 dependencies {
     // To change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+    implementation "net.fabricmc:fabric-loader:${project.loader_version}"
-    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+    implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-    modImplementation include("net.kyori:adventure-platform-fabric:${project.adventure_platform_fabric_version}")
+    implementation include("net.kyori:adventure-platform-fabric:${project.adventure_platform_fabric_version}")
 
     implementation project(":common")
     shadowBundle(project(":common"))
@@ -53,7 +52,7 @@ processResources {
     }
 }
 
-def targetJavaVersion = 21
+def targetJavaVersion = 25
 tasks.withType(JavaCompile).configureEach {
     // ensure that the encoding is set to UTF-8, no matter what the system default is
     // this fixes some edge cases with special characters not displaying correctly
@@ -88,10 +87,6 @@ shadowJar {
     relocate("de.themoep.minedown.adventure", "io.github.skippyall.minedown")
 }
 
-remapJar {
-    input.set shadowJar.archiveFile
-}
-
 // configure the maven publication
 publishing {
     publications {

fabric/gradle.properties

@@ -3,17 +3,17 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://modmuss50.me/fabric.html
-	minecraft_version=1.21.8
+	minecraft_version=26.1.2
-	yarn_mappings=1.21.8+build.1
 	loader_version=0.17.2
+	loom_version=1.16-SNAPSHOT
 
 # Mod Properties
-	mod_version = 1.0-SNAPSHOT
+	mod_version = 1.0.0
 	maven_group = io.github.skippyall
 	archives_base_name = ruler-fabric
 
 # Dependencies
 	# check this on https://modmuss50.me/fabric.html
-	fabric_version=0.133.4+1.21.8
+	fabric_version=0.149.0+26.1.2
 
-	adventure_platform_fabric_version=6.6.0
+	adventure_platform_fabric_version=6.9.0

fabric/src/main/java/io/github/skippyall/ruler/fabric/FabricCommandHelper.java

@@ -2,11 +2,11 @@ package io.github.skippyall.ruler.fabric;
 
 import io.github.skippyall.ruler.command.CommandHelper;
 import net.kyori.adventure.audience.Audience;
-import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.commands.CommandSourceStack;
 
-public class FabricCommandHelper implements CommandHelper<ServerCommandSource> {
+public class FabricCommandHelper implements CommandHelper<CommandSourceStack> {
     @Override
-    public Audience toAudience(ServerCommandSource source) {
+    public Audience toAudience(CommandSourceStack source) {
         return source.audience();
     }
 }

fabric/src/main/java/io/github/skippyall/ruler/fabric/FabricPlatform.java

@@ -28,6 +28,6 @@ public class FabricPlatform implements Platform {
 
     @Override
     public <T> CompletableFuture<T> runAsync(Supplier<T> supplier) {
-        return CompletableFuture.supplyAsync(supplier, Util.getMainWorkerExecutor());
+        return CompletableFuture.supplyAsync(supplier, Util.backgroundExecutor());
     }
 }

fabric/src/main/java/io/github/skippyall/ruler/fabric/RulerFabric.java

@@ -5,20 +5,20 @@ import io.github.skippyall.ruler.Ruler;
 import io.github.skippyall.ruler.command.Commands;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
-import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.commands.CommandSourceStack;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class RulerFabric implements ModInitializer {
     public static final String MOD_ID = "ruler";
-    public static final Commands<ServerCommandSource> COMMANDS = new Commands<>(new FabricCommandHelper());
+    public static final Commands<CommandSourceStack> COMMANDS = new Commands<>(new FabricCommandHelper());
     public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
 
     @Override
     public void onInitialize() {
         Ruler.init(new FabricPlatform());
         CommandRegistrationCallback.EVENT.register((dispatcher, access,environment) -> {
-            for(LiteralArgumentBuilder<ServerCommandSource> node : COMMANDS.getCommands()) {
+            for(LiteralArgumentBuilder<CommandSourceStack> node : COMMANDS.getCommands()) {
                 dispatcher.register(node);
             }
         });

fabric/src/main/resources/fabric.mod.json

@@ -20,7 +20,7 @@
   },
   "depends": {
     "fabricloader": ">=${loader_version}",
-    "fabric": "*",
+    "fabric-api": "*",
-    "minecraft": "${minecraft_version}"
+    "minecraft": "~26.1"
   }
 }

gradle.properties

@@ -1,6 +1,5 @@
 brigadier_version=1.3.10
-adventure_version=4.26.1
+adventure_version=5.1.1
-minedown_version=1.7.3-SNAPSHOT
+minedown_version=1.7.6-SNAPSHOT
-slf4j_version=2.0.17
+slf4j_version=2.0.18
-gson_version=2.13.0
+gson_version=2.14.0
-night_config_version=3.6.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
-#Wed Apr 09 17:43:33 CEST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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.
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# This is normally unused
-
+# shellcheck disable=SC2034
-APP_NAME="Gradle"
 APP_BASE_NAME=${0##*/}
-
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -133,22 +132,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
+fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -165,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -193,18 +198,27 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
+
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-#     shell script including quotes and variable substitutions, so put them in
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-#     double quotes to make sure that they get re-expanded; and
+
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
-        org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -26,6 +28,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,32 +59,33 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @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%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal