Merge pull request #25 from mobilegmYT/master

Changed MC java and MC bedrock

apps/Minecraft Bedrock/install

@@ -7,13 +7,13 @@ function error {
 }
 
 # Get dependencies
-"${DIRECTORY}/pkg-install" "flatpak" "$(dirname "$0")" || exit 1
+"${DIRECTORY}/pkg-install" "curl libx11-6 libxext6 libegl1-mesa zlib1g libstdc++6 libgl1-mesa-dri libasound2 libcom-err2 libgmp10 libp11-kit0" "$(dirname "$0")" || exit 1
 
-#Add flathub as a source
-sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-
-#Install through flatpak
-flatpak install -y flathub io.mrarm.mcpelauncher || error 'Failed to install launcher!'
+#Download file
+cd ~
+curl -L https://github.com/ChristopherHX/linux-packaging-scripts/releases/download/appimage/Minecraft_Bedrock_Launcher-armhf.0.0.540.AppImage --output MCBedrock.AppImage
+chmod +x MCBedrock.AppImage
+sudo mv MCBedrock.AppImage /usr/bin/MCBedrock.AppImage
 
 #Make Desktop file
 echo '[Desktop Entry]
@@ -21,9 +21,9 @@ Version=1.1
 Type=Application
 Name=Minecraft Bedrock Launcher
 Comment=A Minecraft: Bedrock Edition
-Icon=/var/lib/flatpak/exports/share/icons/hicolor/scalable/apps/io.mrarm.mcpelauncher.svg
-Exec=/usr/bin/flatpak run --branch=stable --arch=arm --command=mcpelauncher-ui-qt io.mrarm.mcpelauncher
-Categories=Game;' > /home/pi/.local/share/applications/minecraftbedrock.desktop
-
-#echo 'Please please reboot your pi to finish installation'
+Icon=/home/pi/pi-apps/apps/Minecraft Bedrock/icon-64.png
+Exec=/usr/bin/MCBedrock.AppImage
+Categories=Game;
+Terminal=false
+StartupNotify=true' > /home/pi/.local/share/applications/minecraftbedrock.desktop
 

apps/Minecraft Bedrock/uninstall

@@ -6,11 +6,8 @@ function error {
   exit 1
 }
 
-#Uninstall app
-flatpak uninstall -y io.mrarm.mcpelauncher
-
-#Remove flatpak
-sudo apt purge flatpak -y
+#Remove app
+sudo rm /usr/bin/MCBedrock.AppImage
 
 #Remove install folder
-sudo rm -r /home/pi/.var/app/io.mrarm.mcpelauncher/
+sudo rm -r /home/pi/.local/share/mcpelauncher/

apps/Minecraft Java/install

@@ -12,25 +12,21 @@ function error {
 # || error 'reason'
 #example below:
 
-#Download java and launcher
-rm -rf ~/Minecraft
+echo 'WARNING: This install script is only compatiable with 32-bit OSes for the time being. Please press [Enter] to continue.'
+read -p
 
-mkdir ~/Minecraft || error "Failed to create the directory!"
-cd ~/Minecraft || error "Failed to enter the directory!"
-wget https://www.dropbox.com/s/2602i5d0h4kteex/setupMC.sh  || error 'Failed to download launcher!'
-chmod +x setupMC.sh || error "failed to mark as executable!"
-./setupMC.sh
+#Download java and launcher
+mkdir ~/Minecraft && cd ~/Minecraft && wget https://www.dropbox.com/s/2602i5d0h4kteex/setupMC.sh && chmod +x setupMC.sh && ./setupMC.sh || error 'Failed to install the launcher!'
 
 #Move launcher to /usr/share/
-sudo mkdir /usr/share/minecraftjava && sudo mv launcher.jar /usr/share/minecraftjava/launcher.jar 
+sudo mkdir /usr/share/minecraftjava && sudo mv launcher.jar /usr/share/minecraftjava/launcher.jar
 
 #Create desktop shortcut
 cd ~/.local/share/applications/
 wget https://raw.githubusercontent.com/mobilegmYT/pi-apps-resources/main/Minecraft/minecraft.desktop
+chmod +x minecraft.desktop
 cd
 
-sudo chmod +x ~/.local/share/applications/minecraft.desktop
-
 mkdir -p ~/.minecraft
 echo '{
   "profiles": {
@@ -49,6 +45,5 @@ echo '{
   }
 }' > /home/pi/.minecraft/launcher_profiles.json
 
-#sudo update-java-alternatives -s java-1.11.0-openjdk-armhf
-
-java -jar /usr/share/minecraftjava/launcher.jar
+echo 'Installation is now done! You can open the launcher by going to Menu > Games > Minecraft Launcher'
+echo 'NOTE: You can only play versions 1.13 and higher with your current config. To use lower versions, please follow the instructions at https://www.noxxtech.tk/minecraft-install#h.fpnon3xvmuoz'