From 9a5ac14bc3e0fe206fa9fa1b7bb32ccf555800d9 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 15 Oct 2021 11:40:55 -0400
Subject: [PATCH] Fixed #6158

---
 .../blocks/liquid/liquid-container-liquid.png | Bin 0 -> 208 bytes
 .../production/cryofluid-mixer-bottom.png     | Bin 1295 -> 1290 bytes
 .../world/blocks/environment/StaticTree.java  |   1 +
 .../world/blocks/payloads/PayloadBlock.java   |   1 +
 core/src/mindustry/world/meta/BlockGroup.java |   2 +-
 5 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 core/assets-raw/sprites/blocks/liquid/liquid-container-liquid.png

diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-container-liquid.png b/core/assets-raw/sprites/blocks/liquid/liquid-container-liquid.png
new file mode 100644
index 0000000000000000000000000000000000000000..435e380369376b87ce0c32673206fe8568b32dbd
GIT binary patch
literal 208
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS!$7>k44ofy`glX=O&z|iIC
z;uumf=k3jdybOvw%mzFDmOqQTyCAe>1AE6Mn?zj(1_p+TQ}cN2pU>%=v-f+%`Hc_O
zJwAPfLwVud<I_6@Z!s_L)4!{{rOj79-pc*QuBN=yhLT1T<|W)qBo$&6&N94Y%4G8p
z_b_(Y<uHr!66+<N33?Nrd9E>DWAj%dYF?d~zIja#$c_Wabz#3%bS!ppYl66*u6{1-
HoD!M<&+|&t

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/production/cryofluid-mixer-bottom.png b/core/assets-raw/sprites/blocks/production/cryofluid-mixer-bottom.png
index b9bc65af455f75fe3580f25ac892691dc0f3cf26..8b07e080d3d551ee7a127d9cb6458fa9c6708220 100644
GIT binary patch
delta 1257
zcmeC@>f)MUSbxOR#WAE}&eiC%ej<(n{|-ELSad9B(;o@GBX1bLvwmTd@Rw7VQ^EaM
z`Gdr<&E<>O{oS6Zh6$OqF;ARt+OneDW=-#2+t90_cWod4n47R{`Lg}_t5&bxot+-H
zzp{GsmR(J|3QBg)`}*hBp~QvrF3gbSbGNX!T>F;QlI4{eKf`8*`U`G?vlRIM2r^_$
z=kT4#-q82|e1QcM!;TpXM32}$|M2E0+s(Y(hXzu@Dxc=t)y(@<Z}4LEFZH84ZhmO`
z+#-|DVg1TkDMK;8@yJpo2d)+RiJ}L+;(mXXwGh-|is1D=pXs_{_8w+cr}m8FN@CJ%
z&2_4BKXMOmJRvweCQK>6H@3bZk>kf)f8RMKvfjP6EB^*_I`~d3P3sQ}sJ-}2U#p?`
zrI1p_t?64<ZcOcBOq_S1@iep3jyVcFtaGfN`?Sg|k`rK)y)V4tW0tD?Ki$Snx<`3@
zZ32%nc(TYxeP7Cv?YiKe<5yQ{pR1c2^qEXWpH8@br+e>d^_-cWK86jmn=L=pC%W&e
zspfm&RCD}h25-N7UC*ufsMwV^{AW68%Wc@QE2-<qoq`1?Ukhw|+7bC%QZ2K=fW_q4
zPR&hysil1!B8BXRY#zs)7psO%G+ff5Fp*uvu)!#AZvXxLx7j!3S3Q$BaP6Dl(_cSN
zYDx<SeQN1qKhjh1eJ6vZ;(WGuk>`YyEbBQ+=gTmKslHZ_-<&9$HOC@{=R#M2`p+4<
zYdI#RpLz36?w*dG{080?Isv=*r>MSf?&3_e*`RZyPw%?ATtVTs$VK%Guax6&Z98q1
zpWfKL+1F#9LZVgSO8<rrv5Ci4w9YT`Kgw`QxMuqDXCdBg;Zj$2CtEu|tXeF@VkxNc
zNwvM+PiqCM$n<l;xhEqXoY(L^ku_QEv5wc8*Nf%0%RR-?nY!y(H5TQnyq~b?V$hS6
z7xir#45qrv{HFRIsCvT2!Q|m`Tf^zqLT$~4wuIR(7p@2w<Z3Ym9ARs=oB4UWBTJXW
zc0=c_bA=j|{r|q5FspAG!`F8=uEl5^dK;ziJo}fdWxe0Fr225JKVDNK7p&0^_P%Cz
zt8Ctdi6?@kIXC*cC0x3A>2#8AW!C1fRgp={9p6gIt9zVWfAr?1dE6emqn9v5ec~(a
zn&5q}QFx(}!>Myx0sS0dpERv+T`XqI(ps3+*wD#wC1mH;y~+11HoE=(JURH&-HkI;
z*Rck5O*L^e63t7lKUSn6wOS*Y^+JxNxu(+&Q+3hImI*F9K0kSRY+ik0-MZ%Z>-JY<
zUw_>t(Z62n`tirwU#jlzfBUZX==b^kA!g3sm$S(BuQ#w?Zh!av*Ih5Z?%MJD!M`hC
zl}ej}d}bWe*tKxej+%ytrF-;)CLXh2DSRa?e_BM^ajlT9>zrAyKNPvtpHQ41d`MjM
zKves3-$gZtqCN#>&C_bqWXpJ1e&v0Lgs{b<f8pDv9gLXYS>=!?JCFaYz{aqq=+_d?
zE0P@iWaES{Tr&&`IM1ZowZMckC`(B6_RdEMU5tj0uH2Z+u@jV0{uwXyU1fJc@oBrr
zll-=z1l?tygq1Wc7v(IO_A2;%(nRM2T26eGFK4B!zVcr5hQx%;3pP%=e&@92)aPLn
z84Nyux_ZxdQ>yY7_SL2H%z4=UYQE2WQ*fndRm^kFk{6u4921;YXbNVDE3|tEEB#>;
YS3Y@8NGT+kfq{X+)78&qol`;+02c>F^#A|>

delta 1262
zcmeC;>gSqZSbx&f#WAE}&eiCRc_M}awdE?V0t+-Qxe9s-F4R8sm!YInK-6{7l|K$z
z4}?ES3YuOK6ba#&INw4^aG{8x)zg3yCYNfFg9l&Fl{|mrUTWplyX(rYy}w&wv+a3R
zyMFxH>t@$3iumbm+cfWfjIG`kVX40#e~3)p{P|ei1m^{rpBOIGvp48<U0|zx(9hto
z-6f;jhC$~?{ISQu3=Q3!QI2<t`TFPOOnz$?-oMz;QR)A~yT?y`znHP&)qIi1zaFwa
z=d`>hP<Ex=<$}{arcQ6)29bdMEuk#hm2cO-KhPN<d>|{L%1_(r@)KDNL9vc9ourM4
zCQ{cPHQqOq>6R%xnX3BfTKx@HiMEFOKd&6|yu9(sjmfv{r!rg-xta1UgY~L-?*Bzh
z7Sr_<o0ipj&X$T^CL!>QQ)Y*aLd$8+LlFmd7M}|_q4<h1@xn*jMyd5-pB|=jPRZ3w
z%XrkO#pa>(<H9a|*9dK<uY9ZYZzZgn$66z}Vx>m=o@a4yV(k)7`y_QS-jO*|Kat<s
zX!lQ(UwxCib#?w%$!^`hZDZW#`9`hRY!Y&l?}~Kpd^o{rUiN9h&EJfDE-@r>Wb_mV
zrwE^ZB_pWuh%bp}LQlJ!_Zp>S4?#yIevKrC)H_!4`)i9?9-R2X!|>+KyQ}Mb&z-wD
zW5Oi$D>e#gExXUNp3wf3`C#5t8^vkO0pIISDkg+(;{0SNeQn{f&cnwT)^hkx>c4rZ
zOQF*3{m+9bcJpO7@vhJb*u_6Z^?h>}XQIspog037+t%4E*uE!zQ9Z*f<@j6MPFt-{
zZ@l-(PQ`!1hnKID-$xfSF<e#AJR`C7L-0E<o&`1s%PX_|)=tV74=IzpEy;CVdaJ^T
zPKSy5mh~k;j=BqWl+4TWKF1`L6sz!lL8NO@?v2a<r5mcB_*S0IDb#fke5+L1KBae>
zlDhMMV;9C1nTDmSa+t3vn>z?NDBW@u4C0UVWHe#ft<tn?UPE@UaD$SW6z|D7`?-|@
zj_l}_T$Ss}&}Z}Y=EHw?zwer7#-JtImwUEVDP}!uQC+=ne9QThVI>}C|JVMQs#UvS
zjdrm2HN9J9^EN0<Ty7?mG`r_OsJpj*_tqyX&ql3G>zvEBHN9qzf@;0)xoO{G9B$oJ
zV!be_JR_(j<`dr>4pYXUvarT9mkpErZ(i)1#~l#N8OqHP)9K(l)p~dJvtHrXU#u*x
z)$hx8M?Q*DSQ_D3FRT*$&@4@-ebL4)qcDcE(~4&+wL}*OO?2b%Y?0=d%ai{hK21#g
zL-DuRyBiNCuwH(d`u0~zRp-Hkr}?{Y$A5Tx+;-~O3x72omtXeQ(S7CroxNF<hfRCO
z)|%x-dp+hZ5D{Kw(VMs8OnSS-`A4-AyG;Ih&RwvrYV#2z>#&7Ed;IDHqT8n{JMsOT
zBeZV?!!;|LT%o7J*CtI5`WzzYW9Y!We{tRNLo*Htey>l>mhAaDa|Qd8YY%^3;1SGL
z-LbXLutkgQ$(4s&8FOWoS-<K8EaLE*tguuqaN}HUzGV^u%6`4JofANr<$=BMttGFR
zWrO~CIQ~o5V7->4Wv@7ClJco^x2%<RUu7&=)+jxhFnyipHm|?&jlGPP+)~<=XZOwt
zs>~DRWZ0Xo&-d))wB8GHYs@O|8A$PJ-@AP4;fkjrJ5LI~xF8%QsL&b^tz@F-z&Fv%
c<p=LCjU#J*8(9=HFfcH9y85}Sb4q9e0H16_5dZ)H

diff --git a/core/src/mindustry/world/blocks/environment/StaticTree.java b/core/src/mindustry/world/blocks/environment/StaticTree.java
index 9b1a7063f4..0cea162c2c 100644
--- a/core/src/mindustry/world/blocks/environment/StaticTree.java
+++ b/core/src/mindustry/world/blocks/environment/StaticTree.java
@@ -10,6 +10,7 @@ public class StaticTree extends StaticWall{
 
     public StaticTree(String name){
         super(name);
+        variants = 0;
     }
 
     @Override
diff --git a/core/src/mindustry/world/blocks/payloads/PayloadBlock.java b/core/src/mindustry/world/blocks/payloads/PayloadBlock.java
index 17f74ac4ad..86247f85aa 100644
--- a/core/src/mindustry/world/blocks/payloads/PayloadBlock.java
+++ b/core/src/mindustry/world/blocks/payloads/PayloadBlock.java
@@ -25,6 +25,7 @@ public class PayloadBlock extends Block{
 
         update = true;
         sync = true;
+        group = BlockGroup.payloads;
         envEnabled |= Env.space;
     }
 
diff --git a/core/src/mindustry/world/meta/BlockGroup.java b/core/src/mindustry/world/meta/BlockGroup.java
index d1e995887e..72a850d6c4 100644
--- a/core/src/mindustry/world/meta/BlockGroup.java
+++ b/core/src/mindustry/world/meta/BlockGroup.java
@@ -1,7 +1,7 @@
 package mindustry.world.meta;
 
 public enum BlockGroup{
-    none, walls(true), projectors(true), turrets(true), transportation(true), power, liquids(true), drills, units, logic(true);
+    none, walls(true), projectors(true), turrets(true), transportation(true), power, liquids(true), drills, units, logic(true), payloads(true);
 
     /** if true, any block in this category replaces any other block in this category. */
     public final boolean anyReplace;