Inventory, entity rendering, block breaking, entity interaction, and more

.github/workflows/build.yml

@@ -7,41 +7,63 @@ on:
 
 jobs:
   build-macos:
-    runs-on: macOS-12
+    runs-on: macOS-15
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v6
       - name: List Xcodes
         run: ls /Applications
-      - name: Force Xcode 14.2
-        run: sudo xcode-select -switch /Applications/Xcode_14.2.app
+      - name: Force Xcode 16.4
+        run: sudo xcode-select -switch /Applications/Xcode_16.4.app
       - name: Version
         run: swift --version
-      - name: Download swift-bundler
+
+      - name: Cache swift-bundler
+        id: cache-swift-bundler
+        uses: actions/cache@v5
+        with:
+          path: sbun
+          key: ${{ runner.os }}-swift-bundler
+      - name: Build swift-bundler
+        if: steps.cache-swift-bundler.outputs.cache-hit != 'true'
         run: |
-          curl -o swift-bundler -L https://github.com/stackotter/swift-bundler/releases/download/v2.0.4/swift-bundler
-          chmod +x ./swift-bundler
-          cp ./swift-bundler /usr/local/bin
-      - name: Build
+          git clone https://github.com/moreSwift/swift-bundler
+          cd swift-bundler
+          git checkout 6d72c4f442cc2c57c2559f3df21b3777b1d0a917
+          swift build --product swift-bundler
+          cp .build/debug/swift-bundler ../sbun
+
+      - name: Build arm64
+        run: |
+          ./sbun bundle -c release --arch arm64
+          mv "$(./sbun bundle --show-bundle-path)" DeltaClient-arm64.app
+      - name: Build x86
         run: |
-          ./swift-bundler bundle -c release -o . -u
-          plutil -insert MetalCaptureEnabled -bool YES DeltaClient.app/Contents/Info.plist
-      - name: Zip .app
-        run: zip -r DeltaClient.zip DeltaClient.app
-      - name: Upload artifact
-        uses: actions/upload-artifact@v2
+          ./sbun bundle -c release --arch x86_64
+          mv "$(./sbun bundle --show-bundle-path)" DeltaClient-x86_64.app
+      - name: Zip .app (arm64)
+        run: zip -r DeltaClient-arm64.zip DeltaClient-arm64.app
+      - name: Zip .app (x86_64)
+        run: zip -r DeltaClient-x86_64.zip DeltaClient-x86_64.app
+      - name: Upload artifact (arm64)
+        uses: actions/upload-artifact@v7
+        with:
+          name: DeltaClient-arm64
+          path: ./DeltaClient-arm64.zip
+      - name: Upload artifact (x86_64)
+        uses: actions/upload-artifact@v7
         with:
-          name: DeltaClient
-          path: ./DeltaClient.zip
+          name: DeltaClient-x86_64
+          path: ./DeltaClient-x86_64.zip
   build-linux:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Swift
-        uses: swift-actions/setup-swift@v1
+        uses: SwiftyLab/setup-swift@latest
         with:
-          swift-version: 5.7
+          swift-version: "5.9"
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v6
       - name: Build
         run: |
           cd Sources/Core

.github/workflows/swiftlint.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: macOS-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v6
       - name: Lint
         run: |
           URL="https://github.com/realm/SwiftLint/releases/download/0.50.3/portable_swiftlint.zip"

.github/workflows/test.yml

@@ -7,12 +7,12 @@ on:
 
 jobs:
   test-macos:
-    runs-on: macOS-12
+    runs-on: macOS-15
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - name: Force Xcode 14.2
-        run: sudo xcode-select -switch /Applications/Xcode_14.2.app
+        uses: actions/checkout@v6
+      - name: Force Xcode 16.4
+        run: sudo xcode-select -switch /Applications/Xcode_16.4.app
       - name: Version
         run: swift --version
       - name: Test
@@ -23,11 +23,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Swift
-        uses: swift-actions/setup-swift@v1
+        uses: SwiftyLab/setup-swift@latest
         with:
-          swift-version: 5.7
+          swift-version: "5.9"
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v6
       - name: Test
         run: |
           cd Sources/Core

.swift-format

@@ -0,0 +1,7 @@
+{
+    "version": 1,
+    "indentation": {
+        "spaces": 2
+    },
+    "indentSwitchCaseLabels": true
+}

Bundler.toml

@@ -1,12 +1,14 @@
+format_version = 2
+
 [apps.DeltaClient]
 product = 'DeltaClient'
 version = 'v0.1.0-alpha.1'
-bundle_identifier = 'dev.stackotter.delta-client'
+identifier = 'dev.stackotter.delta-client'
 category = 'public.app-category.games'
-minimum_macos_version = '11.0'
 icon = 'AppIcon.icns'
 
-[apps.DeltaClient.extra_plist_entries]
+[apps.DeltaClient.plist]
 # Append the current commit hash to the user-facing version string
-CFBundleShortVersionString = "{VERSION}, commit: {COMMIT_HASH}"
+CFBundleShortVersionString = "$(VERSION), commit: $(COMMIT_HASH)"
 GCSupportsControllerUserInteraction = "True"
+MetalCaptureEnabled = true

Contributing.md

@@ -34,9 +34,9 @@ If your contributions follow these guidelines, they'll be much more likely to ge
 
 ### Delta Client
 
-**Important**: Only Xcode 14 is supported, Xcode 12 builds don't work because Delta Client uses new
+**Important**: Only Xcode 14+ is supported, Xcode 12 builds don't work because Delta Client uses new
 automatic `Codable` conformance and there are some weird discrepancies between Xcode 12's swift
-compiler and Xcode 14's swift compiler. Xcode 13 isn't supported because it causes some weird memory
+compiler and Xcode 14+'s swift compiler. Xcode 13 isn't supported because it causes some weird memory
 corruption issues.
 
 [Delta Client](https://github.com/stackotter/delta-client) uses the

Notes/GUIRendering.md

@@ -25,7 +25,7 @@ relatively consistent.
 
 This improvement gave a 2.36x reduction in encode time which is pretty great.
 
-This improvement isn't foolproof, it should be conservative to always retain ordering when required,
+This improvement isn't foolproof, it should be conservative enough to always retain ordering when required,
 but it doesn't seem to always combine meshes when they can be combined. This can be worked around by
 refactoring mesh generation to group by array texture when possible. I had to do this with
 `GUIList`'s row background generation (by putting all the backgrounds first) and it worked a charm.