From d2ade23f36183c6fc49a3324422166ebd5ba3655 Mon Sep 17 00:00:00 2001
From: paulevsGitch <paulevs@yandex.ru>
Date: Thu, 22 Oct 2020 23:21:41 +0300
Subject: [PATCH] More fixes

---
 src/main/java/ru/betterend/blocks/BlockEndLotusSeed.java     | 2 +-
 .../java/ru/betterend/mixin/common/BoneMealItemMixin.java    | 3 +++
 src/main/java/ru/betterend/registry/BlockTagRegistry.java    | 2 ++
 .../java/ru/betterend/world/features/RoundCaveFeature.java   | 3 ++-
 src/main/resources/assets/betterend/lang/en_us.json          | 5 ++++-
 src/main/resources/assets/betterend/lang/ru_ru.json          | 5 ++++-
 6 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/main/java/ru/betterend/blocks/BlockEndLotusSeed.java b/src/main/java/ru/betterend/blocks/BlockEndLotusSeed.java
index dd82fd3b..3f0b0a9b 100644
--- a/src/main/java/ru/betterend/blocks/BlockEndLotusSeed.java
+++ b/src/main/java/ru/betterend/blocks/BlockEndLotusSeed.java
@@ -64,7 +64,7 @@ public class BlockEndLotusSeed extends BlockUnderwaterPlantWithAge {
 			BlocksHelper.setWithoutUpdate(world, bpos, flower);
 			bpos.setY(bpos.getY() - 1);
 			stem = world.getBlockState(bpos);
-			if (stem.isOf(BlockRegistry.END_LOTUS_STEM)) {
+			if (!stem.isOf(BlockRegistry.END_LOTUS_STEM)) {
 				stem = BlockRegistry.END_LOTUS_STEM.getDefaultState();
 				if (!world.getBlockState(bpos.north()).getFluidState().isEmpty()) {
 					stem = stem.with(BlockEndLotusStem.WATERLOGGED, true);
diff --git a/src/main/java/ru/betterend/mixin/common/BoneMealItemMixin.java b/src/main/java/ru/betterend/mixin/common/BoneMealItemMixin.java
index 1a0a4a46..d5504563 100644
--- a/src/main/java/ru/betterend/mixin/common/BoneMealItemMixin.java
+++ b/src/main/java/ru/betterend/mixin/common/BoneMealItemMixin.java
@@ -85,6 +85,9 @@ public class BoneMealItemMixin {
 		if (block == BlockRegistry.END_MOSS || block == BlockRegistry.END_MYCELIUM) {
 			return world.random.nextBoolean() ? BlockRegistry.CREEPING_MOSS.getDefaultState() : BlockRegistry.UMBRELLA_MOSS.getDefaultState();
 		}
+		else if (block == BlockRegistry.CAVE_MOSS) {
+			return BlockRegistry.CAVE_GRASS.getDefaultState();
+		}
 		else if (block == BlockRegistry.CHORUS_NYLIUM) {
 			return BlockRegistry.CHORUS_GRASS.getDefaultState();
 		}
diff --git a/src/main/java/ru/betterend/registry/BlockTagRegistry.java b/src/main/java/ru/betterend/registry/BlockTagRegistry.java
index 30b8420d..956cc4c2 100644
--- a/src/main/java/ru/betterend/registry/BlockTagRegistry.java
+++ b/src/main/java/ru/betterend/registry/BlockTagRegistry.java
@@ -3,6 +3,7 @@ package ru.betterend.registry;
 import net.fabricmc.fabric.api.tag.TagRegistry;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
+import net.minecraft.tag.BlockTags;
 import net.minecraft.tag.Tag;
 import net.minecraft.tag.Tag.Identified;
 import net.minecraft.util.registry.Registry;
@@ -28,6 +29,7 @@ public class BlockTagRegistry {
 		addSurfaceBlock(BlockRegistry.CAVE_MOSS);
 		
 		TagHelper.addTag(GEN_TERRAIN, BlockRegistry.ENDER_ORE, BlockRegistry.FLAVOLITE.stone, BlockRegistry.VIOLECITE.stone);
+		TagHelper.addTag(BlockTags.NYLIUM, BlockRegistry.END_MOSS, BlockRegistry.END_MYCELIUM, BlockRegistry.CHORUS_NYLIUM, BlockRegistry.CAVE_MOSS);
 	}
 	
 	public static void addSurfaceBlock(Block block) {
diff --git a/src/main/java/ru/betterend/world/features/RoundCaveFeature.java b/src/main/java/ru/betterend/world/features/RoundCaveFeature.java
index de750494..135af8bf 100644
--- a/src/main/java/ru/betterend/world/features/RoundCaveFeature.java
+++ b/src/main/java/ru/betterend/world/features/RoundCaveFeature.java
@@ -39,7 +39,7 @@ public class RoundCaveFeature extends DefaultFeature {
 		
 		int radius = MHelper.randRange(10, 30, random);
 		int bottom = BlocksHelper.upRay(world, new BlockPos(pos.getX(), 0, pos.getZ()), 32) + radius + 5;
-		int top = world.getTopY(Heightmap.Type.WORLD_SURFACE, pos.getX(), pos.getZ()) - radius - 5;
+		int top = world.getTopY(Heightmap.Type.WORLD_SURFACE, pos.getX(), pos.getZ());
 		
 		Mutable bpos = new Mutable();
 		bpos.setX(pos.getX());
@@ -48,6 +48,7 @@ public class RoundCaveFeature extends DefaultFeature {
 		while (top > bottom && !world.getBlockState(bpos).isIn(BlockTagRegistry.GEN_TERRAIN)) {
 			bpos.setY(--top);
 		}
+		top -= radius + 5;
 		
 		if (top <= bottom) {
 			return false;
diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json
index 4ecda741..191b0f97 100644
--- a/src/main/resources/assets/betterend/lang/en_us.json
+++ b/src/main/resources/assets/betterend/lang/en_us.json
@@ -185,5 +185,8 @@
 	
 	"block.betterend.flavolite_runed": "Runed Flavolite",
 	"block.betterend.flavolite_runed_eternal": "Eternal Runed Flavolite",
-	"block.betterend.end_portal_block": "End Portal"
+	"block.betterend.end_portal_block": "End Portal",
+	"block.betterend.cave_moss": "Cave Moss",
+	"block.betterend.cave_grass": "Cave Grass",
+	"block.betterend.cave_bush": "Cave Bush"
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json
index 34d7c8e1..3165d668 100644
--- a/src/main/resources/assets/betterend/lang/ru_ru.json
+++ b/src/main/resources/assets/betterend/lang/ru_ru.json
@@ -185,5 +185,8 @@
 	
 	"block.betterend.flavolite_runed": "Рунный флаволит",
 	"block.betterend.flavolite_runed_eternal": "Вечный рунный флаволит",
-	"block.betterend.end_portal_block": "Портал Края"
+	"block.betterend.end_portal_block": "Портал Края",
+	"block.betterend.cave_moss": "Пещерный мох",
+	"block.betterend.cave_grass": "Пещерная трава",
+	"block.betterend.cave_bush": "Пещерный куст"
 }
\ No newline at end of file