From 17d18995e9e8e89c7febf17b32f198de13a3e8ce Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Wed, 27 May 2015 18:53:57 -0400 Subject: [PATCH] Vastly improve conduit/facade sounds, facades play painted block sounds Ref #2510 --- resources/assets/enderio/sounds.json | 12 ++++ resources/assets/enderio/sounds/silence.ogg | Bin 0 -> 3956 bytes .../enderio/conduit/AbstractItemConduit.java | 5 +- .../enderio/conduit/BlockConduitBundle.java | 59 ++++++++++++++++-- .../enderio/conduit/ConduitUtil.java | 37 +++++++++++ .../conduit/facade/ItemConduitFacade.java | 4 +- 6 files changed, 109 insertions(+), 8 deletions(-) create mode 100644 resources/assets/enderio/sounds/silence.ogg diff --git a/resources/assets/enderio/sounds.json b/resources/assets/enderio/sounds.json index 1d7fdd17..80f59268 100644 --- a/resources/assets/enderio/sounds.json +++ b/resources/assets/enderio/sounds.json @@ -57,5 +57,17 @@ "telepad/teleport1", "telepad/teleport2" ] + }, + "silence.dig": { + "category": "block", + "sounds": [ + "silence" + ] + }, + "silence.step": { + "category": "block", + "sounds": [ + "silence" + ] } } \ No newline at end of file diff --git a/resources/assets/enderio/sounds/silence.ogg b/resources/assets/enderio/sounds/silence.ogg new file mode 100644 index 0000000000000000000000000000000000000000..e0f9f1f874852641d476504c61c5c73c371a4a85 GIT binary patch literal 3956 zcmai1eNaYCJ^E>CAw>3LE8O=j;Z92t0d2PY23ykHAlD9R=94)oPi0z!)@(zQZoMCLGPCjeY zNs4kH_Q$Op@z4L&F3fi`S_bqTIeT`$x>b{n<>e?-Y4(^53tPQ<-RiYrVH7vU0{3P- zW@9P?F=0iLfH}&>>*NS=5PB;J_iflE!!3r^kiAWY&D6}Xy1L0w?cinBN}NvzEIexo zLLR6rgr#qvmgSB~vw6XKO^Y;V%lhM(S54AwDeK&KuVfZ<^mM2T#&98XVcG%&mWbLc zsNj;+psW&9@?iKYUo$K?Zqj&*PPFXz4jabG6T%*t8@5C~IMJ?;d>GO*9^)hKnIIA* zlc||qA9-fHs~wZhnC1o+tp^5oiSZ1~;>0j1_EmUClLlD1)xuC2sEIZm=E_cUFP`RK zx)QYYo6scxh%0O2l2a1p(26s*m#C&nil<6S)0!&M&y=Q}sYt(Gk@2KrC$Dm@|4@4C z3Ds%UF$QW`DQ&!qx2<@&?MrFfd|hSdJd{P51Y^~&!0X#(9lLV7a+>>gpX|%O*d2PY zn@w*4FM3e7K`lAPj{oVq(i&C2-J^C7i%=BUa;T6$R2URT1`TOKy=V&$Bk*Yy8S2o4 zZ_%L&BwR6Ba#n0_Apuq9lArA^!qcgA`xYL~Pe?n9?Rrfhj19{Ce9* z;{_BE9NX2HTgF^dx05zY8L;KGGB>i_l3+ts>sOd@-1zvC)Yo{g#ma5I`e}7ab8x@4 zshRd*-dNyW@FhNS)X{Qu+^8Lsv5gk@Y_DIlm)$x6Yk@N+UuWP>*q1Y5^s?UA0cX?3 zjngOkxiG6XGza(gr?~me!NU4S)7YodJ8+`R%_U<=e=>U`x?{T5}8`9fwBo(}9Mv8^z}O z8qr9|2cuyZL#d&2a4d56)F5XgTLLH!jQ|uM?45p3+a=wsw)DCbt1JeRz%A~G0;ghG zb(MVYwarG;#{LLx=en4hO||2PIB~ zUiv0{>*Me%{&7j+iOEYct}H3O8lXyEn{hQlbycpKEK%L)Q>A}cn$|ZLFz&FqHC6mV zq);8~7M9%J-<4rZkt7>Md z^dZ%aIn_p6e_P&2*X+P=_Ggi^NfQJeA}3B0^g`sEmGC!0Gd7Ov!Z6 zf>x<#>v^8;IA;x8x^P8NU3Bn*^E}O%>_SWIn1prAFf0wWG)%~FaU*XHF6{8jylZNokX1;v%GEliqlRfgHo9>&OwwJw8cDkDHRmq|9Zy5sBxqat?0cCy(JneBEgD zJyZF3bO=J&Sq3~YA>mnZh!c!%?+Lox5FXDJ#{0)z=BlRr6Q_=ZUkZ;%N|9gmmrth1 zZw4gF`-F-9iHYB)$o=EwOXOD@6Xm`6m%~*zQsiF*$S3<$Hv|5%y|MV#n#44Cbpf?_ zspi2YicfK#Z!=pG)O%?-nr%Sc-!{S>ZImVpawi7mEh|OlT_2t{T z?CEXyZEd!Z?rd9E=ScVaC%f`yf!cM#)*WiIg`Vv0{K*zN+jqh?U?1r|)!cP*w(o17 z!O+=(J+`i{liiOf>VSRLSvWhe`rQuvV#mpc1J;3og4uz>(Y}0syY1n}qKoHFjdXuK zJMg=nVnLF;_zOeE-R+=9{+sW-m;R)pJO8y$>_3eFgNYxcm*3|1!?6zvmcp9z@v1-U zT(7re8{wuld$aB2Ydal)|iZC>7fX~YNo~P8$(#k+;~EqItoB;pNQUU zHTxyYti8a>Vh)HWBz@fU0*Q+cC(M57GTg~c&KEn4E1ejyxc=5#P-T-xhWcpb70wFX1qe
gw%)g;8=xO_C4DeN7S z;<&>lWeP0;@glJ!RgL4Ig&67%I&3`?s~rsQg=s7l3sLOEAn$kvT6pE-JTo_wv%$VXhyn;i>gcc}iz4=hj<&7J5@Zm!4Jn|M>$(B@NMJZvT z#kvF{*t!oaYA*&TSRA8@Tzk*;D5kx_6&5c9DD1MIZ&Iv6=n-7#5uHbbsLl&T@!CPI zG@GLwmEPxvLuTabd__)Exo-?}30wodRijcEI59wgdatz{28&^WB9O!b4AyW<5k)YN z-Ux~IKt*&aDNDQma0}$jd1x<{GYP3ztKoIri5coi5C#Y4JNJrd13N=#`-@>SfS2ZoC;rS zCvPd!U6sG?N55v~%@yfQ?$;M;_UG06ug%icc7WWA1B&{@+Y9~dwKR3pdi-UdP)bLR zFBE!%O>kq+Wx7iIzF7zEY28RjLxg}590&M7L>m;uQ7uV|gqB7sbzD;rV&Ls1w7AGz zkP^wX^jxDvU60<3TU?3*VhA|`UX`^Gl_YF&Tvv8V%o8NUCoi)T0!X2TtEc@ZtU$jtY5yTRJDheY4 z9k{{0rmK6l#)+J9Lkj>k;DIncqIG)OGmWKw