Merge pull request #683 from mobilegmYT/patch-10

Change mcpi modded to apt repo

apps/Minecraft Pi (Modded)/credits

@@ -1,4 +1,4 @@
-Game mods made by TheBrokenRail#5376 on Discord
-Launcher made by Alvarito050506#8207 on Discord
+Game mods and jMCPIL made by TheBrokenRail#5376 on Discord
+gMCPIL made by Alvarito050506#8207 on Discord
 
-Ported to pi-apps by TheBrokenRail#5376 on Discord with a little help from Botspot.
+Ported to Pi-Apps by TheBrokenRail#5376 on Discord with a little help from Botspot.

apps/Minecraft Pi (Modded)/description

@@ -1,7 +1,5 @@
-A modded version of Minecraft: Pi Edition with things like survival mode, multiplayer support and more!
+A modded version of Minecraft: Pi Edition with things like survival mode, multiplayer support, and more!
 
-To open the launcher: Menu > Games > MCPIL. Use the launcher to set up mods and multiplayer.
-NOTE: Make sure "GPU Driver" is set to Full/Fake in "raspi-config".
+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? If it's related to an error or a bug, ask it on the Pi-Apps discord or open an issue on Pi-Apps.
-But if it's related to using Minecraft Pi, then consider asking on MCPI's Discord server instead: https://discord.gg/3wXu3xtr
+Need help? Consider asking on MCPI Modded's Discord server instead: https://discord.gg/3wXu3xtr

apps/Minecraft Pi (Modded)/install

@@ -4,11 +4,6 @@
 ## Config
 ##
 
-# Used To Trigger Updates
-MCPI_REBORN_VERSION='build_52'
-# MCPIL Version
-MCPIL_VERSION='0.1.9'
-
 set -e
 
 DIRECTORY="$(dirname "$(dirname "$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )")")"
@@ -19,92 +14,36 @@ function error {
   exit 1
 }
 
-function install_deb {
-  echo "Installing $1..."
-  sudo dpkg -i "$1" || : # Expected To Fail
-  sudo apt-get --fix-broken install --no-install-recommends -y || error 'Unable To Complete Install'
-}
-
 ##
 ## Install mcpi-reborn
 ##
 
 if [[ "$(lsb_release -cs)" != "buster" && "$(lsb_release -cs)" != "bullseye" && "$(lsb_release -cs)" != "sid" ]]; then
-    error "Unsupported Debian Version! Your Debian version is $(lsb_release -cs), but supported versions are Buster, Bullseye, or Sid."
+  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
 
 # Remove Old Minecraft Pi
 sudo apt-get remove -y minecraft-pi &>/dev/null || true
-sudo apt-get remove -y minecraft-pi-native &>/dev/null || true
-sudo apt-get remove -y mcpil-r &>/dev/null || true
-
-# Debian Buster Support
-if [[ "$(lsb_release -cs)" = "buster" ]]; then
-  # Uninstall Old Docker
-  sudo apt-get remove -y docker.io >/dev/null
-  
-  # Setup Backports Repo On Buster
-  if ! grep -q '^deb http://deb.debian.org/debian buster-backports main$' /etc/apt/sources.list; then
-    # Install Backports Repository
-    echo 'deb http://deb.debian.org/debian buster-backports main' | sudo tee -a /etc/apt/sources.list
-    # Sign backports repo
-    sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 04EE7237B7D453EC
-    sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 648ACFD622F3D138
-    # Update APT Index
-    sudo apt-get update
-    # Install Updated libseccomp2
-    sudo apt-get install --no-install-recommends -y -t buster-backports libseccomp2
-  fi
-fi
-
-# Install Docker
-if command -v docker &>/dev/null ;then
-  echo "Docker is installed at $(command -v docker)"
-else
-  echo "Docker is not installed. Running Docker install script..."
-  curl -fsSL https://get.docker.com -o "${STORAGE}/get-docker.sh" || error 'Unable To Download Docker Install Script'
-  sudo sh "${STORAGE}/get-docker.sh" || error 'Unable To Install Docker'
-  rm "${STORAGE}/get-docker.sh"
-fi
-
-# Prepare
-rm -rf "${STORAGE}/mcpi-reborn"
-mkdir "${STORAGE}/mcpi-reborn"
-
-# Download DEBs
-wget -O "${STORAGE}/mcpi-reborn/deb.zip" https://jenkins.thebrokenrail.com/job/minecraft-pi-reborn/job/master/lastSuccessfulBuild/artifact/out/deb/*zip*/deb.zip || error 'Unable To Download deb.zip! Check your internet connection and try again.'
-
-# Unzip DEBs
-unzip "${STORAGE}/mcpi-reborn/deb.zip" -d "${STORAGE}/mcpi-reborn" || error 'Unable to extract deb.zip! Check your internet connection and try again.'
-
-# Find DEB
-MCPI_DOCKER_DEB="$(find "${STORAGE}/mcpi-reborn/deb" -name 'minecraft-pi-reborn-native*.deb')"
-
-# Install DEB
-install_deb "${MCPI_DOCKER_DEB}"
-
-# Clean Up
-rm -rf "${STORAGE}/mcpi-reborn"
-
-##
-## Install MCPIL
-##
-
-MCPIL_URL="https://github.com/MCPI-Revival/MCPIL/releases/download/${MCPIL_VERSION}/mcpil_${MCPIL_VERSION}_all.deb"
-
-# Prepare
-rm -rf "${STORAGE}/mcpil"
-mkdir "${STORAGE}/mcpil"
-
-# Download DEB
-wget -O "${STORAGE}/mcpil/mcpil.deb" "${MCPIL_URL}"
-
-# Install DEB
-install_deb "${STORAGE}/mcpil/mcpil.deb"
-
-# Clean Up
-rm -rf "${STORAGE}/mcpil"
-
-# Update Docker Permissions
-sudo groupadd -f docker
-sudo usermod -aG docker "$(id -un)"
+sudo apt-get remove -y mcpil-r mcpil &>/dev/null || true
+
+wget -qO- https://raw.githubusercontent.com/MCPI-Revival/mcpi-packages/master/install.sh | bash &>/dev/null || error "Failed to install apt repo!"
+
+# Choose MCPIL to use
+PS3='Which launcher for MCPI Modded would you like to use? (Need help deciding? Ask here: https://discord.com/invite/aDqejQGMMy): '
+options=("gMCPIL (recommended)" "jMCPIL (better GUI)" "Quit")
+select opt in "${options[@]}"
+do
+  case $opt in
+    "${options[0]}")
+        "${DIRECTORY}/pkg-install" "minecraft-pi-reborn-client gmcpil" "$(dirname "$0")" || exit 1
+        break;;
+    "${options[1]}")
+        "${DIRECTORY}/pkg-install" "minecraft-pi-reborn-client jmcpil" "$(dirname "$0")" || exit 1
+        break;;
+    "${options[2]}")
+        break;;
+    *) echo "Invalid option: $REPLY";;
+  esac
+done
+
+pip3 install mcpi

apps/Minecraft Pi (Modded)/uninstall

@@ -7,5 +7,10 @@ function error {
   exit 1
 }
 
-sudo apt-get remove -y minecraft-pi-native &>/dev/null || true
-sudo apt-get remove -y mcpil &>/dev/null || true
+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
+
+sudo apt-get -y autoremove
+
+sudo rm /etc/apt/sources.list.d/mcpi-revival.list