From 9193bb76fe89eaa01f599b5e87e356c8bae36649 Mon Sep 17 00:00:00 2001
From: Pieter <pieter@devpieter.nl>
Date: Thu, 6 Aug 2026 16:54:20 +0200
Subject: [PATCH] Add client utils; Refactor util package

---
 .../client/task/tasks/RunLaterTask.java       |  2 +-
 .../utilize/client/utils/ClientUtils.java     | 27 +++++++++++++++++++
 .../utilize/client/utils/PlayerUtils.java     | 23 ++++++++++++++++
 .../utilize/utils/{common => }/FileUtils.java |  2 +-
 .../utilize/utils/{common => }/MathUtils.java |  2 +-
 .../utils/{common => }/RandomUtils.java       |  2 +-
 6 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 src/client/java/nl/devpieter/utilize/client/utils/ClientUtils.java
 create mode 100644 src/client/java/nl/devpieter/utilize/client/utils/PlayerUtils.java
 rename src/main/java/nl/devpieter/utilize/utils/{common => }/FileUtils.java (97%)
 rename src/main/java/nl/devpieter/utilize/utils/{common => }/MathUtils.java (97%)
 rename src/main/java/nl/devpieter/utilize/utils/{common => }/RandomUtils.java (98%)

diff --git a/src/client/java/nl/devpieter/utilize/client/task/tasks/RunLaterTask.java b/src/client/java/nl/devpieter/utilize/client/task/tasks/RunLaterTask.java
index 0e30e0d..137e771 100644
--- a/src/client/java/nl/devpieter/utilize/client/task/tasks/RunLaterTask.java
+++ b/src/client/java/nl/devpieter/utilize/client/task/tasks/RunLaterTask.java
@@ -2,7 +2,7 @@
 
 import nl.devpieter.utilize.client.task.ITask;
 import nl.devpieter.utilize.client.task.enums.TickResult;
-import nl.devpieter.utilize.utils.common.MathUtils;
+import nl.devpieter.utilize.utils.MathUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.time.Duration;
diff --git a/src/client/java/nl/devpieter/utilize/client/utils/ClientUtils.java b/src/client/java/nl/devpieter/utilize/client/utils/ClientUtils.java
new file mode 100644
index 0000000..7d32ef4
--- /dev/null
+++ b/src/client/java/nl/devpieter/utilize/client/utils/ClientUtils.java
@@ -0,0 +1,27 @@
+package nl.devpieter.utilize.client.utils;
+
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.player.LocalPlayer;
+
+public final class ClientUtils {
+
+    private ClientUtils() {
+    }
+
+    public static boolean isDevEnv() {
+        return FabricLoader.getInstance().isDevelopmentEnvironment();
+    }
+
+    public static Minecraft getClient() {
+        return Minecraft.getInstance();
+    }
+
+    public static boolean hasPlayer() {
+        return getClient().player != null;
+    }
+
+    public static LocalPlayer getPlayer() {
+        return getClient().player;
+    }
+}
diff --git a/src/client/java/nl/devpieter/utilize/client/utils/PlayerUtils.java b/src/client/java/nl/devpieter/utilize/client/utils/PlayerUtils.java
new file mode 100644
index 0000000..8b7b350
--- /dev/null
+++ b/src/client/java/nl/devpieter/utilize/client/utils/PlayerUtils.java
@@ -0,0 +1,23 @@
+package nl.devpieter.utilize.client.utils;
+
+import net.minecraft.network.chat.Component;
+import org.jetbrains.annotations.NotNull;
+
+public final class PlayerUtils {
+
+    private PlayerUtils() {
+    }
+
+    public static void sendMessage(@NotNull Component message, boolean overlay) {
+        if (overlay) sendOverlayMessage(message);
+        else sendSystemMessage(message);
+    }
+
+    public static void sendOverlayMessage(@NotNull Component message) {
+        if (ClientUtils.hasPlayer()) ClientUtils.getPlayer().sendOverlayMessage(message);
+    }
+
+    public static void sendSystemMessage(@NotNull Component message) {
+        if (ClientUtils.hasPlayer()) ClientUtils.getPlayer().sendSystemMessage(message);
+    }
+}
diff --git a/src/main/java/nl/devpieter/utilize/utils/common/FileUtils.java b/src/main/java/nl/devpieter/utilize/utils/FileUtils.java
similarity index 97%
rename from src/main/java/nl/devpieter/utilize/utils/common/FileUtils.java
rename to src/main/java/nl/devpieter/utilize/utils/FileUtils.java
index 28131ad..5d727b8 100644
--- a/src/main/java/nl/devpieter/utilize/utils/common/FileUtils.java
+++ b/src/main/java/nl/devpieter/utilize/utils/FileUtils.java
@@ -1,4 +1,4 @@
-package nl.devpieter.utilize.utils.common;
+package nl.devpieter.utilize.utils;
 
 import java.io.File;
 
diff --git a/src/main/java/nl/devpieter/utilize/utils/common/MathUtils.java b/src/main/java/nl/devpieter/utilize/utils/MathUtils.java
similarity index 97%
rename from src/main/java/nl/devpieter/utilize/utils/common/MathUtils.java
rename to src/main/java/nl/devpieter/utilize/utils/MathUtils.java
index 30a2b45..18cbce1 100644
--- a/src/main/java/nl/devpieter/utilize/utils/common/MathUtils.java
+++ b/src/main/java/nl/devpieter/utilize/utils/MathUtils.java
@@ -1,4 +1,4 @@
-package nl.devpieter.utilize.utils.common;
+package nl.devpieter.utilize.utils;
 
 import java.time.Duration;
 
diff --git a/src/main/java/nl/devpieter/utilize/utils/common/RandomUtils.java b/src/main/java/nl/devpieter/utilize/utils/RandomUtils.java
similarity index 98%
rename from src/main/java/nl/devpieter/utilize/utils/common/RandomUtils.java
rename to src/main/java/nl/devpieter/utilize/utils/RandomUtils.java
index b53506d..2b34f8c 100644
--- a/src/main/java/nl/devpieter/utilize/utils/common/RandomUtils.java
+++ b/src/main/java/nl/devpieter/utilize/utils/RandomUtils.java
@@ -1,4 +1,4 @@
-package nl.devpieter.utilize.utils.common;
+package nl.devpieter.utilize.utils;
 
 public final class RandomUtils {