diff --git a/src/main/java/thedarkcolour/exdeorum/blockentity/AbstractSieveBlockEntity.java b/src/main/java/thedarkcolour/exdeorum/blockentity/AbstractSieveBlockEntity.java
index 099037e0..30226ad9 100644
--- a/src/main/java/thedarkcolour/exdeorum/blockentity/AbstractSieveBlockEntity.java
+++ b/src/main/java/thedarkcolour/exdeorum/blockentity/AbstractSieveBlockEntity.java
@@ -26,7 +26,6 @@ import net.minecraft.server.level.ServerLevel;
 import net.minecraft.stats.Stats;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.InteractionHand;
-import net.minecraft.world.InteractionResult;
 import net.minecraft.world.ItemInteractionResult;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.player.Player;
@@ -37,10 +36,8 @@ import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.neoforged.neoforge.common.util.FakePlayer;
-import org.jetbrains.annotations.Nullable;
 import thedarkcolour.exdeorum.blockentity.logic.SieveLogic;
 import thedarkcolour.exdeorum.config.EConfig;
-import thedarkcolour.exdeorum.recipe.RecipeCaches;
 
 import java.util.function.Function;
 
diff --git a/src/main/java/thedarkcolour/exdeorum/blockentity/LavaCrucibleBlockEntity.java b/src/main/java/thedarkcolour/exdeorum/blockentity/LavaCrucibleBlockEntity.java
index d7a3341c..21ad4224 100644
--- a/src/main/java/thedarkcolour/exdeorum/blockentity/LavaCrucibleBlockEntity.java
+++ b/src/main/java/thedarkcolour/exdeorum/blockentity/LavaCrucibleBlockEntity.java
@@ -23,12 +23,10 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
-import thedarkcolour.exdeorum.recipe.RecipeUtil;
 import thedarkcolour.exdeorum.recipe.crucible.CrucibleRecipe;
 import thedarkcolour.exdeorum.registry.EBlockEntities;
 
 import javax.annotation.Nullable;
-import java.util.Objects;
 
 public class LavaCrucibleBlockEntity extends AbstractCrucibleBlockEntity {
     public LavaCrucibleBlockEntity(BlockPos pos, BlockState state) {
diff --git a/src/main/java/thedarkcolour/exdeorum/blockentity/logic/SieveLogic.java b/src/main/java/thedarkcolour/exdeorum/blockentity/logic/SieveLogic.java
index 2e5cf2ca..98522a11 100644
--- a/src/main/java/thedarkcolour/exdeorum/blockentity/logic/SieveLogic.java
+++ b/src/main/java/thedarkcolour/exdeorum/blockentity/logic/SieveLogic.java
@@ -29,7 +29,6 @@ import net.minecraft.util.RandomSource;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.enchantment.Enchantments;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.storage.loot.LootContext;
 import thedarkcolour.exdeorum.config.EConfig;
diff --git a/src/main/java/thedarkcolour/exdeorum/compat/CompatUtil.java b/src/main/java/thedarkcolour/exdeorum/compat/CompatUtil.java
index cf8122df..23f6085b 100644
--- a/src/main/java/thedarkcolour/exdeorum/compat/CompatUtil.java
+++ b/src/main/java/thedarkcolour/exdeorum/compat/CompatUtil.java
@@ -24,14 +24,17 @@ import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
-import net.minecraft.world.item.crafting.*;
+import net.minecraft.world.item.crafting.Recipe;
+import net.minecraft.world.item.crafting.RecipeHolder;
+import net.minecraft.world.item.crafting.RecipeInput;
+import net.minecraft.world.item.crafting.RecipeManager;
+import net.minecraft.world.item.crafting.RecipeType;
 import net.minecraft.world.item.enchantment.ItemEnchantments;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.Level;
 import net.neoforged.fml.ModList;
 import thedarkcolour.exdeorum.material.DefaultMaterials;
 import thedarkcolour.exdeorum.material.MaterialRegistry;
-import thedarkcolour.exdeorum.recipe.RecipeUtil;
 import thedarkcolour.exdeorum.registry.EItems;
 
 import java.util.ArrayList;
diff --git a/src/main/java/thedarkcolour/exdeorum/compat/XeiSieveRecipe.java b/src/main/java/thedarkcolour/exdeorum/compat/XeiSieveRecipe.java
index 8a787789..fae10f49 100644
--- a/src/main/java/thedarkcolour/exdeorum/compat/XeiSieveRecipe.java
+++ b/src/main/java/thedarkcolour/exdeorum/compat/XeiSieveRecipe.java
@@ -30,7 +30,6 @@ import net.minecraft.world.item.crafting.RecipeType;
 import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
 import net.minecraft.world.level.storage.loot.providers.number.NumberProvider;
 import org.apache.commons.lang3.mutable.MutableInt;
-import thedarkcolour.exdeorum.client.ClientsideCode;
 import thedarkcolour.exdeorum.recipe.RecipeUtil;
 import thedarkcolour.exdeorum.recipe.sieve.SieveRecipe;
 import thedarkcolour.exdeorum.registry.EItems;
diff --git a/src/main/java/thedarkcolour/exdeorum/loot/CompressedHammerLootModifier.java b/src/main/java/thedarkcolour/exdeorum/loot/CompressedHammerLootModifier.java
index 2ac2f7f8..065820c8 100644
--- a/src/main/java/thedarkcolour/exdeorum/loot/CompressedHammerLootModifier.java
+++ b/src/main/java/thedarkcolour/exdeorum/loot/CompressedHammerLootModifier.java
@@ -3,6 +3,7 @@ package thedarkcolour.exdeorum.loot;
 import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.world.item.Item;
+import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
 import net.neoforged.neoforge.common.loot.IGlobalLootModifier;
 import net.neoforged.neoforge.common.loot.LootModifier;
@@ -24,7 +25,7 @@ public class CompressedHammerLootModifier extends HammerLootModifier {
     }
 
     @Override
-    protected @Nullable HammerRecipe getRecipe(Item itemForm) {
-        return RecipeUtil.getServerRecipeCaches().getCompressedHammerRecipe(itemForm);
+    protected @Nullable HammerRecipe getRecipe(Item itemForm, LootContext context) {
+        return RecipeUtil.getCaches(context.getLevel()).getCompressedHammerRecipe(itemForm);
     }
 }
diff --git a/src/main/java/thedarkcolour/exdeorum/loot/HammerLootModifier.java b/src/main/java/thedarkcolour/exdeorum/loot/HammerLootModifier.java
index 201ca205..599fd231 100644
--- a/src/main/java/thedarkcolour/exdeorum/loot/HammerLootModifier.java
+++ b/src/main/java/thedarkcolour/exdeorum/loot/HammerLootModifier.java
@@ -69,7 +69,7 @@ public class HammerLootModifier extends LootModifier {
             return generatedLoot;
         }
 
-        var recipe = getRecipe(itemForm);
+        var recipe = getRecipe(itemForm, context);
         if (recipe == null) {
             return generatedLoot;
         }
@@ -91,8 +91,8 @@ public class HammerLootModifier extends LootModifier {
     }
 
     @Nullable
-    protected HammerRecipe getRecipe(Item itemForm) {
-        return RecipeUtil.getServerRecipeCaches().getHammerRecipe(itemForm);
+    protected HammerRecipe getRecipe(Item itemForm, LootContext context) {
+        return RecipeUtil.getCaches(context.getLevel()).getHammerRecipe(itemForm);
     }
 
     @Override