diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4e4423226..650af498a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -38,12 +38,12 @@ nightConfig = "3.8.3"
 fabricPermissions = "0.3.3"
 iris-fabric = "1.9.1+1.21.7-fabric"
 iris-forge = "1.9.1+1.21.7-neoforge"
-jei = "26.0.0.1"
+jei = "27.0.0.1"
 modmenu = "16.0.0-rc.1"
 moreRed = "6.0.0.3"
 rei = "18.0.800"
-sodium-fabric = "mc1.21.6-0.6.13-fabric"
-sodium-forge = "mc1.21.6-0.6.13-neoforge"
+sodium-fabric = "mc1.21.11-0.8.0-fabric"
+sodium-forge = "mc1.21.11-0.8.0-neoforge"
 mixinExtra = "0.3.5"
 create-forge = "6.0.0-6"
 create-fabric = "6.0.7.0+mc1.20.1-build.1716"
@@ -107,9 +107,9 @@ fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric-l
 fabricPermissions = { module = "me.lucko:fabric-permissions-api", version.ref = "fabricPermissions" }
 iris-fabric = { module = "maven.modrinth:iris", version.ref = "iris-fabric" }
 iris-forge = { module = "maven.modrinth:iris", version.ref = "iris-forge" }
-jei-api = { module = "mezz.jei:jei-1.21.10-common-api", version.ref = "jei" }
-jei-fabric = { module = "mezz.jei:jei-1.21.10-fabric", version.ref = "jei" }
-jei-forge = { module = "mezz.jei:jei-1.21.10-neoforge", version.ref = "jei" }
+jei-api = { module = "mezz.jei:jei-1.21.11-common-api", version.ref = "jei" }
+jei-fabric = { module = "mezz.jei:jei-1.21.11-fabric", version.ref = "jei" }
+jei-forge = { module = "mezz.jei:jei-1.21.11-neoforge", version.ref = "jei" }
 mixin = { module = "org.spongepowered:mixin", version.ref = "mixin" }
 mixinExtra = { module = "io.github.llamalad7:mixinextras-common", version.ref = "mixinExtra" }
 modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu" }
@@ -178,7 +178,7 @@ kotlin = ["kotlin-stdlib", "kotlin-coroutines"]
 # Minecraft
 externalMods-common = ["iris-forge", "jei-api", "nightConfig-core", "nightConfig-toml"]
 externalMods-forge-compile = ["moreRed", "iris-forge", "jei-api"]
-externalMods-forge-runtime = []
+externalMods-forge-runtime = ["jei-forge"]
 externalMods-fabric-compile = ["fabricPermissions", "iris-fabric", "jei-api", "rei-api", "rei-builtin"]
 externalMods-fabric-runtime = []
 
diff --git a/projects/common/build.gradle.kts b/projects/common/build.gradle.kts
index 6a14268d6..338648986 100644
--- a/projects/common/build.gradle.kts
+++ b/projects/common/build.gradle.kts
@@ -11,12 +11,6 @@ plugins {
     id("cc-tweaked.publishing")
 }
 
-sourceSets.client {
-    java {
-        exclude("dan200/computercraft/client/integration/jei")
-    }
-}
-
 minecraft {
     accessWideners(
         "src/main/resources/computercraft.accesswidener",
diff --git a/projects/common/src/client/java/dan200/computercraft/client/integration/jei/JEIComputerCraft.java b/projects/common/src/client/java/dan200/computercraft/client/integration/jei/JEIComputerCraft.java
index bfbbc78c6..43fc8e6f0 100644
--- a/projects/common/src/client/java/dan200/computercraft/client/integration/jei/JEIComputerCraft.java
+++ b/projects/common/src/client/java/dan200/computercraft/client/integration/jei/JEIComputerCraft.java
@@ -20,6 +20,7 @@ import mezz.jei.api.registration.IAdvancedRegistration;
 import mezz.jei.api.registration.ISubtypeRegistration;
 import mezz.jei.api.runtime.IJeiRuntime;
 import net.minecraft.client.Minecraft;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.resources.Identifier;
 import net.minecraft.world.item.ItemStack;
@@ -106,7 +107,8 @@ public class JEIComputerCraft implements IModPlugin {
      */
     private static final ISubtypeInterpreter<ItemStack> diskSubtype = (stack, ctx) -> Integer.toString(DyedItemColor.getOrDefault(stack, -1));
 
-    private static RegistryAccess getRegistryAccess() {
-        return Minecraft.getInstance().level.registryAccess();
+    private static HolderLookup.Provider getRegistryAccess() {
+        var connection = Minecraft.getInstance().getConnection();
+        return connection == null ? RegistryAccess.EMPTY : connection.registryAccess();
     }
 }
diff --git a/projects/common/src/client/java/dan200/computercraft/client/integration/jei/RecipeResolver.java b/projects/common/src/client/java/dan200/computercraft/client/integration/jei/RecipeResolver.java
index bed006399..4a85f0288 100644
--- a/projects/common/src/client/java/dan200/computercraft/client/integration/jei/RecipeResolver.java
+++ b/projects/common/src/client/java/dan200/computercraft/client/integration/jei/RecipeResolver.java
@@ -12,8 +12,8 @@ import mezz.jei.api.ingredients.ITypedIngredient;
 import mezz.jei.api.recipe.advanced.ISimpleRecipeManagerPlugin;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.registries.Registries;
-import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.*;
 import net.minecraft.world.item.crafting.display.RecipeDisplay;