From 0d1085ef09670a5879bcdb1001998d7733710499 Mon Sep 17 00:00:00 2001
From: simibubi <31564874+simibubi@users.noreply.github.com>
Date: Tue, 25 Aug 2020 23:33:39 +0200
Subject: [PATCH] Late-night adjustments

- Reduced ambient dripping particles of fluid pipes
- Fixed reversed uvs on encased fans
- Fixed tile entities not being added to contraptions client-side
---
 .../components/structureMovement/Contraption.java         | 2 +-
 .../content/contraptions/fluids/FluidPipeBehaviour.java   | 4 ++--
 .../assets/create/models/block/encased_fan/block.json     | 6 +++---
 .../assets/create/models/block/encased_fan/item.json      | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
index 737806082..edbd69c80 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
@@ -465,7 +465,7 @@ public abstract class Contraption {
 						renderOrder.add(0, info.pos);
 					CompoundNBT tag = info.nbt;
 					MovementBehaviour movementBehaviour = AllMovementBehaviours.getMovementBehaviour(block);
-					if (tag == null || movementBehaviour == null || movementBehaviour.hasSpecialMovementRenderer())
+					if (tag == null || (movementBehaviour != null && movementBehaviour.hasSpecialMovementRenderer()))
 						return;
 
 					tag.putInt("x", info.pos.getX());
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidPipeBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidPipeBehaviour.java
index 940f75fb7..3010fa403 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidPipeBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidPipeBehaviour.java
@@ -237,8 +237,8 @@ public abstract class FluidPipeBehaviour extends TileEntityBehaviour {
 	}
 
 	public static final int MAX_PARTICLE_RENDER_DISTANCE = 20;
-	public static final int SPLASH_PARTICLE_AMOUNT = 3;
-	public static final float IDLE_PARTICLE_SPAWN_CHANCE = 1 / 100f;
+	public static final int SPLASH_PARTICLE_AMOUNT = 1;
+	public static final float IDLE_PARTICLE_SPAWN_CHANCE = 1 / 800f;
 	public static final Random r = new Random();
 
 	@OnlyIn(Dist.CLIENT)
diff --git a/src/main/resources/assets/create/models/block/encased_fan/block.json b/src/main/resources/assets/create/models/block/encased_fan/block.json
index cc03182de..1dce214f0 100644
--- a/src/main/resources/assets/create/models/block/encased_fan/block.json
+++ b/src/main/resources/assets/create/models/block/encased_fan/block.json
@@ -13,7 +13,7 @@
 			"from": [0, 0, 0],
 			"to": [16, 16, 2],
 			"faces": {
-				"north": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#fan_side"},
+				"north": {"uv": [0, 0, 16, 16], "texture": "#fan_side"},
 				"east": {"uv": [14, 0, 16, 16], "texture": "#fan_side"},
 				"south": {"uv": [0, 0, 16, 16], "texture": "#fan_side"},
 				"west": {"uv": [14, 0, 16, 16], "rotation": 180, "texture": "#fan_side"},
@@ -26,7 +26,7 @@
 			"from": [0, 0, 14],
 			"to": [16, 16, 16],
 			"faces": {
-				"north": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#fan_side"},
+				"north": {"uv": [0, 0, 16, 16], "texture": "#fan_side"},
 				"east": {"uv": [0, 0, 2, 16], "texture": "#fan_side"},
 				"south": {"uv": [0, 0, 16, 16], "texture": "#fan_side"},
 				"west": {"uv": [14, 0, 16, 16], "texture": "#fan_side"},
@@ -50,7 +50,7 @@
 			"from": [14, 0, 2],
 			"to": [16, 16, 14],
 			"faces": {
-				"east": {"uv": [2, 0, 14, 16], "rotation": 180, "texture": "#fan_side"},
+				"east": {"uv": [2, 0, 14, 16], "texture": "#fan_side"},
 				"west": {"uv": [14, 0, 2, 16], "texture": "#fan_side"},
 				"up": {"uv": [0, 2, 2, 14], "rotation": 180, "texture": "#fan_casing"},
 				"down": {"uv": [14, 2, 16, 14], "texture": "#fan_casing"}
diff --git a/src/main/resources/assets/create/models/block/encased_fan/item.json b/src/main/resources/assets/create/models/block/encased_fan/item.json
index 00f5a814e..fe80c3a0e 100644
--- a/src/main/resources/assets/create/models/block/encased_fan/item.json
+++ b/src/main/resources/assets/create/models/block/encased_fan/item.json
@@ -4,8 +4,8 @@
 	"textures": {
 		"2": "create:block/gearbox",
 		"fan_casing": "create:block/fan_casing",
-		"fan_side": "create:block/fan_side",
 		"particle": "create:block/fan_side",
+		"fan_side": "create:block/fan_side",
 		"axis_top": "create:block/axis_top",
 		"fan_blades": "create:block/fan_blades",
 		"axis": "create:block/axis"
@@ -21,7 +21,7 @@
 				"south": {"uv": [0, 14, 16, 16], "texture": "#fan_casing"},
 				"west": {"uv": [14, 0, 16, 16], "rotation": 90, "texture": "#fan_side"},
 				"up": {"uv": [0, 0, 16, 16], "texture": "#fan_side"},
-				"down": {"uv": [0, 0, 16, 16], "texture": "#fan_side"}
+				"down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#fan_side"}
 			}
 		},
 		{
@@ -34,7 +34,7 @@
 				"south": {"uv": [0, 0, 16, 2], "texture": "#fan_casing"},
 				"west": {"uv": [14, 0, 16, 16], "rotation": 270, "texture": "#fan_side"},
 				"up": {"uv": [0, 0, 16, 16], "texture": "#fan_side"},
-				"down": {"uv": [0, 0, 16, 16], "texture": "#fan_side"}
+				"down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#fan_side"}
 			}
 		},
 		{
@@ -54,7 +54,7 @@
 			"to": [16, 14, 16],
 			"faces": {
 				"north": {"uv": [0, 2, 2, 14], "texture": "#fan_casing"},
-				"east": {"uv": [2, 0, 14, 16], "rotation": 270, "texture": "#fan_side"},
+				"east": {"uv": [2, 0, 14, 16], "rotation": 90, "texture": "#fan_side"},
 				"south": {"uv": [14, 2, 16, 14], "texture": "#fan_casing"},
 				"west": {"uv": [14, 0, 2, 16], "rotation": 270, "texture": "#fan_side"}
 			}