From 9683b1833731000fcf9591a33fd9bc5faa435dfe Mon Sep 17 00:00:00 2001 From: Sen Date: Wed, 3 Sep 2025 11:56:19 +0200 Subject: [PATCH] fix bank loader (DMX), add new press sound --- client/src/main/java/client/Client.java | 2 +- .../src/main/java/client/audio/BankLoader.java | 2 +- .../main/java/client/gui/element/Element.java | 2 +- client/src/main/resources/sounds/press.ogg | Bin 0 -> 4252 bytes common/src/main/java/common/init/SoundEvent.java | 2 ++ 5 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 client/src/main/resources/sounds/press.ogg diff --git a/client/src/main/java/client/Client.java b/client/src/main/java/client/Client.java index 615adb77..d54766e2 100755 --- a/client/src/main/java/client/Client.java +++ b/client/src/main/java/client/Client.java @@ -2878,7 +2878,7 @@ public class Client implements IThreadListener { if(func != null) { Bind.disableInput(key); if(!(this.open instanceof GuiLoading)) { - this.soundManager.playSound(new PositionedSound(SoundEvent.CLICK, EventType.UI_INTERFACE)); + this.soundManager.playSound(new PositionedSound(SoundEvent.PRESS, EventType.UI_INTERFACE)); func.runner.execute(key); } } diff --git a/client/src/main/java/client/audio/BankLoader.java b/client/src/main/java/client/audio/BankLoader.java index c2b4f74e..063cdc03 100644 --- a/client/src/main/java/client/audio/BankLoader.java +++ b/client/src/main/java/client/audio/BankLoader.java @@ -120,7 +120,7 @@ typedef struct { int[] fb = new int[2]; int algo = op2x2 ? 0x08 : 0x00; for(int ch = 0; ch < (op2x2 ? 2 : 1); ch++) { - int transpose = (int)dmx_read_uint16(data, offset + 14) + 12; + int transpose = (int)((short)dmx_read_uint16(data, offset + 14)) + 12; for(int op = 0; op < 2; op++) { boolean tremolo = (data[offset + op*7+0] & 0x80) != 0; boolean vibrato = (data[offset + op*7+0] & 0x40) != 0; diff --git a/client/src/main/java/client/gui/element/Element.java b/client/src/main/java/client/gui/element/Element.java index dd9267ca..cac26d9f 100644 --- a/client/src/main/java/client/gui/element/Element.java +++ b/client/src/main/java/client/gui/element/Element.java @@ -267,6 +267,6 @@ public abstract class Element { } public void playSound() { - this.gm.getSoundManager().playSound(new PositionedSound(SoundEvent.CLICK, EventType.UI_INTERFACE)); + this.gm.getSoundManager().playSound(new PositionedSound(SoundEvent.PRESS, EventType.UI_INTERFACE)); } } diff --git a/client/src/main/resources/sounds/press.ogg b/client/src/main/resources/sounds/press.ogg new file mode 100644 index 0000000000000000000000000000000000000000..84aaf466a1e37ee6c9de2c42d8ae81e3deb85486 GIT binary patch literal 4252 zcmai14_H%ImcJB)1R{+PX=u|+K%gd!Cx*mkTm;jf4&L2LV=wSr1pJ7cX~`|Y~tCEB{({W|x%@4ox) zx%ZrV&iS4D&fT7wnTVc4PfCjW+i#NHvgTC1!z&I&`;^kGd~(2{$Jmm za^=s3TuD-jdzxeDnUDWh8F#cZ;sbqG*8aWgw<|N*Ia$(V8+*2p9UK%K6tppj&-No^ z8HMRticEI2q9{wbPmwEA6ksIZ-@zkOr0>g+DZ}H^iqb;`>q9oK=LH3kjO^?kR@mQI z)aGOdM1cjoIJUWDrdEUy9icaUF!zQ%LQJn|_dC#}i6MLDpvopqrJ0#t&9gjh*!+yu z2sxn=KdQQOQJ6g~$YlDem2HBoZJWB;E>#KF1=Mp7exI)BI@KjtOk-TiO7RK=HjIej zlradhkydcZnb7jSIe`YuFZc=Xj?&?5^LbnJBlwQ?qy+ zZ!S5#_ao=jxALb2ORY~Ds!b0z>?O+CJA)oYA=y`8T}?`0Wmk)hNY?$(TIJ zI)Bk;`#%B_JVP&rL?8>TCzpwpP%16YE&>V#k+)4o6ja&vPh)GzptpzXq%C6n5>&?#*f$+Id5zdR=8q!4mZN#B(LA4M!e>+&;9|4z7y_S05CLW- ze``K}H2)7!w-#&}*TkLwKJNLaP9WWmPy~-<&SQ;(HHg4V%Fvzp;q&?N^I!_nBEMbU zvEc<2;T+x5m|a2%sZFz)r3BbA+bNrAc1bXyqWvqjc1C;uyue+1tIfb@x%5e8Qj719 zp{d2@!JKLDo8U`qqS@TmJfqE@7SgnOd+&fpi;KxH3uE3(t?m}@G?=4;+~q5Rjt`Z;nC1dYlTlNxC?Z?v^^TNKsq;HQz3#~7_+jo10a_WQ)o z2Aux~fBSv@MbGF2ethEU)QhVNFL}ulH>6$)m0c3a=89xj2W2TA6pII+1dKgw7Um0| zi5xOS)(F%$W9prLiJUe+^_QE}YlZbb;`-koXw0nC8k&#YF?6{8DsuK#bvIRYS5z%k zsQoG%vnsX5p^lu1-sRzcT7Qn5tx6xL5INCGpJyWHERVGrqNzV1{=Qwu@QYy3g6J2X zbpS$VYiY5zb0mQXoFhW#h(J+N_-{uHQ0MsZm-t}VBM5mTv=*GKqE{(vqZHx0D7;0V z73~7&_D`9rZh8n!uyRd7ZKQAb>3YEk?f!MbZ}pbA(i-kYHGAc`uHC|0n<#MXIiUoE zN_bO9gbO|S^L zz~k0FQ@h$Bf`O2fMz~^S8e$q-tR*IRw^#%&=x$A%7EoSRP4JwLmeMgjD{&edWvQkj zZ?%@rMEW7bKI;HalpjAM8qs~x_5D5<8u+mcZmehY1%_5G9CY;v|u{NG5(L+G#D01!`ja)zu==py=v@Tv223 zjRH~XPTAFmBC*%oDf4AFeki`dBstH|6#_NQDogvIaKSH2o0Z*h+^F?48V$z5Tw|{( zrQ^1-!#L5OY3%Kp=zs4-Z_YAMdygCY1B}Li6a76u83UFFj~joc{mQ=_THcw)IgZv>h69NW&xwe3&bsGHHaQ??&JrV$ z?r&xn(22WjT@ufklfMl&vot&KY>wu#zlEKo7LK(xc;I_6%`D;4uHS*n+cj1~ezNPb z^c%L$3(pGF%u2EimdldrRq6ELC0)j}kg7jL5`fiGo6bE7*XtOucwq7r0J(EEGRC0u zNE8|dfR$e76^ru*87T^$l?5ww9w|c1!br>wv}o5_*uZL>6mFAot4RZ_noH|(+;pU# zm}+exS(U1BAvRc#$HA^}{A3v+$>CXBiJVZ_6|kzua{?`rl(>OHy2Q=4E7L%-JlkXe z;aoj47C$-QC0FnkU&OOaq;P}TD@6^$6Xl^@)@+iHk{fQ-=Hn*oWugWM>A4@xY5)D+ zQ_ZE>fflROL<;vmd88hMFMcMe7HDRrz^b08h7~C}LtTy8K+qD01{Ocd&k6nEvZRNU z5et8a{KG>JlHt@TaYPX%R9PE&gpgqySwTz-v*^kxfj>2BO5kfy#zkS6XeyGz9heqi znAs|zaP?lX{(i<$}n3VQRDB-?cAN(9AJW(|(z0u=U`K5de$L+ESR(ATzego|ojPz19R zi?sJ0rIR> z$?&(fFkhnBv+~zHY@g{lPm=T|`{y$``!Cu1Z}n2-CV25FP1uWW z0i=#}cS!U`nqbGyFRRM2+d37vr+qUn@Z$nXFbv=W5v`Hn&G`i3&($}QN5^Fe9tgZ$ zxOyv*4N}4=`cs!lQCA{kFuhfBC=fyphfisBXgL8>%vYp6Jl!k-@ySf@fdG=oVe9fh zY``k59sv8p31O8U3bjhy&~?RrR1(vdSAInI{<(|SZNBC}vK?i!HhD21z!z;KS~y#9 zKoyA*jtbmhA5+!-JVp;&vO^01wPc^C*%4)f7Ns4=u$KX3ezqPLdQ^J?X9J_k15!B+ zaJG+WJV1smz0(jRBEd8y!3I@ZkIEsbvwhkxUo+!EOo6h!BQyc6NTV2*(xl@o^A`p(Yqb~`zJfbLx=W?clR3Qa>+btJqGQ3bO;FwxrZk@vmR5 z+4&e-qPh`dabVs?#9CamBE2M4eJp7&o@ z6rL8%lp*XN`@Ij3-z(t^Ex2p