From def84de1dd814996a1b0931be32731f411d35005 Mon Sep 17 00:00:00 2001
From: nils <48135649+Nilstrieb@users.noreply.github.com>
Date: Mon, 5 Sep 2022 16:17:33 +0200
Subject: [PATCH] config cleanup

---
 .../com/github/nilstrieb/cofig/Config.java    | 39 ++-----------------
 .../com/github/nilstrieb/cofig/Secrets.java   |  6 ---
 .../java/com/github/nilstrieb/core/Main.java  |  9 +++--
 3 files changed, 8 insertions(+), 46 deletions(-)
 delete mode 100644 src/main/java/com/github/nilstrieb/cofig/Secrets.java

diff --git a/src/main/java/com/github/nilstrieb/cofig/Config.java b/src/main/java/com/github/nilstrieb/cofig/Config.java
index 70cb3dc..6cf5355 100644
--- a/src/main/java/com/github/nilstrieb/cofig/Config.java
+++ b/src/main/java/com/github/nilstrieb/cofig/Config.java
@@ -1,22 +1,15 @@
 package com.github.nilstrieb.cofig;
 
-import com.github.nilstrieb.util.trivia.TriviaQuestionData;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.JDA;
 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 TOKEN = System.getenv("BOT_TOKEN");
+    public static final String PREFIX = "kil ";
+    public static final String JSON_PATH = System.getenv("KILLUA_JSON_PATH");
 
     public static final String VERSION = "1.0.1";
 
@@ -28,8 +21,6 @@ public class Config {
     public static final long KUKUROO_MOUNTAIN_ID = 799696420386504795L;
     public static final long TRIVIA_APPROVAL_CHANNEL_ID = 802244298774413312L;
 
-    private static final String JSON_PATH_INTELLIJ = "trivia_questions.json";
-
     private static JDA jda;
 
     public static void setJda(JDA jda) {
@@ -48,28 +39,4 @@ public class Config {
                 .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/cofig/Secrets.java b/src/main/java/com/github/nilstrieb/cofig/Secrets.java
deleted file mode 100644
index e1d0ce3..0000000
--- a/src/main/java/com/github/nilstrieb/cofig/Secrets.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.github.nilstrieb.cofig;
-
-public class Secrets {
-    public static String NORMAL_TOKEN = System.getenv("BOT_TOKEN");
-    public static String L_TOKEN = System.getenv("LITTLE_BOT_TOKEN");
-}
diff --git a/src/main/java/com/github/nilstrieb/core/Main.java b/src/main/java/com/github/nilstrieb/core/Main.java
index 41b6ce5..8dabc51 100644
--- a/src/main/java/com/github/nilstrieb/core/Main.java
+++ b/src/main/java/com/github/nilstrieb/core/Main.java
@@ -1,14 +1,16 @@
 package com.github.nilstrieb.core;
 
 import com.github.nilstrieb.cofig.Config;
-import com.github.nilstrieb.cofig.Secrets;
 import com.github.nilstrieb.commands.fun.*;
 import com.github.nilstrieb.commands.fun.trivia.TriviaCommand;
-import com.github.nilstrieb.commands.info.*;
+import com.github.nilstrieb.commands.info.EvalCommand;
+import com.github.nilstrieb.commands.info.HelpCommand;
+import com.github.nilstrieb.commands.info.InviteCommand;
+import com.github.nilstrieb.commands.info.ToukaCommand;
 import com.github.nilstrieb.commands.util.EmoteAddCommand;
-import com.github.nilstrieb.core.sections.ChannelMessageListener;
 import com.github.nilstrieb.core.command.CommandListener;
 import com.github.nilstrieb.core.reactions.ReactionEventListener;
+import com.github.nilstrieb.core.sections.ChannelMessageListener;
 import com.github.nilstrieb.listener.DMDebugListener;
 import com.github.nilstrieb.listener.StartUpListener;
 import net.dv8tion.jda.api.JDA;
@@ -24,7 +26,6 @@ import java.util.Scanner;
 public class Main {
 
     public static void main(String[] args) throws LoginException {
-        Config.init(0);
         JDABuilder builder = JDABuilder.createDefault(Config.TOKEN);
         builder.setCompression(Compression.ZLIB);
         builder.setActivity(Activity.watching("over Gon"));