From 95fc927c16e6574108223f0957ca6f2f217a6131 Mon Sep 17 00:00:00 2001
From: paulevsGitch <paulevs@yandex.ru>
Date: Mon, 19 Apr 2021 20:53:26 +0300
Subject: [PATCH] Cave generation fix & cleanup

---
 src/main/java/ru/betterend/rituals/EternalRitual.java       | 6 +++---
 .../world/features/terrain/caves/EndCaveFeature.java        | 5 ++---
 .../assets/betterend/models/item/bucket_cubozoa.json        | 6 ------
 3 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 src/main/resources/assets/betterend/models/item/bucket_cubozoa.json

diff --git a/src/main/java/ru/betterend/rituals/EternalRitual.java b/src/main/java/ru/betterend/rituals/EternalRitual.java
index ab031512..428235f0 100644
--- a/src/main/java/ru/betterend/rituals/EternalRitual.java
+++ b/src/main/java/ru/betterend/rituals/EternalRitual.java
@@ -7,11 +7,9 @@ import java.util.Random;
 import java.util.Set;
 import java.util.function.Predicate;
 
-import com.google.common.collect.Lists;
-import net.minecraft.world.chunk.ChunkSection;
-import net.minecraft.world.chunk.WorldChunk;
 import org.jetbrains.annotations.Nullable;
 
+import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
 import net.minecraft.block.Block;
@@ -35,6 +33,8 @@ import net.minecraft.util.registry.Registry;
 import net.minecraft.world.Heightmap;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.chunk.ChunkSection;
+import net.minecraft.world.chunk.WorldChunk;
 import net.minecraft.world.dimension.DimensionType;
 import net.minecraft.world.gen.feature.ConfiguredFeatures;
 import ru.betterend.BetterEnd;
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 ad2b088a..7904822b 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
@@ -24,7 +24,6 @@ import ru.betterend.util.MHelper;
 import ru.betterend.world.biome.EndBiome;
 import ru.betterend.world.biome.cave.EndCaveBiome;
 import ru.betterend.world.features.DefaultFeature;
-import ru.betterend.world.generator.GeneratorOptions;
 
 public abstract class EndCaveFeature extends DefaultFeature {
 	protected static final BlockState CAVE_AIR = Blocks.CAVE_AIR.getDefaultState();
@@ -33,7 +32,7 @@ public abstract class EndCaveFeature extends DefaultFeature {
 	
 	@Override
 	public boolean generate(StructureWorldAccess world, ChunkGenerator chunkGenerator, Random random, BlockPos pos, DefaultFeatureConfig config) {
-		if (!(GeneratorOptions.useNewGenerator() && GeneratorOptions.noRingVoid()) || pos.getX() * pos.getX() + pos.getZ() * pos.getZ() <= 22500) {
+		if (pos.getX() * pos.getX() + pos.getZ() * pos.getZ() <= 2500) {
 			return false;
 		}
 		
@@ -194,7 +193,7 @@ public abstract class EndCaveFeature extends DefaultFeature {
 			for (int z = -2; z < 3; z++) {
 				Biome biome = world.getBiome(pos.add(x << 4, 0, z << 4));
 				EndBiome endBiome = EndBiomes.getFromBiome(biome);
-				if (!endBiome.hasCaves()) {
+				if (!endBiome.hasCaves() && EndBiomes.LAND_BIOMES.containsImmutable(endBiome.getID())) {
 					return true;
 				}
 			}
diff --git a/src/main/resources/assets/betterend/models/item/bucket_cubozoa.json b/src/main/resources/assets/betterend/models/item/bucket_cubozoa.json
deleted file mode 100644
index 27e0e130..00000000
--- a/src/main/resources/assets/betterend/models/item/bucket_cubozoa.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "item/generated",
-	"textures": {
-		"layer0": "betterend:item/bucket_cubozoa"
-	}
-}