diff --git a/src/main/java/com/github/nilstrieb/cofig/Config.java b/src/main/java/com/github/nilstrieb/cofig/Config.java index 5e29f3a..70cb3dc 100644 --- a/src/main/java/com/github/nilstrieb/cofig/Config.java +++ b/src/main/java/com/github/nilstrieb/cofig/Config.java @@ -7,15 +7,18 @@ import net.dv8tion.jda.api.entities.User; import java.awt.*; import java.io.File; +import java.io.FileNotFoundException; import java.net.URISyntaxException; public class Config { + public static String TOKEN; + public static String PREFIX; + public static String JSON_PATH; + public static final String NORMAL_PREFIX = "kil "; public static final String L_PREFIX = "k "; - public static final String VERSION = "1.0.0"; - - public static final String PREFIX = NORMAL_PREFIX; + public static final String VERSION = "1.0.1"; public static final Color DEFAULT_COLOR = new Color(229, 201, 255); @@ -25,19 +28,7 @@ public class Config { public static final long KUKUROO_MOUNTAIN_ID = 799696420386504795L; public static final long TRIVIA_APPROVAL_CHANNEL_ID = 802244298774413312L; - private static String JSON_PATH_JAR; - - static { - try { - JSON_PATH_JAR = new File(TriviaQuestionData.class.getProtectionDomain().getCodeSource() - .getLocation().toURI()).getPath().replaceAll("(.*\\\\).*?\\.jar", "$1") + "trivia_questions.json"; - } catch (URISyntaxException e) { - e.printStackTrace(); - } - } - private static final String JSON_PATH_INTELLIJ = "trivia_questions.json"; - public static final String JSON_PATH = JSON_PATH_JAR; private static JDA jda; @@ -52,9 +43,33 @@ public class Config { } EmbedBuilder builder = new EmbedBuilder(); - builder.setColor(Config.DEFAULT_COLOR). - setThumbnail(killua.getAvatarUrl()) + builder.setColor(Config.DEFAULT_COLOR) + .setThumbnail(killua.getAvatarUrl()) .setFooter("KilluaBot"); return builder; } + + /** + * 0 = normal + * 1 = test + */ + public static void init(int level) { + switch (level) { + case 0 -> { + PREFIX = NORMAL_PREFIX; + TOKEN = Secrets.NORMAL_TOKEN; + try { + JSON_PATH = new File(TriviaQuestionData.class.getProtectionDomain().getCodeSource() + .getLocation().toURI()).getPath().replaceAll("(.*\\\\).*?\\.jar", "$1") + "trivia_questions.json"; + } catch (URISyntaxException e) { + throw new RuntimeException("Trivia questions not found", e); + } + } + case 1 -> { + PREFIX = L_PREFIX; + TOKEN = Secrets.L_TOKEN; + JSON_PATH = JSON_PATH_INTELLIJ; + } + } + } } diff --git a/src/main/java/com/github/nilstrieb/core/Main.java b/src/main/java/com/github/nilstrieb/core/Main.java index 249303b..b6c84d4 100644 --- a/src/main/java/com/github/nilstrieb/core/Main.java +++ b/src/main/java/com/github/nilstrieb/core/Main.java @@ -24,7 +24,8 @@ import java.util.Scanner; public class Main { public static void main(String[] args) throws LoginException { - JDABuilder builder = JDABuilder.createDefault(Secrets.TOKEN); + Config.init(1); + JDABuilder builder = JDABuilder.createDefault(Config.TOKEN); builder.setCompression(Compression.ZLIB); builder.setActivity(Activity.watching("over Gon"));