diff --git a/README.md b/README.md index c8508fa..5ca0698 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,14 @@ Planet is a **maintained, feature-rich and a flexible** launcher. It is supporte If you're installing a DEB, all of them with the exception of Minecraft: Pi Edition: Reborn will be automatically installed. Please install an AppImage for the latest build. If you want a DEB, please consider checking out [MCPI++](https://github.com/mobilegmyt/mcpi-reborn-extended). #### Installation +###### Option A (Raspberry Pi Only) +[![badge](https://github.com/Botspot/pi-apps/blob/master/icons/badge.png?raw=true)](https://github.com/Botspot/pi-apps) +###### Option B (Raspberry Pi Only) +[![badge](https://cdn.discordapp.com/attachments/717494538205397052/957080742293295134/addonsmini.png)](https://raspbian-addons.org) +Install the `planet-launcher` package through APT. +###### Option C (Any Debian-Based) +Use [our PPA](https://github.com/mcpiscript/ppa) +###### Option D (Manual Installation) 1. Download the DEB from the releases section. 2. Install the DEB using `apt` 3. Follow the on-screen instructions diff --git a/planet/main.py b/planet/main.py index 82f5219..2701acc 100644 --- a/planet/main.py +++ b/planet/main.py @@ -245,6 +245,7 @@ class Planet(QMainWindow): "render_distance": "Short", "theme": theme, "discord_rpc": True, + "version": "extended_2.3.2" } with open( @@ -394,9 +395,22 @@ class Planet(QMainWindow): self.skin_button = QPushButton("Select Skin") self.skin_button.clicked.connect(self.select_skin) - + self.versionbox = QComboBox() - self.versionbox.addItems(["Far", "Normal", "Short", "Tiny"]) # Set the values + + versions = json.loads(web.get_versions())["versions"] + + version_list = list() + + for version in versions: + version_list.append(versions[version]) + + version_name_list = list() + + for version in version_list: + version_name_list.append(version["name"]) + + self.versionbox.addItems(version_name_list) # Set the values self.versionbox.setCurrentText("Short") # Set the default option self.playbutton = QPushButton("Play") # The most powerful button @@ -432,7 +446,7 @@ class Planet(QMainWindow): layout.addWidget(self.showlauncher, 6, 4) layout.addWidget(self.skin_button, 6, 0) - + layout.addWidget(self.versionbox, 8, 0, 1, 3) layout.addWidget(self.playbutton, 8, 4, 1, 2) diff --git a/planet/splashes.py b/planet/splashes.py index d0acb4d..e23d9db 100644 --- a/planet/splashes.py +++ b/planet/splashes.py @@ -39,6 +39,8 @@ SPLASHES = [ "Підтримай Україну!", "Supercalifragilisticexpialidocious!", "Now with multiplayer!", - "ENGINEER GAMING", - "Play Minecraft Pi Edition, watch Red-Exe-Engineer, get PIG!", + "RED EXE ENGINEER GAMING", + "Play Minecraft Pi Edition, watch Red-Exe-Engineer, get PIG!", + "Wat", + "About the same size as Earth", ] diff --git a/planet/web.py b/planet/web.py index bd1eb57..b061a7d 100644 --- a/planet/web.py +++ b/planet/web.py @@ -1,14 +1,13 @@ -from urllib.request import Request, urlopen +from urllib.request import urlopen import requests def get_versions() -> str: return str( urlopen( - Request( - "https://gist.github.com/leha-code/3e8fea40346536b451e45fc1728ed250/raw/versions.json" - ) - ).read() + "https://gist.github.com/leha-code/3e8fea40346536b451e45fc1728ed250/raw/versions.json" + ).read(), + "UTF-8", )