From dc479a2f03a6409cd9caeda058b450d61c096b75 Mon Sep 17 00:00:00 2001 From: artdeell Date: Tue, 31 Aug 2021 18:00:38 +0300 Subject: [PATCH] Resolver changes - Modified ResConfHack to read resolv data from the Java property - Added auto-unpacking of premade resolv.conf and setting the Java property (Now SRV resolving should work on Java 17 by default) --- .../components/caciocavallo/ResConfHack.jar | Bin 11746 -> 12329 bytes app_pojavlauncher/src/main/assets/resolv.conf | 2 ++ .../kdt/pojavlaunch/PojavLoginActivity.java | 2 +- .../net/kdt/pojavlaunch/utils/JREUtils.java | 2 ++ 4 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 app_pojavlauncher/src/main/assets/resolv.conf diff --git a/app_pojavlauncher/src/main/assets/components/caciocavallo/ResConfHack.jar b/app_pojavlauncher/src/main/assets/components/caciocavallo/ResConfHack.jar index 05b93e0c9667b6fe00d81bb22d0034315beca4eb..1564aa64de2090601332050f5db59479d287290e 100644 GIT binary patch delta 3745 zcmb7H33OD|8UF4pc{49B3zKCsA&?1CmYFON5paUY7Pb(H1Pd{u4#@z)Fu}|aiCRZw zsi2_YAr-JhyBK#Nkx3-28yc(CDq7oWTNhla*47qV7YwA|eQyAdr|0xIIl1@0_x|_Z z@Bi=j|M%Uab@yG7T3uEn=iY4!yka-S+Mtu}uiCUSXY(D*F~(biAg< z2GrQ}hf|8W4_a@siXHkCrAqA5Z&7AaKBCMqX5V!07ZbY+96_6SKv!L3^ar)EDf^Lv z1IR=dvT;!VSPOIPEtjbun{#_v_q{39e~J1_QjS2wtH{7>$inM-vn$O0Q@W3=vRk@K zG9I;v4E?>VDfTSbMYcXNdotVg*>i?Sq=)*}_aDy!VZo{+_p z4m{<+(-PBRxy&<8qI^~s{VJZruN6G6!jBHw^MXYD8wD@gX%Jx3-%;?AiZc9G#mjg_ zsvMCZA16_ey(DPC9bdllto;}0t4qeHFFco}pF38pJYvFx@>u!&clV;0mpamV`sm5_8e&V05K|4>Wv;zv_jQ)@ih!3*Lh&vq4(}Sy^@f|H-bg4~2)Omj3*1WteBVKG zaX7e)AfnA)Mr#8L39O`^SOXgVfzLGj6FW5gOBTnlgZ|R+IsUETKlnn!m-tG<*Ep_k zA6B?}E56Y%fD;-{Vuyfw#sm$60-6xQA|UGczf==e*<-_v8ZO5b8ZN{FMc6fw#8KoJ zhBXDlD@vzD=mmL*6)i2zEgGtEktP)3&~Hul>6?c8a<>YnB2-Nz3r)jisMD|!n>1X4 zI{ohSF-c__+OdP8&!It=xZL{r7WZfkKR~U9^#mYNM5;ilvFF-oV^it;#z<5VX_`pK z3B57DSC3?6rmhG@t6Q4a5KNoENPS+x*`i#}_l})xZC)GwHu0)k8pF|=DBZcbJaHWI zG``g>psbNfO<{dXL3y^yrK>`bNN@!S?1(mVZew_bUgiB<-&jzrKU45^tdyYwrUq5| ziIOV)z&aNTQA39L$g!L~Na~CYe&SKAad^@T zI|koQh~;;2WblYb@yC%XwFaLxVxv0cF?ekI zc~WJViP=p0PO)9Iv$mmuCmBaE%c*c;2Ky>_ea*rs>Xk8B&LnGQqY`t;qB>Mz9l5iC z%-KxtY$tcx$(&9y=YA|kHhzhI}l~^T~W3>n)ELzbl+HjS)4lQB>B4RVviY;gr+tEhoR|_52B1G7C zAdO&?u^cOS`OJhhAFuVxJrIe!V<6@N7ay^S7wNkRux7%{`mM zHg+wf-gm*p!sErUd2 zS7;S=1=j$J>rMsh4Ftlh#2p!uJPsS-#DI&sFnSL%yD+8~zCB3pgP$=}^h6hmojdm; zvlk^(^VtYxV(iX4VLRaKLs_k_2j}!+{FAU8#JN7UCLF{>s&=FJ09Usf)bY`6z$UnH z6Y{YIg}k^*aWlr^Hk?OtOh;@lS+tKir^7g|Y(gyLN7V-Mi2h?~`cyi`28%m~<4nRV zX@c-@8-BZCWgjL z)s|9{j>v+|V8Jy57|w&v96%ncL`L311%5|RRUYzmE+YMyPVY?Nxn01Moq7<{?jF~))>sT|m4CLkuTADan?(j8_3 zqO{vcKo0CVO^?e7PX3BqrSTXl_CT?9!e;Hp=swIMRc3c%OeW?qru#6D?MlYV;xpXI zW-bIFr1OTzWl(#C3w}nWB&i)1ZK~kzQYu{*Z6t>35+1sV`tY?tK0dQ@GS$W(qs}6HY((^jG{djD~#Y=|hWZ mPCw=J)WhJ1+WMa4D7+wjbbOW#(!AnE-g3Gl!1%t{mh delta 3173 zcmbVOdw5jE75~jXa_`>Ugs^#T2uUCi$Zp<-DB)2E@~9AA31UQwfdmMIBqjl?t!y8H zS_KP(w7dir30NzEg(R|I5K64HMQQOtt%%T8P-}~|t!<(4H+L7p*MItb-S69(Gc#w- zoO6D^Id}HldtpxW^vQOI0qDTQ!xb~vMGw&@uwUcp+Ouv{MM6=OF|Mhms->nnr}Tl6 z^n!xi{M>^4b*&p6N?VQB6PdbNdba5DmOzJCBSgF$Z!eBkb8*$PmX$kz za)*2=Dm!q{{-|9%B1daw;&J(ec01+M+9YfDwGnSN1_tO=4zWWT?kxGDnIH8$qOc2b zXhi~EkeAJRuAOs-^q1BgSr^zHMg3#czbmR6CSF4dAkU(`^4?t;3i=H`?CIrIvEBK*xj zCe~?KZ@>nrVS|RJbZn$8{K$XoQ|Dp z@p;wk($H!!MyX@B>i6h)!SGY~i8|{=W%#EWUUJcay{c(5un+q+1Ply>R5J$*97MZ@ z4kvvD9P+$|P6JtZ*}x$LmC9k|{}Cm<}JCk|SPH`U;@iC<&2hEpbf zgEJ=H!rLa^!Mi5T;v)iq55VvdQ6_&tTWCjNlcCjO{)eMCQIq$ZS@xD&HY zjK>5GmrPv7d4Z%}V`H0nR!eO|{rIM)2A(((lQev6;uCx-pN#ZMndVJii9c!h%*3DZ z7ZbBE)5JINfQcEHDW8eSiYPR(3acr4brX-M7!qYcZsJfAWteVaIaZjsg3kq_tz(zB z)Yj!qscml2@K+OG;C*?2dMB^ki~(_S?EsG~9(cuwsA_Disjn8u;q>6xaI7N)^p=KD z_;PSYo@|bfl@%HP^k))vK!c&eq-3Zt*eB!bxB~){DcdjwZsn0B(|697TXF^07*+2$ zCQ0RtYmrkq zDQQRi7L25nOKB?#Db2B@p_JxYQfd$hj5pDp)DDk_-g(@~Y}(O}hd4N)BW3o(T2H(t z^D-0tOhEruIGGAZ8*}Os1)>P4ECF+v(Ty0)b_`rZtRJz;BvM(#s(?rp5vx0hRT+`G zlWirYq8igsN6Z??wpGOFQDXKKDzJ@+?WEQr;&gsOu~=kbiO9xMQGj~7Rws(lh#}XY5DXX2k7BdM5^KMr05JiE~ERehhML z*n+rD3?7rlK}{TnY}g9NK5r0NmEI0`JK;MD+d*V|Im$VRT&e~zXdjLG?H15pW)OG~ ziFgQUtb-ZwvtoY-`Gj#eR-+U@WGW<~-C*TDfgWb?b9q05XVM7wLMxFf9S+zMleo^R z!cQ9EaW#X;mLhw?)XP4RWZ@AS2GqM$6h8_C(cLQf+$d|#*dI8K@EYYU=KZMvm* z6Zc$K>O|4hoNmPASbJSQ_G*vihGK9jV%Tm+AMEAVx{Y7!PI&M#29b-|2*O{8!=&=7 zB={+k`wbHNEk^S;3HuIN^e*Fi&x+U^iXa?kACmY%s|a~W`EQXrswlV!7gaCcDS^6ntPvw+jv^v~-04ySolA{OzD-dhl)(sV^6E{-{mxK?LRX(i z5?5CrNM=-LC3`GvZ8~$L$gF#PDg8Sj{@Y-dWiUh+9X|-w7Z#((L-mEy6QTM-X^mB1 zbgT^l@2A;$^iKV<-I?texfzr2GPGLwmn^Sz_$u1Lf$5{jQR+sa0%Wpi# k<&p3}y|rahUT8%#!T