XodiumSoftware
diff --git a/‎.github/renovate.json‎
Lines changed: 13 additions & 13 deletions b/‎.github/renovate.json‎
Lines changed: 13 additions & 13 deletions
diff --git a/‎.github/workflows/build_app.yml‎ ‎.github/workflows/build_test_release.yml‎.github/workflows/build_app.yml renamed to .github/workflows/build_test_release.yml
Lines changed: 9 additions & 9 deletions b/‎.github/workflows/build_app.yml‎ ‎.github/workflows/build_test_release.yml‎.github/workflows/build_app.yml renamed to .github/workflows/build_test_release.yml
Lines changed: 9 additions & 9 deletions
diff --git a/‎.github/workflows/enforce_branch.yml‎
Lines changed: 3 additions & 2 deletions b/‎.github/workflows/enforce_branch.yml‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎.github/workflows/enforce_pr_title.yml‎
Lines changed: 1 addition & 0 deletions b/‎.github/workflows/enforce_pr_title.yml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎.idea/dictionaries/project.xml‎
Lines changed: 1 addition & 0 deletions b/‎.idea/dictionaries/project.xml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎Cargo.toml‎
Lines changed: 12 additions & 6 deletions b/‎Cargo.toml‎
Lines changed: 12 additions & 6 deletions
diff --git a/‎README.md‎
Lines changed: 20 additions & 9 deletions b/‎README.md‎
Lines changed: 20 additions & 9 deletions
diff --git a/‎src/config.rs‎
Lines changed: 73 additions & 0 deletions b/‎src/config.rs‎
Lines changed: 73 additions & 0 deletions
diff --git a/‎src/lib.rs‎
Lines changed: 38 additions & 19 deletions b/‎src/lib.rs‎
Lines changed: 38 additions & 19 deletions
@@ -1,15 +1,15 @@
 {
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "assignees": [
-    "illyrius666"
-  ],
-  "automerge": true,
-  "baseBranchPatterns": [
-    "dev"
-  ],
-  "extends": [
-    "config:recommended"
-  ],
-  "prHeader": "Dependencies Updater",
-  "commitMessagePrefix": "[ci-skip]"
+    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+    "assignees": [
+        "illyrius666"
+    ],
+    "automerge": true,
+    "baseBranchPatterns": [
+        "main"
+    ],
+    "extends": [
+        "config:recommended"
+    ],
+    "prHeader": "Dependencies Updater",
+    "commitMessagePrefix": "[ci-skip]"
 }
@@ -1,4 +1,4 @@
-name: Xodium CI/CD - Build Application
+name: Xodium CI/CD - Build | Test | Release
 
 on:
   push:
@@ -31,11 +31,11 @@ jobs:
     steps:
       - id: checkout
         name: Checkout
-        uses: actions/checkout@v6.0.1
+        uses: actions/checkout@v6.0.2
 
       - id: cache_dependencies
         name: Cache dependencies
-        uses: actions/cache@v5.0.2
+        uses: actions/cache@v5.0.4
         with:
           path: |
             ~/.cargo/registry
@@ -45,7 +45,7 @@ jobs:
 
       - id: setup_rust
         name: Setup Rust
-        uses: actions-rust-lang/setup-rust-toolchain@806aa7ddf5d59f36fb30048411f6bde29364a53f
+        uses: actions-rust-lang/setup-rust-toolchain@150fca883cd4034361b621bd4e6a9d34e5143606
         with:
           toolchain: stable
           components: rustfmt, clippy
@@ -63,7 +63,7 @@ jobs:
 
       - id: upload_artifact
         name: Upload Artifact
-        uses: actions/upload-artifact@v6.0.0
+        uses: actions/upload-artifact@v7.0.0
         with:
           name: ${{ env.APP_NAME }}-${{ matrix.os }}
           path: target/release/${{ env.APP_NAME }}
@@ -81,11 +81,11 @@ jobs:
     steps:
       - id: checkout
         name: Checkout
-        uses: actions/checkout@v6.0.1
+        uses: actions/checkout@v6.0.2
 
       - id: setup_rust
         name: Setup Rust
-        uses: actions-rust-lang/setup-rust-toolchain@806aa7ddf5d59f36fb30048411f6bde29364a53f
+        uses: actions-rust-lang/setup-rust-toolchain@150fca883cd4034361b621bd4e6a9d34e5143606
         with:
           toolchain: stable
 
@@ -107,7 +107,7 @@ jobs:
     steps:
       - id: download_artifact
         name: Download Artefact
-        uses: actions/download-artifact@v7.0.0
+        uses: actions/download-artifact@v8.0.1
         with:
           name: ${{ env.APP_NAME }}
 
@@ -118,7 +118,7 @@ jobs:
 
       - id: create_release
         name: Create Release
-        uses: softprops/action-gh-release@78237c54eb15310cb292a15480c4be010be47aeb
+        uses: softprops/action-gh-release@153bb8e04406b158c6c84fc1615b65b24149a1fe
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         with:
 
@@ -15,6 +15,7 @@ permissions:
 jobs:
   enforce-branch:
     runs-on: ubuntu-latest
+    if: github.actor != 'renovate[bot]'
     steps:
       - id: enforce_branch
         name: Enforce and Auto-fix Target Branch
@@ -27,9 +28,9 @@ jobs:
         run: |
           if [ "$BASE_REF" == "main" ] && [ "$HEAD_REF" != "dev" ]; then
             echo "❌ PR is targeting 'main' but not from 'dev'. Changing target to 'dev'..."
-          
+
             gh pr edit "$PR_NUMBER" --repo "$REPO" --base dev
-          
+
             echo "changed=true" >> $GITHUB_OUTPUT
             echo "✅ Target branch automatically changed to 'dev'"
             echo "⚠️  To merge to 'main', please create a PR from 'dev' branch"
 
@@ -15,6 +15,7 @@ permissions:
 jobs:
   enforce-title:
     runs-on: ubuntu-latest
+    if: github.actor != 'renovate[bot]'
     steps:
       - id: enforce_title
         name: Set PR title to branch name
 
@@ -1,17 +1,23 @@
 [package]
-name = "illyriaplus"
+name = "vanillaplus"
 version = "0.0.1"
 edition = "2024"
+authors = ["Xodium"]
 
 [lib]
 crate-type = ["cdylib"]
 
 [dependencies]
-pumpkin = { git = "https://github.com/Pumpkin-MC/Pumpkin.git", branch = "master" }
-pumpkin-util = { git = "https://github.com/Pumpkin-MC/Pumpkin.git", branch = "master", package = "pumpkin-util" }
-pumpkin-api-macros = { git = "https://github.com/Pumpkin-MC/Pumpkin.git", branch = "master" }
-
-tokio = "1.49.0"
+pumpkin-plugin-api = { version = "0.1.0", git = "https://github.com/Pumpkin-MC/Pumpkin" }
+tracing = "0.1"
+serde = { version = "1.0.228", features = ["derive"] }
+serde_json = "1.0.149"
 
 [profile.release]
 lto = true
+
+[lints.rust]
+unsafe_code = "forbid"
+
+[lints.clippy]
+all = "warn"
@@ -6,7 +6,7 @@
       <img src="https://gist.githubusercontent.com/illyrius666/a38f03b4fbe9b43faa2c5623137c1250/raw/3a1410e77807097bcfbcf963822b41fadd495d9f/xodium.svg" alt="Xodium Logo" width="200">
     </a>
   <br /><br />
-  illyriaplus
+  Vanilla+
   <br />
   <br />
 </h1>
@@ -38,14 +38,25 @@
 <p align="right"><a href="#readme-top">▲</a></p>
 
 [built_with_shield_url]: https://skillicons.dev/icons?i=rust,github,githubactions
+
 [built_with_url]: https://skillicons.dev
-[code_of_conduct_url]: https://github.com/XodiumSoftware/illyriaplus?tab=coc-ov-file
-[contributing_url]: https://github.com/XodiumSoftware/illyriaplus/blob/main/CONTRIBUTING.md
-[contributors_shield_url]: https://img.shields.io/github/contributors/XodiumSoftware/illyriaplus?style=for-the-badge&color=blue
-[contributors_url]: https://github.com/XodiumSoftware/illyriaplus/graphs/contributors
-[issues_shield_url]: https://img.shields.io/github/issues/XodiumSoftware/illyriaplus?style=for-the-badge&color=yellow
-[issues_url]: https://github.com/XodiumSoftware/illyriaplus/issues
-[license_url]: https://github.com/XodiumSoftware/illyriaplus?tab=AGPL-3.0-1-ov-file
+
+[code_of_conduct_url]: https://github.com/XodiumSoftware/vanillaplus?tab=coc-ov-file
+
+[contributing_url]: https://github.com/XodiumSoftware/vanillaplus/blob/main/CONTRIBUTING.md
+
+[contributors_shield_url]: https://img.shields.io/github/contributors/XodiumSoftware/vanillaplus?style=for-the-badge&color=blue
+
+[contributors_url]: https://github.com/XodiumSoftware/vanillaplus/graphs/contributors
+
+[issues_shield_url]: https://img.shields.io/github/issues/XodiumSoftware/vanillaplus?style=for-the-badge&color=yellow
+
+[issues_url]: https://github.com/XodiumSoftware/vanillaplus/issues
+
+[license_url]: https://github.com/XodiumSoftware/vanillaplus?tab=AGPL-3.0-1-ov-file
+
 [roadmap_shield_url]: https://img.shields.io/badge/Roadmap-Click%20Me!-purple.svg?style=for-the-badge
+
 [roadmap_url]: https://github.com/orgs/XodiumSoftware/projects/4
-[security_url]: https://github.com/XodiumSoftware/illyriaplus?tab=security-ov-file
+
+[security_url]: https://github.com/XodiumSoftware/vanillaplus?tab=security-ov-file
@@ -0,0 +1,73 @@
+use crate::player::Config;
+use pumpkin_plugin_api::Context;
+use serde::{Deserialize, Serialize};
+use std::path::{Path, PathBuf};
+use std::{fs, io};
+
+/// Manages plugin configuration, loading from and saving to disk.
+#[derive(Clone, Debug, Default, Serialize, Deserialize)]
+pub struct ConfigManager {
+    /// Configuration for the player mechanics module.
+    pub player_module: Config,
+}
+
+impl ConfigManager {
+    /// Loads the configuration from disk, or writes and returns the default if not found.
+    ///
+    /// # Errors
+    /// Returns an [`io::Error`] if an I/O or deserialization error occurs.
+    pub fn new(context: Context) -> Result<Self, io::Error> {
+        let path = Self::path(context);
+
+        match Self::load(&path) {
+            Ok(config) => Ok(config),
+            Err(e) if e.kind() == io::ErrorKind::NotFound => {
+                let default_config = ConfigManager::default();
+                default_config.save(&path)?;
+                Ok(default_config)
+            }
+            Err(e) => Err(e),
+        }
+    }
+
+    /// Returns the path to the configuration file within the plugin's data folder.
+    fn path(context: Context) -> PathBuf {
+        PathBuf::from(context.get_data_folder()).join("config.json")
+    }
+
+    /// Reads and deserializes the configuration from `path`.
+    ///
+    /// # Errors
+    /// Returns [`io::ErrorKind::NotFound`] if the file does not exist, or
+    /// [`io::ErrorKind::InvalidData`] if deserialization fails.
+    fn load(path: &Path) -> Result<ConfigManager, io::Error> {
+        if !path.exists() {
+            return Err(io::Error::new(
+                io::ErrorKind::NotFound,
+                format!("Config file not found at: {}", path.display()),
+            ));
+        }
+
+        let content = fs::read_to_string(path)?;
+        let config: ConfigManager = serde_json::from_str(&content)
+            .map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?;
+
+        Ok(config)
+    }
+
+    /// Serializes and writes the configuration to `path`, creating parent directories if needed.
+    ///
+    /// # Errors
+    /// Returns an [`io::Error`] if serialization or any file operation fails.
+    fn save(&self, path: &Path) -> Result<(), io::Error> {
+        if let Some(parent) = path.parent() {
+            fs::create_dir_all(parent)?;
+        }
+
+        let content = serde_json::to_string_pretty(self)
+            .map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?;
+
+        fs::write(path, content)?;
+        Ok(())
+    }
+}
@@ -1,34 +1,53 @@
+mod config;
+
 mod modules {
-    pub mod player;
+    pub mod module;
+    pub mod mechanics {
+        pub mod locator;
+        pub mod motd;
+        pub mod player;
+        pub mod tablist;
+    }
 }
 
-use pumpkin_api_macros::{plugin_impl, plugin_method};
-
-#[plugin_method]
-async fn on_load(&mut self, server: Arc<Context>) -> Result<(), String> {
-    server.init_log();
+pub use config::*;
+pub use mechanics::*;
+pub use modules::*;
 
-    log::info!("Hello, Pumpkin!");
+use crate::module::Module;
+use crate::motd::Motd;
+use crate::player::Player;
+use pumpkin_plugin_api::{Context, PluginMetadata};
+use tracing::info;
 
-    server
-        .register_event(Arc::new(PlayerModule), EventPriority::Lowest, true)
-        .await;
-
-    Ok(())
-}
+pub const PLUGIN_ID: &str = "vanillaplus";
 
 /// IllyriaPlus plugin implementation.
-#[plugin_impl]
 pub struct IllyriaPlus {}
 
 impl IllyriaPlus {
-    pub fn new() -> Self {
+    fn new() -> Self {
         IllyriaPlus {}
     }
-}
 
-impl Default for IllyriaPlus {
-    fn default() -> Self {
-        Self::new()
+    fn metadata(&self) -> PluginMetadata {
+        PluginMetadata {
+            name: "Vanilla+".into(),
+            version: env!("CARGO_PKG_VERSION").into(),
+            authors: vec!["Xodium".into()],
+            description: "Minecraft plugin that enhances the base gameplay in Rust".into(),
+        }
+    }
+
+    fn on_load(&mut self, context: Context) -> pumpkin_plugin_api::Result<()> {
+        Motd::default().register(&context);
+        Player::default().register(&context);
+        info!("IllyriaPlus loaded. NICE TO CYA!");
+        Ok(())
+    }
+
+    fn on_unload(&mut self, _context: Context) -> pumpkin_plugin_api::Result<()> {
+        info!("IllyriaPlus unloaded. CYA NEXT TIME!");
+        Ok(())
     }
 }