Merge pull request #68 from daffyyyy/fix-knife-3

IMPORTANT KNIVES FIX

.github/workflows/build.yml

@@ -3,8 +3,16 @@ name: Build
 on:
   push:
     branches: [ "main" ]
+    paths-ignore:
+      - '**/README.md'
+      - '**/.gitignore'
+      - '**/LICENSE'
   pull_request:
     branches: [ "main" ]
+    paths-ignore:
+      - '**/README.md'
+      - '**/.gitignore'
+      - '**/LICENSE'
 
 env:
   BUILD_NUMBER: ${{ github.run_number }}
@@ -12,7 +20,6 @@ env:
   PROJECT_NAME: "WeaponPaints"
   OUTPUT_PATH: "./WeaponPaints"
 
-
 jobs:
   build:
     permissions: write-all
@@ -51,6 +58,8 @@ jobs:
           ${{ env.OUTPUT_PATH }}/McMaster.NETCore.Plugins.dll \
           ${{ env.OUTPUT_PATH }}/Microsoft.DotNet.PlatformAbstractions.dll \
           ${{ env.OUTPUT_PATH }}/Microsoft.Extensions.DependencyModel.dll \
+    - name: Copy skins.json
+      run: cp website/data/skins.json ${{ env.OUTPUT_PATH }}/skins.json
     - name: Zip
       uses: thedoctor0/zip-release@0.7.5
       with:

Config.cs

@@ -17,10 +17,16 @@ 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("ChosenSkinMenu")]
+		public string ChosenSkinMenu { get; set; } = "You have chosen {SKIN} as your skin.";
 		[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.";
+		[JsonPropertyName("WeaponMenuTitle")]
+		public string WeaponMenuTitle { get; set; } = "Weapon Menu.";
+		[JsonPropertyName("SkinMenuTitle")]
+		public string SkinMenuTitle { get; set; } = "Select skin for {WEAPON}";
 	}
 
 	public class Additional
@@ -46,6 +52,9 @@ namespace WeaponPaints
 		[JsonPropertyName("CommandSkin")]
 		public string CommandSkin { get; set; } = "ws";
 
+		[JsonPropertyName("CommandSkinSelection")]
+		public string CommandSkinSelection { get; set; } = "skins";
+
 		[JsonPropertyName("CommandRefresh")]
 		public string CommandRefresh { get; set; } = "wp";
 
@@ -54,6 +63,9 @@ namespace WeaponPaints
 
 		[JsonPropertyName("GiveRandomKnife")]
 		public bool GiveRandomKnife { get; set; } = false;
+
+		[JsonPropertyName("GiveRandomSkin")]
+		public bool GiveRandomSkin { get; set; } = false;
 	}
 
 	public class WeaponPaintsConfig : BasePluginConfig

README.md

@@ -1,42 +1,80 @@
-# cs2-WeaponPaints
+# CS2 Weapon Paints
 
-### Description
+## Description
-Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin for [CSSharp](https://docs.cssharp.dev/).
+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/d9CvaYPSFe) 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)
+[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/E1E2G0P2O) or [![Donate on Steam](https://github.com/Nereziel/cs2-WeaponPaints/assets/32937653/a0d53822-4ca7-4caf-83b4-e1a9b5f8c94e)](https://steamcommunity.com/tradeoffer/new/?partner=41515647&token=gW2W-nXE)
 
-### Features
+## Features
-- changes only paint, seed and wear on weapons and knives
+- Changes only paint, seed and wear on weapons and knives;
-- mysql based or global website at [weaponpaints.fun](https://weaponpaints.fun/), so you dont need mysql/website
+- MySQL based or global website at [weaponpaints.fun](https://weaponpaints.fun/), so you dont need MySQL/Website;
-- data sync on player connect
+- Data sync on player connect;
-- Added command `!wp` to refresh skins (with cooldown in second can be configured)
+- Added command **`!wp`** to refresh skins; ***(with cooldown in second can be configured)***
-- Added command `!ws` to show website
+- Added command **`!ws`** to show website;
-- Added command `!knife` to show menu with knives
+- Added command **`!knife`** to show menu with knives;
-- Knife change is now limited to have these cvars empty `mp_t_default_melee ""` and `mp_ct_default_melee ""`
+- Knife change is now limited to have these cvars empty **`mp_t_default_melee ""`** and **`mp_ct_default_melee ""`**;
 
-### CS2 server:
+## 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/)
+- Compile and copy plugin to plugins, [more info here](https://docs.cssharp.dev/guides/hello-world-plugin/);
-- setup `addons/counterstrikesharp/configs/plugins/WeaponPaints/WeaponPaints.json`
+- Setup **`addons/counterstrikesharp/configs/plugins/WeaponPaints/WeaponPaints.json`** set **`GlobalShare`** to **`true`** for global, or include database credentials;
-  set `GlobalShare` to true for gloval, or include database credentials
+- in **`addons/counterstrikesharp/configs/core.json`** set **FollowCS2ServerGuidelines** to **`false`**;
-- in `addons/counterstrikesharp/configs/core.json` set **FollowCS2ServerGuidelines** to **false**
 
-### Web install:
+## Plugin Configuration
-- not needed if config `GlobalShare = true`
+<details>
-- requires PHP min v7.3 (tested on php ver `8.2.3` and nginx webserver)
+  <summary>Spoiler warning</summary>
-- copy website to web server (img folder not needed)
+<code><pre>{
-- import `database.sql` to mysql
+	"Version": 4, // Don't touch
-- get steam api key [https://steamcommunity.com/dev/apikey](https://steamcommunity.com/dev/apikey)
+	"DatabaseHost": "", // MySQL host (required if GlobalShare = false)
-- fill in database credentials and api key in `class/config.php`
+	"DatabasePort": 3306, // MySQL port (required if GlobalShare = false)
-- visit website and login via steam
+	"DatabaseUser": "", // MySQL username (required if GlobalShare = false)
+	"DatabasePassword": "", // MySQL user password (required if GlobalShare = false)
+	"DatabaseName": "", // MySQL database name (required if GlobalShare = false)
+	"GlobalShare": false, // Enable or disable GlobalShare, plugin can work without mysql credentials but with shared website at weaponpaints.fun
+	"CmdRefreshCooldownSeconds": 60, // Cooldown time in refreshing skins (!wp command)
+	"Prefix": "[WeaponPaints]", // Prefix every chat message
+	"Website": "example.com/skins", // Website used in WebsiteMessageCommand (!ws command)
+"Messages": {
+	"WebsiteMessageCommand": "Visit {WEBSITE} where you can change skins.", // Information about website where player can change skins (!ws command) Set to empty to disable
+	"SynchronizeMessageCommand": "Type !wp to synchronize chosen skins.", // Information about skins refreshing (!ws command) Set to empty to disable
+	"KnifeMessageCommand": "Type !knife to open knife menu.", // Information about knife menu (!ws command) Set to empty to disable
+	"CooldownRefreshCommand": "You can\u0027t refresh weapon paints right now.", // Cooldown information (!wp command) Set to empty to disable
+	"SuccessRefreshCommand": "Refreshing weapon paints.", // Information about refreshing skins (!wp command) Set to empty to disable
+	"ChosenKnifeMenu": "You have chosen {KNIFE} as your knife.", // Information about choosen knife (!knife command) Set to empty to disable
+	"ChosenKnifeMenuKill": "To correctly apply skin for knife, you need to type !kill.", // Information about suicide after knife selection (!knife command) Set to empty to disable
+	"KnifeMenuTitle": "Knife Menu."  // Menu title (!knife menu)
+},
+"Additional": {
+	"SkinVisibilityFix": true, // Enable or disable fix for skin visibility
+	"KnifeEnabled": true, // Enable or disable knife feature
+	"SkinEnabled": true, // Enable or disable skin feature
+	"CommandWpEnabled": true, // Enable or disable refreshing command
+	"CommandKillEnabled": true, // Enable or disable kill command
+	"CommandKnife": "knife", // Name of knife menu command, u can change to for e.g, knives
+	"CommandSkin": "ws", // Name of skin information command, u can change to for e.g, skins
+	"CommandRefresh": "wp", // Name of skin refreshing command, u can change to for e.g, refreshskins
+	"CommandKill": "kill", // Name of kill command, u can change to for e.g, suicide
+	"GiveRandomKnife": false  // Give random knife to players if they didn't choose
+},
 
-### Known issues
+"ConfigVersion": 4  // Don't touch
+}</pre></code>
+</details>
+    
+## Web install
+Disregard if the config is **`GlobalShare = true`**;
+- Requires PHP >= 7.4; ***(Tested on php ver **`8.2.3`** and nginx webserver)***
+- Copy website to web server; ***(Folder `img` not needed)***
+- Get [Steam API Key](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
 ![preview](https://github.com/Nereziel/cs2-WeaponPaints/blob/main/website/preview.png?raw=true)

Utility.cs

@@ -0,0 +1,62 @@
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Entities;
+using CounterStrikeSharp.API.Modules.Utils;
+using System.Reflection;
+
+namespace WeaponPaints
+{
+	public static class Utility
+	{
+		public static WeaponPaintsConfig? Config { get; set; }
+
+		public static bool IsPlayerValid(CCSPlayerController? player)
+		{
+			return (player != null && player.IsValid && !player.IsBot && !player.IsHLTV);
+		}
+
+		public static string ReplaceTags(string message)
+		{
+			if (message.Contains('{'))
+			{
+				string modifiedValue = message;
+				if (Config != null)
+				{
+					modifiedValue = modifiedValue.Replace("{WEBSITE}", Config.Website);
+				}
+				foreach (FieldInfo field in typeof(ChatColors).GetFields())
+				{
+					string pattern = $"{{{field.Name}}}";
+					if (message.Contains(pattern, StringComparison.OrdinalIgnoreCase))
+					{
+						modifiedValue = modifiedValue.Replace(pattern, field.GetValue(null)!.ToString(), StringComparison.OrdinalIgnoreCase);
+					}
+				}
+				return modifiedValue;
+			}
+
+			return message;
+		}
+
+		public static void Log(string message)
+		{
+			Console.BackgroundColor = ConsoleColor.DarkGray;
+			Console.ForegroundColor = ConsoleColor.Cyan;
+			Console.WriteLine("[WeaponPaints] " + message);
+			Console.ResetColor();
+		}
+		public static void ShowAd(string moduleVersion)
+		{
+			Console.WriteLine(" ");
+			Console.WriteLine(" _     _  _______  _______  _______  _______  __    _  _______  _______  ___   __    _  _______  _______ ");
+			Console.WriteLine("| | _ | ||       ||   _   ||       ||       ||  |  | ||       ||   _   ||   | |  |  | ||       ||       |");
+			Console.WriteLine("| || || ||    ___||  |_|  ||    _  ||   _   ||   |_| ||    _  ||  |_|  ||   | |   |_| ||_     _||  _____|");
+			Console.WriteLine("|       ||   |___ |       ||   |_| ||  | |  ||       ||   |_| ||       ||   | |       |  |   |  | |_____ ");
+			Console.WriteLine("|       ||    ___||       ||    ___||  |_|  ||  _    ||    ___||       ||   | |  _    |  |   |  |_____  |");
+			Console.WriteLine("|   _   ||   |___ |   _   ||   |    |       || | |   ||   |    |   _   ||   | | | |   |  |   |   _____| |");
+			Console.WriteLine("|__| |__||_______||__| |__||___|    |_______||_|  |__||___|    |__| |__||___| |_|  |__|  |___|  |_______|");
+			Console.WriteLine("						>> Version: " + moduleVersion);
+			Console.WriteLine("			>> GitHub: https://github.com/Nereziel/cs2-WeaponPaints");
+			Console.WriteLine(" ");
+		}
+	}
+}

website/index.php

@@ -22,6 +22,8 @@ if (isset($_SESSION['steamid'])) {
 		if ($ex[0] == "knife") {
 			$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']]);
 		} else {
+			if (!is_int($ex[1]))
+				header("Location: index.php");
 			if (array_key_exists($ex[1], $skins[$ex[0]])) {
 				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]]);
@@ -83,7 +85,7 @@ if (isset($_SESSION['steamid'])) {
 				<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>
+							<option disabled>Select knife</option>
 							<?php
 							foreach ($knifes as $knifeKey => $knife) {
 								if ($selectedKnife['knife'] == $knife['weapon_name'])
@@ -120,7 +122,7 @@ if (isset($_SESSION['steamid'])) {
 					<div class="card-footer">
 						<form action="" method="POST">
 							<select name="forma" class="form-control select" onchange="this.form.submit()" class="SelectWeapon">
-								<option>Select skin</option>
+								<option disabled>Select skin</option>
 								<?php
 								foreach ($skins[$defindex] as $paintKey => $paint) {
 									if (array_key_exists($defindex, $selectedSkins) && $selectedSkins[$defindex] == $paintKey)