chore(deps): update dependency fabric-loader to v0.14.23 (#111)

* deps: update dependency JDA to 5.0.0-beta.12

deps: update dependency fabric-api to 0.86.1+1.19.4

build(deps): update dependency checkstyle to 10.12.1

build(deps): update dependency fabric-loom to 1.3-SNAPSHOT

build(deps): update dependency gradle to 8.2.1

build(deps): update dependency junit to 5.10.0

build(deps): update dependency minotaur to 2.8.2

build(deps): update dependency shadow to 8.1.1

build(deps): update dependency yarn to 1.19.4+build.2

Release-As: v2.0.2+1.19.4

* chore(deps): update dependency JDA to v5.0.0-beta.15 (#99)

chore(deps): update dependency fabric-api to v0.87.1+1.19.4
build(deps): update dependency checkstyle to v10.12.4
build(deps): update dependency fabric-loom to v1.4-SNAPSHOT
build(deps): upgrade gradle wrapper to v8.4
build(deps): update dependency minotaur to v2.8.4

(cherry picked from commit 4fe6afb)

* chore(deps): update dependency fabric-loader to v0.14.23

Refs: a8908dc

refactor: tidy up mixins
Refs: c96bfc3

(cherry picked from commit be5e6d5)

* build: sync `build.gradle`

build.gradle

@@ -2,10 +2,10 @@ plugins {
     id 'java'
     id 'checkstyle'
     id 'maven-publish'
-    id 'com.modrinth.minotaur' version '2.7.5'
+    id 'com.modrinth.minotaur' version '2.8.4'
     id 'com.matthewprenger.cursegradle' version '1.4.0'
-    id 'com.github.johnrengelman.shadow' version '7.1.2'
-    id 'fabric-loom' version '1.2-SNAPSHOT'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'fabric-loom' version '1.4-SNAPSHOT'
 }
 
 allprojects {
@@ -17,9 +17,9 @@ allprojects {
 
     group = project.maven_group
     version = project.mod_version
-    archivesBaseName = project.mod_id
+    base { archivesName = project.mod_id }
 
-    sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
+    java { sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17 }
 
     // Declare dependencies
     configurations { shade }
@@ -30,7 +30,7 @@ allprojects {
         modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
         // Mods
-//        modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+        modRuntimeOnly "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
         // Code Quality
         compileOnly "org.jetbrains:annotations:${project.jetbrains_annotations_version}"

gradle.properties

@@ -8,18 +8,18 @@ mod_version = 2.0.1+1.19.4
 
 # Fabric
 minecraft_version = 1.19.4
-loader_version = 0.14.18
-yarn_mappings = 1.19.4+build.1
-fabric_version = 0.76.0+1.19.4
+loader_version = 0.14.23
+yarn_mappings = 1.19.4+build.2
+fabric_version = 0.87.1+1.19.4
 
 # Dependencies
-checkstyle_version = 10.9.3
+checkstyle_version = 10.12.4
 jetbrains_annotations_version = 24.0.1
-junit_jupiter_version = 5.9.2
+junit_jupiter_version = 5.10.0
 
 # CurseForge
 cf_project_id = 502254
-cf_game_versions = Fabric, Java 17, 1.19.1, 1.19.2, 1.19.3, 1.19.4
+cf_game_versions = Fabric, Java 17, 1.19.4
 cf_relations_required = fabric-api
 cf_relations_optional =
 cf_relations_embedded = cloth-config
@@ -28,7 +28,7 @@ cf_relations_incompatible =
 
 # Modrinth
 mr_project_id = DoVQa3oa
-mr_game_versions = 1.19.1, 1.19.2, 1.19.3, 1.19.4
+mr_game_versions = 1.19.4
 mr_relations_required = P7dR8mSH
 mr_relations_optional =
 mr_relations_incompatible =

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# 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
@@ -130,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=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
@@ -198,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" \

minecord-api/README.md

@@ -1,6 +1,6 @@
-<img alt="Minecord API Icon" src="src/main/resources/assets/minecord-api/icon.svg" height="72">
-
-## Minecord API
-
-Minecord API is a gateway into the [Minecord](../README.md) mod. It equips
-developers with the tools necessary to integrate their mods with Discord.
+<img alt="Minecord API Icon" src="src/main/resources/assets/minecord-api/icon.svg" height="72">
+
+## Minecord API
+
+Minecord API is a gateway into the [Minecord](../README.md) mod. It equips
+developers with the tools necessary to integrate their mods with Discord.

minecord-api/build.gradle

@@ -3,6 +3,7 @@ dependencies {
     modApi include(fabricApi.module("fabric-api-base", project.fabric_version))
     modApi include(fabricApi.module("fabric-lifecycle-events-v1", project.fabric_version))
     modApi include("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") {
+        exclude module: 'fabric-api'
         exclude module: 'modmenu'
     }
     modApi include("eu.pb4:placeholder-api:${project.placeholder_api_version}")

minecord-api/gradle.properties

@@ -10,6 +10,6 @@ mod_version = 2.0.1+1.19.4
 cloth_config_version = 10.0.96
 emoji_java_version = 5.1.1
 fabric_tailor_version = 2.1.1
-jda_version = 5.0.0-beta.9
+jda_version = 5.0.0-beta.15
 log4j_version = 2.20.0
 placeholder_api_version = 2.1.0+1.19.4

minecord-api/src/main/java/me/axieum/mcmod/minecord/impl/MinecordImpl.java

@@ -24,7 +24,6 @@
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint;
-import net.fabricmc.loader.impl.entrypoint.EntrypointUtils;
 
 import me.axieum.mcmod.minecord.api.Minecord;
 import me.axieum.mcmod.minecord.api.addon.MinecordAddon;
@@ -82,7 +81,9 @@ public void onPreLaunch()
             }
 
             // Register any Minecord addons
-            EntrypointUtils.invoke("minecord", MinecordAddon.class, addon -> addon.onInitializeMinecord(builder));
+            FabricLoader.getInstance().invokeEntrypoints(
+                "minecord", MinecordAddon.class, addon -> addon.onInitializeMinecord(builder)
+            );
 
             // Build and login to the client
             JDAEvents.BUILD_CLIENT.invoker().onBuildClient(builder);

minecord-api/src/main/java/me/axieum/mcmod/minecord/mixin/api/MinecraftServerMixin.java

@@ -2,6 +2,7 @@
 
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -19,7 +20,7 @@
 public abstract class MinecraftServerMixin
 {
     // Captured Minecraft server crash report
-    private static @Nullable CrashReport crashReport = null;
+    private static @Unique @Nullable CrashReport crashReport = null;
 
     /**
      * Broadcasts a server shutdown event, be it gracefully or forcefully exited.

minecord-api/src/main/resources/fabric.mod.json

@@ -36,7 +36,7 @@
   "depends": {
     "java": ">=17",
     "minecraft": "~1.19.4",
-    "fabricloader": ">=0.14.17",
+    "fabricloader": ">=0.14.23",
     "fabric-lifecycle-events-v1": "*",
     "placeholder-api": "*"
   },

minecord-api/src/main/resources/minecord.mixins.json

@@ -5,7 +5,6 @@
   "compatibilityLevel": "JAVA_16",
   "mixins": [],
   "server": [
-    "CrashReportAccessor",
     "MinecraftServerMixin"
   ],
   "client": [],

minecord-chat/src/main/java/me/axieum/mcmod/minecord/mixin/chat/TellRawCommandMixin.java

@@ -4,6 +4,7 @@
 import java.util.Collections;
 
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
@@ -85,6 +86,7 @@ private static Collection<ServerPlayerEntity> getPlayers(
      * @param context command context
      * @return true if the {@code /tellraw @a} command was executed
      */
+    @Unique
     private static boolean targetsAllPlayers(CommandContext<ServerCommandSource> context)
     {
         return context.getNodes().size() > 1 && context.getNodes().get(1).getRange().get(context.getInput()).equals(

minecord-chat/src/main/resources/fabric.mod.json

@@ -36,7 +36,7 @@
   "depends": {
     "java": ">=17",
     "minecraft": "~1.19.4",
-    "fabricloader": ">=0.14.17",
+    "fabricloader": ">=0.14.23",
     "fabric-entity-events-v1": "*",
     "fabric-lifecycle-events-v1": "*",
     "fabric-message-api-v1": "*",

minecord-cmds/src/main/resources/fabric.mod.json

@@ -30,7 +30,7 @@
   "depends": {
     "java": ">=17",
     "minecraft": "~1.19.4",
-    "fabricloader": ">=0.14.17",
+    "fabricloader": ">=0.14.23",
     "fabric-lifecycle-events-v1": "*",
     "minecord-api": "*",
     "placeholder-api": "*"

minecord-presence/src/main/resources/fabric.mod.json

@@ -30,7 +30,7 @@
   "depends": {
     "java": ">=17",
     "minecraft": "~1.19.4",
-    "fabricloader": ">=0.14.17",
+    "fabricloader": ">=0.14.23",
     "fabric-lifecycle-events-v1": "*",
     "minecord-api": "*",
     "placeholder-api": "*"

settings.gradle

@@ -7,4 +7,7 @@ pluginManagement {
 }
 
 rootProject.name = 'minecord'
-include 'minecord-api', 'minecord-chat', 'minecord-cmds', 'minecord-presence'
+include 'minecord-api'
+include 'minecord-chat'
+include 'minecord-cmds'
+include 'minecord-presence'

src/main/resources/fabric.mod.json

@@ -25,7 +25,7 @@
   "depends": {
     "java": ">=17",
     "minecraft": "~1.19.4",
-    "fabricloader": ">=0.14.18"
+    "fabricloader": ">=0.14.23"
   },
   "recommends": {
     "minecord-api": "*",