Skip to content

Commit a718467

Browse files
committed
refactor: custom fork of allay to customize messenges through templating
1 parent 6d2738c commit a718467

File tree

4 files changed

+41
-28
lines changed

4 files changed

+41
-28
lines changed

beet-project.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,15 @@ pipeline:
3232
load: ["test/*.md"]
3333

3434
meta:
35+
allay:
36+
templates:
37+
pretty_name: '{storage="rx:info", nbt="playerdb.pretty_name", interpret}'
38+
patterns:
39+
normal: (gray)
40+
error: (#CE4257)
41+
success: (#1DF368)
42+
emphasis: (gold)
43+
3544
lectern:
3645
load: ["src/**/*.md"]
3746

poetry.lock

Lines changed: 9 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ keywords = [
2424
python = "^3.9"
2525
PyYAML = "^5.4.1"
2626
mecha = ">=0.8.0"
27-
allay = ">=1.0.3"
27+
# allay = ">=1.1.0"
2828
beet = ">=0.44.2"
2929
lectern = ">=0.17.0"
30+
allay = {git = "https://github.com/rx-modules/Allay", rev = "main"}
3031

3132
[tool.poetry.dev-dependencies]
3233
pytest = "^6.2.5"

src/messages.md

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,29 @@
44

55
<details>
66

7-
`@message rx.playerdb:load`
8-
```json
9-
[{"text":"", "color":"gray"}, {"nbt": "playerdb.pretty_name", "storage": "rx:info", "interpret": true}, " ", {"storage": "rx:info", "nbt": "playerdb.pretty_version", "interpret": true}, " loaded"]
7+
`@allay_message rx.playerdb:load`
8+
```
9+
{$pretty_name} {storage="rx:info", nbt="playerdb.pretty_version", interpret}(@normal) [loaded](@normal)
1010
```
1111

1212
`@allay_message rx.playerdb:error/no_data`
13-
1413
```
15-
{nbt="playerdb.name", storage="rx:info"} [Save Error: No rx:io data to save](#CE4257)
14+
{$pretty_name} [Save Error: No rx:io data to save](@error)
1615
```
1716

1817
`@allay_message rx.playerdb:error/bad_uid`
1918
```
20-
{nbt="playerdb.name", storage="rx:info"} [Error: rx.playerdb:io player.info.uid invalid](#CE4257)
19+
{$pretty_name} [Error: rx.playerdb:io player.info.uid invalid](@error)
2120
```
2221

2322
`@allay_message rx.playerdb:error/empty_database`
2423
```
25-
{nbt="playerdb.name", storage="rx:info"} [Select Error: Selection failed. No players in database to select](#CE4257)
24+
{$pretty_name} [Select Error: Selection failed. No players in database to select](@error)
2625
```
2726

2827
`@allay_message rx.playerdb:error/impossible_uid`
2928
```
30-
{nbt="playerdb.name", storage="rx:info"} [Get Error: Input uid above max uid](#CE4257)
29+
{$pretty_name} [Get Error: Input uid above max uid](@error)
3130
```
3231

3332
</details>
@@ -38,50 +37,50 @@
3837

3938
`@allay_message rx.playerdb:admin/impossible_uid`
4039
```
41-
{nbt="playerdb.name", storage="rx:info"} [Deletion Error: Input uid outside max uid](#CE4257)
40+
{$pretty_name} [Deletion Error: Input uid outside max uid](@error)
4241
```
4342

4443
`@allay_message rx.playerdb:admin/successful_removal`
4544
```
46-
{nbt="playerdb.name", storage="rx:info"} [Removal Success: Removed {nbt="players[{selected:1b}.info.name]", storage="rx.playerdb:main"}'s entry](#1DF368)
45+
{$pretty_name} [Removal Success: Removed {nbt="players[{selected:1b}].info.name", storage="rx.playerdb:main"}'s entry](@success)
4746
48-
[→ Don't forget to reset their rx.pdb.has_entry score \(unless you ran admin/delete_player\)](gold)
47+
[→ Don't forget to reset their rx.pdb.has_entry score \(unless you ran admin/delete_player\)](@emphasis)
4948
```
5049

5150
`@allay_message rx.playerdb:admin/non_existent_entry`
5251
```
53-
{nbt="playerdb.name", storage="rx:info"} [Removal Error: Entry does not exist](#CE4257)
52+
{$pretty_name} [Removal Error: Entry does not exist](@error)
5453
```
5554

5655
`@allay_message rx.playerdb:admin/migration/bad_input`
5756
```
58-
{nbt="playerdb.name", storage="rx:info"} [Migration Error: Bad input at](#CE4257) [rx.playerdb:temp admin.migrate](gold) [is empty](#CE4257)
57+
{$pretty_name} [Migration Error: Bad input at](@error) [rx.playerdb:temp admin.migrate](@emphasis) [is empty](@error)
5958
```
6059

6160
`@allay_message rx.playerdb:admin/migration/acc_not_found`
6261
```
63-
{nbt="playerdb.name", storage="rx:info"} [Migration Error: Input UUID account not found](#CE4257)
62+
{$pretty_name} [Migration Error: Input UUID account not found](@error)
6463
```
6564

6665
`@allay_message rx.playerdb:admin/migration/success`
6766
```
68-
@insert = (insertion="/scoreboard players reset ")
67+
@temp = (insertion="/scoreboard players reset ")
6968
7069
#ALLAYDEFS
7170
72-
{nbt="playerdb.name", storage="rx:info"} [Migration Success:](#1DF368) {nbt="admin.migrate.old_name", storage="rx.playerdb:temp"}(gold)['s data was migrated to](#1DF368) {@s}(gold)
71+
{$pretty_name} [Migration Success:](@success) {nbt="admin.migrate.old_name", storage="rx.playerdb:temp"}(@emphasis)['s data was migrated to](@success) {@s}(@emphasis)
7372
74-
[→ Run ](gray) [/scoreboard players reset {nbt="admin.migrate.old_name", storage="rx.playerdb:temp"}](gold, @insert) [to complete the migration process!](gray)
73+
[→ Run ](gray) [/scoreboard players reset {nbt="admin.migrate.old_name", storage="rx.playerdb:temp"}](@emphasis, @temp) [to complete the migration process!](gray)
7574
```
7675

7776
`@allay_message rx.playerdb:admin/migration/success_to_migrated`
7877
```
79-
{nbt="playerdb.name", storage="rx:info"} [Migration Success:](#1DF368) {nbt="admin.migrate.old_name", storage="rx.playerdb:temp"}(gold)['s data was successfully migrated to you!](#1DF368)
78+
{$pretty_name} [Migration Success:](@success) {nbt="admin.migrate.old_name", storage="rx.playerdb:temp"}(@emphasis)['s data was successfully migrated to you!](@success)
8079
```
8180

8281
`@allay_message rx.playerdb:admin/reset`
8382
```
84-
{nbt="playerdb.name", storage="rx:info"} [Reset Success: PlayerDB successfully reset](#1DF368)
83+
{$pretty_name} [Reset Success: PlayerDB successfully reset](@success)
8584
```
8685

8786
</details>
@@ -92,17 +91,17 @@
9291

9392
`@allay_message rx.playerdb:api/name_change`
9493
```
95-
{nbt="playerdb.name", storage="rx:info"} {nbt="old_name", storage="rx.playerdb:io"}(gold) [has changed their name to](#1DF368) {@s}(gold)
94+
{$pretty_name} {nbt="old_name", storage="rx.playerdb:io"}(@emphasis) [has changed their name to](@success) {@s}(@emphasis)
9695
```
9796

9897
`@allay_message rx.playerdb:upgrade/v1tov2`
9998
```
100-
{nbt="playerdb.name", storage="rx:info"} [Upgrade Success: PlayerDB v1 upgraded to v2](#1DF368)
99+
{$pretty_name} [Upgrade Success: PlayerDB v1 upgraded to v2](@success)
101100
```
102101

103102
`@allay_message rx.playerdb:upgrade/v1tov2/player`
104103
```
105-
{nbt="playerdb.name", storage="rx:info"} [Upgrade Success: Your data has been safely transfered :)](#1DF368)
104+
{$pretty_name} [Upgrade Success: Your data has been safely transfered :)](@success)
106105
```
107106

108107
</details>

0 commit comments

Comments
 (0)