Merge branch 'master' of https://github.com/ChristopherHX/mcpelaunche…

…r-manifest into preview

.github/workflows/main.yml

@@ -26,6 +26,7 @@ jobs:
       run: |
         export HOMEBREW_MACOSX_DEPLOYMENT_TARGET=10.12.0
         export HOMEBREW_SDKROOT=${{ github.workspace }}/../MacOSX10.13.sdk
+        brew reinstall python
         brew install p7zip libzip libuv protobuf || :
     - uses: actions/setup-python@v1
       with:
@@ -80,6 +81,7 @@ jobs:
       run: |
         export HOMEBREW_MACOSX_DEPLOYMENT_TARGET=10.12.0
         export HOMEBREW_SDKROOT=${{ github.workspace }}/../MacOSX10.14.sdk
+        brew reinstall python
         brew install p7zip libzip libuv protobuf || :
     - uses: actions/setup-python@v1
       with:

README.md

@@ -1,32 +1,45 @@
 # mcpelauncher-manifest
-A fork of MCPE Launcher created by ChristopherHX for the Linux and Mac OS Bedrock Edition Minecraft launcher that supports 1.13.x and 1.14.x.
+A fork of MCPE Launcher created by ChristopherHX for the Linux and Mac OS Bedrock Edition Minecraft launcher **Client** that supports 1.13.x and 1.14.x. **Heavy based on minecraft-linux**
 
  <p align="center">
   <img src="https://user-images.githubusercontent.com/24195572/71060819-64f78c80-211b-11ea-8ea4-f1c2dabb9b54.png"/>
 </p>
 
 # Features
-- Full Linux x86, amd64, ARM support
+- Full Linux x86, amd64 and **ARM** support
 - Limited macOS Sierra, High Sierra, Mojave support
   - **reduced gpu performance** Patched [ANGLE - Almost Native Graphics Layer Engine](https://github.com/minecraft-linux/angle)
 - Support for new Minecraft Releases (1.13+) out of Box
+  - **The mcpelauncher-server only supports 1.12.0.28 and 1.12.1.1**
   - Might break sometime in the future
-- Xbox live login
-  - unstable
-    - Sometime fails silently without an errormessage (might be in the log)
-      - to try it again close Minecraft and open it again
-  - Friend joining works
-    - Sometimes only successful during world loading
+- **unstable** Xbox live login
+  - Sometime fails silently without an errormessage (might be in the log)
+    - to try it again close Minecraft and open it again
+    - may caused by network problems (e.g. unstable internet access)
+  - Friend joining
+    - Sometimes only successful during world loading or won't succeed
 - less game patches needed than the original launcher
+  - defaults to pocket UI
+    - e.g. change it in Settings->General->Video->UI Profile from Pocket to Classic
+  - defaults to 60 fps vsync
+    - vsync is ignored under macOS
+    - can be disabled in options.txt
+  - defaults to larger buttons
+    - e.g. change it in Settings->General->Video->GUI Scale Modifier to -1
+  - **Scripting support isn't enabled**, android defaults to no scripting support
+    - might added back in the future
   - Initializes the game mostly like android does it
     - results in less function patches
     - implemented "java" functions in c++ rather than patching jni function calls
 - More prebuild Linux (disribution) packages supported than the original launcher
-  - Pure Linux x86 distro support on old PCs (SSSE3 CPU instruction set needed)
+  - **Pure Linux x86 distro support on old PCs (SSSE3 CPU instruction set needed)**
+  - **Linux ARM appimage**
 
-# [Issues / Bugs](https://github.com/ChristopherHX/mcpelauncher-manifest/issues)
+# [Known Issues / Bugs](https://github.com/ChristopherHX/mcpelauncher-manifest/issues)
 
 # Installation Guide
+**Currently are the mcpelauncher-client and mcpelauncher-server &ast;.deb packages incompatible**
+
 ## Install Prebuilds for Debian / Ubuntu / archlinux / manjarolinux
 https://github.com/ChristopherHX/linux-packaging-scripts/releases
 
@@ -45,7 +58,7 @@ https://github.com/ChristopherHX/mcpelauncher-manifest/releases
 - armhf, arm64:
 
   `sudo dpkg --add-architecture armhf && sudo apt-get install python3-pip cmake g++-arm-linux-gnueabihf libpng-dev:armhf libx11-dev:armhf libxi-dev:armhf libcurl4-openssl-dev:armhf libudev-dev:armhf libevdev-dev:armhf libegl1-mesa-dev:armhf libasound2:armhf && pip3 install jinja2 ds_store ply`
-  - Only Raspberry Pi
+  - Only Raspberry Pi (Note: raspbian buster with Pi4 and beyond, you might need to override preinstalled mesa)
     - Download https://github.com/ChristopherHX/mcpelauncher-manifest/releases/download/1.12.x.2.armhf.raspbian.buster/mesa.tar.xz and extract to $HOME/mesa
     - it should contain `$HOME/mesa/include` and `$HOME/mesa/lib`
 - Next, in the same window, run `git clone --recursive https://github.com/ChristopherHX/mcpelauncher-manifest.git mcpelauncher && cd mcpelauncher` in the home directory.
@@ -77,22 +90,34 @@ https://github.com/ChristopherHX/mcpelauncher-manifest/releases
   - Then Minecraft Bedrock 1.13.x will begin to start up. Make sure you replace `1.13.X` with your 1.13.X or 1.14.X installation, otherwise this setup will not work for you
 
 **Before starting the new launcher, please remember to download the game with the original Bedrock launcher QT GUI!**
+
 ### Archlinux based (pacman)
 - prerequisites
   - Add the [multilib Repository](https://wiki.archlinux.org/index.php/Official_repositories#multilib) One time setup (Manjaro has it enabled by default, `sudo bash -c "echo '[multilib]' >> /etc/pacman.conf && echo 'Include = /etc/pacman.d/mirrorlist' >> /etc/pacman.conf"`)
 
   `sudo pacman -Syu --noconfirm git util-linux sudo fakeroot binutils autoconf automake libtool pkgconf file make`
 
-  `(git clone https://github.com/ChristopherHX/lib32-check.git lib32-check && cd lib32-check || cd lib32-check && git pull) && makepkg --syncdeps --noconfirm --install && cd .. && (git clone https://aur.archlinux.org/lib32-libevdev.git lib32-libevdev && cd lib32-libevdev || cd lib32-libevdev && git pull) && makepkg --syncdeps --noconfirm --install && cd ..`
+  `(git clone https://github.com/ChristopherHX/lib32-check.git lib32-check || cd lib32-check && git pull) && cd lib32-check && makepkg --syncdeps --noconfirm --install && cd .. && (git clone https://aur.archlinux.org/lib32-libevdev.git lib32-libevdev && cd lib32-libevdev || cd lib32-libevdev && git pull) && cd lib32-libevdev && makepkg --syncdeps --noconfirm --install || :`
 
 - compile and install the core launcher
 
-  `(git clone https://github.com/ChristopherHX/mcpelauncher-linux-git.git mcpelauncher-linux-git && cd mcpelauncher-linux-git || cd mcpelauncher-linux-git && git pull) && makepkg --syncdeps --noconfirm --install && cd ..`
+  `(git clone https://github.com/ChristopherHX/mcpelauncher-linux-git.git mcpelauncher-linux-git || cd mcpelauncher-linux-git && git pull) && cd mcpelauncher-linux-git && makepkg --syncdeps --noconfirm --install || :`
 
 - compile and install Xbox live login support
 
-  `(git clone https://aur.archlinux.org/mcpelauncher-msa-git.git mcpelauncher-msa-git && cd mcpelauncher-msa-git || cd mcpelauncher-msa-git && git pull) && makepkg --syncdeps --noconfirm --install && cd .. && (git clone https://aur.archlinux.org/mcpelauncher-msa-ui-qt-git.git mcpelauncher-msa-ui-qt-git && cd mcpelauncher-msa-ui-qt-git || cd mcpelauncher-msa-ui-qt-git && git pull) && makepkg --syncdeps --noconfirm --install && cd ..`
+  `((git clone https://aur.archlinux.org/mcpelauncher-msa-git.git mcpelauncher-msa-git || cd mcpelauncher-msa-git && git pull)  && cd mcpelauncher-msa-git && makepkg --syncdeps --noconfirm --install || :) && ((git clone https://aur.archlinux.org/mcpelauncher-msa-ui-qt-git.git mcpelauncher-msa-ui-qt-git || cd mcpelauncher-msa-ui-qt-git && git pull) && cd mcpelauncher-msa-ui-qt-git && makepkg --syncdeps --noconfirm --install || :)`
+
 
 - compile and install the launcher GUI
 
-  `(git clone https://github.com/ChristopherHX/mcpelauncher-ui-git.git mcpelauncher-ui-git && cd mcpelauncher-ui-git || cd mcpelauncher-ui-git && git pull) && makepkg --syncdeps --noconfirm --install && cd ..`
+  `(git clone https://github.com/ChristopherHX/mcpelauncher-ui-git.git mcpelauncher-ui-git || cd mcpelauncher-ui-git && git pull) && cd mcpelauncher-ui-git && makepkg --syncdeps --noconfirm --install || :`
+
+### Solus
+- optional `mkdir -p mcpelauncher && cd mcpelauncher`
+  - keeps user folder clean
+- `sudo eopkg install -c system.devel`
+- `sudo eopkg install git mesalib-32bit-devel openssl-32bit-devel curl-32bit-devel libpng-32bit-devel libx11-32bit-devel gcc g++ libgcc-32bit libstdc++-32bit cmake make binutils glibc-32bit-devel libgudev-32bit-devel libxi-32bit-devel`
+- Install libevdev-32bit-devel manually
+`(git clone https://gitlab.freedesktop.org/libevdev/libevdev.git || cd libevdev && git pull) && cd libevdev && ./autogen.sh CFLAGS=-m32 && make && sudo make install && ln -s /usr/local/lib/libevdev.so.2 /usr/lib32/libevdev.so.2 || :`
+- Install mcpelauncher-manifest
+`(git clone --recursive https://github.com/ChristopherHX/mcpelauncher-manifest.git mcpelauncher || cd mcpelauncher && git pull) && cd mcpelauncher && mkdir -p build && cd build && cmake .. -DCMAKE_ASM_FLAGS=-m32 -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32 && make && sudo make install || :`