diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index 6d518226..3258fbf3 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -30,6 +30,9 @@
     ],
     "modmenu": [
       "net.blay09.mods.excompressum.fabric.compat.ModMenuIntegration"
+    ],
+    "jei_mod_plugin": [
+      "net.blay09.mods.excompressum.compat.jei.JEIAddon"
     ]
   },
   "mixins": [
diff --git a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/ChickenStickJeiRecipeCategory.java b/shared/src/main/java/net/blay09/mods/excompressum/compat/jei/ChickenStickJeiRecipeCategory.java
similarity index 94%
rename from forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/ChickenStickJeiRecipeCategory.java
rename to shared/src/main/java/net/blay09/mods/excompressum/compat/jei/ChickenStickJeiRecipeCategory.java
index eaa72812..42e1d2b8 100644
--- a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/ChickenStickJeiRecipeCategory.java
+++ b/shared/src/main/java/net/blay09/mods/excompressum/compat/jei/ChickenStickJeiRecipeCategory.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.jei;
 
 import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
@@ -9,6 +9,7 @@
 import mezz.jei.api.recipe.RecipeType;
 import mezz.jei.api.recipe.category.IRecipeCategory;
 import net.blay09.mods.excompressum.ExCompressum;
+import net.blay09.mods.excompressum.compat.recipeviewers.ExpandedChickenStickRecipe;
 import net.blay09.mods.excompressum.item.ModItems;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
diff --git a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/CompressedHammerJeiRecipeCategory.java b/shared/src/main/java/net/blay09/mods/excompressum/compat/jei/CompressedHammerJeiRecipeCategory.java
similarity index 94%
rename from forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/CompressedHammerJeiRecipeCategory.java
rename to shared/src/main/java/net/blay09/mods/excompressum/compat/jei/CompressedHammerJeiRecipeCategory.java
index e1d23963..a477c0d4 100644
--- a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/CompressedHammerJeiRecipeCategory.java
+++ b/shared/src/main/java/net/blay09/mods/excompressum/compat/jei/CompressedHammerJeiRecipeCategory.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.jei;
 
 import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
@@ -10,6 +10,7 @@
 import mezz.jei.api.recipe.category.IRecipeCategory;
 import net.blay09.mods.excompressum.ExCompressum;
 import net.blay09.mods.excompressum.block.ModBlocks;
+import net.blay09.mods.excompressum.compat.recipeviewers.ExpandedCompressedHammerRecipe;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
diff --git a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/CraftChickenStickJeiRecipeCategory.java b/shared/src/main/java/net/blay09/mods/excompressum/compat/jei/CraftChickenStickJeiRecipeCategory.java
similarity index 97%
rename from forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/CraftChickenStickJeiRecipeCategory.java
rename to shared/src/main/java/net/blay09/mods/excompressum/compat/jei/CraftChickenStickJeiRecipeCategory.java
index 98a349a5..c788fbc2 100644
--- a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/CraftChickenStickJeiRecipeCategory.java
+++ b/shared/src/main/java/net/blay09/mods/excompressum/compat/jei/CraftChickenStickJeiRecipeCategory.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.jei;
 
 import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
diff --git a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/CraftChickenStickRecipe.java b/shared/src/main/java/net/blay09/mods/excompressum/compat/jei/CraftChickenStickRecipe.java
similarity index 91%
rename from forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/CraftChickenStickRecipe.java
rename to shared/src/main/java/net/blay09/mods/excompressum/compat/jei/CraftChickenStickRecipe.java
index 34f8870c..8ec7fe76 100644
--- a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/CraftChickenStickRecipe.java
+++ b/shared/src/main/java/net/blay09/mods/excompressum/compat/jei/CraftChickenStickRecipe.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.jei;
 
 import net.blay09.mods.excompressum.item.ModItems;
 import net.minecraft.nbt.CompoundTag;
diff --git a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/HammerJeiRecipeCategory.java b/shared/src/main/java/net/blay09/mods/excompressum/compat/jei/HammerJeiRecipeCategory.java
similarity index 94%
rename from forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/HammerJeiRecipeCategory.java
rename to shared/src/main/java/net/blay09/mods/excompressum/compat/jei/HammerJeiRecipeCategory.java
index 9ea5d294..9565700a 100644
--- a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/HammerJeiRecipeCategory.java
+++ b/shared/src/main/java/net/blay09/mods/excompressum/compat/jei/HammerJeiRecipeCategory.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.jei;
 
 import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
@@ -10,6 +10,7 @@
 import mezz.jei.api.recipe.category.IRecipeCategory;
 import net.blay09.mods.excompressum.ExCompressum;
 import net.blay09.mods.excompressum.block.ModBlocks;
+import net.blay09.mods.excompressum.compat.recipeviewers.ExpandedHammerRecipe;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
diff --git a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/HeavySieveJeiRecipeCategory.java b/shared/src/main/java/net/blay09/mods/excompressum/compat/jei/HeavySieveJeiRecipeCategory.java
similarity index 95%
rename from forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/HeavySieveJeiRecipeCategory.java
rename to shared/src/main/java/net/blay09/mods/excompressum/compat/jei/HeavySieveJeiRecipeCategory.java
index 9f1cdcca..dffd367d 100644
--- a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/HeavySieveJeiRecipeCategory.java
+++ b/shared/src/main/java/net/blay09/mods/excompressum/compat/jei/HeavySieveJeiRecipeCategory.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.jei;
 
 import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
@@ -11,12 +11,12 @@
 import mezz.jei.api.recipe.category.IRecipeCategory;
 import net.blay09.mods.excompressum.ExCompressum;
 import net.blay09.mods.excompressum.block.ModBlocks;
+import net.blay09.mods.excompressum.compat.recipeviewers.ExpandedHeavySieveRecipe;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 
 import javax.annotation.Nonnull;
-import java.util.List;
 
 public class HeavySieveJeiRecipeCategory implements IRecipeCategory<ExpandedHeavySieveRecipe> {
 
diff --git a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/JEIAddon.java b/shared/src/main/java/net/blay09/mods/excompressum/compat/jei/JEIAddon.java
similarity index 98%
rename from forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/JEIAddon.java
rename to shared/src/main/java/net/blay09/mods/excompressum/compat/jei/JEIAddon.java
index 27c4b3d4..05385ceb 100644
--- a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/JEIAddon.java
+++ b/shared/src/main/java/net/blay09/mods/excompressum/compat/jei/JEIAddon.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.jei;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Lists;
@@ -11,6 +11,7 @@
 import mezz.jei.api.registration.IRecipeRegistration;
 import net.blay09.mods.balm.api.Balm;
 import net.blay09.mods.excompressum.ExCompressum;
+import net.blay09.mods.excompressum.compat.recipeviewers.*;
 import net.blay09.mods.excompressum.loot.LootTableUtils;
 import net.blay09.mods.excompressum.block.HeavySieveBlock;
 import net.blay09.mods.excompressum.block.ModBlocks;
diff --git a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/JeiUtils.java b/shared/src/main/java/net/blay09/mods/excompressum/compat/jei/JeiUtils.java
similarity index 97%
rename from forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/JeiUtils.java
rename to shared/src/main/java/net/blay09/mods/excompressum/compat/jei/JeiUtils.java
index 28727ab8..69bb9c71 100644
--- a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/JeiUtils.java
+++ b/shared/src/main/java/net/blay09/mods/excompressum/compat/jei/JeiUtils.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.jei;
 
 import net.blay09.mods.excompressum.loot.LootTableEntry;
 import net.blay09.mods.excompressum.loot.LootTableUtils;
diff --git a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/SieveJeiRecipeCategory.java b/shared/src/main/java/net/blay09/mods/excompressum/compat/jei/SieveJeiRecipeCategory.java
similarity index 95%
rename from forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/SieveJeiRecipeCategory.java
rename to shared/src/main/java/net/blay09/mods/excompressum/compat/jei/SieveJeiRecipeCategory.java
index c2260437..8e3f15fa 100644
--- a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/SieveJeiRecipeCategory.java
+++ b/shared/src/main/java/net/blay09/mods/excompressum/compat/jei/SieveJeiRecipeCategory.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.jei;
 
 import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
@@ -11,6 +11,7 @@
 import mezz.jei.api.recipe.category.IRecipeCategory;
 import net.blay09.mods.excompressum.ExCompressum;
 import net.blay09.mods.excompressum.block.ModBlocks;
+import net.blay09.mods.excompressum.compat.recipeviewers.ExpandedSieveRecipe;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
diff --git a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/WoodenCrucibleJeiRecipeCategory.java b/shared/src/main/java/net/blay09/mods/excompressum/compat/jei/WoodenCrucibleJeiRecipeCategory.java
similarity index 92%
rename from forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/WoodenCrucibleJeiRecipeCategory.java
rename to shared/src/main/java/net/blay09/mods/excompressum/compat/jei/WoodenCrucibleJeiRecipeCategory.java
index fe8fb0e2..8b36bf53 100644
--- a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/WoodenCrucibleJeiRecipeCategory.java
+++ b/shared/src/main/java/net/blay09/mods/excompressum/compat/jei/WoodenCrucibleJeiRecipeCategory.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.jei;
 
 import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
@@ -10,12 +10,12 @@
 import mezz.jei.api.recipe.category.IRecipeCategory;
 import net.blay09.mods.excompressum.ExCompressum;
 import net.blay09.mods.excompressum.block.ModBlocks;
+import net.blay09.mods.excompressum.compat.recipeviewers.ExpandedWoodenCrucibleRecipe;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 
 import javax.annotation.Nonnull;
-import java.util.List;
 
 public class WoodenCrucibleJeiRecipeCategory implements IRecipeCategory<ExpandedWoodenCrucibleRecipe> {
 
@@ -56,7 +56,7 @@ public IDrawable getIcon() {
 
     @Override
     public void setRecipe(IRecipeLayoutBuilder recipeLayoutBuilder, ExpandedWoodenCrucibleRecipe recipe, IFocusGroup focusGroup) {
-        recipeLayoutBuilder.addSlot(RecipeIngredientRole.OUTPUT, 75, 10).addFluidStack(recipe.getFluid(), recipe.getFluidStack().getAmount());
+        recipeLayoutBuilder.addSlot(RecipeIngredientRole.OUTPUT, 75, 10).addFluidStack(recipe.getFluid(), recipe.getAmount());
 
         final var inputs = recipe.getInputs();
         for (int i = 0; i < inputs.size(); i++) {
diff --git a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/ExpandedChickenStickRecipe.java b/shared/src/main/java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedChickenStickRecipe.java
similarity index 95%
rename from forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/ExpandedChickenStickRecipe.java
rename to shared/src/main/java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedChickenStickRecipe.java
index bdfcd976..23bbdf29 100644
--- a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/ExpandedChickenStickRecipe.java
+++ b/shared/src/main/java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedChickenStickRecipe.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.recipeviewers;
 
 import net.blay09.mods.excompressum.loot.LootTableEntry;
 import net.blay09.mods.excompressum.loot.LootTableUtils;
diff --git a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/ExpandedCompressedHammerRecipe.java b/shared/src/main/java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedCompressedHammerRecipe.java
similarity index 95%
rename from forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/ExpandedCompressedHammerRecipe.java
rename to shared/src/main/java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedCompressedHammerRecipe.java
index 2f4daf34..6cc33e40 100644
--- a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/ExpandedCompressedHammerRecipe.java
+++ b/shared/src/main/java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedCompressedHammerRecipe.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.recipeviewers;
 
 import net.blay09.mods.excompressum.api.recipe.CompressedHammerRecipe;
 import net.blay09.mods.excompressum.loot.LootTableEntry;
diff --git a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/ExpandedHammerRecipe.java b/shared/src/main/java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedHammerRecipe.java
similarity index 95%
rename from forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/ExpandedHammerRecipe.java
rename to shared/src/main/java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedHammerRecipe.java
index 3a87bb63..f35093e6 100644
--- a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/ExpandedHammerRecipe.java
+++ b/shared/src/main/java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedHammerRecipe.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.recipeviewers;
 
 import net.blay09.mods.excompressum.api.recipe.HammerRecipe;
 import net.blay09.mods.excompressum.loot.LootTableEntry;
diff --git a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/ExpandedHeavySieveRecipe.java b/shared/src/main/java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedHeavySieveRecipe.java
similarity index 97%
rename from forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/ExpandedHeavySieveRecipe.java
rename to shared/src/main/java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedHeavySieveRecipe.java
index b317ae3f..052d94d0 100644
--- a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/ExpandedHeavySieveRecipe.java
+++ b/shared/src/main/java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedHeavySieveRecipe.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.recipeviewers;
 
 import net.blay09.mods.excompressum.api.recipe.HeavySieveRecipe;
 import net.blay09.mods.excompressum.api.sievemesh.CommonMeshType;
diff --git a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/ExpandedSieveRecipe.java b/shared/src/main/java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedSieveRecipe.java
similarity index 95%
rename from forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/ExpandedSieveRecipe.java
rename to shared/src/main/java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedSieveRecipe.java
index 90eb4e16..39a51a9a 100644
--- a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/ExpandedSieveRecipe.java
+++ b/shared/src/main/java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedSieveRecipe.java
@@ -1,6 +1,5 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.recipeviewers;
 
-import net.blay09.mods.excompressum.api.recipe.HeavySieveRecipe;
 import net.blay09.mods.excompressum.api.recipe.SieveRecipe;
 import net.blay09.mods.excompressum.api.sievemesh.CommonMeshType;
 import net.blay09.mods.excompressum.api.sievemesh.SieveMeshRegistryEntry;
diff --git a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/ExpandedWoodenCrucibleRecipe.java b/shared/src/main/java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedWoodenCrucibleRecipe.java
similarity index 84%
rename from forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/ExpandedWoodenCrucibleRecipe.java
rename to shared/src/main/java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedWoodenCrucibleRecipe.java
index c60a2de0..3da32653 100644
--- a/forge/src/main/java/net/blay09/mods/excompressum/forge/compat/jei/ExpandedWoodenCrucibleRecipe.java
+++ b/shared/src/main/java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedWoodenCrucibleRecipe.java
@@ -1,10 +1,9 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.recipeviewers;
 
 import com.mojang.datafixers.util.Pair;
 import net.blay09.mods.excompressum.registry.woodencrucible.WoodenCrucibleRecipe;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.material.Fluid;
-import net.minecraftforge.fluids.FluidStack;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,8 +32,8 @@ public Fluid getFluid() {
         return fluid;
     }
 
-    public FluidStack getFluidStack() {
-        return new FluidStack(fluid, 1000);
+    public int getAmount() {
+        return 1000;
     }
 
     public WoodenCrucibleRecipe getEntryAt(int index) {