From 58cf1f00f4bcaf6ad98689e6a6c1bb3ad5e210e0 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 19 Feb 2017 04:25:29 +0100 Subject: [PATCH] Add storage monitor texture --- CHANGELOG.md | 1 - .../TileEntitySpecialRendererStorageMonitor.java | 2 +- .../blockstates/storage_monitor.json | 14 +++++++------- .../textures/blocks/storage_monitor_front.png | Bin 0 -> 1273 bytes .../textures/blocks/storage_monitor_left.png | Bin 0 -> 1451 bytes .../textures/blocks/storage_monitor_right.png | Bin 0 -> 1443 bytes .../textures/blocks/storage_monitor_top.png | Bin 0 -> 1391 bytes 7 files changed, 8 insertions(+), 9 deletions(-) create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/storage_monitor_front.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/storage_monitor_left.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/storage_monitor_right.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/storage_monitor_top.png diff --git a/CHANGELOG.md b/CHANGELOG.md index a5a4cdf12..fefc95333 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,6 @@ ### 1.4.1 - Added Storage Monitor (raoulvdberge) - Fixed Processing Pattern Encoder and Security Manager recipes not supporting oredict workbench and chest (VT-14) -- Fixed network nodes not saving correctly (raoulvdberge) - Fixed network nodes not respecting redstone mode (raoulvdberge) - Fixed "Clear" and "Create Pattern" buttons not working correctly when using Grid Filter tabs (raoulvdberge) - Fixed Wrench in Dismantling Mode voiding Storage Block contents (raoulvdberge) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/TileEntitySpecialRendererStorageMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/render/TileEntitySpecialRendererStorageMonitor.java index bce3a6a7b..6ba34f60e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/TileEntitySpecialRendererStorageMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/TileEntitySpecialRendererStorageMonitor.java @@ -19,7 +19,7 @@ public class TileEntitySpecialRendererStorageMonitor extends TileEntitySpecialRe setLightmapDisabled(true); float disX = 0, disXText = 0; - float disY = 0.5F, disYText = 0.2F; + float disY = 0.5F, disYText = 0.23F; float disZ = 0, disZText = 0; float spacing = 0.01F; diff --git a/src/main/resources/assets/refinedstorage/blockstates/storage_monitor.json b/src/main/resources/assets/refinedstorage/blockstates/storage_monitor.json index 2349a107a..a1599018c 100644 --- a/src/main/resources/assets/refinedstorage/blockstates/storage_monitor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/storage_monitor.json @@ -4,19 +4,19 @@ "model": "cube", "textures": { "particle": "refinedstorage:blocks/side", - "north": "refinedstorage:blocks/interface_disconnected", - "east": "refinedstorage:blocks/side", - "south": "refinedstorage:blocks/side", - "west": "refinedstorage:blocks/side", - "up": "refinedstorage:blocks/side", - "down": "refinedstorage:blocks/side" + "north": "refinedstorage:blocks/storage_monitor_front", + "east": "refinedstorage:blocks/storage_monitor_left", + "south": "refinedstorage:blocks/grid_back", + "west": "refinedstorage:blocks/storage_monitor_right", + "up": "refinedstorage:blocks/storage_monitor_top", + "down": "refinedstorage:blocks/bottom" } }, "variants": { "connected": { "true": { "textures": { - "north": "refinedstorage:blocks/interface_connected" + "north": "refinedstorage:blocks/storage_monitor_front" } }, "false": { diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/storage_monitor_front.png b/src/main/resources/assets/refinedstorage/textures/blocks/storage_monitor_front.png new file mode 100644 index 0000000000000000000000000000000000000000..d7a267815296bbeb4a5fa9a3f4bff269b0b43590 GIT binary patch literal 1273 zcmbVMZEO=|96#|TrWrcX4-U{A2aYXrZ@pgIyY!e_uN#f)+)8C-WXSdI>3ZAluDyFk z+etzqbEdv!ATe_x1U>-CG-&vuvJj^v5>e0~zJw*ZEEpwxz$_$u7%x88wbKs^AH3xL z&&&OO|M&luIy>4{dRBWd3|kr9BFE8M>%Nb!Kyqw<#*dad7)ipdRvP9N8(__vl>&Iw zQ2Ia|C|WW14G3Y_gS+)a5+-BqqG}nG;$oBE=kkPjc+hFT(M?xJQPz8->+Kh(^B2r)gsNe--&~(ItM3nW4XzyOr1YU-~ z0f|_2DjDmBtno*(S%BYG@bQT4Ki?4ThBt>GI3X< zlCp-NL?BNWLol+j*pgz?sU!-ej4miynxz=pFx@Ix`luoQ##l!{Kt(@rG{Q)U3SI=$2_QY8lx2ZlJZ=mVuY^ zEb7bnAOsi^4CFHH(6r;#WsR$v5;1DckjyUp^S=BZwxj&!$6 zqks-e!vst;K{gtdbyxSsFzkW4sN9?=T!9C!d-gFkug~;Yvs~ld%iTB6?5S1GPA&8& z8{T~;d12zvh7%=Y=I5TN8wuG~KQ=P|SZ;3o z$mCa4?8nQur1lRQ-cz2~{>k6dZ*oqeQxdrT8|96#|@napPDHr?xXFb5gES6kX%D5msUD6}k#Sy1na8#<1Rgh$ z{bpoBRH?H7whAJE^=O91Ll6XPFrkFrs3rC3Fo_d-3^!o}uE7b4z$p@kCm%%dCbC|t zh_+AqQdVZfC(A(!!$P4D8q%VIxEdo&CKHB}7)fdr3yoCE%S>3qOUZEt8b}_I3(B0p z!!bt2Ev%8vh@y1j3W1>0IYrD%lYvq~hJ~3RMxZzr2*mC+ZY{}0;9nWjT1&3lAi#=% zB&-oVN~ocDr%_LL{3QxQ%wt=H37iO4%&<;Cn(FYl$&(B39nYC(QEZu zjS1-V8WZa_X|#kE2P|VS5*|FxGaX*1H<1KxH`qy?l^|>xmTZ!+8w|8wYalGNO&`ZP zcu8h>4~YBb6yKBBj7MTAs|Xlb5M6>$9j}4{pCAj8PYA+R>v-1T)Dn(og^-jMOVh-y zX&`cM0@f}H0eC#l6gQ0qqb);=XV`5<9chp0&n9fPY@I&aK;l-DK}#c(SazD&O=9i; zi^UW%Sgc6?Q#A1{r4nP)sTNQcQ%wYTrE^53MHbvZqYyOXyo0v5!k1QTKGJprS8r(U z8ve$1r~pn)RWI6lct-U2!dpvkUvQ~jY*4Fw=$YQ(VI;qwzLFmqi z_lvSX@2c76SsMqE+dSWYy#rTeeu4~Rt<5L?tUL0s6?u9?Zeh|u(D-rjdm!)A^r(Np z(Ry}gi6P?C-G6G}82yo^{+VZI|9Y`)X2)m#Enr!+nSDqX?x}$KK5yaF)*A2pujZ}Y z+tZKsocZqZ`6Tj9)Ic|#%4&@`tm zb?=G0EtOSOYIA4g)a|hc5f|Eb^2)J4#&XaniQ=8tcdh?<-O)YKcV^6iK73f&>Y*NA Q75jZUZ29!Q?8?S}0J$~}(*OVf literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/storage_monitor_right.png b/src/main/resources/assets/refinedstorage/textures/blocks/storage_monitor_right.png new file mode 100644 index 0000000000000000000000000000000000000000..8a7d7d2c5163a961f5894538593765666c83c340 GIT binary patch literal 1443 zcmaJ>eNYr-9A1?WP0S%Q4RV%+;lsGwkNe zEktb;YesBzz=mczC!L`Qh-fIvQDK~9Gz^O&aGGSawD_8$h7=sz1CIKG+?n0?>-Rjr z=ly-`5nKLq(QBVx3qeq{WxLTXjT=I5)Jo}ltii38hApDWAr^3@qMzmgq-QuMfGr-n z4A=q9?5XSnSrD|!%N9CBhc%CMaUMAxvXKWoJ_!v$Svdh8?J5T%>;z@3SBFe}c^-jT zMu!xsteDkD0XMt7h6e>T`Gu~Ua+j7tasRuF@z7RXR*yxC+IzD2~Z6oWwDbz~IFPk-YIt zDQP#F7kx=99pV;6ABm!VzhCZG$T_|Y#kE>3iV-M5$RrDyu*WOX0hw1w3^N#k;Nn@I z$Z}pd#7H~2Dp7|>N*Au+@mZ})#9m=BP*TXy0PRC@Ifi;Xp?l3+3!)wTD`Qz}p>U56 zpmrc|RlG~eM`>ahEXD58jzWf#8geJkN=czBjGU{=1H7Wes6(U^Im0rflW;omQiW2c zQm7O%El{dtTE?lBDR2b_7&=3PyRb0Na(D%$RO>Sg1~Z|gaNMLeXiRE~FyR?`gULu? ziZIsV6-3(W0%6~*SP5p1V z8xDQf+`n_|a^9pt95w8X?5h9!{p_PtH|@noqPF#%&{$HE`-jptCm#!Tcjq@341W0H zM=BB*$12A-ufV+vsm7BW1{9bXc1v@ew8nJ2o76Ww$A4jaEFp4B&uq@MU4uPw zrl0yhd;Vfwdoa~T#IL7eYnLZZ+~?v8^I5Inl#+x?wpU3%`=nKcRP zdd~{CH}*HwVlg9=is02%b+yMGLGch3zq=}__@(m7PUcDk*A=&GPHAm=Vx0r+ZM-u* zJT=pY*J^yLE6C=$r`qrSa+u0L38Gwv+UNwi`n~9E|KYiPg#P|yX5*WhVBV?Tz1e4> z;p?@3=B`1KF8gL?&!w1R#vgW!2eSTfbT;gJgZO!T?Adp2T`b8>85-NzjwZzQ+-Z4@ zXo`4d)L+z=x+5oeX1^zE>yxWb-vh7S)yA(U4nz*7jwR=}{V;v+ZFS4+D>YeLiO+{C zl3%}cx;-(u{z5@x)NS}db^4~qn+|*xc_|Q4LIlqrm1RCmya3&gFGd*Q>dnw^(_+du Jwi-(6{sCeM}Q)96o_%LPA!FOvR5J$C5dqy{}&F-CCgZ=;)wGY9n>(#Mh59TFz@7M2n ze$V^+xaRV*S5i|lQXmLQwHLEab<{-P)d}kN_z9mu9X2RMZe@p5rGz*cKo(x|0NC#5 zs(}-5eEt3*V1l4TQE<5xx1*HtN`4&|wb6zB0Tm5Fru=Y#^VR?b_JC?ZG$Rkc97JG& zHzO6419Jqdz$X+p$Y4i9nakTyjcdbRkkF$<-)M(=>_^C_!jd3vIAoRJgEK3}(d{SP=BeLO>BD z5sor)9;r?-BdXG+EBFHr$1<@Pj0H*!85-sSD6Yd$zdw4fMeCsA1pmrd(K_g=4*=8& zf>NFARr67m6$h)ad%B~jp{j=2E(>Z>xLQ{7*7<>`*jY28p6GaiXFP<*gIAGyEk#nK zmIiuCOYg0Soi4Y4x>#-^AgY}st1Yr{a%~R;t!lHg7FYO3(}%;|O_=7$`>iwW z{lDweb`JbuZdAsvMp~MiYxcIU?wC6`%?`ld-a1R(zj^#@*+t=WtMgX>3-&AXkzJ?W z8XVU<`uBZe*G^_mbUhg8y!`OVg{__8;zOC>*xgqTZ2HDD((}WmcYZxM*anjE)=_uO z!j1Ix9g)gCroRHl-{zm(lap^ptVaTghd+8eyKuGm((J;fxi#i39}HJzMHEfROgh;& z=I62-aORXdZXnlTfyJV+n+jz&j}jk`wO}2BU2+e z?cO=(hR&q<2Y({xduH-RdP8F~`Stgk3Oh8jjd{rv*SVBcyOT!0n4a1rO^-LU+}Zaz zvEO)eB5az}l)8VqC!eqk_5SkQ#f=pU4n8~K@w!Ur4X5SMn>ps(=r7P-RK|7}RyO?u Dom}%M literal 0 HcmV?d00001