diff --git a/build.gradle b/build.gradle
index 9521bb06..06db597a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -100,7 +100,9 @@ dependencies {
     modCompileOnly "dev.emi:trinkets:${project.trinkets_version}"
 
     modCompileOnly "dev.emi:emi-fabric:${emi_version}:api"
-    modLocalRuntime "dev.emi:emi-fabric:${emi_version}"
+//    modLocalRuntime("dev.emi:emi-fabric:${emi_version}") {
+//        transitive = false
+//    }
 
     if (local_wunderlib) {
         println "Using local WunderLib"
diff --git a/gradle.properties b/gradle.properties
index d48e4164..03246066 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx2G
 # check these on https://fabricmc.net/versions.html
 minecraft_version=1.20.1
 loader_version=0.14.21
-fabric_version=0.85.0+1.20.1
+fabric_version=0.86.0+1.20.1
 #Loom
 loom_version=1.0-SNAPSHOT
 #Modrinth
@@ -21,6 +21,6 @@ archives_base_name=better-end
 patchouli_version=1.19-73-FABRIC
 bclib_version=3.0.12
 rei_version=12.0.622
-emi_version=1.0.3+1.20
+emi_version=1.0.12+1.20.1
 trinkets_version=3.7.0
 cca_version=5.2.1
diff --git a/src/main/java/org/betterx/betterend/client/BetterEndClient.java b/src/main/java/org/betterx/betterend/client/BetterEndClient.java
index c711949b..bcfc3e50 100644
--- a/src/main/java/org/betterx/betterend/client/BetterEndClient.java
+++ b/src/main/java/org/betterx/betterend/client/BetterEndClient.java
@@ -16,7 +16,7 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.Level;
 
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.model.ModelLoadingRegistry;
+import net.fabricmc.fabric.api.client.model.loading.v1.ModelLoadingPlugin;
 import net.fabricmc.fabric.api.client.rendering.v1.DimensionRenderingRegistry;
 
 public class BetterEndClient implements ClientModInitializer {
@@ -35,15 +35,18 @@ public class BetterEndClient implements ClientModInitializer {
         ResourceLocation checkPlantId = new ResourceLocation("item/chorus_plant");
         ResourceLocation toLoadFlowerId = new ResourceLocation("betterend", "item/custom_chorus_flower");
         ResourceLocation toLoadPlantId = new ResourceLocation("betterend", "item/custom_chorus_plant");
-        ModelLoadingRegistry.INSTANCE.registerResourceProvider(manager -> (resourceId, context) -> {
-            if (GeneratorOptions.changeChorusPlant()) {
-                if (resourceId.equals(checkFlowerId)) {
-                    return context.loadModel(toLoadFlowerId);
-                } else if (resourceId.equals(checkPlantId)) {
-                    return context.loadModel(toLoadPlantId);
+
+        ModelLoadingPlugin.register(pluginContext -> {
+            pluginContext.resolveModel().register((context) -> {
+                if (GeneratorOptions.changeChorusPlant()) {
+                    if (context.id().equals(checkFlowerId)) {
+                        return context.getOrLoadModel(toLoadFlowerId);
+                    } else if (context.id().equals(checkPlantId)) {
+                        return context.getOrLoadModel(toLoadPlantId);
+                    }
                 }
-            }
-            return null;
+                return null;
+            });
         });
 
         if (ClientOptions.isCustomSky()) {