diff --git a/.gitignore b/.gitignore index eaf8d5f..9b563a8 100644 --- a/.gitignore +++ b/.gitignore @@ -40,7 +40,7 @@ build/ ### Other Stuff ### config*.json -config.example.json +!config.example.json !**/resources/config.schema.json ### why would this not be here already ### diff --git a/config.example.json b/config.example.json new file mode 100644 index 0000000..7bc7b61 --- /dev/null +++ b/config.example.json @@ -0,0 +1,3 @@ +{ + "token": "CHANGEME" +} \ 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 28bcbf8..7615f3b 100644 --- a/src/main/java/net/hypr/doki/Config.java +++ b/src/main/java/net/hypr/doki/Config.java @@ -11,8 +11,6 @@ import java.nio.charset.StandardCharsets; //You will need a valid config.json in the resources folder for this to work public class Config { @SuppressWarnings("unused") private String token; - @SuppressWarnings("unused") private String prefix; - @SuppressWarnings("unused") private DBConfig mariadb; /** * Returns the configuration object for this bot @@ -35,29 +33,4 @@ public class Config { public String getToken() { return token; } - public String getPrefix() { return prefix; } - - public DBConfig getDbConfig() { - return mariadb; - } - - public static class DBConfig { - @SuppressWarnings("unused") private String host, user, password, database; - @SuppressWarnings("unused") private int portNumber; - - public String getHost() { return host; } - - public String getUser() { - return user; - } - - public String getPassword() { - return password; - } - - public String getDatabase() { return database; } - public int getPortNumber() { - return portNumber; - } - } } \ No newline at end of file diff --git a/src/main/java/net/hypr/doki/Doki.java b/src/main/java/net/hypr/doki/Doki.java index 88d8abf..299d19d 100644 --- a/src/main/java/net/hypr/doki/Doki.java +++ b/src/main/java/net/hypr/doki/Doki.java @@ -5,7 +5,6 @@ import com.freya02.botcommands.api.Logging; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.JDABuilder; import net.dv8tion.jda.api.entities.*; -import net.dv8tion.jda.api.requests.GatewayIntent; import org.slf4j.Logger; import java.io.IOException; @@ -23,7 +22,6 @@ public class Doki { public static JDA getJDA() { return jda; } - public static String getPrefix() { return config.getPrefix(); } public static void start() throws IOException, InterruptedException { config = Config.readConfig(); diff --git a/src/main/resources/config.schema.json b/src/main/resources/config.schema.json index ffb185f..a5464fb 100644 --- a/src/main/resources/config.schema.json +++ b/src/main/resources/config.schema.json @@ -1,18 +1,12 @@ - - { "$schema": "http://json-schema.org/draft-04/schema#", "type": "object", "properties": { "token": { "type": "string" - }, - "prefix": { - "type": "string" } }, "required": [ - "token", - "prefix" + "token" ] } \ No newline at end of file