Merge pull request #21 from PocketRelay/dev

Fixed matchmaking and new features

.gitignore

@@ -3,7 +3,8 @@
 .env
 
 app.db
-.vscode/
+.vscode/**
+!.vscode/extensions.json
 /data/
 
 .release

.vscode/extensions.json

@@ -0,0 +1,7 @@
+{
+  "recommendations": [
+    "serayuzgur.crates",
+    "tamasfe.even-better-toml",
+    "rust-lang.rust-analyzer"
+  ]
+}

Cargo.toml

@@ -22,7 +22,7 @@ features = ["std", "serde"]
 
 [package]
 name = "pocket-relay"
-version = "0.5.0"
+version = "0.5.1"
 description = "Pocket Relay Server"
 readme = "README.md"
 keywords = ["EA", "PocketRelay", "MassEffect"]

README.md

@@ -5,10 +5,10 @@
 *Mass Effect 3 Server Emulator / Private Server*
 
 
-![License](https://img.shields.io/github/license/PocketRelay/ServerRust?style=for-the-badge)
+![License](https://img.shields.io/github/license/PocketRelay/Server?style=for-the-badge)
 ![Cargo Version](https://img.shields.io/crates/v/pocket-relay?style=for-the-badge)
 ![Cargo Downloads](https://img.shields.io/crates/d/pocket-relay?style=for-the-badge)
-![Build](https://img.shields.io/github/actions/workflow/status/PocketRelay/ServerRust/rust.yml?style=for-the-badge)
+![Build](https://img.shields.io/github/actions/workflow/status/PocketRelay/Server/rust.yml?style=for-the-badge)
 
 [Discord Server (discord.gg/yvycWW8RgR)](https://discord.gg/yvycWW8RgR)
 [Website (pocket-relay.pages.dev)](https://pocket-relay.pages.dev/)
@@ -34,16 +34,12 @@ the [Server Setup Guide](https://pocket-relay.pages.dev/guide/server/)
 
 ## 📦 Downloads
 
-Below is a table of the download links for the different platforms and server types
-
-### Normal
-
-The **SQLite** version of **Pocket Relay** this version requires no additional database setup and is the ideal choice for most 
+Below is a table of the download links for the different platforms
 
 | Platform | Download                                                                                                |
 | -------- | ------------------------------------------------------------------------------------------------------- |
-| Windows  | [Download](https://github.com/PocketRelay/ServerRust/releases/latest/download/pocket-relay-windows.exe) |
-| Linux    | [Download](https://github.com/PocketRelay/ServerRust/releases/latest/download/pocket-relay-linux)       |
+| Windows  | [Download](https://github.com/PocketRelay/Server/releases/latest/download/pocket-relay-windows.exe) |
+| Linux    | [Download](https://github.com/PocketRelay/Server/releases/latest/download/pocket-relay-linux)       |
 
 
 ## 🔧 Configuration
@@ -73,13 +69,15 @@ on Windows, Linux, etc. *Note the server will store the player data and logging
 
 Instructions for building the server can be found [Here](https://pocket-relay.pages.dev/guide/server/building/)
 
-> Note: Building the server can be quite a heavy load on your computer
+> **Note**
+> Building the server can be quite a heavy load on your computer
 
 ## Dashboard
 
 Below are some screenshots of the included dashboard. You can access the dashboard by visting the server connection URL this 
 URL will be present in the server logs / output upon launching.
 
+> **Note**
 > If you are running the server on the same computer you can access the dashboard using http://localhost
 
 ![Dashboard Login](images/3.png)

src/config.rs

@@ -11,6 +11,7 @@ pub struct RuntimeConfig {
     pub menu_message: String,
 }
 
+/// Environment variable key to load the config from
 const CONFIG_ENV_KEY: &str = "PR_CONFIG_JSON";
 
 pub async fn load_config() -> Option<Config> {
@@ -26,6 +27,7 @@ pub async fn load_config() -> Option<Config> {
         return Some(config);
     }
 
+    // Attempt to load the config from disk
     let file = Path::new("config.json");
     if !file.exists() {
         return None;
@@ -78,9 +80,6 @@ impl Default for Config {
     }
 }
 
-pub const TELEMETRY_PORT: Port = 42129;
-pub const QOS_PORT: Port = 42130;
-
 #[derive(Deserialize)]
 #[serde(default)]
 pub struct GalaxyAtWarConfig {