add flatpak, fix no vsync typo

Author: colbster937

.github/workflows/build.yml

@@ -40,3 +40,23 @@ jobs:
         with:
           name: app-linux
           path: dist/*.AppImage
+          
+  flatpak:
+    runs-on: ubuntu-latest
+    needs: build
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        
+      - name: Build flatpak
+        run: |
+          npm run flatpak
+
+      - name: Upload Flatpak
+        uses: actions/upload-artifact@v4
+        with:
+          name: app-flatpak
+          path: |
+            webmc.flatpak
+            install-flatpak.sh

.gitignore

@@ -1,4 +1,8 @@
 **/.DS_Store
 dist/
 node_modules/
-build/
+build/
+build-dir/
+.flatpak-builder/
+tmp/
+repo/

README.md

@@ -4,4 +4,6 @@
 
 [**macOS**](https://nightly.link/WebMCDevelopment/WebMCDesktop/workflows/build/main/app-macOS.zip)
 
-[**Linux**](https://nightly.link/WebMCDevelopment/WebMCDesktop/workflows/build/main/app-linux.zip)
+[**Linux**](https://nightly.link/WebMCDevelopment/WebMCDesktop/workflows/build/main/app-linux.zip)
+
+[**FlatPak**](https://nightly.link/WebMCDevelopment/WebMCDesktop/workflows/build/main/app-flatpak.zip)

WebMC.desktop

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=WebMC
+Comment=Launch WebMC Desktop
+Exec=run.sh
+Icon=xyz.webmc.desktop
+Terminal=false
+Type=Application
+Categories=Game;

build.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 ARGS="$*"
 
 if [ -z "$ARGS" ]; then

flatpak.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+set -e
+
+if ! [ -d "dist/linux-unpacked" ]; then
+  echo "App not found, please build first."
+  exit 1
+fi
+
+if ! command -v flatpak &> /dev/null; then
+  sudo apt update
+  sudo apt install -y flatpak flatpak-builder
+fi
+
+if ! command -v convert &> /dev/null; then
+  sudo apt install -y imagemagick
+fi
+
+if ! flatpak remotes | grep -q flathub; then
+  flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+fi
+
+if ! flatpak info org.freedesktop.Platform//23.08 &> /dev/null; then
+  flatpak install -y --noninteractive --assumeyes --installation=system flathub org.freedesktop.Platform//23.08
+fi
+
+if ! flatpak info org.freedesktop.Sdk//23.08 &> /dev/null; then
+  flatpak install -y --noninteractive --assumeyes --installation=system flathub org.freedesktop.Sdk//23.08
+fi
+
+if ! flatpak info org.electronjs.Electron2.BaseApp//23.08 &> /dev/null; then
+  flatpak install -y --noninteractive --assumeyes --installation=system flathub org.electronjs.Electron2.BaseApp//23.08
+fi
+
+if ! flatpak info org.freedesktop.Sdk.Extension.node18//23.08 &> /dev/null; then
+  flatpak install -y --noninteractive --assumeyes --installation=system flathub org.freedesktop.Sdk.Extension.node18//23.08
+fi
+
+mkdir -p tmp
+cp -r dist/linux-unpacked/. tmp/app/
+chmod +x tmp/app/webmc
+convert build/icon.iconset/icon_512x512@2x.png -resize 512x512\! tmp/icon.png
+cp WebMC.desktop tmp/
+cp zypak-wrapper.sh tmp/
+
+flatpak-builder --force-clean build-dir xyz.webmc.desktop.yml
+flatpak build-export repo build-dir
+flatpak build-bundle repo webmc.flatpak xyz.webmc.desktop
+
+rm -rf .flatpak-builder
+rm -rf build-dir
+rm -rf repo
+rm -rf tmp

index.js

@@ -4,7 +4,7 @@ const { app, BrowserWindow, screen, Menu } = require('electron')
 
 Menu.setApplicationMenu(null)
 if (process.argv.includes('--portable')) app.setPath('userData', path.join(__dirname, 'data'));
-if (!process.argv.includes('--vsync')) {
+if (process.argv.includes('--no-vsync')) {
   app.commandLine.appendSwitch('disable-frame-rate-limit');
   app.commandLine.appendSwitch('disable-gpu-vsync');
 }

inject.css

@@ -1,4 +1,3 @@
-.settings .setting:nth-child(5),
 .settings .setting.popupTab {
   display: none !important;
 }

install-flatpak.sh

@@ -0,0 +1 @@
+flatpak install --user --assumeyes webmc.flatpak