From e49efa3ba0efa1440885eea56aaee6799dd03d3f Mon Sep 17 00:00:00 2001
From: Jonathan Hiles <jonathan@hil.es>
Date: Mon, 17 Jun 2024 20:50:06 +0100
Subject: [PATCH] chore(deps): update dependencies to Minecraft 1.21 (#143)

---
 gradle.properties                                      | 10 +++++-----
 minecord-api/gradle.properties                         |  6 +++---
 .../impl/placeholder/MinecordPlaceholders.java         |  4 ++--
 .../mcmod/minecord/api/util/StringUtilsTests.java      |  4 ++--
 .../callback/minecraft/ServerLifecycleCallback.java    |  5 ++++-
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index e7f9090..a2ec20c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,10 +7,10 @@ mod_version = 2.1.0+1.20.6
 ## {x-release-please-end}
 
 # Fabric
-minecraft_version = 1.20.6
+minecraft_version = 1.21
 loader_version = 0.15.11
-yarn_mappings = 1.20.6+build.1
-fabric_version = 0.97.8+1.20.6
+yarn_mappings = 1.21+build.2
+fabric_version = 0.100.1+1.21
 
 # Dependencies
 checkstyle_version = 10.15.0
@@ -19,7 +19,7 @@ junit_jupiter_version = 5.10.2
 
 # CurseForge
 cf_project_id = 502254
-cf_game_versions = Fabric, Java 21, 1.20.5, 1.20.6
+cf_game_versions = Fabric, Java 21, 1.21
 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.20.5, 1.20.6
+mr_game_versions = 1.20.5, 1.21
 mr_relations_required = P7dR8mSH
 mr_relations_optional =
 mr_relations_incompatible =
diff --git a/minecord-api/gradle.properties b/minecord-api/gradle.properties
index aee72b7..8692d78 100644
--- a/minecord-api/gradle.properties
+++ b/minecord-api/gradle.properties
@@ -7,9 +7,9 @@ mod_version = 2.0.1+1.20.6
 ## {x-release-please-end}
 
 # Dependencies
-cloth_config_version = 14.0.126
+cloth_config_version = 15.0.127
 emoji_java_version = 5.1.1
-fabric_tailor_version = 2.3.1
+fabric_tailor_version = 2.4.2
 jda_version = 5.0.0-beta.23
 log4j_version = 2.23.1
-placeholder_api_version = 2.4.0-pre.1+1.20.5
+placeholder_api_version = 2.4.0-pre.2+1.21
diff --git a/minecord-api/src/main/java/me/axieum/mcmod/minecord/impl/placeholder/MinecordPlaceholders.java b/minecord-api/src/main/java/me/axieum/mcmod/minecord/impl/placeholder/MinecordPlaceholders.java
index ffadd42..bbf0cc3 100644
--- a/minecord-api/src/main/java/me/axieum/mcmod/minecord/impl/placeholder/MinecordPlaceholders.java
+++ b/minecord-api/src/main/java/me/axieum/mcmod/minecord/impl/placeholder/MinecordPlaceholders.java
@@ -21,7 +21,7 @@ private MinecordPlaceholders() {}
     public static void register()
     {
         // minecord:player (or server)
-        Placeholders.register(new Identifier("minecord", "player"), (ctx, arg) ->
+        Placeholders.register(Identifier.of("minecord", "player"), (ctx, arg) ->
             PlaceholderResult.value(
                 ctx.player() != null
                     ? ctx.player().getDisplayName().getString()
@@ -29,7 +29,7 @@ public static void register()
             )
         );
         // minecord:world
-        Placeholders.register(new Identifier("minecord", "world"), (ctx, arg) ->
+        Placeholders.register(Identifier.of("minecord", "world"), (ctx, arg) ->
             PlaceholderResult.value(ctx.world() != null ? StringUtils.getWorldName(ctx.world()) : "∞")
         );
     }
diff --git a/minecord-api/src/test/java/me/axieum/mcmod/minecord/api/util/StringUtilsTests.java b/minecord-api/src/test/java/me/axieum/mcmod/minecord/api/util/StringUtilsTests.java
index ee566d7..c3557ab 100644
--- a/minecord-api/src/test/java/me/axieum/mcmod/minecord/api/util/StringUtilsTests.java
+++ b/minecord-api/src/test/java/me/axieum/mcmod/minecord/api/util/StringUtilsTests.java
@@ -93,11 +93,11 @@ public void deriveWorldName()
     {
         assertEquals(
             "Overworld",
-            StringUtils.deriveWorldName(new Identifier("minecraft", "overworld"))
+            StringUtils.deriveWorldName(Identifier.of("minecraft", "overworld"))
         );
         assertEquals(
             "Deep Dark",
-            StringUtils.deriveWorldName(new Identifier("extrautils", "the_deep_dark"))
+            StringUtils.deriveWorldName(Identifier.of("extrautils", "the_deep_dark"))
         );
     }
 }
diff --git a/minecord-chat/src/main/java/me/axieum/mcmod/minecord/impl/chat/callback/minecraft/ServerLifecycleCallback.java b/minecord-chat/src/main/java/me/axieum/mcmod/minecord/impl/chat/callback/minecraft/ServerLifecycleCallback.java
index 8dd577e..56de036 100644
--- a/minecord-chat/src/main/java/me/axieum/mcmod/minecord/impl/chat/callback/minecraft/ServerLifecycleCallback.java
+++ b/minecord-chat/src/main/java/me/axieum/mcmod/minecord/impl/chat/callback/minecraft/ServerLifecycleCallback.java
@@ -3,6 +3,7 @@
 import java.awt.Color;
 import java.io.File;
 import java.lang.management.ManagementFactory;
+import java.nio.file.Path;
 import java.time.Duration;
 import java.util.Collections;
 import java.util.HashMap;
@@ -143,7 +144,9 @@ public void onServerShutdown(MinecraftServer server, @Nullable CrashReport crash
             // The server stopped due to an error
             } else {
                 // Fetch the crash report file
-                final Optional<File> file = Optional.ofNullable(crashReport.getFile()).filter(File::exists);
+                final Optional<File> file = Optional.ofNullable(crashReport.getFile())
+                    .map(Path::toFile)
+                    .filter(File::exists);
 
                 // Dispatch the message
                 DiscordDispatcher.embed(