Skip to content

Commit c046109

Browse files
authored
Separate CHOOSE_STORAGE as StorageAPI with each plugin (#67)
* 👑 remove storage compile tests for CI * 🔥 Implement StorageAPI with endpoint include * 🧭 remove storage hardcoded types from CA_Gag * ✔️ Implement Storage: SQLite * ⌛ Temporary disallow permanent gag option * ❌ Remove NVault storage (replaced by SQLite) * 🎺 Enable Storage: SQLite as default storage in plugins.ini * ⛄ FIX: compilation warnings * 🍧 FIX: gag chat message * 🥳 Better logs for Storage: SQLite * ❌ Trashed old storage files
1 parent b3a7b80 commit c046109

20 files changed

+482
-3131
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,6 @@ jobs:
1414
matrix:
1515
amxmodx: ["1.9"]
1616
parameters: ["", "DEBUG=1"]
17-
storage:
18-
[
19-
"",
20-
"CHOOSE_STORAGE=0",
21-
"CHOOSE_STORAGE=1",
22-
"CHOOSE_STORAGE=2",
23-
"CHOOSE_STORAGE=3",
24-
]
2517

2618
fail-fast: false
2719
steps:
@@ -40,7 +32,6 @@ jobs:
4032
- name: Compile plugins AMXX Version
4133
env:
4234
DEBUG: ${{ matrix.parameters }}
43-
STORAGE: ${{ matrix.storage }}
4435
run: |
4536
cp -Rf ./cstrike/addons/amxmodx/* ./addons/amxmodx/
4637
cd addons/amxmodx/scripting
@@ -49,5 +40,5 @@ jobs:
4940
chmod +x amxxpc
5041
for sourcefile in *.sma; do\
5142
echo -n "Compiling $sourcefile ...";\
52-
./amxxpc -d3 $sourcefile $DEBUG $STORAGE -o../plugins/$(echo $sourcefile | sed -e 's/\.sma$/.amxx/') || exit 1;\
43+
./amxxpc -d3 $sourcefile $DEBUG -o../plugins/$(echo $sourcefile | sed -e 's/\.sma$/.amxx/') || exit 1;\
5344
done

cstrike/addons/amxmodx/configs/plugins-ChatAdditions.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
; Main plugin
22
ChatAdditions_Core.amxx debug
3+
; Storage choose
4+
CA_Storage_SQLite.amxx debug
35
; Allows to privileged users (admins & etc.) set chats (Voice & Say chat) restricts on the clients.
46
CA_Gag.amxx debug
57
; Allows to clients set personal preferences in the restrictions.

cstrike/addons/amxmodx/data/lang/CA_Gag.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ CA_Gag_Confirm = Подтвердить!
2121
CA_Gag_NotSet = Не задано
2222
CA_Gag_Perpapent = *НАВСЕГДА*
2323

24-
Player_Gagged = ^3Админ ^4%n ^3заткнул игрока ^4%n^1 (^3%s^1)
25-
Player_Gagged_ByServer = ^4Сервер заткнул игрока ^4%n^1 (^3%s^1)
24+
Player_Gagged = ^3Админ ^4%s ^3заткнул игрока ^4%s^1 (^3%s^1)
2625
Player_UnGagged = ^3Админ ^4%n ^3снял затычку с игрока ^4%n^1.
2726
Player_NotConnected = ^3Игрок не доступен!^1
2827
Player_AlreadyRemovedGag = ^3Игрок ^4%n^1 уже удалён!
@@ -66,8 +65,7 @@ CA_Gag_Confirm = Confirm!
6665
CA_Gag_NotSet = Not selected
6766
CA_Gag_Perpapent = *PERMAMENT*
6867

69-
Player_Gagged = ^3Admin ^4%n ^3gag player ^4%n^1 (^3%s^1)
70-
Player_Gagged_ByServer = ^3Server gag player ^4%n^1 (^3%s^1)
68+
Player_Gagged = ^3Admin ^4%s ^3gag player ^4%s^1 (^3%s^1)
7169
Player_UnGagged = ^3Admin ^4%n ^3remove gag from player ^4%n^1.
7270
Player_NotConnected = ^3Player not connected!
7371
Player_AlreadyRemovedGag = ^3Player ^4%n^1 already removed!

0 commit comments

Comments
 (0)