From bd73d19674081debd43a6af059243271a3871e03 Mon Sep 17 00:00:00 2001
From: hypherionmc <hypherionmc@gmail.com>
Date: Tue, 19 Nov 2024 19:33:20 +0200
Subject: [PATCH] [BUG] Fix 1.18.2 compile error

---
 .../com/hypherionmc/craterlib/utils/ChatUtils.java    |  1 +
 commit.sha                                            |  2 +-
 .../hypherionmc/craterlib/utils/ChatUtils.java.patch  | 11 +++++------
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java b/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java
index d805ab3..b7535d9 100644
--- a/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java
+++ b/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java
@@ -9,6 +9,7 @@ import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import net.kyori.adventure.text.serializer.json.JSONOptions;
 import net.minecraft.ChatFormatting;
 import net.minecraft.SharedConstants;
+import net.minecraft.Util;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.Style;
 import net.minecraft.network.chat.TextComponent;
diff --git a/commit.sha b/commit.sha
index de3b733..b348b0f 100644
--- a/commit.sha
+++ b/commit.sha
@@ -1 +1 @@
-0a7d569db49dd69e378de08da7c815993f91c523
\ No newline at end of file
+cc26cd450d2ed828eeb7d937a8b5eb92e97afef9
\ No newline at end of file
diff --git a/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch
index 896ff97..ac535d6 100644
--- a/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch
+++ b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch
@@ -8,11 +8,10 @@
  import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier;
  import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer;
  import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer;
-@@ -11,14 +9,10 @@
- import net.kyori.adventure.text.serializer.json.JSONOptions;
+@@ -12,13 +10,10 @@
  import net.minecraft.ChatFormatting;
  import net.minecraft.SharedConstants;
--import net.minecraft.Util;
+ import net.minecraft.Util;
 -// @noplugin
 -import net.minecraft.client.Minecraft;
 -// #noplugin
@@ -25,7 +24,7 @@
  
  public class ChatUtils {
  
-@@ -30,32 +24,20 @@
+@@ -30,32 +25,20 @@
  
      public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) {
          final String serialised = adventureSerializer.serialize(inComponent);
@@ -61,7 +60,7 @@
      }
  
      public static String strip(String inString, String... toStrip) {
-@@ -84,7 +66,7 @@
+@@ -84,7 +67,7 @@
      }
  
      public static net.kyori.adventure.text.Component resolve(String component, boolean formatted) {
@@ -70,7 +69,7 @@
          if (formatted) {
              returnVal = MinecraftSerializer.INSTANCE.serialize(component);
          }
-@@ -112,7 +94,7 @@
+@@ -112,7 +95,7 @@
          if (identifier == null)
              return net.kyori.adventure.text.Component.text("Unknown");