From d61031b8215bf03d0cf799e168aac166a118865b Mon Sep 17 00:00:00 2001
From: Oth3r <oth3rone@outlook.com>
Date: Wed, 10 Apr 2024 14:05:36 -0500
Subject: [PATCH] fix merge errors

---
 src/main/java/one/oth3r/sit/Sit.java       | 1 +
 src/main/java/one/oth3r/sit/SitClient.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/one/oth3r/sit/Sit.java b/src/main/java/one/oth3r/sit/Sit.java
index 3851da8..7ba996d 100644
--- a/src/main/java/one/oth3r/sit/Sit.java
+++ b/src/main/java/one/oth3r/sit/Sit.java
@@ -16,6 +16,7 @@ import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
 import one.oth3r.sit.file.Config;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/one/oth3r/sit/SitClient.java b/src/main/java/one/oth3r/sit/SitClient.java
index 555bd09..d1404ac 100644
--- a/src/main/java/one/oth3r/sit/SitClient.java
+++ b/src/main/java/one/oth3r/sit/SitClient.java
@@ -22,6 +22,6 @@ public class SitClient implements ClientModInitializer {
     }
     public static CustomPayload sendPackets() {
         Gson gson = new GsonBuilder().disableHtmlEscaping().create();
-        return new Sit.SettingsPayload(gson.toJson(Utl.getHandSettings()));
+        return new Sit.SettingsPayload(gson.toJson(Utl.HandSettings.getHandSettings()));
     }
 }