Merge pull request #34 from daffyyyy/enhancement/website-knife-choosing

Choosing knife on website

Config.cs

@@ -21,9 +21,24 @@ namespace WeaponPaints
         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;
+    }
+
     public class WeaponPaintsConfig : BasePluginConfig
     {
-        public override int Version { get; set; } = 2;
+        public override int Version { get; set; } = 3;
 
         [JsonPropertyName("DatabaseHost")]
         public string DatabaseHost { get; set; } = "";
@@ -51,6 +66,9 @@ namespace WeaponPaints
 
         [JsonPropertyName("Messages")]
         public Messages Messages { get; set; } = new Messages();
+
+        [JsonPropertyName("Additional")]
+        public Additional Additional { get; set; } = new Additional();
     }
     
 }

WeaponPaints.cs

@@ -1,5 +1,6 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core.Attributes;
 using CounterStrikeSharp.API.Core.Attributes.Registration;
 using CounterStrikeSharp.API.Modules.Commands;
 using CounterStrikeSharp.API.Modules.Entities;
@@ -13,6 +14,7 @@ using System.Reflection;
 
 
 namespace WeaponPaints;
+[MinimumApiVersion(52)]
 public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 {
     public override string ModuleName => "WeaponPaints";
@@ -74,7 +76,8 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
         RegisterListener<Listeners.OnMapStart>(OnMapStart);
         RegisterEventHandler<EventPlayerSpawn>(OnPlayerSpawn);
         //RegisterEventHandler<EventRoundPrestart>(OnRoundPreStart);
-        SetupMenus();
+        if (Config.Additional.KnifeEnabled)
+            SetupMenus();
     }
     public void OnConfigParsed(WeaponPaintsConfig config)
     {
@@ -112,6 +115,7 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
     }
     private void OnMapStart(string mapName)
     {
+        if (!Config.Additional.KnifeEnabled) return;
         // TODO
         // needed for now
         base.AddTimer(2.0f, () => {
@@ -124,15 +128,17 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
     {
         int playerIndex = playerSlot + 1;
         Task.Run(async () =>
-        {
+        {   
-            await GetKnifeFromDatabase(playerIndex);
+            if (Config.Additional.KnifeEnabled)
+                await GetKnifeFromDatabase(playerIndex);
             await GetWeaponPaintsFromDatabase(playerIndex);
         });
     }
     private void OnClientDisconnect(int playerSlot)
     {
         // TODO: Clean up after player
-        g_playersKnife.Remove(playerSlot+1);
+        if (Config.Additional.KnifeEnabled)
+            g_playersKnife.Remove(playerSlot+1);
     }
 
     private HookResult OnPlayerSpawn(EventPlayerSpawn @event, GameEventInfo info)
@@ -143,17 +149,22 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
             return HookResult.Continue;
         }
 
-        GiveKnifeToPlayer(player);
+        if (Config.Additional.KnifeEnabled)
+            GiveKnifeToPlayer(player);
 
-        // Check the best slot and set it. Weird solution but works xD
+        if (Config.Additional.SkinVisibilityFix)
-        AddTimer(0.1f, () => NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot3"));
+        {
-        AddTimer(0.25f, () => NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot2"));
+            // Check the best slot and set it. Weird solution but works xD
-        AddTimer(0.35f, () => NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot1"));
+            AddTimer(0.1f, () => NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot3"));
+            AddTimer(0.25f, () => NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot2"));
+            AddTimer(0.35f, () => NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot1"));
+        }
 
         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;
@@ -199,6 +210,7 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
     }
     public void GiveKnifeToPlayer(CCSPlayerController player)
     {
+        if (!Config.Additional.KnifeEnabled) return;
         if (player.IsBot) 
         { 
             player.GiveNamedItem((CsTeam)player.TeamNum == CsTeam.Terrorist ? "weapon_knife_t" : "weapon_knife");
@@ -219,6 +231,7 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
     }
     public void RemoveKnifeFromPlayer(CCSPlayerController player)
     {
+        if (!Config.Additional.KnifeEnabled) return;
         if (!g_playersKnife.ContainsKey((int)player.EntityIndex!.Value.Value)) return;
         var weapons = player.PlayerPawn.Value.WeaponServices!.MyWeapons;
         foreach (var weapon in weapons)
@@ -234,8 +247,9 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
             }
         }
     }
-    public static bool PlayerHasKnife(CCSPlayerController player)
+    public bool PlayerHasKnife(CCSPlayerController player)
     {
+        if (!Config.Additional.KnifeEnabled) return true;
         var weapons = player.PlayerPawn.Value.WeaponServices!.MyWeapons;
         foreach (var weapon in weapons)
         {
@@ -251,6 +265,7 @@ 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) =>
         {
@@ -275,6 +290,7 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
     [ConsoleCommand("css_wp", "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;
@@ -282,6 +298,8 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
         {
             commandCooldown[playerIndex] = DateTime.UtcNow;
             Task.Run(async () => await GetWeaponPaintsFromDatabase(playerIndex));
+            if (Config.Additional.KnifeEnabled)
+                Task.Run(async () => await GetKnifeFromDatabase(playerIndex));
             if (!string.IsNullOrEmpty(Config.Messages.SuccessRefreshCommand)) {
                 temp = $"{Config.Prefix} {Config.Messages.SuccessRefreshCommand}";
                 player.PrintToChat(ReplaceTags(temp));
@@ -296,6 +314,7 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
     [ConsoleCommand("css_ws", "weaponskins")]
     public void OnCommandWS(CCSPlayerController? player, CommandInfo command)
     {
+        if (!Config.Additional.SkinEnabled) return;
         if (player == null) return;
 
         string temp = "";
@@ -308,6 +327,7 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
             temp = $"{Config.Prefix} {Config.Messages.SynchronizeMessageCommand}";
             player.PrintToChat(ReplaceTags(temp));
         }
+        if (!Config.Additional.KnifeEnabled) return;
         if (!string.IsNullOrEmpty(Config.Messages.KnifeMessageCommand)) {
             temp = $"{Config.Prefix} {Config.Messages.KnifeMessageCommand}";
             player.PrintToChat(ReplaceTags(temp));
@@ -320,6 +340,7 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
     }
     private async Task GetWeaponPaintsFromDatabase(int playerIndex)
     {
+        if (!Config.Additional.SkinEnabled) return;
         try
         {
             CCSPlayerController player = Utilities.GetPlayerFromIndex(playerIndex);
@@ -364,6 +385,7 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
     }
     private async Task GetKnifeFromDatabase(int playerIndex)
     {
+        if (!Config.Additional.KnifeEnabled) return;
         try
         {
             CCSPlayerController player = Utilities.GetPlayerFromIndex(playerIndex);
@@ -395,6 +417,7 @@ 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);

website/class/utils.php

@@ -7,7 +7,8 @@ class UtilsClass
         $json = json_decode(file_get_contents(__DIR__ . "/../data/skins.json"), true);
 
         foreach ($json as $skin) {
-            $skins[(int)$skin['weapon_defindex']][(int)$skin['paint']] = [
+            $skins[(int) $skin['weapon_defindex']][(int) $skin['paint']] = [
+                'weapon_name' => $skin['weapon_name'],
                 'paint_name' => $skin['paint_name'],
                 'image_url' => $skin['image'],
             ];
@@ -21,11 +22,12 @@ class UtilsClass
         $weapons = [];
         $temp = self::skinsFromJson();
 
-        foreach ($temp as $key => $value)
+        foreach ($temp as $key => $value) {
-        {
+            if (key_exists($key, $weapons))
-            if (key_exists($key, $weapons)) continue;
+                continue;
 
             $weapons[$key] = [
+                'weapon_name' => $value[0]['weapon_name'],
                 'paint_name' => $value[0]['paint_name'],
                 'image_url' => $value[0]['image_url'],
             ];
@@ -34,15 +36,61 @@ class UtilsClass
         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)
+        foreach ($temp as $weapon) {
-        {
             $selected[$weapon['weapon_defindex']] = $weapon['weapon_paint_id'];
         }
 
         return $selected;
     }
-}
+}

website/index.php

@@ -15,18 +15,24 @@ if (isset($_SESSION['steamid'])) {
 	$skins = UtilsClass::skinsFromJson();
 	$querySelected = $query3 = $db->select("SELECT `weapon_defindex`, `weapon_paint_id` FROM `wp_player_skins` WHERE `wp_player_skins`.`steamid` = :steamid", ["steamid" => $steamid]);
 	$selectedSkins = UtilsClass::getSelectedSkins($querySelected);
+	$selectedKnife = $db->select("SELECT * FROM `wp_player_knife` WHERE `wp_player_knife`.`steamid` = :steamid", ["steamid" => $steamid])[0];
+	$knifes = UtilsClass::getKnifeTypes();
 
 	if (isset($_POST['forma'])) {
 		$ex = explode("-", $_POST['forma']);
 
-		if (array_key_exists($ex[1], $skins[$ex[0]])) {
+		if ($ex[0] == "knife") {
-			if (array_key_exists($ex[0], $selectedSkins)) {
+			$db->query("INSERT INTO `wp_player_knife` (`steamid`, `knife`) VALUES(:steamid, :knife) ON DUPLICATE KEY UPDATE `knife` = :knife", ["steamid" => $steamid, "knife" => $knifes[$ex[1]]['weapon_name']]);
-				$db->query("UPDATE wp_player_skins SET weapon_paint_id = :weapon_paint_id WHERE steamid = :steamid AND weapon_defindex = :weapon_defindex", ["steamid" => $steamid, "weapon_defindex" => $ex[0], "weapon_paint_id" => $ex[1]]);
+		} else {
-			} else {
+			if (array_key_exists($ex[1], $skins[$ex[0]])) {
-				$db->query("INSERT INTO wp_player_skins (`steamid`, `weapon_defindex`, `weapon_paint_id`) VALUES (:steamid, :weapon_defindex, :weapon_paint_id)", ["steamid" => $steamid, "weapon_defindex" => $ex[0], "weapon_paint_id" => $ex[1]]);
+				if (array_key_exists($ex[0], $selectedSkins)) {
+					$db->query("UPDATE wp_player_skins SET weapon_paint_id = :weapon_paint_id WHERE steamid = :steamid AND weapon_defindex = :weapon_defindex", ["steamid" => $steamid, "weapon_defindex" => $ex[0], "weapon_paint_id" => $ex[1]]);
+				} else {
+					$db->query("INSERT INTO wp_player_skins (`steamid`, `weapon_defindex`, `weapon_paint_id`) VALUES (:steamid, :weapon_defindex, :weapon_paint_id)", ["steamid" => $steamid, "weapon_defindex" => $ex[0], "weapon_paint_id" => $ex[1]]);
+				}
 			}
-			header("Location: index.php");
 		}
+		header("Location: index.php");
 	}
 }
 ?>
@@ -54,7 +60,47 @@ if (isset($_SESSION['steamid'])) {
 		echo "</h2></div>";
 	} else {
 		echo "<div class='bg-primary'>Your current weapon skin loadout<form action='' method='get'><button class='btn btn-secondary' name='logout' type='submit'>Logout</button></form></div>";
-		echo "<div class='card-group'>";
+		echo "<div class='card-group mt-2'>";
+		?>
+
+		<div class="col-sm-2">
+			<div class="card text-center mb-3 border border-primary">
+				<div class="card-body">
+					<?php
+					$actualKnife = $knifes[0];
+					foreach ($knifes as $knife) {
+						if ($selectedKnife['knife'] == $knife['weapon_name']) {
+							$actualKnife = $knife;
+							break;
+						}
+					}
+
+					echo "<div class='card-header'>";
+					echo "<h6 class='card-title item-name'>Knife type</h6>";
+					echo "<h5 class='card-title item-name'>{$actualKnife["paint_name"]}</h5>";
+					echo "</div>";
+					echo "<img src='{$actualKnife["image_url"]}' class='skin-image'>";
+					?>
+				</div>
+				<div class="card-footer">
+					<form action="" method="POST">
+						<select name="forma" class="form-control select" onchange="this.form.submit()" class="SelectWeapon">
+							<option>Select knife</option>
+							<?php
+							foreach ($knifes as $knifeKey => $knife) {
+								if ($selectedKnife['knife'] == $knife['weapon_name'])
+									echo "<option selected value=\"knife-{$knifeKey}\">{$knife['paint_name']}</option>";
+								else
+									echo "<option value=\"knife-{$knifeKey}\">{$knife['paint_name']}</option>";
+							}
+							?>
+						</select>
+					</form>
+				</div>
+			</div>
+		</div>
+
+		<?php
 		foreach ($weapons as $defindex => $default) { ?>
 			<div class="col-sm-2">
 				<div class="card text-center mb-3">
@@ -64,7 +110,7 @@ if (isset($_SESSION['steamid'])) {
 							echo "<div class='card-header'>";
 							echo "<h5 class='card-title item-name'>{$skins[$defindex][$selectedSkins[$defindex]]["paint_name"]}</h5>";
 							echo "</div>";
-							echo "<img src='{$skins[$defindex][$selectedSkins[$defindex]]['image_url']}' class='skin-image' >";
+							echo "<img src='{$skins[$defindex][$selectedSkins[$defindex]]['image_url']}' class='skin-image'>";
 						} else {
 							echo "<div class='card-header'>";
 							echo "<h5 class='card-title item-name'>{$default["paint_name"]}</h5>";