From c4ed32689dd072a3b6dd6edb392ffdf1fcf08d71 Mon Sep 17 00:00:00 2001 From: ChococookieOS Date: Mon, 15 Apr 2019 11:14:06 +0200 Subject: [PATCH] Changed Server to new protocol on port 9999 with only one String based communication exchange --- QuickLaunch/bin/basics/BasicGuiApp$1.class | Bin 992 -> 992 bytes QuickLaunch/bin/basics/BasicGuiApp.class | Bin 2883 -> 2883 bytes QuickLaunch/bin/update/UpdateChecker.class | Bin 2634 -> 2634 bytes QuickLaunch/bin/update/Updater.class | Bin 4424 -> 1960 bytes QuickLaunch/settings.properties | 2 +- QuickLaunch/src/basics/BasicGuiApp.java | 2 - QuickLaunch/src/update/UpdateChecker.java | 3 +- QuickLaunch/src/update/Updater.java | 58 ++++++++++-------- .../bin/run/ServerThread.class | Bin 2195 -> 1961 bytes QuickLaunchUpdateServer/bin/run/Start.class | Bin 1282 -> 1179 bytes .../bin/run/UpdateThread.class | Bin 958 -> 877 bytes .../src/run/ServerThread.java | 16 +---- QuickLaunchUpdateServer/src/run/Start.java | 2 - .../src/run/UpdateThread.java | 1 - 14 files changed, 36 insertions(+), 48 deletions(-) diff --git a/QuickLaunch/bin/basics/BasicGuiApp$1.class b/QuickLaunch/bin/basics/BasicGuiApp$1.class index 4b94953974c73fa57aa11492ca861d988af68b32..c9c55f2df85171123787c9694ee44647de6f74c2 100644 GIT binary patch delta 27 icmaFB{(yah1T&-6WJzXwPFn_M20I3J28YRs%=G|Zr3ME8 delta 27 icmaFB{(yah1T&+}WJzXwPJ0Gs1_uUq2B*o1%=G|a0R|5M diff --git a/QuickLaunch/bin/basics/BasicGuiApp.class b/QuickLaunch/bin/basics/BasicGuiApp.class index c11e0d0abfa0ce9d9799f4e820e56b493b82ca15..e3df2fee9268410b2dfe610930f39b0c6f786a63 100644 GIT binary patch delta 119 zcmX>sc35n~YEDBX1|9}w1_1^Y1`!5T1_=fY25AOO26+Z;pr|eo>Msc35n~YEDCC1|9|#1_1_D1`!4|1_=gD25AN@26+Y@24x0423-by24e<8273l0 z1~(wfhrwj>9nP1gmJBQmRzRKBKs`1LCJe4XmK%`t0;=$42mq2H489Bz4E_vpKwd6G N7()R=#N=OGo&Yh$6Da@y diff --git a/QuickLaunch/bin/update/UpdateChecker.class b/QuickLaunch/bin/update/UpdateChecker.class index 67e0ea287a98ded1fe211f9d7490120dc71216e5..183a61917f8dcdcfbf6b8ecee2f54be71e74e134 100644 GIT binary patch delta 47 zcmX>la!O=_8V3{mh0Piq+>E@645t{B7|t;$GhAX&o$SDQhf|Y*he3-$hCyetDwiq% DC*umV delta 47 zcmX>la!O=_8V3{8p3NE@+>E?R45t{B8O|}NFkE6#o9w`Ohf|Azhe4Y`hCz3-Dwiq% DB&Q0Z diff --git a/QuickLaunch/bin/update/Updater.class b/QuickLaunch/bin/update/Updater.class index c28f1add03feb117dc678f839a4fb8c10fea59d9..3618065fdc5b2cb52d02e2c58b36d7775ee13837 100644 GIT binary patch delta 955 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 diff --git a/QuickLaunch/settings.properties b/QuickLaunch/settings.properties index 75f37c9..2f6a4f2 100644 --- a/QuickLaunch/settings.properties +++ b/QuickLaunch/settings.properties @@ -1,4 +1,4 @@ -#Sun Apr 14 19:07:39 CEST 2019 +#Mon Apr 15 11:05:55 CEST 2019 Load-File-on-startup=true key2=44 key1=29 diff --git a/QuickLaunch/src/basics/BasicGuiApp.java b/QuickLaunch/src/basics/BasicGuiApp.java index a9dbfd5..ce89ef8 100644 --- a/QuickLaunch/src/basics/BasicGuiApp.java +++ b/QuickLaunch/src/basics/BasicGuiApp.java @@ -31,7 +31,6 @@ public class BasicGuiApp extends Application{ public static KeyChecker listener; public BasicGuiApp(){ - ModLoader ml = new ModLoader(); ml.init(); ml.addMods(); @@ -45,7 +44,6 @@ public class BasicGuiApp extends Application{ } listener = new KeyChecker(); LogManager.getLogManager().reset(); - Logger logger = Logger.getLogger(GlobalScreen.class.getPackage().getName()); logger.setLevel(Level.OFF); GlobalScreen.addNativeKeyListener(listener); diff --git a/QuickLaunch/src/update/UpdateChecker.java b/QuickLaunch/src/update/UpdateChecker.java index b77b34f..b135ce7 100644 --- a/QuickLaunch/src/update/UpdateChecker.java +++ b/QuickLaunch/src/update/UpdateChecker.java @@ -14,7 +14,7 @@ public class UpdateChecker { public void requestServerData(){ try { Socket socket = new Socket(); - socket.connect(new InetSocketAddress(InetAddress.getByName("cookiestudios.org"), 9999), 700); + socket.connect(new InetSocketAddress(InetAddress.getByName("cookiestudios.org"), 9999), 2000); DataInputStream in = new DataInputStream(socket.getInputStream()); DataOutputStream out = new DataOutputStream(socket.getOutputStream()); @@ -30,7 +30,6 @@ public class UpdateChecker { String[] keyValue = str.split("="); serverData.put(keyValue[0], keyValue[1]); } - socket.close(); } catch (IOException e) { e.printStackTrace(); diff --git a/QuickLaunch/src/update/Updater.java b/QuickLaunch/src/update/Updater.java index 51e23c9..962e524 100644 --- a/QuickLaunch/src/update/Updater.java +++ b/QuickLaunch/src/update/Updater.java @@ -9,6 +9,7 @@ import java.nio.channels.ReadableByteChannel; import java.util.Optional; import guis.MainGui; +import javafx.application.Platform; import javafx.scene.control.Alert; import javafx.scene.control.Alert.AlertType; import javafx.scene.control.ButtonType; @@ -22,37 +23,42 @@ public class Updater { uc.requestServerData(); System.out.println("got version: " + uc.getLatestVersion()); if(uc.getLatestVersion() > Start.VERSION){ - String dl = "https://cookiestudios.org/software/QuickLaunch/QuickLaunch.jar"; - Alert updateAlert = new Alert(AlertType.INFORMATION, + Platform.runLater(new Runnable() { + @Override + public void run() { + String dl = "https://cookiestudios.org/software/QuickLaunch/QuickLaunch.jar"; + Alert updateAlert = new Alert(AlertType.INFORMATION, "There is a newer version of QuickLaunch available\nDownload now?", ButtonType.YES, ButtonType.NO); - updateAlert.setTitle("Update available!"); - Optional result = updateAlert.showAndWait(); - if(result.isPresent() && result.get() == ButtonType.YES){ - try { - System.out.println("here"); - cleanDirectory(); - URL website = new URL(dl); - ReadableByteChannel rbc = Channels.newChannel(website.openStream()); - FileOutputStream fos = new FileOutputStream(SettingManager.getJarDirectory()+File.separator+"Squirrel.jar"); - fos.getChannel().transferFrom(rbc, 0, Integer.MAX_VALUE); - fos.close(); - try { - ProcessBuilder pb = new ProcessBuilder("java","-jar",SettingManager.getJarDirectory()+File.separator+"Squirrel.jar"); - pb.directory(new File(SettingManager.getJarDirectory())); - pb.redirectErrorStream(true); - pb.redirectOutput(ProcessBuilder.Redirect.INHERIT); - pb.start(); - }catch(Exception e) { - e.printStackTrace(); + updateAlert.setTitle("Update available!"); + Optional result = updateAlert.showAndWait(); + if(result.isPresent() && result.get() == ButtonType.YES){ + try { + System.out.println("here"); + cleanDirectory(); + URL website = new URL(dl); + ReadableByteChannel rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(SettingManager.getJarDirectory()+File.separator+"Squirrel.jar"); + fos.getChannel().transferFrom(rbc, 0, Integer.MAX_VALUE); + fos.close(); + try { + ProcessBuilder pb = new ProcessBuilder("java","-jar",SettingManager.getJarDirectory()+File.separator+"Squirrel.jar"); + pb.directory(new File(SettingManager.getJarDirectory())); + pb.redirectErrorStream(true); + pb.redirectOutput(ProcessBuilder.Redirect.INHERIT); + pb.start(); + }catch(Exception e) { + e.printStackTrace(); + } + System.exit(0); + } catch (IOException e) { + e.printStackTrace(); + MainGui.addNotification("Couldn't download update", 2); + } } - System.exit(0); - } catch (IOException e) { - e.printStackTrace(); - MainGui.addNotification("Couldn't download update", 2); } - } + }); } else{ if(uc.getLatestVersion() == Start.VERSION){ MainGui.addNotification("QuickLaunch is up to date", 2); diff --git a/QuickLaunchUpdateServer/bin/run/ServerThread.class b/QuickLaunchUpdateServer/bin/run/ServerThread.class index 99f03333082c3232b9c8c1458f30a221d075b246..a3bca7039220ad4024d40caa1bf1093aa7df400e 100644 GIT binary patch literal 1961 zcmaJ>+fy4=9R5y1*(7eEq!$XUl1f{X6bP+t)za3sl-OV(NB{-3x+E(sgx$E=0QJ^- znenYp_05q!IMWB8WJ(zAjN^=baC~ycKgKulJG%*N(dlGz&Yp9Am+$xeE`R*<^Dh9- z;wuFKfqiz>OyzZZS+^(VZCxuWXyWaHwydQ}nmL!s%`WH#M?tedbmw-wYMRSq6qE`gkv#yw_J9WExtFWj$1C-%woA0%8AGE5DK&SU&SgGrpqvfhjx$5K{ zLRz9~z%T_mo{-3xeu3tThG{sLi6@>(OmQ2uih2Y=98}SULj)I3OobtEScQU+Kx@`8 z_0j6mECcrWR+`dmL!RrGP0qYQ*wO56o(QU`Y}o`JDqcWbpjj&v^fK-2k0<^^j#Npicm`@1J?K-=`$Tf`wZUnP3BlH##Rhx{z5E*ew>qt&(mn!v+CA@ zr#q0Cir{5jQ1A+A+=N{o3z#1KFGMhmHzd2`tmt~2yJfsmosfxbQNVKc z5?JpIU*$^-Z>gBZOoQ|7rl3-T0P6X4h+q=$NCfXnnA=t37x4hRr=k`6q`0PHR?@4; z5ivQD4uM$;O%09bGr7@AVSIpj1#<#nw@n<)c2pQxpaKU=#jx1DA}v#0lBr%2I2uns zEuq7(RFq{dLMyi6=yWN0vsF}NGw&&stP0zE61HT3OP5?$@sWaCzSL%NL#wj62tdWh zQnS@fZQjueixak1&_noCK=lS-tgM+vK@Jv~qn&MDkYEF6e1P z4#YP9H0_hcgJbOCApd*#gB(9xA?JX*v$@@!xpsF_&OJbR&J3>mc}nvf;2ueC;z07q z2HJmgWjeUF(6(Hgn5-~$J9#?fN#h8P@FAkFoaJqzhL>u%RKwL8hNv|xwRoA`#MlP%yqT=uyt#?D zH*k~sl(<>L`%>W{@~*W4t*t|^VbQf@%7+?0^duc_G+E_F5X%p?irG^&tUO)j%194o z=q>sQ9X;6Ucf()98cX7P{EFYW2O-ItVfY{|tt6(Cq?{)qH&{J0h+&S2x`S?fjpMkB z6Zi%v@hyk+8WOmVBrWye2lQecefS9}+U>_?hi7g`0L*FAwIT9%7>@AZB6bMCqK-TCp( zH{Sx-jn5231eUuMyF07gY2^-&yUHvWh*3IWPMh6D(;n*{8l6yi&p@3(^1k#$#kS4S zq7sN5A38BCAo>JkrBpCIHK+k2ll@NKERLA2rN3*!m^W@Qfn@(; z5(zI>a$Kem<&}ZW0;~R&f&^NzMZ;OC!?#N;h19aN#5Qya)S3CbD$&o1_Ktthq)oO< zEJH&*9>GonJ07T9_I%k>Qxc8X#qjrtI__Hb0*eOrusZk4N^&iG>~O^@7L*&uqx5&g zv28YhDx_vCZ~QE-lJtsgZ zuyP?}$b`C2qu;|xZzy3# z2;UIFAWmv_*{{vDJQwQ(P5YcK>~aHqWI+LIuO##aG=>)>Uc{LN&hI@B8Z8h&yO0eL z`i883PRLc%KPEnck#%Fsvj%k6mlm5I( z+5W)kOdWM*Yn3i`(8O|22u%b(P~jNFT=_ zE=pX|17k_P=#)7^a=56u<!zH_$SN zwpnaV^SHH&j#+eFNB2B-=aPHpu#eKNDl%0Zs^VA`ed&1&YAXtl&tZ5LrzpwQB+t*` z>?}rked;<2RZP$mKSrytY5G4uG!R<6qI182=FhQ;hRKSK?fadn;#GaB;*CJ_O>Ttq z7B?nv`P$vq{%uvf{hvB_?hbTPM|*ysp0C~c&FAkXZnDX43n60MqtJ|B@cCWO;%;D> zHj?2@$dKg$GJKZoTG)(fwBa(g;3~G_3v}R1{;7P0PRyYT-=iBp@NeTM?7+|1iC?gb zQTE^#_To17;aBX(?>K-zkr4t1#S#wmdi01U9P%Tlf|}JTdyAev#77X+llYjY2tFao cb*$}Q`0k8>D|h)=A_fGHwFRG2BZ8}c17DvSX#fBK diff --git a/QuickLaunchUpdateServer/bin/run/Start.class b/QuickLaunchUpdateServer/bin/run/Start.class index 2981809354f0d550d8c0176f2491306ac7fe9180..93ec4663ac3a0957026a7f52154b585ab9772461 100644 GIT binary patch delta 683 zcmYLG+fvg|6kR8^4UN%WXhkbv9?rh5z1H6OsC)@4zyJL@0WgEjmNMIVSqMc{1QBZe zoCzgW^h0g^ohw`xNIY%Uw%?SDrnSAJ?VEO^R=4IA4B?85VS$0y#=h}hZ@jBnuk`iJ zJ%{Bj!!lK9xawBL;?O9@WsC_#yiR@BVBgwq-EdS)VA4Gi;{h2{pQYqzRv>COE&cgk z)o{#bJGN<56=aZ9kj8aSlkVoF!Ra(^sJIDLAlPsW+X-`t+cIVe?@^RLG#vA-iaF%n zPm;DUFOcjE)*OGb=3`AVEa0AuMS*@FU90O`cFl6i4*5Btfcx$rX)OJqtFCO?yuzuv zC9HVDRt3(ai&HQ9@X*Z#>;nm5@0h%A3Nrd27y}X%1Q?x#%FH=tGPK?oil6_1$TxZt zVtf@^uro+6?q|VH{**3Gr}dD*OdE+FEaWF;9C#S7mmRo(0opJw;u13+>sMw2w5##d z5eAPiLhfUvE62!G+Q_wWt&}~)^mp8f-#NtHPHCwUn~b!v%<4w2TU}$d$38;AK!ocR vque`&VQQbC>O2xWauO@l;wjTQ?0AGCqZG1O$75>CQ(cLkM1O-72~Yk5@&tGb delta 766 zcmY*WT~iWa6n@?%Tv#?f7Q{j=Bt;Z+NimBusLaA3F~o-HYLhKDX>pcC>&ls?>t<+Y zy6Go$WzL9`GyZ^nMn9mR&~z4boc7{<&-*;jIp;ZNzqvmO!mqzSPXMIxqAkpcu3BSP zuQ!w$gY?A_YG<=yNrV%9E`%81218f`4_EtBx^Ga#Wq8{s^Vt!G&}vKD*eWP3ePc7a zqZ&=Ep=ShK!x)cIhJm-rj`Ch^?rQoQd3j~qB)X*Ns)#totu$L0oaFr0d{dcNu_b5uy zBgBr7uuV);NIs5{svcve+CjR5xkB;~w|?M`bpH?!dsMy}825GXl-S}_k9{pYBl>)T zICTU3G<*O-NQluHM+npCM-E{u(wqhIXipaHIY9}l^ok*g=O~lU9Ib1OB97t;F&x(a E0Xv0=`Tzg` diff --git a/QuickLaunchUpdateServer/bin/run/UpdateThread.class b/QuickLaunchUpdateServer/bin/run/UpdateThread.class index 5b90e66a0dcdc543622342e3487a75ce2a5b93f8..40c6bfc4d40fff92e318d86e8635c88ce106e584 100644 GIT binary patch delta 98 zcmdnT{+5mF)W2Q(7#J8#7_2sOl`>5}!qmwb#lXzK2ozJE9LB6*v;6-9Ae)(i2S{=; kFab$!1_dCG7s%p)sAJ$`;0N-|ff%flk--AUWMZ%c02kyAH~;_u delta 180 zcmaFMwvV0b)W2Q(7#J8#7#ucol`^?