.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
       matrix:
         # Use these Java versions
         java: [
-          17    # Minimum supported by Minecraft
+          16    # Minimum supported by Minecraft
         ]
         # and run on both Linux and Windows
         os: [ubuntu-20.04, windows-latest]

README.md

@@ -1,5 +1,3 @@
 # Speed Carts
 
 This mod adds the ability to control minecarts with signs.
-
-All you need to do is place a sign beside the rail, and put a number on the first line of the sign that indicates the desired speed of carts, in meters per second.

build.gradle

@@ -1,10 +1,10 @@
 plugins {
-	id 'fabric-loom' version '0.12-SNAPSHOT'
+	id 'fabric-loom' version '0.8-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
+sourceCompatibility = JavaVersion.VERSION_16
-targetCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_16
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
@@ -25,16 +25,10 @@ dependencies {
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
-	// modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-	// Jackson API for config file parsing.
+	// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
-	implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.12.4'
+	// You may need to force-disable transitiveness on them.
-	include group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.12.4'
-	// Include Jackson dependencies since include directive is not transitive:
-	include group: 'org.yaml', name: 'snakeyaml', version: '1.27'
-	include group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.12.4'
-	include group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.12.4'
-	include group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.12.4'
 }
 
 processResources {
@@ -52,8 +46,8 @@ tasks.withType(JavaCompile).configureEach {
 	// If Javadoc is generated, this must be specified in that task too.
 	it.options.encoding = "UTF-8"
 
-	// Minecraft 1.18 (pre-release 2) upwards uses Java 17.
+	// Minecraft 1.17 (21w19a) upwards uses Java 16.
-	it.options.release = 17
+	it.options.release = 16
 }
 
 java {

gradle.properties

@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/versions.html
-	minecraft_version=1.19
+	minecraft_version=1.17.1
-	yarn_mappings=1.19+build.1
+	yarn_mappings=1.17.1+build.14
-	loader_version=0.14.7
+	loader_version=0.11.6
 
 # Mod Properties
-	mod_version = 1.4.0
+	mod_version = 1.0.0
 	maven_group = nl.andrewlalis
 	archives_base_name = speed-carts
 
 # Dependencies
-	fabric_version=0.55.3+1.19
+	fabric_version=0.37.0+1.17

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright 2015 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,101 +17,67 @@
 #
 
 ##############################################################################
-#
+##
-#   Gradle start up script for POSIX generated by Gradle.
+##  Gradle start up script for UN*X
-#
+##
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       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
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
 ##############################################################################
 
 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
+PRG="$0"
-
+# Need this for relative symlinks.
-# Need this for daisy-chained symlinks.
+while [ -h "$PRG" ] ; do
-while
+    ls=`ls -ld "$PRG"`
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    link=`expr "$ls" : '.*-> \(.*\)$'`
-    [ -h "$app_path" ]
+    if expr "$link" : '/.*' > /dev/null; then
-do
+        PRG="$link"
-    ls=$( ls -ld "$app_path" )
+    else
-    link=${ls#*' -> '}
+        PRG=`dirname "$PRG"`"/$link"
-    case $link in             #(
+    fi
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
 done
-
+SAVED="`pwd`"
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
-APP_BASE_NAME=${0##*/}
+APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"
 
 warn () {
     echo "$*"
-} >&2
+}
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-} >&2
+}
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
+case "`uname`" in
-  CYGWIN* )         cygwin=true  ;; #(
+  CYGWIN* )
-  Darwin* )         darwin=true  ;; #(
+    cygwin=true
-  MSYS* | MINGW* )  msys=true    ;; #(
+    ;;
-  NONSTOP* )        nonstop=true ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -121,9 +87,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
     else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -132,7 +98,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD=java
+    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.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -140,95 +106,80 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    case $MAX_FD in #(
+    MAX_FD_LIMIT=`ulimit -H -n`
-      max*)
+    if [ $? -eq 0 ] ; then
-        MAX_FD=$( ulimit -H -n ) ||
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            warn "Could not query maximum file descriptor limit"
+            MAX_FD="$MAX_FD_LIMIT"
-    esac
+        fi
-    case $MAX_FD in  #(
+        ulimit -n $MAX_FD
-      '' | soft) :;; #(
+        if [ $? -ne 0 ] ; then
-      *)
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        ulimit -n "$MAX_FD" ||
+        fi
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    else
-    esac
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
 fi
 
-# Collect all arguments for the java command, stacking in reverse order:
+# For Darwin, add options to specify how the application appears in the dock
-#   * args from the command line
+if $darwin; then
-#   * the main class name
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-#   * -classpath
+fi
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
 
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    # We build the pattern for arguments to be converted via cygpath
-    for arg do
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-        if
+    SEP=""
-            case $arg in                                #(
+    for dir in $ROOTDIRSRAW ; do
-              -*)   false ;;                            # don't mess with options #(
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+        SEP="|"
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
     done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
 fi
 
-# Collect all arguments for the java command;
+# Escape application args
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+save () {
-#     shell script including quotes and variable substitutions, so put them in
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-#     double quotes to make sure that they get re-expanded; and
+    echo " "
-#   * put everything else in single quotes, so that it's not re-expanded.
+}
+APP_ARGS=`save "$@"`
 
-set -- \
+# Collect all arguments for the java command, following the shell quoting and substitution rules
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
 
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,89 +1,89 @@
-@rem
+@rem
-@rem Copyright 2015 the original author or authors.
+@rem Copyright 2015 the original author or authors.
-@rem
+@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
+@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
+@rem You may obtain a copy of the License at
-@rem
+@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
+@rem
-@rem Unless required by applicable law or agreed to in writing, software
+@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
+@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
+@rem limitations under the License.
-@rem
+@rem
-
+
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
+@rem ##########################################################################
-@rem
+@rem
-@rem  Gradle startup script for Windows
+@rem  Gradle startup script for Windows
-@rem
+@rem
-@rem ##########################################################################
+@rem ##########################################################################
-
+
-@rem Set local scope for the variables with windows NT shell
+@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
+if "%OS%"=="Windows_NT" setlocal
-
+
-set DIRNAME=%~dp0
+set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
+set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
+set APP_HOME=%DIRNAME%
-
+
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
+
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
+
-@rem Find java.exe
+@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
+if defined JAVA_HOME goto findJavaFromJavaHome
-
+
-set JAVA_EXE=java.exe
+set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
+%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if "%ERRORLEVEL%" == "0" goto execute
-
+
-echo.
+echo.
-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.
-echo.
+echo.
-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
-echo location of your Java installation.
+echo location of your Java installation.
-
+
-goto fail
+goto fail
-
+
-:findJavaFromJavaHome
+:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
+
-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto execute
-
+
-echo.
+echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
+echo.
-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
-echo location of your Java installation.
+echo location of your Java installation.
-
+
-goto fail
+goto fail
-
+
-:execute
+:execute
-@rem Setup the command line
+@rem Setup the command line
-
+
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
+
-
+
-@rem Execute Gradle
+@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%" org.gradle.wrapper.GradleWrapperMain %*
-
+
-:end
+:end
-@rem End local scope for the variables with windows NT shell
+@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if "%ERRORLEVEL%"=="0" goto mainEnd
-
+
-:fail
+:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
+rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+exit /b 1
-
+
-:mainEnd
+:mainEnd
-if "%OS%"=="Windows_NT" endlocal
+if "%OS%"=="Windows_NT" endlocal
-
+
-:omega
+:omega

src/main/java/nl/andrewlalis/speed_carts/Config.java

@@ -1,73 +0,0 @@
-package nl.andrewlalis.speed_carts;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UncheckedIOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-/**
- * Contains all configuration options and the logic for loading config.
- */
-public class Config {
-	private static final Path CONFIG_FILE = Paths.get("config", "speed_carts.yaml");
-
-	private final double defaultSpeed;
-	private final double minimumSpeed;
-	private final double maximumSpeed;
-	private final String signRegex;
-
-	public Config() {
-		try {
-			this.ensureConfigExists();
-			ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
-			JsonNode configJson = mapper.readTree(Files.newInputStream(CONFIG_FILE));
-			this.defaultSpeed = configJson.get("defaultSpeed").asDouble();
-			this.minimumSpeed = configJson.get("minimumSpeed").asDouble();
-			this.maximumSpeed = configJson.get("maximumSpeed").asDouble();
-			this.signRegex = configJson.get("signRegex").asText();
-		} catch (IOException e) {
-			throw new UncheckedIOException(e);
-		}
-	}
-
-	private void ensureConfigExists() throws IOException {
-		if (!Files.exists(CONFIG_FILE)) {
-			Files.createDirectories(CONFIG_FILE.getParent());
-			OutputStream out = Files.newOutputStream(CONFIG_FILE);
-			InputStream defaultConfigInputStream = SpeedCarts.class.getClassLoader().getResourceAsStream("default_config.yaml");
-			if (defaultConfigInputStream == null) {
-				throw new IOException("Could not load default_config.yaml");
-			}
-			byte[] buffer = new byte[8192];
-			int bytesRead;
-			while ((bytesRead = defaultConfigInputStream.read(buffer)) > 0) {
-				out.write(buffer, 0, bytesRead);
-			}
-			defaultConfigInputStream.close();
-			out.close();
-		}
-	}
-
-	public double getDefaultSpeed() {
-		return defaultSpeed;
-	}
-
-	public double getMinimumSpeed() {
-		return minimumSpeed;
-	}
-
-	public double getMaximumSpeed() {
-		return maximumSpeed;
-	}
-
-	public String getSignRegex() {
-		return signRegex;
-	}
-}

src/main/java/nl/andrewlalis/speed_carts/SpeedCarts.java

@@ -3,11 +3,8 @@ package nl.andrewlalis.speed_carts;
 import net.fabricmc.api.ModInitializer;
 
 public class SpeedCarts implements ModInitializer {
-	public static Config config;
-
 	@Override
 	public void onInitialize() {
-		config = new Config();
 		System.out.println("Speed Carts initialized.");
 	}
 }

src/main/java/nl/andrewlalis/speed_carts/mixin/AbstractMinecartMixin.java

@@ -1,26 +1,24 @@
 package nl.andrewlalis.speed_carts.mixin;
 
 import com.mojang.datafixers.util.Pair;
-import net.minecraft.block.AbstractRailBlock;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
-import net.minecraft.block.PoweredRailBlock;
-import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.SignBlockEntity;
 import net.minecraft.block.enums.RailShape;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
-import net.minecraft.entity.MovementType;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.vehicle.AbstractMinecartEntity;
 import net.minecraft.sound.SoundCategory;
-import net.minecraft.sound.SoundEvents;
+import net.minecraft.sound.SoundEvent;
 import net.minecraft.state.property.Properties;
 import net.minecraft.text.Text;
 import net.minecraft.util.DyeColor;
-import net.minecraft.util.math.*;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.math.Vec3i;
 import net.minecraft.world.World;
-import nl.andrewlalis.speed_carts.SpeedCarts;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -31,7 +29,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.regex.Pattern;
 
 /**
  * Mixin which overrides the default minecart behavior so that we can define a
@@ -39,16 +36,9 @@ import java.util.regex.Pattern;
  */
 @Mixin(AbstractMinecartEntity.class)
 public abstract class AbstractMinecartMixin extends Entity {
-	private static final double DEFAULT_SPEED = SpeedCarts.config.getDefaultSpeed();
+	private static final double DEFAULT_SPEED = 8.0;
-	private static final double MIN_SPEED = SpeedCarts.config.getMinimumSpeed();
+	private static final double MIN_SPEED = 1.0;
-	private static final double MAX_SPEED = SpeedCarts.config.getMaximumSpeed();
+	private static final double MAX_SPEED = 128.0;
-	private static final Pattern SIGN_PATTERN = Pattern.compile(SpeedCarts.config.getSignRegex());
-
-	/**
-	 * Time in game ticks, to wait before attempting to update the cart's speed
-	 * from the same position, after that block/sign has already updated the
-	 * cart's speed just before.
-	 */
 	private static final long SPEED_UPDATE_COOLDOWN = 20 * 3;
 
 	/**
@@ -76,9 +66,9 @@ public abstract class AbstractMinecartMixin extends Entity {
 	}
 
 	@Shadow
-	protected abstract double getMaxSpeed();
+	protected abstract double getMaxOffRailSpeed();
 
-	@Inject(at = @At("HEAD"), method = "getMaxSpeed", cancellable = true)
+	@Inject(at = @At("HEAD"), method = "getMaxOffRailSpeed", cancellable = true)
 	public void getMaxOffRailSpeedOverwrite(CallbackInfoReturnable<Double> cir) {
 		cir.setReturnValue(this.maxSpeedBps / 20.0);
 	}
@@ -101,8 +91,6 @@ public abstract class AbstractMinecartMixin extends Entity {
 	@Inject(at = @At("HEAD"), method = "moveOnRail", cancellable = true)
 	public void moveOnRailOverwrite(BlockPos pos, BlockState state, CallbackInfo ci) {
 		this.updateForSpeedModifiers(pos);
-		this.modifiedMoveOnRail(pos, state);
-		ci.cancel();
 	}
 
 	/**
@@ -119,16 +107,16 @@ public abstract class AbstractMinecartMixin extends Entity {
 			return;
 		}
 
-		for (BlockPos position : this.getPositionsToCheck(pos)) {
+		for (var position : this.getPositionsToCheck(pos)) {
-			BlockEntity blockEntity = this.world.getBlockEntity(position);
+			if (
-			if (blockEntity instanceof SignBlockEntity sign) {
+				this.world.getBlockEntity(position) instanceof SignBlockEntity sign &&
-				if (!sign.getPos().equals(this.lastUpdatedFrom) || this.world.getTime() > this.lastSpeedUpdate + SPEED_UPDATE_COOLDOWN) {
+				(!sign.getPos().equals(this.lastUpdatedFrom) || this.world.getTime() > this.lastSpeedUpdate + SPEED_UPDATE_COOLDOWN)
-					BlockState state = this.world.getBlockState(position);
+			) {
-					Direction dir = (Direction) state.getEntries().get(Properties.HORIZONTAL_FACING);
+				var state = this.world.getBlockState(position);
-					// Only allow free-standing signs or those facing the cart.
+				var dir = (Direction) state.getEntries().get(Properties.HORIZONTAL_FACING);
-					if (dir == null || dir.equals(this.getMovementDirection().getOpposite())) {
+				// Only allow free-standing signs or those facing the cart.
-						if (this.updateSpeedForSign(sign)) return;
+				if (dir == null || dir.equals(this.getMovementDirection().getOpposite())) {
-					}
+					if (this.updateSpeedForSign(sign)) return;
 				}
 			}
 		}
@@ -141,10 +129,7 @@ public abstract class AbstractMinecartMixin extends Entity {
 	 */
 	private boolean updateSpeedForSign(SignBlockEntity sign) {
 		Text text = sign.getTextOnRow(0, false);
-		String s = text.getString();
+		String s = text.asString();
-		if (!SIGN_PATTERN.matcher(s).matches()) {
-			return false;
-		}
 		try {
 			double speed = Double.parseDouble(s);
 			if (speed >= MIN_SPEED && speed <= MAX_SPEED) {
@@ -154,7 +139,7 @@ public abstract class AbstractMinecartMixin extends Entity {
 				if (this.hasPlayerRider()) {
 					PlayerEntity player = (PlayerEntity) this.getFirstPassenger();
 					if (player != null) {
-						player.playSound(SoundEvents.BLOCK_NOTE_BLOCK_BELL, SoundCategory.PLAYERS, 1.0f, 1.0f);
+						player.playSound(new SoundEvent(new Identifier("block.note_block.bell")), SoundCategory.PLAYERS, 1.0f, 1.0f);
 					}
 				}
 				return true;
@@ -193,185 +178,4 @@ public abstract class AbstractMinecartMixin extends Entity {
 		}
 		return positionsToCheck;
 	}
-
-	/**
-	 * Modified version of {@link AbstractMinecartMixin#moveOnRail(BlockPos, BlockState)}
-	 * that allows the minecart to maintain speeds above 32 m/s.
-	 * @param pos The block position of the cart.
-	 * @param state The state of the block the cart is in.
-	 */
-	private void modifiedMoveOnRail(BlockPos pos, BlockState state) {
-		this.fallDistance = 0.0F;
-		double d = this.getX();
-		double e = this.getY();
-		double f = this.getZ();
-		Vec3d vec3d = this.snapPositionToRail(d, e, f);
-		e = pos.getY();
-		boolean onPoweredRail = false;
-		boolean onNormalRail = false;
-		if (state.isOf(Blocks.POWERED_RAIL)) {
-			onPoweredRail = state.get(PoweredRailBlock.POWERED);
-			onNormalRail = !onPoweredRail;
-		}
-
-		double g = 0.0078125D;
-		if (this.isTouchingWater()) {
-			g *= 0.2D;
-		}
-
-		Vec3d velocity = this.getVelocity();
-		RailShape railShape = state.get(((AbstractRailBlock)state.getBlock()).getShapeProperty());
-		switch (railShape) {
-			case ASCENDING_EAST -> {
-				this.setVelocity(velocity.add(-g, 0.0D, 0.0D));
-				++e;
-			}
-			case ASCENDING_WEST -> {
-				this.setVelocity(velocity.add(g, 0.0D, 0.0D));
-				++e;
-			}
-			case ASCENDING_NORTH -> {
-				this.setVelocity(velocity.add(0.0D, 0.0D, g));
-				++e;
-			}
-			case ASCENDING_SOUTH -> {
-				this.setVelocity(velocity.add(0.0D, 0.0D, -g));
-				++e;
-			}
-		}
-
-		velocity = this.getVelocity();
-		Pair<Vec3i, Vec3i> adjacentRailPositions = getAdjacentRailPositionsByShape(railShape);
-		Vec3i vec3i = adjacentRailPositions.getFirst();
-		Vec3i vec3i2 = adjacentRailPositions.getSecond();
-		double h = vec3i2.getX() - vec3i.getX();
-		double i = vec3i2.getZ() - vec3i.getZ();
-		double j = Math.sqrt(h * h + i * i);
-		double k = velocity.x * h + velocity.z * i;
-		if (k < 0.0D) {
-			h = -h;
-			i = -i;
-		}
-
-		double l = Math.min(2.0D, velocity.horizontalLength());
-		// Only consider using Minecraft's default velocity damper logic when going at 'normal' speeds.
-		if (this.maxSpeedBps <= DEFAULT_SPEED) {
-			this.setVelocity(new Vec3d(l * h / j, velocity.y, l * i / j));
-		} else { // Otherwise, simply clamp to the computed max speed in blocks per tick.
-			double speed = this.maxSpeedBps / 20.0;
-			this.setVelocity(new Vec3d(
-					Math.max(Math.min(speed, velocity.x), -speed),
-					velocity.y,
-					Math.max(Math.min(speed, velocity.z), -speed)
-			));
-		}
-
-		Entity entity = this.getFirstPassenger();
-		if (entity instanceof PlayerEntity) {
-			Vec3d playerVelocity = entity.getVelocity();
-			double m = playerVelocity.horizontalLengthSquared();
-			double n = this.getVelocity().horizontalLengthSquared();
-			if (m > 1.0E-4D && n < 0.01D) {
-				this.setVelocity(this.getVelocity().add(playerVelocity.x * 0.1D, 0.0D, playerVelocity.z * 0.1D));
-				onNormalRail = false;
-			}
-		}
-
-		double p;
-		if (onNormalRail) {
-			p = this.getVelocity().horizontalLength();
-			if (p < 0.03D) {
-				this.setVelocity(Vec3d.ZERO);
-			} else {
-				this.setVelocity(this.getVelocity().multiply(0.5D, 0.0D, 0.5D));
-			}
-		}
-
-		p = (double)pos.getX() + 0.5D + (double)vec3i.getX() * 0.5D;
-		double q = (double)pos.getZ() + 0.5D + (double)vec3i.getZ() * 0.5D;
-		double r = (double)pos.getX() + 0.5D + (double)vec3i2.getX() * 0.5D;
-		double s = (double)pos.getZ() + 0.5D + (double)vec3i2.getZ() * 0.5D;
-		h = r - p;
-		i = s - q;
-		double x;
-		double v;
-		double w;
-		if (h == 0.0D) {
-			x = f - (double)pos.getZ();
-		} else if (i == 0.0D) {
-			x = d - (double)pos.getX();
-		} else {
-			v = d - p;
-			w = f - q;
-			x = (v * h + w * i) * 2.0D;
-		}
-
-		d = p + h * x;
-		f = q + i * x;
-		this.setPosition(d, e, f);
-		v = this.hasPassengers() ? 0.75D : 1.0D;
-		w = this.getMaxSpeed();
-		velocity = this.getVelocity();
-		Vec3d movement = new Vec3d(MathHelper.clamp(v * velocity.x, -w, w), 0.0D, MathHelper.clamp(v * velocity.z, -w, w));
-		this.move(MovementType.SELF, movement);
-		if (vec3i.getY() != 0 && MathHelper.floor(this.getX()) - pos.getX() == vec3i.getX() && MathHelper.floor(this.getZ()) - pos.getZ() == vec3i.getZ()) {
-			this.setPosition(this.getX(), this.getY() + (double)vec3i.getY(), this.getZ());
-		} else if (vec3i2.getY() != 0 && MathHelper.floor(this.getX()) - pos.getX() == vec3i2.getX() && MathHelper.floor(this.getZ()) - pos.getZ() == vec3i2.getZ()) {
-			this.setPosition(this.getX(), this.getY() + (double)vec3i2.getY(), this.getZ());
-		}
-
-		this.applySlowdown();
-		Vec3d vec3d4 = this.snapPositionToRail(this.getX(), this.getY(), this.getZ());
-		Vec3d vec3d7;
-		double af;
-		if (vec3d4 != null && vec3d != null) {
-			double aa = (vec3d.y - vec3d4.y) * 0.05D;
-			vec3d7 = this.getVelocity();
-			af = vec3d7.horizontalLength();
-			if (af > 0.0D) {
-				this.setVelocity(vec3d7.multiply((af + aa) / af, 1.0D, (af + aa) / af));
-			}
-
-			this.setPosition(this.getX(), vec3d4.y, this.getZ());
-		}
-
-		int ac = MathHelper.floor(this.getX());
-		int ad = MathHelper.floor(this.getZ());
-		if (ac != pos.getX() || ad != pos.getZ()) {
-			vec3d7 = this.getVelocity();
-			af = vec3d7.horizontalLength();
-			this.setVelocity(af * (double)(ac - pos.getX()), vec3d7.y, af * (double)(ad - pos.getZ()));
-		}
-
-		if (onPoweredRail) {
-			vec3d7 = this.getVelocity();
-			af = vec3d7.horizontalLength();
-			if (af > 0.01D) {
-				this.setVelocity(vec3d7.add(vec3d7.x / af * 0.06D, 0.0D, vec3d7.z / af * 0.06D));
-			} else {
-				Vec3d vec3d8 = this.getVelocity();
-				double ah = vec3d8.x;
-				double ai = vec3d8.z;
-				if (railShape == RailShape.EAST_WEST) {
-					if (this.willHitBlockAt(pos.west())) {
-						ah = 0.02D;
-					} else if (this.willHitBlockAt(pos.east())) {
-						ah = -0.02D;
-					}
-				} else {
-					if (railShape != RailShape.NORTH_SOUTH) {
-						return;
-					}
-
-					if (this.willHitBlockAt(pos.north())) {
-						ai = 0.02D;
-					} else if (this.willHitBlockAt(pos.south())) {
-						ai = -0.02D;
-					}
-				}
-
-				this.setVelocity(ah, vec3d8.y, ai);
-			}
-		}
-	}
 }

src/main/resources/default_config.yaml

@@ -1,16 +0,0 @@
-# Configuration for Speed Carts
-# -----------------------------
-# A server restart is required to apply changes.
-
-# The default speed for all carts in the world, in meters per second.
-defaultSpeed: 8
-
-# The minimum allowable speed limit that can be set, in meters per second.
-minimumSpeed: 1
-
-# The maximum allowable speed limit that can be set, in meters per second.
-maximumSpeed: 128
-
-# The regular expression that's used to determine if a sign should affect the cart's speed.
-# By default, it matches any positive decimal number.
-signRegex: \d+(\.\d+)?

src/main/resources/fabric.mod.json

@@ -23,12 +23,16 @@
     ]
   },
   "mixins": [
-    "speed-carts.mixins.json"
+    "modid.mixins.json"
   ],
 
   "depends": {
-    "fabricloader": ">=0.14.7",
+    "fabricloader": ">=0.11.3",
-    "minecraft": "1.19.x",
+    "fabric": "*",
-    "java": ">=17"
+    "minecraft": "1.17.x",
+    "java": ">=16"
+  },
+  "suggests": {
+    "another-mod": "*"
   }
 }

src/main/resources/modid.mixins.json

@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "nl.andrewlalis.speed_carts.mixin",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "AbstractMinecartMixin"
   ],