From f9b09c213ba5ce02ebe2cee12fc0852f09d4e2dd Mon Sep 17 00:00:00 2001
From: simibubi <31564874+simibubi@users.noreply.github.com>
Date: Wed, 9 Dec 2020 18:57:29 +0100
Subject: [PATCH] Ported #528 to 1.15

---
 .../waterwheel/WaterWheelBlock.java           | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlock.java
index 850051626..846cf61a0 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlock.java
@@ -10,6 +10,8 @@ import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld;
 
 import net.minecraft.block.BlockRenderType;
 import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.block.BubbleColumnBlock;
 import net.minecraft.fluid.Fluids;
 import net.minecraft.fluid.IFluidState;
 import net.minecraft.item.BlockItemUseContext;
@@ -80,18 +82,25 @@ public class WaterWheelBlock extends HorizontalKineticBlock implements ITE<Water
 		updateWheelSpeed(worldIn, pos);
 	}
 
-	private void updateFlowAt(BlockState state, World world, BlockPos pos, Direction f) {
-		if (f.getAxis() == state.get(HORIZONTAL_FACING)
+	private void updateFlowAt(BlockState state, World world, BlockPos pos, Direction side) {
+		if (side.getAxis() == state.get(HORIZONTAL_FACING)
 			.getAxis())
 			return;
 
-		IFluidState fluid = world.getFluidState(pos.offset(f));
+		IFluidState fluid = world.getFluidState(pos.offset(side));
 		Direction wf = state.get(HORIZONTAL_FACING);
 		boolean clockwise = wf.getAxisDirection() == AxisDirection.POSITIVE;
 		int clockwiseMultiplier = 2;
 
-		Vec3d vec = fluid.getFlow(world, pos.offset(f));
-		vec = vec.scale(f.getAxisDirection()
+		Vec3d vec = fluid.getFlow(world, pos.offset(side));
+		if (side.getAxis()
+			.isHorizontal()) {
+			BlockState adjacentBlock = world.getBlockState(pos.offset(side));
+			if (adjacentBlock.getBlock() == Blocks.BUBBLE_COLUMN.getBlock())
+				vec = new Vec3d(0, adjacentBlock.get(BubbleColumnBlock.DRAG) ? -1 : 1, 0);
+		}
+
+		vec = vec.scale(side.getAxisDirection()
 			.getOffset());
 		vec = new Vec3d(Math.signum(vec.x), Math.signum(vec.y), Math.signum(vec.z));
 		Vec3d flow = vec;
@@ -100,16 +109,16 @@ public class WaterWheelBlock extends HorizontalKineticBlock implements ITE<Water
 			double flowStrength = 0;
 
 			if (wf.getAxis() == Axis.Z) {
-				if (f.getAxis() == Axis.Y)
+				if (side.getAxis() == Axis.Y)
 					flowStrength = flow.x > 0 ^ !clockwise ? -flow.x * clockwiseMultiplier : -flow.x;
-				if (f.getAxis() == Axis.X)
+				if (side.getAxis() == Axis.X)
 					flowStrength = flow.y < 0 ^ !clockwise ? flow.y * clockwiseMultiplier : flow.y;
 			}
 
 			if (wf.getAxis() == Axis.X) {
-				if (f.getAxis() == Axis.Y)
+				if (side.getAxis() == Axis.Y)
 					flowStrength = flow.z < 0 ^ !clockwise ? flow.z * clockwiseMultiplier : flow.z;
-				if (f.getAxis() == Axis.Z)
+				if (side.getAxis() == Axis.Z)
 					flowStrength = flow.y > 0 ^ !clockwise ? -flow.y * clockwiseMultiplier : -flow.y;
 			}
 
@@ -120,7 +129,7 @@ public class WaterWheelBlock extends HorizontalKineticBlock implements ITE<Water
 			}
 
 			Integer flowModifier = AllConfigs.SERVER.kinetics.waterWheelFlowSpeed.get();
-			te.setFlow(f, (float) (flowStrength * flowModifier / 2f));
+			te.setFlow(side, (float) (flowStrength * flowModifier / 2f));
 		});
 	}