From cd2c6050363d205dccca4f2e349cccf39dc7a064 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 25 Jun 2021 14:37:32 -0400 Subject: [PATCH] Suppress certain mod errors on client load --- core/assets/maps/passage.msav | Bin 13732 -> 13732 bytes core/src/mindustry/ClientLauncher.java | 11 ++++++++++- gradle.properties | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/core/assets/maps/passage.msav b/core/assets/maps/passage.msav index b6816fba7b349882950968948212b25c99a33c2b..e9b8c5b1d12ff1c546fd8da83a3fae520acefa9f 100644 GIT binary patch delta 1915 zcmV->2ZZ>fYou$iKQ4b`lyC2Efj#rl^1q9^iyS=E|7V5#{^x-98#VvanARQKy3JbX zhiBk=2PD6)I`X(}zJ_D_E#1xjMq}rL$U_!*@AOEQ73>Vz4neHFPXJx;wd! zrb$l*i{Z(xD$7na_ zk)QtebB9I~bS$+`>hp8dCG|^CkM|vWp#2Rk^OpMF0lVJlfXyx4?_@9cLG}R8IeEbW z>hwJ7ZrkxSp>O4X6XkIEkdJO-|MN)iz{xl04oPMtqrF)h<7oT}4$s$+r!E&9yVU=# z1n;yq>zIFj?p*^g=WHdJ;YcBIbYL$^!)%M&5yMA7Y7)=kNxOeu8bJ=oVE$t z7u|`9&=(61{{q-Ep-t4`0ovF-w3!2}-^6wWaL)oXJvo0(K<>s-u0rju0-cxH{bbr7 z?I3RbuCd-RPx~I>ciMlw40Qfy>Dm27u_J%FQ(nMWP{H_e0qnY#cyHjkp$)Vy?wWaP z*F0q%-Ntqs4(|%mv-D5%wR@Jf-+AP#+r0*KR$}+C=}e0Dyw8E0jnn*CH}$eFKzq7m zpG$_W_1_BeO98w);+Megf!Vm;b@ptmzv>@y(wS|HbPC8X!TCey7w19Fz6oE=)B}Is z!vsE)D4^W5=36#=te?}~ON8xGuyJw=?3`XhdMWB{i{pu%UpkJ@wlLn6@tL5#Z35j} zlKbJ3%gFtxO>Cb8bXraf=y1HSIJQvVDdMbw-BUXca(AVQK1ydWdOWUzdr!dKr|O#D z59#M+ptYaGB06((>n~&b>kiJg6ElAR`H`Pu zfbFCotwAhZx?4y2a2@NH5eLaY_W-p1e+81yH&N#_Cog0FI_h-;`&t<+4w`=_>5RRE zG-=+T`|dYD)GFR7ojuCkkqFyUo>xVB71V!M6=f)}T(W0> zIpAZ@P`mIyfzD!mK9@NLie3vyzl!ou3@e_&H^q2Jc@yz3IrHZK0-CSnw?&k9#2ioa zanPLrjpNN6JbF%Z^BD38T31nf9S8mi_W9hE?xxXrgM+^e_AW*q|03oanr|`aPrr95 zIDEBz{4?5DbVfVETSR}p=a8?Hp!q(}6%Jlm)*xyy4Xzs;(EtXF>nvL=)-sJ{|B_MNkIIW B1Uvu$ delta 1915 zcmV->2ZZ>fYou$iKQ4dc8TS4b*fSq3|GTKW$iYMXe|ARyb3przn*V7`>ke++W-au? zD4*^-Ao+FGk;iTGH5}V_@%go!Hs?UjpTNP${0sT~*LcpbxL0%aEf_1Di=A%wHjZ}( zF#tZ#1@9ef_jaxvcFwHi$l|tJ1@|mnuVc=}4XE1>k#F0{189HE8iAcp6Vq-F&uq@- zzXGx+qwVxZui!;E-Mt}N^PR=>M<91|biW_6{U{)$<4VzKgsc2kjqY{Vulq0qpVq zDd4+qcN67%jJba!0O0!H=6;Xy`%P^B17|E&LFWrL?%hP4@8G;mXIixXrvH_J_Acz& zIKp-X)6e$5iS#}&Igpj%LyYUU&>pYhTpi)~(pjy|;kz6smO<7`G1!=#8akF9-JM*= z@%qoOk8`5UL6$(y=7=txi`T)w(Ef&&c}soofL(8Nz~+|jce0oJAbWu4oV?%w zb$T9kx9#|v(6{oxiE_An$Va!a|9PZ$;N%;0ha@wS(cY|$aWsAfhv#d^QlUFv^V zf_GY*bxeOh_pSk$bG8_Ox|1!{>AK7Cspgc_+ zAHqUwJ$G-E_VnHa*>lr)8i;2X{et!%G(T;hH*kMkwEeb#?#9x6EK8GoD@K_juzQVk zH@AiMo*H_VZW-jROoaRkV9(W-9X%1Q67nr!K6wKqFK>eE+mIe#%RB& z$$nt*HIR?JyXoW8dRswzAv*#Siv*{hf3%)7-9LaXpD)rK3;mDwXlTD7a{Sf(E_Y43 zNY8)LrG0V2cZ=;B(4O}&p2~jK9%3wmoUds=`hI|s=11E5ivtYb$9{A!S4IqbPTK_S zi|#~4=!*r1e*x^7&?f5e0B!6Z+ROpgZ(_RwxMu;Ho}9lXAa~;^SD|)SfzHe9elqQk zb`ZCI*I4hEr+ts`JMF(-20H(<^z8nk*b#r-DKB6ws9=1#0CrtVyf<*&&<0u;cg?)D zYo4->ZezO*hj#_(S^B5>+C59#?>zF=?Op>qE3tdnbS6c6-seEh#%X@6n|j$7pgmo( z&m}|G`fmmKr2yU?@k?O$z-(OaI(s(OU-b_;>C84pItApH;QXQUi}N67--NGb>H&Z6 zVFI5?6i{wj^DP@b*3W70CBk+o*f_Zbc22J$y%hDf#qq?>FCE8cTNv-k_)O5=Hi7Of z$^CH2W#oR;CbmxkIxQy#bU0pE99yXG6mizT?x~#zxw}$DAEh%GJswxVy(i%AQ+3Vn zhxGF@(ArO85uLfY^_Q{zbq8nLi5Y)@{K!|95f9k~-GNNeN7^9wk7%ycwy_gn?jYV9 zICfne(=NW>0NP{ovFyM;=fM=Kmyj==XRPA*YMbf+tqE*A+yR^CHn0utdDykReP&o+ zz;@D))*zNH-L0d1xQ_M9h=XLHdjMMhzXHkUo2YY|lb5l79re0_eXR@@2hD$zbjDsn znlx|FefJw6>!A+V{6f=fVNC4g(4#wxzXH0Gc$!`Z`?tW}+6o(|ILx} zI@r9t12#VdhfWjiv4gf%0LdNYPKfBLfwUWruH8E*fc@!wrGsPCM1FPjTYGmy<{ACG zg*fZTqmFXj^4i(;*b3^ej{1MCqFw7XSO)%YZgxS=kZMS~26FbZ>&Tjz{#{)21O65a zfPSa73IKG+i}t#8{HAlUD$=J|)yD61hk#=2D$1(myN39*JvXsE-4&ypKtKOGJ}LL0 zdv&jYJu6&Cd2V5RTf?|T>!K@Y-*m@>booDk&K~9NNQCVv&#NN63hIBWiZT>fF4?oc z9PqJcs9pGo^8~Z++}l=-)2=n)~mk(S(D1z zRBVmzD;AI@=|t=DCfW$)Q!%#x4bc4xxyx6;q{{wA?Nj(Z6 B3lRVS diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java index 71b04314a8..8ffcd3daf1 100644 --- a/core/src/mindustry/ClientLauncher.java +++ b/core/src/mindustry/ClientLauncher.java @@ -149,7 +149,16 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform } mods.eachClass(Mod::init); finished = true; - Events.fire(new ClientLoadEvent()); + var event = new ClientLoadEvent(); + //a temporary measure for compatibility with certain mods + Events.fireWrap(event.getClass(), event, listener -> { + try{ + listener.get(event); + }catch(NoSuchFieldError | NoSuchMethodError error){ + Log.err(error); + } + + }); clientLoaded = true; super.resize(graphics.getWidth(), graphics.getHeight()); app.post(() -> app.post(() -> app.post(() -> app.post(() -> { diff --git a/gradle.properties b/gradle.properties index fae8458bb2..90e2aa9faa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,4 +10,4 @@ kapt.include.compile.classpath=false kotlin.stdlib.default.dependency=false #needed for android compilation android.useAndroidX=true -archash=41e8bb990244cd77c49e2b789bf9fc5374a711df +archash=db5cfe90d3eb516401d90c1c1556542de0f4676a