From f079e1696a17f3dab893b182603d5b7a74ecc54f Mon Sep 17 00:00:00 2001 From: Retr0-01 Date: Fri, 20 Jan 2023 19:48:39 +0200 Subject: [PATCH] Reorganize and cleanup files --- CODE_OF_CONDUCT.md | 128 ------------------ GlobalSuppressions.cs | 8 -- README.md | 1 + .editorconfig => src/.editorconfig | 0 .../CSGO-Discord-RP.csproj | 16 ++- .../CSGO-Discord-RP.sln | 0 src/Classes/ApplicationSetup.cs | 2 +- src/Classes/DiscordManager.cs | 2 +- src/Classes/HttpServer.cs | 2 +- src/Program.cs | 2 +- favicon.ico => src/favicon.ico | Bin .../gamestate_integration_discord-rp.cfg | 0 12 files changed, 17 insertions(+), 144 deletions(-) delete mode 100644 CODE_OF_CONDUCT.md delete mode 100644 GlobalSuppressions.cs rename .editorconfig => src/.editorconfig (100%) rename CSGO-Discord-RP.csproj => src/CSGO-Discord-RP.csproj (64%) rename CSGO-Discord-RP.sln => src/CSGO-Discord-RP.sln (100%) rename favicon.ico => src/favicon.ico (100%) rename gamestate_integration_discord-rp.cfg => src/gamestate_integration_discord-rp.cfg (100%) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md deleted file mode 100644 index d391609..0000000 --- a/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,128 +0,0 @@ -# Contributor Covenant Code of Conduct - -## Our Pledge - -We as members, contributors, and leaders pledge to make participation in our -community a harassment-free experience for everyone, regardless of age, body -size, visible or invisible disability, ethnicity, sex characteristics, gender -identity and expression, level of experience, education, socio-economic status, -nationality, personal appearance, race, religion, or sexual identity -and orientation. - -We pledge to act and interact in ways that contribute to an open, welcoming, -diverse, inclusive, and healthy community. - -## Our Standards - -Examples of behavior that contributes to a positive environment for our -community include: - -* Demonstrating empathy and kindness toward other people -* Being respectful of differing opinions, viewpoints, and experiences -* Giving and gracefully accepting constructive feedback -* Accepting responsibility and apologizing to those affected by our mistakes, - and learning from the experience -* Focusing on what is best not just for us as individuals, but for the - overall community - -Examples of unacceptable behavior include: - -* The use of sexualized language or imagery, and sexual attention or - advances of any kind -* Trolling, insulting or derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or email - address, without their explicit permission -* Other conduct which could reasonably be considered inappropriate in a - professional setting - -## Enforcement Responsibilities - -Community leaders are responsible for clarifying and enforcing our standards of -acceptable behavior and will take appropriate and fair corrective action in -response to any behavior that they deem inappropriate, threatening, offensive, -or harmful. - -Community leaders have the right and responsibility to remove, edit, or reject -comments, commits, code, wiki edits, issues, and other contributions that are -not aligned to this Code of Conduct, and will communicate reasons for moderation -decisions when appropriate. - -## Scope - -This Code of Conduct applies within all community spaces, and also applies when -an individual is officially representing the community in public spaces. -Examples of representing our community include using an official e-mail address, -posting via an official social media account, or acting as an appointed -representative at an online or offline event. - -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported to the community leaders responsible for enforcement at -contact@spacetr0.com. -All complaints will be reviewed and investigated promptly and fairly. - -All community leaders are obligated to respect the privacy and security of the -reporter of any incident. - -## Enforcement Guidelines - -Community leaders will follow these Community Impact Guidelines in determining -the consequences for any action they deem in violation of this Code of Conduct: - -### 1. Correction - -**Community Impact**: Use of inappropriate language or other behavior deemed -unprofessional or unwelcome in the community. - -**Consequence**: A private, written warning from community leaders, providing -clarity around the nature of the violation and an explanation of why the -behavior was inappropriate. A public apology may be requested. - -### 2. Warning - -**Community Impact**: A violation through a single incident or series -of actions. - -**Consequence**: A warning with consequences for continued behavior. No -interaction with the people involved, including unsolicited interaction with -those enforcing the Code of Conduct, for a specified period of time. This -includes avoiding interactions in community spaces as well as external channels -like social media. Violating these terms may lead to a temporary or -permanent ban. - -### 3. Temporary Ban - -**Community Impact**: A serious violation of community standards, including -sustained inappropriate behavior. - -**Consequence**: A temporary ban from any sort of interaction or public -communication with the community for a specified period of time. No public or -private interaction with the people involved, including unsolicited interaction -with those enforcing the Code of Conduct, is allowed during this period. -Violating these terms may lead to a permanent ban. - -### 4. Permanent Ban - -**Community Impact**: Demonstrating a pattern of violation of community -standards, including sustained inappropriate behavior, harassment of an -individual, or aggression toward or disparagement of classes of individuals. - -**Consequence**: A permanent ban from any sort of public interaction within -the community. - -## Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], -version 2.0, available at -https://www.contributor-covenant.org/version/2/0/code_of_conduct.html. - -Community Impact Guidelines were inspired by [Mozilla's code of conduct -enforcement ladder](https://github.com/mozilla/diversity). - -[homepage]: https://www.contributor-covenant.org - -For answers to common questions about this code of conduct, see the FAQ at -https://www.contributor-covenant.org/faq. Translations are available at -https://www.contributor-covenant.org/translations. diff --git a/GlobalSuppressions.cs b/GlobalSuppressions.cs deleted file mode 100644 index a5fe501..0000000 --- a/GlobalSuppressions.cs +++ /dev/null @@ -1,8 +0,0 @@ -// This file is used by Code Analysis to maintain SuppressMessage -// attributes that are applied to this project. -// Project-level suppressions either have no target or are given -// a specific target and scoped to a namespace, type, member, etc. - -using System.Diagnostics.CodeAnalysis; - -[assembly: SuppressMessage( "Interoperability", "CA1416:Validate platform compatibility", Justification = "", Scope = "member", Target = "~M:CSGODiscordRP.ApplicationSetup.GetCSGODir~System.String" )] diff --git a/README.md b/README.md index 48ebdc5..923c563 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ All you have to do now is run the exe and you should be good to go! **[SETUP] CS:GO installation path not found! Aborting...** > If for whatever reason the application couldn't find your game installation path or write the config file needed, you need to manually copy the ``gamestate_integration_discord-rp.cfg`` file and paste it *inside* the ``cfg`` folder of your CS:GO installation. > Example path: `C:\Program Files (x86)\Steam\steamapps\common\Counter-Strike Global Offensive\csgo\cfg` +> ## Credits Huge thanks to the following devs/teams for creating some of the packages/tools used. - [Newtonsoft](https://www.newtonsoft.com/json) for Json.NET diff --git a/.editorconfig b/src/.editorconfig similarity index 100% rename from .editorconfig rename to src/.editorconfig diff --git a/CSGO-Discord-RP.csproj b/src/CSGO-Discord-RP.csproj similarity index 64% rename from CSGO-Discord-RP.csproj rename to src/CSGO-Discord-RP.csproj index 3caeb18..2e66ccb 100644 --- a/CSGO-Discord-RP.csproj +++ b/src/CSGO-Discord-RP.csproj @@ -2,17 +2,21 @@ Exe - net6.0 - CSGODiscordRP + net6.0-windows10.0.22621.0 + RichPresenceApp enable annotations - True + False favicon.ico none False - CSGODiscordRP.Program + RichPresenceApp.Program + + + + @@ -23,6 +27,10 @@ + + + + diff --git a/CSGO-Discord-RP.sln b/src/CSGO-Discord-RP.sln similarity index 100% rename from CSGO-Discord-RP.sln rename to src/CSGO-Discord-RP.sln diff --git a/src/Classes/ApplicationSetup.cs b/src/Classes/ApplicationSetup.cs index 86a4558..356e3cd 100644 --- a/src/Classes/ApplicationSetup.cs +++ b/src/Classes/ApplicationSetup.cs @@ -1,7 +1,7 @@ using Microsoft.Win32; using System.Text.RegularExpressions; -namespace CSGODiscordRP; +namespace RichPresenceApp; public static class ApplicationSetup { diff --git a/src/Classes/DiscordManager.cs b/src/Classes/DiscordManager.cs index ffa5edc..95d1d00 100644 --- a/src/Classes/DiscordManager.cs +++ b/src/Classes/DiscordManager.cs @@ -1,7 +1,7 @@ using DiscordRPC; using DiscordRPC.Logging; -namespace CSGODiscordRP; +namespace RichPresenceApp; public static class DiscordManager { diff --git a/src/Classes/HttpServer.cs b/src/Classes/HttpServer.cs index f748a05..b5a4f8a 100644 --- a/src/Classes/HttpServer.cs +++ b/src/Classes/HttpServer.cs @@ -3,7 +3,7 @@ using System.Net; using System.Text; -namespace CSGODiscordRP; +namespace RichPresenceApp; public class HttpServer { diff --git a/src/Program.cs b/src/Program.cs index 90f867b..c5d3ee0 100644 --- a/src/Program.cs +++ b/src/Program.cs @@ -1,4 +1,4 @@ -namespace CSGODiscordRP; +namespace RichPresenceApp; public class Program { diff --git a/favicon.ico b/src/favicon.ico similarity index 100% rename from favicon.ico rename to src/favicon.ico diff --git a/gamestate_integration_discord-rp.cfg b/src/gamestate_integration_discord-rp.cfg similarity index 100% rename from gamestate_integration_discord-rp.cfg rename to src/gamestate_integration_discord-rp.cfg