From 7591f18298583076f15f627d38dd9d1a4e67f8d7 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 9 Jul 2016 18:07:26 +0200 Subject: [PATCH] Disk Drive Texs --- .../java/refinedstorage/tile/TileDiskDrive.java | 4 ++++ .../textures/blocks/constructor.png | Bin 481 -> 466 bytes .../textures/blocks/detector_unpowered.png | Bin 680 -> 470 bytes .../textures/blocks/disk_drive_0.png | Bin 648 -> 469 bytes .../textures/blocks/disk_drive_1.png | Bin 651 -> 472 bytes .../textures/blocks/disk_drive_2.png | Bin 651 -> 471 bytes .../textures/blocks/disk_drive_3.png | Bin 648 -> 471 bytes .../textures/blocks/disk_drive_4.png | Bin 653 -> 474 bytes .../textures/blocks/disk_drive_5.png | Bin 650 -> 471 bytes .../textures/blocks/disk_drive_6.png | Bin 649 -> 474 bytes .../textures/blocks/disk_drive_7.png | Bin 650 -> 488 bytes .../textures/blocks/relay_connected.png | Bin 452 -> 444 bytes .../refinedstorage/textures/blocks/side.png | Bin 370 -> 370 bytes 13 files changed, 4 insertions(+) diff --git a/src/main/java/refinedstorage/tile/TileDiskDrive.java b/src/main/java/refinedstorage/tile/TileDiskDrive.java index 47cc20e7d..b9a86af62 100755 --- a/src/main/java/refinedstorage/tile/TileDiskDrive.java +++ b/src/main/java/refinedstorage/tile/TileDiskDrive.java @@ -263,6 +263,10 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag } } + if (storedMax == 0) { + return 0; + } + return (int) Math.floor((stored / storedMax) * 7f); } diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/constructor.png b/src/main/resources/assets/refinedstorage/textures/blocks/constructor.png index cf3da9ef64c654915b1c121a0312b053e92b6ae2..77a8932c5e2b4a44ac62077e8f323f6540a8878a 100755 GIT binary patch delta 383 zcmV-_0f7GD1JVPKB#|)~3c>&Y4#EKyC`y2lQzw5=Nklu!QT5QTY1A3-nFeYAr1)DUj7wjYTZy%vg(r?*@Y-mlB6Ed9H**SA&Ezety$4^3pwjFuiYBozJ zlezC_VYqeO*!THe*mj4=BC+4Ug2Ul0&o6)iDQ|#aw|g<+x=V{YdaUC_WqEyA0K3`L zSyq2_Kwj_}Bwq=Y+wF6jmg{wyBsmxkebu2XZzw5>D_>%?4n79d5cE1Q@E?-?DS$;4 zAV3Th0U7}A!D}0lN5HQY1X)!zb$v%Pw*q}yLo=lE{EQPq%#oCFx+pFrPy);X&5+{s z>GZB#(n>}nrMQDWZ8AWsQXQmhq`bEvXvk-283f1U*&Nz&Vl{(F0nR;gNfj`-xiw%G zbi=SUHmDXy2V}4>7N;dK5;pKOes@rhj~RL_uH#8-V%SS@1FBZODe!G&v!|nVp?8XV&t(`Ed9oL}=TQ=Pf3aWHg%kej0`w z*NuIj-$@2?eVzl-?dejhfIxz4blKv@xMHL`G3={zx z0PewS8<9uAuN4GoS=Lo`Lo~MneOf~^q_XUU6GBXplyW-H&m>R+%mU4j;`H(Ou3XYe z1_PzIg+6UEK&w(6q^za9H6W~0rs1`>DWUwz5rzJ5GHt;ll zcTkUy89FSk<4I#;*hz5(&wD{#gC94>W0+aP<4g>=LPLn~8!8EP0J|JItpET307*qo IM6N<$f*69Ip8x;= diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/detector_unpowered.png b/src/main/resources/assets/refinedstorage/textures/blocks/detector_unpowered.png index e6c6452bdb03d559844258c24e17151fa06126de..da1df4416cece90f166b736aeac56049021d8ec6 100755 GIT binary patch delta 385 zcmV-{0e=3d1=a(QJPN)501mzZ>O!%=kwzwe0aQsuK~y+TeUkf2!cY`|@AOXJi1E>X%JPN-601m$aI0aKAkwzwe0wzgBK~y+TJyO4G+fWd`|I3rX1TqFf zg2)hz6{jFm*%$|e37)*TapE6C2M0M>aPGMmk&(JTC|X&vl_dZ8n>m&1SpZ-rY45 zmhePgPV>Csa7g3v*s?5Cg&YXC9lK6{w0V660SYXR>sZ!z%d!`X#rX4>&d$&3_4-GS zTp?-_jYgxvV9?+?j7K2g^z?*Qs}(vB#nFE}{zJdtk0W$Aidcjg;Cb~-%jFVB5Kt=` z@`JI*e!j2=Pftnm6UI0J5j3^}p>$HZE?-vwu~HR9kqGI zR4NggjS*s?eA;vTS(OMq@qNEcgrkXVns8#!2qsyUF>G-1C&ItD5Yea*S#dl9x!{xK z2DMr(UDq*hV2Wkvf^fB7ul>L;m&-@HF@@bg7=o$MXyCwe|Gh-G5wQwn5tcc@@ z@_en9l9!~Zcpn_Prm5=1<;BZDiwlk*2&fi7cGxGAi7d%vA_ktLNw z>FvwC$b-mC1VXi%=5n4==yYzCxord#7}!{XpmhNrkS!F>FhB%s1sDPqaoqcjB)P~C zMIDV=O~oHeL=GE(ni<;jVlq68M$hB%%W(KK7(7lUuNgRU1;-HdmQbK{x%`BqBbd+M ziHpSt1l;2mnrl+%cJCnYEB&Y-nNHuxN$8>@1Qb|+_`b5l=v>fS>kxHsXsgv%zdzHK z6ahpb7EG#S}uqj-N6c*tXDN+Or3$aL%BBV%RAr>j@_czJgGxuI5ch0#pnLFYDLOhZl zMR6P-8$|CB@g0zjBqa>P{eCa-s;usyzSocX@p#;Bw>y5lF@LY?nw6p`s;VlB(hq#G z+wCrwOW8m!T;%{1fFx(vYe~uKn&+AC`vQjtT-TjWU1#dJp8Nd#&Goz{BVpTimSyMj zdAr>TJkRr@EF9bZD@1F5{@bRp>C~ZOmgmdmQmj_1)9J*iC?kFe(=svJvK+@TO_PW~ z*T<*RIZ2Y$dVeL>n>Bl((RCdGG0WLMqr~NWLHYZWK-qHU^B1vLERd$hRMRx^QxMy0 z1!Ei0r{9xQ`b!dV|^?$NwPpNdzpoYklqZ2 z0|djtkX|K8Ov92m8I4A-Uu07D^gW)M1=s_SY<~e(NklN*AAIW_e66=W_p$~rd(kgFhbRhd;b)lBGynYm%xT27{e1q&Fg(jD+jdYYg^m*v z706BV#IiD!#q;7u;|esJ*GY1dp0?7MPk zh<_lRUAY%|5SfTTs8o_%&Pf$oty|h}B%r{++7bk%3-Ew!p>T=;B48^(6R3!y&Tqu= zMTRhJDO9Uz{INvjum-5&4< z+3bxtpT9%EJ#KEHr3&r#9Rz-*9~C6y@syl|E-FGmfdz=`rj{6;3wkRZqUsH8x%}*Q zC(2Svz!F-@5*L3&7(k7Ld%YzTutemr20YZtNLg=bOW>Tpcd&Zq%`csP1%~$xWl(e4 Tivb=~00000NkvXXu0mjfjwGu@ delta 554 zcmV+_0@eN41B(TaY<~g?NklP?RG2hvMBGMx>t|t@p#;Bw>y5lF@LYBij_Ri%d#x;!Vi40 z*=#PCOHo5ET;%{1fFx(vYeC8Knq{f)`vQjtT-P0sU1#jLp8NLp&Go!GBVpTinx^OT zdA(i>Jj=4Y$Q|4M_enhMMf?@gR<(`C4i(cZo6qNBu~?i=Cr(8f@mrXdiP@IrIF4zW zLj;Qx#{MZKF6Rr%Kc5B4hBKYMi`i_3G&v@kriovI z*jy_}l4Ph25ooFg2Yk#v#B@516DjER`v?ZAdgKH0F`=fen+S&bP-fzIhG6nO33nmA z>GgXE`n^8AisJ(fix07?sz1KSr0nVbFquq*=Xtacl7FHoFFys0!C=6=+wCenr4f+f z8PI6R!Y~Y)jiwQN{r)uDeHsFmA_TjgVOU}`8U;Z>zuWD0htY1eTGG2p7amE8P6q-s z$ilKLKG>mogG>Us6!<R42Dutqjc&udn>l sfa~XcL?hl0ph^SwXF)=fL(>NT0iRsKa;5Kf-T(jq07*qoM6N<$f(lg$@&Et; diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_2.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_2.png index 5f55368bd018f5d4fbd15e21ed7eb6ed1ba75205..808a22f6989cce2ad3bf929c56c676f66f257ddf 100644 GIT binary patch delta 372 zcmV-)0gL{N1=jh(1KSR!&*1Jv};juVjKVK{sqja~+Wr+)u&Jbul9w{6f;g-+)d0>9Fa3X;j>jhuuoDndYk1&HgWmKdE2dMh2G>J4qV{Oa|l z%2G$;X@ z5fK>1;BYu5Nq@3fF2r)RWG^&^VIUx8Is0dnI2}(Y|9loG8_sn4CT6o4(sZBdx-NbR zVsot^P1AusK%i?n9PmDS7t`r9Nu{9I?;}t(ZO;efeM(Kkun-K4fy^Yy48i1W67E8J z)9d#T^m~1Jl_W6@OX5V+v>#t&Qug#Co=hfUJRZ|RNPmi=JpB|fR8?i(?RJ%((g?`# z3}`fDVVWk*M$-tset($bJq!U$5rW;$G;J{)4uc?|-|cq0!)Ui!E$LmQ3y-8krvm{R zWMSJjAMDV)K_-D*3Va_AXe;yWW($Wf9D4Fd{+jo32Q(;mmm;WlP@UXrwK8>6JU{bG sD%a2Xh$FloK$QmU&w_+5hpwyt0B8lop?THKQvd(}07*qoM6N<$f{V8XjQ{`u diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_3.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_3.png index 818bdea14b90ee005a856f280098128dd1ffb24b..6aaa339a271b125661e71484e21fbf55177ee31a 100644 GIT binary patch delta 372 zcmV-)0gL{K1=j&9K7VK!u4Q?)T`83U#|elE zwl+|?j~}O$Xz0DiR>HV z?@4z@Zbj}zrXmok)i{@PQiXQ=n)VwBC@`?L1VQNnJRn;roM3sFdROOM$d!6W553}9=~MZ$Q2w-P+LNQ(#7Hvj*4J5 zdneB49}sYlTWx5mLZ@>BfnVuI1<7RcN=`x-6(OL&0;F6{EipP5^j11V)f?J!`PJ)9 zm8Fz`CA5?!F8+uxfEo$+dP^u^iO69Mc&L>TPj6{U;GDmAW%bOPUpoB?4EGzWvw8d! SM0{)j00009SXfv{iWFjz!Xj9tND(Yjh((GNlET75EK*o5Z-0}xXYRdB?woUHGIzudgm@%9 zisCpv)QI*GaSzBwk`jjDcDoh$rM%ohb*~=P28V}D*%6)WfS`Et3G=h6>+ zvDs`+r&C!&E?ngR6o4dW*K0}1%e5$S-}eO$54f&79=p!iaXt6#?WgN`bw_SZM@w3q+(L)v)kP%$rx`Ft)Gi$#`YoQg8yk1#D0vn|VU9Md$3 z2y}gzWyd5*7JtiySgw}rg+|wP1jM{x|C|!1;|b;0T%c??)9JgI&1Oi`L#k<-_$`Rd zwSqKFhuRQ+ds(=0>E$upxRCgz=MY7qE&L2~dgh=1pE-?KRymv9&E*`^bS z5f#V{W8XAWxZ*fLvv~qqt~PlkuV;BGj)@Aq$ey_?bKAq7XS;An!{5(<>g=WlRS z1k>pYaW;E}fN*=1k8M&RYSyn*Ug-K+cke!X6A_mg7z?Z5}*Lqbi%un_c(zRbk&6v6my9BxB; z)9rN;^twHI6~}uT7Vl$C)BdJ1DSNuxkH=#%8jWZnB!5Lwp56rvRaKdHIvu5}Gy*a_ z0~!rkn5Idy(KLduKct-=;`g6VL%>pmV7oO*_zwm(C3l;`A5*0000~AlpVk6HIfzR)0IDbSIYGSgvDvj^*Q1 zzLpYqePvDoDoTCvpNkl-B0#62JzN=gs}+wE51Rasp@eXVcx?RL9dE?4|~VSirNH7lpnsj8~-RC>NA zHk(bBWn}}oaFzp50Fs=Y&m|?Rb5Z1;=LsAha2#hmcI>h3xX$bA565+zjKpv_%=7$s zJg(Pkffq$_Do^%sc>g9o?di+DOB;`ED&|EopU=f&u}IUDQ&C3z76WU54K2&I?ZIF` zL|_>GG(E;~ynk3O#B#M{FEoZ>ARy)i`{$I%jv31PT%de#rqeeuo6V3WheX$P@kFa$2x~9Vc@3VI?olfIK3c9@>0#(xvd_X=V)HI9%g1*t0nK+&yn7mDbT|jTT zy)J@Yw@0tyIHF;36lyyWOxQN z8nQ4=lV+oV^ye&~^1cXoJxAcv3p_00000NkvXXu0mjf>%ayE diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_6.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_6.png index 9e63d02ef6cfe810b84661c3229ac327d9cd2740..5a8112645bfcbea4aae83a90d2d8f77c999f9d46 100644 GIT binary patch delta 375 zcmV--0f_#I1=<6UY<~e*Nkl}MPp(x zMptgQKLB3WTo$ZcdU*^tF3j;O=cF1GO7@l9D0x=$ z@hM+RQ5{ixqIP5=0-;=PrBZIJ5JgwC-$+1#fsG{yS{L8}*=+V014O`9fFV#(t)Bcw z7@j2vf=HuMiQ|tYB8N3V%?$0jRWdvb2KU3^L%)C5>)nn@sDHLK$jLrqUwGL7DhPGI| zce@j9DJEbEEp3U5KOzjEN5Z|?5(-!%a##Z%YGuSXTiOyh=kHxwJ@e+5j=zG8_YHC8 Vf};4Al7V38t4ut*^(QltneEG)z#uohb^?r)O!&fI&M+&SmYWbTLq*yDlp zAPB?oR3kVB#3LXZNXmY{-|cn+zm%6dsP5IHdORMt+wG2DZ-30Is$!)mip%9v7NzHV zV!Pd@X4f z&*#l%Bk(-Wi?Xmsqvsd#VP8M(o3zQqrec=oi^W1Lm&+tcI2C2YFJW3HHnJ?+woTI{ zBGC0=lANO`T7RyVVzpke7aCpH5fHPS{WD6W=M?30Ay77)+3Zcs=X0d-Db_Si{1n9I zT0tDgLv4sa8)$IA`}|$ZX0s@kf?mJ>{VCMJ;KT>yQ%p@=HxUf=q0B_l9KrN$xRTPCZEDEE+VDK-IN!in5IGs*~>$aQV?;!_Jr2+f1Afd^jY3hH$pVO7FSb$Xk00001?U5iBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wCVv50Nkldj^cv|8t3c#)vd zIQx%Wt|;^%+eE<-EPv~uRy(0|N6DU&YbDQ0K0f7ZA*v&4SJbwsErC!jhpChsD@4&H z?bi}eU|?ejg4P9iKsK8_!T=Gl6<`QdRIA6oQLmpS2!cqXQiYhf z3%C41BwNZB#|)~3cmmV4!;371ydxEQzm}`2uVaiR5(vHlCi4dKoo`t_Eq)) z_H7nH5mzrEL=por7{bMcTgWXe#KJ-rNs&Sjg``N4BBV%RAr^savBlzk z6Yu@!oWtbI|DT!68F2u6Jdhp)VHlno1jm4Q1Y`qA+3)we-A>?DS=~T=tMB#we!pI? zH~fEcWnR}cD@9RMRaF+H=X+wi-KJ?;HjoP!IRFJ9$=T&nQnI?_dFFYZz~KSMaV8VT zp4g7-yuSW+T(`+cSeBJ#+4+3lY&HVV^Smev+p-?t#HW4#vY*l>6Pt=zo-Y;)v0N^b zB;iz)`SB1VbA(x@Y1{T_G$JC<^}Z#Bn^-h6prOg9F~@?_xHaMX?n02Ll9(s-F0Oe2S^5 z>mvk1eJC?gG)FLfo9+*Ldea~D5e)hRdKE<>4U57^Rn>oqOv;`f!|8M?T-T+Aka~Z; z-k*nnp(qOTZnxX(_nrbWJOdgHSr~>vv(Y>S>6d-{{WJtD1qcoY!!X5oJobH`ez)80 z4x`;_wWN1@U3erVIvohmAPdtp`Cy0V8)V|kCExRKpSCjJZFg`8#*@ZvX%Q diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected.png index 0a01159b24b0c3edc72fa38712aebede68ba96da..48f3bf8d7a4282ca9384c420f8ed2bc7eb2a6046 100755 GIT binary patch delta 358 zcmV-s0h#{91H1!}JPN=701m(bYSxJfkwzzfI!Q!9R5(wCl8H{jKoExeri804t+ZAV zN=pi~^w4-g@OUmC!6)%shKvP`CSN9d%R delta 366 zcmV-!0g?W^1H=Q6JPN@801m+cxRGn^kwzzfLPKwqZcIOdABX_GHEFf(W7+%sdi?szb`G|kYqN3J{ZyvX+> zs)ldNy0&d$WQ1XorW?qzZJzIh)#~Xdjx#pc<81T~l)$pC=JUHazO9oa_d*nvvspQR zo#xQ%`RatSe8odiymY%>zaKD4S9}X{0u7&7Vy^YoYJN8BAeIG6K=0zD)46DTG}h~F zQS26rhctagz@TM1d&1%NSa zi5_%BdVxBjs@|&V9cUWC8TFKg!y6-62#%JRBUUQjs2ZA<1xkP=?MJBJ8sTWLbV!L4 zutZQ?+}@i)=O!Bq>haZ6`WG&Z=RHBU=kSJk&-lbHAyR>$G^QDT1K-|qLK_z?*Z=?k M07*qoM6N<$f{5j<#sB~S diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/side.png b/src/main/resources/assets/refinedstorage/textures/blocks/side.png index 623c4942bb289fa1f83b3a9af31648f401075e49..f6e70dd203a74c75ba4d2dc439152ecbce72edc5 100644 GIT binary patch delta 21 dcmeyw^oePL4c9>i2EK!gJ0@no-RP#n2mo7~2o(ST delta 21 ccmeyw^oePL4c8$C2EId#q8eTe8{Kpm0Z`QjeE