New items

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

@@ -4,7 +4,6 @@ import net.minecraft.block.BlockState;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-
 import ru.betterend.rituals.InfusionRitual;
 
 public class InfusionPedestalEntity extends PedestalBlockEntity {

src/main/java/ru/betterend/entity/EntityEndFish.java

@@ -15,7 +15,6 @@ import net.minecraft.entity.data.TrackedData;
 import net.minecraft.entity.data.TrackedDataHandlerRegistry;
 import net.minecraft.entity.passive.SchoolingFishEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.sound.SoundEvent;
@@ -24,6 +23,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
 import net.minecraft.world.ServerWorldAccess;
 import net.minecraft.world.World;
+import ru.betterend.registry.EndItems;
 
 public class EntityEndFish extends SchoolingFishEntity {
 	public static final int VARIANTS = 5;
@@ -61,7 +61,7 @@ public class EntityEndFish extends SchoolingFishEntity {
 
 	@Override
 	protected ItemStack getFishBucketItem() {
-		return new ItemStack(Items.WATER_BUCKET);
+		return new ItemStack(EndItems.BUCKET_END_FISH);
 	}
 
 	@Override

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

@@ -8,7 +8,6 @@ import org.spongepowered.asm.mixin.Shadow;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.recipe.Ingredient;
-
 import ru.betterend.interfaces.CompoundSerializer;
 
 @Mixin(Ingredient.class)

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

@@ -17,7 +17,6 @@ import net.minecraft.util.Identifier;
 import net.minecraft.util.JsonHelper;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.world.World;
-
 import ru.betterend.BetterEnd;
 import ru.betterend.interfaces.CompoundSerializer;
 import ru.betterend.recipe.EndRecipeManager;

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

@@ -10,9 +10,12 @@ import net.minecraft.block.dispenser.ItemDispenserBehavior;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.SpawnReason;
+import net.minecraft.fluid.Fluids;
 import net.minecraft.item.ArmorItem;
 import net.minecraft.item.BlockItem;
+import net.minecraft.item.FishBucketItem;
 import net.minecraft.item.FoodComponent;
+import net.minecraft.item.FoodComponents;
 import net.minecraft.item.Item;
 import net.minecraft.item.Item.Settings;
 import net.minecraft.item.ItemStack;
@@ -81,6 +84,9 @@ public class EndItems {
 	// Food //
 	public final static Item SHADOW_BERRY_RAW = registerFood("shadow_berry_raw", 4, 0.5F);
 	public final static Item SHADOW_BERRY_COOKED = registerFood("shadow_berry_cooked", 6, 0.7F);
+	public final static Item END_FISH_RAW = registerFood("end_fish_raw", FoodComponents.SALMON);
+	public final static Item END_FISH_COOKED = registerFood("end_fish_cooked", FoodComponents.COOKED_SALMON);
+	public final static Item BUCKET_END_FISH = registerItem("bucket_end_fish", new FishBucketItem(EndEntities.END_FISH, Fluids.WATER, makeSettings()));
 	
 	// Other //
 	public static final Item ETERNAL_CRYSTAL = registerItem("eternal_crystal", new EternalCrystal());

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

@@ -10,7 +10,6 @@ import net.minecraft.nbt.CompoundTag;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.world.World;
-
 import ru.betterend.blocks.entities.InfusionPedestalEntity;
 import ru.betterend.blocks.entities.PedestalBlockEntity;
 import ru.betterend.recipe.builders.InfusionRecipe;

src/main/java/ru/betterend/world/features/bushes/BushFeature.java

@@ -0,0 +1,81 @@
+package ru.betterend.world.features.bushes;
+
+import java.util.Random;
+import java.util.function.Function;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.LeavesBlock;
+import net.minecraft.block.Material;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.world.StructureWorldAccess;
+import net.minecraft.world.gen.chunk.ChunkGenerator;
+import net.minecraft.world.gen.feature.DefaultFeatureConfig;
+import ru.betterend.noise.OpenSimplexNoise;
+import ru.betterend.registry.EndTags;
+import ru.betterend.util.BlocksHelper;
+import ru.betterend.util.MHelper;
+import ru.betterend.util.sdf.SDF;
+import ru.betterend.util.sdf.operator.SDFDisplacement;
+import ru.betterend.util.sdf.operator.SDFScale3D;
+import ru.betterend.util.sdf.operator.SDFSubtraction;
+import ru.betterend.util.sdf.operator.SDFTranslate;
+import ru.betterend.util.sdf.primitive.SDFSphere;
+import ru.betterend.world.features.DefaultFeature;
+
+public class BushFeature extends DefaultFeature {
+	private static final Function<BlockState, Boolean> REPLACE;
+	private final Block leaves;
+	private final Block stem;
+	
+	public BushFeature(Block leaves, Block stem) {
+		this.leaves = leaves;
+		this.stem = stem;
+	}
+	
+	@Override
+	public boolean generate(StructureWorldAccess world, ChunkGenerator chunkGenerator, Random random, BlockPos pos, DefaultFeatureConfig config) {
+		if (!world.getBlockState(pos.down()).getBlock().isIn(EndTags.END_GROUND)) return false;
+		
+		float radius = MHelper.randRange(1.8F, 3.5F, random);
+		OpenSimplexNoise noise = new OpenSimplexNoise(random.nextInt());
+		SDF sphere = new SDFSphere().setRadius(radius).setBlock(this.leaves);
+		sphere = new SDFScale3D().setScale(1, 0.5F, 1).setSource(sphere);
+		sphere = new SDFDisplacement().setFunction((vec) -> { return (float) noise.eval(vec.getX() * 0.2, vec.getY() * 0.2, vec.getZ() * 0.2) * 3; }).setSource(sphere);
+		sphere = new SDFDisplacement().setFunction((vec) -> { return MHelper.randRange(-2F, 2F, random); }).setSource(sphere);
+		sphere = new SDFSubtraction().setSourceA(sphere).setSourceB(new SDFTranslate().setTranslate(0, -radius, 0).setSource(sphere));
+		sphere.setReplaceFunction(REPLACE);
+		sphere.setPostProcess((info) -> {
+			if (info.getState().getBlock() instanceof LeavesBlock) {
+				int distance = info.getPos().getManhattanDistance(pos);
+				if (distance < 7) {
+					return info.getState().with(LeavesBlock.DISTANCE, distance);
+				}
+				else {
+					return AIR;
+				}
+			}
+			return info.getState();
+		});
+		sphere.fillRecursive(world, pos);
+		BlocksHelper.setWithoutUpdate(world, pos, stem);
+		for (Direction d: Direction.values()) {
+			BlockPos p = pos.offset(d);
+			if (world.isAir(p)) {
+				BlocksHelper.setWithoutUpdate(world, p, leaves.getDefaultState().with(LeavesBlock.DISTANCE, 1));
+			}
+		}
+		
+		return true;
+	}
+	
+	static {
+		REPLACE = (state) -> {
+			if (state.getMaterial().equals(Material.PLANT)) {
+				return true;
+			}
+			return state.getMaterial().isReplaceable();
+		};
+	}
+}