From 7a164dd1c7a3ba3badf262ec686133a784e6822e Mon Sep 17 00:00:00 2001 From: zaxar163 Date: Thu, 23 May 2019 21:07:40 +0300 Subject: [PATCH 01/16] =?UTF-8?q?[ANY]=20=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B8?= =?UTF-8?q?.=20[FIX]=20AdditionalHash=5Fmodule.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index b5995176..ab2f866a 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit b599517693c9d1c9a9045982ffa8068e1ed620c4 +Subproject commit ab2f866aa71b2cc6cdcf90836e91c222399c995d From aa1be6a23f1c72293a4e19e71e26b2a419276c60 Mon Sep 17 00:00:00 2001 From: Gravit Date: Fri, 24 May 2019 03:29:03 +0700 Subject: [PATCH 02/16] =?UTF-8?q?[FIX]=20=D0=98=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=D0=BF=D1=80=D0=B8=D0=B5=D0=BC=D0=B0=20ping=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=BF=D1=80=D0=BE=D1=81=D0=BE=D0=B2=20=D1=83=20=D0=BA?= =?UTF-8?q?=D0=BB=D0=B8=D0=B5=D0=BD=D1=82=D1=81=D0=BA=D0=BE=D0=B9=20=D1=87?= =?UTF-8?q?=D0=B0=D1=81=D1=82=D0=B8=20=D0=B2=D0=B5=D0=B1=D1=81=D0=BE=D0=BA?= =?UTF-8?q?=D0=B5=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../launcher/request/websockets/WebSocketClientHandler.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WebSocketClientHandler.java b/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WebSocketClientHandler.java index d9c27341..32ad7cf2 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WebSocketClientHandler.java +++ b/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WebSocketClientHandler.java @@ -66,6 +66,10 @@ protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Except LogHelper.dev("Message: %s", textFrame.text()); // uncomment to print request // logger.info(textFrame.text()); + } else if ((frame instanceof PingWebSocketFrame)) { + frame.content().retain(); + ctx.channel().writeAndFlush(new PongWebSocketFrame(frame.content())); + //return; } else if (frame instanceof PongWebSocketFrame) { } else if (frame instanceof CloseWebSocketFrame) ch.close(); From d0c59790bb0c5b1c140bba7d488ca2166daf0fda Mon Sep 17 00:00:00 2001 From: Gravit Date: Fri, 24 May 2019 04:04:11 +0700 Subject: [PATCH 03/16] =?UTF-8?q?[FIX]=20=D0=98=D0=B7=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=BC=D0=B5=D1=85=D0=B0=D0=BD=D0=B8=D0=B7=D0=BC?= =?UTF-8?q?=20schedule=20ping=20=D0=B7=D0=B0=D0=BF=D1=80=D0=BE=D1=81=D0=BE?= =?UTF-8?q?=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../launcher/request/websockets/WebSocketClientHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WebSocketClientHandler.java b/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WebSocketClientHandler.java index 32ad7cf2..c7042963 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WebSocketClientHandler.java +++ b/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WebSocketClientHandler.java @@ -32,9 +32,9 @@ public void handlerAdded(final ChannelHandlerContext ctx) throws Exception { public void channelActive(final ChannelHandlerContext ctx) throws Exception { handshaker.handshake(ctx.channel()); clientJSONPoint.onOpen(); - ctx.executor().schedule(() -> { + ctx.executor().scheduleWithFixedDelay(() -> { ctx.channel().writeAndFlush(new PingWebSocketFrame()); - }, 20L, TimeUnit.SECONDS); + }, 20L, 20L, TimeUnit.SECONDS); } @Override From 1f692330a7dfecaee07c415d218b9e06fb45867f Mon Sep 17 00:00:00 2001 From: zaxar163 Date: Fri, 24 May 2019 12:37:07 +0300 Subject: [PATCH 04/16] =?UTF-8?q?[ANY]=20=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B8?= =?UTF-8?q?.=20[FIX]=20=D0=9F=D0=BE=D0=BF=D1=8B=D1=82=D0=BA=D0=B0=20=D0=BF?= =?UTF-8?q?=D0=BE=D1=84=D0=B8=D0=BA=D1=81=D0=B8=D1=82=D1=8C=20JarSigner=5F?= =?UTF-8?q?module.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index ab2f866a..3bec47f6 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit ab2f866aa71b2cc6cdcf90836e91c222399c995d +Subproject commit 3bec47f61ceaf63f8c3de0bafc4a51224dfaddb1 From 07ba774ed90f1c629591cd35d1ec6ed5ae5451f8 Mon Sep 17 00:00:00 2001 From: Zaxar163 <35835496+Zaxar163@users.noreply.github.com> Date: Sat, 25 May 2019 19:40:14 +0300 Subject: [PATCH 05/16] =?UTF-8?q?[FIX]=20=D0=9E=D0=B2=D0=B5=D1=80=D0=BB?= =?UTF-8?q?=D0=B5=D0=B9=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F.=20(#271)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix update overlay * fix update overlay --- .../dialog/images/downloader/blured.jpg | Bin 6997 -> 7155 bytes .../dialog/overlay/processing/processing.css | 9 +- .../runtime/dialog/overlay/update/update.css | 2 +- Launcher/runtime/dialog/styles.css | 177 ++++++++++++------ 4 files changed, 128 insertions(+), 60 deletions(-) diff --git a/Launcher/runtime/dialog/images/downloader/blured.jpg b/Launcher/runtime/dialog/images/downloader/blured.jpg index b721d11c4001e5d0c34d4b360120a501399440d7..2b73931233c9689573a3b4a9fb6b083cbe9706df 100644 GIT binary patch literal 7155 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 literal 6997 zcmbVQ3sh5Ax;_aHd1-kB5U3BRiHQ;_=3uO^Mli@Dp(G&)NGp#LlZ?euOObdPgGH+m z6d?i$t;QsT1htilQ^Dd;i?&*Gg%GSd#c6GuQQGQE#mnflK+)>~v zqC`#JD=AFOgBYj6WIP6+SRh<)hysbVuqB3xf-p~F4Z07Wx`(gmuK+HzjQIccLPhDD zait}1&c);6<2cykzhFsNpnt%O0KdQ)(`N(+1%}LIM$QZin;HKceHL>WXXT0)I7_*_ zl>7|dnst2c(#+RH>oyc^ly6)mEUSF|)vfs@8;j8XH z`ApUVJYflU=?lw}*6@?prlh7xvZUGTa&q&EUoDYslq-~5-YkEsVr!-9?V6pt-r2oJ z)6l3r*woyj(;H3ZHcPwJ*74!Vu2X;d=yZ3_xljAgU-<0vi3 z2d@@QD=Z6%SzPTyOFVF-^Aq3aIO4yD7QHd(7d8+7hW-y^8e!T0&afT-FUuwko3iT$ z7T`ev=XnHSFJeF5HfoCfm~95Ch6z_56EkY^u(Uj;nZl=K{@z6urKj?|Xd;29u}Ooa zF^%eAO^93lx zgPsT~CPqVingr}b<}<-^1eGucrXp$L!Q4o|mqOLBV$4jKPHsqIcaNlD2$6>z z%@b6kQ_)Z~;bCGGj2Dn}A)^3EKf&vS*B4E3I_W-b7fCk`csgSz(1Bb@xL^s76hJxw zauO{eFk*%{Dm~RLT!aeA6cLPM`ZSRsaqwmzaz&ulO}xN!0y~lq67wLh<|(5IPDwv% z(C$Vx4!Ax)(FQa#jZNy{CJhS{@!1&c?G7#!0d8I=Zot)KOc2bFqlEt4a+pMGK!94@ z9w!wdK};JGCuH)p*exiYqmj`Nn?ww-)TES2`De!b%BE%WchbZIuu_aY0UPCo-@hga zKw3g!x}`)})9C`A$af+$WDJ*Z?B^++YMk#e)$0 zz#*9sP*RwDcUPlI2JH8di5Qs-DVGHyOb7z@_n4&f zw-O+5{8k2}^NB<nh zcCG26Ki39bwM#GmWOBn>D`B|8k_d3U4{EeD|`R0p+v6MmZcWGD+JS`Gz{g$Rn%?3rgIfy=XE z$KX;nM0e)eY8)Xc$~}SlB&awO6+R7FOV*ZUDyFeJLrusWm;yy%kkAZ?fIR?C^h93p z=hJC@c`T;E%S`Crts-z(fLpR;IY$Utq=u&kU`6#F2usotQ`Lu)BE;CyxWnmi_LU_> zB_x1c+KWnGICMm2CfIKJq;8R;QJ9d3syY->1(YRlXdv)LCAt7~+@0HIWB0ylx!K*$ zH8nsGK-7U~jOs8=8ex$qk`ubvG%fOsHek{irrCsJqEx+Lz{6_i;yS}LS?$o4WI4qt zL7#Gqs}^R=_6UQQu@R<=22=GM@RF<%2Szx_atwxR2B@xjy+T>2#LD2KP*uEgx!<>6 zI5&-*bDkT{X25NUt_xW5L zna?z=)(adVse13_xU3Z!c|Td9GvVq#DquS=E9JV`zUUO*8%`BETRURL9Aoc${>8@4 zT2(S%m+|#WJ&ol_E^(zc-*;TpW4O;+aS7|}sT*ErZ@aIk{zG}(Xa{|~y;2*12B+zg z9~Gb{_-E^!l(NCjzcS7vX`x9|s9rY=~uw+=P>59P+lN2%1;2hlpBl9TAn9%D2qQW{f0{ zz5|%3{by_yS<9^>DY3$y=JKSTI;Yp3k3>C2n5Xvt#X6FCw{3)%(_9|a!FHCK!x$rJ z)02AMjZ}9o!v7&+*|K%9c}eLh&i+N<(V5PYjuVOw($AP zu7e?8h_B_Gc-4CO>;tJ~+^XNMdMEnYY1z0XqIa}Wcu&CDHh4Mg`H0>-mhCFT#&HY& z@3DtFF6=pcv+<|d51L9>-m!dp^SyHyY^TR9t@~A%xU0rK-ExnAzIgpltH!F@Z+6)qKW zi%(xsy(b&*pt>G$r5kXSoSvn3{fP`|e->NYihP_)^oPN)Fo0Q281KlT!MV>RIoP}32@8~;MyFqO~k zTs6wgin3K?f;ZA(eR@xQPAfQQmb26ln-O{Fxb*ETtJCj%SHj}qt@fNe`L1Pp=V<4^(}* zpWhSvH~x^t+4}M}=iV*%a{SBhN$6kpdT_J1tG2e@>}>ek&9?Q2RdJl0^o;up6F>~N zwyTPsf2iHuk+@y;dh^OV5M$BGn$+~3mSaox3Vf%{Jj6KHC}iw_@HySR2GFcdh)7s- ztxP3+5CL`fb9w7!)8&ruZD;Q6KIIa*q%V(EYJG^i4U6|LZrS_ClG!C$_nG&Z)W7Q1 z>ZJd12_pIkibe=1J~)c91iS))#Jl*B_^uTkSswy3D4-~-9&w#0 z#C*pG33sVuy=^9?<+$X6)3^Cnf?|P|@qV&iYQ-xW>zN zrem?Q)f!uWD*30>o|X&h80~OG-utOpme3{igYQ8edg#S-<{UVGhwEH3R3SOB$9>A) zfL7e0TsgLLH0LwO81<*P<#@Dkk;A1I%4?!64t?4YFNWfpIYu4T(_CqeY1I^@%u9&5 zr0iW9nG_fM+10k(Uw>GUurxKL0>Aq0O>_9F2Tk<0`@;DAVQ_?Q{uR}Q+?S5$?AxI7 z-em5+Cw}MH=WRz>bTRcN5J9<9F$|0-aJ#eBwz~}fG+E(m$c`M2irf~t$1c4nFODo! z&K&Y>ePMX!x*wsJ*1>iK_7KYJ7;kLCQ8zixydKMS&C z)^c0Lx`^8(xy|JeY|RA!yVCXCto6WuFg(DAK{5)Jh}*RF)V=OO*)7206y{41dW?V8FJ(#lqiFF*H&E#(*IP_O8~L$myyaLYYw`cTDC zXGz_d1L9dYmNTu}zOG(oW{W!QVL`c$qdn3Kp&{%r#`*BP+T;0<;okgFsQIUPh4k%N zi9cu}sWI0q;pRroPQCG5Hw*MPV>DA?4rh#jLz$l(4}1rdvd9HR(w%1wzP@IQ3~K3Z zI|u5e#~xF8a$X~T?z=O#Pder*`W#fLQa2|wCt>Nzg#iQm1X6A5%@3RMv-Wa(xk<&HbELFsF^1d27?sFwnS30sVamg*Sy)ph)N5(H%cfXP@-1P(RKw3qI_{9YL zUe-vrr7p0|b_RMine|mvGAp4g`4y@q)at%6d3YEsrA_(q(et?sW0^ko zxmD7RV=o-{l_cbvTnBfTyuN^+wsoH+<<7O(=+*=AV~>$%>}tar57xrK(L{#|Xk(|LhTjin__oFrMO zKekuGv@9s4?C->y8HgIf0iTe6|JGdz9YHIB251n;j55=IV-R-FK=rTK~-a(BxYgUB|hz zl<)rR;2n5nqpRcOmW+cBJANECGAortCnJeqKx+c(R?izr)$a#o>~1V)jP5UID5@Ew zf+6Tp0)HHO35UKAyO8gsFZjfAK(Hoy0YC38Xhx|`4Yfm9OiT9R6nRik8Z}F+#i|w8 zOt`GY`$nR%8JDSNitDt$4C+1S=Dpk{t8-$lUQu3g&_Pi*(HuJt_cY=;YZ%KmACx#m z1u;QGHRW{navxsT-&x(z%=jrIriHQ+qQ(q<9KU006W$U@HTT5>J8PxZt4HdT<Z; zB|pV$Zo3rT{y^;#p{GMu?M2fWt3!xp>krSBT{q!h4eGJCNB6_++x8+f25Z zME60o zq8{DUclUVyfXBEv1e#5Q_fq>BiN3{AR6m`6KI7x8qC?Xc&GVjUxuX$71#EhRu^Rm* zNMM)SWy%+E9lRzuC{q+JsU3))`sOB-?BBJK`|%?-$};^yVRp7ndMCayMAT`jO1_ec z)hcQR>;iUHG&~A47rcne5Lndf%bIcQM}ixS80BU{C$C%y?NJhR^pG(m=oP^3)Dhox zCcGaSe)RARco@CHoP-nt>WWivQuQo#w+X+&q-;r6FzwWE^ky)za0nT3g9*L2{xupp z5k7%@_dOenQ*04JN&?=IHNN07I1Bs5;W80l`D=SLSd%6#@3IqK&UiF2ygR~q9G*XV zF=5Ej?w66u6zD7XZZ*~r%NI@IAc^WSb(a^@NBt#Q8xohWTgrB zy2usvm|z$G22>CA`2!0Z2>%KO!s!s12tr&cw6q-XN4Q%8>Unm?C@CrT3ltI>`NBj{ z+)Y#^AhFx1o|Q`eU`G5#jNUGZA24gtFLo0@4^O #description { + +#overlay>#description { -fx-font-size: 12pt; -fx-text-fill: #fff; -fx-wrap-text: true; } -#overlay > #description.error { - -fx-text-fill: red; +#overlay>#description.error { + -fx-text-fill: #CE5757; } + + /*-- DrLeonardo Design --*/ \ No newline at end of file diff --git a/Launcher/runtime/dialog/overlay/update/update.css b/Launcher/runtime/dialog/overlay/update/update.css index 4035391a..51324077 100644 --- a/Launcher/runtime/dialog/overlay/update/update.css +++ b/Launcher/runtime/dialog/overlay/update/update.css @@ -20,7 +20,7 @@ #overlay > #description.error { } .downloadPane { - -fx-background-color: rgba(0, 0, 0, 0.2); + -fx-background-color: rgba(0, 0, 0, 0.1); } /* Progress bar */ diff --git a/Launcher/runtime/dialog/styles.css b/Launcher/runtime/dialog/styles.css index d26cc8e4..f382a466 100644 --- a/Launcher/runtime/dialog/styles.css +++ b/Launcher/runtime/dialog/styles.css @@ -1,10 +1,15 @@ /*-- DrLeonardo Design --*/ -Button, CheckBox, ComboBox, RadioButton { - -fx-cursor: hand; + +Button, +CheckBox, +ComboBox, +RadioButton { + -fx-cursor: hand; } /* Backgrounds */ + #layout { -fx-background-color: transparent; -fx-background-size: cover; @@ -12,48 +17,61 @@ #layout { -fx-pref-height: 450px; -fx-background-image: url('images/background.jpg'); } + #background { -fx-background-color: #fff; } + + /** Labels **/ -#background > #settingsTitle { + +#background>#settingsTitle { -fx-font-size: 14pt; -fx-alignment: baseline-center; } -#serverLabel{ +#serverLabel { -fx-text-fill: #323232; } -#serverStatus{ +#serverStatus { -fx-text-fill: #323232; -fx-pref-width: 120px; -fx-pref-height: 25px; } + /* Mask */ + #mask { - -fx-effect: DropShadow( gaussian , rgba(255,255,255,0.5) , 0,0,0,1 ); + -fx-effect: DropShadow( gaussian, rgba(255, 255, 255, 0.5), 0, 0, 0, 1); } + /** Errors **/ -#errormessage{ + +#errormessage { -fx-background-color: transparent; -fx-text-alignment: center; -fx-text-fill: #CE5757; } -.error{ +.error { -fx-text-fill: #CE5757; } + /* bars */ + #bar { -fx-background-color: #323232; -fx-pref-width: 46px; -fx-pref-height: 450px; } + + /** buttons in bar **/ + #close { -fx-background-position: center; -jfx-button-type: FLAT; @@ -62,7 +80,12 @@ #close { -fx-pref-width: 46px; -fx-pref-height: 45px; } -#hide, #back, #goConsole, #settings, #discord { + +#hide, +#back, +#goConsole, +#settings, +#discord { -fx-background-position: center; -jfx-button-type: FLAT; -fx-background-radius: 0; @@ -70,21 +93,23 @@ #hide, #back, #goConsole, #settings, #discord { -fx-pref-height: 45px; } -#logout{ - -fx-text-fill:#323232; - -fx-font-size:12; - -fx-font-weight:normal; - -fx-border-color:#CE5757; - -fx-border-width:1; - -fx-background-color:transparent; - -fx-padding:0; +#logout { + -fx-text-fill: #323232; + -fx-font-size: 12; + -fx-font-weight: normal; + -fx-border-color: #CE5757; + -fx-border-width: 1; + -fx-background-color: transparent; + -fx-padding: 0; } + #logout:hover, -#logout:focus{ - -fx-text-fill:#ff6a5e; +#logout:focus { + -fx-text-fill: #ff6a5e; } -#logout:pressed{ - -fx-border-color:#cb4d43; + +#logout:pressed { + -fx-border-color: #cb4d43; } #send { @@ -97,9 +122,13 @@ #send { -fx-pref-height: 30px; } -#send:pressed { -fx-background-color: #d8d8d8; } +#send:pressed { + -fx-background-color: #d8d8d8; +} + /* LoginMenu */ + #authPane { -fx-background-color: rgba(255, 255, 255, 0.71); -fx-pref-width: 270px; @@ -113,7 +142,9 @@ #logo { -fx-pref-height: 32px; } + /** Buttons & textarea**/ + .auth { -jfx-button-type: FLAT; -fx-font-weight: bold; @@ -123,18 +154,22 @@ .auth { -fx-text-fill: #ffffff; -fx-pref-width: 200px; -fx-pref-height: 45px; - -fx-effect: dropshadow(gaussian, rgba(23, 25, 29, 0.3), 15,0,0,3); + -fx-effect: dropshadow(gaussian, rgba(23, 25, 29, 0.3), 15, 0, 0, 3); } -.auth:hover, .auth:pressed { -fx-background-color: #75e18c; } +.auth:hover, +.auth:pressed { + -fx-background-color: #75e18c; +} -#password, #login { +#password, +#login { -fx-background-radius: 0; -fx-pref-width: 200px; -fx-pref-height: 30px; } -.text-input{ +.text-input { -fx-focus-color: transparent; -fx-background-repeat: no-repeat; -fx-text-fill: #909090; @@ -145,7 +180,9 @@ .text-input{ -fx-font-weight: bold; } + /** Hyperlink **/ + #link { -fx-font-weight: bold; -fx-font-size: 7pt; @@ -155,21 +192,28 @@ #link { -fx-pref-height: 17px; } -#link:hover, #link:pressed { -fx-opacity: 0.8; } +#link:hover, +#link:pressed { + -fx-opacity: 0.8; +} + /** CheckBox & ComboBox**/ -#rememberchb{ + +#rememberchb { -fx-font-size: 13; -fx-text-fill: #909090; -fx-pref-width: 145px; -fx-pref-height: 30px; } + #combologin { -fx-text-fill: #909090; -fx-prompt-text-fill: #909090; -fx-pref-width: 200px; -fx-pref-height: 30px; } + .combologin, .combologin { -fx-font-size: 13px; @@ -187,7 +231,7 @@ .combologin .list-cell { .combologin-popup .list-view { -fx-background-color: white, white; -fx-background-insets: 0, 1; - -fx-effect: dropshadow( three-pass-box , rgba(0,0,0,0.6) , 8, 0.0 , 0 , 0 ); + -fx-effect: dropshadow( three-pass-box, rgba(0, 0, 0, 0.6), 8, 0.0, 0, 0); } .combologin .list-cell:filled:selected .text, @@ -200,40 +244,44 @@ .combologin .arrow { -fx-background-color: #5fd97a; } -.combologin-popup .list-view .list-cell -{ +.combologin-popup .list-view .list-cell { -fx-background-color: white; } -.combologin-popup .list-view .list-cell:filled:selected, .combologin-popup .list-view .list-cell:filled:selected:hover -{ +.combologin-popup .list-view .list-cell:filled:selected, +.combologin-popup .list-view .list-cell:filled:selected:hover { -fx-background: -fx-accent; -fx-background-color: -fx-selection-bar; -fx-text-fill: #909090; } -.combologin-popup .list-view .list-cell:filled:hover -{ +.combologin-popup .list-view .list-cell:filled:hover { -fx-background-color: white; -fx-text-fill: #909090; } + /** web**/ + #news { -fx-background-color: transparent; -fx-pref-width: 423px; -fx-pref-height: 450px; } + /* MenuPane */ + .serverentrance { -fx-background-color: rgba(255, 255, 255, 0.71); -fx-pref-width: 386px; -fx-pref-height: 450px; } + /** buttons **/ -.clientLaunch{ + +.clientLaunch { -jfx-button-type: FLAT; -fx-font-weight: bold; -fx-font-size: 16pt; @@ -241,17 +289,25 @@ .clientLaunch{ -fx-background-color: #5fd97a; -fx-text-fill: #ffffff; } -.clientSettings{ + +.clientSettings { -fx-background-position: center; -jfx-button-type: FLAT; -fx-background-color: #5fd97a; -fx-background-radius: 0; } -.clientLaunch:hover, .clientLaunch:pressed { -fx-background-color: #75e18c; } +.clientLaunch:hover, +.clientLaunch:pressed { + -fx-background-color: #75e18c; +} + /* Pressets options */ -.pressetLight, .pressetMedium, .pressetHigh { + +.pressetLight, +.pressetMedium, +.pressetHigh { -jfx-toggle-color: #5fd97a; -jfx-untoggle-color: #FAFAFA; -jfx-toggle-line-color: rgba(116, 192, 133, 0.79); @@ -260,7 +316,9 @@ .pressetLight, .pressetMedium, .pressetHigh { -jfx-disable-visual-focus: false; } + /* Scrolls */ + .scroll-pane { -fx-background-color: transparent; } @@ -298,12 +356,14 @@ .scroll-pane>.corner { -fx-background-color: rgba(0, 0, 0, 0.19); } + /* OptionsPane */ -#optionsPane > #modlist { + +#optionsPane>#modlist { -fx-background-color: transparent; } -#optionsPane > #modlist > .viewport { +#optionsPane>#modlist>.viewport { -fx-background-color: transparent; } @@ -332,39 +392,44 @@ .separator *.line { -fx-border-width: 0 0 10 0; } -#serverlist{ - -fx-background-color: transparent; -} -#serverlist > .viewport { +#serverlist { -fx-background-color: transparent; } -#serverdesc{ - -fx-background-color: transparent; -} -#serverdesc > .viewport { +#serverlist>.viewport { -fx-background-color: transparent; } -#serverinfo{ - -fx-background-color: transparent; -} -#serverinfo > .viewport { +#serverdesc { -fx-background-color: transparent; } -#servercontainer{ +#serverdesc>.viewport { + -fx-background-color: transparent; +} + +#serverinfo { + -fx-background-color: transparent; +} + +#serverinfo>.viewport { + -fx-background-color: transparent; +} + +#servercontainer { -fx-background-color: transparent; -jfx-button-type: FLAT; -fx-pref-width: 282px; -fx-pref-height: 75px; } -.toggle-button:disabled{ +.toggle-button:disabled { -fx-opacity: 1.0; } -.heading{ +.heading { -fx-text-fill: #555555; } + + /*-- DrLeonardo Design --*/ \ No newline at end of file From 30c34d4ce98edcc1c6103cc899b2cb4137377e68 Mon Sep 17 00:00:00 2001 From: Gravit Date: Sun, 26 May 2019 09:57:22 +0700 Subject: [PATCH 06/16] =?UTF-8?q?[FEATURE]=20=D0=A0=D0=B0=D1=81=D1=88?= =?UTF-8?q?=D0=B8=D1=80=D0=B5=D0=BD=D0=BD=D1=8B=D0=B5=20=D0=BD=D0=B0=D1=81?= =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8=20Launch4J?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/ru/gravit/launchserver/LaunchServer.java | 3 +++ .../ru/gravit/launchserver/binary/EXEL4JLauncherBinary.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java b/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java index bc13b9d1..07a9e14b 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java @@ -252,6 +252,8 @@ public void close() { public static class ExeConf { public boolean enabled; + public boolean setMaxVersion; + public String maxVersion; public String productName; public String productVer; public String fileDesc; @@ -705,6 +707,7 @@ private void generateConfigIfNotExists(boolean testEnv) throws IOException { newConfig.launch4j.txtProductVersion = "%s, build %d"; newConfig.launch4j.productName = "GravitLauncher"; newConfig.launch4j.productVer = newConfig.launch4j.fileVer; + newConfig.launch4j.maxVersion = "1.8.999"; newConfig.env = LauncherConfig.LauncherEnvironment.STD; newConfig.startScript = JVMHelper.OS_TYPE.equals(JVMHelper.OS.MUSTDIE) ? "." + File.separator + "start.bat" : "." + File.separator + "start.sh"; newConfig.hwidHandler = new AcceptHWIDHandler(); diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/EXEL4JLauncherBinary.java b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/EXEL4JLauncherBinary.java index ea0826ea..2f2142b7 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/EXEL4JLauncherBinary.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/EXEL4JLauncherBinary.java @@ -78,6 +78,8 @@ private void setConfig() { // Prepare JRE Jre jre = new Jre(); jre.setMinVersion("1.8.0"); + if(server.config.launch4j.setMaxVersion) + jre.setMaxVersion(server.config.launch4j.maxVersion); jre.setRuntimeBits(Jre.RUNTIME_BITS_64_AND_32); jre.setJdkPreference(Jre.JDK_PREFERENCE_PREFER_JRE); config.setJre(jre); From 0b8769b898c86aa3d20f8497613e2b71a0fb15ca Mon Sep 17 00:00:00 2001 From: zaxar163 Date: Sun, 26 May 2019 09:37:25 +0300 Subject: [PATCH 07/16] =?UTF-8?q?[ANY]=20=D0=9F=D0=B5=D1=80=D0=B5=D0=B8?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D0=B5=D0=BA=D1=82=20libLauncher=20->=20LauncherCore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LaunchServer/build.gradle | 1 - LauncherAPI/build.gradle | 2 +- {libLauncher => LauncherCore}/build.gradle | 0 .../src/main/java/ru/gravit/launcher/LauncherAPI.java | 0 .../src/main/java/ru/gravit/launcher/LauncherNetworkAPI.java | 0 .../src/main/java/ru/gravit/launcher/NeedGarbageCollection.java | 0 .../main/java/ru/gravit/launcher/hasher/FileNameMatcher.java | 0 .../src/main/java/ru/gravit/launcher/hasher/HashedDir.java | 0 .../src/main/java/ru/gravit/launcher/hasher/HashedEntry.java | 0 .../main/java/ru/gravit/launcher/hasher/HashedEntryAdapter.java | 0 .../src/main/java/ru/gravit/launcher/hasher/HashedFile.java | 0 .../main/java/ru/gravit/launcher/managers/GarbageManager.java | 0 .../src/main/java/ru/gravit/launcher/managers/GsonManager.java | 0 .../java/ru/gravit/launcher/managers/SimpleModuleManager.java | 0 .../ru/gravit/launcher/managers/SimpleModulesConfigManager.java | 0 .../src/main/java/ru/gravit/launcher/modules/Module.java | 0 .../src/main/java/ru/gravit/launcher/modules/ModuleContext.java | 0 .../java/ru/gravit/launcher/modules/ModulesConfigManager.java | 0 .../main/java/ru/gravit/launcher/modules/ModulesManager.java | 0 .../src/main/java/ru/gravit/launcher/serialize/HInput.java | 0 .../src/main/java/ru/gravit/launcher/serialize/HOutput.java | 0 .../main/java/ru/gravit/launcher/serialize/SerializeLimits.java | 0 .../ru/gravit/launcher/serialize/signed/DigestBytesHolder.java | 0 .../ru/gravit/launcher/serialize/signed/SignedBytesHolder.java | 0 .../ru/gravit/launcher/serialize/signed/SignedObjectHolder.java | 0 .../ru/gravit/launcher/serialize/stream/EnumSerializer.java | 0 .../java/ru/gravit/launcher/serialize/stream/StreamObject.java | 0 .../src/main/java/ru/gravit/launcher/ssl/LauncherKeyStore.java | 0 .../main/java/ru/gravit/launcher/ssl/LauncherSSLContext.java | 0 .../main/java/ru/gravit/launcher/ssl/LauncherTrustManager.java | 0 .../src/main/java/ru/gravit/utils/BiHookSet.java | 0 .../src/main/java/ru/gravit/utils/HTTPRequest.java | 0 .../src/main/java/ru/gravit/utils/HookException.java | 0 .../src/main/java/ru/gravit/utils/HookSet.java | 0 .../src/main/java/ru/gravit/utils/HttpDownloader.java | 0 .../src/main/java/ru/gravit/utils/ProviderMap.java | 0 .../src/main/java/ru/gravit/utils/PublicURLClassLoader.java | 0 .../src/main/java/ru/gravit/utils/UniversalJsonAdapter.java | 0 .../src/main/java/ru/gravit/utils/Version.java | 0 .../main/java/ru/gravit/utils/command/BaseCommandCategory.java | 0 .../src/main/java/ru/gravit/utils/command/Command.java | 0 .../src/main/java/ru/gravit/utils/command/CommandCategory.java | 0 .../src/main/java/ru/gravit/utils/command/CommandException.java | 0 .../src/main/java/ru/gravit/utils/command/CommandHandler.java | 0 .../main/java/ru/gravit/utils/command/JLineCommandHandler.java | 0 .../main/java/ru/gravit/utils/command/StdCommandHandler.java | 0 .../main/java/ru/gravit/utils/command/basic/ClearCommand.java | 0 .../main/java/ru/gravit/utils/command/basic/DebugCommand.java | 0 .../src/main/java/ru/gravit/utils/command/basic/GCCommand.java | 0 .../main/java/ru/gravit/utils/command/basic/HelpCommand.java | 0 .../src/main/java/ru/gravit/utils/event/EventHandler.java | 0 .../src/main/java/ru/gravit/utils/event/EventInterface.java | 0 .../src/main/java/ru/gravit/utils/event/EventManager.java | 0 .../src/main/java/ru/gravit/utils/helper/CommonHelper.java | 0 .../src/main/java/ru/gravit/utils/helper/EnvHelper.java | 0 .../src/main/java/ru/gravit/utils/helper/FormatHelper.java | 0 .../src/main/java/ru/gravit/utils/helper/IOHelper.java | 0 .../src/main/java/ru/gravit/utils/helper/JVMHelper.java | 0 .../src/main/java/ru/gravit/utils/helper/JarHelper.java | 0 .../src/main/java/ru/gravit/utils/helper/LogHelper.java | 0 .../src/main/java/ru/gravit/utils/helper/SecurityHelper.java | 0 .../src/main/java/ru/gravit/utils/helper/UnpackHelper.java | 0 .../src/main/java/ru/gravit/utils/helper/VerifyHelper.java | 0 settings.gradle | 2 +- 64 files changed, 2 insertions(+), 3 deletions(-) rename {libLauncher => LauncherCore}/build.gradle (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/launcher/LauncherAPI.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/launcher/LauncherNetworkAPI.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/launcher/NeedGarbageCollection.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/launcher/hasher/FileNameMatcher.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/launcher/hasher/HashedDir.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/launcher/hasher/HashedEntry.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/launcher/hasher/HashedEntryAdapter.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/launcher/hasher/HashedFile.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/launcher/managers/GarbageManager.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/launcher/managers/GsonManager.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/launcher/managers/SimpleModuleManager.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/launcher/managers/SimpleModulesConfigManager.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/launcher/modules/Module.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/launcher/modules/ModuleContext.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/launcher/modules/ModulesConfigManager.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/launcher/modules/ModulesManager.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/launcher/serialize/HInput.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/launcher/serialize/HOutput.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/launcher/serialize/SerializeLimits.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/launcher/serialize/signed/DigestBytesHolder.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/launcher/serialize/signed/SignedBytesHolder.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/launcher/serialize/signed/SignedObjectHolder.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/launcher/serialize/stream/EnumSerializer.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/launcher/serialize/stream/StreamObject.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/launcher/ssl/LauncherKeyStore.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/launcher/ssl/LauncherSSLContext.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/launcher/ssl/LauncherTrustManager.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/BiHookSet.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/HTTPRequest.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/HookException.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/HookSet.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/HttpDownloader.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/ProviderMap.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/PublicURLClassLoader.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/UniversalJsonAdapter.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/Version.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/command/BaseCommandCategory.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/command/Command.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/command/CommandCategory.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/command/CommandException.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/command/CommandHandler.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/command/JLineCommandHandler.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/command/StdCommandHandler.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/command/basic/ClearCommand.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/command/basic/DebugCommand.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/command/basic/GCCommand.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/command/basic/HelpCommand.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/event/EventHandler.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/event/EventInterface.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/event/EventManager.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/helper/CommonHelper.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/helper/EnvHelper.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/helper/FormatHelper.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/helper/IOHelper.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/helper/JVMHelper.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/helper/JarHelper.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/helper/LogHelper.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/helper/SecurityHelper.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/helper/UnpackHelper.java (100%) rename {libLauncher => LauncherCore}/src/main/java/ru/gravit/utils/helper/VerifyHelper.java (100%) diff --git a/LaunchServer/build.gradle b/LaunchServer/build.gradle index d090969f..fde96714 100644 --- a/LaunchServer/build.gradle +++ b/LaunchServer/build.gradle @@ -41,7 +41,6 @@ } dependencies { - pack project(':libLauncher') pack project(':LauncherAPI') bundle project(':Radon') bundle 'mysql:mysql-connector-java:8.0.16' diff --git a/LauncherAPI/build.gradle b/LauncherAPI/build.gradle index 1e733b39..305be8ce 100644 --- a/LauncherAPI/build.gradle +++ b/LauncherAPI/build.gradle @@ -2,7 +2,7 @@ targetCompatibility = '1.8' dependencies { - compile project(':libLauncher') + compile project(':LauncherCore') compileOnly 'org.apache.httpcomponents:httpclient:4.5.7' compileOnly 'io.netty:netty-all:4.1.36.Final' } diff --git a/libLauncher/build.gradle b/LauncherCore/build.gradle similarity index 100% rename from libLauncher/build.gradle rename to LauncherCore/build.gradle diff --git a/libLauncher/src/main/java/ru/gravit/launcher/LauncherAPI.java b/LauncherCore/src/main/java/ru/gravit/launcher/LauncherAPI.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/LauncherAPI.java rename to LauncherCore/src/main/java/ru/gravit/launcher/LauncherAPI.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/LauncherNetworkAPI.java b/LauncherCore/src/main/java/ru/gravit/launcher/LauncherNetworkAPI.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/LauncherNetworkAPI.java rename to LauncherCore/src/main/java/ru/gravit/launcher/LauncherNetworkAPI.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/NeedGarbageCollection.java b/LauncherCore/src/main/java/ru/gravit/launcher/NeedGarbageCollection.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/NeedGarbageCollection.java rename to LauncherCore/src/main/java/ru/gravit/launcher/NeedGarbageCollection.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/hasher/FileNameMatcher.java b/LauncherCore/src/main/java/ru/gravit/launcher/hasher/FileNameMatcher.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/hasher/FileNameMatcher.java rename to LauncherCore/src/main/java/ru/gravit/launcher/hasher/FileNameMatcher.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/hasher/HashedDir.java b/LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedDir.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/hasher/HashedDir.java rename to LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedDir.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/hasher/HashedEntry.java b/LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedEntry.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/hasher/HashedEntry.java rename to LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedEntry.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/hasher/HashedEntryAdapter.java b/LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedEntryAdapter.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/hasher/HashedEntryAdapter.java rename to LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedEntryAdapter.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/hasher/HashedFile.java b/LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedFile.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/hasher/HashedFile.java rename to LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedFile.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/managers/GarbageManager.java b/LauncherCore/src/main/java/ru/gravit/launcher/managers/GarbageManager.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/managers/GarbageManager.java rename to LauncherCore/src/main/java/ru/gravit/launcher/managers/GarbageManager.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/managers/GsonManager.java b/LauncherCore/src/main/java/ru/gravit/launcher/managers/GsonManager.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/managers/GsonManager.java rename to LauncherCore/src/main/java/ru/gravit/launcher/managers/GsonManager.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/managers/SimpleModuleManager.java b/LauncherCore/src/main/java/ru/gravit/launcher/managers/SimpleModuleManager.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/managers/SimpleModuleManager.java rename to LauncherCore/src/main/java/ru/gravit/launcher/managers/SimpleModuleManager.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/managers/SimpleModulesConfigManager.java b/LauncherCore/src/main/java/ru/gravit/launcher/managers/SimpleModulesConfigManager.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/managers/SimpleModulesConfigManager.java rename to LauncherCore/src/main/java/ru/gravit/launcher/managers/SimpleModulesConfigManager.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/modules/Module.java b/LauncherCore/src/main/java/ru/gravit/launcher/modules/Module.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/modules/Module.java rename to LauncherCore/src/main/java/ru/gravit/launcher/modules/Module.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/modules/ModuleContext.java b/LauncherCore/src/main/java/ru/gravit/launcher/modules/ModuleContext.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/modules/ModuleContext.java rename to LauncherCore/src/main/java/ru/gravit/launcher/modules/ModuleContext.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/modules/ModulesConfigManager.java b/LauncherCore/src/main/java/ru/gravit/launcher/modules/ModulesConfigManager.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/modules/ModulesConfigManager.java rename to LauncherCore/src/main/java/ru/gravit/launcher/modules/ModulesConfigManager.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/modules/ModulesManager.java b/LauncherCore/src/main/java/ru/gravit/launcher/modules/ModulesManager.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/modules/ModulesManager.java rename to LauncherCore/src/main/java/ru/gravit/launcher/modules/ModulesManager.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/serialize/HInput.java b/LauncherCore/src/main/java/ru/gravit/launcher/serialize/HInput.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/serialize/HInput.java rename to LauncherCore/src/main/java/ru/gravit/launcher/serialize/HInput.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/serialize/HOutput.java b/LauncherCore/src/main/java/ru/gravit/launcher/serialize/HOutput.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/serialize/HOutput.java rename to LauncherCore/src/main/java/ru/gravit/launcher/serialize/HOutput.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/serialize/SerializeLimits.java b/LauncherCore/src/main/java/ru/gravit/launcher/serialize/SerializeLimits.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/serialize/SerializeLimits.java rename to LauncherCore/src/main/java/ru/gravit/launcher/serialize/SerializeLimits.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/serialize/signed/DigestBytesHolder.java b/LauncherCore/src/main/java/ru/gravit/launcher/serialize/signed/DigestBytesHolder.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/serialize/signed/DigestBytesHolder.java rename to LauncherCore/src/main/java/ru/gravit/launcher/serialize/signed/DigestBytesHolder.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/serialize/signed/SignedBytesHolder.java b/LauncherCore/src/main/java/ru/gravit/launcher/serialize/signed/SignedBytesHolder.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/serialize/signed/SignedBytesHolder.java rename to LauncherCore/src/main/java/ru/gravit/launcher/serialize/signed/SignedBytesHolder.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/serialize/signed/SignedObjectHolder.java b/LauncherCore/src/main/java/ru/gravit/launcher/serialize/signed/SignedObjectHolder.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/serialize/signed/SignedObjectHolder.java rename to LauncherCore/src/main/java/ru/gravit/launcher/serialize/signed/SignedObjectHolder.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/serialize/stream/EnumSerializer.java b/LauncherCore/src/main/java/ru/gravit/launcher/serialize/stream/EnumSerializer.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/serialize/stream/EnumSerializer.java rename to LauncherCore/src/main/java/ru/gravit/launcher/serialize/stream/EnumSerializer.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/serialize/stream/StreamObject.java b/LauncherCore/src/main/java/ru/gravit/launcher/serialize/stream/StreamObject.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/serialize/stream/StreamObject.java rename to LauncherCore/src/main/java/ru/gravit/launcher/serialize/stream/StreamObject.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/ssl/LauncherKeyStore.java b/LauncherCore/src/main/java/ru/gravit/launcher/ssl/LauncherKeyStore.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/ssl/LauncherKeyStore.java rename to LauncherCore/src/main/java/ru/gravit/launcher/ssl/LauncherKeyStore.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/ssl/LauncherSSLContext.java b/LauncherCore/src/main/java/ru/gravit/launcher/ssl/LauncherSSLContext.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/ssl/LauncherSSLContext.java rename to LauncherCore/src/main/java/ru/gravit/launcher/ssl/LauncherSSLContext.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/ssl/LauncherTrustManager.java b/LauncherCore/src/main/java/ru/gravit/launcher/ssl/LauncherTrustManager.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/ssl/LauncherTrustManager.java rename to LauncherCore/src/main/java/ru/gravit/launcher/ssl/LauncherTrustManager.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/BiHookSet.java b/LauncherCore/src/main/java/ru/gravit/utils/BiHookSet.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/BiHookSet.java rename to LauncherCore/src/main/java/ru/gravit/utils/BiHookSet.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/HTTPRequest.java b/LauncherCore/src/main/java/ru/gravit/utils/HTTPRequest.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/HTTPRequest.java rename to LauncherCore/src/main/java/ru/gravit/utils/HTTPRequest.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/HookException.java b/LauncherCore/src/main/java/ru/gravit/utils/HookException.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/HookException.java rename to LauncherCore/src/main/java/ru/gravit/utils/HookException.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/HookSet.java b/LauncherCore/src/main/java/ru/gravit/utils/HookSet.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/HookSet.java rename to LauncherCore/src/main/java/ru/gravit/utils/HookSet.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/HttpDownloader.java b/LauncherCore/src/main/java/ru/gravit/utils/HttpDownloader.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/HttpDownloader.java rename to LauncherCore/src/main/java/ru/gravit/utils/HttpDownloader.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/ProviderMap.java b/LauncherCore/src/main/java/ru/gravit/utils/ProviderMap.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/ProviderMap.java rename to LauncherCore/src/main/java/ru/gravit/utils/ProviderMap.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/PublicURLClassLoader.java b/LauncherCore/src/main/java/ru/gravit/utils/PublicURLClassLoader.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/PublicURLClassLoader.java rename to LauncherCore/src/main/java/ru/gravit/utils/PublicURLClassLoader.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/UniversalJsonAdapter.java b/LauncherCore/src/main/java/ru/gravit/utils/UniversalJsonAdapter.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/UniversalJsonAdapter.java rename to LauncherCore/src/main/java/ru/gravit/utils/UniversalJsonAdapter.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/Version.java b/LauncherCore/src/main/java/ru/gravit/utils/Version.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/Version.java rename to LauncherCore/src/main/java/ru/gravit/utils/Version.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/command/BaseCommandCategory.java b/LauncherCore/src/main/java/ru/gravit/utils/command/BaseCommandCategory.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/command/BaseCommandCategory.java rename to LauncherCore/src/main/java/ru/gravit/utils/command/BaseCommandCategory.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/command/Command.java b/LauncherCore/src/main/java/ru/gravit/utils/command/Command.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/command/Command.java rename to LauncherCore/src/main/java/ru/gravit/utils/command/Command.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/command/CommandCategory.java b/LauncherCore/src/main/java/ru/gravit/utils/command/CommandCategory.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/command/CommandCategory.java rename to LauncherCore/src/main/java/ru/gravit/utils/command/CommandCategory.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/command/CommandException.java b/LauncherCore/src/main/java/ru/gravit/utils/command/CommandException.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/command/CommandException.java rename to LauncherCore/src/main/java/ru/gravit/utils/command/CommandException.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/command/CommandHandler.java b/LauncherCore/src/main/java/ru/gravit/utils/command/CommandHandler.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/command/CommandHandler.java rename to LauncherCore/src/main/java/ru/gravit/utils/command/CommandHandler.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/command/JLineCommandHandler.java b/LauncherCore/src/main/java/ru/gravit/utils/command/JLineCommandHandler.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/command/JLineCommandHandler.java rename to LauncherCore/src/main/java/ru/gravit/utils/command/JLineCommandHandler.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/command/StdCommandHandler.java b/LauncherCore/src/main/java/ru/gravit/utils/command/StdCommandHandler.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/command/StdCommandHandler.java rename to LauncherCore/src/main/java/ru/gravit/utils/command/StdCommandHandler.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/command/basic/ClearCommand.java b/LauncherCore/src/main/java/ru/gravit/utils/command/basic/ClearCommand.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/command/basic/ClearCommand.java rename to LauncherCore/src/main/java/ru/gravit/utils/command/basic/ClearCommand.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/command/basic/DebugCommand.java b/LauncherCore/src/main/java/ru/gravit/utils/command/basic/DebugCommand.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/command/basic/DebugCommand.java rename to LauncherCore/src/main/java/ru/gravit/utils/command/basic/DebugCommand.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/command/basic/GCCommand.java b/LauncherCore/src/main/java/ru/gravit/utils/command/basic/GCCommand.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/command/basic/GCCommand.java rename to LauncherCore/src/main/java/ru/gravit/utils/command/basic/GCCommand.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/command/basic/HelpCommand.java b/LauncherCore/src/main/java/ru/gravit/utils/command/basic/HelpCommand.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/command/basic/HelpCommand.java rename to LauncherCore/src/main/java/ru/gravit/utils/command/basic/HelpCommand.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/event/EventHandler.java b/LauncherCore/src/main/java/ru/gravit/utils/event/EventHandler.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/event/EventHandler.java rename to LauncherCore/src/main/java/ru/gravit/utils/event/EventHandler.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/event/EventInterface.java b/LauncherCore/src/main/java/ru/gravit/utils/event/EventInterface.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/event/EventInterface.java rename to LauncherCore/src/main/java/ru/gravit/utils/event/EventInterface.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/event/EventManager.java b/LauncherCore/src/main/java/ru/gravit/utils/event/EventManager.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/event/EventManager.java rename to LauncherCore/src/main/java/ru/gravit/utils/event/EventManager.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/helper/CommonHelper.java b/LauncherCore/src/main/java/ru/gravit/utils/helper/CommonHelper.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/helper/CommonHelper.java rename to LauncherCore/src/main/java/ru/gravit/utils/helper/CommonHelper.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/helper/EnvHelper.java b/LauncherCore/src/main/java/ru/gravit/utils/helper/EnvHelper.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/helper/EnvHelper.java rename to LauncherCore/src/main/java/ru/gravit/utils/helper/EnvHelper.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/helper/FormatHelper.java b/LauncherCore/src/main/java/ru/gravit/utils/helper/FormatHelper.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/helper/FormatHelper.java rename to LauncherCore/src/main/java/ru/gravit/utils/helper/FormatHelper.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/helper/IOHelper.java b/LauncherCore/src/main/java/ru/gravit/utils/helper/IOHelper.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/helper/IOHelper.java rename to LauncherCore/src/main/java/ru/gravit/utils/helper/IOHelper.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/helper/JVMHelper.java b/LauncherCore/src/main/java/ru/gravit/utils/helper/JVMHelper.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/helper/JVMHelper.java rename to LauncherCore/src/main/java/ru/gravit/utils/helper/JVMHelper.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/helper/JarHelper.java b/LauncherCore/src/main/java/ru/gravit/utils/helper/JarHelper.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/helper/JarHelper.java rename to LauncherCore/src/main/java/ru/gravit/utils/helper/JarHelper.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/helper/LogHelper.java b/LauncherCore/src/main/java/ru/gravit/utils/helper/LogHelper.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/helper/LogHelper.java rename to LauncherCore/src/main/java/ru/gravit/utils/helper/LogHelper.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/helper/SecurityHelper.java b/LauncherCore/src/main/java/ru/gravit/utils/helper/SecurityHelper.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/helper/SecurityHelper.java rename to LauncherCore/src/main/java/ru/gravit/utils/helper/SecurityHelper.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/helper/UnpackHelper.java b/LauncherCore/src/main/java/ru/gravit/utils/helper/UnpackHelper.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/helper/UnpackHelper.java rename to LauncherCore/src/main/java/ru/gravit/utils/helper/UnpackHelper.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/helper/VerifyHelper.java b/LauncherCore/src/main/java/ru/gravit/utils/helper/VerifyHelper.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/helper/VerifyHelper.java rename to LauncherCore/src/main/java/ru/gravit/utils/helper/VerifyHelper.java diff --git a/settings.gradle b/settings.gradle index 50775c2f..72971c4c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,7 +2,7 @@ include 'Launcher' include 'Radon' -include 'libLauncher' +include 'LauncherCore' include 'LauncherAPI' include 'LauncherAuthlib' include 'ServerWrapper' From 9af2a5b9230ce0565acd1e5402ed5a732d8d7ae6 Mon Sep 17 00:00:00 2001 From: zaxar163 Date: Sun, 26 May 2019 10:08:04 +0300 Subject: [PATCH 08/16] =?UTF-8?q?[FIX]=20=D0=91=D0=BE=D0=BB=D0=B5=D0=B5=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D1=8C=D0=BD=D0=BE=D0=B5=20?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D1=89=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=BE=D0=B2.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/gravit/launcher/client/LauncherUpdateController.java | 3 +-- .../main/java/ru/gravit/launcher/managers/ConsoleManager.java | 3 --- .../java/ru/gravit/launcher/managers/SimpleModuleManager.java | 0 .../gravit/launcher/managers/SimpleModulesConfigManager.java | 0 .../src/main/java/ru/gravit/launcher/modules/Module.java | 0 .../main/java/ru/gravit/launcher/modules/ModuleContext.java | 0 .../java/ru/gravit/launcher/modules/ModulesConfigManager.java | 0 .../main/java/ru/gravit/launcher/modules/ModulesManager.java | 0 .../gravit/launcher/request/websockets/WaitEventHandler.java | 1 - .../src/main/java/ru/gravit/launcher/ssl/LauncherKeyStore.java | 0 .../main/java/ru/gravit/launcher/ssl/LauncherSSLContext.java | 0 .../main/java/ru/gravit/launcher/ssl/LauncherTrustManager.java | 0 12 files changed, 1 insertion(+), 6 deletions(-) rename {LauncherCore => LauncherAPI}/src/main/java/ru/gravit/launcher/managers/SimpleModuleManager.java (100%) rename {LauncherCore => LauncherAPI}/src/main/java/ru/gravit/launcher/managers/SimpleModulesConfigManager.java (100%) rename {LauncherCore => LauncherAPI}/src/main/java/ru/gravit/launcher/modules/Module.java (100%) rename {LauncherCore => LauncherAPI}/src/main/java/ru/gravit/launcher/modules/ModuleContext.java (100%) rename {LauncherCore => LauncherAPI}/src/main/java/ru/gravit/launcher/modules/ModulesConfigManager.java (100%) rename {LauncherCore => LauncherAPI}/src/main/java/ru/gravit/launcher/modules/ModulesManager.java (100%) rename {LauncherCore => LauncherAPI}/src/main/java/ru/gravit/launcher/ssl/LauncherKeyStore.java (100%) rename {LauncherCore => LauncherAPI}/src/main/java/ru/gravit/launcher/ssl/LauncherSSLContext.java (100%) rename {LauncherCore => LauncherAPI}/src/main/java/ru/gravit/launcher/ssl/LauncherTrustManager.java (100%) diff --git a/Launcher/src/main/java/ru/gravit/launcher/client/LauncherUpdateController.java b/Launcher/src/main/java/ru/gravit/launcher/client/LauncherUpdateController.java index a5dc40d6..be328d52 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/client/LauncherUpdateController.java +++ b/Launcher/src/main/java/ru/gravit/launcher/client/LauncherUpdateController.java @@ -17,7 +17,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicReference; @@ -39,7 +38,7 @@ public void postDiff(UpdateRequest request, UpdateRequestEvent e, HashedDir.Diff { LogHelper.info("Enabled HStore feature. Find"); AtomicReference lastEn = new AtomicReference<>(null); - ArrayList removed = new ArrayList<>(); + //ArrayList removed = new ArrayList<>(); diff.mismatch.walk(File.separator, (path, name, entry) -> { if(entry.getType() == HashedEntry.Type.DIR) { Files.createDirectories(request.getDir().resolve(path)); diff --git a/Launcher/src/main/java/ru/gravit/launcher/managers/ConsoleManager.java b/Launcher/src/main/java/ru/gravit/launcher/managers/ConsoleManager.java index ac22db8d..864ab65a 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/managers/ConsoleManager.java +++ b/Launcher/src/main/java/ru/gravit/launcher/managers/ConsoleManager.java @@ -20,9 +20,6 @@ import ru.gravit.utils.helper.LogHelper; import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; public class ConsoleManager { public static CommandHandler handler; diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/managers/SimpleModuleManager.java b/LauncherAPI/src/main/java/ru/gravit/launcher/managers/SimpleModuleManager.java similarity index 100% rename from LauncherCore/src/main/java/ru/gravit/launcher/managers/SimpleModuleManager.java rename to LauncherAPI/src/main/java/ru/gravit/launcher/managers/SimpleModuleManager.java diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/managers/SimpleModulesConfigManager.java b/LauncherAPI/src/main/java/ru/gravit/launcher/managers/SimpleModulesConfigManager.java similarity index 100% rename from LauncherCore/src/main/java/ru/gravit/launcher/managers/SimpleModulesConfigManager.java rename to LauncherAPI/src/main/java/ru/gravit/launcher/managers/SimpleModulesConfigManager.java diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/modules/Module.java b/LauncherAPI/src/main/java/ru/gravit/launcher/modules/Module.java similarity index 100% rename from LauncherCore/src/main/java/ru/gravit/launcher/modules/Module.java rename to LauncherAPI/src/main/java/ru/gravit/launcher/modules/Module.java diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/modules/ModuleContext.java b/LauncherAPI/src/main/java/ru/gravit/launcher/modules/ModuleContext.java similarity index 100% rename from LauncherCore/src/main/java/ru/gravit/launcher/modules/ModuleContext.java rename to LauncherAPI/src/main/java/ru/gravit/launcher/modules/ModuleContext.java diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/modules/ModulesConfigManager.java b/LauncherAPI/src/main/java/ru/gravit/launcher/modules/ModulesConfigManager.java similarity index 100% rename from LauncherCore/src/main/java/ru/gravit/launcher/modules/ModulesConfigManager.java rename to LauncherAPI/src/main/java/ru/gravit/launcher/modules/ModulesConfigManager.java diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/modules/ModulesManager.java b/LauncherAPI/src/main/java/ru/gravit/launcher/modules/ModulesManager.java similarity index 100% rename from LauncherCore/src/main/java/ru/gravit/launcher/modules/ModulesManager.java rename to LauncherAPI/src/main/java/ru/gravit/launcher/modules/ModulesManager.java diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WaitEventHandler.java b/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WaitEventHandler.java index d319714d..e9a4fb03 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WaitEventHandler.java +++ b/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WaitEventHandler.java @@ -4,7 +4,6 @@ import ru.gravit.launcher.request.ResultInterface; import ru.gravit.utils.helper.LogHelper; -import java.util.HashSet; import java.util.Set; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/ssl/LauncherKeyStore.java b/LauncherAPI/src/main/java/ru/gravit/launcher/ssl/LauncherKeyStore.java similarity index 100% rename from LauncherCore/src/main/java/ru/gravit/launcher/ssl/LauncherKeyStore.java rename to LauncherAPI/src/main/java/ru/gravit/launcher/ssl/LauncherKeyStore.java diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/ssl/LauncherSSLContext.java b/LauncherAPI/src/main/java/ru/gravit/launcher/ssl/LauncherSSLContext.java similarity index 100% rename from LauncherCore/src/main/java/ru/gravit/launcher/ssl/LauncherSSLContext.java rename to LauncherAPI/src/main/java/ru/gravit/launcher/ssl/LauncherSSLContext.java diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/ssl/LauncherTrustManager.java b/LauncherAPI/src/main/java/ru/gravit/launcher/ssl/LauncherTrustManager.java similarity index 100% rename from LauncherCore/src/main/java/ru/gravit/launcher/ssl/LauncherTrustManager.java rename to LauncherAPI/src/main/java/ru/gravit/launcher/ssl/LauncherTrustManager.java From 5f7b0ca647986f18334a3b13e07485c0f0fe7af6 Mon Sep 17 00:00:00 2001 From: DrLeonardo Date: Mon, 27 May 2019 23:47:23 +0300 Subject: [PATCH 09/16] Fix #275 bug, added featureStore in settings overlay, fix download overlay --- .../dialog/overlay/processing/processing.css | 9 +- .../dialog/overlay/settings/settings.fxml | 60 +++--- .../dialog/overlay/settings/settings.js | 17 +- .../runtime/dialog/overlay/update/update.css | 2 +- .../dialog/scenes/options/options.fxml | 4 +- .../runtime/dialog/scenes/options/options.js | 6 +- Launcher/runtime/dialog/styles.css | 177 ++++++------------ 7 files changed, 100 insertions(+), 175 deletions(-) diff --git a/Launcher/runtime/dialog/overlay/processing/processing.css b/Launcher/runtime/dialog/overlay/processing/processing.css index c65c33dc..39c74e65 100644 --- a/Launcher/runtime/dialog/overlay/processing/processing.css +++ b/Launcher/runtime/dialog/overlay/processing/processing.css @@ -1,14 +1,11 @@ /*-- DrLeonardo Design --*/ - -#overlay>#description { +#overlay > #description { -fx-font-size: 12pt; -fx-text-fill: #fff; -fx-wrap-text: true; } -#overlay>#description.error { - -fx-text-fill: #CE5757; +#overlay > #description.error { + -fx-text-fill: red; } - - /*-- DrLeonardo Design --*/ \ No newline at end of file diff --git a/Launcher/runtime/dialog/overlay/settings/settings.fxml b/Launcher/runtime/dialog/overlay/settings/settings.fxml index bfd1ae16..90358a27 100644 --- a/Launcher/runtime/dialog/overlay/settings/settings.fxml +++ b/Launcher/runtime/dialog/overlay/settings/settings.fxml @@ -13,60 +13,44 @@ - + - - - - - - + + + + + + - + - - - - + + + + Выделение памяти: - + - + - + - - + + - + + + - - + + diff --git a/Launcher/runtime/dialog/overlay/settings/settings.js b/Launcher/runtime/dialog/overlay/settings/settings.js index 590dea8b..17090929 100644 --- a/Launcher/runtime/dialog/overlay/settings/settings.js +++ b/Launcher/runtime/dialog/overlay/settings/settings.js @@ -33,6 +33,11 @@ var settingsOverlay = { } }); + var featureStore = holder.lookup("#featureStore"); + featureStore.setSelected(settings.featureStore); + featureStore.selectedProperty()["addListener(javafx.beans.value.ChangeListener)"]( + function(o, ov, nv) settings.featureStore = nv); + var fullScreenBox = holder.lookup("#fullScreen"); fullScreenBox.setSelected(settings.fullScreen); fullScreenBox.selectedProperty()["addListener(javafx.beans.value.ChangeListener)"]( @@ -145,7 +150,7 @@ LogHelper.debug("Dir: %s", DirBridge.dir); var cliParams = { login: null, password: null, profile: -1, autoLogin: false, updatesDir: null, autoEnter: null, fullScreen: null, ram: -1, - offline: false, + offline: false, featureStore: null, init: function(params) { var named = params.getNamed(); @@ -167,6 +172,10 @@ var cliParams = { if (autoEnter !== null) { cliParams.autoEnter = java.lang.Boolean.parseBoolean(autoEnter); } + var featureStore = named.get("featureStore"); + if (featureStore !== null) { + cliParams.featureStore = java.lang.Boolean.parseBoolean(featureStore); + } var fullScreen = named.get("fullScreen"); if (fullScreen !== null) { cliParams.fullScreen = java.lang.Boolean.parseBoolean(fullScreen); @@ -175,7 +184,6 @@ var cliParams = { if (ram !== null) { cliParams.ram = java.lang.Integer.parseInt(ram); } - var offline = named.get("offline"); if (offline !== null) { cliParams.offline = java.lang.Boolean.parseBoolean(offline); @@ -192,19 +200,20 @@ var cliParams = { if (cliParams.profile >= 0) { settings.profile = cliParams.profile; } - if (cliParams.updatesDir !== null) { } if (cliParams.autoEnter !== null) { settings.autoLogin = cliParams.autoEnter; } + if (cliParams.featureStore !== null) { + settings.featureStore = cliParams.featureStore; + } if (cliParams.fullScreen !== null) { settings.fullScreen = cliParams.fullScreen; } if (cliParams.ram >= 0) { settingsOverlay.setRAM(cliParams.ram); } - if (cliParams.offline !== null) { settings.offline = cliParams.offline; } diff --git a/Launcher/runtime/dialog/overlay/update/update.css b/Launcher/runtime/dialog/overlay/update/update.css index 51324077..4035391a 100644 --- a/Launcher/runtime/dialog/overlay/update/update.css +++ b/Launcher/runtime/dialog/overlay/update/update.css @@ -20,7 +20,7 @@ #overlay > #description.error { } .downloadPane { - -fx-background-color: rgba(0, 0, 0, 0.1); + -fx-background-color: rgba(0, 0, 0, 0.2); } /* Progress bar */ diff --git a/Launcher/runtime/dialog/scenes/options/options.fxml b/Launcher/runtime/dialog/scenes/options/options.fxml index c0b42259..a0bb1ef0 100644 --- a/Launcher/runtime/dialog/scenes/options/options.fxml +++ b/Launcher/runtime/dialog/scenes/options/options.fxml @@ -18,9 +18,9 @@ - + - + diff --git a/Launcher/runtime/dialog/scenes/options/options.js b/Launcher/runtime/dialog/scenes/options/options.js index b5959ff7..a5020d7e 100644 --- a/Launcher/runtime/dialog/scenes/options/options.js +++ b/Launcher/runtime/dialog/scenes/options/options.js @@ -129,7 +129,7 @@ var options = { profile.unmarkOptional(modFile); LogHelper.debug("Unselected mod %s", modFile.name); } - options.update(); + //options.update(); }); checkBoxList.add(testMod); testMod.getStyleClass().add("modname"); @@ -137,11 +137,11 @@ var options = { textDescr = new javafx.scene.text.Text(modDescription); if(subLevel > 1) { for(var i = 1; i < subLevel; i++){ - textDescr.setWrappingWidth(630-(25*i)); + textDescr.setWrappingWidth(620-(25*i)); textDescr.setTranslateX(25+(25*i)); } } else { - textDescr.setWrappingWidth(630); + textDescr.setWrappingWidth(620); textDescr.setTranslateX(25); } textDescr.setTextAlignment(javafx.scene.text.TextAlignment.JUSTIFY); diff --git a/Launcher/runtime/dialog/styles.css b/Launcher/runtime/dialog/styles.css index f382a466..d26cc8e4 100644 --- a/Launcher/runtime/dialog/styles.css +++ b/Launcher/runtime/dialog/styles.css @@ -1,15 +1,10 @@ /*-- DrLeonardo Design --*/ - -Button, -CheckBox, -ComboBox, -RadioButton { - -fx-cursor: hand; +Button, CheckBox, ComboBox, RadioButton { + -fx-cursor: hand; } /* Backgrounds */ - #layout { -fx-background-color: transparent; -fx-background-size: cover; @@ -17,61 +12,48 @@ #layout { -fx-pref-height: 450px; -fx-background-image: url('images/background.jpg'); } - #background { -fx-background-color: #fff; } - - /** Labels **/ - -#background>#settingsTitle { +#background > #settingsTitle { -fx-font-size: 14pt; -fx-alignment: baseline-center; } -#serverLabel { +#serverLabel{ -fx-text-fill: #323232; } -#serverStatus { +#serverStatus{ -fx-text-fill: #323232; -fx-pref-width: 120px; -fx-pref-height: 25px; } - /* Mask */ - #mask { - -fx-effect: DropShadow( gaussian, rgba(255, 255, 255, 0.5), 0, 0, 0, 1); + -fx-effect: DropShadow( gaussian , rgba(255,255,255,0.5) , 0,0,0,1 ); } - /** Errors **/ - -#errormessage { +#errormessage{ -fx-background-color: transparent; -fx-text-alignment: center; -fx-text-fill: #CE5757; } -.error { +.error{ -fx-text-fill: #CE5757; } - /* bars */ - #bar { -fx-background-color: #323232; -fx-pref-width: 46px; -fx-pref-height: 450px; } - - /** buttons in bar **/ - #close { -fx-background-position: center; -jfx-button-type: FLAT; @@ -80,12 +62,7 @@ #close { -fx-pref-width: 46px; -fx-pref-height: 45px; } - -#hide, -#back, -#goConsole, -#settings, -#discord { +#hide, #back, #goConsole, #settings, #discord { -fx-background-position: center; -jfx-button-type: FLAT; -fx-background-radius: 0; @@ -93,23 +70,21 @@ #discord { -fx-pref-height: 45px; } -#logout { - -fx-text-fill: #323232; - -fx-font-size: 12; - -fx-font-weight: normal; - -fx-border-color: #CE5757; - -fx-border-width: 1; - -fx-background-color: transparent; - -fx-padding: 0; +#logout{ + -fx-text-fill:#323232; + -fx-font-size:12; + -fx-font-weight:normal; + -fx-border-color:#CE5757; + -fx-border-width:1; + -fx-background-color:transparent; + -fx-padding:0; } - #logout:hover, -#logout:focus { - -fx-text-fill: #ff6a5e; +#logout:focus{ + -fx-text-fill:#ff6a5e; } - -#logout:pressed { - -fx-border-color: #cb4d43; +#logout:pressed{ + -fx-border-color:#cb4d43; } #send { @@ -122,13 +97,9 @@ #send { -fx-pref-height: 30px; } -#send:pressed { - -fx-background-color: #d8d8d8; -} - +#send:pressed { -fx-background-color: #d8d8d8; } /* LoginMenu */ - #authPane { -fx-background-color: rgba(255, 255, 255, 0.71); -fx-pref-width: 270px; @@ -142,9 +113,7 @@ #logo { -fx-pref-height: 32px; } - /** Buttons & textarea**/ - .auth { -jfx-button-type: FLAT; -fx-font-weight: bold; @@ -154,22 +123,18 @@ .auth { -fx-text-fill: #ffffff; -fx-pref-width: 200px; -fx-pref-height: 45px; - -fx-effect: dropshadow(gaussian, rgba(23, 25, 29, 0.3), 15, 0, 0, 3); + -fx-effect: dropshadow(gaussian, rgba(23, 25, 29, 0.3), 15,0,0,3); } -.auth:hover, -.auth:pressed { - -fx-background-color: #75e18c; -} +.auth:hover, .auth:pressed { -fx-background-color: #75e18c; } -#password, -#login { +#password, #login { -fx-background-radius: 0; -fx-pref-width: 200px; -fx-pref-height: 30px; } -.text-input { +.text-input{ -fx-focus-color: transparent; -fx-background-repeat: no-repeat; -fx-text-fill: #909090; @@ -180,9 +145,7 @@ .text-input { -fx-font-weight: bold; } - /** Hyperlink **/ - #link { -fx-font-weight: bold; -fx-font-size: 7pt; @@ -192,28 +155,21 @@ #link { -fx-pref-height: 17px; } -#link:hover, -#link:pressed { - -fx-opacity: 0.8; -} - +#link:hover, #link:pressed { -fx-opacity: 0.8; } /** CheckBox & ComboBox**/ - -#rememberchb { +#rememberchb{ -fx-font-size: 13; -fx-text-fill: #909090; -fx-pref-width: 145px; -fx-pref-height: 30px; } - #combologin { -fx-text-fill: #909090; -fx-prompt-text-fill: #909090; -fx-pref-width: 200px; -fx-pref-height: 30px; } - .combologin, .combologin { -fx-font-size: 13px; @@ -231,7 +187,7 @@ .combologin .list-cell { .combologin-popup .list-view { -fx-background-color: white, white; -fx-background-insets: 0, 1; - -fx-effect: dropshadow( three-pass-box, rgba(0, 0, 0, 0.6), 8, 0.0, 0, 0); + -fx-effect: dropshadow( three-pass-box , rgba(0,0,0,0.6) , 8, 0.0 , 0 , 0 ); } .combologin .list-cell:filled:selected .text, @@ -244,44 +200,40 @@ .combologin .arrow { -fx-background-color: #5fd97a; } -.combologin-popup .list-view .list-cell { +.combologin-popup .list-view .list-cell +{ -fx-background-color: white; } -.combologin-popup .list-view .list-cell:filled:selected, -.combologin-popup .list-view .list-cell:filled:selected:hover { +.combologin-popup .list-view .list-cell:filled:selected, .combologin-popup .list-view .list-cell:filled:selected:hover +{ -fx-background: -fx-accent; -fx-background-color: -fx-selection-bar; -fx-text-fill: #909090; } -.combologin-popup .list-view .list-cell:filled:hover { +.combologin-popup .list-view .list-cell:filled:hover +{ -fx-background-color: white; -fx-text-fill: #909090; } - /** web**/ - #news { -fx-background-color: transparent; -fx-pref-width: 423px; -fx-pref-height: 450px; } - /* MenuPane */ - .serverentrance { -fx-background-color: rgba(255, 255, 255, 0.71); -fx-pref-width: 386px; -fx-pref-height: 450px; } - /** buttons **/ - -.clientLaunch { +.clientLaunch{ -jfx-button-type: FLAT; -fx-font-weight: bold; -fx-font-size: 16pt; @@ -289,25 +241,17 @@ .clientLaunch { -fx-background-color: #5fd97a; -fx-text-fill: #ffffff; } - -.clientSettings { +.clientSettings{ -fx-background-position: center; -jfx-button-type: FLAT; -fx-background-color: #5fd97a; -fx-background-radius: 0; } -.clientLaunch:hover, -.clientLaunch:pressed { - -fx-background-color: #75e18c; -} - +.clientLaunch:hover, .clientLaunch:pressed { -fx-background-color: #75e18c; } /* Pressets options */ - -.pressetLight, -.pressetMedium, -.pressetHigh { +.pressetLight, .pressetMedium, .pressetHigh { -jfx-toggle-color: #5fd97a; -jfx-untoggle-color: #FAFAFA; -jfx-toggle-line-color: rgba(116, 192, 133, 0.79); @@ -316,9 +260,7 @@ .pressetHigh { -jfx-disable-visual-focus: false; } - /* Scrolls */ - .scroll-pane { -fx-background-color: transparent; } @@ -356,14 +298,12 @@ .scroll-pane>.corner { -fx-background-color: rgba(0, 0, 0, 0.19); } - /* OptionsPane */ - -#optionsPane>#modlist { +#optionsPane > #modlist { -fx-background-color: transparent; } -#optionsPane>#modlist>.viewport { +#optionsPane > #modlist > .viewport { -fx-background-color: transparent; } @@ -392,44 +332,39 @@ .separator *.line { -fx-border-width: 0 0 10 0; } -#serverlist { +#serverlist{ + -fx-background-color: transparent; +} +#serverlist > .viewport { -fx-background-color: transparent; } -#serverlist>.viewport { +#serverdesc{ + -fx-background-color: transparent; +} +#serverdesc > .viewport { -fx-background-color: transparent; } -#serverdesc { +#serverinfo{ + -fx-background-color: transparent; +} +#serverinfo > .viewport { -fx-background-color: transparent; } -#serverdesc>.viewport { - -fx-background-color: transparent; -} - -#serverinfo { - -fx-background-color: transparent; -} - -#serverinfo>.viewport { - -fx-background-color: transparent; -} - -#servercontainer { +#servercontainer{ -fx-background-color: transparent; -jfx-button-type: FLAT; -fx-pref-width: 282px; -fx-pref-height: 75px; } -.toggle-button:disabled { +.toggle-button:disabled{ -fx-opacity: 1.0; } -.heading { +.heading{ -fx-text-fill: #555555; } - - /*-- DrLeonardo Design --*/ \ No newline at end of file From 2176221c8eba52f0527cb1c69188178f12784b3f Mon Sep 17 00:00:00 2001 From: Gravit Date: Wed, 29 May 2019 08:15:32 +0700 Subject: [PATCH 10/16] =?UTF-8?q?[FEATURE]=20=D0=A0=D0=B0=D1=81=D1=88?= =?UTF-8?q?=D0=B8=D1=80=D0=B5=D0=BD=D0=BD=D1=8B=D0=B9=20=D1=82=D0=B8=D0=BF?= =?UTF-8?q?=20=D0=B7=D0=B0=D1=89=D0=B8=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../launcher/bridge/GravitGuardBridge.java | 20 ++++ .../launcher/guard/LauncherGravitGuard.java | 96 +++++++++++++++++++ .../launcher/guard/LauncherGuardManager.java | 4 + 3 files changed, 120 insertions(+) create mode 100644 Launcher/src/main/java/ru/gravit/launcher/bridge/GravitGuardBridge.java create mode 100644 Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGravitGuard.java diff --git a/Launcher/src/main/java/ru/gravit/launcher/bridge/GravitGuardBridge.java b/Launcher/src/main/java/ru/gravit/launcher/bridge/GravitGuardBridge.java new file mode 100644 index 00000000..f3e266eb --- /dev/null +++ b/Launcher/src/main/java/ru/gravit/launcher/bridge/GravitGuardBridge.java @@ -0,0 +1,20 @@ +package ru.gravit.launcher.bridge; + +import ru.gravit.launcher.LauncherAPI; + +import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.URL; +@LauncherAPI +public class GravitGuardBridge { + @LauncherAPI + public static native void callGuard(); + @LauncherAPI + public static int sendHTTPRequest(String strurl) throws IOException { + URL url = new URL(strurl); + HttpURLConnection connection = (HttpURLConnection) url.openConnection(); + connection.setRequestMethod("GET"); + connection.setRequestProperty("Content-Language", "en-US"); + return connection.getResponseCode(); + } +} diff --git a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGravitGuard.java b/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGravitGuard.java new file mode 100644 index 00000000..a72e5b4a --- /dev/null +++ b/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGravitGuard.java @@ -0,0 +1,96 @@ +package ru.gravit.launcher.guard; + +import ru.gravit.launcher.Launcher; +import ru.gravit.launcher.LauncherConfig; +import ru.gravit.launcher.bridge.GravitGuardBridge; +import ru.gravit.launcher.client.ClientLauncher; +import ru.gravit.launcher.client.ClientLauncherContext; +import ru.gravit.launcher.client.DirBridge; +import ru.gravit.utils.helper.IOHelper; +import ru.gravit.utils.helper.JVMHelper; +import ru.gravit.utils.helper.UnpackHelper; + +import java.io.IOException; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Collections; +import java.util.Map; + +//Используется для всех типов защит, совместимых с новым GravitGuard API +public class LauncherGravitGuard implements LauncherGuardInterface { + public String protectToken; + public Path javaBinPath; + + @Override + public String getName() { + return "wrapper"; + } + + @Override + public Path getJavaBinPath() { + if (JVMHelper.OS_TYPE == JVMHelper.OS.MUSTDIE) { + String projectName = Launcher.getConfig().projectname; + String wrapperUnpackName = JVMHelper.JVM_BITS == 64 ? projectName.concat("64.exe") : projectName.concat("32.exe"); + return DirBridge.getGuardDir().resolve(wrapperUnpackName); + } else if(ClientLauncher.getJavaBinPath() != null) + { + javaBinPath = ClientLauncher.getJavaBinPath(); + String projectName = Launcher.getConfig().projectname; + String wrapperUnpackName = JVMHelper.JVM_BITS == 64 ? projectName.concat("64.exe") : projectName.concat("32.exe"); + return DirBridge.getGuardDir().resolve(wrapperUnpackName); + } + else + return IOHelper.resolveJavaBin(Paths.get(System.getProperty("java.home"))); + } + + @Override + public int getClientJVMBits() { + return JVMHelper.JVM_BITS; + } + + @Override + public void init(boolean clientInstance) { + try { + String wrapperName = JVMHelper.JVM_BITS == 64 ? "wrapper64.exe" : "wrapper32.exe"; + String projectName = Launcher.getConfig().projectname; + String wrapperUnpackName = JVMHelper.JVM_BITS == 64 ? projectName.concat("64.exe") : projectName.concat("32.exe"); + String antiInjectName = JVMHelper.JVM_BITS == 64 ? "AntiInject64.dll" : "AntiInject32.dll"; + UnpackHelper.unpack(Launcher.getResourceURL(wrapperName, "guard"), DirBridge.getGuardDir().resolve(wrapperUnpackName)); + UnpackHelper.unpack(Launcher.getResourceURL(antiInjectName, "guard"), DirBridge.getGuardDir().resolve(antiInjectName)); + } catch (IOException e) { + throw new SecurityException(e); + } + if(clientInstance) GravitGuardBridge.callGuard(); + } + + @Override + public void addCustomParams(ClientLauncherContext context) { + Collections.addAll(context.args, "-Djava.class.path=".concat(context.pathLauncher)); + } + + @Override + public void addCustomEnv(ClientLauncherContext context) { + Map env = context.builder.environment(); + if(javaBinPath == null) + env.put("JAVA_HOME", System.getProperty("java.home")); + else + env.put("JAVA_HOME", javaBinPath.toAbsolutePath().toString()); + LauncherConfig config = Launcher.getConfig(); + env.put("GUARD_BRIDGE", GravitGuardBridge.class.getName()); + env.put("GUARD_USERNAME", context.playerProfile.username); + env.put("GUARD_PUBLICKEY", config.publicKey.getModulus().toString(16)); + env.put("GUARD_PROJECTNAME", config.projectname); + if (protectToken != null) + env.put("GUARD_TOKEN", protectToken); + if (config.guardLicenseName != null) + env.put("GUARD_LICENSE_NAME", config.guardLicenseName); + if (config.guardLicenseKey != null) { + env.put("GUARD_LICENSE_KEY", config.guardLicenseKey); + } + } + + @Override + public void setProtectToken(String token) { + protectToken = token; + } +} diff --git a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGuardManager.java b/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGuardManager.java index e636dd0d..63a10397 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGuardManager.java +++ b/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGuardManager.java @@ -11,6 +11,10 @@ public class LauncherGuardManager { public static void initGuard(boolean clientInstance) { LauncherConfig config = Launcher.getConfig(); switch (config.guardType) { + case "gravitguard": { + guard = new LauncherGravitGuard(); + break; + } case "wrapper": { guard = new LauncherWrapperGuard(); break; From 377a4c921ff14e7aad3e63c26376b4b2fe5f9bb5 Mon Sep 17 00:00:00 2001 From: Gravit Date: Wed, 29 May 2019 08:22:37 +0700 Subject: [PATCH 11/16] =?UTF-8?q?[FIX]=20=D0=98=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=82=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BA=D0=B0=20=D0=B8=D1=81=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/websockets/StandartClientWebSocketService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/StandartClientWebSocketService.java b/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/StandartClientWebSocketService.java index a5372c44..bfdff933 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/StandartClientWebSocketService.java +++ b/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/StandartClientWebSocketService.java @@ -63,7 +63,7 @@ public ResultInterface get() throws InterruptedException, ExecutionException { } ResultInterface result = event.result; waitEventHandler.requests.remove(event); - if (event.result.getType().equals("error")) { + if (event.result.getType().equals("error") || event.result.getType().equals("exception")) { ErrorRequestEvent errorRequestEvent = (ErrorRequestEvent) event.result; throw new ExecutionException(new RequestException(errorRequestEvent.error)); } @@ -80,7 +80,7 @@ public ResultInterface get(long timeout, TimeUnit unit) throws InterruptedExcept } ResultInterface result = event.result; waitEventHandler.requests.remove(event); - if (event.result.getType().equals("error")) { + if (event.result.getType().equals("error") || event.result.getType().equals("exception")) { ErrorRequestEvent errorRequestEvent = (ErrorRequestEvent) event.result; throw new ExecutionException(new RequestException(errorRequestEvent.error)); } From bee6429bede3d39f8363ca1f1506c5b21cfb02d0 Mon Sep 17 00:00:00 2001 From: Gravit Date: Fri, 31 May 2019 05:38:07 +0700 Subject: [PATCH 12/16] =?UTF-8?q?[FIX]=20=D0=92=D0=B5=D1=80=D0=BD=D1=83?= =?UTF-8?q?=D0=BB=20=D0=BD=D0=B0=20=D0=BC=D0=B5=D1=81=D1=82=D0=BE=20option?= =?UTF-8?q?s.update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Launcher/runtime/dialog/scenes/options/options.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Launcher/runtime/dialog/scenes/options/options.js b/Launcher/runtime/dialog/scenes/options/options.js index a5020d7e..b7749643 100644 --- a/Launcher/runtime/dialog/scenes/options/options.js +++ b/Launcher/runtime/dialog/scenes/options/options.js @@ -129,7 +129,7 @@ var options = { profile.unmarkOptional(modFile); LogHelper.debug("Unselected mod %s", modFile.name); } - //options.update(); + options.update(); }); checkBoxList.add(testMod); testMod.getStyleClass().add("modname"); From 3ecc4c3bf194a296bb7ae9b1195ac151033381d6 Mon Sep 17 00:00:00 2001 From: Gravit Date: Fri, 31 May 2019 05:40:19 +0700 Subject: [PATCH 13/16] [ANY] IDEA Reformat code --- .../ru/gravit/launchserver/LaunchServer.java | 4 +- .../binary/EXEL4JLauncherBinary.java | 2 +- .../binary/JARLauncherBinary.java | 4 +- .../binary/tasks/MainBuildTask.java | 2 +- .../websocket/json/update/UpdateResponse.java | 3 +- .../launcher/bridge/GravitGuardBridge.java | 2 + .../client/LauncherUpdateController.java | 47 ++++++--------- .../launcher/console/FeatureCommand.java | 9 +-- .../console/store/CopyStoreDirCommand.java | 12 ++-- .../console/store/LinkStoreDirCommand.java | 12 ++-- .../console/store/StoreListCommand.java | 3 +- .../launcher/guard/LauncherGravitGuard.java | 10 ++-- .../launcher/managers/SettingsManager.java | 11 ++-- .../launcher/downloader/ListDownloader.java | 16 ++--- .../gravit/launcher/request/UpdateAction.java | 60 ------------------- .../request/update/UpdateRequest.java | 33 +++++----- .../ru/gravit/launcher/hasher/HashedDir.java | 19 +++--- .../ru/gravit/utils/helper/LogHelper.java | 3 +- 18 files changed, 79 insertions(+), 173 deletions(-) delete mode 100644 LauncherAPI/src/main/java/ru/gravit/launcher/request/UpdateAction.java diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java b/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java index 07a9e14b..e6f15e8d 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java @@ -265,8 +265,8 @@ public static class ExeConf { public String txtFileVersion; public String txtProductVersion; } - public static class NettyUpdatesBind - { + + public static class NettyUpdatesBind { public String url; public boolean zip; } diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/EXEL4JLauncherBinary.java b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/EXEL4JLauncherBinary.java index 2f2142b7..0b754461 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/EXEL4JLauncherBinary.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/EXEL4JLauncherBinary.java @@ -78,7 +78,7 @@ private void setConfig() { // Prepare JRE Jre jre = new Jre(); jre.setMinVersion("1.8.0"); - if(server.config.launch4j.setMaxVersion) + if (server.config.launch4j.setMaxVersion) jre.setMaxVersion(server.config.launch4j.maxVersion); jre.setRuntimeBits(Jre.RUNTIME_BITS_64_AND_32); jre.setJdkPreference(Jre.JDK_PREFERENCE_PREFER_JRE); diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/JARLauncherBinary.java b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/JARLauncherBinary.java index 5d2ee007..bf61117a 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/JARLauncherBinary.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/JARLauncherBinary.java @@ -42,11 +42,11 @@ public JARLauncherBinary(LaunchServer server) throws IOException { public void init() { tasks.add(new PrepareBuildTask(server)); tasks.add(new MainBuildTask(server)); - if(server.config.launcher.attachLibraryBeforeProGuard) tasks.add(new AttachJarsTask(server)); + if (server.config.launcher.attachLibraryBeforeProGuard) tasks.add(new AttachJarsTask(server)); tasks.add(new ProGuardBuildTask(server)); tasks.add(new AdditionalFixesApplyTask(server)); tasks.add(new RadonBuildTask(server)); - if(!server.config.launcher.attachLibraryBeforeProGuard) tasks.add(new AttachJarsTask(server)); + if (!server.config.launcher.attachLibraryBeforeProGuard) tasks.add(new AttachJarsTask(server)); } @Override diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/MainBuildTask.java b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/MainBuildTask.java index 255dfd59..90eb8e45 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/MainBuildTask.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/MainBuildTask.java @@ -137,7 +137,7 @@ public Path process(Path inputJar) throws IOException { jaConfigurator.setGuardType(server.config.launcher.guardType); jaConfigurator.setWarningMissArchJava(server.config.isWarningMissArchJava); jaConfigurator.setEnv(server.config.env); - if(server.runtime.oemUnlockKey == null) server.runtime.oemUnlockKey = SecurityHelper.randomStringToken(); + if (server.runtime.oemUnlockKey == null) server.runtime.oemUnlockKey = SecurityHelper.randomStringToken(); jaConfigurator.setOemUnlockKey(server.runtime.oemUnlockKey); server.buildHookManager.registerAllClientModuleClass(jaConfigurator); reader.getCp().add(new JarFile(inputJar.toFile())); diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/update/UpdateResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/update/UpdateResponse.java index b326f1c0..5e03c7ef 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/update/UpdateResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/update/UpdateResponse.java @@ -40,8 +40,7 @@ public void execute(ChannelHandlerContext ctx, Client client) { } String url = LaunchServer.server.config.netty.downloadURL.replace("%dirname%", dirName); boolean zip = false; - if (server.config.netty.bindings.get(dirName) != null) - { + if (server.config.netty.bindings.get(dirName) != null) { LaunchServer.NettyUpdatesBind bind = server.config.netty.bindings.get(dirName); url = bind.url; zip = bind.zip; diff --git a/Launcher/src/main/java/ru/gravit/launcher/bridge/GravitGuardBridge.java b/Launcher/src/main/java/ru/gravit/launcher/bridge/GravitGuardBridge.java index f3e266eb..cabe2cc6 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/bridge/GravitGuardBridge.java +++ b/Launcher/src/main/java/ru/gravit/launcher/bridge/GravitGuardBridge.java @@ -5,10 +5,12 @@ import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; + @LauncherAPI public class GravitGuardBridge { @LauncherAPI public static native void callGuard(); + @LauncherAPI public static int sendHTTPRequest(String strurl) throws IOException { URL url = new URL(strurl); diff --git a/Launcher/src/main/java/ru/gravit/launcher/client/LauncherUpdateController.java b/Launcher/src/main/java/ru/gravit/launcher/client/LauncherUpdateController.java index be328d52..73a57835 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/client/LauncherUpdateController.java +++ b/Launcher/src/main/java/ru/gravit/launcher/client/LauncherUpdateController.java @@ -33,47 +33,40 @@ public void preDiff(UpdateRequest request, UpdateRequestEvent e) { @Override public void postDiff(UpdateRequest request, UpdateRequestEvent e, HashedDir.Diff diff) throws IOException { - if(e.zip) return; - if(SettingsManager.settings.featureStore) - { + if (e.zip) return; + if (SettingsManager.settings.featureStore) { LogHelper.info("Enabled HStore feature. Find"); AtomicReference lastEn = new AtomicReference<>(null); //ArrayList removed = new ArrayList<>(); diff.mismatch.walk(File.separator, (path, name, entry) -> { - if(entry.getType() == HashedEntry.Type.DIR) { + if (entry.getType() == HashedEntry.Type.DIR) { Files.createDirectories(request.getDir().resolve(path)); return HashedDir.WalkAction.CONTINUE; } HashedFile file = (HashedFile) entry; //Первый экспериментальный способ - честно обходим все возможные Store Path ret = null; - if(lastEn.get() == null) - { - for(NewLauncherSettings.HashedStoreEntry en : SettingsManager.settings.lastHDirs) - { + if (lastEn.get() == null) { + for (NewLauncherSettings.HashedStoreEntry en : SettingsManager.settings.lastHDirs) { ret = tryFind(en, file); - if(ret != null) { + if (ret != null) { lastEn.set(en); break; } } - } - else { + } else { ret = tryFind(lastEn.get(), file); } - if(ret == null) - { - for(NewLauncherSettings.HashedStoreEntry en : SettingsManager.settings.lastHDirs) - { + if (ret == null) { + for (NewLauncherSettings.HashedStoreEntry en : SettingsManager.settings.lastHDirs) { ret = tryFind(en, file); - if(ret != null) { + if (ret != null) { lastEn.set(en); break; } } } - if(ret != null) - { + if (ret != null) { //Еще раз проверим корректность хеша //Возможно эта проверка избыточна //if(file.isSame(ret, true)) @@ -82,8 +75,7 @@ public void postDiff(UpdateRequest request, UpdateRequestEvent e, HashedDir.Diff LogHelper.debug("Copy file %s to %s", ret.toAbsolutePath().toString(), source.toAbsolutePath().toString()); //Let's go! Files.copy(ret, source); - try(InputStream input = IOHelper.newInput(ret)) - { + try (InputStream input = IOHelper.newInput(ret)) { IOHelper.transfer(input, source); } entry.flag = true; @@ -94,25 +86,22 @@ public void postDiff(UpdateRequest request, UpdateRequestEvent e, HashedDir.Diff }); } } - public Path tryFind(NewLauncherSettings.HashedStoreEntry en, HashedFile file) throws IOException - { + + public Path tryFind(NewLauncherSettings.HashedStoreEntry en, HashedFile file) throws IOException { AtomicReference ret = new AtomicReference<>(null); en.hdir.walk(File.separator, (path, name, entry) -> { - if(entry.getType() == HashedEntry.Type.DIR) return HashedDir.WalkAction.CONTINUE; + if (entry.getType() == HashedEntry.Type.DIR) return HashedDir.WalkAction.CONTINUE; HashedFile tfile = (HashedFile) entry; - if(tfile.isSame(file)) - { + if (tfile.isSame(file)) { LogHelper.dev("[DIR:%s] Found file %s in %s", en.name, name, path); Path tdir = Paths.get(en.fullPath).resolve(path); try { - if(tfile.isSame(tdir, true)) - { + if (tfile.isSame(tdir, true)) { LogHelper.dev("[DIR:%s] Confirmed file %s in %s", en.name, name, path); ret.set(tdir); return HashedDir.WalkAction.STOP; } - } catch (IOException e) - { + } catch (IOException e) { LogHelper.error("Check file error %s %s", e.getClass().getName(), e.getMessage()); } } diff --git a/Launcher/src/main/java/ru/gravit/launcher/console/FeatureCommand.java b/Launcher/src/main/java/ru/gravit/launcher/console/FeatureCommand.java index 07f9ffc8..79dd2b3c 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/console/FeatureCommand.java +++ b/Launcher/src/main/java/ru/gravit/launcher/console/FeatureCommand.java @@ -19,15 +19,12 @@ public String getUsageDescription() { public void invoke(String... args) throws Exception { verifyArgs(args, 2); boolean enabled = Boolean.valueOf(args[1]); - switch (args[0]) - { - case "store": - { + switch (args[0]) { + case "store": { SettingsManager.settings.featureStore = enabled; break; } - default: - { + default: { LogHelper.info("Features: [store]"); return; } diff --git a/Launcher/src/main/java/ru/gravit/launcher/console/store/CopyStoreDirCommand.java b/Launcher/src/main/java/ru/gravit/launcher/console/store/CopyStoreDirCommand.java index 9731dba5..4b966ca5 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/console/store/CopyStoreDirCommand.java +++ b/Launcher/src/main/java/ru/gravit/launcher/console/store/CopyStoreDirCommand.java @@ -26,20 +26,16 @@ public void invoke(String... args) throws Exception { int ind = 1; int index = Integer.valueOf(args[0]); boolean overwrite = Boolean.valueOf(args[1]); - for(NewLauncherSettings.HashedStoreEntry e : SettingsManager.settings.lastHDirs) - { - if(ind == index) - { + for (NewLauncherSettings.HashedStoreEntry e : SettingsManager.settings.lastHDirs) { + if (ind == index) { LogHelper.info("Copy [%d] FullPath: %s name: %s", ind, e.fullPath, e.name); Path path = Paths.get(e.fullPath); - if(!Files.isDirectory(path)) - { + if (!Files.isDirectory(path)) { LogHelper.error("Directory %s not found", path.toAbsolutePath().toString()); return; } Path target = Paths.get(SettingsManager.settings.updatesDirPath).resolve(e.name); - if(Files.exists(target) && !overwrite) - { + if (Files.exists(target) && !overwrite) { LogHelper.error("Directory %s found, flag overwrite not found", target.toAbsolutePath().toString()); return; } diff --git a/Launcher/src/main/java/ru/gravit/launcher/console/store/LinkStoreDirCommand.java b/Launcher/src/main/java/ru/gravit/launcher/console/store/LinkStoreDirCommand.java index a107e6d3..712a04a1 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/console/store/LinkStoreDirCommand.java +++ b/Launcher/src/main/java/ru/gravit/launcher/console/store/LinkStoreDirCommand.java @@ -26,20 +26,16 @@ public void invoke(String... args) throws Exception { verifyArgs(args, 1); int ind = 1; int index = Integer.valueOf(args[0]); - for(NewLauncherSettings.HashedStoreEntry e : SettingsManager.settings.lastHDirs) - { - if(ind == index) - { + for (NewLauncherSettings.HashedStoreEntry e : SettingsManager.settings.lastHDirs) { + if (ind == index) { LogHelper.info("Copy [%d] FullPath: %s name: %s", ind, e.fullPath, e.name); Path path = Paths.get(e.fullPath); - if(!Files.isDirectory(path)) - { + if (!Files.isDirectory(path)) { LogHelper.error("Directory %s not found", path.toAbsolutePath().toString()); return; } Path target = Paths.get(SettingsManager.settings.updatesDirPath).resolve(e.name); - if(Files.exists(target)) - { + if (Files.exists(target)) { LogHelper.error("Directory %s already exists", target.toAbsolutePath().toString()); return; } diff --git a/Launcher/src/main/java/ru/gravit/launcher/console/store/StoreListCommand.java b/Launcher/src/main/java/ru/gravit/launcher/console/store/StoreListCommand.java index 14a68524..0770d172 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/console/store/StoreListCommand.java +++ b/Launcher/src/main/java/ru/gravit/launcher/console/store/StoreListCommand.java @@ -19,8 +19,7 @@ public String getUsageDescription() { @Override public void invoke(String... args) throws Exception { int ind = 1; - for(NewLauncherSettings.HashedStoreEntry e : SettingsManager.settings.lastHDirs) - { + for (NewLauncherSettings.HashedStoreEntry e : SettingsManager.settings.lastHDirs) { LogHelper.info("[%d] FullPath: %s name: %s", ind, e.fullPath, e.name); ind++; } diff --git a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGravitGuard.java b/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGravitGuard.java index a72e5b4a..de9bd32f 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGravitGuard.java +++ b/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGravitGuard.java @@ -32,14 +32,12 @@ public Path getJavaBinPath() { String projectName = Launcher.getConfig().projectname; String wrapperUnpackName = JVMHelper.JVM_BITS == 64 ? projectName.concat("64.exe") : projectName.concat("32.exe"); return DirBridge.getGuardDir().resolve(wrapperUnpackName); - } else if(ClientLauncher.getJavaBinPath() != null) - { + } else if (ClientLauncher.getJavaBinPath() != null) { javaBinPath = ClientLauncher.getJavaBinPath(); String projectName = Launcher.getConfig().projectname; String wrapperUnpackName = JVMHelper.JVM_BITS == 64 ? projectName.concat("64.exe") : projectName.concat("32.exe"); return DirBridge.getGuardDir().resolve(wrapperUnpackName); - } - else + } else return IOHelper.resolveJavaBin(Paths.get(System.getProperty("java.home"))); } @@ -60,7 +58,7 @@ public void init(boolean clientInstance) { } catch (IOException e) { throw new SecurityException(e); } - if(clientInstance) GravitGuardBridge.callGuard(); + if (clientInstance) GravitGuardBridge.callGuard(); } @Override @@ -71,7 +69,7 @@ public void addCustomParams(ClientLauncherContext context) { @Override public void addCustomEnv(ClientLauncherContext context) { Map env = context.builder.environment(); - if(javaBinPath == null) + if (javaBinPath == null) env.put("JAVA_HOME", System.getProperty("java.home")); else env.put("JAVA_HOME", javaBinPath.toAbsolutePath().toString()); diff --git a/Launcher/src/main/java/ru/gravit/launcher/managers/SettingsManager.java b/Launcher/src/main/java/ru/gravit/launcher/managers/SettingsManager.java index d6788e91..052dd999 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/managers/SettingsManager.java +++ b/Launcher/src/main/java/ru/gravit/launcher/managers/SettingsManager.java @@ -25,8 +25,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) String fullPath = input.readString(1024); HashedDir dir = new HashedDir(input); settings.lastHDirs.add(new NewLauncherSettings.HashedStoreEntry(dir, dirName, fullPath)); - } catch (IOException e) - { + } catch (IOException e) { LogHelper.error("Skip file %s exception: %s", file.toAbsolutePath().toString(), e.getMessage()); } return super.visitFile(file, attrs); @@ -61,10 +60,8 @@ public void setConfig(NewLauncherSettings config) { settings = config; if (settings.updatesDirPath != null) settings.updatesDir = Paths.get(settings.updatesDirPath); - if(settings.consoleUnlockKey != null && !ConsoleManager.isConsoleUnlock) - { - if(ConsoleManager.checkUnlockKey(settings.consoleUnlockKey)) - { + if (settings.consoleUnlockKey != null && !ConsoleManager.isConsoleUnlock) { + if (ConsoleManager.checkUnlockKey(settings.consoleUnlockKey)) { ConsoleManager.unlock(); LogHelper.info("Console auto unlocked"); } @@ -81,7 +78,7 @@ public void loadHDirStore(Path storePath) throws IOException { public void saveHDirStore(Path storeProjectPath) throws IOException { Files.createDirectories(storeProjectPath); for (NewLauncherSettings.HashedStoreEntry e : settings.lastHDirs) { - if(!e.needSave) continue; + if (!e.needSave) continue; Path file = storeProjectPath.resolve(e.name.concat(".bin")); if (!Files.exists(file)) Files.createFile(file); try (HOutput output = new HOutput(IOHelper.newOutput(file))) { diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/downloader/ListDownloader.java b/LauncherAPI/src/main/java/ru/gravit/launcher/downloader/ListDownloader.java index 7646379c..d31a5344 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/downloader/ListDownloader.java +++ b/LauncherAPI/src/main/java/ru/gravit/launcher/downloader/ListDownloader.java @@ -62,6 +62,7 @@ public void download(String base, List applies, Path dstDirFile, D } } } + public void downloadZip(String base, Path dstDirFile, DownloadCallback callback, DownloadTotalCallback totalCallback) throws IOException, URISyntaxException { /*try (CloseableHttpClient httpclient = HttpClients.custom() .setRedirectStrategy(new LaxRedirectStrategy()) @@ -132,23 +133,18 @@ public FileDownloadResponseHandler(Path target, DownloadCallback callback, Downl @Override public Path handleResponse(HttpResponse response) throws IOException { InputStream source = response.getEntity().getContent(); - if(zip) - { - try(ZipInputStream input = IOHelper.newZipInput(source)) - { + if (zip) { + try (ZipInputStream input = IOHelper.newZipInput(source)) { ZipEntry entry = input.getNextEntry(); - while(entry != null) - { - if(entry.isDirectory()) - { + while (entry != null) { + if (entry.isDirectory()) { entry = input.getNextEntry(); continue; } long size = entry.getSize(); String filename = entry.getName(); Path target = this.target.resolve(filename); - if(callback != null) - { + if (callback != null) { callback.stateChanged(entry.getName(), 0, entry.getSize()); } LogHelper.dev("Resolved filename %s to %s", filename, target.toAbsolutePath().toString()); diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/UpdateAction.java b/LauncherAPI/src/main/java/ru/gravit/launcher/request/UpdateAction.java deleted file mode 100644 index 9f80c671..00000000 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/UpdateAction.java +++ /dev/null @@ -1,60 +0,0 @@ -package ru.gravit.launcher.request; - -import ru.gravit.launcher.hasher.HashedEntry; -import ru.gravit.launcher.serialize.HInput; -import ru.gravit.launcher.serialize.HOutput; -import ru.gravit.launcher.serialize.stream.EnumSerializer; -import ru.gravit.launcher.serialize.stream.StreamObject; -import ru.gravit.utils.helper.IOHelper; - -import java.io.IOException; - -public final class UpdateAction extends StreamObject { - public enum Type implements EnumSerializer.Itf { - CD(1), CD_BACK(2), GET(3), FINISH(255); - private static final EnumSerializer SERIALIZER = new EnumSerializer<>(Type.class); - - public static Type read(HInput input) throws IOException { - return SERIALIZER.read(input); - } - - private final int n; - - Type(int n) { - this.n = n; - } - - @Override - public int getNumber() { - return n; - } - } - - public static final UpdateAction CD_BACK = new UpdateAction(Type.CD_BACK, null, null); - - public static final UpdateAction FINISH = new UpdateAction(Type.FINISH, null, null); - // Instance - public final Type type; - public final String name; - - public final HashedEntry entry; - - public UpdateAction(HInput input) throws IOException { - type = Type.read(input); - name = type == Type.CD || type == Type.GET ? IOHelper.verifyFileName(input.readString(255)) : null; - entry = null; - } - - public UpdateAction(Type type, String name, HashedEntry entry) { - this.type = type; - this.name = name; - this.entry = entry; - } - - @Override - public void write(HOutput output) throws IOException { - EnumSerializer.write(output, type); - if (type == Type.CD || type == Type.GET) - output.writeString(name, 255); - } -} diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/UpdateRequest.java b/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/UpdateRequest.java index 8ae58501..931e6828 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/UpdateRequest.java +++ b/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/UpdateRequest.java @@ -27,15 +27,20 @@ import java.util.Objects; public final class UpdateRequest extends Request implements RequestInterface { - public interface UpdateController - { + public interface UpdateController { void preUpdate(UpdateRequest request, UpdateRequestEvent e) throws IOException; + void preDiff(UpdateRequest request, UpdateRequestEvent e) throws IOException; - void postDiff(UpdateRequest request, UpdateRequestEvent e,HashedDir.Diff diff) throws IOException; + + void postDiff(UpdateRequest request, UpdateRequestEvent e, HashedDir.Diff diff) throws IOException; + void preDownload(UpdateRequest request, UpdateRequestEvent e, List adds) throws IOException; + void postDownload(UpdateRequest request, UpdateRequestEvent e) throws IOException; + void postUpdate(UpdateRequest request, UpdateRequestEvent e) throws IOException; } + private static UpdateController controller; public static void setController(UpdateController controller) { @@ -184,18 +189,17 @@ public double getTotalSizeMiB() { public UpdateRequestEvent requestDo(StandartClientWebSocketService service) throws Exception { LogHelper.debug("Start update request"); UpdateRequestEvent e = (UpdateRequestEvent) service.sendRequest(this); - if(controller != null) controller.preUpdate(this, e); + if (controller != null) controller.preUpdate(this, e); LogHelper.debug("Start update"); Launcher.profile.pushOptionalFile(e.hdir, !Launcher.profile.isUpdateFastCheck()); - if(controller != null) controller.preDiff(this, e); + if (controller != null) controller.preDiff(this, e); HashedDir.Diff diff = e.hdir.diff(localDir, matcher); - if(controller != null) controller.postDiff(this, e, diff); + if (controller != null) controller.postDiff(this, e, diff); final List adds = new ArrayList<>(); - if(controller != null) controller.preDownload(this, e, adds); + if (controller != null) controller.preDownload(this, e, adds); diff.mismatch.walk(IOHelper.CROSS_SEPARATOR, (path, name, entry) -> { if (entry.getType().equals(HashedEntry.Type.FILE)) { - if(!entry.flag) - { + if (!entry.flag) { HashedFile file = (HashedFile) entry; totalSize += file.size; adds.add(new ListDownloader.DownloadTask(path, file.size)); @@ -214,17 +218,14 @@ public UpdateRequestEvent requestDo(StandartClientWebSocketService service) thro updateState("UnknownFile", 0L, 100); ListDownloader listDownloader = new ListDownloader(); LogHelper.info("Download %s to %s", dirName, dir.toAbsolutePath().toString()); - if(e.zip && !adds.isEmpty()) - { + if (e.zip && !adds.isEmpty()) { listDownloader.downloadZip(e.url, dir, this::updateState, (add) -> totalDownloaded += add); - } - else - { + } else { listDownloader.download(e.url, adds, dir, this::updateState, (add) -> totalDownloaded += add); } - if(controller != null) controller.postDownload(this, e); + if (controller != null) controller.postDownload(this, e); deleteExtraDir(dir, diff.extra, diff.extra.flag); - if(controller != null) controller.postUpdate(this, e); + if (controller != null) controller.postUpdate(this, e); LogHelper.debug("Update success"); return e; } diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedDir.java b/LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedDir.java index bb1327be..0fed474b 100644 --- a/LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedDir.java +++ b/LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedDir.java @@ -342,8 +342,8 @@ public void walk(CharSequence separator, WalkCallback callback) throws IOExcepti String append = ""; walk(append, separator, callback, true); } - public enum WalkAction - { + + public enum WalkAction { STOP, CONTINUE } @@ -356,24 +356,21 @@ private WalkAction walk(String append, CharSequence separator, WalkCallback call for (Map.Entry entry : map.entrySet()) { HashedEntry e = entry.getValue(); if (e.getType() == Type.FILE) { - if (noSeparator) - { + if (noSeparator) { WalkAction a = callback.walked(append + entry.getKey(), entry.getKey(), e); - if(a == WalkAction.STOP) return a; - } - else - { + if (a == WalkAction.STOP) return a; + } else { WalkAction a = callback.walked(append + separator + entry.getKey(), entry.getKey(), e); - if(a == WalkAction.STOP) return a; + if (a == WalkAction.STOP) return a; } } else { String newAppend; if (noSeparator) newAppend = append + entry.getKey(); else newAppend = append + separator + entry.getKey(); WalkAction a = callback.walked(newAppend, entry.getKey(), e); - if(a == WalkAction.STOP) return a; + if (a == WalkAction.STOP) return a; a = ((HashedDir) e).walk(newAppend, separator, callback, false); - if(a == WalkAction.STOP) return a; + if (a == WalkAction.STOP) return a; } } return WalkAction.CONTINUE; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/helper/LogHelper.java b/LauncherCore/src/main/java/ru/gravit/utils/helper/LogHelper.java index 22c1649a..a1739758 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/helper/LogHelper.java +++ b/LauncherCore/src/main/java/ru/gravit/utils/helper/LogHelper.java @@ -113,8 +113,7 @@ public static void debug(String format, Object... args) { @LauncherAPI public static void dev(String format, Object... args) { - if(isDevEnabled()) - { + if (isDevEnabled()) { dev(String.format(format, args)); } } From 4af4a002a72bd69a9102b6cf998a06aacde83095 Mon Sep 17 00:00:00 2001 From: Gravit Date: Fri, 31 May 2019 05:40:54 +0700 Subject: [PATCH 14/16] [ANY] Update modules --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index baf1e7fb..5c3aa4d1 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit baf1e7fb820fd1f4a1031e517fea03632f9e57e6 +Subproject commit 5c3aa4d10e6973799315c5befed2ecb7cd98b203 From 27db641eae11f9297da91a68d3b19f0faaffcb42 Mon Sep 17 00:00:00 2001 From: Gravit Date: Fri, 31 May 2019 05:42:51 +0700 Subject: [PATCH 15/16] =?UTF-8?q?[FIX]=20=D0=98=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0?= =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B8=20=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B8=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D1=83=D1=80?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/ru/gravit/launcher/config/JsonConfigurable.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/config/JsonConfigurable.java b/LauncherAPI/src/main/java/ru/gravit/launcher/config/JsonConfigurable.java index 5e1883e0..9546e85d 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/config/JsonConfigurable.java +++ b/LauncherAPI/src/main/java/ru/gravit/launcher/config/JsonConfigurable.java @@ -33,7 +33,7 @@ public JsonConfigurable(Type type, Path configPath) { @LauncherAPI public void saveConfig(Path configPath) throws IOException { try (BufferedWriter writer = IOHelper.newWriter(configPath)) { - Launcher.gsonManager.gson.toJson(getConfig(), type, writer); + Launcher.gsonManager.configGson.toJson(getConfig(), type, writer); } } @@ -41,7 +41,7 @@ public void saveConfig(Path configPath) throws IOException { public void loadConfig(Path configPath) throws IOException { if (generateConfigIfNotExists(configPath)) return; try (BufferedReader reader = IOHelper.newReader(configPath)) { - setConfig(Launcher.gsonManager.gson.fromJson(reader, type)); + setConfig(Launcher.gsonManager.configGson.fromJson(reader, type)); } } From fdc9730e018ff066fcf570f7f90e2a3c3a1bd34d Mon Sep 17 00:00:00 2001 From: Gravit Date: Fri, 31 May 2019 05:44:14 +0700 Subject: [PATCH 16/16] [ANY] Release 5.0.2 --- LauncherCore/src/main/java/ru/gravit/utils/Version.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LauncherCore/src/main/java/ru/gravit/utils/Version.java b/LauncherCore/src/main/java/ru/gravit/utils/Version.java index 5f729792..e314edd1 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/Version.java +++ b/LauncherCore/src/main/java/ru/gravit/utils/Version.java @@ -17,7 +17,7 @@ public final class Version { public final Type release; public static final int MAJOR = 5; public static final int MINOR = 0; - public static final int PATCH = 1; + public static final int PATCH = 2; public static final int BUILD = 1; public static final Version.Type RELEASE = Version.Type.STABLE;