diff --git a/src/main/java/ru/bclib/mixin/client/EnchantingTableBlockMixin.java b/src/main/java/ru/bclib/mixin/client/EnchantingTableBlockMixin.java
index 9ac56d2e..db8ddd23 100644
--- a/src/main/java/ru/bclib/mixin/client/EnchantingTableBlockMixin.java
+++ b/src/main/java/ru/bclib/mixin/client/EnchantingTableBlockMixin.java
@@ -15,13 +15,13 @@ public abstract class EnchantingTableBlockMixin extends Block {
 		super(settings);
 	}
 	
-	@Redirect(method = "animateTick", at = @At(
+	@Redirect(method = "isValidBookShelf", at = @At(
 		value = "INVOKE",
 		target = "Lnet/minecraft/world/level/block/state/BlockState;is(Lnet/minecraft/world/level/block/Block;)Z"),
 		require = -1,
 		expect = -1
 	)
-	private boolean bclib_isBookshelf(BlockState state, Block block) {
+	private static boolean bclib_isBookshelf(BlockState state, Block block) {
 		return block == Blocks.BOOKSHELF ? state.is(CommonBlockTags.BOOKSHELVES) : state.is(block);
 	}
 }
diff --git a/src/main/java/ru/bclib/mixin/common/DimensionTypeMixin.java b/src/main/java/ru/bclib/mixin/common/DimensionTypeMixin.java
index 656b7367..6945bb2e 100644
--- a/src/main/java/ru/bclib/mixin/common/DimensionTypeMixin.java
+++ b/src/main/java/ru/bclib/mixin/common/DimensionTypeMixin.java
@@ -32,7 +32,7 @@ public class DimensionTypeMixin {
 		locals = LocalCapture.CAPTURE_FAILHARD,
 		at = @At("TAIL")
 	)
-	private static void bclib_updateDimensions(RegistryAccess registryAccess, long seed, boolean bl, CallbackInfoReturnable<MappedRegistry<LevelStem>> info, @NotNull MappedRegistry<LevelStem> writableRegistry, Registry<DimensionType> registry, Registry<Biome> biomeRegistry, Registry<StructureSet> structureRegistry, Registry<NoiseGeneratorSettings> noiseSettingsRegistry, Registry<NormalNoise.NoiseParameters> noiseParamRegistry) {
+	private static void bclib_updateDimensions(RegistryAccess registryAccess, long seed, boolean bl, CallbackInfoReturnable<Registry> info, WritableRegistry writableRegistry, Registry registry, Registry biomeRegistry, Registry structureRegistry, Registry noiseSettingsRegistry, Registry noiseParamRegistry) {
 		int id = writableRegistry.getId(writableRegistry.get(LevelStem.NETHER));
 		writableRegistry.register(
 				LevelStem.NETHER, 
diff --git a/src/main/java/ru/bclib/mixin/common/EnchantmentMenuMixin.java b/src/main/java/ru/bclib/mixin/common/EnchantmentMenuMixin.java
deleted file mode 100644
index 6e33274f..00000000
--- a/src/main/java/ru/bclib/mixin/common/EnchantmentMenuMixin.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package ru.bclib.mixin.common;
-
-import net.minecraft.world.inventory.AbstractContainerMenu;
-import net.minecraft.world.inventory.EnchantmentMenu;
-import net.minecraft.world.inventory.MenuType;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.state.BlockState;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-import ru.bclib.api.tag.CommonBlockTags;
-
-@Mixin(EnchantmentMenu.class)
-public abstract class EnchantmentMenuMixin extends AbstractContainerMenu {
-	protected EnchantmentMenuMixin(MenuType<?> type, int syncId) {
-		super(type, syncId);
-	}
-	
-	@Redirect(method = "lambda$slotsChanged$0(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)V", at = @At(
-		value = "INVOKE",
-		target = "Lnet/minecraft/world/level/block/state/BlockState;is(Lnet/minecraft/world/level/block/Block;)Z"),
-		require = -1,
-		expect = -1
-	)
-	private boolean bclib_isBookshelf(BlockState state, Block block) {
-		return block == Blocks.BOOKSHELF ? state.is(CommonBlockTags.BOOKSHELVES) : state.is(block);
-	}
-}
diff --git a/src/main/resources/bclib.mixins.common.json b/src/main/resources/bclib.mixins.common.json
index 50f21ce8..52029a3f 100644
--- a/src/main/resources/bclib.mixins.common.json
+++ b/src/main/resources/bclib.mixins.common.json
@@ -21,7 +21,6 @@
 		"RecipeManagerAccessor",
 		"DiggerItemAccessor",
 		"shears.SnowGolemMixin",
-		"EnchantmentMenuMixin",
 		"MinecraftServerMixin",
 		"NetherBiomeDataMixin",
 		"PistonBaseBlockMixin",