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

Fixed blank page
Update index.php
2026-02-17 18:39:07 +00:00 · 2023-11-19 21:14:15 +01:00 · 2023-11-19 21:10:55 +01:00 · 2023-11-19 20:45:12 +01:00 · 2023-11-19 19:03:05 +01:00 · 2023-11-19 19:02:26 +01:00
9 changed files with 958 additions and 509 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,6 +28,22 @@ 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 \
--- a/Config.cs
+++ b/Config.cs
@@ -3,54 +3,95 @@ using System.Text.Json.Serialization;

 namespace WeaponPaints
 {
-    public class Messages
-    {
-        [JsonPropertyName("WebsiteMessageCommand")]
-        public string WebsiteMessageCommand { get; set; } = "Visit {WEBSITE} where you can change skins.";
-        [JsonPropertyName("SynchronizeMessageCommand")]
-        public string SynchronizeMessageCommand { get; set; } = "Type !wp to synchronize chosen skins.";
-        [JsonPropertyName("KnifeMessageCommand")]
-        public string KnifeMessageCommand { get; set; } = "Type !knife to open knife menu.";
-        [JsonPropertyName("CooldownRefreshCommand")]
-        public string CooldownRefreshCommand { get; set; } = "You can't refresh weapon paints right now.";
-        [JsonPropertyName("SuccessRefreshCommand")]
-        public string SuccessRefreshCommand { get; set; } = "Refreshing weapon paints.";
-        [JsonPropertyName("ChosenKnifeMenu")]
-        public string ChosenKnifeMenu { get; set; } = "You have chosen {KNIFE} as your knife.";
-        [JsonPropertyName("KnifeMenuTitle")]
-        public string KnifeMenuTitle { get; set; } = "Knife Menu.";
-    }
+	public class Messages
+	{
+		[JsonPropertyName("WebsiteMessageCommand")]
+		public string WebsiteMessageCommand { get; set; } = "Visit {WEBSITE} where you can change skins.";
+		[JsonPropertyName("SynchronizeMessageCommand")]
+		public string SynchronizeMessageCommand { get; set; } = "Type !wp to synchronize chosen skins.";
+		[JsonPropertyName("KnifeMessageCommand")]
+		public string KnifeMessageCommand { get; set; } = "Type !knife to open knife menu.";
+		[JsonPropertyName("CooldownRefreshCommand")]
+		public string CooldownRefreshCommand { get; set; } = "You can't refresh weapon paints right now.";
+		[JsonPropertyName("SuccessRefreshCommand")]
+		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 WeaponPaintsConfig : BasePluginConfig
-    {
-        public override int Version { get; set; } = 2;
+	public class Additional
+	{
+		[JsonPropertyName("SkinVisibilityFix")]
+		public bool SkinVisibilityFix { get; set; } = true;

-        [JsonPropertyName("DatabaseHost")]
-        public string DatabaseHost { get; set; } = "";
+		[JsonPropertyName("KnifeEnabled")]
+		public bool KnifeEnabled { get; set; } = true;

-        [JsonPropertyName("DatabasePort")]
-        public int DatabasePort { get; set; } = 3306;
+		[JsonPropertyName("SkinEnabled")]
+		public bool SkinEnabled { get; set; } = true;

-        [JsonPropertyName("DatabaseUser")]
-        public string DatabaseUser { get; set; } = "";
+		[JsonPropertyName("CommandWpEnabled")]
+		public bool CommandWpEnabled { get; set; } = true;

-        [JsonPropertyName("DatabasePassword")]
-        public string DatabasePassword { get; set; } = "";
+		[JsonPropertyName("CommandKillEnabled")]
+		public bool CommandKillEnabled { get; set; } = true;

-        [JsonPropertyName("DatabaseName")]
-        public string DatabaseName { get; set; } = "";
+		[JsonPropertyName("CommandKnife")]
+		public string CommandKnife { get; set; } = "knife";

-        [JsonPropertyName("CmdRefreshCooldownSeconds")]
-        public int CmdRefreshCooldownSeconds { get; set; } = 60;
+		[JsonPropertyName("CommandSkin")]
+		public string CommandSkin { get; set; } = "ws";

-        [JsonPropertyName("Prefix")]
-        public string Prefix { get; set; } = "[WeaponPaints]";
+		[JsonPropertyName("CommandRefresh")]
+		public string CommandRefresh { get; set; } = "wp";

-        [JsonPropertyName("Website")]
-        public string Website { get; set; } = "example.com/skins";
+		[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; } = 4;
+
+		[JsonPropertyName("DatabaseHost")]
+		public string DatabaseHost { get; set; } = "";
+
+		[JsonPropertyName("DatabasePort")]
+		public int DatabasePort { get; set; } = 3306;
+
+		[JsonPropertyName("DatabaseUser")]
+		public string DatabaseUser { get; set; } = "";
+
+		[JsonPropertyName("DatabasePassword")]
+		public string DatabasePassword { get; set; } = "";
+
+		[JsonPropertyName("DatabaseName")]
+		public string DatabaseName { get; set; } = "";
+
+		[JsonPropertyName("GlobalShare")]
+		public bool GlobalShare { get; set; } = false;
+
+		[JsonPropertyName("CmdRefreshCooldownSeconds")]
+		public int CmdRefreshCooldownSeconds { get; set; } = 60;
+
+		[JsonPropertyName("Prefix")]
+		public string Prefix { get; set; } = "[WeaponPaints]";
+
+		[JsonPropertyName("Website")]
+		public string Website { get; set; } = "example.com/skins";
+
+		[JsonPropertyName("Messages")]
+		public Messages Messages { get; set; } = new Messages();
+
+		[JsonPropertyName("Additional")]
+		public Additional Additional { get; set; } = new Additional();
+	}

-        [JsonPropertyName("Messages")]
-        public Messages Messages { get; set; } = new Messages();
-    }
-    
 }
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ There will be a lot of frequent changes which may break functionality or compati

 ### 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,10 +20,12 @@ There will be a lot of frequent changes which may break functionality or compati

 ### 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:
+- not needed if config `GlobalShare = true`
 - 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
@@ -31,6 +33,9 @@ There will be a lot of frequent changes which may break functionality or compati
 - 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
--- a/WeaponPaints.cs
+++ b/WeaponPaints.cs
--- a/WeaponPaints.csproj
+++ b/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>
--- a/website/class/utils.php
+++ b/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)
-        {
-            if (key_exists($key, $weapons)) continue;
+        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'],
            ];
@@ -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;
    }
-}
+}
--- a/website/database.sql
+++ b/website/database.sql
@@ -1,46 +0,0 @@
-- phpMyAdmin SQL Dump
-- version 5.2.1
-- https://www.phpmyadmin.net/
--
-- Host: localhost
-- Generation Time: Nov 02, 2023 at 11:12 AM
-- Server version: 10.11.2-MariaDB
-- PHP Version: 8.2.3
-
-SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
-START TRANSACTION;
-SET time_zone = "+00:00";
-
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8mb4 */;
-
--
-- Database: `cs2server`
--
-
-- --------------------------------------------------------
-
--
-- Table structure for table `wp_player_skins`
--
-
-CREATE TABLE `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;
-
--
-- Table structure for table `wp_player_knife`
--
-
-CREATE TABLE `wp_player_knife` (
-  `steamid` varchar(64) NOT NULL,
-  `knife` varchar(64) NOT NULL,
-  UNIQUE (`steamid`)
-) ENGINE = InnoDB;
--- a/website/img/skins/weapon_knife.png
+++ b/website/img/skins/weapon_knife.png
--- a/website/index.php
+++ b/website/index.php
@@ -7,26 +7,30 @@ require_once 'class/utils.php';

 $db = new DataBase();
 if (isset($_SESSION['steamid'])) {
-
-	include('steamauth/userInfo.php');
-	$steamid = $steamprofile['steamid'];
+	$steamid = $_SESSION['steamid'];

 	$weapons = UtilsClass::getWeaponsFromArray();
 	$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 (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]]);
+		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 (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]]);
+				} 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 +58,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 +108,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>";
Author	SHA1	Message	Date
Nereziel	e9f7db5171	Merge pull request #51 from daffyyyy/website-fix-1 Fixed blank page	2023-11-19 21:14:15 +01:00
Dawid Bepierszcz	648b928b4e	Update index.php	2023-11-19 21:10:55 +01:00
Nereziel	530a7d64c7	Update README.md	2023-11-19 20:45:12 +01:00
Nereziel	3453f4c505	Merge pull request #47 from daffyyyy/feature/global-share EXPERIMENTAL (GlobalShare) - Website for all servers	2023-11-19 19:03:05 +01:00
Nereziel	25b466422b	Update build.yml	2023-11-19 19:02:26 +01:00
daffyyyy	6baa59dd9b	Update WeaponPaints.cs New version	2023-11-19 12:30:47 +01:00
daffyyyy	10afe7ce1e	Update WeaponPaints.cs	2023-11-19 12:24:57 +01:00
daffyyyy	5eeb0c5fec	Initial	2023-11-19 02:07:29 +01:00
Nereziel	e53ee27b39	Merge pull request #44 from daffyyyy/fix-knives_finally Finally fixed knife problem?	2023-11-18 19:26:37 +01:00
Dawid Bepierszcz	75112b02fe	Update WeaponPaints.cs	2023-11-18 19:21:28 +01:00
Nereziel	8e92635231	sync paints on plugin reload	2023-11-18 15:20:26 +01:00
Nereziel	6923295cb6	Update build.yml	2023-11-18 15:14:40 +01:00
Nereziel	e5f98077f3	Update build.yml	2023-11-18 15:12:57 +01:00
Nereziel	3296055841	Merge pull request #42 from daffyyyy/enhancement/mysql-wrapper Creating tables fix	2023-11-18 11:18:15 +01:00
Dawid Bepierszcz	89de192c20	Update WeaponPaints.cs Additional check	2023-11-18 09:15:20 +01:00
Dawid Bepierszcz	a1297b9cbe	Update WeaponPaints.cs Creating tables fix	2023-11-18 08:54:33 +01:00
Nereziel	99af078b32	Merge pull request #40 from daffyyyy/enhancement/mysql-wrapper New mysql stuff, and small changes	2023-11-18 01:29:06 +01:00
Dawid Bepierszcz	b0bef746cd	Delete website/database.sql	2023-11-17 23:28:33 +01:00
daffyyyy	117a95e99c	New mysql stuff, and small changes	2023-11-17 23:27:07 +01:00
Nereziel	a6d4108ca7	Merge pull request #37 from daffyyyy/hotfix-2 Fixed server crashing	2023-11-16 20:51:10 +01:00
Dawid Bepierszcz	7b45169d8d	Update WeaponPaints.cs Typo	2023-11-16 20:42:20 +01:00
Dawid Bepierszcz	42bd45c3f0	Update WeaponPaints.cs Fixed crashing	2023-11-16 20:38:35 +01:00
Nereziel	5262739c3d	Merge pull request #35 from daffyyyy/fix-knife-1 Fix for knife disappearing and more changes Fix for knife disappearing Possibility to change commands names Skin refresh now also works for knife Possibility to set a random knife for players who have not set any via GiveRandomKnife in config And probably some smaller changes	2023-11-16 11:37:58 +01:00
Dawid Bepierszcz	c82a0c0d26	Update Config.cs Changed refresh command to wp by default	2023-11-16 11:30:16 +01:00
Dawid Bepierszcz	9ad7f9fc83	Update Config.cs	2023-11-16 11:23:59 +01:00
Dawid Bepierszcz	9e2dac52e5	Update WeaponPaints.cs	2023-11-16 11:23:26 +01:00
Nereziel	118931f44d	Merge pull request #34 from daffyyyy/enhancement/website-knife-choosing Choosing knife on website	2023-11-16 00:39:19 +01:00
Nereziel	843ae34e31	Merge pull request #33 from daffyyyy/enhancement/config-expansion Added an additional section to the config	2023-11-16 00:38:33 +01:00
Dawid Bepierszcz	46a720ff83	default knife image	2023-11-16 00:10:26 +01:00
Dawid Bepierszcz	63d059b607	Update utils.php	2023-11-16 00:07:27 +01:00
Dawid Bepierszcz	005ef18338	Update index.php	2023-11-16 00:06:16 +01:00
Dawid Bepierszcz	c0c1fe2566	Update WeaponPaints.cs	2023-11-16 00:05:34 +01:00
Dawid Bepierszcz	c4ad17a7ed	MinimumApiVersion	2023-11-15 22:46:42 +01:00
Dawid Bepierszcz	99fde6ec52	Update Config.cs	2023-11-15 22:35:57 +01:00
Dawid Bepierszcz	ca2c3eb212	Update WeaponPaints.cs	2023-11-15 22:35:19 +01:00