Merge pull request #51 from daffyyyy/website-fix-1

Fixed blank page

.github/workflows/build.yml

@@ -28,19 +28,38 @@ jobs:
       run: dotnet restore
     - name: Build
       run: dotnet build ${{ env.PROJECT_PATH }} -c WeaponPaints -o ${{ env.OUTPUT_PATH }}
+
+  publish:
+    if: github.event_name == 'push'
+    permissions: write-all
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+    - uses: actions/checkout@v3
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 7.0.x
+    - name: Restore
+      run: dotnet restore
+    - name: Build
+      run: dotnet build ${{ env.PROJECT_PATH }} -c WeaponPaints -o ${{ env.OUTPUT_PATH }}
     - name: Clean files
       run: |
         rm -f \
           ${{ env.OUTPUT_PATH }}/CounterStrikeSharp.API.dll \
           ${{ env.OUTPUT_PATH }}/McMaster.NETCore.Plugins.dll \
           ${{ env.OUTPUT_PATH }}/Microsoft.DotNet.PlatformAbstractions.dll \
-          ${{ env.OUTPUT_PATH }}/Microsoft.Extensions.DependencyModel.dll 
+          ${{ env.OUTPUT_PATH }}/Microsoft.Extensions.DependencyModel.dll \
     - name: Zip
       uses: thedoctor0/zip-release@0.7.5
       with:
         type: 'zip'
         filename: '${{ env.PROJECT_NAME }}.zip'
         path: ${{ env.OUTPUT_PATH }}
+    - name: Clean files Website
+      run: |
+        rm -rf website/img/
     - name: Zip
       uses: thedoctor0/zip-release@0.7.5
       with:

Config.cs

@@ -17,13 +17,48 @@ namespace WeaponPaints
 		public string SuccessRefreshCommand { get; set; } = "Refreshing weapon paints.";
 		[JsonPropertyName("ChosenKnifeMenu")]
 		public string ChosenKnifeMenu { get; set; } = "You have chosen {KNIFE} as your knife.";
+		[JsonPropertyName("ChosenKnifeMenuKill")]
+		public string ChosenKnifeMenuKill { get; set; } = "To correctly apply skin for knife, you need to type !kill.";
 		[JsonPropertyName("KnifeMenuTitle")]
 		public string KnifeMenuTitle { get; set; } = "Knife Menu.";
 	}
 
+	public class Additional
+	{
+		[JsonPropertyName("SkinVisibilityFix")]
+		public bool SkinVisibilityFix { get; set; } = true;
+
+		[JsonPropertyName("KnifeEnabled")]
+		public bool KnifeEnabled { get; set; } = true;
+
+		[JsonPropertyName("SkinEnabled")]
+		public bool SkinEnabled { get; set; } = true;
+
+		[JsonPropertyName("CommandWpEnabled")]
+		public bool CommandWpEnabled { get; set; } = true;
+
+		[JsonPropertyName("CommandKillEnabled")]
+		public bool CommandKillEnabled { get; set; } = true;
+
+		[JsonPropertyName("CommandKnife")]
+		public string CommandKnife { get; set; } = "knife";
+
+		[JsonPropertyName("CommandSkin")]
+		public string CommandSkin { get; set; } = "ws";
+
+		[JsonPropertyName("CommandRefresh")]
+		public string CommandRefresh { get; set; } = "wp";
+
+		[JsonPropertyName("CommandKill")]
+		public string CommandKill { get; set; } = "kill";
+
+		[JsonPropertyName("GiveRandomKnife")]
+		public bool GiveRandomKnife { get; set; } = false;
+	}
+
 	public class WeaponPaintsConfig : BasePluginConfig
 	{
-        public override int Version { get; set; } = 2;
+		public override int Version { get; set; } = 4;
 
 		[JsonPropertyName("DatabaseHost")]
 		public string DatabaseHost { get; set; } = "";
@@ -40,6 +75,9 @@ namespace WeaponPaints
 		[JsonPropertyName("DatabaseName")]
 		public string DatabaseName { get; set; } = "";
 
+		[JsonPropertyName("GlobalShare")]
+		public bool GlobalShare { get; set; } = false;
+
 		[JsonPropertyName("CmdRefreshCooldownSeconds")]
 		public int CmdRefreshCooldownSeconds { get; set; } = 60;
 
@@ -51,6 +89,9 @@ namespace WeaponPaints
 
 		[JsonPropertyName("Messages")]
 		public Messages Messages { get; set; } = new Messages();
+
+		[JsonPropertyName("Additional")]
+		public Additional Additional { get; set; } = new Additional();
 	}
 
 }

README.md

@@ -1,17 +1,17 @@
 # cs2-WeaponPaints
 
-[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/E1E2G0P2O) or [Donate on Steam](https://steamcommunity.com/tradeoffer/new/?partner=41515647&token=gW2W-nXE)
-
-### Use this plugin at your own risk! Using this may lead to GSLT ban or something else Valve come with. [Valve Server guidelines](https://blog.counter-strike.net/index.php/server_guidelines/)
-
 ### Description
 Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin for [CSSharp](https://docs.cssharp.dev/).
+There will be a lot of frequent changes which may break functionality or compatibility. You have been warned!
 
-### Created [Discord server](https://discord.gg/mwEQppJ5AT) where you can discus about plugin.
+## Created [Discord server](https://discord.gg/mwEQppJ5AT) where you can discus about plugin.
+
+### Consider to donate instead of buying from unknown sources.
+[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/E1E2G0P2O) or [Donate on Steam](https://steamcommunity.com/tradeoffer/new/?partner=41515647&token=gW2W-nXE)
 
 ### Features
 - changes only paint, seed and wear on weapons and knives
-- mysql based
+- mysql based or global website at [weaponpaints.fun](https://weaponpaints.fun/), so you dont need mysql/website
 - data sync on player connect
 - Added command `!wp` to refresh skins (with cooldown in second can be configured)
 - Added command `!ws` to show website
@@ -20,16 +20,23 @@ Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin
 
 ### CS2 server:
 - compile and copy plugin to plugins. Info here [https://docs.cssharp.dev/guides/hello-world-plugin/](https://docs.cssharp.dev/guides/hello-world-plugin/)
-- setup `addons/counterstrikesharp/configs/plugins/WeaponPaints/WeaponPaints.json` with database credentials
+- setup `addons/counterstrikesharp/configs/plugins/WeaponPaints/WeaponPaints.json`
+  set `GlobalShare` to true for gloval, or include database credentials
 - in `addons/counterstrikesharp/configs/core.json` set **FollowCS2ServerGuidelines** to **false**
 
 ### Web install:
-- requires PHP (tested on php ver `8.2.3` and nginx webserver)
+- not needed if config `GlobalShare = true`
-- copy website to web server
+- requires PHP min v7.3 (tested on php ver `8.2.3` and nginx webserver)
+- copy website to web server (img folder not needed)
 - import `database.sql` to mysql
 - get steam api key [https://steamcommunity.com/dev/apikey](https://steamcommunity.com/dev/apikey)
 - fill in database credentials and api key in `class/config.php`
 - visit website and login via steam
 
+### Known issues
+- Issue on Windows servers, no knives are given.
+
+### Use this plugin at your own risk! Using this may lead to GSLT ban or something else Valve come with. [Valve Server guidelines](https://blog.counter-strike.net/index.php/server_guidelines/)
+
 ### Preview
 ![preview](https://github.com/Nereziel/cs2-WeaponPaints/blob/main/website/preview.png?raw=true)

WeaponPaints.cs

@@ -1,28 +1,35 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
-using CounterStrikeSharp.API.Core.Attributes.Registration;
+using CounterStrikeSharp.API.Core.Attributes;
 using CounterStrikeSharp.API.Modules.Commands;
 using CounterStrikeSharp.API.Modules.Entities;
 using CounterStrikeSharp.API.Modules.Memory;
 using CounterStrikeSharp.API.Modules.Menu;
 using CounterStrikeSharp.API.Modules.Utils;
-using Nexd.MySQL;
+using MySqlConnector;
+using Dapper;
 using System.Runtime.ExceptionServices;
-using static CounterStrikeSharp.API.Core.Listeners;
 using System.Reflection;
-
+using CounterStrikeSharp.API.Modules.Cvars;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace WeaponPaints;
+[MinimumApiVersion(55)]
 public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 {
 	public override string ModuleName => "WeaponPaints";
-    public override string ModuleDescription => "Connector for web-based player chosen wepaon paints.";
+	public override string ModuleDescription => "Connector for web-based player chosen wepaon paints, and standalone for knife.";
 	public override string ModuleAuthor => "Nereziel";
-    public override string ModuleVersion => "0.8";
+	public override string ModuleVersion => "1.0";
-
 	public WeaponPaintsConfig Config { get; set; } = new();
 
-    MySqlDb? MySql = null;
+	private string DatabaseConnectionString = string.Empty;
+	private Uri GlobalShareApi = new Uri("https://weaponpaints.fun/api.php");
+
+	public bool IsMatchZy = false;
+	public int GlobalShareServerId = 0;
+
 	private DateTime[] commandCooldown = new DateTime[Server.MaxPlayers];
 	private Dictionary<ulong, Dictionary<nint, int>> gPlayerWeaponPaints = new();
 	private Dictionary<ulong, Dictionary<nint, int>> gPlayerWeaponSeed = new();
@@ -30,26 +37,16 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 	private Dictionary<int, string> g_playersKnife = new();
 	private static readonly Dictionary<string, string> knifeTypes = new()
 	{
-        { "m9", "weapon_knife_m9_bayonet" },
+		{ "m9", "weapon_knife_m9_bayonet" },        { "karambit", "weapon_knife_karambit" },
-        { "karambit", "weapon_knife_karambit" },
+		{ "bayonet", "weapon_bayonet" },        { "bowie", "weapon_knife_survival_bowie" },
-        { "bayonet", "weapon_bayonet" },
+		{ "butterfly", "weapon_knife_butterfly" },        { "falchion", "weapon_knife_falchion" },
-        { "bowie", "weapon_knife_survival_bowie" },
+		{ "flip", "weapon_knife_flip" },        { "gut", "weapon_knife_gut" },
-        { "butterfly", "weapon_knife_butterfly" },
+		{ "tactical", "weapon_knife_tactical" },        { "shadow", "weapon_knife_push" },
-        { "falchion", "weapon_knife_falchion" },
+		{ "navaja", "weapon_knife_gypsy_jackknife" },        { "stiletto", "weapon_knife_stiletto" },
-        { "flip", "weapon_knife_flip" },
+		{ "talon", "weapon_knife_widowmaker" },        { "ursus", "weapon_knife_ursus" },
-        { "gut", "weapon_knife_gut" },
+		{ "css", "weapon_knife_css" },        { "paracord", "weapon_knife_cord" },
-        { "tactical", "weapon_knife_tactical" },
+		{ "survival", "weapon_knife_canis" },        { "nomad", "weapon_knife_outdoor" },
-        { "shadow", "weapon_knife_push" },
+		{ "skeleton", "weapon_knife_skeleton" },        { "default", "weapon_knife" }
-        { "navaja", "weapon_knife_gypsy_jackknife" },
-        { "stiletto", "weapon_knife_stiletto" },
-        { "talon", "weapon_knife_widowmaker" },
-        { "ursus", "weapon_knife_ursus" },
-        { "css", "weapon_knife_css" },
-        { "paracord", "weapon_knife_cord" },
-        { "survival", "weapon_knife_canis" },
-        { "nomad", "weapon_knife_outdoor" },
-        { "skeleton", "weapon_knife_skeleton" },
-        { "default", "weapon_knife" }
 	};
 	private static readonly List<string> weaponList = new()
 	{
@@ -65,26 +62,116 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 	};
 	public override void Load(bool hotReload)
 	{
-        base.Load(hotReload);
 		SetGlobalExceptionHandler();
-        MySql = new MySqlDb(Config.DatabaseHost, Config.DatabaseUser, Config.DatabasePassword, Config.DatabaseName!, Config.DatabasePort);
+		if (!Config.GlobalShare)
+		{
+			BuildDatabaseConnectionString();
+			TestDatabaseConnection();
+		}
 		RegisterListener<Listeners.OnEntitySpawned>(OnEntitySpawned);
 		RegisterListener<Listeners.OnClientPutInServer>(OnClientPutInServer);
 		RegisterListener<Listeners.OnClientDisconnect>(OnClientDisconnect);
 		RegisterListener<Listeners.OnMapStart>(OnMapStart);
 		RegisterEventHandler<EventPlayerSpawn>(OnPlayerSpawn);
-        //RegisterEventHandler<EventRoundPrestart>(OnRoundPreStart);
+		RegisterEventHandler<EventRoundStart>(OnRoundStart, HookMode.Pre);
+		RegisterEventHandler<EventItemPickup>(OnItemPickup, HookMode.Pre);
+
+		if (hotReload)
+		{
+			OnMapStart(string.Empty);
+			Task.Run(async () =>
+			{
+				for (int i = 1; i <= Server.MaxPlayers; i++)
+				{
+					if (Config.Additional.KnifeEnabled)
+						await GetKnifeFromDatabase(i);
+					if (Config.Additional.SkinEnabled)
+						await GetWeaponPaintsFromDatabase(i);
+				}
+			});
+		}
+
+		if (Config.Additional.KnifeEnabled)
 			SetupMenus();
+
+		RegisterCommands();
 	}
 	public void OnConfigParsed(WeaponPaintsConfig config)
+	{
+		if (!config.GlobalShare)
 		{
 			if (config.DatabaseHost.Length < 1 || config.DatabaseName.Length < 1 || config.DatabaseUser.Length < 1)
 			{
 				throw new Exception("You need to setup Database credentials in config!");
 			}
+		}
 
 		Config = config;
 	}
+
+	private void BuildDatabaseConnectionString()
+	{
+		var builder = new MySqlConnectionStringBuilder
+		{
+			Server = Config.DatabaseHost,
+			UserID = Config.DatabaseUser,
+			Password = Config.DatabasePassword,
+			Database = Config.DatabaseName,
+			Port = (uint)Config.DatabasePort,
+		};
+
+		DatabaseConnectionString = builder.ConnectionString;
+	}
+
+	private void TestDatabaseConnection()
+	{
+		try
+		{
+			using var connection = new MySqlConnection(DatabaseConnectionString);
+			connection.Open();
+
+			if (connection.State != System.Data.ConnectionState.Open)
+			{
+				throw new Exception("Unable connect to database!");
+			}
+		}
+		catch (Exception ex)
+		{
+			throw new Exception("Unknown mysql exception! " + ex.Message);
+		}
+		CheckDatabaseTables();
+	}
+
+	async private void CheckDatabaseTables()
+	{
+		try
+		{
+			using var connection = new MySqlConnection(DatabaseConnectionString);
+			await connection.OpenAsync();
+
+			using var transaction = await connection.BeginTransactionAsync();
+
+			try
+			{
+				string createTable1 = "CREATE TABLE IF NOT EXISTS `wp_player_skins` (`steamid` varchar(64) NOT NULL, `weapon_defindex` int(6) NOT NULL, `weapon_paint_id` int(6) NOT NULL, `weapon_wear` float NOT NULL DEFAULT 0.0001, `weapon_seed` int(16) NOT NULL DEFAULT 0) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci";
+				string createTable2 = "CREATE TABLE IF NOT EXISTS `wp_player_knife` (`steamid` varchar(64) NOT NULL, `knife` varchar(64) NOT NULL, UNIQUE (`steamid`)) ENGINE = InnoDB";
+
+				await connection.ExecuteAsync(createTable1, transaction: transaction);
+				await connection.ExecuteAsync(createTable2, transaction: transaction);
+
+				await transaction.CommitAsync();
+			}
+			catch (Exception)
+			{
+				await transaction.RollbackAsync();
+				throw new Exception("Unable to create tables!");
+			}
+		}
+		catch (Exception ex)
+		{
+			throw new Exception("Unknown mysql exception! " + ex.Message);
+		}
+	}
 	// TODO: fix for map which change mp_t_default_melee
 	/*private HookResult OnRoundPreStart(EventRoundPrestart @event, GameEventInfo info)
 	{
@@ -110,14 +197,78 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 	{
 		AppDomain.CurrentDomain.FirstChanceException -= this.GlobalExceptionHandler;
 	}
+	private void RegisterCommands()
+	{
+		AddCommand($"css_{Config.Additional.CommandSkin}", "Skins info", (player, info) => { if (player == null) return; OnCommandWS(player, info); });
+		AddCommand($"css_{Config.Additional.CommandRefresh}", "Skins refresh", (player, info) => { if (player == null) return; OnCommandRefresh(player, info); });
+		if (Config.Additional.CommandKillEnabled)
+		{
+			AddCommand($"css_{Config.Additional.CommandKill}", "kill yourself", (player, info) =>
+			{
+				if (player == null || !player.IsValid || !player.PlayerPawn.IsValid)
+					return;
+
+				player.PlayerPawn.Value.CommitSuicide(true, false);
+			});
+		}
+	}
+	private void IncompatibilityCheck()
+	{
+		// MatchZy
+		if (Directory.Exists(Path.GetDirectoryName(ModuleDirectory) + "/MatchZy"))
+		{
+			Console.WriteLine("[WeaponPaints] Incompatibility found: MatchZy");
+			IsMatchZy = true;
+		}
+	}
+
 	private void OnMapStart(string mapName)
 	{
+		if (!Config.Additional.KnifeEnabled) return;
 		// TODO
 		// needed for now
-        base.AddTimer(2.0f, () => {
+		AddTimer(2.0f, () =>
+		{
 			NativeAPI.IssueServerCommand("mp_t_default_melee \"\"");
 			NativeAPI.IssueServerCommand("mp_ct_default_melee \"\"");
+			IncompatibilityCheck();
 		});
+		if (Config.GlobalShare)
+			GlobalShareConnect();
+	}
+
+	private void GlobalShareConnect()
+	{
+		if (!Config.GlobalShare) return;
+
+		var values = new Dictionary<string, string>
+			{
+			   { "server_address", $"{ConVar.Find("ip")!.StringValue}:{ConVar.Find("hostport")!.GetPrimitiveValue<int>().ToString()}" },
+			   { "server_hostname", ConVar.Find("hostname")!.StringValue }
+			};
+
+		using (var httpClient = new HttpClient())
+		{
+			httpClient.BaseAddress = GlobalShareApi;
+			var formContent = new FormUrlEncodedContent(values);
+
+			Task<HttpResponseMessage> responseTask = httpClient.PostAsync("", formContent);
+			responseTask.Wait();
+			HttpResponseMessage response = responseTask.Result;
+
+			if (response.IsSuccessStatusCode)
+			{
+				Task<string> responseBodyTask = response.Content.ReadAsStringAsync();
+				responseBodyTask.Wait();
+				string responseBody = responseBodyTask.Result;
+				GlobalShareServerId = Int32.Parse(responseBody);
+			}
+			else
+			{
+				throw new Exception("Unable to retrieve serverid from GlobalShare!");
+			}
+		}
+		Console.WriteLine("[WeaponPaints] GlobalShare ONLINE");
 	}
 
 	private void OnClientPutInServer(int playerSlot)
@@ -125,45 +276,70 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 		int playerIndex = playerSlot + 1;
 		Task.Run(async () =>
 		{
+			if (Config.Additional.KnifeEnabled)
 				await GetKnifeFromDatabase(playerIndex);
+			if (Config.Additional.SkinEnabled)
 				await GetWeaponPaintsFromDatabase(playerIndex);
 		});
 	}
 	private void OnClientDisconnect(int playerSlot)
 	{
+		CCSPlayerController player = Utilities.GetPlayerFromSlot(playerSlot);
+		if (!player.IsValid || player.IsBot) return;
 		// TODO: Clean up after player
-        g_playersKnife.Remove(playerSlot+1);
+		if (Config.Additional.KnifeEnabled)
+			g_playersKnife.Remove((int)player.EntityIndex!.Value.Value);
+		if (Config.Additional.SkinEnabled)
+			gPlayerWeaponPaints.Remove(new SteamID(player.SteamID).SteamId64);
 	}
 
 	private HookResult OnPlayerSpawn(EventPlayerSpawn @event, GameEventInfo info)
 	{
 		var player = @event.Userid;
-        if (!player.IsValid || !player.PlayerPawn.IsValid || !player.PawnIsAlive)
+		if (!player.IsValid || !player.PlayerPawn.IsValid)
 		{
 			return HookResult.Continue;
 		}
-        if (player.IsBot) 
-        { 
-            player.GiveNamedItem("weapon_knife");
-            return HookResult.Continue;
-        }
 
-        if (!PlayerHasKnife(player))
+		if (Config.Additional.KnifeEnabled)
 		{
-            if (g_playersKnife.TryGetValue((int)player.EntityIndex!.Value.Value, out var knife))
+			GiveKnifeToPlayer(player);
-            {
-                player.GiveNamedItem(knife);
-            }
-            else
-            {
-                player.GiveNamedItem("weapon_knife");
-            }
 		}
 
+
 		return HookResult.Continue;
 	}
+	private HookResult OnRoundStart(EventRoundStart @event, GameEventInfo info)
+	{
+		if (!IsMatchZy) return HookResult.Continue;
+
+		NativeAPI.IssueServerCommand("mp_t_default_melee \"\"");
+		NativeAPI.IssueServerCommand("mp_ct_default_melee \"\"");
+
+		return HookResult.Continue;
+	}
+	private HookResult OnItemPickup(EventItemPickup @event, GameEventInfo info)
+	{
+		if (@event.Defindex == 42 || @event.Defindex == 59)
+		{
+			CCSPlayerController player = @event.Userid;
+
+			if (player.IsValid && !player.IsBot && @event.Item == "knife")
+			{
+				if (g_playersKnife.ContainsKey((int)player.EntityIndex!.Value.Value)
+					&&
+				   g_playersKnife[(int)player.EntityIndex!.Value.Value] != "weapon_knife")
+				{
+					RefreshPlayerKnife(player, true);
+				}
+			}
+		}
+		return HookResult.Continue;
+	}
+
 	private void OnEntitySpawned(CEntityInstance entity)
 	{
+		if (!Config.Additional.SkinEnabled) return;
 		var designerName = entity.DesignerName;
 		if (!weaponList.Contains(designerName)) return;
 		bool isKnife = false;
@@ -174,6 +350,8 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 			isKnife = true;
 		}
 		Server.NextFrame(() =>
+		{
+			try
 			{
 				if (!weapon.IsValid) return;
 				if (weapon.OwnerEntity.Value == null) return;
@@ -205,12 +383,36 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 					var skeleton = GetSkeletonInstance(weapon.CBodyComponent.SceneNode);
 					skeleton.ModelState.MeshGroupMask = 2;
 				}
+			}
+			catch (Exception) { }
 		});
 	}
-    public void RemoveKnifeFromPlayer(CCSPlayerController player)
+	public void GiveKnifeToPlayer(CCSPlayerController? player)
 	{
-        if (!player.PawnIsAlive) return;
+		if (!Config.Additional.KnifeEnabled) return;
-        if (!g_playersKnife.ContainsKey((int)player.EntityIndex!.Value.Value)) return;
+		if (player == null || !player.IsValid) return;
+
+		if (g_playersKnife.TryGetValue((int)player.EntityIndex!.Value.Value, out var knife))
+		{
+			player.GiveNamedItem(knife);
+		}
+		else
+		{
+			if (Config.Additional.GiveRandomKnife)
+			{
+				Random random = new Random();
+				int index = random.Next(knifeTypes.Count);
+				player.GiveNamedItem(knifeTypes.Values.ElementAt(index));
+			}
+			else
+			{
+				player.GiveNamedItem((CsTeam)player.TeamNum == CsTeam.Terrorist ? "weapon_knife_t" : "weapon_knife");
+			}
+		}
+	}
+	public void RemoveKnifeFromPlayer(CCSPlayerController? player)
+	{
+		if (player == null || !player.IsValid || !player.PawnIsAlive) return;
 		var weapons = player.PlayerPawn.Value.WeaponServices!.MyWeapons;
 		foreach (var weapon in weapons)
 		{
@@ -220,16 +422,42 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 				if (weapon.Value.DesignerName.Contains("knife"))
 				{
 					weapon.Value.Remove();
-                    player.GiveNamedItem(g_playersKnife[(int)player.EntityIndex!.Value.Value]);
+					return;
-                    break;
 				}
 			}
 		}
 	}
-    public static bool PlayerHasKnife(CCSPlayerController player)
+	public void RefreshPlayerKnife(CCSPlayerController? player, bool remove = false)
 	{
-        if (!player.PawnIsAlive) return false;
+		if (player == null || !player.IsValid || !player.PawnIsAlive) return;
+
+		if (remove == true)
+			RemoveKnifeFromPlayer(player);
+
+		AddTimer(0.2f, () =>
+		{
+			if (!PlayerHasKnife(player))
+				GiveKnifeToPlayer(player);
+		});
+
+		if (Config.Additional.SkinVisibilityFix)
+		{
+			AddTimer(0.2f, () => NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot3"));
+			AddTimer(0.3f, () => NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot2"));
+			AddTimer(0.36f, () => NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot1"));
+		}
+	}
+	public bool PlayerHasKnife(CCSPlayerController? player)
+	{
+		if (!Config.Additional.KnifeEnabled) return false;
+
+		if (player == null || !player.IsValid || !player.PawnIsAlive)
+		{
+			return false;
+		}
+
 		var weapons = player.PlayerPawn.Value.WeaponServices!.MyWeapons;
+		if (weapons == null) return false;
 		foreach (var weapon in weapons)
 		{
 			if (weapon.IsValid && weapon.Value.IsValid)
@@ -244,63 +472,86 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 	}
 	private void SetupMenus()
 	{
+		if (!Config.Additional.KnifeEnabled) return;
 		var giveItemMenu = new ChatMenu(ReplaceTags(Config.Messages.KnifeMenuTitle));
 		var handleGive = (CCSPlayerController player, ChatMenuOption option) =>
 		{
+			string temp = "";
 			if (knifeTypes.TryGetValue(option.Text, out var knife))
 			{
-                Task.Run(() => SyncKnifeToDatabase((int)player.EntityIndex!.Value.Value, knife));
 				g_playersKnife[(int)player.EntityIndex!.Value.Value] = knifeTypes[option.Text];
-                if (!string.IsNullOrEmpty(Config.Messages.ChosenKnifeMenu)) {
+				if (!string.IsNullOrEmpty(Config.Messages.ChosenKnifeMenu))
-                    string temp = $"{Config.Prefix} {Config.Messages.ChosenKnifeMenu}".Replace("{KNIFE}", option.Text);
+				{
+					temp = $"{Config.Prefix} {Config.Messages.ChosenKnifeMenu}".Replace("{KNIFE}", option.Text);
 					player.PrintToChat(ReplaceTags(temp));
 				}
+				if (!string.IsNullOrEmpty(Config.Messages.ChosenKnifeMenuKill) && Config.Additional.CommandKillEnabled)
+				{
+					temp = $"{Config.Prefix} {Config.Messages.ChosenKnifeMenuKill}";
+					player.PrintToChat(ReplaceTags(temp));
+				}
+				Task.Run(() => SyncKnifeToDatabase((int)player.EntityIndex!.Value.Value, knife));
 				RemoveKnifeFromPlayer(player);
+				AddTimer(0.1f, () => GiveKnifeToPlayer(player));
 			}
 		};
 		foreach (var knife in knifeTypes)
 		{
 			giveItemMenu.AddMenuOption(knife.Key, handleGive);
 		}
-        AddCommand("css_knife", "Knife Menu", (player, info) => { if (player == null) return; ChatMenus.OpenMenu(player, giveItemMenu); });
+		AddCommand($"css_{Config.Additional.CommandKnife}", "Knife Menu", (player, info) => { if (player == null) return; ChatMenus.OpenMenu(player, giveItemMenu); });
 	}
-    [ConsoleCommand("css_wp", "refreshskins")]
+	// [ConsoleCommand($"css_{Config.Additional.CommandRefresh}", "refreshskins")]
 	public void OnCommandRefresh(CCSPlayerController? player, CommandInfo command)
 	{
+		if (!Config.Additional.CommandWpEnabled || !Config.Additional.SkinEnabled) return;
 		if (player == null) return;
 		string temp = "";
 		int playerIndex = (int)player.EntityIndex!.Value.Value;
-        if (DateTime.UtcNow >= commandCooldown[playerIndex].AddSeconds(Config.CmdRefreshCooldownSeconds))
+		if (commandCooldown != null && DateTime.UtcNow >= commandCooldown[playerIndex].AddSeconds(Config.CmdRefreshCooldownSeconds))
 		{
 			commandCooldown[playerIndex] = DateTime.UtcNow;
 			Task.Run(async () => await GetWeaponPaintsFromDatabase(playerIndex));
-            if (!string.IsNullOrEmpty(Config.Messages.SuccessRefreshCommand)) {
+			if (Config.Additional.KnifeEnabled)
+			{
+				Task.Run(async () => await GetKnifeFromDatabase(playerIndex));
+				RemoveKnifeFromPlayer(player);
+				AddTimer(0.2f, () => GiveKnifeToPlayer(player));
+			}
+			if (!string.IsNullOrEmpty(Config.Messages.SuccessRefreshCommand))
+			{
 				temp = $"{Config.Prefix} {Config.Messages.SuccessRefreshCommand}";
 				player.PrintToChat(ReplaceTags(temp));
 			}
 			return;
 		}
-        if (!string.IsNullOrEmpty(Config.Messages.CooldownRefreshCommand)) {
+		if (!string.IsNullOrEmpty(Config.Messages.CooldownRefreshCommand))
+		{
 			temp = $"{Config.Prefix} {Config.Messages.CooldownRefreshCommand}";
 			player.PrintToChat(ReplaceTags(temp));
 		}
 	}
-    [ConsoleCommand("css_ws", "weaponskins")]
+	// [ConsoleCommand($"css_{Config.Additional.CommandSkin}", "weaponskins")]
 	public void OnCommandWS(CCSPlayerController? player, CommandInfo command)
 	{
+		if (!Config.Additional.SkinEnabled) return;
 		if (player == null) return;
 
 		string temp = "";
 
-        if (!string.IsNullOrEmpty(Config.Messages.WebsiteMessageCommand)) {
+		if (!string.IsNullOrEmpty(Config.Messages.WebsiteMessageCommand))
+		{
 			temp = $"{Config.Prefix} {Config.Messages.WebsiteMessageCommand}";
 			player.PrintToChat(ReplaceTags(temp));
 		}
-        if (!string.IsNullOrEmpty(Config.Messages.SynchronizeMessageCommand)) {
+		if (!string.IsNullOrEmpty(Config.Messages.SynchronizeMessageCommand))
+		{
 			temp = $"{Config.Prefix} {Config.Messages.SynchronizeMessageCommand}";
 			player.PrintToChat(ReplaceTags(temp));
 		}
-        if (!string.IsNullOrEmpty(Config.Messages.KnifeMessageCommand)) {
+		if (!Config.Additional.KnifeEnabled) return;
+		if (!string.IsNullOrEmpty(Config.Messages.KnifeMessageCommand))
+		{
 			temp = $"{Config.Prefix} {Config.Messages.KnifeMessageCommand}";
 			player.PrintToChat(ReplaceTags(temp));
 		}
@@ -312,42 +563,94 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 	}
 	private async Task GetWeaponPaintsFromDatabase(int playerIndex)
 	{
+		if (!Config.Additional.SkinEnabled) return;
+
 		try
 		{
 			CCSPlayerController player = Utilities.GetPlayerFromIndex(playerIndex);
-            if (player == null || !player.IsValid) return;
+			if (player == null || !player.IsValid || player.IsBot) return;
 			var steamId = new SteamID(player.SteamID);
 
-            MySqlQueryCondition conditions = new MySqlQueryCondition()
+			if (Config.GlobalShare)
-                 .Add("steamid", "=", steamId.SteamId64.ToString());
-
-            MySqlQueryResult result = await MySql!.Table("wp_player_skins").Where(conditions).SelectAsync();
-            if (result.Rows < 1) return;
-            result.ToList().ForEach(pair =>
 			{
-                int WeaponDefIndex = result.Get<int>(pair.Key, "weapon_defindex");
+				var values = new Dictionary<string, string>
-                int PaintId = result.Get<int>(pair.Key, "weapon_paint_id");
+				{
-                float Wear = result.Get<float>(pair.Key, "weapon_wear");
+				   { "server_id", GlobalShareServerId.ToString() },
-                int Seed = result.Get<int>(pair.Key, "weapon_seed");
+				   { "steamid", steamId.SteamId64.ToString() },
+				   { "skins", "1" }
+				};
+				UriBuilder builder = new UriBuilder(GlobalShareApi);
+				builder.Query = string.Join("&", values.Select(p => $"{Uri.EscapeDataString(p.Key)}={Uri.EscapeDataString(p.Value)}"));
 
-                if (!gPlayerWeaponPaints.ContainsKey(steamId.SteamId64))
+				using (var httpClient = new HttpClient())
+				{
+					httpClient.BaseAddress = GlobalShareApi;
+					var formContent = new FormUrlEncodedContent(values);
+					HttpResponseMessage response = await httpClient.GetAsync(builder.Uri);
+
+					if (response.IsSuccessStatusCode)
+					{
+						string responseBody = await response.Content.ReadAsStringAsync();
+						JArray jsonArray = JArray.Parse(responseBody);
+						if (jsonArray.Count > 0)
 						{
 							gPlayerWeaponPaints[steamId.SteamId64] = new Dictionary<nint, int>();
-                }
-                if (!gPlayerWeaponWear.ContainsKey(steamId.SteamId64))
-                {
 							gPlayerWeaponWear[steamId.SteamId64] = new Dictionary<nint, float>();
-                }
-                if (!gPlayerWeaponSeed.ContainsKey(steamId.SteamId64))
-                {
 							gPlayerWeaponSeed[steamId.SteamId64] = new Dictionary<nint, int>();
+
+							foreach (var weapon in jsonArray)
+							{
+								int weaponDefIndex = weapon["weapon_defindex"].Value<int>();
+								int weaponPaintId = weapon["weapon_paint_id"].Value<int>();
+								float weaponWear = weapon["weapon_wear"].Value<float>();
+								int weaponSeed = weapon["weapon_seed"].Value<int>();
+
+								gPlayerWeaponPaints[steamId.SteamId64][weaponDefIndex] = weaponPaintId;
+								gPlayerWeaponWear[steamId.SteamId64][weaponDefIndex] = weaponWear;
+								gPlayerWeaponSeed[steamId.SteamId64][weaponDefIndex] = weaponSeed;
+							}
+						}
+						return;
+					}
+					else
+					{
+						return;
+					}
+				}
 			}
 
-                gPlayerWeaponPaints[steamId.SteamId64][WeaponDefIndex] = PaintId;
+			using (var connection = new MySqlConnection(DatabaseConnectionString))
-                gPlayerWeaponWear[steamId.SteamId64][WeaponDefIndex] = Wear;
+			{
-                gPlayerWeaponSeed[steamId.SteamId64][WeaponDefIndex] = Seed;
+				await connection.OpenAsync();
+
+				string query = "SELECT * FROM `wp_player_skins` WHERE `steamid` = @steamid";
+
+				IEnumerable<dynamic> PlayerSkins = await connection.QueryAsync<dynamic>(query, new { steamid = steamId.SteamId64.ToString() });
+
+				if (PlayerSkins != null && PlayerSkins.AsList().Count > 0)
+				{
+					gPlayerWeaponPaints[steamId.SteamId64] = new Dictionary<nint, int>();
+					gPlayerWeaponWear[steamId.SteamId64] = new Dictionary<nint, float>();
+					gPlayerWeaponSeed[steamId.SteamId64] = new Dictionary<nint, int>();
+
+					PlayerSkins.ToList().ForEach(row =>
+					{
+						int weaponDefIndex = row.weapon_defindex ?? default(int);
+						int weaponPaintId = row.weapon_paint_id ?? default(int);
+						float weaponWear = row.weapon_wear ?? default(float);
+						int weaponSeed = row.weapon_seed ?? default(int);
+
+						gPlayerWeaponPaints[steamId.SteamId64][weaponDefIndex] = weaponPaintId;
+						gPlayerWeaponWear[steamId.SteamId64][weaponDefIndex] = weaponWear;
+						gPlayerWeaponSeed[steamId.SteamId64][weaponDefIndex] = weaponSeed;
 					});
 				}
+				else
+				{
+					return;
+				}
+			}
+		}
 		catch (Exception e)
 		{
 			Log(e.Message);
@@ -356,26 +659,65 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 	}
 	private async Task GetKnifeFromDatabase(int playerIndex)
 	{
+		if (!Config.Additional.KnifeEnabled) return;
 		try
 		{
 			CCSPlayerController player = Utilities.GetPlayerFromIndex(playerIndex);
-            if (player == null || !player.IsValid) return;
+			if (player == null || !player.IsValid || player.IsBot) return;
 			var steamId = new SteamID(player.SteamID);
-            MySqlQueryCondition conditions = new MySqlQueryCondition()
-                 .Add("steamid", "=", steamId.SteamId64.ToString());
 
-            MySqlQueryResult result = await MySql!.Table("wp_player_knife").Where(conditions).SelectAsync();
+			if (Config.GlobalShare)
-
+			{
-            if (result.Rows < 1)
+				var values = new Dictionary<string, string>
+				{
+				   { "server_id", GlobalShareServerId.ToString() },
+				   { "steamid", steamId.SteamId64.ToString() },
+				   { "knife", "1" }
+				};
+				UriBuilder builder = new UriBuilder(GlobalShareApi);
+				builder.Query = string.Join("&", values.Select(p => $"{Uri.EscapeDataString(p.Key)}={Uri.EscapeDataString(p.Value)}"));
+
+				using (var httpClient = new HttpClient())
+				{
+					httpClient.BaseAddress = GlobalShareApi;
+					var formContent = new FormUrlEncodedContent(values);
+					HttpResponseMessage response = await httpClient.GetAsync(builder.Uri);
+
+					if (response.IsSuccessStatusCode)
+					{
+						string result = await response.Content.ReadAsStringAsync();
+						if (!string.IsNullOrEmpty(result))
+						{
+							g_playersKnife[playerIndex] = result;
+						}
+						else
 						{
-                //g_playersKnife[playerIndex] = "weapon_knife";
 							return;
 						}
 
-            string knife = result.Get<string>(0, "knife");
+					}
-            if (knife != null)
+					else
 					{
-                g_playersKnife[playerIndex] = knife;
+						return;
+					}
+				}
+				return;
+			}
+
+			using (var connection = new MySqlConnection(DatabaseConnectionString))
+			{
+				await connection.OpenAsync();
+				string query = "SELECT `knife` FROM `wp_player_knife` WHERE `steamid` = @steamid";
+				string? PlayerKnife = await connection.QueryFirstOrDefaultAsync<string>(query, new { steamid = steamId.SteamId64.ToString() });
+
+				if (PlayerKnife != null)
+				{
+					g_playersKnife[playerIndex] = PlayerKnife;
+				}
+				else
+				{
+					return;
+				}
 			}
 			//Log($"{player.PlayerName} has this knife -> {g_playersKnife[playerIndex]}");
 		}
@@ -387,12 +729,17 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 	}
 	private async Task SyncKnifeToDatabase(int playerIndex, string knife)
 	{
+		if (!Config.Additional.KnifeEnabled) return;
 		try
 		{
 			CCSPlayerController player = Utilities.GetPlayerFromIndex(playerIndex);
 			if (player == null || !player.IsValid) return;
 			var steamId = new SteamID(player.SteamID);
-            await MySql!.ExecuteNonQueryAsync($"INSERT INTO `wp_player_knife` (`steamid`, `knife`) VALUES('{steamId.SteamId64}', '{knife}') ON DUPLICATE KEY UPDATE `knife` = '{knife}';");
+
+			using var connection = new MySqlConnection(DatabaseConnectionString);
+			await connection.OpenAsync();
+			string query = "INSERT INTO `wp_player_knife` (`steamid`, `knife`) VALUES(@steamid, @newKnife) ON DUPLICATE KEY UPDATE `knife` = @newKnife";
+			await connection.ExecuteAsync(query, new { steamid = steamId.SteamId64.ToString(), newKnife = knife });
 		}
 		catch (Exception e)
 		{

WeaponPaints.csproj

@@ -9,7 +9,9 @@
 
   <ItemGroup>
     <PackageReference Include="CounterStrikeSharp.API" Version="*" />
-    <PackageReference Include="Nexd.MySQL" Version="1.0.1" />
+    <PackageReference Include="Dapper" Version="2.1.21" />
+    <PackageReference Include="MySqlConnector" Version="2.3.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>

website/class/utils.php

@@ -0,0 +1,96 @@
+<?php
+class UtilsClass
+{
+    public static function skinsFromJson(): array
+    {
+        $skins = [];
+        $json = json_decode(file_get_contents(__DIR__ . "/../data/skins.json"), true);
+
+        foreach ($json as $skin) {
+            $skins[(int) $skin['weapon_defindex']][(int) $skin['paint']] = [
+                'weapon_name' => $skin['weapon_name'],
+                'paint_name' => $skin['paint_name'],
+                'image_url' => $skin['image'],
+            ];
+        }
+
+        return $skins;
+    }
+
+    public static function getWeaponsFromArray()
+    {
+        $weapons = [];
+        $temp = self::skinsFromJson();
+
+        foreach ($temp as $key => $value) {
+            if (key_exists($key, $weapons))
+                continue;
+
+            $weapons[$key] = [
+                'weapon_name' => $value[0]['weapon_name'],
+                'paint_name' => $value[0]['paint_name'],
+                'image_url' => $value[0]['image_url'],
+            ];
+        }
+
+        return $weapons;
+    }
+
+    public static function getKnifeTypes()
+    {
+        $knifes = [];
+        $temp = self::getWeaponsFromArray();
+
+        foreach ($temp as $key => $weapon) {
+            if (
+                !in_array($key, [
+                    500,
+                    503,
+                    505,
+                    506,
+                    507,
+                    508,
+                    509,
+                    512,
+                    514,
+                    515,
+                    516,
+                    517,
+                    518,
+                    519,
+                    520,
+                    521,
+                    522,
+                    523,
+                    525
+                ])
+            )
+                continue;
+
+            $knifes[$key] = [
+                'weapon_name' => $weapon['weapon_name'],
+                'paint_name' => rtrim(explode("|", $weapon['paint_name'])[0]),
+                'image_url' => $weapon['image_url'],
+            ];
+            $knifes[0] = [
+                'weapon_name' => "weapon_knife",
+                'paint_name' => "Default knife",
+                'image_url' => "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/weapon_knife.png",
+            ];
+        }
+
+        ksort($knifes);
+        return $knifes;
+    }
+
+    public static function getSelectedSkins(array $temp)
+    {
+        $selected = [];
+
+        foreach ($temp as $weapon) {
+            $selected[$weapon['weapon_defindex']] = $weapon['weapon_paint_id'];
+        }
+
+        return $selected;
+    }
+}