diff --git a/src/main/java/fr/syuko/emicreatecompat/category/automaticpacking/AutomaticPackingRecipes.java b/src/main/java/fr/syuko/emicreatecompat/category/automaticpacking/AutomaticPackingRecipes.java
index 1b19806..132d524 100644
--- a/src/main/java/fr/syuko/emicreatecompat/category/automaticpacking/AutomaticPackingRecipes.java
+++ b/src/main/java/fr/syuko/emicreatecompat/category/automaticpacking/AutomaticPackingRecipes.java
@@ -1,7 +1,6 @@
 package fr.syuko.emicreatecompat.category.automaticpacking;
 
 import com.simibubi.create.AllRecipeTypes;
-import com.simibubi.create.content.kinetics.crafter.MechanicalCraftingRecipe;
 import com.simibubi.create.content.kinetics.press.MechanicalPressBlockEntity;
 import com.simibubi.create.infrastructure.config.AllConfigs;
 import fr.syuko.emicreatecompat.category.basin.BasinDisplay;
@@ -12,10 +11,7 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.crafting.CraftingRecipe;
-import net.minecraft.world.item.crafting.Ingredient;
-import net.minecraft.world.item.crafting.RecipeHolder;
-import net.minecraft.world.item.crafting.RecipeManager;
+import net.minecraft.world.item.crafting.*;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,9 +29,9 @@ public static List<BasinDisplay> all(RecipeManager manager) {
 
         List<BasinDisplay> displays = new ArrayList<>();
 
-        for (RecipeHolder<?> holder : manager.getRecipes()) {
-            if (!(holder.value() instanceof CraftingRecipe recipe) || recipe instanceof MechanicalCraftingRecipe || !MechanicalPressBlockEntity.canCompress(
-                    recipe) || AllRecipeTypes.shouldIgnoreInAutomation(holder)) {
+        for (RecipeHolder<CraftingRecipe> holder : manager.getAllRecipesFor(RecipeType.CRAFTING)) {
+            CraftingRecipe recipe = holder.value();
+            if (!MechanicalPressBlockEntity.canCompress(recipe) || AllRecipeTypes.shouldIgnoreInAutomation(holder)) {
                 continue;
             }
 
diff --git a/src/main/java/fr/syuko/emicreatecompat/category/automaticshaped/AutomaticShapedRecipes.java b/src/main/java/fr/syuko/emicreatecompat/category/automaticshaped/AutomaticShapedRecipes.java
index cb8931f..f83dcf2 100644
--- a/src/main/java/fr/syuko/emicreatecompat/category/automaticshaped/AutomaticShapedRecipes.java
+++ b/src/main/java/fr/syuko/emicreatecompat/category/automaticshaped/AutomaticShapedRecipes.java
@@ -5,10 +5,7 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.crafting.CraftingRecipe;
-import net.minecraft.world.item.crafting.RecipeHolder;
-import net.minecraft.world.item.crafting.RecipeManager;
-import net.minecraft.world.item.crafting.ShapedRecipe;
+import net.minecraft.world.item.crafting.*;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,8 +23,9 @@ public static List<AutomaticShapedDisplay> all(RecipeManager manager) {
 
         List<AutomaticShapedDisplay> displays = new ArrayList<>();
 
-        for (RecipeHolder<?> holder : manager.getRecipes()) {
-            if (!(holder.value() instanceof CraftingRecipe recipe) || AllRecipeTypes.shouldIgnoreInAutomation(holder)) {
+        for (RecipeHolder<CraftingRecipe> holder : manager.getAllRecipesFor(RecipeType.CRAFTING)) {
+            CraftingRecipe recipe = holder.value();
+            if (AllRecipeTypes.shouldIgnoreInAutomation(holder)) {
                 continue;
             }
 
@@ -41,16 +39,12 @@ public static List<AutomaticShapedDisplay> all(RecipeManager manager) {
                 continue;
             }
 
-            int
-                    width =
-                    shaped
-                    ? ((ShapedRecipe) recipe).getWidth()
-                    : 1;
-            int
-                    height =
-                    shaped
-                    ? ((ShapedRecipe) recipe).getHeight()
-                    : 1;
+            int width = shaped
+                        ? ((ShapedRecipe) recipe).getWidth()
+                        : 1;
+            int height = shaped
+                         ? ((ShapedRecipe) recipe).getHeight()
+                         : 1;
 
             displays.add(new AutomaticShapedDisplay(holder.id(),
                                                     List.copyOf(recipe.getIngredients()),
diff --git a/src/main/java/fr/syuko/emicreatecompat/category/automaticshapeless/AutomaticShapelessRecipes.java b/src/main/java/fr/syuko/emicreatecompat/category/automaticshapeless/AutomaticShapelessRecipes.java
index 70d93f9..a1a0c68 100644
--- a/src/main/java/fr/syuko/emicreatecompat/category/automaticshapeless/AutomaticShapelessRecipes.java
+++ b/src/main/java/fr/syuko/emicreatecompat/category/automaticshapeless/AutomaticShapelessRecipes.java
@@ -8,10 +8,7 @@
 import fr.syuko.emicreatecompat.category.basin.BasinDisplays;
 import fr.syuko.emicreatecompat.create.recipe.BasinRecipes;
 import net.minecraft.client.Minecraft;
-import net.minecraft.world.item.crafting.CraftingRecipe;
-import net.minecraft.world.item.crafting.RecipeHolder;
-import net.minecraft.world.item.crafting.RecipeManager;
-import net.minecraft.world.item.crafting.ShapedRecipe;
+import net.minecraft.world.item.crafting.*;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,10 +25,10 @@ public static List<BasinDisplay> all(RecipeManager manager) {
 
         List<BasinDisplay> displays = new ArrayList<>();
 
-        for (RecipeHolder<?> holder : manager.getRecipes()) {
-            if (!(holder.value() instanceof CraftingRecipe recipe) || recipe instanceof ShapedRecipe || BasinRecipes.present(
-                                                                                                                            recipe.getIngredients())
-                                                                                                                    .size() <= 1 || MechanicalPressBlockEntity.canCompress(
+        for (RecipeHolder<CraftingRecipe> holder : manager.getAllRecipesFor(RecipeType.CRAFTING)) {
+            CraftingRecipe recipe = holder.value();
+            if (recipe instanceof ShapedRecipe || BasinRecipes.present(recipe.getIngredients())
+                                                              .size() <= 1 || MechanicalPressBlockEntity.canCompress(
                     recipe) || AllRecipeTypes.shouldIgnoreInAutomation(holder)) {
                 continue;
             }