Support Minecraft 1.20.6

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     container:
-      image: eclipse-temurin:18-jdk
+      image: eclipse-temurin:21-jdk
       options: --user root
     steps:
       - name: Get version from tag
@@ -23,7 +23,7 @@ jobs:
           echo "current_version=$GITHUB_REF_NAME" >> $GITHUB_OUTPUT
         shell: bash
       - run: apt update && apt install git nodejs -y && git --version
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Get Changelog Entry
@@ -33,7 +33,7 @@ jobs:
           validation_level: warn
           version: ${{ steps.tag_name.outputs.current_version }}
           path: ./CHANGELOG.md
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: gradle/actions/wrapper-validation@v3
       - run: ./gradlew build publishMod --stacktrace
         env:
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.4.6+1.20.6] - 2024-07-13
+
+### Added
+
+- Support Minecraft 1.20.6
+
 ## [1.4.5+1.20.4] - 2024-04-19
 
 ### Added

build.gradle

@@ -1,7 +1,7 @@
 import groovy.json.JsonSlurper
 
 plugins {
-	id 'fabric-loom' version '1.6-SNAPSHOT'
+	id 'fabric-loom' version '1.7-SNAPSHOT'
 	id 'maven-publish'
 	id 'com.modrinth.minotaur' version '2.+'
 }
@@ -55,8 +55,8 @@ processResources {
 }
 
 java {
-	sourceCompatibility = JavaVersion.VERSION_17
-	targetCompatibility = JavaVersion.VERSION_17
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
 }
 
 jar {
@@ -65,7 +65,7 @@ jar {
 
 tasks.withType(JavaCompile).configureEach {
 	it.options.encoding = "UTF-8"
-	it.options.release = 17
+	it.options.release = 21
 }
 
 modrinth {

gradle.properties

@@ -11,18 +11,18 @@ project_slug = staffderpsmod
 modrinth_debug = false
 
 #Current and version
-mod_version = 1.4.5
+mod_version = 1.4.6
 
 #Required malilib version
-malilib_version = 0.18.1
-malilib_mod_version = >=0.18.1
+malilib_version = 0.19.0
+malilib_mod_version = >=0.19.0
 
 # Minecraft, Fabric and mappings versions
-minecraft_version_malilib = 1.20.4
-minecraft_version_mod = 1.20.4
-minecraft_version = 1.20.4
-minecraft_version_dependency = 1.20.4
-mappings_version = 1.20.4+build.1
+minecraft_version_malilib = 1.20.6
+minecraft_version_mod = 1.20.6
+minecraft_version = 1.20.6
+minecraft_version_dependency = 1.20.6
+mappings_version = 1.20.6+build.3
 
-fabric_loader_version = 0.15.9
-mod_menu_version = 9.0.0
+fabric_loader_version = 0.15.10
+mod_menu_version = 10.0.0

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -145,15 +145,15 @@ 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=SC3045
+        # 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=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # 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"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     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, 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" \

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

src/main/java/eu/minemania/staffderpsmod/command/StaffDerpsCommand.java

@@ -10,7 +10,7 @@
 import fi.dy.masa.malilib.util.StringUtils;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.command.CommandRegistryAccess;
-import net.minecraft.command.argument.RegistryEntryArgumentType;
+import net.minecraft.command.argument.RegistryEntryReferenceArgumentType;
 import net.minecraft.command.suggestion.SuggestionProviders;
 import net.minecraft.entity.EntityType;
 import net.minecraft.registry.BuiltinRegistries;
@@ -57,7 +57,7 @@ public static void register(CommandDispatcher<ServerCommandSource> dispatcher)
                         .then(argument("pos", blockPos()).executes(StaffDerpsCommand::tp)))
                 .then(literal("summon").executes(StaffDerpsCommand::summon)
                         .then(argument("pos", blockPos())
-                                .then(argument("entity", RegistryEntryArgumentType.registryEntry(registryAccess, RegistryKeys.ENTITY_TYPE)).suggests(SuggestionProviders.SUMMONABLE_ENTITIES).executes(StaffDerpsCommand::summon))))
+                                .then(argument("entity", RegistryEntryReferenceArgumentType.registryEntry(registryAccess, RegistryKeys.ENTITY_TYPE)).suggests(SuggestionProviders.SUMMONABLE_ENTITIES).executes(StaffDerpsCommand::summon))))
                 .then(literal("scalar").executes(StaffDerpsCommand::scalar)
                         .then(argument("scalar", doubleArg(0, 9)).executes(StaffDerpsCommand::scalar)));
         dispatcher.register(staffderps);
@@ -180,7 +180,7 @@ private static int summon(CommandContext<ServerCommandSource> context)
         try
         {
             blockPos = getBlockPos(context, "pos");
-            entity = RegistryEntryArgumentType.getSummonableEntityType(context, "entity");
+            entity = RegistryEntryReferenceArgumentType.getSummonableEntityType(context, "entity");
             if (entity != null)
             {
                 String command = "summon " + entity.registryKey().getValue().toString() + " " + blockPos.getX() + " " + blockPos.getY() + " " + blockPos.getZ() + " {Attributes:[{Name:generic.maxHealth,Base:1}],Age:-99}";