From 0cd80b70b71706a33c9e0379748c0a0fccdd4338 Mon Sep 17 00:00:00 2001
From: xStaBUx <96493687+xStaBUx@users.noreply.github.com>
Date: Thu, 28 Jul 2022 16:43:52 +0300
Subject: [PATCH] Water in cryofluid mixer & cultivator (#7244)

* criofluid mixer, cultivator & spore press liquids fix

water and oil now displayed in cryofluid mixer, cultivator and spore press

* 1

* 2
---
 .../blocks/production/cultivator-bottom.png     | Bin 0 -> 223 bytes
 .../sprites/blocks/production/cultivator.png    | Bin 336 -> 535 bytes
 core/src/mindustry/content/Blocks.java          |   4 +++-
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 core/assets-raw/sprites/blocks/production/cultivator-bottom.png

diff --git a/core/assets-raw/sprites/blocks/production/cultivator-bottom.png b/core/assets-raw/sprites/blocks/production/cultivator-bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..e05f72e92ce1a7155e5fd12e70285b5e366fc01d
GIT binary patch
literal 223
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS!$7>k44ofy`glX=O&z%bL(
z#WAE}&f5!)f(H~B4j4Gd*?e4|dg4TKZ&TcJyYJHW+e#X)F~}}3bzslny}%g7OegLw
a<{n3;bf3HDk1;SXFnGH9xvX<aXaWF1!$u7N

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/production/cultivator.png b/core/assets-raw/sprites/blocks/production/cultivator.png
index e1ff7aa69299b641049258be4413b190bfeb0cbc..0532d0e1db4373ada99dc9cef58e260e1ed7ca59 100644
GIT binary patch
literal 535
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS!$7>k44ofy`glX=O&z<ANq
z#WAE}&fD3xd4~;n+$5FTKRh_-ynN20;OFy}ybvsESrmM6C;N#xn#(^-QFLy*b0~Jz
zp@|xuWq~z|j&47C?)-7~SxyX@pFjRIy~Lk;KQPziviSDXqEngO9>=fnbu#98{vgR$
zXq$`6;eus%-#vWi=EJ1EM&*xH$ED40zY9(f39I_(QgbZC{r=g8kVdJl@-q_!cpP7f
zPwNXgRQ8g8&;GaO-uA!c_w0G+{$I-ccFiQ&3*Th7){577W*!wjYW#GUxmJRe<#Hh}
zoqHQyn6w+B&2H_}-c@lthO@EZ#;l)zzC_e~?6VYdS>3Sgk?f_svs@P<_Bbm!USZ5W
z#<GBUfg$4yh72DDD+Vdy2EGQ$gidl<$oL=R^U*EX?Oy95yCAS>NyQ>bbvF~w4$<>(
zrPHh(Hn$x9Xj0UA%*@wap0QUb#;m@%JnMKx5nINj2kAvZMYo@Be$JXVU3+)^4i`>u
z4yy#+<tLWRyy@<+yCo#-e_RP$##Duq7PbCGYz0ClatoBW!kNr(ullJk@cKm-i@@K9
hM^4Q8pjyK$bLF7X$^Yk?85kHCJYD@<);T3K0RWAS-wgl&

literal 336
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS!$#XVgdLn>~)y}gl_$&jb@
z;TiU)ZyO~V4Fyb@1A;f+R8(|z+BxHfU~BC^?()u(_tu(Mi+A38mp%9R=c#$8%pKfX
zcpc1Iimc+Vo#BvY;9O|_b<g#U|IQfglF|Ib<8(2mPvl<L0;UeJdrbzs1r~bi+`1E(
zR<uX4<UiEq$ZGhO;QB!-u6qH~ggBq~4^26o8(utg=LlxFc<8^A0kaFQz9It&V9JuB
z>rXC;tGfTKdjGKcZd!4unU>S~+cvS&`r0o1KDPfYw@YltET$XWO<R5~X6ooOi24`A
w=;C@|-T##g-%Ny@q!>6AMIHDRWgWUdutoBmy7)}6KNDoXr>mdKI;Vst06TVe3jhEB

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index b972594e2b..568836b600 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -998,7 +998,7 @@ public class Blocks{
             solid = true;
             outputsLiquid = true;
             envEnabled = Env.any;
-            drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawLiquidTile(Liquids.cryofluid), new DrawDefault());
+            drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawLiquidTile(Liquids.water), new DrawLiquidTile(Liquids.cryofluid){{drawLiquidLight = true;}}, new DrawDefault());
             liquidCapacity = 24f;
             craftTime = 120;
 
@@ -2592,6 +2592,8 @@ public class Blocks{
 
             legacyReadWarmup = true;
             drawer = new DrawMulti(
+            new DrawRegion("-bottom"),
+            new DrawLiquidTile(Liquids.water),
             new DrawDefault(),
             new DrawCultivator(),
             new DrawRegion("-top")