From d6d78925b727e1d709c5864134666263b16a13ab Mon Sep 17 00:00:00 2001
From: paulevsGitch <paulevs@yandex.ru>
Date: Sun, 1 Nov 2020 16:42:30 +0300
Subject: [PATCH] Fixes

---
 .../world/biome/BiomeShadowForest.java        |  3 ++-
 .../world/features/DragonTreeFeature.java     | 12 +++++++++++
 .../features/PythadendronTreeFeature.java     | 21 +++++++++++++++++--
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java b/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java
index 2fcbf120..91ac8ce5 100644
--- a/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java
+++ b/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java
@@ -22,6 +22,7 @@ public class BiomeShadowForest extends EndBiome {
 				.addFeature(EndFeatures.DRAGON_TREE_BUSH)
 				.addFeature(EndFeatures.SHADOW_PLANT)
 				.addStructureFeature(ConfiguredStructureFeatures.END_CITY)
-				.addMobSpawn(EntityType.ENDERMAN, 80, 1, 4));
+				.addMobSpawn(EntityType.ENDERMAN, 80, 1, 4)
+				.addMobSpawn(EntityType.PHANTOM, 1, 1, 2));
 	}
 }
diff --git a/src/main/java/ru/betterend/world/features/DragonTreeFeature.java b/src/main/java/ru/betterend/world/features/DragonTreeFeature.java
index 30ce6cc9..72584fe8 100644
--- a/src/main/java/ru/betterend/world/features/DragonTreeFeature.java
+++ b/src/main/java/ru/betterend/world/features/DragonTreeFeature.java
@@ -117,6 +117,18 @@ public class DragonTreeFeature extends DefaultFeature {
 		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) * 1.5F; }).setSource(sphere);
 		sphere = new SDFDisplacement().setFunction((vec) -> { return random.nextFloat() * 3F - 1.5F; }).setSource(sphere);
+		sphere.setPostProcess((info) -> {
+			if (random.nextInt(5) == 0) {
+				for (Direction dir: Direction.values()) {
+					BlockState state = info.getState(dir, 2);
+					if (state.isAir()) {
+						return info.getState();
+					}
+				}
+				return EndBlocks.DRAGON_TREE.bark.getDefaultState();
+			}
+			return info.getState();
+		});
 		sphere.fillRecursiveIgnore(world, pos, IGNORE);
 		
 		if (radius > 5) {
diff --git a/src/main/java/ru/betterend/world/features/PythadendronTreeFeature.java b/src/main/java/ru/betterend/world/features/PythadendronTreeFeature.java
index 7fdb0a05..a41b5149 100644
--- a/src/main/java/ru/betterend/world/features/PythadendronTreeFeature.java
+++ b/src/main/java/ru/betterend/world/features/PythadendronTreeFeature.java
@@ -9,6 +9,7 @@ import net.minecraft.block.LeavesBlock;
 import net.minecraft.block.Material;
 import net.minecraft.client.util.math.Vector3f;
 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;
@@ -28,6 +29,7 @@ import ru.betterend.util.sdf.primitive.SDFSphere;
 
 public class PythadendronTreeFeature extends DefaultFeature {
 	private static final Function<BlockState, Boolean> REPLACE;
+	private static final Function<BlockState, Boolean> IGNORE;
 	private static final Function<PosInfo, BlockState> POST;
 	
 	@Override
@@ -109,8 +111,19 @@ public class PythadendronTreeFeature extends DefaultFeature {
 		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 random.nextFloat() * 3F - 1.5F; }).setSource(sphere);
 		sphere = new SDFSubtraction().setSourceA(sphere).setSourceB(new SDFTranslate().setTranslate(0, -radius, 0).setSource(sphere));
-		BlocksHelper.setWithoutUpdate(world, pos.up(), AIR);
-		sphere.fillRecursive(world, pos.up());
+		sphere.setPostProcess((info) -> {
+			if (random.nextInt(5) == 0) {
+				for (Direction dir: Direction.values()) {
+					BlockState state = info.getState(dir, 2);
+					if (state.isAir()) {
+						return info.getState();
+					}
+				}
+				return EndBlocks.PYTHADENDRON.bark.getDefaultState();
+			}
+			return info.getState();
+		});
+		sphere.fillRecursiveIgnore(world, pos.up(), IGNORE);
 		
 		if (radius > 5) {
 			int count = (int) (radius * 2.5F);
@@ -135,6 +148,10 @@ public class PythadendronTreeFeature extends DefaultFeature {
 			return state.getMaterial().isReplaceable();
 		};
 		
+		IGNORE = (state) -> {
+			return EndBlocks.PYTHADENDRON.isTreeLog(state);
+		};
+		
 		POST = (info) -> {
 			if (EndBlocks.PYTHADENDRON.isTreeLog(info.getStateUp()) && EndBlocks.PYTHADENDRON.isTreeLog(info.getStateDown())) {
 				return EndBlocks.PYTHADENDRON.log.getDefaultState();