v3.1

.gitattributes

@@ -1,2 +1,3 @@
 *.sp gitlab-language=cpp
-*.inc gitlab-language=cpp
+*.inc gitlab-language=cpp
+* text eol=lf

.github/workflows/build.yml

@@ -5,13 +5,10 @@ on: [push, pull_request, workflow_dispatch]
 jobs:
   compile:
     runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.sm-version == '1.11.x' }}
+    continue-on-error: ${{ matrix.sm-version == '1.12.x' }}
     strategy:
       matrix:
-        sm-version: [ '1.9.x', '1.10.x', '1.11.x' ]
-        include:
-          - sm-version: "1.11.x" # https://github.com/rumblefrog/setup-sp/issues/5
-            compiler-options: "-i=$includePath"
+        sm-version: [ '1.10.x', '1.11.x', '1.12.x' ]
 
     name: "Build SM ${{ matrix.sm-version }}"
     steps:
@@ -35,7 +32,7 @@ jobs:
           mkdir plugins
           cd scripting
           spcomp VIP_Core.sp -E -o ../plugins/VIP_Core.smx -iinclude ${{ matrix.compiler-options }}
-
+          
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
@@ -44,7 +41,7 @@ jobs:
             addons
             LICENSE
           retention-days: 2
-
+          
   release:
     name: Release
     if: github.ref_type == 'tag'
@@ -57,15 +54,15 @@ jobs:
       - name: Find Assets
         shell: bash
         run: |
-          echo "artifact-1_9=$(find * -maxdepth 0 -type d -name "*1.9*")" >> $GITHUB_ENV
           echo "artifact-1_10=$(find * -maxdepth 0 -type d -name "*1.10*")" >> $GITHUB_ENV
           echo "artifact-1_11=$(find * -maxdepth 0 -type d -name "*1.11*")" >> $GITHUB_ENV
-
+          echo "artifact-1_12=$(find * -maxdepth 0 -type d -name "*1.12*")" >> $GITHUB_ENV
+
       - name: Arhive Assets
         run: |
-          zip -r ${{ env.artifact-1_9 }}.zip ${{ env.artifact-1_9 }}
           zip -r ${{ env.artifact-1_10 }}.zip ${{ env.artifact-1_10 }}
           zip -r ${{ env.artifact-1_11 }}.zip ${{ env.artifact-1_11 }}
+          zip -r ${{ env.artifact-1_12 }}.zip ${{ env.artifact-1_12 }}
 
       - name: Create Release
         id: create_release
@@ -77,33 +74,33 @@ jobs:
           release_name: ${{ github.ref_name }}
           draft: true
           prerelease: false
-      
-      - name: Upload Asset
+
+      - name: Upload Asset 1.10
         uses: actions/upload-release-asset@v1.0.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ${{ env.artifact-1_9 }}.zip
-          asset_name: ${{ env.artifact-1_9 }}.zip
+          asset_path: ${{ env.artifact-1_10 }}.zip
+          asset_name: ${{ env.artifact-1_10 }}.zip
           asset_content_type: application/zip
 
-      - name: Upload Asset
+      - name: Upload Asset 1.11
         uses: actions/upload-release-asset@v1.0.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ${{ env.artifact-1_10 }}.zip
-          asset_name: ${{ env.artifact-1_10 }}.zip
+          asset_path: ${{ env.artifact-1_11 }}.zip
+          asset_name: ${{ env.artifact-1_11 }}.zip
           asset_content_type: application/zip
 
-      - name: Upload Asset
+      - name: Upload Asset 1.12
         uses: actions/upload-release-asset@v1.0.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ${{ env.artifact-1_11 }}.zip
-          asset_name: ${{ env.artifact-1_11 }}.zip
-          asset_content_type: application/zip
+          asset_path: ${{ env.artifact-1_12 }}.zip
+          asset_name: ${{ env.artifact-1_12 }}.zip
+          asset_content_type: application/zip

.gitignore

@@ -1,2 +1,3 @@
 .vscode/
 *.smx
+*.code-workspace

addons/sourcemod/data/vip/cfg/info.ini

@@ -18,7 +18,7 @@
 			"time"		"12"	// Через сколько секунд меню будет закрыто автоматически (0 - пока игрок сам не закроет) | After how many seconds the menu will be closed automatically (0 - until the player closes himself)
 			"ru"
 			{
-				// Пукнты меню | Menu Items
+				// Пункты меню | Menu Items
 				"item"	"Вы имеете VIP-статус"
 				"item"	"SPACER"
 				"item"	"Ник: {NAME}"
@@ -62,7 +62,7 @@
 			"time"		"30"	// Через сколько секунд меню будет закрыто автоматически (0 - пока игрок сам не закроет) | After how many seconds the menu will be closed automatically (0 - until the player closes himself)
 			"ru"
 			{
-				// Пукнты меню | Menu Items
+				// Пункты меню | Menu Items
 				"item"	"Вы имеете VIP-статус"
 				"item"	"Группа: {GROUP}"
 			}
@@ -85,7 +85,7 @@
 			"time"		"12"	// Через сколько секунд меню будет закрыто автоматически (0 - пока игрок сам не закроет) | After how many seconds the menu will be closed automatically (0 - until the player closes himself)
 			"ru"
 			{
-				// Пукнты меню | Menu Items
+				// Пункты меню | Menu Items
 				"item"	"У вас нет доступа к этому меню"
 				"item"	"Чтобы приобрести VIP-статус"
 				"item"	"Oбратитесь к администратору"
@@ -118,7 +118,7 @@
 			"time"		"12"	// Через сколько секунд меню будет закрыто автоматически (0 - пока игрок сам не закроет) | After how many seconds the menu will be closed automatically (0 - until the player closes himself)
 			"ru"
 			{
-				// Пукнты меню | Menu Items
+				// Пункты меню | Menu Items
 				"item"	"Срок вашего VIP-статуса истек"
 				"item"	"Чтобы вновь приобрести VIP-статус"
 				"item"	"Oбратитесь к администратору"

addons/sourcemod/scripting/VIP_Core.sp

@@ -4,33 +4,37 @@
 
 #include <sourcemod>
 #include <vip_core>
-#include <clientprefs>
 
-#if !defined VIP_VERSION
-#define VIP_VERSION		"3.0.3 R"
+#if !defined VIP_CORE_VERSION
+#define VIP_CORE_VERSION	"3.1.0 DEV"
 #endif
 
-
-#define DEBUG_MODE			0	// Режим отладки
+#define DEBUG_MODE 			0	// Режим отладки
 
 #define USE_ADMINMENU		1	// Включение админ-меню для управления VIP
 
 #define USE_MORE_SERVERS	1	// Включить/Отключить режим при котором если ID сервера у игрока 0 - то VIP будет работать на всех серверах
 
+#define USE_CLIENTPREFS		0	// Использовать ли стандартные куки для хранения данных игроков
+
+#if USE_CLIENTPREFS 1
+#include <clientprefs>
+#endif
 
 public Plugin myinfo =
 {
 	name = "[VIP] Core",
 	author = "R1KO",
-	version = VIP_VERSION,
+	version = VIP_CORE_VERSION,
 	url = "https://github.com/R1KO/VIP-Core"
 };
 
 #include "vip/Global.sp"
-#include "vip/Debug.sp"
+#include "vip/Debugger.sp"
 #include "vip/Downloads.sp"
 #include "vip/Colors.sp"
 #include "vip/UTIL.sp"
+#include "vip/Storage.sp"
 #include "vip/Features.sp"
 #include "vip/Sounds.sp"
 #include "vip/Info.sp"
@@ -74,6 +78,11 @@ public void OnPluginStart()
 	ITEM_DRAW = hDataPack.Position;
 	delete hDataPack;
 
+
+	g_bIsTranslationPhraseExistsAvailable = (CanTestFeatures() && 
+		GetFeatureStatus(FeatureType_Native, "TranslationPhraseExists") == FeatureStatus_Available);
+
+	API_SetupForwards();
 	ReadConfigs();
 
 	VIPMenu_Setup();
@@ -82,7 +91,6 @@ public void OnPluginStart()
 	#endif
 
 	Cvars_Setup();
-	API_SetupForwards();
 
 	HookEvent("player_spawn", Event_PlayerSpawn);
 	HookEvent("player_death", Event_PlayerDeath);