From bf0bf98c2122572f35162ed0193b4f7c0f6464eb Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Wed, 18 Feb 2015 01:23:03 -0500 Subject: [PATCH] Add a teleport active sound, fix Lang --- resources/assets/enderio/sounds.json | 6 ++++ .../assets/enderio/sounds/telepad/active.ogg | Bin 0 -> 15118 bytes .../machine/AbstractMachineEntity.java | 2 +- .../enderio/machine/MachineSound.java | 18 +++++++--- .../enderio/teleport/telepad/TileTelePad.java | 33 ++++++++++++++++-- src/main/java/crazypants/util/Lang.java | 9 ++++- 6 files changed, 60 insertions(+), 8 deletions(-) create mode 100644 resources/assets/enderio/sounds/telepad/active.ogg diff --git a/resources/assets/enderio/sounds.json b/resources/assets/enderio/sounds.json index 268e0cc0..757d5884 100644 --- a/resources/assets/enderio/sounds.json +++ b/resources/assets/enderio/sounds.json @@ -44,5 +44,11 @@ "darksteel/modules/jump/jump4", "darksteel/modules/jump/jump5" ] + }, + "telepad.active": { + "category": "block", + "sounds" : [ + "telepad/active" + ] } } \ No newline at end of file diff --git a/resources/assets/enderio/sounds/telepad/active.ogg b/resources/assets/enderio/sounds/telepad/active.ogg new file mode 100644 index 0000000000000000000000000000000000000000..7bf90a6d07023000595a454535a02d8dd66f657a GIT binary patch literal 15118 zcmeHNdsq|Kw%?NkNCMI%1O%ks1PBsD`kiyX?|k>aJI1gxv-j-T zd%b?^w`N9i@=QcSL&qy4ePi0p?>-~O5}$s&EHQOCK1BCIq+I-1AE{`EAwN{t`%%ED>TL zr8BE=?;}}ShhMVwxWZ-SeyP)a_X$i2BK!PUXMc8Du(bMc_2Q)+Vi9vx46K2Mq#?pw zz5;(Gs)Tvg@b!h=vJ1j}JD0It_Lpa~Jue70gn9l@wPpI`ANKDpocyEn;j4kB6ApLD z!#r+AFF0`0IDXCY4!_4chrU?kIt1`6fyOpToIobNy-HkNx(sfmUzPwVVVP)JF<*9w zfBBHzH`g3zJa>(>@V@31JToeM793gevp-$f^J!Mkr=Q1^=FV;YJf=B!?ycPTSGft+ zc|)JU&+op%A9Cpe0+l=XmE0Fs+S^w4`&H6&^6F?P32%vjrM4HV_sXglr5#A!(UkI4 z(~`>#u9q9k$Sxp827Ve;o?2FI@L3d7vhd%3q$w9%kQDZ^J=3l|(=k}#*uKowgxui^ z2xKZ%xV9~mOj|B#U+xc|X`cjL)P#NWGVGmUAz-m1B=xXs%e1=)yP=qHeVO;{HQ56$#5K?haE13}r-@t8cC3?J%jY>4I}Mk9V4% zw@HA0sa<6zHNA6SY|PcNNBfWQp_Q-MG49B*DE>9 zUz2wJ^BWdEM^zsw$SvWP_4!@dg3k+$6Zyhw;g+$VY&PFg?r}j}HFi_sRC&#Y2!+i! z?I+pf$^{7Ja7Zm4{vuUbufr&wyCmKRR`Isr1{^!N?_PWB)A`IU zk|%=CHO~n%z22V{HEZ^#OJcTV-9DNde=F;5&*yi0Hq9HIM^&s5%Ryi?IiyW$5;uCZ z@7ypwkfj&!u;pa(+l%ck7CVMEIEHt*e)C*1`HDiA8?-0Vzybt6f{%@F;RsLGH)mB!s&LQbg(>p$gZPsKJkqO zjuvpVT$4yG-j`Yg>wo@d-!PFRk^!Hg+rUKEqKIpfp}Am|7O!Bb1R}|Qe*DE;k>13N zx8{;c!lhB+|M^V+e~16yfq%OLpyGr%{I?3M5RRuQeF^l%eW_X?8;~d$#0>baunn{5 zn`7nwPMOK|Ve5bZ`&_bOtp7XJtRl%fyG=Sbq>dm#Bv=U-c0=b7eBtq#VZDY283?ne zW?jokqxoOYNj)n`sQv4QQzE1!Opp>;T#}AF)7}ssLcZ#x7{C`H>V*VSE{xf2f{=RQ z%CUcaoB#b;%7lc{8KEyK=U8RfU8WT-h>@yYP3Om;aQX^cDWAZdY53{JNJLg9&XOb% z;uxX64F2UVN#q0H5^ZYbg-qAb>p{f}0R-jSOQ6Z!{di?HtMdh{+qs}Jl?LGjw%rJC zyHAST)jT5Qf*c7PQOiBwl7}lRoeKaz)n3YUz5F65k{>>ER{Xa6b4niPS2~wf*B*C+ zi8{#;1>i2FY~-{goDW_Yym9>KvPb#&4z;xhOrhs>NjUWEF{(@{tFEbqNFpUW-pq<0 zt-|MOA-d3Tr&;kmTNf%*VchWpuJkDVZ=3Sk+8>V}7=IZ7fa=}4FvhqK|7vhWsIP@U zf)?iFi~AdxW5SyU5Z|`J9;rYVHYUhDv}Oxs&U8O%$=HEHA`zv=3?eVgBkOtl;(Pb>7n%Y`6 z{JIVsm5cFiZS9k@O?dx%vJ!6N&3|&d1@=8_p-nRm->#+z&B#E=FvWnmjD=O4zz}h6(Vx|yP{J4`XDCDQ*_bfY%4ENtwfvF4{9m?i#V)Qt5{;}o za_Q2ToK0SJj=L-ijYr!y@DP&)QV&pheDA1H%jK4V8~vO`TT5aK>H}3COl{ST*mMu8 zPCt{1Dot#GxTzlm1m|EWv2mtCttR%%2~E~J(uE+k#c*zcm;4BvgQYBXl^=t1huW+c zZwhwaF&AH5T<c90Dv@j8z)Sto=!Ox-lkrQbYF8ZI~e(BizIk-${ zo$htOpEix}873ud7BV!B$)UsDv0rUmc1b3y|8T19qw=a-G85sEIiU*$0heU*UD-^r zaZT<<7j5a5lEBNQ3bVxV9-nOVnCAB|DzM!eTy{1>bgriblP_Jr-VFIlLyBmKZEE)J zxnQZ(O}MwEJR{6^+%6x40#qcCFoe($!bAd&Le0z{nMCmwPQI#5;89`g>{3lvwi)HE zK^Lyx3OUiNbfd>zZHqSvWCn7w=h#UJmap%nc|pBeR|6mEggSkwoutrywb zS8l)m{lFk%aczWR55E8|dHFpwh){?^sZymp@}2BIMH(11HAEgZJpvwpAfu!d5lp5& z8O6VuOg-x%oveRe{ID3;zWGQuDq?(`r-zq^hs4`Q;^pZjk+^$Gyy1+G7yjwx3BM%n z5`1{UMTsYLndI#y@qo)-@K@sLjeFy(lkjzk=YwqB_HfI)3h(N;fe#vM`sdc3*ZhqJ zF%1diNG>w6KHK&2>EH!4yIZ}srf*Kmcg-H{V<)hBy>6@L*KX;)Et8P+>z*e+uR0l0 zfda_&;xA8A+I-vUipu?^c{k5@@1}J*wzX-i97U~d@GmRH(!uJ>w#32LF>^jP`hKM; zGC@=9-kf%;QKWC6GrrJ$y~M@2=?qZ_UgD2K>ZRbL=GVW?A>8f8ZjL~2-g`5zlV4Wa zhfd$u{Tx=2&oa*l`=dLw$}El0ly_)}c2jqbJA=@vxo`HItUAsaw{-r|*B`8wWeKN$ z+u|{z5_o7(lMEE-l*W2tu9g)EJHGhM9_@`gt;l51Ti2;b`#4cax3hSA5~-vNq0PL2 z=+Xj~1r42o0beAd$WJ+D8Q>9Pn~eWh;?K!&!$ecyS>IX=?(wY&JSI{>|OR;@HvGTZm8FbgL%>KS{LpRW^@$ zdm3q4IYQ=}Lo$OM2hE(Bd^FY$wo84d%_BqEH=tWp@={#5p02w6_87FkxCXVbO_}+! zXMQxhylg4)X3U!prd|B0-+0o%m^Y^jHNCB)sOyn9q@tGGQi(^TIMrT}LqlWDK$Id$ z=7v#>4Z5#GS>fN#r?-=OK0KM=tE(JTS5(EA9W}>x2A_|1!!)Z?Q~H(k2YI^Ak8I0) z`_P|9TXTBSD-*+UEj>xtiIDa%A7OOqKIFvHbR9Olu(t~+{M&_nc}T} zd8bX1p`8C*_mlROTlIR1G?i9d2BPJR>$tbf$l9#}#-zV#-=rL1RKm|hOi)p?TElX;0L`uu8=OZG|-cyjzHSZV2 z>ID{dg3{Ngf2#S#$*Fn$0_>eej;pb1CR&rgwTg<0vI9*9)$dkMY4gcYe)mk*Q1a5P z$zUbX3I9@vjKbK%{kr1Bip{ya!UNnl&V52vouxW}bPENip6MtP7 z6Y8-8T*sf4tmsI9G3X^{&~;i=L^f!0+?zc|ZuG*UnQpqy*x%96F`$jtU0&Q z|3fduA{#5c#`JW3_2r^|d5J8-9EHB2%dOicc9V)mF@mb$N3%br4uBFYIlwuBUAyFO&9+*)tQ zo0d=?Dx*+@5UwKz3#17*XcX&2Z?#X053t>z`h zvC$puR-(GVt&~rCz3$zbs{Aojr@UVzLd{((qQc^AH+#m(rNkYO|0~5yx21HG?=5vt zPx3!6fQ_I=i(n(PXDk0cPiQ{=ik890TUH2zn)2w3&AM%S`6s`uzekaOdAA1j6{s4_ zxTA|W#!RENAP#NSakR9r2`pKbMNl6t$H$Y9ItE#*WD#O8SO^!Sx1jHI9QdP2aZA@K zS%|6PafOkAxe(y);5lyGxrN4Yzn?(Hm~`b9CPkJd_DHEZsPWyCQNtO{AXWJn#atW! z)?U;#Zu|SbQe$e+h+%I>87u7lnfYwhGr$(uXkMvrwp!Tr&3=9QpQ5kw$5G8c$w%RY zqU6#tRk`ECWphBy$e7XHhJ({R-OsM6@!uK*r?d-UsCf-DU#{Xsml{>@u{|F>RFzLR z=Zv%{JCIfYL+maUJ9Q+i=yzpmv7Sw=scI!mn8v!h+oBW@2kabzmwe~?WBmk30FR-QDJqsl1D$*SP{5_1`jZ9s&41j|nruNvLn zGKvq&k14=dfD+2eop>lZhb^~I^Z9CH4jZiVgK6T`c+5)(%#oMKG5r9j-#UtCB^e>L zA~0L+Usx(&R$QR#!$#F1eb{Ky;+A0PFf~gK6?i5YDY;vC+nhwLJhxD0E*c&LiUay^ zRLnnNfB-KRSt4_3T$#8fa160INohrn)b&T5G&? z3EfLW`a!@!-KAzG*bgSl7Ki0g6(?;y8!;SPwbpX2BZ<(kueBJX56{{TCm#dDX=K`< zX8XjmK~c(yAp~~l?T-~#I&6Jq05vyvYEyQ3)5ozWMhz%{lPn(J5|KFo0B;H)jaQzr zqrYh(@*r+}G!^0ob)KL`7Rm@VI#$`$jErC!5IsbTUP-1h{<+Ro+tiUqg#pr_uQW)> zePk*>3sh;?^q+-MVu?H1f?(%#Ml+iHNcV zTLXl0x&y{oeB1Kzpl-^7z2W`_LCsmQ6$S0IEYa{58aYbAdqTh|MST*%XbGCIpe;SI4aQ@Yg{AncSl(3-Bf$q?J~E`uLf^)x+= zx^YQ+xq$8L<=SUCK{4h=IO}ZR2hi5oH^1e;um812?s3Ap&yhv}x4mkFqKjtub|G`% zPOvBF(4+A%KB^U-*(Yc?CKE;{Ye&A6%9IX#u04x1OuO=V6GakM~4u zZ_{K?`mLMS-+iW=B9Fxph_Z3j{OxGaKJJvV)ZNlSqoiTr0osF6gt>0s?GY4llAD!w z`R(*Gs=h!uhY^hZ4FtDji%GuN-`Ht)hJQ=71VNgLp$uWMm#vHoaJi@)N^eMj`#k{M zA}Onw_ejoWn(9;HyVGhGrtKyOeq#wv+WaxCvzn1|XB=FUv; z9U%Wb9pINHV)?I`3}J-g)8!XvsL);HFN{1OA&dd&tp$hk3S@|IhI4ndOX@Hqq^Iw& z*9pnZV<3Xy%8vyqaw6C?K87i`Nv^_uq?KWIVbznG=pV(NZxc{o36$RZY2a?>9Ti>6 z_06E4=+|Y>|n&u!cQbAmN@Lv~ZWo;2sh5UZ}YQY~iD7KCPp zg#@8G&gOOw+Kn@hBp=~9V%cR~qvoYk64lS-_-uz)TXr*N1m>ug0VRl$E!G#34!a-v zL*thOHQbWf4fBPse`ek^7M+ZNz@H?4c#c>F-b|79G(CknO9~4K>|LFR1QsC_1_Imw zMJ6+~^<%ImPlL4pWdE})r6oLjcu6bgn0mfeR)93<4(!=0lHQ`9ggu-1L%bcGx@X&S znP`8hQt7*uQ#_TaWq@2@pXWS@|+mK9^HM5+X-QCo>4* zzYU5&7=VXhpegN6F=y<|SV;pq47-_R@eln#1d@TUs|^5-$JajEG1LbuIucAnZVusbf!Pjc8#F*Y zfDZhkNVXW_!~k>yZS&_%OWDNdB1Vl;!?1jqZxMlACgeABlV{LPm{z){jhgyKLslRh zHu^xR`_{f7S24FZ0^`(qn*p0(Dq)oFYn3LG)PaWiP`N4!^>K*QF2R`v zD>ZuN^>haxh)`po>w2~aT9|xGp?H-%XOzM4OLW~fP9$iJ;0%(y;496Y9Ok5hWB|=N zV_-LF#eCGVrF42wQIc~oG8(cqyaGUjV09e^Ye|~GM9sXo0}O|Y+xUA)e-0!^ax&en z9CDk9+Kvum1JRfw!6i$s+l+c$rh9heMt86mHS6Hiha+X@XnQl} zj2t0@+v7gAO>))`SFXR2mU_S!#fx*2@x@4oWx| zWV<5wN*eF1I}5r2NGm`Pw40Qecui8Nzy z-TR@vnB=5nT{k!}sE=)tAPi6~Z*!IonE+1l2|x|My9Ph$FEx;j6O7rw$s{5VxHltb z5;Z6e1A&a4ZD&jYW|gU|K=&0hG)L?az!JOryXj#ANm=P>(N!O(8&pL!-63dx)m&qT z@a*v|I2#}%2NY7qaiNj|q2pveG2Nab(AZj}EMjnZ2{u!U09|74<>bq5oS>52%g6C% z2F|J1o<>Ne+2^-<`j{qMCVB_=y-NFe!fJ37?Xf3GM#uS@xxDM=XLIGmq zczbuT>`CGn-%I$JWnoXK! zWK|rD4p#chLY_1BI~y^F0q0OkRH*21Gp91c5&5ntqsDhy_KX#E$dtpL0*>Q==o6q| z%{J(sh8CnJ4kaC&k@|o%JjN7AYyRxGz_22YoM0nYy}G6UWUO~;mvH@tvey-tTnVJ! zSjE_LZtDZ6Q{sBcD|PQJU^(Vsda&^jz~VnUTxVGx>I>nf(p)z?ILe0PbE6vEaxY-LPxA8An@tv3ZBJ8nXu63q@Nf;hPw>kiaY zzLg&Mb=@P)9R^iDi+XverJ%t-(_HJH2hT;uj*)tb_LuX9vBQc7<&?~+ImJBQgM*+p z|BHNMQGpp6q}4ITUyR7>gxUxgC|S4|s#vmd_CP_8o;3v8+FxM$;>^~51t)^8FLnTY zfT|UY?tmP{plDfnX(N&b1+7#RX*3Vkb0SUw;OtOzwGopJj+qzexWH)R3#%CupdLmRh5Q7n@!Iy17^@Xl*l0Ee;0Cw{uE#7!NGNV z02M9hr?BG!d5{q*KF=+7auc0-I1^9`xzYccN{9)fDJ|9fzWf(CRfFXWY}D;NT_hmP z20$1K>8&+Y(NZi}h#?AQQos;_&S>q>YM;P_=J8uVv^7QmAz*^#ICq2e|k@r_h45B$|?2+?OAk z>6q&)0Ad8Zz-@JR4v>kXbbFS_76%&U_u|Dg0ZK66%6st45BNvYuh%r{`SA~u$reSP z@~SXoolwXa?;>Ud0PhPbu+HufUj(7qZBUols?ZoxHU;}xC};&O(B9sz&=D4cr@76; zbyQ%v8Yfi1e3V(zRAmHIA=Tw|rApub5|o3}fC3>V#<1F~(g3AyP#{i`d(+XLiB}5N zS9Gn=kQzHI2s@*CB!kaQK&+qfa2cP3tnX3SSn1&u8lqL!F*b`dANmbttv9+`fm^*pa;r|&)B=OD zq-Z+|%E@hB6Otct5bW+F*ozK`r2rK}}+q3CNDG0rvjIOt$vpQQVZx z=aOw$tSOlL{r$gBAJxOw)4Eqaxq$kK%rWqK=13?(`}bP{3>S-?oq}1Hvm;zuh>yTe zP4vKMr|q8Zi8}Bv(2keqcod}yDPTYIjf=D@=jhRn?Bkz+#>~_8?5)cB)QlQW?Okda zg8sUys{PKF3l1TpA@H^U!p{mw_!UJTcI-J z1I0N=b_^>s5OSiG1(~hKvhCO;0)fnBE@Uo!+u$venk5CPR7YBl`DH=Kum1L8Q80ER z!!I*{<(%o)eGc_}5Gm5n-703!Qj2Jeu5>dHc1%Sc?b0y#BINV`qt`}^hkU$i0 ztjqD&vt7+%5spIuQ4UfcmT7F|A-FyI;j}p)q19my7aXmvhQ6O+L_sAPB zCoqg?-=@BkYi4o*BT(5>Ltp(VydfMXcH=%C2yO-|!-?y*E?_;+;lve_U4~R_&|(YJ z_aZk(aEWc&2v`O4FeF4d0q|3t<m z%kh1QJ_a5@sQ_l#L16Fb>gsl-I0@mxoZeZ3dm3`q2JXq&#uAM+of@HvIO|!iK_gI- z$b+o)NRFF9rl;a)Y0_3BMo_C!@F1Td059_g!g;#H%#a_Ia*J8Yg3tyvEvif-06qaj z6d*-_;Q&f)GBEfvs9>$!xR|FLe@Riuad2}XAX0<>+YG>yFd2ke{$Dx^iB}M<#e~5y z5?gY{F^2geC*ab}Aml(LKi{yD?=#a8)oDsK8u#&z#<;ei2Lzb9(pT9HS&N{r7$`3! zpDAauUf@VQ5;n-3MISZ{EAuY!Dz=l{Ix{b!g)=-0e#MC7Q+_dg#Yozuf>#d}3SQS7 zai)C`6JAjxD+^@Sme;QP-8uMazX7~S;s??Mygs%}B`bIaDGQY3^wd?$D5%NxECH_E zAZ-(bPDRQB#VN*kf$OGs#Rj-^$+TQ@7z`2(Ydr^`){*)ul)CKW+kId z9|$y}16^OmZ;D%#mUZ;e+J#G(e!lLbkH1^@&-9y}|BQb8_{ulme)ee9liy#Y<8xVS zKP5XoTKoA&AD`@O%+kd)P5$77P4M3u`2EF-l7>60_Viv#?!7Vbvwy5fF5D8fF^Kpd D6) literal 0 HcmV?d00001 diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index d508b1f4..8cdd4be1 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -60,7 +60,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi private final ResourceLocation soundRes; - protected static ResourceLocation getSoundFor(String sound) { + public static ResourceLocation getSoundFor(String sound) { return sound == null ? null : new ResourceLocation(EnderIO.MODID + ":" + sound); } diff --git a/src/main/java/crazypants/enderio/machine/MachineSound.java b/src/main/java/crazypants/enderio/machine/MachineSound.java index cc18f993..dd9dc5da 100644 --- a/src/main/java/crazypants/enderio/machine/MachineSound.java +++ b/src/main/java/crazypants/enderio/machine/MachineSound.java @@ -4,10 +4,10 @@ import net.minecraft.client.audio.ITickableSound; import net.minecraft.client.audio.PositionedSound; import net.minecraft.util.ResourceLocation; -public class MachineSound extends PositionedSound implements ITickableSound{ +public class MachineSound extends PositionedSound implements ITickableSound { private boolean donePlaying; - + public MachineSound(ResourceLocation sound, float x, float y, float z, float volume, float pitch) { super(sound); this.xPosF = x; @@ -27,12 +27,22 @@ public class MachineSound extends PositionedSound implements ITickableSound{ public boolean isDonePlaying() { return donePlaying; } - + public void endPlaying() { donePlaying = true; } - + public void startPlaying() { donePlaying = false; } + + public MachineSound setVolume(float vol) { + this.volume = vol; + return this; + } + + public MachineSound setPitch(float pitch) { + this.field_147663_c = pitch; + return this; + } } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java index ee3ccf6e..cc57bbb4 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java @@ -12,6 +12,7 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.Vec3; import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.EnergyStorage; @@ -19,8 +20,13 @@ import cofh.api.energy.EnergyStorage; import com.google.common.collect.Lists; import com.google.common.collect.Queues; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.api.teleport.ITelePad; import crazypants.enderio.api.teleport.TravelSource; +import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.MachineSound; import crazypants.enderio.machine.PacketPowerStorage; import crazypants.enderio.machine.PacketProgress; import crazypants.enderio.network.PacketHandler; @@ -53,6 +59,9 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei private int powerUsed; private int maxPower; private int lastSyncPowerUsed; + + private static final ResourceLocation activeRes = AbstractMachineEntity.getSoundFor("telepad.active"); + private MachineSound activeSound = null; @Override public void updateEntity() { @@ -65,7 +74,22 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei updateConnectedState(true); autoUpdate = false; } - if(!worldObj.isRemote) { + if(worldObj.isRemote) { + if(active()) { + if(activeSound == null) { + activeSound = new MachineSound(activeRes, xCoord, yCoord, zCoord, 0.01f, 1); + playSound(); + } + activeSound.setVolume(Math.min(activeSound.getVolume() + 0.01f, 0.5f)); + } else if(!active() && activeSound != null) { + if(activeSound.getVolume() > 0) { + activeSound.setVolume(activeSound.getVolume() - 0.1f); + } else { + activeSound.endPlaying(); + activeSound = null; + } + } + } else { if(active()) { System.out.println(maxPower); if(powerUsed >= maxPower) { @@ -92,6 +116,11 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei } } + @SideOnly(Side.CLIENT) + private void playSound() { + FMLClientHandler.instance().getClient().getSoundHandler().playSound(activeSound); + } + private void updateQueuedEntities() { List toRemove = Lists.newArrayList(); for (Entity e : toTeleport) { @@ -234,7 +263,7 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei } private int getPowerForTeleport() { - return new BlockCoord(this).distance(target) * 10; + return new BlockCoord(this).distance(target) * 1000; } public boolean active() { diff --git a/src/main/java/crazypants/util/Lang.java b/src/main/java/crazypants/util/Lang.java index 214b35f1..892f44d1 100644 --- a/src/main/java/crazypants/util/Lang.java +++ b/src/main/java/crazypants/util/Lang.java @@ -1,5 +1,7 @@ package crazypants.util; +import java.util.IllegalFormatException; + import net.minecraft.util.StatCollector; public class Lang { @@ -14,7 +16,12 @@ public class Lang { if(appendEIO) { s = prefix + s; } - return String.format(StatCollector.translateToLocal(s), (Object[]) args); + String ret = StatCollector.translateToLocal(s); + try { + return String.format(ret, (Object[]) args); + } catch (IllegalFormatException e) { + return ret; + } } public static String[] localizeList(String string) {