From 705a9c0b73a90498f95797cded10e70a2417f4e6 Mon Sep 17 00:00:00 2001 From: leha-code Date: Sun, 13 Mar 2022 18:01:21 -0400 Subject: [PATCH] Add server support --- planet/assets/multiplayer.png | Bin 0 -> 527 bytes planet/assets/multiplayer512.png | Bin 0 -> 11546 bytes planet/main.py | 31 ++++++++++++++++++++++++++----- 3 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 planet/assets/multiplayer.png create mode 100644 planet/assets/multiplayer512.png diff --git a/planet/assets/multiplayer.png b/planet/assets/multiplayer.png new file mode 100644 index 0000000000000000000000000000000000000000..956ebddc9478b30c4f08c4269e1f636a28bb71b5 GIT binary patch literal 527 zcmV+q0`UEbP)Px$$w@>(R49>M&AUz%Q2>D9e`e0?EHJxrTO!e9ff!?B(8?I2#>N*=U%=iT6B-Lk zDjRBJX=f;X1R6s^5D-{gG|ui^cIR?t=A1bec78ALS=+B)7{_ZP>l&SBTyq67pAwA5 zIPE!X86m|28ffwmvEsXg@gG*Z9i-8is-o*T%->ugD^k2(pUWUdH_%#GLZr3B#;rTJ zmZDM`LmT0GI7VVrMpJ55mpYuC54Z{=gs}vVpFCy3Zz0?nwD2iwg)jwnHNo-b$$|mV zIAmw{6XN-!`z+7epmMa5)J;muvQaX@wJT5(G5y6{IpNi_d)WQ84Mv%wYArI(4S6o{ z9GfC9sf>#w1d~cr>xRwS>j-zY%i88cEWgLH1z$dXz^)|S#TE7s4te=zi%^0|t~mL+ zhsc5fouwWCBLikSLYt5{9V2u_C;=cH4v?b(*5&6ND{www1)_Fd#ZTX8Y}XhDXQDyEF8cuk-uI1zYcSxi~wgu4}4FVN+(v zI3SOLfAu6L%O$$8h?4|>B9$29pj3l6I6Xwy1=G?3VDH;G|I4N+mQ*BB!Cx@e_8KZZ R$ZG%q002ovPDHLkV1jL0Swm*o1UJJ5|Kw^sC}~2e`QJX#wOuc^nBA}KL5K+R*)es#}`xwxPll3B^4=7 za|4BCAUT#Oe;Nr+1v2d99(qnV@GrMbb$v_X-7W5jWs-3nXVPuS=A7y$wQ&5$_M(fRhM3UzEhN zKMcOCK#KnXmxHSsHh@G1!Q~8zx8VrzuZ7FO%?gnC2_LZe5TU4!#QP`;oH`CyeH(ld zNDQ{~1rgDN_G!4sGSI~)@xCbq9|seINpO=)e3ST{d@0W)+f0#ZE0cPgEIqAJaora~ z&nqMbzeh9N*+q$X{!y}aqE)q^r|vSyZnC__>P}`<#Lu=#I?r{Sn0Z*qO8w|u2UV(1 zspvTv#O|ALFH^)yqg%oQi1N>L!y(|4-3ql`u*w&$vi5sFKG>cytIhg=c1)=d1lCrP3*E`Gv}*%T>jS1jN%P$b?vx{X{eb`$y;*#eP*J&Hz63nZ z2^0>?b&3kCP1qEabfoyqPX%{b7}b?Xu@;-br4iR}+XI7lLjS3!H0YhVlN%M){P`;3 z{Ftx{N-#^NJ-Ae~J+Npw8DpVvl&gABZ%MwJH8#OS=cY$HXG37-&{&Mbzrqfp*c2ElE~cwGRGf*ytJqQ~&di^SGZi?&hBp>A z$gpL7p%FG9c-wj^5C;I9QXoYBg!ek1Ccq}cJtjv3FaUjl#dH+vPeVcBSxz%%wg(41DdeliNu~en7rSnaS+;^q- zU)=yw-y&4FTg(Cw7R|7A(ipEQ`0L?}8z^{Yy#RO8=@^W_7tAdTTAvEkIZWUQVe%fE z@SKN<@*c>o*O`zqslWk(>m7`Squ~z;!@$)W1=k}OxTeC_bpZyhTOhbLFM;bM1lPAP zaQ!m`*P|G?-h$w|1q0V22(Erh;93R2H3S1!R|u}}Vsu>r>H5U^y2dw&-^u^wGg%sE>7uuxLcEiu96)tAw>KR{;i@RsB)z2Jz(q10YHen% zp%Im3(+w&*OcK%1W?FPy?CPgUk}Y&I&}%EjH6gB-#ro4!4%hx29-CG<_*5#J#eyMoy(Cr@2=s`bsS(TmMc` zU+oxVSj?=bC%XQtMm4{Cusb#GVRdJ{a8Z1*oTAP_;t%@5hFT5DcLl5YFz_!{mtpQN zbfKT4Z_wvDWM!-C5EZwTaqk;X5mtyg0&}%2T1NF3eIm)UfQ%CHWu-xxY_b|BXt{$% z=T*~fn>NCzh=Qd2H*3y3E<&4V&4QBL2kTrjSDqOP$N8B|bSPRhCZShLVvMsTs=Zjb zCbsKfdIZy?7td#3q)P(vvXuLFsAA12goS;j?APj zu8pnDN^^Gc;~JR$UM<|YMC-a+zvs&qq?(g3D^6l))|9ml_g`gLYe+opByq(f8tMX= zJCS&+^&FTF*J9naEk=O3)3USmZyE7FiFhxyLNA56Z}{1k|LX%drBv=<08E$~dP?5$ z@8*mc)-=7p-JFzXP&AynV^R$me}j(es?Nh9zDdaL*~(3tlHJP7%N7XkU2haF=4zQa*& zKVxmlg3-`z*BzJOx8<*aP#E*t`2f$bGP||E^9EN`4!lpxfX8kq!;gK>ta7yHjbremy literal 0 HcmV?d00001 diff --git a/planet/main.py b/planet/main.py index d508cb7..dd1d0de 100644 --- a/planet/main.py +++ b/planet/main.py @@ -158,8 +158,10 @@ class Planet(QMainWindow): tabs.setTabIcon(play_tab, QIcon("assets/logo512.png")) features_tab = tabs.addTab(self.features_tab(), "Features") tabs.setTabIcon(features_tab, QIcon("assets/heart512.png")) - mods_tab = tabs.addTab(self.custom_mods_tab(), "Mods") - tabs.setTabIcon(mods_tab, QIcon("assets/portal512.png")) + servers_tab = tabs.addTab(self.servers_tab(), "Servers") + tabs.setTabIcon(servers_tab, QIcon("assets/multiplayer512.png")) + #mods_tab = tabs.addTab(self.custom_mods_tab(), "Mods") + #tabs.setTabIcon(mods_tab, QIcon("assets/portal512.png")) changelog_tab = tabs.addTab(self.changelog_tab(), "Changelog") tabs.setTabIcon(changelog_tab, QIcon("assets/pi512.png")) @@ -271,11 +273,10 @@ class Planet(QMainWindow): layout = QVBoxLayout() self.features = dict() - default_features = launcher.get_features_dict(f"/home/{USER}/.planet-launcher/minecraft.AppImage") - for feature in default_features: + for feature in self.conf["options"]: checkbox = QCheckBox(feature) - if default_features[feature]: + if self.conf["options"][feature]: checkbox.setCheckState(Qt.Checked) else: checkbox.setCheckState(Qt.Unchecked) @@ -304,6 +305,24 @@ class Planet(QMainWindow): widget.setLayout(fakelayout) return widget + + def servers_tab(self) -> QWidget: + widget = QWidget() + layout = QGridLayout() + + self.serversedit = QTextEdit() + + self.serversedit.textChanged.connect(self.save_profile) + with open(f"/home/{USER}/.minecraft-pi/servers.txt") as servers: + self.serversedit.setPlainText(servers.read()) + + infolabel = QLabel("Servers are stored in the format of IP: Port") + + layout.addWidget(self.serversedit, 0, 0) + layout.addWidget(infolabel, 6, 0) + + widget.setLayout(layout) + return widget def custom_mods_tab(self) -> QWidget: layout = QVBoxLayout() @@ -358,6 +377,8 @@ class Planet(QMainWindow): with open(f"/home/{USER}/.planet-launcher/config.json", "w") as file: file.write(json.dumps(self.conf)) + with open(f"/home/{USER}/.minecraft-pi/servers.txt", "w") as file: + file.write(self.serversedit.toPlainText()) def launch(self): self.save_profile()