From 22221a0f287b25fd3124872d0117c1c6c026ae4a Mon Sep 17 00:00:00 2001
From: Patrick 'Quezler' Mounier <Quezler@me.com>
Date: Sun, 20 Dec 2020 15:58:18 +0100
Subject: [PATCH 1/3] Add in region to payload block icons (#4052)

---
 .../sprites/blocks/units/factory-in-3.png     | Bin 675 -> 1407 bytes
 .../sprites/blocks/units/factory-in-5.png     | Bin 1083 -> 2172 bytes
 .../sprites/blocks/units/factory-in-7.png     | Bin 1593 -> 3210 bytes
 .../sprites/blocks/units/factory-in-9.png     | Bin 2346 -> 4393 bytes
 .../world/blocks/experimental/BlockForge.java |   5 +++++
 .../blocks/experimental/BlockLoader.java      |   7 ++++++-
 .../world/blocks/units/Reconstructor.java     |   4 ++--
 7 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/core/assets-raw/sprites/blocks/units/factory-in-3.png b/core/assets-raw/sprites/blocks/units/factory-in-3.png
index 625be61764e862ec9568d0b0fffd40d37e88553d..79448147399c1f3956fc8ebe0faec2d6b67058e3 100644
GIT binary patch
literal 1407
zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RWSkfJR9T^xl_H+M9WMyDr
zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7$Y-7B1$5B
zeXNr6bM+Ea@{>~aDsl@LK)|NLsv@@_H?<^Dp&~aYuh^=>Rtc=aDzDfIB&@Hb09I0x
zZL1XF8=&BvUzDm~s%N5Spk&9TprBw=l#*r@<l+X^UX+q%tCUevQedU8UtV6WS8lAA
zUzDzIXlZGwZ(yWvWTab^lBQc+nOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2Ntn
zTO}osMG7zgac4<p8p5W$VyL&0^K<n<GWv#k2KsQbLB@kbt^A8JQ}ap^LFU^T+JIG}
zh(YbK(Fa+M<QRxg!J<JfZgyNY`rt4Dg^wMV&mr|l1_tJ(o-U3d6^w7^`1T1K3b>^!
z^)Y$tF?qjhv^XTgSja!EKyX@tcz|n&cG>N($>BRM&(!aJxg~bpru(zMX>2s{_pfMV
z;Aj9N8RrL|r%&I1Jj5+jsbHb}1P776%2?KbOb?3)29-OF3?32siMN~bypyeWEuHv#
zpJs!XlapS>xqG4voIM)fwYVBuVt!1C6=mSuDdfYXpy=Ne$)NJYqkyxarGhh$ae{z$
zq6dS@5zifee*Vq2khWXHyZAO++<XR)8x=bBn{yo}Y?$+R>jSlhcW$aRzkhwIIrHUw
z{MVm{kNfXdKDqt<z1iVrN^hU{zZdv6zu+T_L8*2~w#@URrTz;v8xEQ5i2A=zBr1w!
z7n8;g_MO-7X*HP5Y|v<EySCwVwWV#9Dbp$juLBo;u2OZ~Kexe?VJUNsb%_6x$Od)I
zq_->z2hM4!3NZz3xHZ|SVQ#3G3d@p&t?I1|)~ly@aCjWd^5<eK3)7sKAGAr&BTBw~
z-dCSR7W^yDGj8$UANlcCr6ceB+WCP^J6NwaR4&|`U1oFj?ZNB6s*3G)#fmsgKHc`}
zr2fJ53DYF{_O`FqYEXOGI7Re5<Lge_C?`dSTc4waHa(U+$8lkzVNCwhtpX0Mn-^An
zKHo4$a<|tZzXP_O9Sjl^m4n@a8`Kt>D!w$gR@yi9vEZ#;Omc~Z=@HK14zK&yZCUW9
zV&%7)zh^P2%viftP229#<Xo3NpM%znkp`85_x>0&q#yfKvw3|hgZ`X16>)z!PCzZY
zpnd07S=GiX^90{BzUrKMZQ~+;(Fu&7%M$1P5!*0r#_eD3`^8x+9$awR^mt_(OT??i
z8^8b1I>#L58}NJIeWU(g!tW#>UbgbDRw@g7@Kt~M4%Vv&cl4_>Fn;ujl~g>?s%<C1
z^l0WTBc}%L@EQY_BgUnvEezu8ek5>oq`x|qA*N9K`Q@sP2Tcv042Pd*Ph>O?W(i?5
z{qn1Bl@;6R|JydP@4n7Aua4=ix<m7tufLanvT`?Jjd&RKI8Ht4_NwxD_v(c~e-_u6
z<~WN<huSd4{jiz(tDxm};Z@EYCbx&doHmSBFXE1bGCcVH;mP)R27CEUA&Iw}mMjR9
z-!@lFwEp%4h6CT5-}M%7GyIV|wXtkE!vXnbon9kuh8oVt74tnA9`rL`b6ds45btbp
zU7w5LkL8YO7h@S4@(-HJUlw8b@i}3wWEm5~{VqMVbpi}O3<GQ<%@`Zr9~6`5K0L)?
kh6gK?0s|No$T9tAQ0LZWnJBYt9jNT{boFyt=akR{0Bvb19smFU

delta 651
zcmey*wU~8+N<Cw7kh>GZx^prw85o#iJzX3_D(1YMdp1|vP{1voY5F9Y%N|8O@@?J$
zoQ_eS4PPF$<D4M=+gZ=^Y(U-nRgsk+ZD&k6`IV=mqobq7Y+k%xe*B{RN1H$WDXL@+
zaA3Ip!I822xmiuXf!N44ey$zT*$<nU-W>}2v7q7Mn^t}<iBt7~KNd73PHExil5ooW
zv7q7Il@@-k7hbtP7Bu9|;glD-(7O3yGt;b0&j0`ShqG?EAZ7PMx?q+ZNX$a{A;@I*
zx_`f7WnXN6Z{L+Y{ULMB+P{sTCT<PLekF3DQJJ%Pz4ij(Xhr#xfe!A|5~u6<bG<lY
z`sLDjHddYmCN%*L^%h(lZj1*t6eL(#7B?h_2=p*DRd(%b+^qBc(f@xteRgiOd+M7n
z+alw6<JSB5cQ57ts@~pQw@WqSy~wLGoS|nMPj&oS$ufl{Mp@CSW`>7@?*`Sal84$o
zS>{AWeOq^vJ3ZG{K5~AX!|BKJ+1Jy!<R@`waMr)I-PFo|lJ!paEav(t_r8K$aHLMz
zOLxKXZ-?GiztLsQR_tBZ{)B0P@1a{;Z>lU2XLzpiCU&ytArYnpeomgbPt4~>FB4=)
zJ$S9-ltQ8w;|BQ;GnZ;b9h&l-(cqcGvortMw-~K$5Om>~k;hqO0`^m&g8|4Im`53}
z$lTCaV0`^Uz5J`43nC-h{ss6SOHJ2)(_Up}qV2BeU#(%!yfpi7*xcI}d2ejc6o{Ut
zdSF>C=Z4%=rkp#o7^2114?MfexuLd}N#?->2KN~%2Ndl%3wlDCWS&f8aF<j&kT{RC
uU`{TR%!@e<a=8*q1XVjaI#@pOg`czZ@wQOnW?*1o@O1TaVOi&t&;$UJ${R5N

diff --git a/core/assets-raw/sprites/blocks/units/factory-in-5.png b/core/assets-raw/sprites/blocks/units/factory-in-5.png
index f158423ff62804112dc4ab205be1f51980f1265f..ccb7fbc5a36e6723fc8555f1c3856980d0d819eb 100644
GIT binary patch
literal 2172
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

literal 1083
zcmeAS@N?(olHy`uVBq!ia0y~yU|0ac9Bd2>4Bh9`br~2K7>k44ofy`glX=O&!2H$I
z#WAE}&fB}*MYr7~S})EHnU=)AcVfzn+7(+^-WndR&_AbA6llcp=wff(hdGvYo4Vpn
zT?DdJ7#J8B4xEXLyI=R`+ArS^b3iPWPKKR#s%ttKcHYPZkr$r-5MnHvxD-S-R)17w
zTC!>D4<W{&i;F?z$!Q?+;586=V;+dSa1TVDm<S>dTm<R5G!sM~x(Ol!Izgnv${#|E
zn}Sb*NavRzGO!m!I<Ea8#Q4eKEQr0R3}pM`E)e^{svrCQ|L$k_`Qp?MA#DZob$$AR
z3jebO<CPrpuJnB<uIXg>xg@N``=csTisMU;_eZC56japz`&vF#^!4fM`L55_9G$MR
zU%XOu*=LP8LB=d6V$+rGRIOo%ELAyVdz@oJ`!|-Y<`ImWPEOm<w`Lks%I2*H`u^?J
za43u9dV6NNDC4HvxdrL^*Z&lLJNsddSB$#Png$a!hgm`jzMK=5-QhLf5LJFC#<QV$
zmf}8_2IpC-`&=3h&(s95XX=93GYmoO8K(PO8t%@v+~?8|JKGk-u4?-s#8~z+@{#u+
zF`s0nC7R_f{txb%Nx8p^+E+DAw4flnddHi)_m>{kVdPtLh0RGfowFdo_{emQ0*}og
z(qe71rmc4a^UdFi>uZbOrcPsEzvykSG@Y}6!Im|+Y8r#}^=J@xL$WO!n0qzbKs8;J
zX^zv%xvQeifZSieWE&G;XXV{6_g1x5%<m1=bEk4_$llu)Tm;gcZLu^BWLR5p7Rc;q
zFjv9070fmM<oaBdNhW~*;gngb2OPKZEx)3}$d}W`!D_K%lK+Mr!_&`PWH(s~#<(<?
zJQcaKGToAwdqeVhfrSj#=G84sG6&8Gauo<{cGEb}ct&C&1G{l_3zN(RA3?5yfXyx%
z2O7@`EM#CeuWG5|UZ%--X$nK8SA&VF1K-b2U!y0^-NJGrZ~Mc!y#WnxHi_Js$-#Oe
zO?CdVpMDKFn^X<XcP;L+O{|PkbCr#}YNJ0x>0Hgu8=&|Oc_ejzn&i8-hvNF{^IhL>
zh`g=t)=(2*wXgiUl8A!+)vot<gIbtWJpcZ<SKAlR@aKw>6XU0YR|UBy#K%Z3WQZ&Y
zZDD${PFqPtVRe?fhJ)NH$%PCzmxQ%2rEHcG<eCuc<*wmSrY*UU!E#AR3)7PgLV{cq
zg3q~WIQUr$FJ#bsl+nVpWQMXJ*Mvpi+%z1zZVNADSecaF!n9<Tt{~ThRdTKx4y&TO
z0~%r;#kDX!G4dAVn&1s`NX$DkC&o)hLjRZZly?d+FfcqY`p>v`-HnE`jtv~3T<q!U
K=d#Wzp$PzY1<k4e

diff --git a/core/assets-raw/sprites/blocks/units/factory-in-7.png b/core/assets-raw/sprites/blocks/units/factory-in-7.png
index 39477c61cdf16273800a8d0a475f4bfca3179767..1861a46c35313b0ec95ca920cfe017195c6f7379 100644
GIT binary patch
literal 3210
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

delta 1576
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
Jvd$@?2>=9GsC)nb

diff --git a/core/assets-raw/sprites/blocks/units/factory-in-9.png b/core/assets-raw/sprites/blocks/units/factory-in-9.png
index 6a3b324f1b117fa7d8de18bbfa8bfc45ade6430a..acf736c8dd9f0fc40be2e19f2b24e97e0bddc172 100644
GIT binary patch
literal 4393
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

literal 2346
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
ONqD;YxvX<aXaWE*{lTsP

diff --git a/core/src/mindustry/world/blocks/experimental/BlockForge.java b/core/src/mindustry/world/blocks/experimental/BlockForge.java
index c609416a30..6dcd81a4eb 100644
--- a/core/src/mindustry/world/blocks/experimental/BlockForge.java
+++ b/core/src/mindustry/world/blocks/experimental/BlockForge.java
@@ -37,6 +37,11 @@ public class BlockForge extends PayloadAcceptor{
         consumes.add(new ConsumeItemDynamic((BlockForgeBuild e) -> e.recipe != null ? e.recipe.requirements : ItemStack.empty));
     }
 
+    @Override
+    public TextureRegion[] icons(){
+        return new TextureRegion[]{region, outRegion};
+    }
+
     @Override
     public void setBars(){
         super.setBars();
diff --git a/core/src/mindustry/world/blocks/experimental/BlockLoader.java b/core/src/mindustry/world/blocks/experimental/BlockLoader.java
index 3e015ec9a6..afaefeffcc 100644
--- a/core/src/mindustry/world/blocks/experimental/BlockLoader.java
+++ b/core/src/mindustry/world/blocks/experimental/BlockLoader.java
@@ -31,6 +31,11 @@ public class BlockLoader extends PayloadAcceptor{
         rotate = true;
     }
 
+    @Override
+    public TextureRegion[] icons(){
+        return new TextureRegion[]{region, inRegion, outRegion, topRegion};
+    }
+
     @Override
     public boolean outputsItems(){
         return false;
@@ -72,7 +77,7 @@ public class BlockLoader extends PayloadAcceptor{
             //draw input
             for(int i = 0; i < 4; i++){
                 if(blends(i) && i != rotation){
-                    Draw.rect(inRegion, x, y, i * 90);
+                    Draw.rect(inRegion, x, y, (i * 90) - 180);
                 }
             }
 
diff --git a/core/src/mindustry/world/blocks/units/Reconstructor.java b/core/src/mindustry/world/blocks/units/Reconstructor.java
index 2aba7a8c7a..634ea5b911 100644
--- a/core/src/mindustry/world/blocks/units/Reconstructor.java
+++ b/core/src/mindustry/world/blocks/units/Reconstructor.java
@@ -39,7 +39,7 @@ public class Reconstructor extends UnitBlock{
 
     @Override
     public TextureRegion[] icons(){
-        return new TextureRegion[]{region, outRegion, topRegion};
+        return new TextureRegion[]{region, inRegion, outRegion, topRegion};
     }
 
     @Override
@@ -129,7 +129,7 @@ public class Reconstructor extends UnitBlock{
             //draw input
             for(int i = 0; i < 4; i++){
                 if(blends(i) && i != rotation){
-                    Draw.rect(inRegion, x, y, i * 90);
+                    Draw.rect(inRegion, x, y, (i * 90) - 180);
                 }
             }
 

From 118ae8e87deb0be4a90a660e273755958c7fe888 Mon Sep 17 00:00:00 2001
From: Patrick 'Quezler' Mounier <Quezler@me.com>
Date: Sun, 20 Dec 2020 20:22:01 +0100
Subject: [PATCH 2/3] #3889 2: electric boogaloo (#4056)

---
 .../drills/{drill-top.png => drill-item-2.png}   | Bin
 .../sprites/blocks/drills/drill-item-3.png       | Bin 0 -> 1562 bytes
 .../sprites/blocks/drills/drill-item-4.png       | Bin 0 -> 1542 bytes
 core/src/mindustry/content/Blocks.java           |   8 ++++++--
 .../mindustry/world/blocks/production/Drill.java |   5 +++--
 5 files changed, 9 insertions(+), 4 deletions(-)
 rename core/assets-raw/sprites/blocks/drills/{drill-top.png => drill-item-2.png} (100%)
 create mode 100644 core/assets-raw/sprites/blocks/drills/drill-item-3.png
 create mode 100644 core/assets-raw/sprites/blocks/drills/drill-item-4.png

diff --git a/core/assets-raw/sprites/blocks/drills/drill-top.png b/core/assets-raw/sprites/blocks/drills/drill-item-2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/drills/drill-top.png
rename to core/assets-raw/sprites/blocks/drills/drill-item-2.png
diff --git a/core/assets-raw/sprites/blocks/drills/drill-item-3.png b/core/assets-raw/sprites/blocks/drills/drill-item-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed716408b2265e22320e14a06da4ee78726e2f96
GIT binary patch
literal 1562
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

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/drills/drill-item-4.png b/core/assets-raw/sprites/blocks/drills/drill-item-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..a18efb5dd402687e164167b8078d4ac075c9329d
GIT binary patch
literal 1542
zcmeAS@N?(olHy`uVBq!ia0y~yU}ykg4mJh`hQoG=rx_R+^D~{D12U7785lGsmQJ+x
zW_A>5wO=fB(L+F2B_c=g=plyy0q<VdSqehRKeEcM+q9_Y?dBB9VU_M~Xw7)M`h$Fi
z_6;qLCZ&#uAKW#jLf5Q21tz9UyZO5??Of_Jo{FSM<L6si6{qXp_?Y1m9T9VB&-x!P
z4tCFP$g{e3<xNh{vd6FIiG{v*S{44eme>7y)+NJ*OPwq3Y<bi4VM#&G;snimg71ut
zf35m3@k56$yU4z<U4f6qkG_<u*VrcfG4sQUc~QUkrR#5;xncP*@nM2qv`PK>#d(js
zpFMxRge`^dfq=Rf3vaVhc8aFJq*>F?Nc}z(dY|X@Bg3cpfrrH0XZ2LLyXbmdUvg#2
z3(udMri8rv|G6Y6dGXeF`#84P?|%1Np`v_YP}$x0$=BD;ad<5p^X&D%(vz8wg1;2S
za?3T<bDvxPYSu<}@!J>vXT01NH#I7?DoC@!y7`^!i@mMqo<@c3e?7;}At`v?3$}0k
z2_D~mhu1Nz-<ST>q%Z0n0|NtRfk$L90|U1Z2s2)~Tla^7fyLI-#WAFU@$K!sc~=}n
z+7g);IyiACx-MF<V8JQgmOhgUhgbuYwd&S26tJ>rxtwKn;P!p-fGsF6AV9&@iQ{53
z-;0iq8EMzbj@du|QQBx8SADH+pZ;cPbrW80CJu!L23it2t`DvR`7QZYxu>!`qV$CI
z_HV2Dwof@2BetOIht#y=LOZk%L_Dn4ZCuUNBfIao&<@Q5ArGsy8@ri&WcMu>nxTIn
z=3%ww!OXn^-LI#wk2_y?t62QQ5{9(&2KN4M|Kon2JGb@Or>ol1vioX(?kb#L(5{!<
z_B;Bo;KdY1lN#QHV9sA{>mRRM$nuO!pnZMfQ!fLP8rkdBoIauo;``b}r$1Qo@b!*)
z-U-VXW*@q~VGGO35B+_1uk(&>?Ge<E^G;aA5PSIgg&@W<-u)(R$AxtEF%-A#UnVqT
zAO8Z!m%EOY@9R^2ePzwWs%*~wjo&Ix-{O3J&Rle#-_4Z@^X;oYS<AeB_;~rrn*n{j
z$EOLsxbaXzOn&za#zze*9K0UaK7KCzv8g_5cFuIwPz8PC#-B__9(pB6?X#Jts^h5n
z;!<&(cfvk~|4RS<=gaJ~Q@-uZ__}UsZIJ4P$7|Nz6;%*F@^-d))cc=1|E5&0WLf%H
z$8LKU(-+Qo=NNC!JK_l*KeDwNe=}vwSaX?4MB(kGS!+cSOaqteU#Vrhx9|UiJ%^`1
z%g8@_S2pK;>Tm7utP?8QrX=t_>^`f-bzwV8Hs}3RMz8NLcAsI{<p1j1ri7>4P8WxX
ze>Qe__3h0Cp$x}E_hmCSto%^CeePEY?(EO30#Bq=FMKfFvVkS;@bv7`&)*q>nk-ga
zdjIzE0n;A^bAR)l&*ksm`sv0|o&`5*)0u4bw)^d!TEP{+uKL6I6P8;Hw_X3S`@p_~
zS2^w<`Y&c>?3S?g_@6HyH{9I2?|S8p$B*Bi{q}9?wSW8T{^XpC-*e&CwBJgi`_AY+
zKbKc3ci8Di(O<PR2HsW2d=?~sjcm`?{bZSZIVVZA#?Zi!IU~X}jY)R(Yb&1kzKJ)N
zng~a5#jiUa!uX_RxsIdEzCHVNb_zvs$FDmY!}w&$at%kln#$V9M?w)i@#_v>NoTNp
zSn%@qOa+^5*OGtw6#Tz;H|nsjUEj;!4ElWE)Y-e^FBJVK(p{F$z?-~oW&$T`Nb|yM
zan=dl^LMex9TGP;XPvQ$CGJppc!Q?b1I?Q0tP-19?j0(RZZPzEU|3U_<jBCtBH%zn
fqVXxmAI39o(vL&_Jvhj~z`)??>gTe~DWM4f_`sa!

literal 0
HcmV?d00001

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 32a322b5a5..33e11eed93 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1262,24 +1262,27 @@ public class Blocks implements ContentList{
 
         mechanicalDrill = new Drill("mechanical-drill"){{
             requirements(Category.production, with(Items.copper, 12), true);
+            drawMineItem = true;
             tier = 2;
             drillTime = 600;
             size = 2;
-            drawMineItem = true;
+
             consumes.liquid(Liquids.water, 0.05f).boost();
         }};
 
         pneumaticDrill = new Drill("pneumatic-drill"){{
             requirements(Category.production, with(Items.copper, 18, Items.graphite, 10));
+            drawMineItem = true;
             tier = 3;
             drillTime = 400;
             size = 2;
-            drawMineItem = true;
+
             consumes.liquid(Liquids.water, 0.06f).boost();
         }};
 
         laserDrill = new Drill("laser-drill"){{
             requirements(Category.production, with(Items.copper, 35, Items.graphite, 30, Items.silicon, 30, Items.titanium, 20));
+            drawMineItem = true;
             drillTime = 280;
             size = 3;
             hasPower = true;
@@ -1293,6 +1296,7 @@ public class Blocks implements ContentList{
 
         blastDrill = new Drill("blast-drill"){{
             requirements(Category.production, with(Items.copper, 65, Items.silicon, 60, Items.titanium, 50, Items.thorium, 75));
+            drawMineItem = true;
             drillTime = 280;
             size = 4;
             drawRim = true;
diff --git a/core/src/mindustry/world/blocks/production/Drill.java b/core/src/mindustry/world/blocks/production/Drill.java
index a0375ea203..e179d18e0e 100644
--- a/core/src/mindustry/world/blocks/production/Drill.java
+++ b/core/src/mindustry/world/blocks/production/Drill.java
@@ -57,6 +57,7 @@ public class Drill extends Block{
     public @Load("@-rim") TextureRegion rimRegion;
     public @Load("@-rotator") TextureRegion rotatorRegion;
     public @Load("@-top") TextureRegion topRegion;
+    public @Load(value = "@-item", fallback = "drill-item-@size") TextureRegion itemRegion;
 
     public Drill(String name){
         super(name);
@@ -80,7 +81,7 @@ public class Drill extends Block{
         if(returnItem == null || !drawMineItem) return;
 
         Draw.color(returnItem.color);
-        Draw.rect("drill-top", req.drawx(), req.drawy());
+        Draw.rect(itemRegion, req.drawx(), req.drawy());
         Draw.color();
     }
 
@@ -304,7 +305,7 @@ public class Drill extends Block{
 
             if(dominantItem != null && drawMineItem){
                 Draw.color(dominantItem.color);
-                Draw.rect("drill-top", x, y);
+                Draw.rect(itemRegion, x, y);
                 Draw.color();
             }
         }

From bbdcef62e4d430e12f6fa4d442de75fdec1fbc56 Mon Sep 17 00:00:00 2001
From: Patrick 'Quezler' Mounier <Quezler@me.com>
Date: Sun, 20 Dec 2020 20:22:14 +0100
Subject: [PATCH 3/3] Draw item in the drill center when in place mode (#4055)

* Draw item in the drill center when in place mode

* Update core/src/mindustry/world/blocks/production/Drill.java

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>

Co-authored-by: Anuken <arnukren@gmail.com>
---
 core/src/mindustry/world/blocks/production/Drill.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/src/mindustry/world/blocks/production/Drill.java b/core/src/mindustry/world/blocks/production/Drill.java
index e179d18e0e..9361c22905 100644
--- a/core/src/mindustry/world/blocks/production/Drill.java
+++ b/core/src/mindustry/world/blocks/production/Drill.java
@@ -125,6 +125,12 @@ public class Drill extends Block{
             Draw.rect(returnItem.icon(Cicon.small), dx, dy - 1);
             Draw.reset();
             Draw.rect(returnItem.icon(Cicon.small), dx, dy);
+
+            if(drawMineItem){
+                Draw.color(returnItem.color);
+                Draw.rect(itemRegion, tile.worldx() + offset, tile.worldy() + offset);
+                Draw.color();
+            }
         }else{
             Tile to = tile.getLinkedTilesAs(this, tempTiles).find(t -> t.drop() != null && t.drop().hardness > tier);
             Item item = to == null ? null : to.drop();