Merge pull request #226 from paulevsGitch/master

Translation

build.gradle

@@ -43,39 +43,46 @@ dependencies {
 
 def useOptional(String dep) {
 	dependencies.modRuntime (dep) {
-		exclude group: "net.fabricmc.fabric-api"
+		exclude group: 'net.fabricmc.fabric-api'
-		exclude group: "net.fabricmc"
+		exclude group: 'net.fabricmc'
 		if (!dep.contains("me.shedaniel")) {
-			exclude group: "me.shedaniel"
+			exclude group: 'me.shedaniel.cloth'
+			exclude group: 'me.shedaniel'
 		}
 	}
 	dependencies.modCompileOnly (dep) {
-		exclude group: "net.fabricmc.fabric-api"
+		exclude group: 'net.fabricmc.fabric-api'
-		exclude group: "net.fabricmc"
+		exclude group: 'net.fabricmc'
 		if (!dep.contains("me.shedaniel")) {
-			exclude group: "me.shedaniel"
+			exclude group: 'me.shedaniel.cloth'
+			exclude group: 'me.shedaniel'
 		}
 	}
 }
 
 def useApi(String dep) {
 	dependencies.modApi (dep) {
-		exclude group: "net.fabricmc.fabric-api"
+		exclude group: 'net.fabricmc.fabric-api'
-		exclude group: "net.fabricmc"
+		exclude group: 'net.fabricmc'
 		if (!dep.contains("me.shedaniel")) {
-			exclude group: "me.shedaniel"
+			exclude group: 'me.shedaniel.cloth'
+			exclude group: 'me.shedaniel'
 		}
 	}
 }
 
 processResources {
 	inputs.property "version", project.version
-	duplicatesStrategy = 'WARN'
+	duplicatesStrategy = 'EXCLUDE'
 
 	from(sourceSets.main.resources.srcDirs) {
 		include "fabric.mod.json"
 		expand "version": project.version
 	}
+
+	from(sourceSets.main.resources.srcDirs) {
+		exclude "fabric.mod.json"
+	}
 }
 
 // ensure that the encoding is set to UTF-8, no matter what the system default is

gradle.properties

@@ -8,14 +8,14 @@ yarn_mappings=6
 loader_version=0.11.3
 
 # Mod Properties
-mod_version = 0.9.8-pre
+mod_version = 0.9.8.5-pre
 maven_group = ru.betterend
 archives_base_name = better-end
 
 # Dependencies
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-patchouli_version = 50-FABRIC
+patchouli_version = 53-FABRIC
-fabric_version = 0.32.9+1.16
+fabric_version = 0.36.0+1.16
+bclib_version = 0.1.44
+rei_version = 5.12.248
 canvas_version = 1.0.+
-bclib_version = 0.1.38
-rei_version = 5.8.10

src/main/java/ru/betterend/blocks/BulbVineLanternBlock.java

@@ -7,6 +7,8 @@ import org.jetbrains.annotations.Nullable;
 
 import com.google.common.collect.Maps;
 
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.client.renderer.block.model.BlockModel;
@@ -57,6 +59,7 @@ public class BulbVineLanternBlock extends EndLanternBlock implements IRenderType
 	}
 
 	@Override
+	@Environment(EnvType.CLIENT)
 	public @Nullable BlockModel getBlockModel(ResourceLocation resourceLocation, BlockState blockState) {
 		Map<String, String> textures = Maps.newHashMap();
 		textures.put("%glow%", getGlowTexture());

src/main/java/ru/betterend/blocks/ChandelierBlock.java

@@ -8,6 +8,8 @@ import org.jetbrains.annotations.Nullable;
 
 import com.google.common.collect.Maps;
 
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.BlockModelRotation;
@@ -46,11 +48,13 @@ public class ChandelierBlock extends BaseAttachedBlock implements IRenderTyped,
 	}
 
 	@Override
+	@Environment(EnvType.CLIENT)
 	public BlockModel getItemModel(ResourceLocation blockId) {
 		return ModelsHelper.createItemModel(blockId);
 	}
 
 	@Override
+	@Environment(EnvType.CLIENT)
 	public @Nullable BlockModel getBlockModel(ResourceLocation resourceLocation, BlockState blockState) {
 		Optional<String> pattern;
 		switch (blockState.getValue(FACING)) {
@@ -67,6 +71,7 @@ public class ChandelierBlock extends BaseAttachedBlock implements IRenderTyped,
 	}
 
 	@Override
+	@Environment(EnvType.CLIENT)
 	public UnbakedModel getModelVariant(ResourceLocation stateId, BlockState blockState, Map<ResourceLocation, UnbakedModel> modelCache) {
 		String state = "_wall";
 		BlockModelRotation rotation = BlockModelRotation.X0_Y0;

src/main/java/ru/betterend/blocks/EmeraldIceBlock.java

@@ -6,6 +6,8 @@ import java.util.Random;
 
 import org.jetbrains.annotations.Nullable;
 
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.core.BlockPos;
@@ -85,6 +87,7 @@ public class EmeraldIceBlock extends HalfTransparentBlock implements IRenderType
 	}
 
 	@Override
+	@Environment(EnvType.CLIENT)
 	public BlockModel getItemModel(ResourceLocation resourceLocation) {
 		return getBlockModel(resourceLocation, defaultBlockState());
 	}

src/main/java/ru/betterend/blocks/EndStoneSmelter.java

@@ -52,7 +52,7 @@ public class EndStoneSmelter extends BaseBlockWithEntity {
 				.resistance(100F)
 				.requiresCorrectToolForDrops()
 				.sound(SoundType.STONE));
-		this.registerDefaultState(this.stateDefinition.any()
+		registerDefaultState(this.stateDefinition.any()
 											  .setValue(FACING, Direction.NORTH)
 											  .setValue(LIT, false));
 	}
@@ -75,7 +75,7 @@ public class EndStoneSmelter extends BaseBlockWithEntity {
 	
 	@Override
 	public BlockState getStateForPlacement(BlockPlaceContext ctx) {
-		return this.defaultBlockState().setValue(FACING, ctx.getHorizontalDirection().getOpposite());
+		return defaultBlockState().setValue(FACING, ctx.getHorizontalDirection().getOpposite());
 	}
 	
 	@Override

src/main/java/ru/betterend/blocks/FlamaeaBlock.java

@@ -18,8 +18,8 @@ import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import ru.bclib.interfaces.ISpetialItem;
 import ru.betterend.blocks.basis.EndPlantBlock;
-import ru.betterend.interfaces.ISpetialItem;
 
 public class FlamaeaBlock extends EndPlantBlock implements ISpetialItem {
 	private static final VoxelShape SHAPE = Block.box(0, 0, 0, 16, 1, 16);

src/main/java/ru/betterend/blocks/HydraluxPetalColoredBlock.java

@@ -4,6 +4,8 @@ import java.util.Optional;
 
 import org.jetbrains.annotations.Nullable;
 
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.color.block.BlockColor;
 import net.minecraft.client.color.item.ItemColor;
@@ -31,6 +33,7 @@ public class HydraluxPetalColoredBlock extends HydraluxPetalBlock implements ICo
 	}
 
 	@Override
+	@Environment(EnvType.CLIENT)
 	public @Nullable BlockModel getBlockModel(ResourceLocation resourceLocation, BlockState blockState) {
 		String path = "betterend:block/block_petal_colored";
 		Optional<String> pattern = Patterns.createJson(Patterns.BLOCK_PETAL_COLORED, path, path);

src/main/java/ru/betterend/blocks/JellyshroomCapBlock.java

@@ -7,6 +7,8 @@ import org.jetbrains.annotations.Nullable;
 
 import com.google.common.collect.Lists;
 
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.color.block.BlockColor;
 import net.minecraft.client.color.item.ItemColor;
@@ -71,11 +73,13 @@ public class JellyshroomCapBlock extends SlimeBlock implements IRenderTyped, Blo
 	}
 
 	@Override
+	@Environment(EnvType.CLIENT)
 	public BlockModel getItemModel(ResourceLocation resourceLocation) {
 		return getBlockModel(resourceLocation, defaultBlockState());
 	}
 
 	@Override
+	@Environment(EnvType.CLIENT)
 	public @Nullable BlockModel getBlockModel(ResourceLocation resourceLocation, BlockState blockState) {
 		Optional<String> pattern = Patterns.createJson(Patterns.BLOCK_COLORED, "jellyshroom_cap");
 		return ModelsHelper.fromPattern(pattern);

src/main/java/ru/betterend/blocks/UmbrellaTreeMembraneBlock.java

@@ -81,6 +81,7 @@ public class UmbrellaTreeMembraneBlock extends SlimeBlock implements IRenderType
 	}
 
 	@Override
+	@Environment(EnvType.CLIENT)
 	public BlockModel getItemModel(ResourceLocation resourceLocation) {
 		return getBlockModel(resourceLocation, defaultBlockState());
 	}

src/main/java/ru/betterend/blocks/basis/EndLanternBlock.java

@@ -2,6 +2,8 @@ package ru.betterend.blocks.basis;
 
 import java.util.Map;
 
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.core.BlockPos;
@@ -125,6 +127,7 @@ public class EndLanternBlock extends BaseBlockNotFull implements SimpleWaterlogg
 	}
 
 	@Override
+	@Environment(EnvType.CLIENT)
 	public UnbakedModel getModelVariant(ResourceLocation stateId, BlockState blockState, Map<ResourceLocation, UnbakedModel> modelCache) {
 		String floor = blockState.getValue(IS_FLOOR) ? "_floor" : "";
 		ResourceLocation modelId = new ResourceLocation(stateId.getNamespace(),

src/main/java/ru/betterend/blocks/basis/PedestalBlock.java

@@ -10,6 +10,8 @@ import org.jetbrains.annotations.Nullable;
 
 import com.google.common.collect.Lists;
 
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.UnbakedModel;
@@ -370,11 +372,13 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 	}
 
 	@Override
+	@Environment(EnvType.CLIENT)
 	public BlockModel getItemModel(ResourceLocation blockId) {
 		return getBlockModel(blockId, defaultBlockState());
 	}
 
 	@Override
+	@Environment(EnvType.CLIENT)
 	public @Nullable BlockModel getBlockModel(ResourceLocation resourceLocation, BlockState blockState) {
 		Map<String, String> textures = createTexturesMap();
 		PedestalState state = blockState.getValue(STATE);
@@ -401,6 +405,7 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 	}
 
 	@Override
+	@Environment(EnvType.CLIENT)
 	public UnbakedModel getModelVariant(ResourceLocation stateId, BlockState blockState, Map<ResourceLocation, UnbakedModel> modelCache) {
 		PedestalState state = blockState.getValue(STATE);
 		ResourceLocation modelId = new ResourceLocation(stateId.getNamespace(),

src/main/java/ru/betterend/blocks/basis/StoneLanternBlock.java

@@ -4,6 +4,8 @@ import java.util.Optional;
 
 import org.jetbrains.annotations.Nullable;
 
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.color.block.BlockColor;
 import net.minecraft.client.color.item.ItemColor;
@@ -44,6 +46,7 @@ public class StoneLanternBlock extends EndLanternBlock implements IColorProvider
 	}
 
 	@Override
+	@Environment(EnvType.CLIENT)
 	public @Nullable BlockModel getBlockModel(ResourceLocation resourceLocation, BlockState blockState) {
 		String blockName = resourceLocation.getPath();
 		Optional<String> pattern = blockState.getValue(IS_FLOOR) ?

src/main/java/ru/betterend/blocks/complex/WoodenMaterial.java

@@ -16,6 +16,7 @@ import ru.bclib.blocks.BaseBarkBlock;
 import ru.bclib.blocks.BaseBarrelBlock;
 import ru.bclib.blocks.BaseBlock;
 import ru.bclib.blocks.BaseBookshelfBlock;
+import ru.bclib.blocks.BaseChestBlock;
 import ru.bclib.blocks.BaseComposterBlock;
 import ru.bclib.blocks.BaseCraftingTableBlock;
 import ru.bclib.blocks.BaseDoorBlock;
@@ -90,7 +91,7 @@ public class WoodenMaterial {
 		ladder = EndBlocks.registerBlock(name + "_ladder", new BaseLadderBlock(planks));
 		sign = EndBlocks.registerBlock(name + "_sign", new BaseSignBlock(planks));
 		
-		chest = EndBlocks.registerBlock(name + "_chest", new BaseFenceBlock(planks));
+		chest = EndBlocks.registerBlock(name + "_chest", new BaseChestBlock(planks));
 		barrel = EndBlocks.registerBlock(name + "_barrel", new BaseBarrelBlock(planks));
 		shelf = EndBlocks.registerBlock(name + "_bookshelf", new BaseBookshelfBlock(planks));
 		composter = EndBlocks.registerBlock(name + "_composter", new BaseComposterBlock(planks));

src/main/java/ru/betterend/blocks/entities/EndStoneSmelterBlockEntity.java

@@ -246,7 +246,7 @@ public class EndStoneSmelterBlockEntity extends BaseContainerBlockEntity impleme
 				if (recipe == null) {
 					recipe = level.getRecipeManager().getRecipeFor(RecipeType.BLASTING, this, level).orElse(null);
 				}
-				boolean accepted = this.canAcceptRecipeOutput(recipe);
+				boolean accepted = canAcceptRecipeOutput(recipe);
 				if (!burning && accepted) {
 					burnTime = getFuelTime(fuel);
 					fuelTime = burnTime;
@@ -265,7 +265,7 @@ public class EndStoneSmelterBlockEntity extends BaseContainerBlockEntity impleme
 				}
 
 				if (burning && accepted) {
-					this.smeltTime++;
+					smeltTime++;
 					if (smeltTime == smeltTimeTotal) {
 						smeltTime = 0;
 						smeltTimeTotal = getSmeltTime();
@@ -276,7 +276,7 @@ public class EndStoneSmelterBlockEntity extends BaseContainerBlockEntity impleme
 					smeltTime = 0;
 				}
 			}
-
+			burning = isBurning();
 			if (initialBurning != burning) {
 				level.setBlock(worldPosition, level.getBlockState(worldPosition).setValue(EndStoneSmelter.LIT, burning), 3);
 				setChanged();

src/main/java/ru/betterend/interfaces/ISpetialItem.java

@@ -1,7 +0,0 @@
-package ru.betterend.interfaces;
-
-public interface ISpetialItem {
-	public int getStackSize();
-	
-	public boolean canPlaceOnWater();
-}

src/main/java/ru/betterend/item/EnchantedItem.java

@@ -1,5 +1,7 @@
 package ru.betterend.item;
 
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
@@ -25,6 +27,7 @@ public class EnchantedItem extends ModelProviderItem {
 	}
 
 	@Override
+	@Environment(EnvType.CLIENT)
 	public BlockModel getItemModel(ResourceLocation resourceLocation) {
 		ResourceLocation sourceId = Registry.ITEM.getKey(source);
 		return ModelsHelper.createItemModel(sourceId);

src/main/java/ru/betterend/item/EndAnvilItem.java

@@ -1,5 +1,7 @@
 package ru.betterend.item;
 
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
@@ -30,6 +32,7 @@ public class EndAnvilItem extends BaseAnvilItem {
 	}
 
 	@Override
+	@Environment(EnvType.CLIENT)
 	public BlockModel getItemModel(ResourceLocation resourceLocation) {
 		Block block = getBlock();
 		ResourceLocation blockId = Registry.BLOCK.getKey(block);

src/main/java/ru/betterend/item/tool/EndHammerItem.java

@@ -8,6 +8,8 @@ import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
 
 import io.netty.util.internal.ThreadLocalRandom;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.tool.attribute.v1.DynamicAttributeTool;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.core.BlockPos;
@@ -133,6 +135,7 @@ public class EndHammerItem extends DiggerItem implements DynamicAttributeTool, I
 	}
 	
 	@Override
+	@Environment(EnvType.CLIENT)
 	public BlockModel getItemModel(ResourceLocation resourceLocation) {
 		return ModelsHelper.createHandheldItem(resourceLocation);
 	}

src/main/java/ru/betterend/mixin/common/LivingEntityMixin.java

@@ -32,6 +32,7 @@ import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
+import ru.betterend.BetterEnd;
 import ru.betterend.interfaces.FallFlyingItem;
 import ru.betterend.interfaces.MobEffectApplier;
 import ru.betterend.item.CrystaliteArmor;
@@ -89,9 +90,13 @@ public abstract class LivingEntityMixin extends Entity {
 
 	@Inject(method = "canBeAffected", at = @At("HEAD"), cancellable = true)
 	public void be_canBeAffected(MobEffectInstance mobEffectInstance, CallbackInfoReturnable<Boolean> info) {
+		try {
 			if (mobEffectInstance.getEffect() == MobEffects.BLINDNESS && getAttributes().getValue(EndAttributes.BLINDNESS_RESISTANCE) > 0.0) {
 				info.setReturnValue(false);
 			}
+		} catch (Exception ex) {
+			BetterEnd.LOGGER.warning("Blindness resistance attribute haven't been registered.");
+		}
 	}
 
 	@Inject(method = "hurt", at = @At("HEAD"))

src/main/java/ru/betterend/particle/InfusionParticleType.java

@@ -17,11 +17,10 @@ import ru.bclib.util.ColorUtil;
 import ru.betterend.registry.EndParticles;
 
 public class InfusionParticleType extends ParticleType<InfusionParticleType> implements ParticleOptions {
-	public static final Codec<InfusionParticleType> CODEC = ItemStack.CODEC.xmap(itemStack -> {
+	public static final Codec<InfusionParticleType> CODEC = ItemStack.CODEC.xmap(
-		return new InfusionParticleType(EndParticles.INFUSION, itemStack);
+			itemStack -> new InfusionParticleType(EndParticles.INFUSION, itemStack),
-	}, infusionParticleType -> {
+			infusionParticleType -> infusionParticleType.itemStack);
-		return infusionParticleType.itemStack;
+
-	});
 	public static final ParticleOptions.Deserializer<InfusionParticleType> PARAMETERS_FACTORY = new ParticleOptions.Deserializer<InfusionParticleType>() {
 		public InfusionParticleType fromCommand(ParticleType<InfusionParticleType> particleType, StringReader stringReader) throws CommandSyntaxException {
 			stringReader.expect(' ');
@@ -35,8 +34,8 @@ public class InfusionParticleType extends ParticleType<InfusionParticleType> imp
 		}
 	};
 	
-	private ParticleType<InfusionParticleType> type;
+	private final ParticleType<InfusionParticleType> type;
-	private ItemStack itemStack;
+	private final ItemStack itemStack;
 	
 	public InfusionParticleType(ParticleType<InfusionParticleType> particleType, ItemStack stack) {
 		super(true, PARAMETERS_FACTORY);

src/main/java/ru/betterend/recipe/builders/AnvilRecipe.java

@@ -4,9 +4,12 @@ import java.util.Objects;
 
 import com.google.gson.JsonObject;
 
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.core.NonNullList;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.TagParser;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.Tag;
@@ -276,6 +279,15 @@ public class AnvilRecipe implements Recipe<Container>, BetterEndRecipe {
 			if (output == null) {
 				throw new IllegalStateException("Output item does not exists!");
 			}
+			if (result.has("nbt")) {
+				try {
+					String nbtData = GsonHelper.getAsString(result, "nbt");
+					CompoundTag nbt = TagParser.parseTag(nbtData);
+					output.setTag(nbt);
+				} catch (CommandSyntaxException ex) {
+					BetterEnd.LOGGER.warning("Error parse nbt data for output.", ex);
+				}
+			}
 			int inputCount = GsonHelper.getAsInt(json, "inputCount", 1);
 			int toolLevel = GsonHelper.getAsInt(json, "toolLevel", 1);
 			int anvilLevel = GsonHelper.getAsInt(json, "anvilLevel", 1);

src/main/java/ru/betterend/recipe/builders/InfusionRecipe.java

@@ -4,11 +4,15 @@ import java.util.Arrays;
 
 import com.google.gson.JsonObject;
 
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.fabricmc.fabric.api.util.NbtType;
 import net.minecraft.core.NonNullList;
+import net.minecraft.nbt.*;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.tags.TagLoader;
 import net.minecraft.util.GsonHelper;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Ingredient;
@@ -17,6 +21,7 @@ import net.minecraft.world.item.crafting.RecipeSerializer;
 import net.minecraft.world.item.crafting.RecipeType;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.storage.loot.GsonAdapterFactory;
 import ru.bclib.recipes.BCLRecipeManager;
 import ru.betterend.BetterEnd;
 import ru.betterend.config.Configs;
@@ -209,6 +214,15 @@ public class InfusionRecipe implements Recipe<InfusionRitual>, BetterEndRecipe {
 			if (recipe.output == null) {
 				throw new IllegalStateException("Output item does not exists!");
 			}
+			if (result.has("nbt")) {
+				try {
+					String nbtData = GsonHelper.getAsString(result, "nbt");
+					CompoundTag nbt = TagParser.parseTag(nbtData);
+					recipe.output.setTag(nbt);
+				} catch (CommandSyntaxException ex) {
+					BetterEnd.LOGGER.warning("Error parse nbt data for output.", ex);
+				}
+			}
 			recipe.group = GsonHelper.getAsString(json, "group", GROUP);
 			recipe.time = GsonHelper.getAsInt(json, "time", 1);
 			

src/main/java/ru/betterend/registry/EndBiomes.java

@@ -61,7 +61,6 @@ import ru.betterend.world.generator.BiomeType;
 import ru.betterend.world.generator.GeneratorOptions;
 
 public class EndBiomes {
-	private static final Map<ResourceLocation, EndBiome> ID_MAP = Maps.newHashMap();
 	public static final Set<ResourceLocation> FABRIC_VOID = Sets.newHashSet();
 	private static final Set<ResourceLocation> SUBBIOMES_UNMUTABLES = Sets.newHashSet();
 	
@@ -161,7 +160,7 @@ public class EndBiomes {
 						else {
 							LAND_BIOMES.addBiomeMutable(endBiome);
 						}
-						ID_MAP.put(id, endBiome);
+						BiomeAPI.registerBiome(endBiome);
 					}
 				}
 			}
@@ -274,7 +273,7 @@ public class EndBiomes {
 			parent.addSubBiome(endBiome);
 			SUBBIOMES.add(endBiome);
 			SUBBIOMES_UNMUTABLES.add(endBiome.getID());
-			ID_MAP.put(endBiome.getID(), endBiome);
+			BiomeAPI.registerBiome(endBiome);
 		}
 		return endBiome;
 	}
@@ -291,7 +290,6 @@ public class EndBiomes {
 			parent.addSubBiome(biome);
 			SUBBIOMES.add(biome);
 			SUBBIOMES_UNMUTABLES.add(biome.getID());
-			ID_MAP.put(biome.getID(), biome);
 			BiomeAPI.addEndLandBiomeToFabricApi(biome);
 		}
 		return biome;
@@ -307,7 +305,6 @@ public class EndBiomes {
 		if (Configs.BIOME_CONFIG.getBoolean(biome.getID(), "enabled", true)) {
 			BiomeAPI.registerBiome(biome);
 			addToPicker(biome, type);
-			ID_MAP.put(biome.getID(), biome);
 			if (type == BiomeType.LAND) {
 				BiomeAPI.addEndLandBiomeToFabricApi(biome);
 			}
@@ -328,7 +325,6 @@ public class EndBiomes {
 			BiomeAPI.registerBiome(biome);
 			SUBBIOMES.add(biome);
 			SUBBIOMES_UNMUTABLES.add(biome.getID());
-			ID_MAP.put(biome.getID(), biome);
 			BiomeAPI.addEndLandBiomeToFabricApi(biome);
 		}
 		return biome;
@@ -341,7 +337,7 @@ public class EndBiomes {
 	 */
 	public static void addSubBiomeIntegration(EndBiome biome, ResourceLocation parent) {
 		if (Configs.BIOME_CONFIG.getBoolean(biome.getID(), "enabled", true)) {
-			EndBiome parentBiome = ID_MAP.get(parent);
+			BCLBiome parentBiome = BiomeAPI.getBiome(parent);
 			if (parentBiome != null && !parentBiome.containsSubBiome(biome)) {
 				parentBiome.addSubBiome(biome);
 			}
@@ -369,7 +365,6 @@ public class EndBiomes {
 		if (Configs.BIOME_CONFIG.getBoolean(biome.getID(), "enabled", true)) {
 			BiomeAPI.registerBiome(biome);
 			CAVE_BIOMES.addBiome(biome);
-			ID_MAP.put(biome.getID(), biome);
 		}
 		return biome;
 	}
@@ -377,8 +372,4 @@ public class EndBiomes {
 	public static EndCaveBiome getCaveBiome(int x, int z) {
 		return (EndCaveBiome) caveBiomeMap.getBiome(x, z);
 	}
-	
-	public static boolean hasBiome(ResourceLocation biomeID) {
-		return ID_MAP.containsKey(biomeID);
-	}
 }

src/main/java/ru/betterend/registry/EndTags.java

@@ -1,20 +1,14 @@
 package ru.betterend.registry;
 
 import java.util.List;
-import java.util.function.Supplier;
-
 import com.google.common.collect.Lists;
 
-import net.fabricmc.fabric.api.tag.TagRegistry;
 import net.fabricmc.fabric.impl.tool.attribute.ToolManagerImpl;
 import net.fabricmc.fabric.impl.tool.attribute.handlers.ModdedToolsVanillaBlocksToolHandler;
 import net.minecraft.core.Registry;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.tags.Tag;
-import net.minecraft.tags.Tag.Named;
-import net.minecraft.tags.TagCollection;
 import net.minecraft.world.food.FoodProperties;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.biome.Biome;
@@ -39,43 +33,12 @@ public class EndTags {
 	// https://fabricmc.net/wiki/tutorial:tags
 	
 	// Block Tags
-	public static final Tag.Named<Block> PEDESTALS = makeBlockTag("pedestal");
+	public static final Tag.Named<Block> PEDESTALS = TagAPI.makeBlockTag(BetterEnd.MOD_ID, "pedestal");
-	public static final Tag.Named<Block> END_STONES = makeCommonBlockTag("end_stones");
+	public static final Tag.Named<Block> END_STONES = TagAPI.makeCommonBlockTag("end_stones");
-	public static final Tag.Named<Block> DRAGON_IMMUNE = getMCBlockTag("dragon_immune");
+	public static final Tag.Named<Block> DRAGON_IMMUNE = TagAPI.getMCBlockTag("dragon_immune");
 	
 	// Item Tags
-	public final static Tag.Named<Item> HAMMERS = makeFabricItemTag("hammers");
+	public final static Tag.Named<Item> HAMMERS = TagAPI.makeItemTag("fabric", "hammers");
-
-	public static <T> Tag.Named<T> makeTag(Supplier<TagCollection<T>> containerSupplier, ResourceLocation id) {
-		Tag<T> tag = containerSupplier.get().getTag(id);
-		return tag == null ? TagRegistry.create(id, containerSupplier) : (Named<T>) tag;
-	}
-
-	public static Tag.Named<Block> makeBlockTag(String name) {
-		return makeTag(BlockTags::getAllTags, BetterEnd.makeID(name));
-	}
-	
-	public static Tag.Named<Item> makeItemTag(String name) {
-		return makeTag(ItemTags::getAllTags, BetterEnd.makeID(name));
-	}
-	
-	public static Tag.Named<Block> makeCommonBlockTag(String name) {
-		return makeTag(BlockTags::getAllTags, new ResourceLocation("c", name));
-	}
-	
-	public static Tag.Named<Item> makeCommonItemTag(String name) {
-		return makeTag(ItemTags::getAllTags, new ResourceLocation("c", name));
-	}
-
-	public static Tag.Named<Item> makeFabricItemTag(String name) {
-		return makeTag(ItemTags::getAllTags, new ResourceLocation("fabric", name));
-	}
-	
-	public static Tag.Named<Block> getMCBlockTag(String name) {
-		ResourceLocation id = new ResourceLocation(name);
-		Tag<Block> tag = BlockTags.getAllTags().getTag(id);
-		return tag == null ? (Named<Block>) TagRegistry.block(id) : (Named<Block>) tag;
-	}
 	
 	public static void register() {
 		TagAPI.addEndGround(EndBlocks.THALLASIUM.ore);
@@ -104,6 +67,8 @@ public class EndTags {
 				ComposterBlockAccessor.callAdd(0.1F, block);
 			}
 		});
+		TagAPI.addEndGround(EndBlocks.CAVE_MOSS);
+		TagHelper.addTag(BlockTags.NYLIUM, EndBlocks.CAVE_MOSS);
 		BonemealAPI.addSpreadableBlock(EndBlocks.CAVE_MOSS);
 		
 		List<Item> hammers = Lists.newArrayList();

src/main/java/ru/betterend/rituals/InfusionRitual.java

@@ -11,7 +11,6 @@ import net.minecraft.nbt.CompoundTag;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.Container;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;

src/main/java/ru/betterend/util/BlockFixer.java

@@ -1,6 +1,7 @@
 package ru.betterend.util;
 
 import java.util.Set;
+import java.util.stream.IntStream;
 
 import com.google.common.collect.Sets;
 
@@ -20,17 +21,19 @@ import ru.betterend.blocks.basis.FurBlock;
 import ru.betterend.registry.EndBlocks;
 
 public class BlockFixer {
-	private static final MutableBlockPos POS = new MutableBlockPos();
 	private static final BlockState AIR = Blocks.AIR.defaultBlockState();
 	private static final BlockState WATER = Blocks.WATER.defaultBlockState();
 
 	public static void fixBlocks(LevelAccessor world, BlockPos start, BlockPos end) {
+		Set<BlockPos> doubleCheck = Sets.newConcurrentHashSet();
+		int dx = end.getX() - start.getX() + 1;
+		int dz = end.getZ() - start.getZ() + 1;
+		int count = dx * dz;
+		IntStream.range(0, count).parallel().forEach(index -> {
+			MutableBlockPos POS = new MutableBlockPos();
+			POS.setX((index % dx) + start.getX());
+			POS.setZ((index / dx) + start.getZ());
 			BlockState state;
-		Set<BlockPos> doubleCheck = Sets.newHashSet();
-		for (int x = start.getX(); x <= end.getX(); x++) {
-			POS.setX(x);
-			for (int z = start.getZ(); z <= end.getZ(); z++) {
-				POS.setZ(z);
 			for (int y = start.getY(); y <= end.getY(); y++) {
 				POS.setY(y);
 				state = world.getBlockState(POS);
@@ -41,12 +44,12 @@ public class BlockFixer {
 				// Liquids
 				else if (!state.getFluidState().isEmpty()) {
 					if (!state.canSurvive(world, POS)) {
-							BlocksHelper.setWithoutUpdate(world, POS, WATER);
+						setWithoutUpdate(world, POS, WATER);
 						POS.setY(POS.getY() - 1);
 						state = world.getBlockState(POS);
 						while (!state.canSurvive(world, POS)) {
 							state = state.getFluidState().isEmpty() ? AIR : WATER;
-								BlocksHelper.setWithoutUpdate(world, POS, state);
+							setWithoutUpdate(world, POS, state);
 							POS.setY(POS.getY() - 1);
 							state = world.getBlockState(POS);
 						}
@@ -55,7 +58,7 @@ public class BlockFixer {
 					if (world.isEmptyBlock(POS)) {
 						POS.setY(y);
 						while (!world.getFluidState(POS).isEmpty()) {
-								BlocksHelper.setWithoutUpdate(world, POS, AIR);
+							setWithoutUpdate(world, POS, AIR);
 							POS.setY(POS.getY() + 1);
 						}
 						continue;
@@ -72,7 +75,7 @@ public class BlockFixer {
 					if (world.isEmptyBlock(POS)) {
 						POS.setY(POS.getY() + 1);
 						while (state.is(EndBlocks.SMARAGDANT_CRYSTAL)) {
-								BlocksHelper.setWithoutUpdate(world, POS, AIR);
+							setWithoutUpdate(world, POS, AIR);
 							POS.setY(POS.getY() + 1);
 							state = world.getBlockState(POS);
 						}
@@ -82,14 +85,14 @@ public class BlockFixer {
 					if (!state.canSurvive(world, POS)) {
 						if (world.getBlockState(POS.above()).getBlock() instanceof StalactiteBlock) {
 							while (state.getBlock() instanceof StalactiteBlock) {
-									BlocksHelper.setWithoutUpdate(world, POS, AIR);
+								setWithoutUpdate(world, POS, AIR);
 								POS.setY(POS.getY() + 1);
 								state = world.getBlockState(POS);
 							}
 						}
 						else {
 							while (state.getBlock() instanceof StalactiteBlock) {
-									BlocksHelper.setWithoutUpdate(world, POS, AIR);
+								setWithoutUpdate(world, POS, AIR);
 								POS.setY(POS.getY() - 1);
 								state = world.getBlockState(POS);
 							}
@@ -98,7 +101,7 @@ public class BlockFixer {
 				}
 				else if (state.is(EndBlocks.CAVE_PUMPKIN)) {
 					if (!world.getBlockState(POS.above()).is(EndBlocks.CAVE_PUMPKIN_SEED)) {
-							BlocksHelper.setWithoutUpdate(world, POS, AIR);
+						setWithoutUpdate(world, POS, AIR);
 					}
 				}
 				else if (!state.canSurvive(world, POS)) {
@@ -110,7 +113,7 @@ public class BlockFixer {
 
 						for (int i = 0; i < 64 && !ends.isEmpty(); i++) {
 							ends.forEach((pos) -> {
-									BlocksHelper.setWithoutUpdate(world, pos, AIR);
+								setWithoutUpdate(world, pos, AIR);
 								for (Direction dir : BlocksHelper.HORIZONTAL) {
 									BlockPos p = pos.relative(dir);
 									BlockState st = world.getBlockState(p);
@@ -132,7 +135,7 @@ public class BlockFixer {
 					// Vines
 					else if (state.getBlock() instanceof BaseVineBlock) {
 						while (world.getBlockState(POS).getBlock() instanceof BaseVineBlock) {
-								BlocksHelper.setWithoutUpdate(world, POS, AIR);
+							setWithoutUpdate(world, POS, AIR);
 							POS.setY(POS.getY() - 1);
 						}
 					}
@@ -145,11 +148,11 @@ public class BlockFixer {
 
 						int ray = BlocksHelper.downRayRep(world, POS.immutable(), 64);
 						if (ray > 32) {
-								BlocksHelper.setWithoutUpdate(world, POS, Blocks.END_STONE.defaultBlockState());
+							setWithoutUpdate(world, POS, Blocks.END_STONE.defaultBlockState());
 							if (world.getRandom().nextBoolean()) {
 								POS.setY(POS.getY() - 1);
 								state = world.getBlockState(POS);
-									BlocksHelper.setWithoutUpdate(world, POS, Blocks.END_STONE.defaultBlockState());
+								setWithoutUpdate(world, POS, Blocks.END_STONE.defaultBlockState());
 							}
 						}
 						else {
@@ -162,9 +165,9 @@ public class BlockFixer {
 									break;
 								}
 							}
-								BlocksHelper.setWithoutUpdate(world, POS, replacement);
+							setWithoutUpdate(world, POS, replacement);
 							POS.setY(y - ray);
-								BlocksHelper.setWithoutUpdate(world, POS, falling);
+							setWithoutUpdate(world, POS, falling);
 						}
 					}
 					// Blocks without support
@@ -172,30 +175,29 @@ public class BlockFixer {
 						// Blue Vine
 						if (state.getBlock() instanceof BlueVineBlock) {
 							while (state.is(EndBlocks.BLUE_VINE) || state.is(EndBlocks.BLUE_VINE_LANTERN) || state.is(EndBlocks.BLUE_VINE_FUR)) {
-									BlocksHelper.setWithoutUpdate(world, POS, AIR);
+								setWithoutUpdate(world, POS, AIR);
 								POS.setY(POS.getY() + 1);
 								state = world.getBlockState(POS);
 							}
 						}
 						// Double plants
 						if (state.getBlock() instanceof BaseDoublePlantBlock) {
-								BlocksHelper.setWithoutUpdate(world, POS, AIR);
+							setWithoutUpdate(world, POS, AIR);
 							POS.setY(POS.getY() + 1);
-								BlocksHelper.setWithoutUpdate(world, POS, AIR);
+							setWithoutUpdate(world, POS, AIR);
 						}
 						// Other blocks
 						else {
-								BlocksHelper.setWithoutUpdate(world, POS, getAirOrFluid(state));
+							setWithoutUpdate(world, POS, getAirOrFluid(state));
-							}
-						}
 						}
 					}
 				}
 			}
+		});
 
 		doubleCheck.forEach((pos) -> {
 			if (!world.getBlockState(pos).canSurvive(world, pos)) {
-				BlocksHelper.setWithoutUpdate(world, pos, AIR);
+				setWithoutUpdate(world, pos, AIR);
 			}
 		});
 	}
@@ -203,4 +205,10 @@ public class BlockFixer {
 	private static BlockState getAirOrFluid(BlockState state) {
 		return state.getFluidState().isEmpty() ? AIR : state.getFluidState().createLegacyBlock();
 	}
+
+	private static void setWithoutUpdate(LevelAccessor world, BlockPos pos, BlockState state) {
+		synchronized (world) {
+			BlocksHelper.setWithoutUpdate(world, pos, state);
+		}
+	}
 }

src/main/java/ru/betterend/world/biome/EndBiome.java

@@ -5,14 +5,22 @@ import net.minecraft.world.level.biome.Biome;
 import ru.bclib.world.biomes.BCLBiome;
 import ru.bclib.world.biomes.BCLBiomeDef;
 import ru.betterend.config.Configs;
+import ru.betterend.registry.EndFeatures;
 
 public class EndBiome extends BCLBiome {
-	public EndBiome(BCLBiomeDef definition) {
+	public EndBiome(BCLBiomeDef def) {
-		super(definition.loadConfigValues(Configs.BIOME_CONFIG));
+		super(updateDef(def));
+		
 	}
 
 	public EndBiome(ResourceLocation id, Biome biome, float fogDensity, float genChance, boolean hasCaves) {
 		super(id, biome, fogDensity, genChance);
 		this.addCustomData("has_caves", hasCaves);
 	}
+	
+	private static BCLBiomeDef updateDef(BCLBiomeDef def) {
+		def.loadConfigValues(Configs.BIOME_CONFIG);
+		EndFeatures.addDefaultFeatures(def);
+		return def;
+	}
 }

src/main/java/ru/betterend/world/features/terrain/caves/EndCaveFeature.java

@@ -58,19 +58,17 @@ public abstract class EndCaveFeature extends DefaultFeature {
 		if (!caveBlocks.isEmpty()) {
 			if (biome != null) {
 				setBiomes(world, biome, caveBlocks);
-				Set<BlockPos> floorPositions = Sets.newHashSet();
+				Set<BlockPos> floorPositions = Sets.newConcurrentHashSet();
-				Set<BlockPos> ceilPositions = Sets.newHashSet();
+				Set<BlockPos> ceilPositions = Sets.newConcurrentHashSet();
-				MutableBlockPos mut = new MutableBlockPos();
+				caveBlocks.parallelStream().forEach((bpos) -> {
-				caveBlocks.forEach((bpos) -> {
+					if (world.getBlockState(bpos).getMaterial().isReplaceable()) {
-					mut.set(bpos);
+						BlockPos side = bpos.below();
-					if (world.getBlockState(mut).getMaterial().isReplaceable()) {
+						if (world.getBlockState(side).is(TagAPI.GEN_TERRAIN)) {
-						mut.setY(bpos.getY() - 1);
+							floorPositions.add(side);
-						if (world.getBlockState(mut).is(TagAPI.GEN_TERRAIN)) {
-							floorPositions.add(mut.immutable());
 						}
-						mut.setY(bpos.getY() + 1);
+						side = bpos.above();
-						if (world.getBlockState(mut).is(TagAPI.GEN_TERRAIN)) {
+						if (world.getBlockState(side).is(TagAPI.GEN_TERRAIN)) {
-							ceilPositions.add(mut.immutable());
+							ceilPositions.add(side);
 						}
 					}
 				});

src/main/java/ru/betterend/world/features/terrain/caves/RoundCaveFeature.java

@@ -2,6 +2,7 @@ package ru.betterend.world.features.terrain.caves;
 
 import java.util.Random;
 import java.util.Set;
+import java.util.stream.IntStream;
 
 import com.google.common.collect.Sets;
 
@@ -30,47 +31,45 @@ public class RoundCaveFeature extends EndCaveFeature {
 		double hr = radius * 0.75;
 		double nr = radius * 0.25;
 		
-		BlockState state;
+		int dx = x2 - x1 + 1;
+		int dz = z2 - z1 + 1;
+		int count = dx * dz;
+		Set<BlockPos> blocks = Sets.newConcurrentHashSet();
+		IntStream.range(0, count).parallel().forEach(index -> {
 			MutableBlockPos bpos = new MutableBlockPos();
-		Set<BlockPos> blocks = Sets.newHashSet();
+			int x = (index % dx) + x1;
-		for (int x = x1; x <= x2; x++) {
+			int z = (index / dx) + z1;
-			int xsq = x - center.getX();
-			xsq *= xsq;
 			bpos.setX(x);
-			for (int z = z1; z <= z2; z++) {
-				int zsq = z - center.getZ();
-				zsq *= zsq;
 			bpos.setZ(z);
+			int xsq = MHelper.sqr(x - center.getX());
+			int zsq = MHelper.sqr(z - center.getZ());
+			int dxz = xsq + zsq;
+			BlockState state;
 			for (int y = y1; y <= y2; y++) {
-					int ysq = y - center.getY();
+				int ysq = (int) MHelper.sqr((y - center.getY()) * 1.6);
-					ysq *= 1.6;
-					ysq *= ysq;
-					bpos.setY(y);
 				double r = noise.eval(x * 0.1, y * 0.1, z * 0.1) * nr + hr;
-					double dist = xsq + ysq + zsq;
+				double dist = dxz + ysq;
 				if (dist < r * r) {
+					bpos.setY(y);
 					state = world.getBlockState(bpos);
 					if (isReplaceable(state) && !isWaterNear(world, bpos)) {
-							BlocksHelper.setWithoutUpdate(world, bpos, CAVE_AIR);
 						blocks.add(bpos.immutable());
 						
 						while (state.getMaterial().equals(Material.LEAVES)) {
-								BlocksHelper.setWithoutUpdate(world, bpos, CAVE_AIR);
 							bpos.setY(bpos.getY() + 1);
 							state = world.getBlockState(bpos);
 						}
 						
 						bpos.setY(y - 1);
 						while (state.getMaterial().equals(Material.LEAVES)) {
-								BlocksHelper.setWithoutUpdate(world, bpos, CAVE_AIR);
 							bpos.setY(bpos.getY() - 1);
 							state = world.getBlockState(bpos);
 						}
 					}
 				}
 			}
-			}
+		});
-		}
+		blocks.forEach(bpos -> BlocksHelper.setWithoutUpdate(world, bpos, CAVE_AIR));
 		
 		return blocks;
 	}

src/main/java/ru/betterend/world/features/terrain/caves/TunelCaveFeature.java

@@ -3,6 +3,7 @@ package ru.betterend.world.features.terrain.caves;
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
+import java.util.stream.IntStream;
 
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -12,14 +13,18 @@ import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.util.Mth;
 import net.minecraft.world.level.WorldGenLevel;
+import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.levelgen.Heightmap.Types;
 import net.minecraft.world.level.levelgen.feature.Feature;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
+import ru.bclib.api.BiomeAPI;
 import ru.bclib.api.TagAPI;
 import ru.bclib.util.BlocksHelper;
+import ru.bclib.world.biomes.BCLBiome;
 import ru.betterend.noise.OpenSimplexNoise;
 import ru.betterend.registry.EndBiomes;
 import ru.betterend.world.biome.cave.EndCaveBiome;
@@ -31,42 +36,56 @@ public class TunelCaveFeature extends EndCaveFeature {
 		if ((long) cx * (long) cx + (long) cz + (long) cz < 256) {
 			return Sets.newHashSet();
 		}
+		
 		int x1 = cx << 4;
 		int z1 = cz << 4;
 		int x2 = x1 + 16;
 		int z2 = z1 + 16;
-		int y2 = world.getHeight();
+		
 		Random rand = new Random(world.getSeed());
 		OpenSimplexNoise noiseH = new OpenSimplexNoise(rand.nextInt());
 		OpenSimplexNoise noiseV = new OpenSimplexNoise(rand.nextInt());
 		OpenSimplexNoise noiseD = new OpenSimplexNoise(rand.nextInt());
 		
-		Set<BlockPos> positions = Sets.newHashSet();
+		Set<BlockPos> positions = Sets.newConcurrentHashSet();
+		
+		float a = hasCaves(world, new BlockPos(x1, 0, z1)) ? 1F : 0F;
+		float b = hasCaves(world, new BlockPos(x2, 0, z1)) ? 1F : 0F;
+		float c = hasCaves(world, new BlockPos(x1, 0, z2)) ? 1F : 0F;
+		float d = hasCaves(world, new BlockPos(x2, 0, z2)) ? 1F : 0F;
+		
+		ChunkAccess chunk = world.getChunk(cx, cz);
+		IntStream.range(0, 256).parallel().forEach(index -> {
 			MutableBlockPos pos = new MutableBlockPos();
-		for (int x = x1; x < x2; x++) {
+			int x = index & 15;
-			pos.setX(x);
+			int z = index >> 4;
-			for (int z = z1; z < z2; z++) {
+			int wheight = chunk.getHeight(Types.WORLD_SURFACE_WG, x, z);
-				pos.setZ(z);
+			float dx = x / 16F;
-				for (int y = 0; y < y2; y++) {
+			float dz = z / 16F;
+			pos.setX(x + x1);
+			pos.setZ(z + z1);
+			float da = Mth.lerp(dx, a, b);
+			float db = Mth.lerp(dx, c, d);
+			float density = 1 - Mth.lerp(dz, da, db);
+			if (density < 0.5) {
+				for (int y = 0; y < wheight; y++) {
 					pos.setY(y);
-					float val = Mth.abs((float) noiseH.eval(x * 0.02, y * 0.01, z * 0.02));
+					float gradient = 1 - Mth.clamp((wheight - y) * 0.1F, 0F, 1F);
-					float vert = Mth.sin((y + (float) noiseV.eval(x * 0.01, z * 0.01) * 20) * 0.1F) * 0.9F;
+					if (gradient > 0.5) {
-					float dist = (float) noiseD.eval(x * 0.1, y * 0.1, z * 0.1) * 0.12F;
+						break;
-					vert *= vert;
+					}
-					if (val + vert + dist < 0.15 && world.getBlockState(pos).is(TagAPI.GEN_TERRAIN) && noWaterNear(world, pos)) {
+					float val = Mth.abs((float) noiseH.eval(pos.getX() * 0.02, y * 0.01, pos.getZ() * 0.02));
-						BlocksHelper.setWithoutUpdate(world, pos, AIR);
+					float vert = Mth.sin((y + (float) noiseV.eval(pos.getX() * 0.01, pos.getZ() * 0.01) * 20) * 0.1F) * 0.9F;
+					float dist = (float) noiseD.eval(pos.getX() * 0.1, y * 0.1, pos.getZ() * 0.1) * 0.12F;
+					val = (val + vert * vert + dist) + density + gradient;
+					if (val < 0.15 && world.getBlockState(pos).is(TagAPI.GEN_TERRAIN) && noWaterNear(world, pos)) {
 						positions.add(pos.immutable());
-						int height = world.getHeight(Types.WORLD_SURFACE_WG, pos.getX(), pos.getZ());
-						if (height < pos.getY() + 4) {
-							while (pos.getY() < height && noWaterNear(world, pos)) {
-								pos.setY(pos.getY() + 1);
-								BlocksHelper.setWithoutUpdate(world, pos, AIR);
-							}
-						}
-					}
 					}
 				}
 			}
+		});
+		positions.forEach(bpos -> BlocksHelper.setWithoutUpdate(world, bpos, CAVE_AIR));
+		
 		return positions;
 	}
 	
@@ -192,4 +211,17 @@ public class TunelCaveFeature extends EndCaveFeature {
 			}
 		});
 	}
+	
+	protected boolean hasCaves(WorldGenLevel world, BlockPos pos) {
+		return hasCavesInBiome(world, pos.offset(-8, 0, -8)) &&
+				hasCavesInBiome(world, pos.offset(8, 0, -8)) &&
+				hasCavesInBiome(world, pos.offset(-8, 0, 8)) &&
+				hasCavesInBiome(world, pos.offset(8, 0, 8));
+	}
+	
+	protected boolean hasCavesInBiome(WorldGenLevel world, BlockPos pos) {
+		Biome biome = world.getBiome(pos);
+		BCLBiome endBiome = BiomeAPI.getFromBiome(biome);
+		return endBiome.getCustomData("has_caves", true);
+	}
 }

src/main/java/ru/betterend/world/generator/BetterEndBiomeSource.java

@@ -63,7 +63,8 @@ public class BetterEndBiomeSource extends BiomeSource {
 	private static List<Biome> getBiomes(Registry<Biome> biomeRegistry) {
 		List<Biome> list = Lists.newArrayList();
 		biomeRegistry.forEach((biome) -> {
-			if (EndBiomes.hasBiome(biomeRegistry.getKey(biome))) {
+			BCLBiome bclBiome = BiomeAPI.getBiome(biomeRegistry.getKey(biome));
+			if (bclBiome instanceof EndBiome) {
 				list.add(biome);
 			}
 		});

src/main/resources/fabric.mod.json

@@ -46,7 +46,7 @@
 		"fabricloader": ">=0.11.0",
 		"fabric": ">=0.32.0",
 		"minecraft": ">=1.16.4",
-	  	"bclib": ">=0.1.38"
+	  	"bclib": ">=0.1.44"
 	},
 	"suggests": {
 		"byg": ">=1.1.3",