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!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|W_r3fhE&XX
zd%;ogfC9q-0|z;qkLy!UoJj6%ihFMNUD|$INy9Y;*#)K!>>0cl7^9f!#J$Db<H(fm
UbNBo)pd%SPUHx3vIVCg!071h>4FCWD

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!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zFM7H-hE&XX
zJKHwzumO*oq;mU*2M3*(&sh}weBP25f<-Nhf-ml5KQTvh`G+Zr&TV%N#jZLuQKPdg
zux8QG?MKg@Kh8eOi6Qgz$DgK`_;c?E=9*j<-+o$jDzn?;_!YiR#yrm-B>4($b8$Ib
zu<Y);hwt2cnAF#({ITk|wE69K!3iQ^RUchyj)l12Kid$}DAiSdW}*O(<4f^reIbX+
zUh?nR|JK~w{<r*|J@4HAOPSxUnIwDRo9xzF@fy#}qryjxpYAf(O0cqAF65<iZ=(y7
zc0;t;t$o_NDvrl+Ha6Ut_4Ch{h?<XmmO?J88<stiy_9#B>q5jHXC=ogjM>Ln7BDX`
zWPHJp;lp6XASK+u*Fc%jNiGW+|ATx!x&^!4Yh7d)1U4<HSR|?LX5!f)dj73+nzh5`
zmct)Sidv7E`MS$9_6o(A)i;-C9j_>2%b4^ay-29&_S4PJS@WiA@2=nB!s*Rnm7u%)
z#FCje-5qwfgoOQ%D`Cr+s&LYx*1w3YK*&UHff83ZllkpcKlKG(zsO<{`1|n4iCG_1
bYnWxO95g!l|6DULrWrh4{an^LB{Ts5jg8+8

literal 336
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU=;UsaSW-r_4f8gUM54H)`w@<
zpT2FBXfzZsWey15cvDf))oJI98-lI1|G3LLOWs>+UM=2v?_KuX<DaMIoicZDYvFY;
zYbmmdzjlU0o`G|r`PV(yH~u?gv`a?w50BHum_CtvT??2x#O^g2@D^C;t#j*6U|P{0
z#ghL}mm{m;TY~EcskrV1OcUaK-aj<uaBg_<(48Zg;o_nHP6o^_y!whjhY}5@EGfGF
z<dV3m``@bf53BE{6^EK>Ijz5K6FaT1?ZWS4``>cA#CFVLy20JF<=0}Sjy{8^e?g2c
vt{2w*U&-*zM94{sfm2b`fnQP9q5A_{B+sdf&jkB3LAHCk`njxgN@xNAJ9c&p

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")