diff --git a/annotation-processor/build.gradle b/annotation-processor/build.gradle
index 0cefd6df..089c5451 100644
--- a/annotation-processor/build.gradle
+++ b/annotation-processor/build.gradle
@@ -14,20 +14,20 @@ dependencies {
     annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
     compileOnly 'com.google.auto.service:auto-service:1.1.1'
 
-    implementation 'com.google.code.gson:gson:2.10.1'
-    shadow 'com.google.code.gson:gson:2.10.1'
-    implementation 'com.google.auto:auto-common:1.2.1'
-    shadow 'com.google.auto:auto-common:1.2.1'
-    implementation 'com.google.guava:guava:21.0'
-    shadow 'com.google.guava:guava:21.0'
+    implementation 'com.google.code.gson:gson:2.11.0'
+    shadow 'com.google.code.gson:gson:2.11.0'
+    implementation 'com.google.auto:auto-common:1.2.2'
+    shadow 'com.google.auto:auto-common:1.2.2'
+    implementation 'com.google.guava:guava:33.2.1-jre'
+    shadow 'com.google.guava:guava:33.2.1-jre'
 
     implementation project(":annotations")
     shadow project(":annotations")
     // Shadow annotations
-    implementation 'net.fabricmc:sponge-mixin:0.12.5+'
+    implementation 'net.fabricmc:sponge-mixin:0.15.0+'
     implementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-    implementation 'net.minecraftforge:mergetool:1.1.7'
-    implementation 'net.neoforged:mergetool:2.0.2'
+    implementation 'net.minecraftforge:mergetool:1.2.3'
+    implementation 'net.neoforged:mergetool:2.0.5'
 }
 
 tasks.withType(JavaCompile) {
@@ -57,4 +57,4 @@ spotless {
         removeUnusedImports()
     }
 }
-version = '1.1.4'
+version = '1.1.4'
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index ad91f56c..28ff6e8a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,11 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.6.396" apply false
+    id "dev.architectury.loom" version "1.7.410" apply false
     id "maven-publish"
     id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
-    id 'com.palantir.git-version' version '1.0.0'
-    id 'org.ajoberstar.grgit' version '5.2.0'
-    id 'se.bjurr.gitchangelog.git-changelog-gradle-plugin' version '1.79.0'
+    id 'com.palantir.git-version' version '3.1.0'
+    id 'org.ajoberstar.grgit' version '5.2.2'
+    id 'se.bjurr.gitchangelog.git-changelog-gradle-plugin' version '2.1.2'
     id "com.modrinth.minotaur" version "2.+" apply false
     id("com.diffplug.spotless") version "6.25.0" apply false
     id 'modernfix.common-conventions' apply false
@@ -29,7 +29,7 @@ tasks.withType(JavaCompile).configureEach {
     // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
     // JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
     // We'll use that if it's available, but otherwise we'll use the older option.
-    def targetVersion = 8
+    def targetVersion = 21
     /*
     if (JavaVersion.current().isJava9Compatible()) {
         options.release = targetVersion
@@ -64,4 +64,4 @@ tasks.register('checkCleanTag') {
     }
 }
 
-println "ModernFix: " + version
+println "ModernFix: " + version
\ No newline at end of file
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index c9bbc663..189d5679 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -41,10 +41,10 @@
     "modernfix-common.mixins.json"
   ],
   "depends": {
-    "minecraft": ">=1.16.2",
-    "fabricloader": ">=0.15.0"
+    "minecraft": ">=1.21",
+    "fabricloader": ">=0.16.0"
   },
   "breaks": {
     "dashloader": "<5.0.0-beta.1"
   }
-}
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 72c78867..1e040964 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,8 +1,8 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx2G
 
-junit_version=5.10.0-M1
-mixinextras_version=0.3.2
+junit_version=5.10.3
+mixinextras_version=0.4.0
 
 mod_id=modernfix
 minecraft_version=1.21
@@ -10,19 +10,19 @@ enabled_platforms=fabric,neoforge
 forge_version=21.0.111-beta
 parchment_version=2024.07.07
 refined_storage_version=4392788
-jei_version=19.0.0.9
-rei_version=13.0.678
-ctm_version=1.20.1-1.1.8+4
-kubejs_version=1902.6.0-build.142
-rhino_version=1902.2.2-build.268
+jei_version=19.5.0.47
+rei_version=16.0.744
+ctm_version=1.21-1.2.0+2
+kubejs_version=2001.6.5-build.14
+rhino_version=2100.2.5-build.44
 supported_minecraft_versions=1.21
 
-fabric_loader_version=0.15.11
-fabric_api_version=0.100.0+1.21
+fabric_loader_version=0.16.0
+fabric_api_version=0.100.7+1.21
 
-continuity_version=3.0.0-beta.4+1.20.2
+continuity_version=3.0.0-beta.5+1.21
 
-modmenu_version=7.0.0-beta.2
+modmenu_version=11.0.1
 diagonal_fences_version=4558828
 
 spark_version=4587310
@@ -30,4 +30,4 @@ spark_version=4587310
 use_fabric_api_at_runtime=false
 
 # Look up maven coordinates when changing shadow_version
-shadow_version=7.1.2
+shadow_version=8.1.1
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d64cd491..2c352119 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a80b22ce..e4a5f610 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists
\ No newline at end of file
diff --git a/gradlew b/gradlew
index 1aa94a42..f5feea6d 100755
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/gradlew.bat b/gradlew.bat
index 93e3f59f..9b42019c 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,92 +1,94 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%"=="" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
index ba2a7a8a..073d7838 100644
--- a/neoforge/build.gradle
+++ b/neoforge/build.gradle
@@ -57,7 +57,7 @@ dependencies {
     modCompileOnly files("deps/ctm.jar")
 
     modCompileOnly("curse.maven:supermartijncore-454372:4455391")
-    modCompileOnly("vazkii.patchouli:Patchouli:1.19.2-77")
+    modCompileOnly("vazkii.patchouli:Patchouli:1.20.6-86")
 
     // runtime remapping at home
     for (extraModJar in fileTree(dir: extraModsDir, include: '*.jar')) {
@@ -131,4 +131,4 @@ publishing {
     repositories {
         // Add repositories to publish to here.
     }
-}
+}
\ No newline at end of file
diff --git a/test_agent/build.gradle b/test_agent/build.gradle
index bd589bbd..2095b094 100644
--- a/test_agent/build.gradle
+++ b/test_agent/build.gradle
@@ -8,8 +8,8 @@ group 'org.embeddedt'
 archivesBaseName = 'modernfix-test-agent'
 version '1.0'
 
-sourceCompatibility = '1.8'
-targetCompatibility = '1.8'
+sourceCompatibility = '21'
+targetCompatibility = '21'
 
 repositories {
     mavenCentral()
@@ -36,9 +36,9 @@ shadowJar {
  */
 dependencies {
     compileOnly "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-    implementation "org.ow2.asm:asm-tree:9.1"
-    implementation "org.ow2.asm:asm-commons:9.1"
-    implementation "org.ow2.asm:asm-util:9.1"
+    implementation "org.ow2.asm:asm-tree:9.7"
+    implementation "org.ow2.asm:asm-commons:9.7"
+    implementation "org.ow2.asm:asm-util:9.7"
 
     //implementation('net.bytebuddy:byte-buddy-agent:1.12.22')
 }