Merge branch 'main' into batch-file-for-ns-vanilla-launch

Co-authored-by: Jack <66967891+ASpoonPlaysGames@users.noreply.github.com>

.github/workflows/add-to-project.yml

@@ -1,20 +0,0 @@
-name: add-to-project
-
-on:
-  issues:
-    types:
-      - opened
-  pull_request_target:
-    types:
-      - opened
-
-jobs:
-  add-to-project:
-    name: Add to project
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/add-to-project@v0.5.0
-        with:
-          project-url: "https://github.com/orgs/R2Northstar/projects/3"
-          github-token: "${{ secrets.PROJECT_BOARD_TOKEN }}"
-

.github/workflows/build.yml

@@ -20,24 +20,20 @@ jobs:
   build-northstar:
     runs-on: ubuntu-20.04
     steps:
-      - name: Checkout release files
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ env.NORTHSTAR_VERSION }}
-          path: northstar
-      - name: Wait for launcher release build to be ready
-        timeout-minutes: 30 # Only wait for 30 minutes. If we take longer, something probably broke
-        run:
-          bash northstar/wait_for_launcher_dl.sh $NORTHSTAR_VERSION
       - name: Download compiled launcher
         run:
           wget "https://github.com/R2Northstar/NorthstarLauncher/releases/download/${{ env.NORTHSTAR_VERSION }}/northstar-launcher.zip"
       - name: Download DiscordRPC plugin
         run:
-          wget "https://github.com/R2Northstar/NorthstarDiscordRPC/releases/download/v6/northstar-discord-rpc.zip"
+          wget "https://github.com/R2Northstar/NorthstarDiscordRPC/releases/download/v4/northstar-discord-rpc.zip"
       - name: Download compiled stubs
         run:
           wget "https://github.com/R2Northstar/NorthstarStubs/releases/download/v1/NorthstarStubs.zip"
+      - name: Checkout release files
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ env.NORTHSTAR_VERSION }}
+          path: northstar
       - name: Checkout core mods
         uses: actions/checkout@v3
         with:
@@ -57,14 +53,14 @@ jobs:
           git ls-tree -r $NORTHSTAR_VERSION --name-only | xargs -L1 md5sum >> md5sum.txt
       - name: Make folder structure
         run: |
-          mv --verbose northstar/release/* northstar/.
-          rm --dir northstar/release
-          mkdir --parents northstar/R2Northstar/mods
-          mkdir --parents northstar/R2Northstar/plugins
-          mkdir --parents northstar/bin/x64_dedi
+          mv -v northstar/release/* northstar/.
+          rm -d northstar/release
+          mkdir -p northstar/R2Northstar/mods
+          mkdir -p northstar/R2Northstar/plugins
+          mkdir -p northstar/bin/x64_dedi
 
           unzip northstar-discord-rpc.zip -d northstar/R2Northstar/plugins
-
+          
           unzip NorthstarStubs.zip -d northstar/bin/x64_dedi
           unzip northstar-launcher.zip -d northstar
           rsync -avr --exclude="Northstar.Coop" --exclude=".git*" northstar-mods/. northstar/R2Northstar/mods
@@ -76,13 +72,13 @@ jobs:
           path: northstar-navs
       - name: Navmeshes setup
         run: |
-          mkdir --parents northstar/R2Northstar/mods/Northstar.CustomServers/mod/maps
-          mv --verbose northstar-navs/graphs northstar/R2Northstar/mods/Northstar.CustomServers/mod/maps
-          mv --verbose northstar-navs/navmesh northstar/R2Northstar/mods/Northstar.CustomServers/mod/maps
+          mkdir -p northstar/R2Northstar/mods/Northstar.CustomServers/mod/maps
+          mv -v northstar-navs/graphs northstar/R2Northstar/mods/Northstar.CustomServers/mod/maps
+          mv -v northstar-navs/navmesh northstar/R2Northstar/mods/Northstar.CustomServers/mod/maps
       - name: Cleanup root Northstar repository files
         working-directory: northstar
         run: |
-          rm -rf .git .github .gitignore *.md LICENSE thunderstore .ci.env.example *.sh
+          rm -rf .git .github .gitignore *.md LICENSE thunderstore .ci.env.example
       - name: Upload
         uses: actions/upload-artifact@v3
         with:
@@ -122,14 +118,14 @@ jobs:
     steps:
       - name: Setup tcli
         run: |
-          wget --output-document tcli.tar.gz https://github.com/thunderstore-io/thunderstore-cli/releases/download/0.1.4/tcli-0.1.4-linux-x64.tar.gz
+          wget -O tcli.tar.gz https://github.com/thunderstore-io/thunderstore-cli/releases/download/0.1.4/tcli-0.1.4-linux-x64.tar.gz
           tar xvf tcli.tar.gz
-          sudo mv --verbose tcli-0.1.4-linux-x64/tcli /bin
+          sudo mv -v tcli-0.1.4-linux-x64/tcli /bin
 
       - name: (DEBUG) Download Northstar package
         if: ${{ env.ACT }} # Download Northstar package from releases when running locally instead of relying on previous jobs
         run: |
-          wget --output-document northstar.zip https://github.com/R2Northstar/Northstar/releases/download/v1.6.3/Northstar.release.v1.6.3.zip
+          wget -O northstar.zip https://github.com/R2Northstar/Northstar/releases/download/v1.6.3/Northstar.release.v1.6.3.zip
           unzip northstar.zip -d northstar
 
       - name: Download Northstar package
@@ -141,10 +137,10 @@ jobs:
 
       - name: Make package structure
         run: |
-          mkdir --parents thunderstore/dist/Northstar
-          mv --verbose northstar/* thunderstore/dist/Northstar
-          wget --output-document thunderstore/icon.png https://raw.githubusercontent.com/R2Northstar/Northstar/main/thunderstore/icon.png
-          wget --output-document thunderstore/README.md https://raw.githubusercontent.com/R2Northstar/Northstar/main/thunderstore/README.md
+          mkdir -p thunderstore/dist/Northstar
+          mv -v northstar/* thunderstore/dist/Northstar
+          wget -O thunderstore/icon.png https://raw.githubusercontent.com/R2Northstar/Northstar/main/thunderstore/icon.png
+          wget -O thunderstore/README.md https://raw.githubusercontent.com/R2Northstar/Northstar/main/thunderstore/README.md
 
       - name: Setup environment variables
         run: |
@@ -167,9 +163,9 @@ jobs:
         run: |
           tcli init --package-name=$TS_MOD_NAME --package-namespace=$TS_NAMESPACE --package-version $MOD_VERSION
 
-          sed --in-place "s/communities = \[\]/communities = [\"$TS_COMMUNITY\"]/g" thunderstore.toml
-          sed --in-place "s/Example-Dependency = \"1.0.0\"//g" thunderstore.toml
-          sed --in-place "s/description = \"Example mod description\"/description = \"$TS_MOD_DESCRIPTION\"/g" thunderstore.toml
+          sed -i "s/communities = \[\]/communities = [\"$TS_COMMUNITY\"]/g" thunderstore.toml
+          sed -i "s/Example-Dependency = \"1.0.0\"//g" thunderstore.toml
+          sed -i "s/description = \"Example mod description\"/description = \"$TS_MOD_DESCRIPTION\"/g" thunderstore.toml
           cat thunderstore.toml
 
           tcli build

.github/workflows/post-to-mastodon.yml

@@ -1,17 +0,0 @@
-name: Post-to-Mastodon
-on:
-  release:
-    types: [published]
-
-jobs:
-  toot:
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Send toot to Mastodon
-        id: mastodon
-        uses: cbrgm/mastodon-github-action@v1
-        with:
-          message: "We just released Northstar ${{ github.event.release.tag_name }}\n\n${{ github.event.release.html_url }}"
-        env:
-          MASTODON_URL: ${{ secrets.MASTODON_URL }}
-          MASTODON_ACCESS_TOKEN: ${{ secrets.MASTODON_ACCESS_TOKEN }}

release/r2vanilla.bat

@@ -0,0 +1,3 @@
+:: This launches Northstar with a profile that usually shouldn't exist. As such it won't load any NorthstarMods and behave close to a vanilla client outside of patches in Launcher code
+:: Disabling ClientCommands with `-norestrictservercommands` is needed for vanilla to be able to transfer you to a game from lobby with `connect`
+start "NorthstarLauncher | R2Vanilla" NorthstarLauncher.exe -norestrictservercommands -profile=R2Vanilla

wait_for_launcher_dl.sh

@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# Check if contains command line arg
-if [ -z "$1" ]; then
-    echo "Missing command-line argument."
-    exit 1
-fi
-
-url="https://github.com/R2Northstar/NorthstarLauncher/releases/download/$1/northstar-launcher.zip"
-wait_time_seconds=60
-
-# Loop until the response code changes
-while true; do
-    response=$(curl --silent --output /dev/null --write-out "%{http_code}" $url)
-    if [ $response -eq 404 ]; then
-        echo "Response is 404. Retrying in $wait_time_seconds seconds."
-        sleep $wait_time_seconds
-    else
-        echo "Site is accessible with response code $response."
-        break
-    fi
-done
-
-# 10 second sleep just in case we hit some weird race condition
-# where files are still being uploaded but release is done
-sleep 10