diff --git a/Common/src/main/resources/terrablender.mixins.json b/Common/src/main/resources/terrablender.mixins.json
index 4c6e8a4..135d086 100644
--- a/Common/src/main/resources/terrablender.mixins.json
+++ b/Common/src/main/resources/terrablender.mixins.json
@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "terrablender.mixin",
-  "compatibilityLevel": "JAVA_21",
+  "compatibilityLevel": "JAVA_17",
   "refmap": "${refmap_target}refmap.json",
   "mixins": [
     "MixinBiomeSource",
diff --git a/Forge/build.gradle b/Forge/build.gradle
index 64d7a26..721d99d 100644
--- a/Forge/build.gradle
+++ b/Forge/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id "net.minecraftforge.gradle" version "[6.0,6.2.)"
-    id "org.spongepowered.mixin" version "0.7-SNAPSHOT"
+    id "net.minecraftforge.gradle" version "[6.0.24,6.2.)"
+    id "org.spongepowered.mixin" version '0.7.+'
     id "com.matthewprenger.cursegradle" version "1.4.0"
     id "com.modrinth.minotaur" version "2.+"
 }
@@ -10,6 +10,7 @@ base.archivesName.set("${mod_name}-forge")
 minecraft {
     mappings channel: 'official', version: minecraft_version
     accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
+    reobf = false
 
     runs {
         client {
@@ -41,12 +42,9 @@ dependencies {
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
     compileOnly project(":Common")
     annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
-}
 
-// Workaround for SpongePowered/MixinGradle#38
-afterEvaluate {
-    tasks.configureReobfTaskForReobfJar.mustRunAfter(tasks.compileJava)
-    tasks.configureReobfTaskForReobfJarJar.mustRunAfter(tasks.compileJava)
+    // Hack fix for now, force jopt-simple to be exactly 5.0.4 because Mojang ships that version, but some transtive dependencies request 6.0+
+    implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } }
 }
 
 mixin {
@@ -77,8 +75,6 @@ processResources {
     }
 }
 
-jar.finalizedBy('reobfJar')
-
 curseforge {
     apiKey = project.findProperty('curseApiKey') ?: 'unset'
     project {
diff --git a/Forge/src/main/resources/terrablender_forge.mixins.json b/Forge/src/main/resources/terrablender_forge.mixins.json
index 902c224..b22099c 100644
--- a/Forge/src/main/resources/terrablender_forge.mixins.json
+++ b/Forge/src/main/resources/terrablender_forge.mixins.json
@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "terrablender.mixin",
-  "compatibilityLevel": "JAVA_21",
+  "compatibilityLevel": "JAVA_17",
   "refmap": "terrablender.refmap.json",
   "mixins": [
   ],