From 85bcf5878e652464703f387221afaa2bd1e3c920 Mon Sep 17 00:00:00 2001
From: paulevsGitch <paulevs@yandex.ru>
Date: Thu, 19 Nov 2020 18:56:02 +0300
Subject: [PATCH] Improved block fixer

---
 .../java/ru/betterend/util/BlocksHelper.java  | 68 ++++++++-----------
 .../features/UnderwaterPlantFeature.java      |  2 +-
 .../features/UnderwaterPlantScatter.java      |  2 +-
 3 files changed, 29 insertions(+), 43 deletions(-)

diff --git a/src/main/java/ru/betterend/util/BlocksHelper.java b/src/main/java/ru/betterend/util/BlocksHelper.java
index 166f3ace..dda412c2 100644
--- a/src/main/java/ru/betterend/util/BlocksHelper.java
+++ b/src/main/java/ru/betterend/util/BlocksHelper.java
@@ -156,9 +156,25 @@ public class BlocksHelper {
 					if (state.getBlock() instanceof BlockGlowingFur) {
 						doubleCheck.add(POS.toImmutable());
 					}
-					
-					if (!state.canPlaceAt(world, POS)) {
-
+					// Liquids
+					else if (!state.getFluidState().isEmpty()) {
+						POS.setY(y - 1);
+						if (world.isAir(POS)) {
+							POS.setY(y);
+							while (!world.getFluidState(POS).isEmpty()) {
+								setWithoutUpdate(world, POS, AIR);
+								POS.setY(POS.getY() + 1);
+							}
+							continue;
+						}
+						for (Direction dir : HORIZONTAL) {
+							if (world.isAir(POS.offset(dir))) {
+								world.getFluidTickScheduler().schedule(POS, state.getFluidState().getFluid(), 0);
+								break;
+							}
+						}
+					}
+					else if (!state.canPlaceAt(world, POS)) {
 						// Chorus
 						if (state.isOf(Blocks.CHORUS_PLANT)) {
 							Set<BlockPos> ends = Sets.newHashSet();
@@ -193,28 +209,6 @@ public class BlocksHelper {
 								POS.setY(POS.getY() - 1);
 							}
 						}
-						// Liquids
-						else if (!state.getFluidState().isEmpty()) {
-							POS.setY(y - 1);
-							if (world.isAir(POS)) {
-								POS.setY(y);
-								while (!world.getFluidState(POS).isEmpty()) {
-									setWithoutUpdate(world, POS, AIR);
-									POS.setY(POS.getY() + 1);
-								}
-								continue;
-							}
-							BlockState st;
-							for (Direction dir : HORIZONTAL) {
-								if ((st = world.getBlockState(POS.offset(dir))).getMaterial().isReplaceable() && st.getFluidState().isEmpty()) {
-									world.getFluidTickScheduler().schedule(POS, state.getFluidState().getFluid(), 0);
-									break;
-								}
-							}
-							if ((st = world.getBlockState(POS.up())).getMaterial().isReplaceable() && st.getFluidState().isEmpty()) {
-								world.getFluidTickScheduler().schedule(POS, state.getFluidState().getFluid(), 0);
-							}
-						}
 						// Falling blocks
 						else if (state.getBlock() instanceof FallingBlock) {
 							BlockState falling = state;
@@ -233,19 +227,15 @@ public class BlocksHelper {
 							}
 							else {
 								POS.setY(y);
-								boolean place = true;
+								BlockState replacement = AIR;
 								for (Direction dir : HORIZONTAL) {
 									state = world.getBlockState(POS.offset(dir));
 									if (!state.getFluidState().isEmpty()) {
-										BlocksHelper.setWithoutUpdate(world, POS, state);
-										place = false;
+										replacement = state;
 										break;
 									}
 								}
-								if (place) {
-									BlocksHelper.setWithoutUpdate(world, POS, AIR);
-								}
-
+								BlocksHelper.setWithoutUpdate(world, POS, replacement);
 								POS.setY(y - ray);
 								BlocksHelper.setWithoutUpdate(world, POS, falling);
 							}
@@ -256,14 +246,6 @@ public class BlocksHelper {
 							if (state.getBlock() instanceof BlockBlueVine) {
 								while (state.isOf(EndBlocks.BLUE_VINE) || state.isOf(EndBlocks.BLUE_VINE_LANTERN) || state.isOf(EndBlocks.BLUE_VINE_FUR)) {
 									BlocksHelper.setWithoutUpdate(world, POS, AIR);
-									for (Direction dir : HORIZONTAL) {
-										BlockPos p = POS.offset(dir);
-										state = world.getBlockState(p);
-										if (state.getBlock() instanceof BlockGlowingFur) {
-											BlocksHelper.setWithoutUpdate(world, p, AIR);
-										}
-										world.getBlockTickScheduler().schedule(p, world.getBlockState(p).getBlock(), 0);
-									}
 									POS.setY(POS.getY() + 1);
 									state = world.getBlockState(POS);
 								}
@@ -276,7 +258,7 @@ public class BlocksHelper {
 							}
 							// Other blocks
 							else {
-								BlocksHelper.setWithoutUpdate(world, POS, AIR);
+								BlocksHelper.setWithoutUpdate(world, POS, getAirOrFluid(state));
 							}
 						}
 					}
@@ -291,6 +273,10 @@ public class BlocksHelper {
 		});
 	}
 	
+	private static BlockState getAirOrFluid(BlockState state) {
+		return state.getFluidState().isEmpty() ? AIR : state.getFluidState().getBlockState();
+	}
+	
 	public static boolean isEndNylium(Block block) {
 		return block.isIn(BlockTags.NYLIUM) && block.isIn(EndTags.END_GROUND);
 	}
diff --git a/src/main/java/ru/betterend/world/features/UnderwaterPlantFeature.java b/src/main/java/ru/betterend/world/features/UnderwaterPlantFeature.java
index ff3dd67e..b24d94bd 100644
--- a/src/main/java/ru/betterend/world/features/UnderwaterPlantFeature.java
+++ b/src/main/java/ru/betterend/world/features/UnderwaterPlantFeature.java
@@ -19,7 +19,7 @@ public class UnderwaterPlantFeature extends UnderwaterPlantScatter {
 	
 	@Override
 	public boolean canGenerate(StructureWorldAccess world, Random random, BlockPos center, BlockPos blockPos, float radius) {
-		return plant.canPlaceAt(plant.getDefaultState(), world, blockPos);
+		return super.canSpawn(world, blockPos) && plant.canPlaceAt(plant.getDefaultState(), world, blockPos);
 	}
 
 	@Override
diff --git a/src/main/java/ru/betterend/world/features/UnderwaterPlantScatter.java b/src/main/java/ru/betterend/world/features/UnderwaterPlantScatter.java
index 1436c576..9af618c4 100644
--- a/src/main/java/ru/betterend/world/features/UnderwaterPlantScatter.java
+++ b/src/main/java/ru/betterend/world/features/UnderwaterPlantScatter.java
@@ -29,7 +29,7 @@ public abstract class UnderwaterPlantScatter extends ScatterFeature {
 	
 	@Override
 	protected boolean canSpawn(StructureWorldAccess world, BlockPos pos) {
-		return !world.getFluidState(pos).isEmpty();
+		return world.getBlockState(pos).isOf(Blocks.WATER);
 	}
 	
 	@Override