Merge pull request #182 from colorfulFlames/FLR-17

FLR 17 - Start work on Amiguito
colorfulFlames · May 9, 2024 · c09951e · c09951e
2 parents 20964b7 + 9b84095
commit c09951e
Show file tree

Hide file tree

Showing 50 changed files with 803 additions and 207 deletions.
diff --git a/.gradle/8.5/checksums/checksums.lock b/.gradle/8.5/checksums/checksums.lock
diff --git a/.gradle/8.5/checksums/sha1-checksums.bin b/.gradle/8.5/checksums/sha1-checksums.bin
diff --git a/.gradle/8.5/executionHistory/executionHistory.lock b/.gradle/8.5/executionHistory/executionHistory.lock
diff --git a/.gradle/8.5/fileHashes/fileHashes.lock b/.gradle/8.5/fileHashes/fileHashes.lock
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/resourceBundles.xml b/.idea/resourceBundles.xml
diff --git a/build/classes/java/main/com/severalcircles/flames/data/FlamesData.class b/build/classes/java/main/com/severalcircles/flames/data/FlamesData.class
diff --git a/build/classes/java/main/com/severalcircles/flames/data/global/GlobalData.class b/build/classes/java/main/com/severalcircles/flames/data/global/GlobalData.class
diff --git a/build/classes/java/main/com/severalcircles/flames/data/user/FlamesUser.class b/build/classes/java/main/com/severalcircles/flames/data/user/FlamesUser.class
diff --git a/build/classes/java/main/com/severalcircles/flames/data/user/UserFunFacts.class b/build/classes/java/main/com/severalcircles/flames/data/user/UserFunFacts.class
diff --git a/build/classes/java/main/com/severalcircles/flames/events/CommandEvent.class b/build/classes/java/main/com/severalcircles/flames/events/CommandEvent.class
diff --git a/build/classes/java/main/com/severalcircles/flames/events/MessageEvent.class b/build/classes/java/main/com/severalcircles/flames/events/MessageEvent.class
diff --git a/build/classes/java/main/org/json/Cookie.class b/build/classes/java/main/org/json/Cookie.class
diff --git a/build/classes/java/main/org/json/JSONPointer.class b/build/classes/java/main/org/json/JSONPointer.class
diff --git a/build/classes/java/main/org/json/JSONTokener.class b/build/classes/java/main/org/json/JSONTokener.class
diff --git a/build/classes/java/main/org/json/JSONWriter.class b/build/classes/java/main/org/json/JSONWriter.class
diff --git a/build/classes/java/main/org/json/XML$1$1.class b/build/classes/java/main/org/json/XML$1$1.class
diff --git a/build/classes/java/main/org/json/XML$1.class b/build/classes/java/main/org/json/XML$1.class
diff --git a/build/classes/java/main/org/json/XML.class b/build/classes/java/main/org/json/XML.class
diff --git a/build/classes/java/main/org/json/XMLTokener.class b/build/classes/java/main/org/json/XMLTokener.class
diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
diff --git a/src/main/java/com/severalcircles/flames/Flames.java b/src/main/java/com/severalcircles/flames/Flames.java
@@ -5,6 +5,8 @@
 
 package com.severalcircles.flames;
 
+import com.severalcircles.flames.amiguito.AmiguitoDataManager;
+import com.severalcircles.flames.amiguito.frontend.AmiguitoNewCommand;
 import com.severalcircles.flames.conversations.Conversation;
 import com.severalcircles.flames.data.FlamesDataManager;
 import com.severalcircles.flames.data.global.GlobalData;
@@ -27,6 +29,7 @@
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
+import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
 import net.dv8tion.jda.api.requests.GatewayIntent;
 
 import java.io.File;
@@ -84,12 +87,10 @@ public static void main(String[] args) throws IOException {
         Locale.setDefault(Locale.ENGLISH);
         properties.load(is);
         version = properties.getProperty("version");
-        if (args.length > 0) runningDebug = args[0].equals("--debug");
-        if (runningDebug) Logger.getGlobal().info("Running in debugging mode.");
         FlamesDataManager.prepare();
         reportHeader = String.format(reportHeader, version);
         String logName = "Flames " + version + "@" + InetAddress.getLocalHost().getHostName() + " " + Instant.now().truncatedTo(ChronoUnit.SECONDS).toString().replace(":", " ").replace("T", " T") + ".log";
-        File logDir = new File(FlamesDataManager.flamesDirectory.getAbsolutePath() + "/logs");
+        File logDir = new File(FlamesDataManager.FLAMES_DIRECTORY.getAbsolutePath() + "/logs");
         //noinspection ResultOfMethodCallIgnored
         logDir.mkdir();
         File logFile = new File(logDir.getAbsolutePath() + "/" + logName);
@@ -123,6 +124,7 @@ public static void main(String[] args) throws IOException {
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
+        AmiguitoDataManager.prepare();
         // --- Events ---
         new CommandEvent().register(api);
         new MessageEvent().register(api);
@@ -156,6 +158,9 @@ public static void main(String[] args) throws IOException {
         commandDataList.add(Commands.slash("about", "Who cooked here?"));
         commandMap.put("spark", new SparkCommand());
         commandDataList.add(Commands.slash("spark", "Start a Spark conversation").addOption(OptionType.STRING, "question", "The question you want to ask", true).addOption(OptionType.INTEGER, "minutes", "Time limit for the conversation in minutes.", true));
+        commandMap.put("amiguito", new AmiguitoNewCommand());
+        commandDataList.add(Commands.slash("amiguito", "Interact with your Amiguito character").addOption(OptionType.STRING, "name", "The name of your Amiguito", true));
+
 //        Commands.context(Command.Type.MESSAGE, "SparkVote");
         api.updateCommands()
                 .addCommands(commandDataList).
@@ -172,7 +177,7 @@ public static void incrementErrorCount() {
         fatalErrorCounter++;
         if (fatalErrorCounter > 10) {
             Logger.getGlobal().log(Level.SEVERE, "Flames has detected a recurring fatal problem. To protect Flames' data, it will now exit. There may be stack traces above with more information.");
-            File file = new File(FlamesDataManager.flamesDirectory.getAbsolutePath() + "/logs/Flames FatalReport:" + Instant.now().toString() + ".log");
+            File file = new File(FlamesDataManager.FLAMES_DIRECTORY.getAbsolutePath() + "/logs/Flames FatalReport:" + Instant.now().toString() + ".log");
             try {
                 //noinspection ResultOfMethodCallIgnored
                 file.createNewFile();