update to 1.20.4

CHANGELOG.md

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

build.gradle

@@ -1,7 +1,7 @@
 import groovy.json.JsonSlurper
 
 plugins {
-	id 'fabric-loom' version '1.4-SNAPSHOT'
+	id 'fabric-loom' version '1.6-SNAPSHOT'
 	id 'maven-publish'
 	id 'com.modrinth.minotaur' version '2.+'
 }
@@ -76,6 +76,9 @@ modrinth {
 	gameVersions = [project.minecraft_version]
 	loaders = loadersResult
 	uploadFile = remapJar
+	dependencies {
+		required.project "malilib"
+	}
 	debugMode = project.modrinth_debug.toBoolean()
 }
 

gradle.properties

@@ -11,18 +11,18 @@ project_slug = staffderpsmod
 modrinth_debug = false
 
 #Current and version
-mod_version = 1.4.4
+mod_version = 1.4.5
 
 #Required malilib version
-malilib_version = 0.17.0
-malilib_mod_version = >=0.17.0
+malilib_version = 0.18.1
+malilib_mod_version = >=0.18.1
 
 # Minecraft, Fabric and mappings versions
-minecraft_version_malilib = 1.20.2
-minecraft_version_mod = 1.20.2
-minecraft_version = 1.20.2
-minecraft_version_dependency = 1.20.2
-mappings_version = 1.20.2+build.2
+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
 
-fabric_loader_version = 0.14.23
-mod_menu_version = 8.0.0
+fabric_loader_version = 0.15.9
+mod_menu_version = 9.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.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# 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"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,26 +131,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=SC3045 
+        # shellcheck disable=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=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,6 +198,10 @@ if "$cygwin" || "$msys" ; then
     done
 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

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

@@ -7,7 +7,6 @@
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.command.CommandException;
 import net.minecraft.text.*;
 import net.minecraft.util.Formatting;
 
@@ -61,10 +60,6 @@ public static int executeCommand(StringReader reader, String command)
         {
             return player.networkHandler.getCommandDispatcher().execute(reader, new FakeCommandSource(player));
         }
-        catch (CommandException e)
-        {
-            ClientCommandManager.sendError(e.getTextMessage());
-        }
         catch (CommandSyntaxException e)
         {
             ClientCommandManager.sendError(Texts.toText(e.getRawMessage()));

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

@@ -11,7 +11,7 @@ public class FakeCommandSource extends ServerCommandSource
 {
     public FakeCommandSource(PlayerEntity player)
     {
-        super(player, player.getPos(), player.getRotationClient(), null, 0, player.getEntityName(), player.getName(), null, player);
+        super(player, player.getPos(), player.getRotationClient(), null, 0, player.getName().toString(), player.getDisplayName(), null, player);
     }
 
     @Override