diff --git a/src/main/java/ru/betterend/entity/DragonflyEntity.java b/src/main/java/ru/betterend/entity/DragonflyEntity.java
index 63ff1ed3..998228cf 100644
--- a/src/main/java/ru/betterend/entity/DragonflyEntity.java
+++ b/src/main/java/ru/betterend/entity/DragonflyEntity.java
@@ -6,7 +6,7 @@ import java.util.Random;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.sounds.SoundEvent;
-import net.minecraft.world.entity.AgableMob;
+import net.minecraft.world.entity.AgeableMob;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.Mob;
@@ -194,7 +194,7 @@ public class DragonflyEntity extends Animal implements FlyingAnimal {
 	}
 
 	@Override
-	public AgableMob getBreedOffspring(ServerLevel world, AgableMob entity) {
+	public AgeableMob getBreedOffspring(ServerLevel world, AgeableMob entity) {
 		return EndEntities.DRAGONFLY.create(world);
 	}
 	
diff --git a/src/main/java/ru/betterend/entity/SilkMothEntity.java b/src/main/java/ru/betterend/entity/SilkMothEntity.java
index 4c54e387..98f3ac16 100644
--- a/src/main/java/ru/betterend/entity/SilkMothEntity.java
+++ b/src/main/java/ru/betterend/entity/SilkMothEntity.java
@@ -16,7 +16,7 @@ import net.minecraft.server.level.ServerLevel;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.entity.AgableMob;
+import net.minecraft.world.entity.AgeableMob;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.Mob;
@@ -162,7 +162,7 @@ public class SilkMothEntity extends Animal implements FlyingAnimal {
 	}
 
 	@Override
-	public AgableMob getBreedOffspring(ServerLevel world, AgableMob entity) {
+	public AgeableMob getBreedOffspring(ServerLevel world, AgeableMob entity) {
 		return EndEntities.SILK_MOTH.create(world);
 	}
 	
diff --git a/src/main/java/ru/betterend/integration/byg/BYGIntegration.java b/src/main/java/ru/betterend/integration/byg/BYGIntegration.java
index 7306d1dd..845c63e4 100644
--- a/src/main/java/ru/betterend/integration/byg/BYGIntegration.java
+++ b/src/main/java/ru/betterend/integration/byg/BYGIntegration.java
@@ -5,7 +5,7 @@ import java.util.stream.Collectors;
 
 import net.minecraft.data.BuiltinRegistries;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.ai.behavior.WeightedList;
+import net.minecraft.world.entity.ai.behavior.ShufflingList;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.block.Block;
 import ru.bclib.api.BiomeAPI;
@@ -62,7 +62,7 @@ public class BYGIntegration extends ModIntegration implements EndBiomeIntegratio
 							EndBiomes.LAND_BIOMES.removeMutableBiome(biomeID);
 							EndBiomes.VOID_BIOMES.addBiomeMutable(endBiome);
 						}
-						WeightedList<ResourceLocation> subBiomes = this.getAndExecuteRuntime(biomeClass, obj, "getHills");
+						ShufflingList<ResourceLocation> subBiomes = this.getAndExecuteRuntime(biomeClass, obj, "getHills");
 						if (subBiomes != null) {
 							subBiomes.stream().collect(Collectors.toList()).forEach((id) -> {
 								BCLBiome subBiome = BiomeAPI.getBiome(id);
diff --git a/src/main/java/ru/betterend/item/EndBucketItem.java b/src/main/java/ru/betterend/item/EndBucketItem.java
index 7d7a729a..bccc0c06 100644
--- a/src/main/java/ru/betterend/item/EndBucketItem.java
+++ b/src/main/java/ru/betterend/item/EndBucketItem.java
@@ -1,12 +1,12 @@
 package ru.betterend.item;
 
 import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.item.FishBucketItem;
+import net.minecraft.world.item.MobBucketItem;
 import net.minecraft.world.level.material.Fluids;
 import ru.bclib.client.models.ItemModelProvider;
 import ru.betterend.registry.EndItems;
 
-public class EndBucketItem extends FishBucketItem implements ItemModelProvider {
+public class EndBucketItem extends MobBucketItem implements ItemModelProvider {
 	public EndBucketItem(EntityType<?> type) {
 		super(type, Fluids.WATER, EndItems.makeEndItemSettings().stacksTo(1));
 	}
diff --git a/src/main/java/ru/betterend/util/LootTableUtil.java b/src/main/java/ru/betterend/util/LootTableUtil.java
index 1b8cb09d..f7439249 100644
--- a/src/main/java/ru/betterend/util/LootTableUtil.java
+++ b/src/main/java/ru/betterend/util/LootTableUtil.java
@@ -4,9 +4,9 @@ import net.fabricmc.fabric.api.loot.v1.FabricLootPoolBuilder;
 import net.fabricmc.fabric.api.loot.v1.event.LootTableLoadingCallback;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Items;
-import net.minecraft.world.level.storage.loot.RandomValueBounds;
 import net.minecraft.world.level.storage.loot.entries.LootItem;
 import net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceCondition;
+import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator;
 import ru.betterend.registry.EndItems;
 
 public class LootTableUtil {
@@ -16,13 +16,13 @@ public class LootTableUtil {
 		LootTableLoadingCallback.EVENT.register((resourceManager, lootManager, id, supplier, setter) -> {
 			if (END_CITY_TREASURE_ID.equals(id)) {
 				FabricLootPoolBuilder builder = FabricLootPoolBuilder.builder();
-				builder.setRolls(RandomValueBounds.between(0, 5));
+				builder.setRolls(UniformGenerator.between(0, 5));
 				builder.withCondition(LootItemRandomChanceCondition.randomChance(0.5f).build());
 				builder.withEntry(LootItem.lootTableItem(Items.GHAST_TEAR).build());
 				supplier.withPool(builder);
 				
 				builder = FabricLootPoolBuilder.builder();
-				builder.setRolls(RandomValueBounds.between(0, 5));
+				builder.setRolls(UniformGenerator.between(0, 5));
 				builder.withCondition(LootItemRandomChanceCondition.randomChance(0.1f).build());
 				builder.withEntry(LootItem.lootTableItem(EndItems.MUSIC_DISC_STRANGE_AND_ALIEN).build());
 				builder.withEntry(LootItem.lootTableItem(EndItems.MUSIC_DISC_GRASPING_AT_STARS).build());
diff --git a/src/main/java/ru/betterend/world/biome/cave/EndCaveBiome.java b/src/main/java/ru/betterend/world/biome/cave/EndCaveBiome.java
index e25ea7db..79af7269 100644
--- a/src/main/java/ru/betterend/world/biome/cave/EndCaveBiome.java
+++ b/src/main/java/ru/betterend/world/biome/cave/EndCaveBiome.java
@@ -3,7 +3,7 @@ package ru.betterend.world.biome.cave;
 import java.util.Random;
 
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.entity.ai.behavior.WeightedList;
+import net.minecraft.world.entity.ai.behavior.ShufflingList;
 import net.minecraft.world.level.biome.Biome.BiomeCategory;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.levelgen.feature.Feature;
@@ -16,8 +16,8 @@ import ru.betterend.world.biome.EndBiome;
 import ru.betterend.world.features.terrain.caves.CaveChunkPopulatorFeature;
 
 public class EndCaveBiome extends EndBiome {
-	private WeightedList<Feature<?>> floorFeatures = new WeightedList<Feature<?>>();
-	private WeightedList<Feature<?>> ceilFeatures = new WeightedList<Feature<?>>();
+	private ShufflingList<Feature<?>> floorFeatures = new ShufflingList<Feature<?>>();
+	private ShufflingList<Feature<?>> ceilFeatures = new ShufflingList<Feature<?>>();
 	
 	public EndCaveBiome(BCLBiomeDef definition) {
 		super(makeDef(definition));