diff --git a/.gitignore b/.gitignore index 7cb2ea7..eaf8d5f 100644 --- a/.gitignore +++ b/.gitignore @@ -39,8 +39,8 @@ build/ .DS_Store ### Other Stuff ### -**/resources/config*.json -!**/resources/config.example.json +config*.json +config.example.json !**/resources/config.schema.json ### why would this not be here already ### diff --git a/README.md b/README.md index e6070d2..b0a5baf 100644 --- a/README.md +++ b/README.md @@ -8,4 +8,32 @@ A multipurpose Discord bot written in Java. ### Tested Operating Systems - macOS 14.4.1 -- Windows 10 (22H2) \ No newline at end of file +- Windows 10 (22H2) + +--- + +## Config file schema +```json +{ + "token": "your_token", + "prefix": "oki!", + "mariadb": { + "host": "127.0.0.1", + "user": "db_user", + "password": "db_password", + "database": "doki_prod" + } +} +``` + +--- + +## Commands + +| Command | Description | Arguments | Aliases | +|---------------|------------------------------------------------------------------------------|---------------|---------| +| `leaderboard` | Gets the leaderboard for the current guild | None | `lb` | +| `rank` | Gets the rank of the specified user (message author if none specified) | `[user ping]` | None | +| `about` | Gets information about the bot | None | None | +| `ping` | Gets the bot's gateway & rest ping | None | None | +| `whois` | Gets information about the specified user (message author if none specified) | `[user ping]` | None | \ No newline at end of file diff --git a/src/main/java/net/hypr/doki/Config.java b/src/main/java/net/hypr/doki/Config.java index c6b233e..28bcbf8 100644 --- a/src/main/java/net/hypr/doki/Config.java +++ b/src/main/java/net/hypr/doki/Config.java @@ -22,8 +22,7 @@ public class Config { */ public static Config readConfig() throws IOException { Logger log = Logging.getLogger(); - try (InputStream in=Thread.currentThread().getContextClassLoader().getResourceAsStream("config.json")) { - assert in != null; + try (InputStream in = new FileInputStream("./config.json")) { Reader reader = new InputStreamReader(in, StandardCharsets.UTF_8); log.info("Loaded config"); return new Gson().fromJson(reader, Config.class);