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!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|x;$MRLn`LH
zy?KzAL6L{qV8`F`XK{BIgtly8@3>@>s0&oWP;qJ=kNxvGeRKAHk2t^a!Mew%uW%?Y
zynB3lr{FE-<$d~hmAAC{%Ew!||Jc=(m)cO$Xu`aNdx@k%tioA_mrR*#9^xLx4!ay?
zF<xT5#4|x}!ZXh`#%pZ;YDCSe6Vo@Z=>gesAh|B=w~CI%E^bW_*VEO{Wt~$(69CWi
BO49%U

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
zcmV<F1Qz>`3W^GlF@MBKL_t(|oYh;+P82~9{=nrxqQ-2p{1^_z>;d-$^adDD9w3}}
z3*#g37{;@Aq6be#<Rw-THiiR{pEZQ2cRZ|(y**XcRoy+~_?=*;r>4Jes;jHJYiC}+
zd3&?8x`MiJbh)1O{My1{p`Or~9S%o0KRK=K1vv!jCJz9!0DsU%5t<+m{1E_Xmk3Rf
z2Y`<M&u};b0JxZ-6~sN~@a)9~*=}v&Fd7pi@}E9@p89_<=&SlC#kkq<g7btNZwNc;
zLn3G)Z-K<6B0vhLFJTqIN?!Z*9XJsx0$2@8&uK-do4f-hLWgL_A{HA4gMK9*_-(_n
z$Pt%ZRw8eWU4MXK2>6{(O`J3xON~9L{Zk1*O_6nGk5*89(e^JYfOF{*B52x|w5hRW
ziUDDsz=6vHLb#kDj0K!K=S+nhq8<<i9p4kE@oFU>{w;yBEyWB?JW<5}NdzBS_oWDH
zMWEh6^+g*@)w6&v0yP!okk{Ocy~`(TnMq7BfSZFk@_%7RzI=NQ;6i-I*=P-qAAXG5
zUs_$M*iV^4D;}`4x?+mN+;E`D>kzi(h*|p?CTV~$1T@CEDYA}bb&d!WaR)I5NXA2>
zC03C!q=+Dq2NW@YGH#uZ-@n@juy1<i7{J!{PUZUf$tfEXQu2g~2gHnU_qhN$A)f~B
zS<Vw;Ie!RspBw^KCF>v`vtb=-oH%R@(27te`Is%O2$E;a?Cu`kEG{3g4X7+ox(}2k
z?}Lg7VLY%b*p4pOCmwKdwppTo0O})O+P2F&Z)bsvvrR~zAYnRjsZW6LU17$kg`aXy
z#Q@3^e3z%@R7-|e8q~XEJ44}mqY?x;5h(H{hks5gs09?4&Qop4SwKUq4dfj(t4OX5
zI}J(%+eF?Wb(t-$1t_9zB=3;2(Ng4O=zoSN05vV9PL)l-dgKNO0!T#LC_?I?D=C16
zV4FnH)Dv)RDgsc%27^AC^S40+iWs*sL$#d}fFn=+?U0&|mH_qc*w$Pq!tGih=WF^M
zIe$*JVt-dE{7RKspsXuXOV&2pcAn6Y$Wt2$u}wx`($Uh(Vl8=UvsS8EVy8jv86PJ|
z$*;xP(w+-QyIZ6HTJjEcijYg*ffJ!3K+4W4P>%>!@+mvo(Q^T6DxqqDfQbmyRJpai
zW8OHiM*H)VQ}W%hm?f?SQi_!{K{6F?V}HhSC>pCMV+GJ`IX5XnxHTsgX@rnOxbx)c
z#-4v+ey)RG*FV%9>-D-AkFP4%$KxyXdfmV6?tR7gpN~{FL-(fy9gnXtKc_$4@AbOq
z^}4wG;QrM0B6WgNOqj+fx}mbTe1PF~yf0Fb#y_bO)K+hnSZ2p6REpOLYU}WFM1RO3
zpHspY6~J1Dr%j@K!dmiDYMv^BDF$fachv7x7!x?+{#Uk^!C0S(dO&U+o)66su~vdx
z>lj0*Vn9wEUK7yPF;Y;^0ws!|Gzn5_5*6FI;$VsaG2+zNlL)z-AdCh6GoekYKF}fM
zhZN**hEiZHrt%XaDLJBSq?YPa&tj27z$!uxdFh&DtJLom*cgzrps|wI+{-DI=T?yb
zF!S=&-c7P)BeVyrb)Gj22K_1TY3y*+a;jYC33TWQjR=rJs3{R@7a)g76C(Tu7bD5e
T5+YPn00000NkvXXu0mjf7Y9c5

delta 1262
zcmV<K1QGj+3XckqF@MQPL_t(|oYh;gZWJ*PeRm{95TGd1MG;C7p)11u0Cb5E6-A=d
z{6H$;6Y?1mHPjIlR0xruI3f|D6cIY*P;>%BdlbRJ>zx_T*xqG%)!nXl*6-bTJhtb0
zhc92v*EZJC6izO-vYy{uJucJ}8vXJ36qB>_#$J#^plR{|(0>PjE{f0wdEk!#K(|C_
zi#z}<_+Q53QviUA30gtia}JN5Y?JLaSC6AHK_dU*-N(xJ(P*gZpA_Tz;RWXjIo=R<
z)Q3dSLf!(2OHF_jP``v#1S@&%ukXN#P!qsvSb9z?Leu0OC=nKjb}VACVKf@n;(^~b
z9E%)r$z>(-)_>Rq7>0n~`P9To)3MapliEL(0Mr!OWcFwU)fa95q5?RVE+K-ZeMy@d
zTc#Kg<_R3QJRpS23Bp*wxpU4`$RX+hVbJkCff}z?^5JI*lx-<yXyS<~21p|K(7G>0
zSStec4yrHOV5*)4d=aRrD2Ke}UhG{yVarTniUHgl%zu#&J2JcZH2RK{i!ChwdL6aD
zwy|EbpE8BkJYa2O-4uzr;gCX}Ys(R{_A^Y<0AUDdjB`_D6U*ux5h&sgVhoUshek`R
zB4bDqK_U+*VgO~_Iv>A%a|GbX^b7#(?C#aBP0r5Qn2?eu)I1<&guBlL$Sd+`;GX3?
zA(n$s_kYPDU{$gS@-Z9Mp~i{B#sIAdO_Gn<(uyE?M(_E-WImrAvJI##P`VG4CGUfZ
z31K|2EZ9yiwyr#&x4d7Xe*l^zU)r|II<IGe-ts;qPmu8G>tpX*a{>U>Bq_`oweVB!
zN(`Vp!FPFTPOXw}7gTl`+ZhVi8?_+Fi9nGrIe&CgK`o%Tbe?KU&H@@@T_EqESw(Vf
z*lAEA*d_7~smp9}EkF_NB6)|Djg}%OL;o{G0jOy)b*gLw)+0AS5I`c@MG;aDT}c5n
z1iK`Hrk;RnQxkw9HX04doWBbqP{g>68LDkX0FFHM+2Q`(_qv`o04f!ZZOw%uT(1Rk
zet%70gwM%VbV$wrefX6seW0u>Q%lw^+IF6>Ad#mw5@MT-z*R>}FN?M0sm)rcW{I5!
zwP$>sASHh-&X)FEK-%3R1<;arXi|h+@(!E`H33p~R)J<ju#!*N(T<)AP*Vw23j|z=
zKuwi9yL;x16YKOkIXfrc9gA7wS|FuZNq-Y0Q{gsdEQg}8iZWIJ&6abUB7|FWQjtao
zNrW2@9&R7_7nT+m@N@QE-Lb)71=Hze?fP_jiNRpyZ@b%H@a@MvmCexoDM6>xODrww
zPxl9d6$}O|xV3zza=l2MpcE6TIE`+o%x8xf&*FWNiZuR7ouIaQv&1qxR-sb7PJd8a
zhnFKl4*8rCzNi4!Iy`L><rCJDms0ao5lk^a3%{d&r^1-P5%+&(YZ;97nWzWk*5Uck
z3=wN3xV4TkgenH))Zw)OZ5<;8^(;`L2uhP6r6y6aohuHe7!V^)jXjBw%L&3*;6D@E
zr0N45QvOIm{%0r!)?z9@A(E0K%4bGusXp}_IRvaC<dB!HNw!M;UxAGQISU#qdCk3?
zQh9C_2>`ukFAnC(mW|LJtTuVxFd7Xj-qYIQsO40-$rI?%6Iu}<g-}}}G%i36kv2s5
Y4f-g=tot%Ja{vGU07*qoM6N<$f}d<d5dZ)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;