From b87339230907b3829a8bfae6be20837bd0c5e39b Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 27 Sep 2022 12:29:27 -0400 Subject: [PATCH] Misc block rendering cleanup --- .../blocks/distribution/cross-full.png | Bin 0 -> 209 bytes .../blocks/distribution/inverted-sorter.png | Bin 260 -> 382 bytes .../sprites/blocks/distribution/sorter.png | Bin 192 -> 270 bytes .../blocks/production/disassembler-bottom.png | Bin 0 -> 306 bytes .../blocks/production/disassembler-liquid.png | Bin 430 -> 0 bytes .../production/disassembler-spinner.png | Bin 299 -> 307 bytes .../blocks/production/disassembler.png | Bin 2264 -> 2253 bytes .../blocks/production/melter-bottom.png | Bin 0 -> 121 bytes .../blocks/production/melter-liquid.png | Bin 198 -> 0 bytes .../sprites/blocks/production/melter.png | Bin 552 -> 563 bytes .../blocks/production/separator-bottom.png | Bin 0 -> 222 bytes .../blocks/production/separator-liquid.png | Bin 179 -> 0 bytes .../blocks/production/separator-spinner.png | Bin 158 -> 233 bytes .../sprites/blocks/production/separator.png | Bin 679 -> 1075 bytes .../sprites/blocks/sandbox/item-source.png | Bin 197 -> 296 bytes core/src/mindustry/content/Blocks.java | 8 ++- .../world/blocks/distribution/Sorter.java | 13 ++++- .../world/blocks/production/Separator.java | 53 ++++++++++++++++-- .../world/blocks/sandbox/ItemSource.java | 14 +++-- core/src/mindustry/world/draw/DrawRegion.java | 5 ++ 20 files changed, 78 insertions(+), 15 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/distribution/cross-full.png create mode 100644 core/assets-raw/sprites/blocks/production/disassembler-bottom.png delete mode 100644 core/assets-raw/sprites/blocks/production/disassembler-liquid.png create mode 100644 core/assets-raw/sprites/blocks/production/melter-bottom.png delete mode 100644 core/assets-raw/sprites/blocks/production/melter-liquid.png create mode 100644 core/assets-raw/sprites/blocks/production/separator-bottom.png delete mode 100644 core/assets-raw/sprites/blocks/production/separator-liquid.png diff --git a/core/assets-raw/sprites/blocks/distribution/cross-full.png b/core/assets-raw/sprites/blocks/distribution/cross-full.png new file mode 100644 index 0000000000000000000000000000000000000000..916e18cfd2a2c6fff53bf96a2339cdf49005600d GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>VCeRA zaSVxQO-_(_*&ulA!zaFf{{G$Db7N1RIB?*=0T+Mojg5iqJyr=<7@6NOhy|IhSn=x6 z&GNkXWj7dAS{XJyz461OoWaatrSghNY#N0uo_q(ypFgo`dLpo3oAQY+rYx(bHzp3f zIvx|5S3KqDDrVfJ>`^LmQdQBgPl1)EBG%wl1K9WjvIblXO{{XqZdcl@WME)m@O1Ta JS?83{1ON}BO7#E$ literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/distribution/inverted-sorter.png b/core/assets-raw/sprites/blocks/distribution/inverted-sorter.png index e023e200615acea46a0d4178a2abb6700e150090..47e4ed20c9e2907df2f45d2aa4c312074069c257 100644 GIT binary patch delta 355 zcmZo+`o}aurJk`k$lZxy-8q?;3=E7Go-U3d5v^~h+wvVU;AxEy)IV_Gz&*W*77Rk} ziEL^|j+`-EU~JuFtT0vf%F?@%5*AJ~wH%YJJ*6GlZLI9y7fbE-+YpoM#S!)-Jo83I zppDS+>a}Ix6Y3iRq(Zcsf+jwj-(OtxPp{XrewyeSwrZv+1@*y`zbP^LJPKKIvbFEt zmgQ^-(m$<_==BD6ojmhi_S)w;%n@gnH9iwQvhCzNmsPJLQyEp?W%mj$=-hGo*8J;@ z^O-YRGm88f8J<79u{t1hkKb{B`)Vf94*$YaNBkc!I|-RH)f{$dcw(8Md*JVa9tOK3 zxe8l!K4|(l-?961cOUcI7zTsVvy%$zUDO+v379=%5ZKaLaIK!9K>POBe;0o8g>Y*X z9@v)@bT)Ib_Yb{1?t`Vr;!iTI)D^$a%JA1LX7gtLS_I oIfz|%m~o$#hoN55(!o=H)(JtD*%~eG3=9kmp00i_>zopr0H+RK?f?J) diff --git a/core/assets-raw/sprites/blocks/distribution/sorter.png b/core/assets-raw/sprites/blocks/distribution/sorter.png index a4c8b37e59ecab31c6741b370177edbf73e290ff..8bbe0fb50a5da12ccd53c995af53f4f0b0707ff9 100644 GIT binary patch delta 242 zcmX@W*vB+MrJk`k$lZxy-8q?;3=9k>JY5_^B3hHrXlML5-@txnXRYLX6UPOMR&|HZ z>r}eDlEF>(K$Cxvw|A?fw|8rj_qy2K&B1)>907-ulFl4@#gG-{cfyB<{lcN5nzYRe zo)^dPo$%;RR5`jya`UtV-S`V{m9@ktWLaufaac9Toc6qE{UiGnV@>5Wv4jK830D{w z^GTE*Si#I;)ex{+QvN`w@}wsWMY4`PPkDHFczUM%5Rg{5vcPeD_KR6;8$wG;iW$~L yP1EB$5PtOWTX6$}3HQuh!tHOF%Y5NuV3=TF*>7<1=wSv11_n=8KbLh*2~7Z^Zeq*; delta 164 zcmeBUI>0zVrM}(M#WAGf*4yj5c^eFPSOU(ot5z$xCG>R6vR&xz^~XBWW!IxqN7j2J zxqo|H;}&^MS2VX?@xk?mvbz&n7*;%za?~$-!k4;V8aH9+>$A4LF0fv7)91>4iJ=VSU VTw?CJn1O+T!PC{xWt~$(69AP=LI(f< diff --git a/core/assets-raw/sprites/blocks/production/disassembler-bottom.png b/core/assets-raw/sprites/blocks/production/disassembler-bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..7337b1d716709147ec8c75fdcd102884ed9ff6de GIT binary patch literal 306 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&!0^V? z#WAE}&fANIybKBq2Miokgg(4yNcoZwx*?_beX;wDrOb8L8P+gHFmGT>;5{JKV9Joq eaBXM`*h<k44ofy`glX=O&z?k9b z;uumf=k1+ru0sJlE)TE#eZTV`mqx^vgkrb%KgAwAN&C>aW$h#tPXyYRx0pTS_rCX& zD{pUeonxES@$%{R7NHM}E1sI~VlkN$SEuZKpecCT{S`tJE^K*fzNqEnfh$k9zZ7yi zd`|Cw^yvjf_NQiXEt>A|T>hC)%Muy8)V}3CtC=tH%{4n8)Sl~Ee0N>d!_98{e=z-P z$`E8#*uUS|>j1aIe>M&cMqPzO#xFb(j9(7QPu%=K-f{J2h8e5}bQsbY4Y(U38O|^z zh%sOhI?Uy<%WcXW)>?LzDGuiw>RBdoFPI)L8sH$hxufN2c&kW&>Fxb~UuFm?Yv&-F{EZ8(yRh## diff --git a/core/assets-raw/sprites/blocks/production/disassembler-spinner.png b/core/assets-raw/sprites/blocks/production/disassembler-spinner.png index 8a7c2bd6061fe2ec10957ea6fb5f60fdae47531d..63758c0e823d475e445b590ec596a7c0dd760503 100644 GIT binary patch delta 267 zcmZ3@w3%swVf|ZA7srr_IdAV+@-Z0-xH>+VbEHFAG3g!WL}!(0nf2x&M_F?14U=>p z-sNL}0<-P@{2%&Ge=VzjTKxR-#1+%PRT2ME5ARpe yRE25U_C>$tV5%&4LF`$kx{rs{pzdbS_`vXu%fV);hTw0Ikf*Dk3(GpEgeCw*24^z> delta 258 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 JWt~$(69AiUH|hWY delta 2239 zcmX>rctdc4Vf`de7srr_Id5ZayJO5nY~y&!WMh2VbYpll)egFP$chR36l^>?Nl9mk zv7U3CL)V|44LiIef^s*uawqqAPSm z^ZOF@mvhQhZC`rr`u6$a`t|JF%P(^OUO%rp(J%ka&PS0Ce4D%K#XIMoOzHahb4|8V z^p%aw4AFwu+UI^btaRv4%{EaTXKs1xpYpvNKmV@fcw6&kinxW~ir4a+I0S2Ae*bHq z9~W$X?6KgddxGB+R*6q-xBu~6-%wdyzII!QudqM!`^}##f+W2&s;7C2O<0gCY$Cas zL&H&UQK!0MQ%!@K^`hT#qV)_BB8^^WK83AuZqfK8yhSOZC6Sfkl~RPSP{dk}i%--& zlp@wP!YjPEl(XWed5OFTEQ}% z|wMmB4=fMQq8%c?#NK^I1o zC(rkS%6;*z9HERhPo95&_I$J2 zC*dfU3rAwNb6h{VT=>BWe~+1~T6MYW{=C@nYt1iN&aX4t`T4{@9TNQe=3{Z-ii2-s zufKV)wSM`1nF)6D>rm2*P>(R);?j* zzt^+J>bA(Im0PMq-S612+~#;LX#3>(OsRf%Y1cYk{)j#mpi{@$Ev_JV0zz1`RO|K3%d(@GFs$aea} z&Xv-;?5z*Kd?#D_W740WM_W}b|9rcH(85Bw?A+S8U*WgF#P@#DVtw|yy`pFd0X>A73%k}+L>>7m_^qKdhD zo!p$)3vq}za)k>k7OkAJt@?Iz%>hfPU4DXV_%`O;%2t!lkl@|g!|8dUE1{G#{W4EU z{r5@y7VSzxS(m5DxzzeIY~q;sB)k4^Xm*AWLqso!-1YII<1uv2nL2tLW)#CqdUUjU<^0LEYo*c&+47Mk(|4{Puc{EI;NLn*3%$|H5?(*i{?%!^!1EVPg6Ri z>cQ>&>3*P6h4^H1f6qLrpPXBl2430fD}M0FG$GG_7tiU2?vPTOtm)?OXHZqNC`#|B zkXfBF0Oy152H_oh$amavlgwXf4*Vtr}9z`@OBx8+xM%}veiyR|j>T7`{}>x8nIi*~Irb*benu3UL=m+xND zH-c(1RUz&oQP1X?7Mf05RUfH$v{5+F=1_}szMzuYzn$q3t2|E^t(2L>y0XvUp@1S2 zEAP+C)$CgB3H=j7=INeZ$`JeY>8*YHT)H`~lz`w0E}ElWm>bb}!q>euewO?3&ZYdtOi8d3ouUbe~C~6G|rZ zPnjr`>KNv_?`h<K+1Kqv zB7UrhY}#qTwW%!detE=?1uiejx-PY|aLcEbZn>+Q%6mfhU@Bwu7Ujr8|1Sho@eBX| SUCF?}z~JfX=d#Wzp$P!QN+tOK diff --git a/core/assets-raw/sprites/blocks/production/melter-bottom.png b/core/assets-raw/sprites/blocks/production/melter-bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..a2dd7b5e0cfcac960eaafb2f8ecec1335a10aa05 GIT binary patch literal 121 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>U@-P{ zaSVxQeS6N3k->oD$bsdbZVCR6>f)K!-57KCx_$TDvz81fz+n>4UT!9JorO9dK;oXR KelF{r5}E)Z86a)| literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/production/melter-liquid.png b/core/assets-raw/sprites/blocks/production/melter-liquid.png deleted file mode 100644 index 19d66fa18a06d9ded298f7982a1e8ae673813db6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 198 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>U|>mi z^mSxl*x1kgCy|wbfq}EYBeIx*f$uN~Gak=hk;1^h5bf#W7!u+B_L?CVg94B9#aDmd z#|X;Ecr7dx_{hGb*;!60qquzc%ze+cGJrsX@PQhaZ>p}WF0DdNj47_EEYm-DIz$_L qZ4-C1ZCtS;#_sTZ0g%Ev_8GiO7V??Cl+)P`;(NOKxvXb!6R40WZ?z{k%SdB49Pi56~2{CJLdkt zkYg_A(uED@Bpx#d#6ID2a&%N;-FU2R^8wpwcjw-{>H0_eUD=HP$=~wQI<4-;u`#Hp zrxt9Padz$NJ2p;+=7z@)T$f>ZWHR@e_-}`n8O-}dZ-^^hkzwGff8;#NFK~5eQOEDg zFZ~`ocyWnq;i{j1-~F*uuw`aqVu*^DKi6V5Gil}fr{^KySL5gXVg8uQ#FRO z^R*PD1XL{}SH@jA!}EGlucK3OG2AU z|Bz|0<33?`V4_6a9X&06>x&&t@=lhLHL^0! l;Bi*m!>o+Q*Ts7{xB_aKT>9x0Y`+1^>6Oyx947|D0{lzdW+jD@0izb}c-{ z~0S2o&q(W{AZ4bPX;-&Cs9EQ;?- zILv1$;;a$SD-?KR7?OU!p8aBms>anWk8^$u4BzMP?Cs}nGLAp<%wF<=LP_z`ptTv2 zS_~F2C%XaVQ zYuoUSdCD1CUq_x>U*B{v{adv{q3F7Kxk_1ap1iW>%Gkc}FlOeK?~KzeA5_`jW{5XD z`knDy4Aa76P6~VO8i+V`?)IN?D^qrY$%Y3!0ds?zr V&!>V}?hFhJ44$rjF6*2UngC|E+$R74 diff --git a/core/assets-raw/sprites/blocks/production/separator-bottom.png b/core/assets-raw/sprites/blocks/production/separator-bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..a100086fe3e930f46cacddbd2bf436d548664bbb GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&z%awp z#WAE}&f5!tq6`8I2OL^N9RIT&*}=b?rFwStd~3UHB@NdYWEYq^uxIdIV2om>6ZaOg ZI5*S8=_UVuF)%PNc)I$ztaD0e0szG}Lx2DP literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/production/separator-liquid.png b/core/assets-raw/sprites/blocks/production/separator-liquid.png deleted file mode 100644 index 0f81574062c97bb50aca053496bb519dd952bd7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 179 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE~)y?IiQL6L*O z@w5M}vx(d~eeYO~{M3BTz`(%3vdb|neqUD((@^7Z_O6L%ZlPWZck_v5_N%nS?+ ZskM8acAoBi&VL4EiKnZd%Q~loCII-(Lp}fi diff --git a/core/assets-raw/sprites/blocks/production/separator-spinner.png b/core/assets-raw/sprites/blocks/production/separator-spinner.png index e09e119c3d5b33f14d2eae7107fb81da4d6b936b..310c92c02059df567acaab855405047a2720cd2c 100644 GIT binary patch delta 205 zcmbQo_>ysgNGZx^prw85kHAd%8G=RLpsM(~$3w0T1hiLzdRceJwL~rq5I| zY;ahW?fzr$#?$`$tRg;cVqjokxI0J7DgXQNZ|{D8-L!1Jy6uO{Put%J1s&cOTX#a| z;T%zu)!$edE=1lq@X_jtjOhuPiGoJ#f2u~g`^5)zAZcSV(>>Ny4L*y6S zddH+SZ==#?=YI`dLR#JI58@+wQdrNfs%4zEcxK{ZpVx&93=9kAs~_($P}*PRGXvxT MPgg&ebxsLQ0CyZ)wg3PC delta 129 zcmaFKIFE6HN>!?-i(^Q|t+zK1axy6LusHl)?@$vz|5ihR!lPtk=6%lJk`tnt85kHU z7WC)8i+lOhyXC|7ni`I$%nS`5?Cny|eQca;^7_Rt@7d}Mj2sROOdoiyS{NEmhtEm# luwS8gjgyIif#JOF)47cn$>~447#J8BJYD@<);T3K0RZ4ZG(`Xa diff --git a/core/assets-raw/sprites/blocks/production/separator.png b/core/assets-raw/sprites/blocks/production/separator.png index cefbb0263315a7505e9489994f396a5f3fd892ee..20c9e6b72f71ccb2da37cf37c43f710c48e4753a 100644 GIT binary patch delta 1055 zcmZ3^x|w5way6EyfIwC~xL+s6^dn5DG-t+EP}rbF+Ot+hX099UP( z+_TN!t3{i!Xu^Fzd6(Rx`<{wU1{}+pTv$$S-gxi%S>~Dz&m&KDOn-iKLGjtVzwXap zeayW0YhK>0<{QPlA#w?m=il+WcrNyn;e#zpzp`v(h-iD-HDS`8CBD5JN{lrx>z4{D zvR5|CDDm9+=-R95m-qMS=N^-S&9}GT(YjD(^Ld+S7bioFoDRQ- zKG2F?|GeHt&A9&Vb7`i1Gg*ZfX7Z&Rn-Scy!biZk$9n0lR-b5rmrPmKwH;E2viKM9 zOwtKFyT0%4aht{{o}*6;mA^kd>|4HXUe8m1L{mq zH(g_A1KON+>VNiRknwLQDf23{B56x!-spnYKJH+9Bc^DcC=Cz$>TYB%AL=u!W}{KK}^ VzQiMCA_D^hgQu&X%Q~loCIIIU=Vbr@ delta 656 zcmdnYv7B{+ay?U?r;B4q#jUru4gHu61y}>-3oevt6bcMl_JpHj7PG=dMXqy)6*;`7 zORTr8|MS0xS>&Br-1*>1Thr4{Kfe6=;nTOyR{P?xs#^7iXmo7V>|NFYeJI!nfjt*jCtPfl>n7-5tTyS+|st_<^jN+Kb z>dL%;Beo%!r9^Of@t*kjoo;*iSPuytDE|EGGY^BPQy}|!mH-8j(hoTdW=?_Z>lqT1 zL`pwsF^D+@vcGrTaL&40fUQA6p?FdDGR8T1ecQyg-M$;ZCfvw$;g;O$rgUW=<}Z96 zs~*hc2xge3yh*DjT6vbm$bNAn$+d~u^l*b9cQ;T@b0PQLD)C*jkudAS2i!}BA{nCgFgln7z2 z5ElQ>u%9*I<@^Kl{|Wch@l?sRUOJxe#BD{p!7Vd=&W4=UYK{{(6KAe9D3bWpBi8i9 zV2K^yW&u4t`3uo9QM_?hicLxjLKl9SA|cGE+p9ZKBvna)!F%b^NRFOF%@fO}98(g| zVZAx!Q3gxXQia(;a{Ue)L{fsKR6^=~FQ1t6QdVhI-$xS$)}~dlahFtzmX{`sCJTj-HDHt%={O#V7-yp8|x|MT@N&J-9nUV}ItOJhDUKJ(C zaMo}aV?YZBL;j+z29u^ozWvmb^Lak=3c*VZHrF)-f*8`)Co9!3cVBCCVzga1pMima Olfl!~&t;ucLK6U7j|`Cj diff --git a/core/assets-raw/sprites/blocks/sandbox/item-source.png b/core/assets-raw/sprites/blocks/sandbox/item-source.png index 98dc16ac3c240fa2dab48d7870764a283693abe7..21c254cba5c36bf5c63bcf6299661ece41eaac4d 100644 GIT binary patch delta 269 zcmX@gxPobdNGZx^prw85kHIdAc};M6@QK(a!jBzJdMD&RWU&CXNdht?CY+ z*Qs=QC4-ynfhPZ=q)+v1Y;3YzYk!=dU_V`Oxz0I(h6q2|hVwdW_!caC+H&Sd0fVm2 z@pLopG`r(+&wF*g0;?NG67h;bK4wq#~zX68=Y{nymB?*gCDLGAuL zc{h$TRr+2%wkeD`y}@e&9k|^eWJx~uVZKtrvM5aqMz~2WqvrPNzX)^P$OyYgU zLk_2Rsp}oK*m>#Je1;z;3Ui}9d>U3f)Mfc9aZYi?^$$`_pPYlESJ>8Es&!#_&C9`9 zvHszIhUq52(Zm}L-rZ06HlvYh~WA@obP0l+XkK7qUjr diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index f306522c57..d087f4ae94 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -8,8 +8,8 @@ import mindustry.entities.*; import mindustry.entities.abilities.*; import mindustry.entities.bullet.*; import mindustry.entities.effect.*; -import mindustry.entities.part.*; import mindustry.entities.part.DrawPart.*; +import mindustry.entities.part.*; import mindustry.entities.pattern.*; import mindustry.gen.*; import mindustry.graphics.*; @@ -1042,7 +1042,7 @@ public class Blocks{ craftTime = 10f; hasLiquids = hasPower = true; - drawer = new DrawMulti(new DrawDefault(), new DrawLiquidRegion()); + drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawLiquidTile(), new DrawDefault()); consumePower(1f); consumeItem(Items.scrap, 1); @@ -1062,6 +1062,8 @@ public class Blocks{ consumePower(1.1f); consumeLiquid(Liquids.slag, 4f / 60f); + + drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawLiquidTile(), new DrawRegion("-spinner", 3), new DrawDefault()); }}; disassembler = new Separator("disassembler"){{ @@ -1080,6 +1082,8 @@ public class Blocks{ consumePower(4f); consumeItem(Items.scrap); consumeLiquid(Liquids.slag, 0.12f); + + drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawLiquidTile(), new DrawRegion("-spinner", 3), new DrawDefault()); }}; sporePress = new GenericCrafter("spore-press"){{ diff --git a/core/src/mindustry/world/blocks/distribution/Sorter.java b/core/src/mindustry/world/blocks/distribution/Sorter.java index b37195173c..a400ef8c20 100644 --- a/core/src/mindustry/world/blocks/distribution/Sorter.java +++ b/core/src/mindustry/world/blocks/distribution/Sorter.java @@ -1,5 +1,6 @@ package mindustry.world.blocks.distribution; +import arc.*; import arc.graphics.g2d.*; import arc.math.*; import arc.scene.ui.layout.*; @@ -49,6 +50,11 @@ public class Sorter extends Block{ return build == null || build.sortItem == null ? 0 : build.sortItem.color.rgba(); } + @Override + protected TextureRegion[] icons(){ + return new TextureRegion[]{Core.atlas.find("source-bottom"), region}; + } + public class SorterBuild extends Building{ public @Nullable Item sortItem; @@ -63,15 +69,16 @@ public class Sorter extends Block{ @Override public void draw(){ - super.draw(); if(sortItem == null){ - Draw.rect("cross", x, y); + Draw.rect("cross-full", x, y); }else{ Draw.color(sortItem.color); - Draw.rect("center", x, y); + Fill.square(x, y, tilesize/2f - 0.00001f); Draw.color(); } + + super.draw(); } @Override diff --git a/core/src/mindustry/world/blocks/production/Separator.java b/core/src/mindustry/world/blocks/production/Separator.java index 79d3741691..e4c2a2a146 100644 --- a/core/src/mindustry/world/blocks/production/Separator.java +++ b/core/src/mindustry/world/blocks/production/Separator.java @@ -1,17 +1,16 @@ package mindustry.world.blocks.production; -import arc.*; import arc.graphics.g2d.*; import arc.math.*; import arc.util.*; import arc.util.io.*; -import mindustry.annotations.Annotations.*; +import mindustry.entities.units.*; import mindustry.gen.*; -import mindustry.graphics.*; import mindustry.logic.*; import mindustry.type.*; import mindustry.world.*; import mindustry.world.consumers.*; +import mindustry.world.draw.*; import mindustry.world.meta.*; /** @@ -23,9 +22,7 @@ public class Separator extends Block{ public ItemStack[] results; public float craftTime; - public @Load("@-liquid") TextureRegion liquidRegion; - public @Load("@-spinner") TextureRegion spinnerRegion; - public float spinnerSpeed = 3f; + public DrawBlock drawer = new DrawDefault(); public Separator(String name){ super(name); @@ -51,6 +48,23 @@ public class Separator extends Block{ consItems = findConsumer(c -> c instanceof ConsumeItems); } + @Override + public void load(){ + super.load(); + + drawer.load(this); + } + + @Override + public void drawPlanRegion(BuildPlan plan, Eachable list){ + drawer.drawPlan(this, plan, list); + } + + @Override + public TextureRegion[] icons(){ + return drawer.finalIcons(this); + } + public class SeparatorBuild extends Building{ public float progress; public float totalProgress; @@ -79,6 +93,7 @@ public class Separator extends Block{ return total < itemCapacity && enabled; } + /* @Override public void draw(){ super.draw(); @@ -88,6 +103,32 @@ public class Separator extends Block{ if(Core.atlas.isFound(spinnerRegion)){ Draw.rect(spinnerRegion, x, y, totalProgress * spinnerSpeed); } + }*/ + + @Override + public void draw(){ + drawer.draw(this); + } + + @Override + public void drawLight(){ + super.drawLight(); + drawer.drawLight(this); + } + + @Override + public float warmup(){ + return warmup; + } + + @Override + public float progress(){ + return progress; + } + + @Override + public float totalProgress(){ + return totalProgress; } @Override diff --git a/core/src/mindustry/world/blocks/sandbox/ItemSource.java b/core/src/mindustry/world/blocks/sandbox/ItemSource.java index 06afbd3e66..0a7461a7ec 100644 --- a/core/src/mindustry/world/blocks/sandbox/ItemSource.java +++ b/core/src/mindustry/world/blocks/sandbox/ItemSource.java @@ -1,5 +1,6 @@ package mindustry.world.blocks.sandbox; +import arc.*; import arc.graphics.g2d.*; import arc.scene.ui.layout.*; import arc.util.*; @@ -45,6 +46,11 @@ public class ItemSource extends Block{ stats.add(Stat.output, itemsPerSecond, StatUnit.itemsSecond); } + @Override + protected TextureRegion[] icons(){ + return new TextureRegion[]{Core.atlas.find("source-bottom"), region}; + } + @Override public void drawPlanConfig(BuildPlan plan, Eachable list){ drawPlanConfigCenter(plan, plan.config, "center", true); @@ -61,15 +67,15 @@ public class ItemSource extends Block{ @Override public void draw(){ - super.draw(); - if(outputItem == null){ - Draw.rect("cross", x, y); + Draw.rect("cross-full", x, y); }else{ Draw.color(outputItem.color); - Draw.rect("center", x, y); + Fill.square(x, y, tilesize/2f - 0.00001f); Draw.color(); } + + super.draw(); } @Override diff --git a/core/src/mindustry/world/draw/DrawRegion.java b/core/src/mindustry/world/draw/DrawRegion.java index 492310eafb..26416abaa5 100644 --- a/core/src/mindustry/world/draw/DrawRegion.java +++ b/core/src/mindustry/world/draw/DrawRegion.java @@ -21,6 +21,11 @@ public class DrawRegion extends DrawBlock{ this.suffix = suffix; } + public DrawRegion(String suffix, float rotateSpeed){ + this.suffix = suffix; + this.rotateSpeed = rotateSpeed; + } + public DrawRegion(){ }