From 0cb8a94be30a3bd22ea7570000447e4e2b89520d Mon Sep 17 00:00:00 2001
From: paulevsGitch <paulevs@yandex.ru>
Date: Mon, 25 Oct 2021 16:06:42 +0300
Subject: [PATCH] Additional fluid fix, mountain cut fix, removed redundant
 config options

---
 src/main/java/ru/betterend/util/BlockFixer.java            | 7 +++++--
 .../ru/betterend/world/generator/GeneratorOptions.java     | 6 ------
 .../java/ru/betterend/world/generator/IslandLayer.java     | 2 +-
 .../ru/betterend/world/generator/TerrainGenerator.java     | 3 +++
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/ru/betterend/util/BlockFixer.java b/src/main/java/ru/betterend/util/BlockFixer.java
index d30b0bd4..0e2b1115 100644
--- a/src/main/java/ru/betterend/util/BlockFixer.java
+++ b/src/main/java/ru/betterend/util/BlockFixer.java
@@ -30,7 +30,7 @@ public class BlockFixer {
 	public static void fixBlocks(LevelAccessor level, BlockPos start, BlockPos end) {
 		final Registry<DimensionType> registry = level.registryAccess().registryOrThrow(Registry.DIMENSION_TYPE_REGISTRY);
 		final ResourceLocation dimKey = registry.getKey(level.dimensionType());
-		if (dimKey!=null && "world_blender".equals(dimKey.getNamespace())) {
+		if (dimKey != null && "world_blender".equals(dimKey.getNamespace())) {
 			return;
 		}
 		final Set<BlockPos> doubleCheck = Sets.newConcurrentHashSet();
@@ -75,7 +75,10 @@ public class BlockFixer {
 					}
 					for (Direction dir : BlocksHelper.HORIZONTAL) {
 						if (level.isEmptyBlock(POS.relative(dir))) {
-							level.getLiquidTicks().scheduleTick(POS, state.getFluidState().getType(), 0);
+							try {
+								level.getLiquidTicks().scheduleTick(POS, state.getFluidState().getType(), 0);
+							}
+							catch (Exception e) {}
 							break;
 						}
 					}
diff --git a/src/main/java/ru/betterend/world/generator/GeneratorOptions.java b/src/main/java/ru/betterend/world/generator/GeneratorOptions.java
index d79793a9..94b3c5e8 100644
--- a/src/main/java/ru/betterend/world/generator/GeneratorOptions.java
+++ b/src/main/java/ru/betterend/world/generator/GeneratorOptions.java
@@ -15,7 +15,6 @@ public class GeneratorOptions {
 	private static boolean changeChorusPlant;
 	private static boolean removeChorusFromVanillaBiomes;
 	private static boolean newGenerator;
-	private static boolean noRingVoid;
 	private static boolean generateCentralIsland;
 	private static boolean generateObsidianPlatform;
 	private static int endCityFailChance;
@@ -46,7 +45,6 @@ public class GeneratorOptions {
 			true
 		);
 		newGenerator = Configs.GENERATOR_CONFIG.getBoolean("customGenerator", "useNewGenerator", true);
-		noRingVoid = Configs.GENERATOR_CONFIG.getBoolean("customGenerator", "noRingVoid", false);
 		generateCentralIsland = Configs.GENERATOR_CONFIG.getBoolean("customGenerator", "generateCentralIsland", true);
 		endCityFailChance = Configs.GENERATOR_CONFIG.getInt("customGenerator", "endCityFailChance", 5);
 		generateObsidianPlatform = Configs.GENERATOR_CONFIG.getBooleanRoot("generateObsidianPlatform", true);
@@ -126,10 +124,6 @@ public class GeneratorOptions {
 		return removeChorusFromVanillaBiomes;
 	}
 	
-	public static boolean noRingVoid() {
-		return noRingVoid;
-	}
-	
 	public static boolean useNewGenerator() {
 		return newGenerator;
 	}
diff --git a/src/main/java/ru/betterend/world/generator/IslandLayer.java b/src/main/java/ru/betterend/world/generator/IslandLayer.java
index 0eb33a7e..76c7a735 100644
--- a/src/main/java/ru/betterend/world/generator/IslandLayer.java
+++ b/src/main/java/ru/betterend/world/generator/IslandLayer.java
@@ -68,7 +68,7 @@ public class IslandLayer {
 				for (int poz = -1; poz < 2; poz++) {
 					int pz = poz + iz;
 					long pz2 = pz;
-					if (GeneratorOptions.noRingVoid() || px2 * px2 + pz2 * pz2 > options.centerDist) {
+					if (px2 * px2 + pz2 * pz2 > options.centerDist) {
 						RANDOM.setSeed(getSeed(px, pz));
 						double posX = (px + RANDOM.nextFloat()) * options.distance;
 						double posY = MHelper.randRange(options.minY, options.maxY, RANDOM);
diff --git a/src/main/java/ru/betterend/world/generator/TerrainGenerator.java b/src/main/java/ru/betterend/world/generator/TerrainGenerator.java
index 57aaf604..7cbe7599 100644
--- a/src/main/java/ru/betterend/world/generator/TerrainGenerator.java
+++ b/src/main/java/ru/betterend/world/generator/TerrainGenerator.java
@@ -73,6 +73,9 @@ public class TerrainGenerator {
 				dist += noise2.eval(px * 0.05, py * 0.05, pz * 0.05) * 0.01 + 0.01;
 				dist += noise1.eval(px * 0.1, py * 0.1, pz * 0.1) * 0.005 + 0.005;
 			}
+			if (py > 100) {
+				dist = (float) Mth.lerp((py - 100) / 27F, dist, -1);
+			}
 			buffer[y] = dist;
 		}