From d0b23a9c9f1123dd7c6623c5da571a99a482cc84 Mon Sep 17 00:00:00 2001
From: paulevsGitch <paulevs@yandex.ru>
Date: Thu, 23 Dec 2021 09:37:50 +0300
Subject: [PATCH] Tunnel caves fixes

---
 .../world/features/terrain/caves/EndCaveFeature.java      | 3 +--
 .../world/features/terrain/caves/RoundCaveFeature.java    | 8 ++++----
 .../world/features/terrain/caves/TunelCaveFeature.java    | 7 ++-----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/main/java/ru/betterend/world/features/terrain/caves/EndCaveFeature.java b/src/main/java/ru/betterend/world/features/terrain/caves/EndCaveFeature.java
index cb3cbee9..c0f202cf 100644
--- a/src/main/java/ru/betterend/world/features/terrain/caves/EndCaveFeature.java
+++ b/src/main/java/ru/betterend/world/features/terrain/caves/EndCaveFeature.java
@@ -128,8 +128,7 @@ public abstract class EndCaveFeature extends DefaultFeature {
 				if (wallBlock != null) {
 					for (Vec3i offset : SPHERE) {
 						BlockPos wallPos = pos.offset(offset);
-						if (!positions.contains(wallPos) && !placed.contains(wallPos) && world.getBlockState(wallPos)
-																							  .is(TagAPI.BLOCK_GEN_TERRAIN)) {
+						if (!positions.contains(wallPos) && !placed.contains(wallPos) && world.getBlockState(wallPos).is(TagAPI.BLOCK_GEN_TERRAIN)) {
 							wallBlock = biome.getWall(wallPos);
 							BlocksHelper.setWithoutUpdate(world, wallPos, wallBlock);
 							placed.add(wallPos);
diff --git a/src/main/java/ru/betterend/world/features/terrain/caves/RoundCaveFeature.java b/src/main/java/ru/betterend/world/features/terrain/caves/RoundCaveFeature.java
index 35c5c35c..07afd22d 100644
--- a/src/main/java/ru/betterend/world/features/terrain/caves/RoundCaveFeature.java
+++ b/src/main/java/ru/betterend/world/features/terrain/caves/RoundCaveFeature.java
@@ -74,9 +74,9 @@ public class RoundCaveFeature extends EndCaveFeature {
 	}
 	
 	private boolean isReplaceable(BlockState state) {
-		return state.is(TagAPI.BLOCK_GEN_TERRAIN) || state.getMaterial().isReplaceable() || state.getMaterial()
-																						   .equals(Material.PLANT) || state
-			.getMaterial()
-			.equals(Material.LEAVES);
+		return state.is(TagAPI.BLOCK_GEN_TERRAIN) ||
+			state.getMaterial().isReplaceable() ||
+			state.getMaterial().equals(Material.PLANT) ||
+			state.getMaterial().equals(Material.LEAVES);
 	}
 }
diff --git a/src/main/java/ru/betterend/world/features/terrain/caves/TunelCaveFeature.java b/src/main/java/ru/betterend/world/features/terrain/caves/TunelCaveFeature.java
index 8f95755d..7b23abb4 100644
--- a/src/main/java/ru/betterend/world/features/terrain/caves/TunelCaveFeature.java
+++ b/src/main/java/ru/betterend/world/features/terrain/caves/TunelCaveFeature.java
@@ -21,6 +21,7 @@ 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.EndBiome;
 import ru.betterend.world.biome.cave.EndCaveBiome;
 
 import java.util.Map;
@@ -167,11 +168,7 @@ public class TunelCaveFeature extends EndCaveFeature {
 		}
 		
 		floorSets.forEach((biome, floorPositions) -> {
-			BlockState surfaceBlock = Blocks.END_STONE.defaultBlockState();
-//			BlockState surfaceBlock = biome.getBiome()
-//										   .getGenerationSettings()
-//										   .getSurfaceBuilderConfig()
-//										   .getTopMaterial();
+			BlockState surfaceBlock = EndBiome.findTopMaterial(biome);
 			placeFloor(world, biome, floorPositions, random, surfaceBlock);
 		});
 		ceilSets.forEach((biome, ceilPositions) -> {