Merge pull request #746 from mobilegmYT/patch-10

Wait for apt lock to be released and add controls

apps/Minecraft Pi (Modded)/description

@@ -3,3 +3,14 @@ A modded version of Minecraft: Pi Edition with things like survival mode, multip
 To open the launcher: Menu > Games > gMCPIL or jMCPIL, depending on which version you chose at install time. Use the launcher to set up mods and multiplayer.
 
 Need help? Consider asking on MCPI Modded's Discord server instead: https://discord.gg/3wXu3xtr
+
+Controls:
+WASD to move
+Mouse to look around
+F1 key to hide HUD
+F5 to switch to 3rd person view
+
+Notes:
+You must be in gamemode survival and have Touch GUI enabled to use Chests, Crafting Tables, etc.
+To make a crafting table, press "E" and then go to the Craft menu in the upper left-hand corner. Click on what you want to craft, then click the big button with all of the stuff needed to craft the item to craft it.
+Mouse scroll doesn't exist, you need to use your mouse to drag stuff like the crafting menu.

apps/Minecraft Pi (Modded)/install

@@ -22,6 +22,22 @@ if [[ "$(lsb_release -cs)" != "buster" && "$(lsb_release -cs)" != "bullseye" &&
   error "Unsupported RPi OS Version! Your RPi OS version is $(lsb_release -cs), but supported versions are Buster, Bullseye, or Sid. Consider searching how to upgrade your version to RPi OS Buster!"
 fi
 
+# Wait for apt lock to be released
+i=0 
+tput sc 
+while fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do
+     case $(($i % 4)) in
+         0 ) j="-" ;;
+         1 ) j="\\" ;;
+         2 ) j="|" ;;
+         3 ) j="/" ;;
+     esac
+     tput rc
+     echo -en "\r[$j] Waiting for other software managers to finish..." 
+     sleep 0.5
+     ((i=i+1)) 
+done
+
 # Remove Old Minecraft Pi
 sudo apt-get remove -y minecraft-pi &>/dev/null || true
 sudo apt-get remove -y mcpil-r mcpil &>/dev/null || true

apps/Minecraft Pi (Modded)/uninstall

@@ -8,8 +8,7 @@ function error {
 }
 
 sudo apt-get remove -y minecraft-pi-reborn-native &>/dev/null || true
-sudo apt-get remove -y gmcpil &>/dev/null || true
-sudo apt-get remove -y jmcpil &>/dev/null || true
+"${DIRECTORY}/purge-installed" "$(dirname "$0")" || exit 1
 
 sudo apt-get -y autoremove