merge 98.0 changes

.github/create-release.sh

@@ -0,0 +1,4 @@
+set -euo pipefail
+IFS=$'\t\n'
+
+gh release create --draft --verify-tag --title $RELEASE_NAME $GITHUB_REF_NAME

.github/emscripten-ghactions.ini

@@ -0,0 +1,11 @@
+[binaries]
+c = 'emcc'
+cpp = 'em++'
+strip = 'emstrip'
+ar = 'emar'
+
+[host_machine]
+system = 'emscripten'
+cpu_family = 'wasm32'
+cpu = 'wasm32'
+endian = 'little'

.github/macaa64-ghactions.ini

@@ -1,6 +1,7 @@
 [binaries]
 c = [ 'clang', '-arch', 'arm64' ]
 cpp = [ 'clang++', '-arch', 'arm64' ]
+objcpp = [ 'clang++', '-arch', 'arm64' ]
 strip = 'strip'
 
 [host_machine]

.github/mingw-ghactions.ini

@@ -2,8 +2,8 @@
 prefix = 'x86_64-w64-mingw32'
 
 [binaries]
-c = prefix + '-gcc-posix'
-cpp = prefix + '-g++-posix'
+c = prefix + '-gcc'
+cpp = prefix + '-g++'
 strip = prefix + '-strip'
 windres = prefix + '-windres'
 

.github/starcatcher-publish.sh

@@ -3,4 +3,16 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-LFTP_PASSWORD=$PUBLISH_PASSWORD lftp -c "open --user '$PUBLISH_USERNAME' --env-password -e 'set ftp:ssl-protect-data true; set ssl:verify-certificate false; cd "${PUBLISH_DIRECTORY:-.}"; put \"$PUBLISH_FILENAME\";' ftp://$PUBLISH_HOSTPORT"
+cat << NETRC > ~/.netrc
+machine $(echo $PUBLISH_HOSTPORT | cut -d ':' -f 1)
+login $PUBLISH_USERNAME
+password $PUBLISH_PASSWORD
+NETRC
+chmod 660 ~/.netrc
+
+mountpoint=ftpmnt
+mkdir $mountpoint
+curlftpfs "$PUBLISH_HOSTPORT" $mountpoint -o ssl,ciphers='ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES128-GCM-SHA256:TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256:TLS_AES_128_CCM_8_SHA256:TLS_AES_128_CCM_SHA256'
+cp $PUBLISH_FILENAME $mountpoint/${PUBLISH_DIRECTORY:-.}/
+fusermount -u $mountpoint
+rmdir $mountpoint

.github/upload-release-asset.sh

@@ -0,0 +1,12 @@
+set -euo pipefail
+IFS=$'\t\n'
+
+temp=.temp
+mkdir $temp
+cp $ASSET_PATH $temp/$ASSET_NAME
+(
+	cd $temp
+	gh release upload $GITHUB_REF_NAME $ASSET_NAME
+)
+rm -r $temp
+echo browser_download_url=https://github.com/$GITHUB_REPOSITORY/releases/download/$GITHUB_REF_NAME/$ASSET_NAME >> $GITHUB_OUTPUT

.github/vs-env.sh

@@ -24,5 +24,8 @@ IFS=$'\t\n'
 for i in $(MSYS_NO_PATHCONV=1 cmd /c "$vs_install_dir\\VC\\Auxiliary\\Build\\vcvarsall.bat" $VS_ENV_PARAMS \& env \& exit /b); do
 	set +e
 	export "$i" 2>/dev/null
+	echo $i | grep ERROR
 	set -e
 done
+
+cl

.github/workflows/build.yaml

@@ -16,7 +16,6 @@ jobs:
   prepare:
     runs-on: ubuntu-latest
     outputs:
-      release_upload_url: ${{ steps.create_release.outputs.upload_url }}
       do_release: ${{ steps.prepare.outputs.do_release }}
       build_matrix: ${{ steps.prepare.outputs.build_matrix }}
       publish_matrix: ${{ steps.prepare.outputs.publish_matrix }}
@@ -32,39 +31,69 @@ jobs:
       do_publish: ${{ steps.prepare.outputs.do_publish }}
     steps:
       - run: git config --global core.autocrlf false
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.10'
-      - run: python -m pip install meson ninja
+      - run: python -m pip install meson==1.2.3 ninja # TODO: go back to using latest meson once https://github.com/mesonbuild/meson/pull/12544 is live
       - id: prepare
         run: python ./.github/prepare.py
         env:
           PUBLISH_HOSTPORT: ${{ secrets.STARCATCHER_PUBLISH_HOSTPORT }}
           GITHUB_REF: ${{ github.ref }}
       - if: steps.prepare.outputs.do_release == 'yes'
         id: create_release
-        uses: LBPHacker/create-release@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: ${{ steps.prepare.outputs.release_name }}
-          draft: true
-          prerelease: false
+          RELEASE_NAME: ${{ steps.prepare.outputs.release_name }}
+        run: bash -c './.github/create-release.sh'
   build:
     runs-on: ${{ matrix.runs_on }}
+    name: ${{ matrix.job_name }}
     needs: [prepare]
     strategy:
       fail-fast: false
       matrix: ${{ fromJSON(needs.prepare.outputs.build_matrix) }}
+    defaults:
+      run:
+        shell: ${{ matrix.shell }}
     steps:
+      - if: matrix.force_msys2_bash == 'yes'
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: UCRT64
+          update: true
+          path-type: strict
+          cache: true
+          # this list doesn't have to mirror the one in build.sh perfectly
+          # but the packages listed here get cached properly and take less time to install
+          install: >-
+            git
+            curl
+            mingw-w64-ucrt-x86_64-gcc
+            mingw-w64-ucrt-x86_64-pkgconf
+            mingw-w64-ucrt-x86_64-bzip2
+            mingw-w64-ucrt-x86_64-luajit
+            mingw-w64-ucrt-x86_64-jsoncpp
+            mingw-w64-ucrt-x86_64-curl
+            mingw-w64-ucrt-x86_64-SDL2
+            mingw-w64-ucrt-x86_64-libpng
+            mingw-w64-ucrt-x86_64-meson
+            mingw-w64-ucrt-x86_64-python
+            mingw-w64-ucrt-x86_64-python-pip
+            mingw-w64-ucrt-x86_64-fftw
+            mingw-w64-ucrt-x86_64-cmake
+            mingw-w64-ucrt-x86_64-7zip
+            mingw-w64-ucrt-x86_64-jq
+            patch
       - run: git config --global core.autocrlf false
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - if: matrix.force_msys2_bash != 'yes'
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
-      - run: python -m pip install meson ninja
+      - if: matrix.force_msys2_bash != 'yes'
+        run: python -m pip install meson==1.2.3 ninja # TODO: go back to using latest meson once https://github.com/mesonbuild/meson/pull/12544 is live
       - if: matrix.bsh_build_platform == 'darwin'
         run: brew install bash coreutils
       - run: bash -c './.github/build.sh'
@@ -88,30 +117,24 @@ jobs:
           PACKAGE_MODE: ${{ matrix.package_mode }}
           ASSET_PATH: ${{ matrix.asset_path }}
           DEBUG_ASSET_PATH: ${{ matrix.debug_asset_path }}
-      - uses: LBPHacker/upload-release-asset@v2 # TODO-NTL: ship licenses
-        if: needs.prepare.outputs.do_release == 'yes' && matrix.publish == 'yes'
+      - if: needs.prepare.outputs.do_release == 'yes' && matrix.publish == 'yes' # TODO-NTL: ship licenses
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.prepare.outputs.release_upload_url }}
-          asset_path: build/${{ matrix.asset_path }}
-          asset_name: ${{ matrix.asset_name }}
-          asset_content_type: application/zip
-      - uses: LBPHacker/upload-release-asset@v2
-        if: needs.prepare.outputs.do_release == 'yes' && matrix.publish == 'yes' && matrix.separate_debug == 'yes'
+          ASSET_PATH: build/${{ matrix.asset_path }}
+          ASSET_NAME: ${{ matrix.asset_name }}
+        run: bash -c './.github/upload-release-asset.sh'
+      - if: needs.prepare.outputs.do_release == 'yes' && matrix.publish == 'yes' && matrix.separate_debug == 'yes'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.prepare.outputs.release_upload_url }}
-          asset_path: build/${{ matrix.debug_asset_path }}
-          asset_name: ${{ matrix.debug_asset_name }}
-          asset_content_type: application/zip
-      - uses: actions/upload-artifact@v3
+          ASSET_PATH: build/${{ matrix.debug_asset_path }}
+          ASSET_NAME: ${{ matrix.debug_asset_name }}
+        run: bash -c './.github/upload-release-asset.sh'
+      - uses: actions/upload-artifact@v4
         if: matrix.artifact == 'yes'
         with:
           path: build/${{ matrix.asset_path }}
           name: ${{ matrix.asset_name }}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: matrix.artifact == 'yes' && matrix.separate_debug == 'yes'
         with:
           path: build/${{ matrix.debug_asset_path }}
@@ -125,12 +148,12 @@ jobs:
     if: needs.prepare.outputs.do_publish == 'yes'
     steps:
       - run: git config --global core.autocrlf false
-      - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v3
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
         with:
           name: ${{ matrix.asset_name }}
       - run: mv ${{ matrix.asset_path }} ${{ matrix.starcatcher_name }}
-      - run: sudo apt update && sudo apt install lftp && bash -c './.github/starcatcher-publish.sh'
+      - run: sudo apt update && sudo apt install curlftpfs && bash -c './.github/starcatcher-publish.sh'
         env:
           PUBLISH_HOSTPORT: ${{ secrets.STARCATCHER_PUBLISH_HOSTPORT }}
           PUBLISH_USERNAME: ${{ secrets.STARCATCHER_PUBLISH_USERNAME }}
@@ -143,7 +166,7 @@ jobs:
     if: needs.prepare.outputs.do_publish == 'yes'
     steps:
       - run: git config --global core.autocrlf false
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: ./.github/starcatcher-release.sh
         env:
           RELEASE_NAME: ${{ needs.prepare.outputs.release_name }}

README.md

@@ -42,7 +42,6 @@ HUD changes:
 
 Other quality-of-life changes:
 - Alt-F continues updating particles until it encouters an "interesting" update (create\_part, delete\_part or part\_change\_type called), and does not display any log messages until the frame is completed.
-- You can paste and place stamps outside the simulation boundary.
 - When pasting or placing stamps, the white dotted paste boundary is not shown.
 - If you attempt to open a save or close the window with the ESC button (the case for closing with the 'X' button has not been implemented) when there are unsaved changes, a confirmation warning is displayed.
 - If you attempt to save when you're in the middle of a frame, a confirmation warning is displayed.
@@ -62,7 +61,6 @@ New Lua interfaces:
 - `tpt.setrecordinterval(num_frames: int)`: Changes the recording interval to once every `num_frames` frames.
 - `sim.reloadParticleOrder()`: Reloads particle order.
 - (v1.13) `tpt.set_bray_life_brightness_threshold(thres: int)`: Make BRAY visible even when its life is low. `thres` is added to BRAY's alpha value when it is in the non-solid (i.e. `life != 2`) state.
-- (v1.14) `event.prehuddraw`: Event that gets fired just before the HUD is rendered. This allows Lua scripts to draw interfaces below the HUD.
 
 Note that the original game already supports the following subframe debugging features (enable with the Lua command `tpt.setdebug(0x8)`):
 - Shift-F updates all particles up to the particle where your mouse is at.
@@ -192,3 +190,7 @@ v1.14:
 v1.15:
 - Merge changes in 97.0.
 - Don't change particle IDs in stack edit if stack mode is not enabled.
+
+v1.16:
+- Merge changes in 98.0.
+- Remove prehuddraw Lua event (you can use aftersimdraw instead).

android/AndroidManifest.template.xml

@@ -2,12 +2,12 @@
 <manifest
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	package="@APPID@"
-	android:versionCode="1"
-	android:versionName="1.0"
+	android:versionCode="@BUILD_NUM@"
+	android:versionName="@DISPLAY_VERSION_MAJOR@.@DISPLAY_VERSION_MINOR@.@BUILD_NUM@"
 	android:installLocation="auto"
 >
 	<uses-sdk
-		android:minSdkVersion="19"
+		android:minSdkVersion="21"
 		android:targetSdkVersion="30"
 	/>
 	<uses-feature
@@ -33,16 +33,18 @@
 		android:name="android.hardware.type.pc"
 		android:required="false"
 	/>
-	<uses-permission android:name="android.permission.VIBRATE" />
+	@ANDROID_PERMISSIONS@
 	<application
 		android:label="@string/app_name"
 		android:icon="@mipmap/ic_launcher"
 		android:allowBackup="true"
 		android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 		android:hardwareAccelerated="true"
+		@ANDROID_PROPERTIES@
 	>
 		<activity
 			android:name=".PowderActivity"
+			android:screenOrientation="landscape"
 			android:label="@string/app_name"
 			android:alwaysRetainTaskState="true"
 			android:launchMode="singleInstance"

android/PowderActivity.template.java

@@ -1,7 +1,42 @@
 package @APPID@;
 
 import org.libsdl.app.SDLActivity;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.util.Enumeration;
+import java.io.IOException;
+import java.util.Base64;
 
 public class PowderActivity extends SDLActivity
 {
+	public static String getCertificateBundle()
+	{
+		String allPems = "";
+		try {
+			KeyStore ks = KeyStore.getInstance("AndroidCAStore");
+			if (ks != null) {
+				ks.load(null, null);
+				Enumeration<String> aliases = ks.aliases();
+				while (aliases.hasMoreElements()) {
+					String alias = (String)aliases.nextElement();
+					java.security.cert.X509Certificate cert = (java.security.cert.X509Certificate)ks.getCertificate(alias);
+					allPems += "-----BEGIN CERTIFICATE-----\n" + Base64.getMimeEncoder().encodeToString(cert.getEncoded()) + "\n-----END CERTIFICATE-----\n";;
+				}
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+			return "";
+		} catch (KeyStoreException e) {
+			e.printStackTrace();
+			return "";
+		} catch (NoSuchAlgorithmException e) {
+			e.printStackTrace();
+			return "";
+		} catch (java.security.cert.CertificateException e) {
+			e.printStackTrace();
+			return "";
+		}
+		return allPems;
+	}
 }

android/cross/arm.ini

@@ -1,5 +1,5 @@
 [constants]
-android_ndk_toolchain_prefix = 'armv7a-linux-androideabi19-'
+android_ndk_toolchain_prefix = 'armv7a-linux-androideabi21-'
 
 [host_machine]
 system = 'android'

android/cross/x86.ini

@@ -1,5 +1,5 @@
 [constants]
-android_ndk_toolchain_prefix = 'i686-linux-android19-'
+android_ndk_toolchain_prefix = 'i686-linux-android21-'
 
 [host_machine]
 system = 'android'