Skip to content

Commit 50dd52e

Browse files
committed
Merge branch 'develop' into feature/lua
2 parents a6327bd + c66e524 commit 50dd52e

File tree

161 files changed

+12960
-9494
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+12960
-9494
lines changed

.github/workflows/build.yml

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ jobs:
2525
with:
2626
java-version: "17"
2727
distribution: "temurin"
28-
- uses: subosito/flutter-action@v2.19.0
28+
- uses: subosito/flutter-action@v2.21.0
2929
with:
3030
flutter-version-file: app/pubspec.yaml
31+
cache: true
3132
- name: 📦 Get dependencies
3233
run: |
3334
flutter clean
@@ -94,6 +95,14 @@ jobs:
9495
with:
9596
name: apk-x86_64-build
9697
path: app/linwood-setonix-android-x86_64.apk
98+
- name: Copy Corepack
99+
run: |
100+
cp app/assets/pack.stnx core.stnx
101+
- name: Archive Corepack
102+
uses: actions/upload-artifact@v4
103+
with:
104+
name: corepack
105+
path: core.stnx
97106
build-windows:
98107
runs-on: windows-2025
99108
defaults:
@@ -106,9 +115,10 @@ jobs:
106115
run: |
107116
choco install yq
108117
choco install innosetup
109-
- uses: subosito/flutter-action@v2.19.0
118+
- uses: subosito/flutter-action@v2.21.0
110119
with:
111120
flutter-version-file: app/pubspec.yaml
121+
cache: true
112122
- name: ✅ Enable platforms
113123
run: flutter config --enable-windows-desktop
114124
- name: 📦 Get dependencies
@@ -197,7 +207,7 @@ jobs:
197207
libsecret-1-dev \
198208
libjsoncpp-dev \
199209
rpm
200-
- uses: subosito/flutter-action@v2.19.0
210+
- uses: subosito/flutter-action@v2.21.0
201211
with:
202212
flutter-version-file: app/pubspec.yaml
203213
channel: "master"
@@ -333,7 +343,7 @@ jobs:
333343
alien \
334344
libsecret-1-dev \
335345
libjsoncpp-dev
336-
- uses: subosito/flutter-action@v2.19.0
346+
- uses: subosito/flutter-action@v2.21.0
337347
with:
338348
flutter-version-file: app/pubspec.yaml
339349
channel: "master"
@@ -405,9 +415,10 @@ jobs:
405415
steps:
406416
- name: ⬆️ Checkout
407417
uses: actions/checkout@v4
408-
- uses: subosito/flutter-action@v2.19.0
418+
- uses: subosito/flutter-action@v2.21.0
409419
with:
410420
flutter-version-file: app/pubspec.yaml
421+
cache: true
411422
- uses: actions/setup-python@v5
412423
with:
413424
python-version: "3.12"
@@ -464,9 +475,10 @@ jobs:
464475
steps:
465476
- name: ⬆️ Checkout
466477
uses: actions/checkout@v4
467-
- uses: subosito/flutter-action@v2.19.0
478+
- uses: subosito/flutter-action@v2.21.0
468479
with:
469480
flutter-version-file: app/pubspec.yaml
481+
cache: true
470482
- name: 📦 Get dependencies
471483
run: |
472484
flutter clean
@@ -547,13 +559,13 @@ jobs:
547559
- name: Install tree
548560
if: ${{ matrix.os.name == 'macos-latest' }}
549561
run: brew install tree
550-
- uses: subosito/flutter-action@v2.19.0
562+
- uses: subosito/flutter-action@v2.21.0
551563
with:
552564
flutter-version-file: app/pubspec.yaml
553-
channel: 'master'
565+
channel: "master"
554566
cache: true
555-
cache-key: 'flutter-:os:-:channel:-:version:-:arch:-:hash:'
556-
cache-path: '${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:'
567+
cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:"
568+
cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"
557569
- name: 📦 Get dependencies
558570
run: |
559571
flutter clean
@@ -635,6 +647,9 @@ jobs:
635647
- uses: actions/download-artifact@v4
636648
with:
637649
name: apk-x86_64-build
650+
- uses: actions/download-artifact@v4
651+
with:
652+
name: corepack
638653
- uses: actions/download-artifact@v4
639654
with:
640655
name: windows-build
@@ -765,6 +780,7 @@ jobs:
765780
linwood-setonix-server-linux-arm64.tar.gz
766781
linwood-setonix-server-windows-x86_64.zip
767782
linwood-setonix-server-macos.zip
783+
core.stnx
768784
checksums.txt
769785
env:
770786
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -798,6 +814,7 @@ jobs:
798814
linwood-setonix-server-linux-arm64.tar.gz
799815
linwood-setonix-server-windows-x86_64.zip
800816
linwood-setonix-server-macos.zip
817+
core.stnx
801818
checksums.txt
802819
env:
803820
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -829,6 +846,7 @@ jobs:
829846
linwood-setonix-server-linux-arm64.tar.gz
830847
linwood-setonix-server-windows-x86_64.zip
831848
linwood-setonix-server-macos.zip
849+
core.stnx
832850
checksums.txt
833851
env:
834852
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -865,9 +883,10 @@ jobs:
865883
with:
866884
java-version: "17"
867885
distribution: "temurin"
868-
- uses: subosito/flutter-action@v2.19.0
886+
- uses: subosito/flutter-action@v2.21.0
869887
with:
870888
flutter-version-file: app/pubspec.yaml
889+
cache: true
871890
- name: Build nessesary files
872891
working-directory: ./
873892
run: |

.github/workflows/dart.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ jobs:
1515
steps:
1616
- name: ⬆️ Checkout
1717
uses: actions/checkout@v4
18-
- uses: subosito/flutter-action@v2.19.0
18+
- uses: subosito/flutter-action@v2.21.0
1919
with:
2020
flutter-version-file: app/pubspec.yaml
21+
cache: true
2122
- uses: actions/checkout@v4
2223
- name: Print Dart SDK version
2324
run: |
@@ -60,6 +61,9 @@ jobs:
6061
- name: Run build_runner
6162
if: matrix.projects == 'api' || matrix.projects == 'app'
6263
run: dart run build_runner build --delete-conflicting-outputs
64+
- name: Run format for generated files
65+
if: matrix.projects == 'api' || matrix.projects == 'app'
66+
run: dart format .
6367
- name: Test for git changes
6468
run: git diff --exit-code
6569
# Your project will need to have tests in test/ and a dependency on

.github/workflows/deploy.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,10 @@ jobs:
5050
steps:
5151
- name: ⬆️ Checkout
5252
uses: actions/checkout@v4
53-
- uses: subosito/flutter-action@v2.19.0
53+
- uses: subosito/flutter-action@v2.21.0
5454
with:
5555
flutter-version-file: app/pubspec.yaml
56+
cache: true
5657
- name: Install dependencies
5758
run: flutter pub get
5859
- name: Generate documentation
@@ -78,9 +79,10 @@ jobs:
7879
steps:
7980
- name: ⬆️ Checkout
8081
uses: actions/checkout@v4
81-
- uses: subosito/flutter-action@v2.19.0
82+
- uses: subosito/flutter-action@v2.21.0
8283
with:
8384
flutter-version-file: app/pubspec.yaml
85+
cache: true
8486
- name: Install dependencies
8587
run: flutter pub get
8688
- name: Generate code

.github/workflows/release.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ jobs:
2121
with:
2222
token: ${{ secrets.CI_PAT }}
2323
fetch-depth: 0
24-
- uses: subosito/flutter-action@v2.19.0
24+
- uses: subosito/flutter-action@v2.21.0
2525
with:
2626
flutter-version-file: app/pubspec.yaml
27+
cache: true
2728
- name: Setup git
2829
id: setup
2930
run: |
@@ -65,9 +66,10 @@ jobs:
6566
token: ${{ secrets.CI_PAT }}
6667
ref: ${{ github.ref }}
6768
fetch-depth: 0
68-
- uses: subosito/flutter-action@v2.19.0
69+
- uses: subosito/flutter-action@v2.21.0
6970
with:
7071
flutter-version-file: app/pubspec.yaml
72+
cache: true
7173
- name: Setup git
7274
id: setup
7375
shell: bash
@@ -127,9 +129,10 @@ jobs:
127129
with:
128130
token: ${{ secrets.CI_PAT }}
129131
fetch-depth: 0
130-
- uses: subosito/flutter-action@v2.19.0
132+
- uses: subosito/flutter-action@v2.21.0
131133
with:
132134
flutter-version-file: app/pubspec.yaml
135+
cache: true
133136
- name: Setup git
134137
id: setup
135138
run: |
@@ -190,9 +193,10 @@ jobs:
190193
echo "SETONIX_BUILD_NUMBER=${SETONIX_BUILD_NUMBER}" >> $GITHUB_ENV
191194
git config --global user.email "ci@linwood.dev"
192195
git config --global user.name "Linwood CI"
193-
- uses: subosito/flutter-action@v2.19.0
196+
- uses: subosito/flutter-action@v2.21.0
194197
with:
195198
flutter-version-file: app/pubspec.yaml
199+
cache: true
196200
- name: Bump version
197201
run: |
198202
git fetch

CHANGELOG.md

Lines changed: 37 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,24 @@
22

33
<!--ENTER CHANGELOG HERE-->
44

5-
## 0.4.1 (2025-06-09)
5+
## 0.5.0 (2025-07-02)
66

7+
* Add account system
8+
* Add auth system
9+
* Add loading screen
10+
* Add server list
11+
* Add kick message
12+
* Add user system on server
13+
* Local database
14+
* Remote endpoint
15+
* Add whitelist system on server
16+
* Fix sensitivity setting not visible on web
17+
* Fix editor not working on web
18+
19+
Read more here: https://linwood.dev/setonix/0.5.0
20+
21+
## 0.4.1 (2025-06-09)
22+
723
* Improve parsing of server url
824
* Improve rendering of cards
925
* Make bottom panel smaller
@@ -18,10 +34,10 @@
1834
* Fix core pack not included in build
1935
* Fix server crash when invalid request is made
2036

21-
Read more here: https://linwood.dev/setonix/0.4.1
22-
23-
## 0.4.0 (2025-06-05)
24-
37+
Read more here: https://linwood.dev/setonix/0.4.1
38+
39+
## 0.4.0 (2025-06-05)
40+
2541
* Add importing system for editor
2642
* Add launch app link for android ([#37](https://github.com/LinwoodDev/Setonix/issues/37))
2743
* Add option for server to send link information
@@ -39,10 +55,10 @@ Read more here: https://linwood.dev/setonix/0.4.1
3955
* Upgrade to flutter 3.32
4056
* Update to agb 8.9
4157

42-
Read more here: https://linwood.dev/setonix/0.4.0
43-
44-
## 0.3.0 (2025-01-27)
45-
58+
Read more here: https://linwood.dev/setonix/0.4.0
59+
60+
## 0.3.0 (2025-01-27)
61+
4662
* Add editor
4763
* Fix importing of packs
4864
* Fix packs not available on singleplayer
@@ -53,10 +69,10 @@ Read more here: https://linwood.dev/setonix/0.4.0
5369
* Fix reproducable builds again
5470
* Add linux arm
5571

56-
Read more here: https://linwood.dev/setonix/0.3.0
57-
58-
## 0.2.0 (2024-11-25)
59-
72+
Read more here: https://linwood.dev/setonix/0.3.0
73+
74+
## 0.2.0 (2024-11-25)
75+
6076
* Add protection to cells if they are hidden
6177
* Add download for packs ([#39](https://github.com/LinwoodDev/Setonix/issues/39))
6278
* Add data metadata for packs
@@ -67,14 +83,13 @@ Read more here: https://linwood.dev/setonix/0.3.0
6783
* Use bolder monochrome icon for android
6884
* Make build reproducable
6985

70-
Read more here: https://linwood.dev/setonix/0.2.0
71-
72-
## 0.1.1 (2024-10-21)
73-
86+
Read more here: https://linwood.dev/setonix/0.2.0
87+
88+
## 0.1.1 (2024-10-21)
89+
7490
* Add internet permission to android
75-
* Fix app crashing if socket cannot be created
76-
77-
## 0.1.0 (2024-10-21)
78-
79-
First release 🎉
91+
* Fix app crashing if socket cannot be created
92+
93+
## 0.1.0 (2024-10-21)
8094

95+
First release 🎉

SECURITY.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44

55
| Version | Supported | |
66
| ------- | --------- | ---------------------------------------------------------------------------------------------------------------- |
7-
| 0.3.0 | :warning: | [Docs](https://setonix.world/docs/v1/intro) [Release](https://github.com/LinwoodDev/Setonix/releases/tag/v0.3.0) |
7+
| 0.5.0 | :warning: | [Docs](https://setonix.world/docs/v1/intro) [Release](https://github.com/LinwoodDev/Setonix/releases/tag/v0.5.0) |
8+
| 0.4.1 | :x: | [Docs](https://setonix.world/docs/v1/intro) [Release](https://github.com/LinwoodDev/Setonix/releases/tag/v0.4.1) |
9+
| 0.3.0 | :x: | [Docs](https://setonix.world/docs/v1/intro) [Release](https://github.com/LinwoodDev/Setonix/releases/tag/v0.3.0) |
810
| 0.2.0 | :x: | [Docs](https://setonix.world/docs/v1/intro) [Release](https://github.com/LinwoodDev/Setonix/releases/tag/v0.2.0) |
911
| 0.1.1 | :x: | [Docs](https://setonix.world/docs/v1/intro) [Release](https://github.com/LinwoodDev/Setonix/releases/tag/v0.1.1) |
1012

api/lib/src/event/client.dart

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,17 @@ final class BoardsSpawnRequest extends ClientWorldEvent
7070

7171
BoardsSpawnRequest(this.table, [this.assets = const {}]);
7272
BoardsSpawnRequest.single(GlobalVectorDefinition cell, ItemLocation asset)
73-
: table = cell.table,
74-
assets = {
75-
cell.position: [asset]
76-
};
73+
: table = cell.table,
74+
assets = {
75+
cell.position: [asset],
76+
};
7777
BoardsSpawnRequest.fromLocal(
78-
this.table, VectorDefinition cell, ItemLocation asset)
79-
: assets = {
80-
cell: [asset]
81-
};
78+
this.table,
79+
VectorDefinition cell,
80+
ItemLocation asset,
81+
) : assets = {
82+
cell: [asset],
83+
};
8284

8385
BoardsSpawnRequest boards(VectorDefinition cell, List<ItemLocation> assets) =>
8486
copyWith(
@@ -169,7 +171,9 @@ final class AuthenticateRequest extends ClientWorldEvent
169171
AuthenticateRequest(this.signature, this.publicKey);
170172

171173
static Future<AuthenticateRequest> build(
172-
AuthenticatedRequested request, SetonixAccount account) async {
174+
AuthenticatedRequested request,
175+
SetonixAccount account,
176+
) async {
173177
final challenge = request.challenge;
174178
final keyPair = account.keyPair;
175179
final signature = await _generator.sign(challenge, keyPair: keyPair);
@@ -180,8 +184,10 @@ final class AuthenticateRequest extends ClientWorldEvent
180184
}
181185

182186
Future<bool> verify(Uint8List challenge) => _generator.verify(
183-
challenge,
184-
signature: Signature(signature,
185-
publicKey: SimplePublicKey(publicKey, type: KeyPairType.ed25519)),
186-
);
187+
challenge,
188+
signature: Signature(
189+
signature,
190+
publicKey: SimplePublicKey(publicKey, type: KeyPairType.ed25519),
191+
),
192+
);
187193
}

0 commit comments

Comments
 (0)