diff --git a/build.gradle.kts b/build.gradle.kts
index 3309d4e..d8be885 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("jfmod") version "1.5-SNAPSHOT"
+    id("jfmod") version "1.6-SNAPSHOT"
 }
 
 loom {
@@ -9,13 +9,14 @@ loom {
 allprojects { group = "io.gitlab.jfronny" }
 base.archivesName = "resclone"
 
-val fabricVersion = "0.91.1+1.20.4"
-val modmenuVersion = "9.0.0-pre.1"
+val modmenuVersion = "10.0.0-beta.1"
+val commonsVersion = "1.7-SNAPSHOT"
 jfMod {
-    minecraftVersion = "1.20.4"
+    minecraftVersion = "1.20.5"
     yarn("build.1")
-    loaderVersion = "0.15.0"
-    libJfVersion = "3.14.1"
+    loaderVersion = "0.15.10"
+    libJfVersion = "3.15.4"
+    fabricApiVersion = "0.97.6+1.20.5"
 
     modrinth {
         projectId = "resclone"
@@ -28,12 +29,19 @@ jfMod {
 }
 
 dependencies {
-    include(modImplementation("io.gitlab.jfronny.libjf:libjf-base:${jfMod.libJfVersion.get()}")!!) // for JfCommons
-    include(modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2:${jfMod.libJfVersion.get()}")!!) // for JfCommons
-    include(modImplementation(fabricApi.module("fabric-resource-loader-v0", fabricVersion))!!)
+    include(modImplementation("io.gitlab.jfronny.libjf:libjf-base")!!) // for JfCommons
+    include(modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2")!!) // for JfCommons
+    include(modImplementation("net.fabricmc.fabric-api:fabric-resource-loader-v0")!!)
+
+    compileOnly("io.gitlab.jfronny:commons-serialize-generator-annotations:$commonsVersion")
+    annotationProcessor("io.gitlab.jfronny:commons-serialize-generator:$commonsVersion")
 
     // Dev env
-    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny:${jfMod.libJfVersion.get()}")
-    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${jfMod.libJfVersion.get()}")
+    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny")
+    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil")
     modLocalRuntime("com.terraformersmc:modmenu:$modmenuVersion")
+    // for modmenu
+    modLocalRuntime("net.fabricmc.fabric-api:fabric-resource-loader-v0")
+    modLocalRuntime("net.fabricmc.fabric-api:fabric-screen-api-v1")
+    modLocalRuntime("net.fabricmc.fabric-api:fabric-key-binding-api-v1")
 }
diff --git a/src/main/resources/resclone.accesswidener b/src/main/resources/resclone.accesswidener
index bf983de..c155d23 100644
--- a/src/main/resources/resclone.accesswidener
+++ b/src/main/resources/resclone.accesswidener
@@ -1,5 +1,5 @@
 accessWidener	v2	named
 
 accessible class net/minecraft/resource/ZipResourcePack$ZipFileWrapper
-extendable method net/minecraft/resource/ZipResourcePack <init> (Ljava/lang/String;Lnet/minecraft/resource/ZipResourcePack$ZipFileWrapper;ZLjava/lang/String;)V
+accessible method net/minecraft/resource/ZipResourcePack <init> (Lnet/minecraft/resource/ResourcePackInfo;Lnet/minecraft/resource/ZipResourcePack$ZipFileWrapper;Ljava/lang/String;)V
 accessible method net/minecraft/resource/ZipResourcePack$ZipFileWrapper <init> (Ljava/io/File;)V
\ No newline at end of file
diff --git a/src/main/resources/resclone.mixins.json b/src/main/resources/resclone.mixins.json
index d09311d..75bfca2 100644
--- a/src/main/resources/resclone.mixins.json
+++ b/src/main/resources/resclone.mixins.json
@@ -2,7 +2,6 @@
   "required": true,
   "minVersion": "0.8",
   "package": "io.gitlab.jfronny.resclone.mixin",
-  "compatibilityLevel": "JAVA_8",
   "mixins": [
     "FileResourcePackProviderMixin"
   ],