diff --git a/build.gradle b/build.gradle
index bf5b99e..6f6b66b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,5 +2,5 @@ apply from: "https://jfmods.gitlab.io/scripts/jfmod.gradle"
 
 dependencies {
     include modImplementation("io.gitlab.jfronny.libjf:libjf-base:${project.jfapi_version}") // for JfCommons
-    modImplementation "com.terraformersmc:modmenu:4.0.0-beta.4"
+    modImplementation "com.terraformersmc:modmenu:4.0.5"
 }
diff --git a/gradle.properties b/gradle.properties
index 857b1b0..31a5479 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,11 +1,11 @@
 # https://fabricmc.net/develop
-minecraft_version=1.19
+minecraft_version=1.19.1
 yarn_mappings=build.1
-loader_version=0.14.6
+loader_version=0.14.8
 maven_group=io.gitlab.jfronny
 archives_base_name=resclone
 
-fabric_version=0.55.1+1.19
-jfapi_version=2.9.1
+fabric_version=0.58.5+1.19.1
+jfapi_version=2.10.0
 
-modrinth_id=kVAQyCLX
\ No newline at end of file
+modrinth_id=resclone
\ No newline at end of file
diff --git a/src/main/java/io/gitlab/jfronny/resclone/mixin/GameOptionsMixin.java b/src/client/java/io/gitlab/jfronny/resclone/mixin/GameOptionsMixin.java
similarity index 100%
rename from src/main/java/io/gitlab/jfronny/resclone/mixin/GameOptionsMixin.java
rename to src/client/java/io/gitlab/jfronny/resclone/mixin/GameOptionsMixin.java
diff --git a/src/client/resources/resclone.client.mixins.json b/src/client/resources/resclone.client.mixins.json
new file mode 100644
index 0000000..77ab234
--- /dev/null
+++ b/src/client/resources/resclone.client.mixins.json
@@ -0,0 +1,12 @@
+{
+  "required": true,
+  "minVersion": "0.8",
+  "package": "io.gitlab.jfronny.resclone.mixin",
+  "compatibilityLevel": "JAVA_8",
+  "client": [
+    "GameOptionsMixin"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}
diff --git a/src/main/java/io/gitlab/jfronny/resclone/Resclone.java b/src/main/java/io/gitlab/jfronny/resclone/Resclone.java
index d34a0a7..7b0649c 100644
--- a/src/main/java/io/gitlab/jfronny/resclone/Resclone.java
+++ b/src/main/java/io/gitlab/jfronny/resclone/Resclone.java
@@ -22,7 +22,7 @@ public class Resclone implements ModInitializer, RescloneApi {
     public static final Map<String, PackFetcher> FETCHER_INSTANCES = new LinkedHashMap<>();
     public static final Set<PackProcessor> PROCESSORS = new LinkedHashSet<>();
     public static final Set<PackMetaLoaded> DOWNLOADED_PACKS = new LinkedHashSet<>();
-    public static final Set<PackMetaLoaded> NEW_PACKS = new LinkedHashSet<>();
+    public static final Set<PackMetaLoaded> NEW_PACKS = new LinkedHashSet<>(); // Client-only!
 
     public static final String MOD_ID = "resclone";
     public static final Logger LOGGER = Logger.forName(MOD_ID);
@@ -119,8 +119,7 @@ public class Resclone implements ModInitializer, RescloneApi {
                     PackFetcher.Result fr = FETCHER_INSTANCES.get(meta.fetcher).get(meta.source, cacheDir, meta.forceDownload);
                     p = new PackMetaLoaded(fr.downloadPath(), meta.name, meta.forceEnable);
                     metas.add(p);
-                    if (isNew)
-                        NEW_PACKS.add(p);
+                    if (isNew && FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) NEW_PACKS.add(p);
                     if (fr.freshDownload()) {
                         //Process
                         Map<String, String> props = new HashMap<>();
diff --git a/src/main/java/io/gitlab/jfronny/resclone/processors/PruneVanillaProcessor.java b/src/main/java/io/gitlab/jfronny/resclone/processors/PruneVanillaProcessor.java
index 2d47168..cebc344 100644
--- a/src/main/java/io/gitlab/jfronny/resclone/processors/PruneVanillaProcessor.java
+++ b/src/main/java/io/gitlab/jfronny/resclone/processors/PruneVanillaProcessor.java
@@ -3,7 +3,7 @@ package io.gitlab.jfronny.resclone.processors;
 import io.gitlab.jfronny.resclone.*;
 import io.gitlab.jfronny.resclone.api.PackProcessor;
 import io.gitlab.jfronny.resclone.util.io.PathPruneVisitor;
-import net.minecraft.client.MinecraftClient;
+import net.minecraft.server.MinecraftServer;
 import org.apache.commons.io.IOUtils;
 
 import java.io.IOException;
@@ -15,7 +15,7 @@ import java.nio.file.StandardOpenOption;
 public class PruneVanillaProcessor implements PackProcessor {
     @Override
     public void process(FileSystem p) throws Exception {
-        ClassLoader cl = MinecraftClient.class.getClassLoader();
+        ClassLoader cl = MinecraftServer.class.getClassLoader();
         try {
             if (Files.isDirectory(p.getPath("/assets/minecraft"))) {
                 Files.walkFileTree(p.getPath("/assets/minecraft"), new PathPruneVisitor((s) -> {
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 2e8ef3c..79c8b5e 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -20,10 +20,15 @@
     ]
   },
   "mixins": [
-    "resclone.mixins.json"
+    "resclone.mixins.json",
+    {
+      "config": "resclone.client.mixins.json",
+      "environment": "client"
+    }
   ],
   "depends": {
     "fabricloader": ">=0.12.0",
-    "minecraft": "*"
+    "minecraft": "*",
+    "libjf-base": "*"
   }
 }
diff --git a/src/main/resources/resclone.mixins.json b/src/main/resources/resclone.mixins.json
index bf31782..d09311d 100644
--- a/src/main/resources/resclone.mixins.json
+++ b/src/main/resources/resclone.mixins.json
@@ -4,8 +4,7 @@
   "package": "io.gitlab.jfronny.resclone.mixin",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
-    "FileResourcePackProviderMixin",
-    "GameOptionsMixin"
+    "FileResourcePackProviderMixin"
   ],
   "injectors": {
     "defaultRequire": 1