diff --git a/build.gradle.kts b/build.gradle.kts
index 3f79eef..9d33bc9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 import java.net.URI
 
 plugins {
-    kotlin("jvm") version "1.9.23"
+    kotlin("jvm") version "2.1.20"
     `java-gradle-plugin`
     `maven-publish`
 }
@@ -9,6 +9,16 @@ plugins {
 version = "${project.properties["version"]}" + if (project.hasProperty("version_snapshot")) "-SNAPSHOT" else ""
 group = "${project.properties["maven_group"]}"
 
+java {
+    toolchain.languageVersion = JavaLanguageVersion.of(8)
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+kotlin {
+    jvmToolchain(8)
+}
+
 base.archivesName = "${project.properties["archives_base_name"]}"
 
 val main: SourceSet by sourceSets.getting
@@ -39,7 +49,8 @@ dependencies {
 
     runtimeOnly(gradleApi())
 
-    implementation("xyz.wagyourtail.unimined:unimined:1.3.15")
+    implementation("xyz.wagyourtail.unimined:unimined:1.4.2")
+    implementation("xyz.wagyourtail.unimined.mapping:unimined-mapping-library-jvm:1.2.1")
     installerImplementation("io.github.java-diff-utils:java-diff-utils:4.16")
     installerImplementation("net.neoforged.installertools:binarypatcher:3.0.13")
     installerImplementation("org.ow2.asm:asm:9.8")
@@ -109,9 +120,9 @@ publishing {
     }
     publications {
         create<MavenPublication>("maven") {
-            groupId = project.group as String
-            artifactId = project.properties["archives_base_name"] as String? ?: project.name
-            version = project.version as String
+            groupId = "${project.group}"
+            artifactId = "${project.properties["archives_base_name"]}"
+            version = "${project.version}"
 
             artifact(installerJar.get()) {
                 classifier = "installer"
diff --git a/src/installer/java/xyz/wagyourtail/patchbase/installer/PatchbaseInstaller.java b/src/installer/java/xyz/wagyourtail/patchbase/installer/PatchbaseInstaller.java
index 5e9699b..380dfae 100644
--- a/src/installer/java/xyz/wagyourtail/patchbase/installer/PatchbaseInstaller.java
+++ b/src/installer/java/xyz/wagyourtail/patchbase/installer/PatchbaseInstaller.java
@@ -9,9 +9,11 @@
 import java.io.InputStream;
 import java.net.URI;
 import java.nio.file.*;
+import java.util.Collections;
 import java.util.Map;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
+import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 
@@ -65,7 +67,7 @@ public void patch(Path patchJar, Path baseJar, Path outputJar) throws IOExceptio
 
     public static <T> T readZipInputStreamFor(Path path, String entry, boolean throwIfMissing, Function<InputStream, T> action) throws IOException {
         try (ZipInputStream zis = new ZipInputStream(Files.newInputStream(path))) {
-            var zipEntry = zis.getNextEntry();
+            ZipEntry zipEntry = zis.getNextEntry();
             while (zipEntry != null) {
                 if (zipEntry.isDirectory()) {
                     zipEntry = zis.getNextEntry();
@@ -85,7 +87,7 @@ public static <T> T readZipInputStreamFor(Path path, String entry, boolean throw
 
     public static void forEachInZip(Path path, BiConsumer<String, InputStream> action) throws IOException {
         try (ZipInputStream zis = new ZipInputStream(Files.newInputStream(path))) {
-            var entry = zis.getNextEntry();
+            ZipEntry entry = zis.getNextEntry();
             while (entry != null) {
                 if (entry.isDirectory()) {
                     entry = zis.getNextEntry();
@@ -98,7 +100,7 @@ public static void forEachInZip(Path path, BiConsumer<String, InputStream> actio
     }
 
     public static FileSystem openZipFileSystem(Path path) throws IOException {
-        return openZipFileSystem(path, Map.of());
+        return openZipFileSystem(path, Collections.emptyMap());
     }
 
     public static FileSystem openZipFileSystem(Path path, Map<String, Object> args) throws IOException {
diff --git a/src/main/kotlin/xyz/wagyourtail/patchbase/gradle/PatchCreatorPlugin.kt b/src/main/kotlin/xyz/wagyourtail/patchbase/gradle/PatchCreatorPlugin.kt
index 8a59a47..3572497 100644
--- a/src/main/kotlin/xyz/wagyourtail/patchbase/gradle/PatchCreatorPlugin.kt
+++ b/src/main/kotlin/xyz/wagyourtail/patchbase/gradle/PatchCreatorPlugin.kt
@@ -2,19 +2,6 @@ package xyz.wagyourtail.patchbase.gradle
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.tasks.SourceSet
-import org.gradle.jvm.tasks.Jar
-import xyz.wagyourtail.patchbase.gradle.tasks.ApplySourcePatchTask
-import xyz.wagyourtail.patchbase.gradle.tasks.CreateClassPatchTask
-import xyz.wagyourtail.patchbase.gradle.tasks.CreateSourcePatchTask
-import xyz.wagyourtail.unimined.api.minecraft.EnvType
-import xyz.wagyourtail.unimined.api.minecraft.MinecraftConfig
-import xyz.wagyourtail.unimined.api.unimined
-import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider
-import xyz.wagyourtail.unimined.internal.minecraft.patch.NoTransformMinecraftTransformer
-import xyz.wagyourtail.unimined.internal.minecraft.patch.jarmod.JarModAgentMinecraftTransformer
-import xyz.wagyourtail.unimined.util.sourceSets
-import xyz.wagyourtail.unimined.util.withSourceSet
 
 class PatchCreatorPlugin : Plugin<Project> {
 
diff --git a/src/main/kotlin/xyz/wagyourtail/patchbase/gradle/PatchExtension.kt b/src/main/kotlin/xyz/wagyourtail/patchbase/gradle/PatchExtension.kt
index c43726e..33cba67 100644
--- a/src/main/kotlin/xyz/wagyourtail/patchbase/gradle/PatchExtension.kt
+++ b/src/main/kotlin/xyz/wagyourtail/patchbase/gradle/PatchExtension.kt
@@ -2,18 +2,18 @@ package xyz.wagyourtail.patchbase.gradle
 
 import org.gradle.api.Project
 import org.gradle.api.tasks.SourceSet
-import org.gradle.configurationcache.extensions.capitalized
 import org.gradle.jvm.tasks.Jar
 import org.jetbrains.annotations.ApiStatus
 import xyz.wagyourtail.patchbase.gradle.tasks.ApplySourcePatchTask
 import xyz.wagyourtail.patchbase.gradle.tasks.CreateClassPatchTask
 import xyz.wagyourtail.patchbase.gradle.tasks.CreateSourcePatchTask
-import xyz.wagyourtail.unimined.api.minecraft.EnvType
 import xyz.wagyourtail.unimined.api.minecraft.MinecraftConfig
 import xyz.wagyourtail.unimined.api.unimined
 import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider
 import xyz.wagyourtail.unimined.internal.minecraft.patch.jarmod.JarModAgentMinecraftTransformer
+import xyz.wagyourtail.unimined.mapping.EnvType
 import xyz.wagyourtail.unimined.util.FinalizeOnRead
+import xyz.wagyourtail.unimined.util.capitalized
 import xyz.wagyourtail.unimined.util.withSourceSet
 import kotlin.io.path.nameWithoutExtension
 
@@ -39,7 +39,7 @@ abstract class PatchExtension(val project: Project) {
 
     fun patchBaseCreator(sourceSet: SourceSet, devJar: Boolean = false) {
         val mc = project.unimined.minecrafts[sourceSet]!!
-        if (mc.side == EnvType.COMBINED) {
+        if (mc.side == EnvType.JOINED) {
             project.logger.warn("[PatchBase/Creator ${this.project.path} ${sourceSet}] Merged may make applying patches more difficult, proceed with caution")
         }
         if (!mc.defaultRemapJar) {
@@ -91,8 +91,7 @@ abstract class PatchExtension(val project: Project) {
             when (mc.side) {
                 EnvType.CLIENT -> it.classpath.set(project.files(mc.minecraftData.minecraftClientFile))
                 EnvType.SERVER -> it.classpath.set(project.files(mc.minecraftData.minecraftServerFile))
-                EnvType.COMBINED -> it.classpath.set(project.files(mc.mergedOfficialMinecraftFile))
-                else -> throw IllegalStateException("Unknown side: ${mc.side}")
+                EnvType.JOINED -> it.classpath.set(project.files(mc.mergedOfficialMinecraftFile))
             }
 
             it.archiveClassifier.set("patch")