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:
@@ -54,4 +73,4 @@ jobs:
         name: "Build ${{ env.BUILD_NUMBER }}"
         tag: "build-${{ env.BUILD_NUMBER }}"
         body: |
-          Place the plugin in game/csgo/addons/counterstrikesharp/plugins/WeaponPaints
+          Place the plugin in game/csgo/addons/counterstrikesharp/plugins/WeaponPaints

Config.cs

@@ -3,54 +3,95 @@ using System.Text.Json.Serialization;
 
 namespace WeaponPaints
 {
-    public class Messages
+	public class Messages
-    {
+	{
-        [JsonPropertyName("WebsiteMessageCommand")]
+		[JsonPropertyName("WebsiteMessageCommand")]
-        public string WebsiteMessageCommand { get; set; } = "Visit {WEBSITE} where you can change skins.";
+		public string WebsiteMessageCommand { get; set; } = "Visit {WEBSITE} where you can change skins.";
-        [JsonPropertyName("SynchronizeMessageCommand")]
+		[JsonPropertyName("SynchronizeMessageCommand")]
-        public string SynchronizeMessageCommand { get; set; } = "Type !wp to synchronize chosen skins.";
+		public string SynchronizeMessageCommand { get; set; } = "Type !wp to synchronize chosen skins.";
-        [JsonPropertyName("KnifeMessageCommand")]
+		[JsonPropertyName("KnifeMessageCommand")]
-        public string KnifeMessageCommand { get; set; } = "Type !knife to open knife menu.";
+		public string KnifeMessageCommand { get; set; } = "Type !knife to open knife menu.";
-        [JsonPropertyName("CooldownRefreshCommand")]
+		[JsonPropertyName("CooldownRefreshCommand")]
-        public string CooldownRefreshCommand { get; set; } = "You can't refresh weapon paints right now.";
+		public string CooldownRefreshCommand { get; set; } = "You can't refresh weapon paints right now.";
-        [JsonPropertyName("SuccessRefreshCommand")]
+		[JsonPropertyName("SuccessRefreshCommand")]
-        public string SuccessRefreshCommand { get; set; } = "Refreshing weapon paints.";
+		public string SuccessRefreshCommand { get; set; } = "Refreshing weapon paints.";
-        [JsonPropertyName("ChosenKnifeMenu")]
+		[JsonPropertyName("ChosenKnifeMenu")]
-        public string ChosenKnifeMenu { get; set; } = "You have chosen {KNIFE} as your knife.";
+		public string ChosenKnifeMenu { get; set; } = "You have chosen {KNIFE} as your knife.";
-        [JsonPropertyName("KnifeMenuTitle")]
+		[JsonPropertyName("ChosenKnifeMenuKill")]
-        public string KnifeMenuTitle { get; set; } = "Knife Menu.";
+		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 class Additional
-    {
+	{
-        public override int Version { get; set; } = 2;
+		[JsonPropertyName("SkinVisibilityFix")]
+		public bool SkinVisibilityFix { get; set; } = true;
 
-        [JsonPropertyName("DatabaseHost")]
+		[JsonPropertyName("KnifeEnabled")]
-        public string DatabaseHost { get; set; } = "";
+		public bool KnifeEnabled { get; set; } = true;
 
-        [JsonPropertyName("DatabasePort")]
+		[JsonPropertyName("SkinEnabled")]
-        public int DatabasePort { get; set; } = 3306;
+		public bool SkinEnabled { get; set; } = true;
 
-        [JsonPropertyName("DatabaseUser")]
+		[JsonPropertyName("CommandWpEnabled")]
-        public string DatabaseUser { get; set; } = "";
+		public bool CommandWpEnabled { get; set; } = true;
 
-        [JsonPropertyName("DatabasePassword")]
+		[JsonPropertyName("CommandKillEnabled")]
-        public string DatabasePassword { get; set; } = "";
+		public bool CommandKillEnabled { get; set; } = true;
 
-        [JsonPropertyName("DatabaseName")]
+		[JsonPropertyName("CommandKnife")]
-        public string DatabaseName { get; set; } = "";
+		public string CommandKnife { get; set; } = "knife";
 
-        [JsonPropertyName("CmdRefreshCooldownSeconds")]
+		[JsonPropertyName("CommandSkin")]
-        public int CmdRefreshCooldownSeconds { get; set; } = 60;
+		public string CommandSkin { get; set; } = "ws";
 
-        [JsonPropertyName("Prefix")]
+		[JsonPropertyName("CommandRefresh")]
-        public string Prefix { get; set; } = "[WeaponPaints]";
+		public string CommandRefresh { get; set; } = "wp";
 
-        [JsonPropertyName("Website")]
+		[JsonPropertyName("CommandKill")]
-        public string Website { get; set; } = "example.com/skins";
+		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();
-    }
-    
 }

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.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;
+    }
+}