From 6eb7fa4c8bf24a87005d6c7c9754c46834c65450 Mon Sep 17 00:00:00 2001
From: Klesti Selimaj <klesti.selimay@icloud.com>
Date: Fri, 6 Mar 2026 12:45:02 +0100
Subject: [PATCH] Transitioned mod helpers to common

---
 .../src/main/java/org/saturnclient/modules/HudMod.java    | 0
 .../main/java/org/saturnclient/modules/ModDimensions.java | 0
 .../main/java/org/saturnclient/modules/ModManager.java    | 8 --------
 .../src/main/java/org/saturnclient/modules/Module.java    | 0
 .../main/java/org/saturnclient/modules/ModuleDetails.java | 0
 .../java/org/saturnclient/saturnclient/SaturnClient.java  | 8 ++++++++
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename {versions/1.21.4 => common}/src/main/java/org/saturnclient/modules/HudMod.java (100%)
 rename {versions/1.21.4 => common}/src/main/java/org/saturnclient/modules/ModDimensions.java (100%)
 rename {versions/1.21.4 => common}/src/main/java/org/saturnclient/modules/ModManager.java (82%)
 rename {versions/1.21.4 => common}/src/main/java/org/saturnclient/modules/Module.java (100%)
 rename {versions/1.21.4 => common}/src/main/java/org/saturnclient/modules/ModuleDetails.java (100%)

diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/HudMod.java b/common/src/main/java/org/saturnclient/modules/HudMod.java
similarity index 100%
rename from versions/1.21.4/src/main/java/org/saturnclient/modules/HudMod.java
rename to common/src/main/java/org/saturnclient/modules/HudMod.java
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/ModDimensions.java b/common/src/main/java/org/saturnclient/modules/ModDimensions.java
similarity index 100%
rename from versions/1.21.4/src/main/java/org/saturnclient/modules/ModDimensions.java
rename to common/src/main/java/org/saturnclient/modules/ModDimensions.java
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/ModManager.java b/common/src/main/java/org/saturnclient/modules/ModManager.java
similarity index 82%
rename from versions/1.21.4/src/main/java/org/saturnclient/modules/ModManager.java
rename to common/src/main/java/org/saturnclient/modules/ModManager.java
index 9a2ef26..e4e068e 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/modules/ModManager.java
+++ b/common/src/main/java/org/saturnclient/modules/ModManager.java
@@ -1,6 +1,5 @@
 package org.saturnclient.modules;
 
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -32,13 +31,6 @@ public class ModManager {
     public static void init() {
         // Pre-filter enabled modules to avoid checking every tick
         updateEnabledModules();
-
-        ClientTickEvents.END_CLIENT_TICK.register(client -> {
-            // Only iterate over enabled modules
-            for (Module m : ENABLED_MODS) {
-                m.tick();
-            }
-        });
     }
 
     public static synchronized void updateEnabledModules() {
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/Module.java b/common/src/main/java/org/saturnclient/modules/Module.java
similarity index 100%
rename from versions/1.21.4/src/main/java/org/saturnclient/modules/Module.java
rename to common/src/main/java/org/saturnclient/modules/Module.java
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/ModuleDetails.java b/common/src/main/java/org/saturnclient/modules/ModuleDetails.java
similarity index 100%
rename from versions/1.21.4/src/main/java/org/saturnclient/modules/ModuleDetails.java
rename to common/src/main/java/org/saturnclient/modules/ModuleDetails.java
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java
index 52a556e..03ff53c 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java
@@ -2,6 +2,7 @@ package org.saturnclient.saturnclient;
 
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.util.math.MatrixStack;
@@ -82,6 +83,13 @@ public class SaturnClient implements ModInitializer {
             }
         });
 
+        ClientTickEvents.END_CLIENT_TICK.register(client -> {
+            // Only iterate over enabled modules
+            for (org.saturnclient.modules.Module m : ModManager.ENABLED_MODS) {
+                m.tick();
+            }
+        });
+
         KeyInputHandler.register();
         Emotes.initialize();
         if (ServiceClient.authenticate()) {