From 02e63e14c058a87e49e9b3849863c20018e90c5d Mon Sep 17 00:00:00 2001 From: ChococookieOS Date: Sun, 28 Apr 2019 11:19:53 +0200 Subject: [PATCH] Improved Backend --- QuickLaunch/bin/basics/BasicGuiApp$1.class | Bin 992 -> 988 bytes QuickLaunch/bin/guis/MainGui$1.class | Bin 2046 -> 2042 bytes QuickLaunch/bin/guis/MainGui$2.class | Bin 941 -> 937 bytes QuickLaunch/bin/guis/MainGui$3.class | Bin 891 -> 887 bytes QuickLaunch/bin/guis/SettingGui$1.class | Bin 1875 -> 1871 bytes QuickLaunch/bin/guis/SettingGui$2.class | Bin 1875 -> 1871 bytes QuickLaunch/bin/guis/SettingGui$3.class | Bin 1422 -> 1418 bytes QuickLaunch/bin/main/KeyChecker$1.class | Bin 1350 -> 1346 bytes QuickLaunch/bin/main/KeyChecker$2.class | Bin 724 -> 720 bytes .../mod_quicklaunch/ShortcutWindow$1$1.class | Bin 1163 -> 1159 bytes .../mod_quicklaunch/ShortcutWindow$1.class | Bin 2409 -> 2405 bytes .../mod_quicklaunch/ShortcutWindow$2.class | Bin 1165 -> 1161 bytes .../mod_quicklaunch/ShortcutWindow$3.class | Bin 2127 -> 2123 bytes .../mod_quicklaunch/ShortcutWindow$4.class | Bin 1875 -> 1871 bytes .../mod_quicklaunch/ShortcutWindow$5.class | Bin 1904 -> 1900 bytes QuickLaunch/bin/update/UpdateChecker.class | Bin 2634 -> 2626 bytes QuickLaunch/settings.properties | 10 +-- QuickLaunch/src/update/UpdateChecker.java | 2 +- .../bin/run/ServerThread.class | Bin 1961 -> 0 bytes QuickLaunchUpdateServer/bin/run/Start.class | Bin 1179 -> 519 bytes .../bin/run/UpdateThread.class | Bin 877 -> 0 bytes .../src/customNodes/LogTextArea.java | 25 ++++++ .../src/customNodes/NewUpdateButton.java | 16 ++++ .../src/data/ServerData.java | 5 ++ .../src/{run => network}/ServerThread.java | 25 ++++-- QuickLaunchUpdateServer/src/run/Start.java | 17 +--- .../src/run/UpdateThread.java | 14 ---- .../src/scenes/LogScene.java | 78 ++++++++++++++++++ .../src/stages/AppStage.java | 25 ++++++ 29 files changed, 175 insertions(+), 42 deletions(-) delete mode 100644 QuickLaunchUpdateServer/bin/run/ServerThread.class delete mode 100644 QuickLaunchUpdateServer/bin/run/UpdateThread.class create mode 100644 QuickLaunchUpdateServer/src/customNodes/LogTextArea.java create mode 100644 QuickLaunchUpdateServer/src/customNodes/NewUpdateButton.java create mode 100644 QuickLaunchUpdateServer/src/data/ServerData.java rename QuickLaunchUpdateServer/src/{run => network}/ServerThread.java (70%) delete mode 100644 QuickLaunchUpdateServer/src/run/UpdateThread.java create mode 100644 QuickLaunchUpdateServer/src/scenes/LogScene.java create mode 100644 QuickLaunchUpdateServer/src/stages/AppStage.java diff --git a/QuickLaunch/bin/basics/BasicGuiApp$1.class b/QuickLaunch/bin/basics/BasicGuiApp$1.class index c9c55f2df85171123787c9694ee44647de6f74c2..89a05e498c4a36bf029099b25dda302286023f39 100644 GIT binary patch delta 45 xcmaFBeusU-CniM`1|}e6VBpfy-patEwVi=)Bap|$AP6Mc7#JBCCW|wl1OVbQ2p9kW delta 49 xcmcb^{(ybMCni-31|}e6VBpfy-patEwVi=)Bap|$AP5oz%P=yqP8Mc92>||52qypl diff --git a/QuickLaunch/bin/guis/MainGui$1.class b/QuickLaunch/bin/guis/MainGui$1.class index 00496614fad628d624993678c40efd846f8a924e..b7635d5312d7c0b3b64e2f73ae2874e68c9a5be2 100644 GIT binary patch delta 24 fcmeyz|BHWv02`ypWI;A*RyGDk28PY1Y$q83R5b;g delta 28 jcmeyx|Bruz02`ylWI;A*PA&!}1_lO32G-4nY$q83WS<49 diff --git a/QuickLaunch/bin/guis/MainGui$2.class b/QuickLaunch/bin/guis/MainGui$2.class index 5477b9bf223aac6fe822d9d5db8d4fd6b4f25a9f..cd8cd4b7d5ff7b985447ff3e5db3201a3bc7cf51 100644 GIT binary patch delta 45 xcmZ3>zLI^zVJ1Zr1|}e6VBpfy-patEwVi=)Bap|$AP6Mc7#JBCCcj`h3INN%2u}b2 delta 49 xcmZ3@7#J8B8Mrn-V$Ed)0C|}Q3jhEB diff --git a/QuickLaunch/bin/guis/SettingGui$2.class b/QuickLaunch/bin/guis/SettingGui$2.class index 140b760ba9fa0c4ed7c2b1f707c43d58c1881acd..f99bc664cafc7ed20397797752293f8ad27eb398 100644 GIT binary patch delta 24 gcmcc2cb;#<9#%%n$$ME9SlJjD85lM{W6fm*0A%q7_W%F@ delta 28 kcmX@lcbRX)9#%%%$$ME9IJp>@7#J8B8Mrn-V$Ed)0C|}Q3jhEB diff --git a/QuickLaunch/bin/guis/SettingGui$3.class b/QuickLaunch/bin/guis/SettingGui$3.class index b5198140566e7edf9103d685a82df51260237751..97dd6fc76e1bd6c279b76251a008dda03d82f1e0 100644 GIT binary patch delta 23 ecmeCmRA5+_68FG diff --git a/QuickLaunch/bin/main/KeyChecker$1.class b/QuickLaunch/bin/main/KeyChecker$1.class index 24cfc93826ae10736d3a75fd3ec0fd079de7466d..64788f1749c79979588e81951915e152bc63d8b7 100644 GIT binary patch delta 24 gcmX@cb%<-j31&u<$tRhmS=ksE85lOdWsYP70Aia4&;S4c delta 28 kcmX@ab&PAn31&u%$tRhmIk^~^7#J8B8CW;JWR7G60CvR&-v9sr diff --git a/QuickLaunch/bin/main/KeyChecker$2.class b/QuickLaunch/bin/main/KeyChecker$2.class index 6ea0d1890a3b239c2d10ce11cf462f622527bca5..d6171ada95dac681bbdd70844f5f568ed6fe2954 100644 GIT binary patch delta 45 wcmcb@dVzI=F_WSR0}~K3FmP#UZ)M=o+RnhY5y)d=5CoEJ42%p6lOvdF0KfwWFaQ7m delta 49 xcmcb>dWCg^F_WqV0}~K3FmP#UZ)M=o+RnhY5y)d=5Cn;VWf&P)CxtYlMgc=0RYpa2i*Vw diff --git a/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$1.class b/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$1.class index 6f6b8ac9fe1c971ca9942b60a7bf3ad03b584acf..0e431ffa4664476fb06b8c14d5691ba4f0b568d9 100644 GIT binary patch delta 24 fcmaDU^i*hrFFT{jWIuLkRyGDk28PW=?B5vyT0#b2 delta 28 jcmaDV^ipVpFFT{fWIuLkPA&!}1_lO32G-4a?B5vyYzzi& diff --git a/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$2.class b/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$2.class index b0861b60fb9d531a22d32bc86d31db023efa9b34..844773146e7a3d4508be46847cbcc7fff9538c9d 100644 GIT binary patch delta 23 ecmeC>?Bv|g#ms0jxtm#va9Uu)Lsmr-1|}e6VBpfy-patEwVi=)Bap|$AP6Mc7#JBCHnXvLG64YOj|Ywb delta 50 ycmX>ta9&`;LsnG_1|}e6VBpfy-patEwVi=)Bap|$AP5oz%P=yqZf0WhWC8#HR0o{^ diff --git a/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$4.class b/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$4.class index b561d3b43a96f93258325c162cc0db7a6c196ea8..9dc083c7619b200400cc33ff4c419fcf3023b5e7 100644 GIT binary patch delta 24 gcmcc2cb;#@7#J8B8MrnxviUIr0D92|N&o-= diff --git a/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$5.class b/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$5.class index d6bf914bad8e619430786c6f556a4982a4830844..e65109c5d1ea57c65913a4f4711d8902db6c378c 100644 GIT binary patch delta 24 fcmeys_l9pnJS(Hgla!6!DD!;dn>he!>ka!O=FE2EHLa(;exW@>RsX-Z~(v0i>r`sRMd%^U#0DGUby diff --git a/QuickLaunch/settings.properties b/QuickLaunch/settings.properties index 2f6a4f2..92bb83f 100644 --- a/QuickLaunch/settings.properties +++ b/QuickLaunch/settings.properties @@ -1,5 +1,5 @@ -#Mon Apr 15 11:05:55 CEST 2019 -Load-File-on-startup=true -key2=44 -key1=29 -Check-for-updates-on-startup=true +#Thu Apr 18 14:02:07 CEST 2019 +Load-File-on-startup=true +key2=44 +key1=29 +Check-for-updates-on-startup=true diff --git a/QuickLaunch/src/update/UpdateChecker.java b/QuickLaunch/src/update/UpdateChecker.java index b135ce7..4b94a90 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), 2000); + socket.connect(new InetSocketAddress(InetAddress.getByName(/*"cookiestudios.org"*/"localhost"), 9999), 2000); DataInputStream in = new DataInputStream(socket.getInputStream()); DataOutputStream out = new DataOutputStream(socket.getOutputStream()); diff --git a/QuickLaunchUpdateServer/bin/run/ServerThread.class b/QuickLaunchUpdateServer/bin/run/ServerThread.class deleted file mode 100644 index a3bca7039220ad4024d40caa1bf1093aa7df400e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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>_}Gc`{+1_=iGF|| zW$XbJOt@4}clA_P_vhE!2Y^#F9b_1a$wa$7BNF2v$50)KN8yG-2ky;aBz?nBI9FPk z3x;f~-Dk*kqkGAbMX`)L3JeubX?Z;v4`gyH2BBoAd66%|zDShKe~LLXR4GHr`y1FH zv9VB^q0zeY=7W1CQ99_f`wrGgJ~bkcse2j6WHXQs>i=xcx;Zwn<)FdPv_cP0u88AM z`NF73+rPi>GPbcpONC;h{UO6qYhiLX6lvO7>V>?DB%lTAOK1k(izbOLuaw=NPw#nR zjo=V;IJ!5Gp%)#D(4oww$SCHIU$F8#r8%LcEtUw&vj&Q*lohdt3RUdqv#A)sYt`&K bYOmOsD{$h7q5jf>3db(?sLrrYn8Cp}?2~Qy literal 1179 zcmZuv+fvg|6kVrW(uQE6P*7AXsL&Rq-bIQR1gc=UNU<}FPlu9$U`RS?0{Z5k_zmg| zFfya>ew5=nX^}ERA9{AyzOB9Y`t$eaF8~j*q9Gy>^8zPV@}=i%Xcg$%mHRShOJ_T` zvbk$kd;x9W^lFyt2#A6}>*~tdI?V-v&RN%~`O@*r(hkfPU^FfeovzrHWBJboTGE*^ z6K35lv-S5EAO_Yq(1vz_c+qmq-jrYO`xOrpLm|&p0r4?Fa4o-HbBYuEN45PDMxWtp!Z#1RX!GF;8b=}jgh8wT*nO! zg9803?^CXJz?9tLO4aAYtI{zIq%cIjwH^0h!KnuRoF#2{TVN#J)T+L#e5MI%bk}hc zw>8{ii8E#e+m*h75sV7xRq55t5D`c=7d_=)(2zNIne`pdlv^6ch^j5TuWm`-tfM-z zNa{#qLhUQZ!J1311&*WE%cZE8dj{^Sowo6eo*$zq9&31Xu2<=E%{TW9Ji#O{>IM`< zvOcBd=2p32pEOOmmycqKt~!;JA2LjZWz8)e(|E4onLtmtgY%gNUf?BVR#nApUh%>u zlr_9+j9W52-tTnW8O*6k=P82pg1YrE zVMS{6=p{GsDrUh_I@L>RR}*Rw3{lb4JtEXLWld`U8lpsFA*ys6MF$KbokX&H)vrBq z=?CK9XhqP?f1NKF*+wf7qF^ND-pI@GRhezsBlMo7wTGY0;T#K1AG9b=fSPmta?L3ZN^<43qt96Q9_?|6`SdWd}8HM7w@8b87;y-VW_Z-L&k z=ELL*#5r9Tr|!leX^fEbBzk%7B<4s(&627&#~Up0YXDxJL?EFE;&%lz7dRFks;pO(g7jd(V|0N6#d8y)MJjIH}>l z>&JGugEb9z31XyU!}U1nbr1I$be{*I7(`A`yTLF;3fns`xt~s6Z+UTGi-t_LsWiTd zt4S9uf>fk$g0?n8mbQw{B6${BMs{L(ANrTUZ-dVKAehG#-Hl-aPGOonTI~PD9|oX6 z^#@At%V+j6`xWzjTq pieChartData; + + + public LogScene(Stage primaryStage) { + + this.setPrefWidth(800); + this.setPrefHeight(600); + this.setMaxHeight(600); + + mNewUpdate = new NewUpdateButton("New update"); + mNewUpdate.setOnAction(new EventHandler() { + + + public void handle(ActionEvent event) { + TextInputDialog dialog = new TextInputDialog(); + dialog.setTitle("Create new update"); + dialog.setHeaderText("Realese new Update"); + dialog.setContentText("New version:"); + + Optional result = dialog.showAndWait(); + if (result.isPresent()){ + ServerData.version = Float.parseFloat(result.get()); + } + } + }); + + mLogView = new LogTextArea(); + pieChartData = + FXCollections.observableArrayList( + new PieChart.Data("Win 7", 0), + new PieChart.Data("Win 10", 0), + new PieChart.Data("Linux", 0)); + final PieChart chart = new PieChart(pieChartData); + chart.setLayoutX(500); + chart.setLayoutY(35); + chart.setMaxHeight(200); + chart.setMaxWidth(300); + chart.setLabelsVisible(true); + chart.setLegendSide(Side.RIGHT); + chart.setLabelLineLength(10); + chart.setStyle("-fx-font-size: 8pt"); + this.getChildren().add(mNewUpdate); + this.getChildren().add(mLogView); + this.getChildren().add(chart); + } + + public void appendText(String text) { + for(Data d : pieChartData) { + if(d.getName().equals("Linux")) { + d.setPieValue(d.getPieValue()+1); + } + } + mLogView.appendText(text+"\n"); + } + + +} diff --git a/QuickLaunchUpdateServer/src/stages/AppStage.java b/QuickLaunchUpdateServer/src/stages/AppStage.java new file mode 100644 index 0000000..b7f8834 --- /dev/null +++ b/QuickLaunchUpdateServer/src/stages/AppStage.java @@ -0,0 +1,25 @@ +package stages; + +import javafx.application.Application; +import javafx.scene.Scene; +import javafx.stage.Stage; +import network.ServerThread; +import scenes.LogScene; + +public class AppStage extends Application{ + + + public void start(Stage primaryStage) throws Exception { + primaryStage.setOnCloseRequest(event -> { + System.exit(0); + }); + LogScene ls = new LogScene(primaryStage); + Thread st = new Thread(new ServerThread(ls)); + st.start(); + primaryStage.setScene(new Scene(ls)); + primaryStage.setResizable(false); + primaryStage.show(); + + } + +}