From 96c021eecc4a27162140068524810f9cc21f6822 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Fri, 30 Jun 2023 16:52:59 +0300 Subject: [PATCH] Move forge/OF installer stuff to a different package and fix deep nesting of if statements in the window handler --- .../forge_installer/forge_installer.jar | Bin 79617 -> 79680 bytes .../assets/components/forge_installer/version | 2 +- app_pojavlauncher/src/main/jni/stdio_is.c | 2 +- forge_installer/build.gradle | 2 +- .../Agent.java | 32 +++++++++++------- .../ComponentFilter.java | 2 +- .../ComponentTimeoutTask.java | 2 +- .../DialogFilter.java | 2 +- .../MainWindowFilter.java | 2 +- .../ProfileFixer.java | 2 +- 10 files changed, 27 insertions(+), 21 deletions(-) rename forge_installer/src/main/java/git/artdeell/{forgeinstaller => installer_agent}/Agent.java (87%) rename forge_installer/src/main/java/git/artdeell/{forgeinstaller => installer_agent}/ComponentFilter.java (73%) rename forge_installer/src/main/java/git/artdeell/{forgeinstaller => installer_agent}/ComponentTimeoutTask.java (84%) rename forge_installer/src/main/java/git/artdeell/{forgeinstaller => installer_agent}/DialogFilter.java (87%) rename forge_installer/src/main/java/git/artdeell/{forgeinstaller => installer_agent}/MainWindowFilter.java (89%) rename forge_installer/src/main/java/git/artdeell/{forgeinstaller => installer_agent}/ProfileFixer.java (98%) diff --git a/app_pojavlauncher/src/main/assets/components/forge_installer/forge_installer.jar b/app_pojavlauncher/src/main/assets/components/forge_installer/forge_installer.jar index c9c5045a24f857c2cba270627233216a03953a92..2e498a39b30888990bf7dfead827eb7da41efdb6 100644 GIT binary patch delta 7634 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 Bry2kN delta 7607 zcmai(2UHVV_qQ{lNR=W1>0Kc7getvP>4c8b2~~=8h;&2&F+f1+y-4pM2+|QEO^_l| zq>2=guJYk~|7&^QcinZrv!*0-_B=CZ_MTb$cXrnQ(94XEqwC}ix;J2l?@%EF7agBYF6ENsF2{O6)A7bY%MxNqe>qw=*S@()%{2~r z5FS(6foeZ0?N(x=(4h^F93y6aTAoL;~3xDdT1l+tWlvmV^FLAQ$i;2St%rO(t@;u_luT4iLd-MmD+pR^+81cbrYDqZfqmMwu>D-!BXyEC z%?DF%8nXtr#=6hj+s#ntQt%qTeB-hr?aV%2MSJkFv~HXBnM)7{izrkPCe~R>owO~C znl&!TU!=}azhQw#3U&c~BYuxJIWdC;s|&=vKOb zp1usDXRAnv%II}G%vh*oOEase?NcEWH&{cuB+ExPBZ~eY;Jw!*ZTd$QB9~zT?*(;^%LM@Uv!%g;=6fH%`-qtrc`pG3T@L zVkgBf3#l6gbS=_oF?!Y&E4M9myLF_S9btnREMuGZBrneIkIv#3eYb*&@N`TiFGBVG zVu;CAa==z9a`?qYCD>3NE#_Nb`+E7-)hZh?H!V7^ib>l=ve=(OxMIyNe7K>;X=bSt zl~C2HVY;b`re@ktMh~87 zDTehCs0Th^`o&PZY9Gri{uFGs|AU3NL#zm_ZkH560SPYpzFnUzU^r`@&{4-w&I40? z_Z{y(yNAI(6e7M#{YG+#F%~>!k}~C~POs6?^TfZ?5A`}UuUEmSRChg1*H*Rf~{%yAxp}*B7D= zE1Yf^)w4hJc%{+z;(+=MmTq2@cn{uk?LOCH@zPi5BCD3;(04)-!b4nK9HoJ|9n=nJYTqHk+1DQ7P5y?vDkuJ*sA&tCXsz( zhwFBC`zX(rrO!tAi7(XEg_!oK6%uEscohgp$rjs^Fgq#7Jrt>NpKiFswaGLn;lvp| z730_GUwEtpmE|d-)>oHm)^V5Lo5QeB=TMt|=o1+00Yy|BsW^MtdHv#(P3Q9xEDG{wJn;Ex`UxgF~+vEmIFhal!CGtJ_MoaoXk z%=sP7!7|~o#vx2x>4awm&m`PMlQa4fkB*2>^CJYyPGL+GrJ;mJR@tifN1J0*{PkN; zMFWYM3=be0EX~uXnT-LH+075rJQ+u#kh=ro>g}bg^sS9T%#~>h{IeR8MbM|#W-qHpSn+6H2RJVAEmA_o54El zhtRVTtnDxS{bnUIB$@6N7#+bOasz_t&A!}H3LdU)j9ICuKs||pk}aQ1!=7r~v`jlT zN!I%0hIpZGj9bgrfjgV24MeIVrPT9zoTO)2Ti;D1@f9q?rbp*w6Jlti10sB^9AC@Z zloYAN&NV8l>eRYpZ?UJ2@dbjP+k460dMQitP$t!M1cs#(g9Un1nTjx`zw+Vax=@8( z>zbgAWyiZjjbtZt1#2j|Yu1js1cV!m;JEret97WSK(LUHO3|fi%h4uRtm`3WUzM@m zD;w-;cA2X?sxNbSHaubptPsM#fg2y)z&r6ASB;}I_bxt~h0_gOzzNMSpJ83kW{BIf z$;)-@SgOpnIQZvfeny>wum5DmCLGTyFt3}3@AIXi;MHpJ8pW}kNps$JF0R|XJ#Zch zPZ>ee!X$3ZtgrYAAeE&&9Jd3V*3BK%!KV(V=cKgK)$0of;4H`6v}<|F-&pRI%$*q! zw)(ar&7UPb^7}|9a$(RXTg$=%RW4$qF1JlK<*VWQ#MF8wuH3M^D4W3B5Jowxy=$jK zx`C2G=`&{34(cyi3LEmW6-%b*M7;}lSX3PPeCa->A9&m-3RkljjM1?sc*D653HEvz zY-*AD8TklVmXdAI3q!o8Su0{g5M=rvmyJ+5!P30hy%d%(`}?E8(!?Qpi#cEYRn|wp zh<^&ht|su2V6 z|6~Z_jgy=Vw;Dj5OG1q7XIqS>S)E}h^X^>{KdtQe^s;}?Ii|+qwbR>Zxtb2DD!65r zRNmbhq5TJ{F85`vzV&gUdUIgYvMLXlI;*Q?!iSIBy!f`43d*UH7?nA`v!vj(h)|U? zqXvk!2wtn{V@-x6%Ck(qVukrIqpK1*I#oP9Z~MKLZ^nPoU0KmTU7OS5%6iqM>cMkh z9s^379D?}zaOPC#X{iawi+VP&TJLP%C*9kdu}SzEGFS`S_;GX!|7E+nnDBbV(^vMP zfOO<*!=$J@^4-Y~xw!`2a_iXTUSlecb`+n-5?i$4G4lYvd5BqXY1OfWSY63By7|FWc|?1JzT)SbXFv2y^N2o4SPRF1+Yg3S z??&%Y?2ilktq1%p;0^(Gba#90_%VA^pGH0s4u~AGtJ!W(viXFK-FI2KX}uw-{1zoG zW>m?&cBnYv%1`S>v2MqhLvtfrtA-Hs?RY^Q)6+uzWjyv4$r8-EON=erG5fZ~{cBDi z`{p~Msvj-PDdYbnzI6P;CbDFf86n-e^G>1dQ%q9P>SEzjwt z(93f!r#SzgXBlZ{utP0Y}tDP%5YZ{6NAmRC?}!nZ+Gc8V2`p8-IO7 zh`+{-tXb~@TxY%>lQj5}Mqs(AzEE_-wc=|Yhk3<5K{ew9V%aY5fzPPw@&=JE7UlFS zL;LB*8y`A6Md?@v?G!@-7+y5VLoM77a%!a+OU(HMWlf76-5;rfaEtPmR#yXTmAFsu zbUsh)`PAWjpdZpc?nCkkRk5G4%(Z&DWuN>Y|F+`%vB8*Z5Q;tC>jq%}Tx*ZN)W&*d z88N@nn8>ED{;S&q@|g1ZvSKB7qd$bqj>-P*Xk&T07K3z?I8iTh1Z_|5&_uRoo4wkU z{;u<|m-5#TiNn)AgIdd%%6%x{k8pryFCZ9?mY&A~oFI_nmGlt%cjbWb;sxkYsRnm+ z>4nKdZ@qA<`xx~UTZ-T-Te+*qaY-lXSM7lIP9c z=&MFj^y{9v5~Pt_|A|^0?Q@kV)Jjl>cIV5?!NIqm6K#0;tqV0|P0K#^nswLPKuBY- z>6;uT-+28eHmeGZ9t)@(v5C}D}$)D zkeSUqrTIfA(viKSeOe@;hHBlb3(}qZfG{1?R?!tan-G80BNGnVwv%p8Vpy)%qZ;Ga zZ-RVQrJ8=#i0HAsJlB1AJ74LVTS9P?^>T*~&L2-+sYrxdcc@3&l>_ z0Sc6!o65@i#7#g`Z5Ad~;>T)^{b|nr@-{(VMi;C=9{MFKlZ9=G#>F8v zJs^Rx|E4fCz8s2@Ao`u z#hkk!w|kPY!V*ji(*4Oc+}8W9ySz-%zw}QOano4qdDxN7H#4_g26}LN6cyVJR>L{w ze(8VGWMn*44;U0S3KL06xSkNV%IG2enYKKyL00_Oh@c4d1MaTKTJXWUDC)qU)8zI7 zdYH(T=H~P-TXEm&YIcg*yocTHn}*#&A5)SgUTr^!Mjlq>Yqpl*RNY<}<4Q+$M=$vc$#YJl^6eAN}5Q+7)(IR-G+mA1OG!; z8=Q9r$&A~f@X)?|6XR=?g^~K1#UotyQLBwyH3JP+h3OiPX;Zk@V{uc2mDIC^#3`Ez z2MC;Itd~Essy*$9-dOB;z*M>$@*?$)()ZT8S6C7AoQi42Jh zkg*rdiIvfU|3d0<2g+_vN|@n75e2f=6!XXp6L;=}b0|GkslpS!TVBoyil(uMdz zB~PdcNh#x2iy^J7NF!clwN{wzE_o^S|aAX6*%Ow zWEe|qgC>Oe47(BGoOsYP8M!9A*oZ8spN+o_zD_YiXav%=h%wOqdJD!w!dG?XR)Bp) z*Tk1lH!b={Egsj#A`F;!?|o*Y`Ut|1C~5d9yLI#v%&V9s?rqSG0~KK?vNgbOC^Ge+&Z`W-R>W1H#)P3YEXdx(;EdVI zJ3><8i$+V9=zimy5~}F_#wiAsVAEkvBkit~g{>RYk6uXFse0{VWIiiE!~&v{9_&7- zGtQ$IK_`phA^qClSkLr~>>LcQbLjA-8y%1{QJ39iFQw3 zDlwLZCRbcLzwXzJ+GE_5nD8pCN9EQB=PZO;_TBJq&hMy>46aL-D_TKH_xR|{#VExb zL)@p>-Py-mLxw3#OP71~09UbG2(wh&*2qT$4X67%|Rgu87A z+8YX88zZW{QMl9*7nQj7w0S8)O^ITdguFLVzPmUKhC}QVxQ9R$$nbn8_^$p zAM==;=F}joBFNpes=KO!!PG!uDG>tYsafMA_QLj|Jg&o6h1QVloX-V=%pMsB~GsWlRhETSX( zm~?o0o0uD`SC#2H=~FZHezR^$Cc5}jjq91DktklUfX zYpGUnMei7_m^IC_dSAPG@pZ+C_4TQs7<(KZvgDnhPSF|_(R|3AO;z}H;da$h$>I5q zNA6RfRH7KCK0V^u@k7old7IM?d#b-6SwxBlaP~?qVa3#4^qpEf4LUei-J&N`5c?`;&1(}et@wB~#L z<}?NWF6*7{nZbATlciMJmS(hX9)xthI3P}k8JotsRQ+07?@7A+Ti*LSTT*`NU72{5 zSfpJg7O?+LEXe=tk&cth;CC;Ae_m_|g4zT0 zyC`3Q!YJMjQcUagwh}Z7MegUK*x1zuJM>jsn{hqc7m4@d^t3c+mIKOB=}njVy~CY3 z5>9s>g7fOez77-57#Iuy@lgrUiwVxD`$4&u+>|t0We-kgZ{d`Ud?2iJp!AD^sSWq~ z%^A!MadgqyY}}2P2^OnUr4zqF{zHad>kYaI_O0jhOF?wirfXHooET*r7iH@DVg6o> zi?(ya<$y7|hK|(1_uO9+mDlzW8&;a$W}!QJF3igOu}+McjRJ8!D^5qsR>a>}q5;kE z>{SB#+s~r}UwmuZXtH6lwJ*hkYHKZ6vqAMIZ>z%|b~=5f9I!-;*hJcSsdn8OeiEW# zw6UW5MC*x#lnH@AE%xba;@?Sn-ky#~HwRT@07iiip!(17 z{`dX=Lkqn5ue9GE0|meY1LFsz!7+3gKmee_#Pb7Cj0Zo!fEnWl1i=^oIcx&7qzM2V zm{0+LALzwY2mr$1O;*gJ03ZrbV5kHEIq(n^&B#lGaT5fffDr~G2&jTH#nJoX5KKQD zAV+_YA-}5W{nZM?pJAAV05!0MJi1z*?k|IR+rJy6Vk(6I4Zs<5A_OP`;+WgQfH7c) zc`6L3gGB-`$-)3NW?vW(0UHGU{sX~C!2ls}NC$eXg99@Q1IRIXFn|uM(RFoz8Z-I3 zllAR?e$&GNN$}7JnsJmJ69@;OU_va~3d{QYCZK>B<^Xcs&4Kjvk4KL7v# diff --git a/app_pojavlauncher/src/main/assets/components/forge_installer/version b/app_pojavlauncher/src/main/assets/components/forge_installer/version index b8f0d6121..825b64780 100644 --- a/app_pojavlauncher/src/main/assets/components/forge_installer/version +++ b/app_pojavlauncher/src/main/assets/components/forge_installer/version @@ -1 +1 @@ -1688118307460 \ No newline at end of file +1688133008591 \ No newline at end of file diff --git a/app_pojavlauncher/src/main/jni/stdio_is.c b/app_pojavlauncher/src/main/jni/stdio_is.c index 5986ed4f6..496c7c8a5 100644 --- a/app_pojavlauncher/src/main/jni/stdio_is.c +++ b/app_pojavlauncher/src/main/jni/stdio_is.c @@ -85,7 +85,7 @@ Java_net_kdt_pojavlaunch_Logger_begin(JNIEnv *env, __attribute((unused)) jclass /* open latestlog.txt for writing */ const char* logFilePath = (*env)->GetStringUTFChars(env, logPath, NULL); - latestlog_fd = open(logFilePath, O_WRONLY | O_TRUNC | O_CREAT, 644); + latestlog_fd = open(logFilePath, O_WRONLY | O_TRUNC); if(latestlog_fd == -1) { latestlog_fd = 0; (*env)->ThrowNew(env, ioeClass, strerror(errno)); diff --git a/forge_installer/build.gradle b/forge_installer/build.gradle index d836fede3..63b38621d 100644 --- a/forge_installer/build.gradle +++ b/forge_installer/build.gradle @@ -19,7 +19,7 @@ jar { versionFile.write(String.valueOf(new Date().getTime())) manifest { attributes("Manifest-Version": "1.0", - "PreMain-Class": "git.artdeell.forgeinstaller.Agent") + "PreMain-Class": "git.artdeell.installer_agent.Agent") } destinationDirectory.set(file("../app_pojavlauncher/src/main/assets/components/forge_installer/")) } \ No newline at end of file diff --git a/forge_installer/src/main/java/git/artdeell/forgeinstaller/Agent.java b/forge_installer/src/main/java/git/artdeell/installer_agent/Agent.java similarity index 87% rename from forge_installer/src/main/java/git/artdeell/forgeinstaller/Agent.java rename to forge_installer/src/main/java/git/artdeell/installer_agent/Agent.java index cc2d82d63..dc2cf22c2 100644 --- a/forge_installer/src/main/java/git/artdeell/forgeinstaller/Agent.java +++ b/forge_installer/src/main/java/git/artdeell/installer_agent/Agent.java @@ -1,4 +1,4 @@ -package git.artdeell.forgeinstaller; +package git.artdeell.installer_agent; import java.awt.AWTEvent; import java.awt.Component; @@ -32,19 +32,25 @@ public class Agent implements AWTEventListener { public void eventDispatched(AWTEvent event) { WindowEvent windowEvent = (WindowEvent) event; Window window = windowEvent.getWindow(); - if(windowEvent.getID() == WindowEvent.WINDOW_OPENED) { - if(!forgeWindowHandled) { // false at startup, so we will handle the first window as the Forge one - forgeWindowHandled = handleMainWindow(window); - if(forgeWindowHandled) { - componentTimer.cancel(); - componentTimer.purge(); - }else{ - componentTimer.schedule(new ComponentTimeoutTask(), 30000); - } - }else if(window instanceof JDialog) { // expecting a new dialog - handleDialog(window); - } + if(windowEvent.getID() != WindowEvent.WINDOW_OPENED) return; + if(forgeWindowHandled && window instanceof JDialog) { // expecting a new dialog + handleDialog(window); + return; } + if(!forgeWindowHandled) { // false at startup, so we will handle the first window as the Forge one + forgeWindowHandled = handleMainWindow(window); + checkComponentTimer(); + } + } + + public void checkComponentTimer() { + if(forgeWindowHandled) { + componentTimer.cancel(); + componentTimer.purge(); + return; + } + componentTimer.schedule(new ComponentTimeoutTask(), 30000); + } public boolean handleMainWindow(Window window) { diff --git a/forge_installer/src/main/java/git/artdeell/forgeinstaller/ComponentFilter.java b/forge_installer/src/main/java/git/artdeell/installer_agent/ComponentFilter.java similarity index 73% rename from forge_installer/src/main/java/git/artdeell/forgeinstaller/ComponentFilter.java rename to forge_installer/src/main/java/git/artdeell/installer_agent/ComponentFilter.java index 352128b56..b4a9c7c89 100644 --- a/forge_installer/src/main/java/git/artdeell/forgeinstaller/ComponentFilter.java +++ b/forge_installer/src/main/java/git/artdeell/installer_agent/ComponentFilter.java @@ -1,4 +1,4 @@ -package git.artdeell.forgeinstaller; +package git.artdeell.installer_agent; import java.awt.*; diff --git a/forge_installer/src/main/java/git/artdeell/forgeinstaller/ComponentTimeoutTask.java b/forge_installer/src/main/java/git/artdeell/installer_agent/ComponentTimeoutTask.java similarity index 84% rename from forge_installer/src/main/java/git/artdeell/forgeinstaller/ComponentTimeoutTask.java rename to forge_installer/src/main/java/git/artdeell/installer_agent/ComponentTimeoutTask.java index a24c2ad89..dabc6b6be 100644 --- a/forge_installer/src/main/java/git/artdeell/forgeinstaller/ComponentTimeoutTask.java +++ b/forge_installer/src/main/java/git/artdeell/installer_agent/ComponentTimeoutTask.java @@ -1,4 +1,4 @@ -package git.artdeell.forgeinstaller; +package git.artdeell.installer_agent; import java.util.TimerTask; diff --git a/forge_installer/src/main/java/git/artdeell/forgeinstaller/DialogFilter.java b/forge_installer/src/main/java/git/artdeell/installer_agent/DialogFilter.java similarity index 87% rename from forge_installer/src/main/java/git/artdeell/forgeinstaller/DialogFilter.java rename to forge_installer/src/main/java/git/artdeell/installer_agent/DialogFilter.java index 8771b84a6..ca1d0031e 100644 --- a/forge_installer/src/main/java/git/artdeell/forgeinstaller/DialogFilter.java +++ b/forge_installer/src/main/java/git/artdeell/installer_agent/DialogFilter.java @@ -1,4 +1,4 @@ -package git.artdeell.forgeinstaller; +package git.artdeell.installer_agent; import javax.swing.*; import java.awt.*; diff --git a/forge_installer/src/main/java/git/artdeell/forgeinstaller/MainWindowFilter.java b/forge_installer/src/main/java/git/artdeell/installer_agent/MainWindowFilter.java similarity index 89% rename from forge_installer/src/main/java/git/artdeell/forgeinstaller/MainWindowFilter.java rename to forge_installer/src/main/java/git/artdeell/installer_agent/MainWindowFilter.java index 8f0921637..9039de568 100644 --- a/forge_installer/src/main/java/git/artdeell/forgeinstaller/MainWindowFilter.java +++ b/forge_installer/src/main/java/git/artdeell/installer_agent/MainWindowFilter.java @@ -1,4 +1,4 @@ -package git.artdeell.forgeinstaller; +package git.artdeell.installer_agent; import javax.swing.*; import java.awt.*; diff --git a/forge_installer/src/main/java/git/artdeell/forgeinstaller/ProfileFixer.java b/forge_installer/src/main/java/git/artdeell/installer_agent/ProfileFixer.java similarity index 98% rename from forge_installer/src/main/java/git/artdeell/forgeinstaller/ProfileFixer.java rename to forge_installer/src/main/java/git/artdeell/installer_agent/ProfileFixer.java index da0b1d4d1..da6e72967 100644 --- a/forge_installer/src/main/java/git/artdeell/forgeinstaller/ProfileFixer.java +++ b/forge_installer/src/main/java/git/artdeell/installer_agent/ProfileFixer.java @@ -1,4 +1,4 @@ -package git.artdeell.forgeinstaller; +package git.artdeell.installer_agent; import org.json.JSONException; import org.json.JSONObject;