Merge pull request #41 from colorfulFlames/release/v4.3

Release/v4.3
colorfulFlames · Oct 15, 2021 · 6a664ca · 6a664ca
2 parents b142df7 + 606b4d8
commit 6a664ca
Show file tree

Hide file tree

Showing 129 changed files with 200 additions and 323 deletions.
diff --git a/.gradle/7.2/executionHistory/executionHistory.bin b/.gradle/7.2/executionHistory/executionHistory.bin
diff --git a/.gradle/7.2/executionHistory/executionHistory.lock b/.gradle/7.2/executionHistory/executionHistory.lock
diff --git a/.gradle/7.2/fileHashes/fileHashes.bin b/.gradle/7.2/fileHashes/fileHashes.bin
diff --git a/.gradle/7.2/fileHashes/fileHashes.lock b/.gradle/7.2/fileHashes/fileHashes.lock
diff --git a/.gradle/7.2/fileHashes/resourceHashesCache.bin b/.gradle/7.2/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/.idea/modules/API/Flames.API.test.iml b/.idea/modules/API/Flames.API.test.iml
diff --git a/build.gradle b/build.gradle
@@ -4,14 +4,12 @@ plugins {
     id'application'
     id'com.github.johnrengelman.shadow' version '5.2.0'
     //noinspection GroovyAssignabilityCheck
-    id 'org.springframework.boot' version '2.5.5'
-    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
     id 'java'
 }
 
 mainClassName = 'com.severalcircles.flames.system.Flames'
 
-version '4.2.1'
+version '4.3'
 def jdaVersion = '4.3.0_277'
 
 sourceCompatibility = targetCompatibility = 1.8
@@ -23,16 +21,24 @@ repositories {
         url "https://m2.dv8tion.net/releases"
     }
 }
+task createProperties(dependsOn: processResources) {
+    doLast {
+        new File("$buildDir/resources/main/version.properties").withWriter { w ->
+            Properties p = new Properties()
+            p['version'] = project.version.toString()
+            p.store w, null
+        }
+    }
+}
 
+classes {
+    dependsOn createProperties
+}
 dependencies {
     implementation("net.dv8tion:JDA:$jdaVersion")
     implementation platform('com.google.cloud:libraries-bom:22.0.0')
     implementation platform('com.google.cloud:libraries-bom:20.8.0')
     implementation 'com.google.cloud:google-cloud-language'
     implementation 'com.bugsnag:bugsnag:3.6.2'
-    implementation 'org.springframework.boot:spring-boot-starter'
-    implementation 'org.springframework.boot:spring-boot-starter-web'
-    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
-    testImplementation 'org.springframework.boot:spring-boot-starter-test'
 
 }
diff --git a/build/bootScripts/Flames b/build/bootScripts/Flames
@@ -64,7 +64,7 @@ case "`uname`" in
     ;;
 esac
 
-JARPATH=$APP_HOME/lib/Flames-4.2.jar
+JARPATH=$APP_HOME/lib/Flames-4.2.1b.jar
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then

diff --git a/build/bootScripts/Flames.bat b/build/bootScripts/Flames.bat
@@ -63,7 +63,7 @@ set CMD_LINE_ARGS=%*
 :execute
 @rem Setup the command line
 
-set JARPATH=%APP_HOME%\lib\Flames-4.2.jar
+set JARPATH=%APP_HOME%\lib\Flames-4.2.1b.jar
 
 @rem Execute Flames
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %FLAMES_OPTS%  -jar "%JARPATH%" %CMD_LINE_ARGS%

diff --git a/build/classes/java/main/com/severalcircles/flames/api/DataController.class b/build/classes/java/main/com/severalcircles/flames/api/DataController.class
diff --git a/build/classes/java/main/com/severalcircles/flames/api/DataViewController.class b/build/classes/java/main/com/severalcircles/flames/api/DataViewController.class
diff --git a/build/classes/java/main/com/severalcircles/flames/api/FlamesAPI.class b/build/classes/java/main/com/severalcircles/flames/api/FlamesAPI.class
diff --git a/build/classes/java/main/com/severalcircles/flames/api/FlamesErrorController.class b/build/classes/java/main/com/severalcircles/flames/api/FlamesErrorController.class
diff --git a/build/classes/java/main/com/severalcircles/flames/buttonaction/ButtonAction.class b/build/classes/java/main/com/severalcircles/flames/buttonaction/ButtonAction.class
diff --git a/build/classes/java/main/com/severalcircles/flames/buttonaction/ConsentButtonAction.class b/build/classes/java/main/com/severalcircles/flames/buttonaction/ConsentButtonAction.class
diff --git a/.../classes/java/main/com/severalcircles/flames/buttonaction/data/FunFactsButtonAction.class b/.../classes/java/main/com/severalcircles/flames/buttonaction/data/FunFactsButtonAction.class
diff --git a/...es/java/main/com/severalcircles/flames/buttonaction/data/ManageUserDataButtonAction.class b/...es/java/main/com/severalcircles/flames/buttonaction/data/ManageUserDataButtonAction.class
diff --git a/.../classes/java/main/com/severalcircles/flames/buttonaction/data/MyDataButtonAction$1.class b/.../classes/java/main/com/severalcircles/flames/buttonaction/data/MyDataButtonAction$1.class
diff --git a/build/classes/java/main/com/severalcircles/flames/buttonaction/data/MyDataButtonAction.class b/build/classes/java/main/com/severalcircles/flames/buttonaction/data/MyDataButtonAction.class
diff --git a/build/classes/java/main/com/severalcircles/flames/buttonaction/data/StatsButtonAction.class b/build/classes/java/main/com/severalcircles/flames/buttonaction/data/StatsButtonAction.class
diff --git a/build/classes/java/main/com/severalcircles/flames/command/DebugCommand.class b/build/classes/java/main/com/severalcircles/flames/command/DebugCommand.class
diff --git a/build/classes/java/main/com/severalcircles/flames/command/FlamesCommand.class b/build/classes/java/main/com/severalcircles/flames/command/FlamesCommand.class
diff --git a/build/classes/java/main/com/severalcircles/flames/command/HelpCommand.class b/build/classes/java/main/com/severalcircles/flames/command/HelpCommand.class
diff --git a/build/classes/java/main/com/severalcircles/flames/command/TestCommand.class b/build/classes/java/main/com/severalcircles/flames/command/TestCommand.class
diff --git a/build/classes/java/main/com/severalcircles/flames/command/connections/ArtistCommand.class b/build/classes/java/main/com/severalcircles/flames/command/connections/ArtistCommand.class
diff --git a/build/classes/java/main/com/severalcircles/flames/command/data/GlobalDataCommand.class b/build/classes/java/main/com/severalcircles/flames/command/data/GlobalDataCommand.class
diff --git a/build/classes/java/main/com/severalcircles/flames/command/data/HiCommand.class b/build/classes/java/main/com/severalcircles/flames/command/data/HiCommand.class
diff --git a/build/classes/java/main/com/severalcircles/flames/command/data/MyDataCommand$1.class b/build/classes/java/main/com/severalcircles/flames/command/data/MyDataCommand$1.class
diff --git a/build/classes/java/main/com/severalcircles/flames/command/data/MyDataCommand.class b/build/classes/java/main/com/severalcircles/flames/command/data/MyDataCommand.class
diff --git a/build/classes/java/main/com/severalcircles/flames/command/data/TodayCommand.class b/build/classes/java/main/com/severalcircles/flames/command/data/TodayCommand.class
diff --git a/build/classes/java/main/com/severalcircles/flames/data/base/ConsentException.class b/build/classes/java/main/com/severalcircles/flames/data/base/ConsentException.class
diff --git a/build/classes/java/main/com/severalcircles/flames/data/base/FlamesDataManager.class b/build/classes/java/main/com/severalcircles/flames/data/base/FlamesDataManager.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/data/user/UserStats.class b/build/classes/java/main/com/severalcircles/flames/data/user/UserStats.class
diff --git a/build/classes/java/main/com/severalcircles/flames/events/ButtonEvent.class b/build/classes/java/main/com/severalcircles/flames/events/ButtonEvent.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/com/severalcircles/flames/features/Analysis.class b/build/classes/java/main/com/severalcircles/flames/features/Analysis.class
diff --git a/build/classes/java/main/com/severalcircles/flames/features/BadWordFilter.class b/build/classes/java/main/com/severalcircles/flames/features/BadWordFilter.class
diff --git a/build/classes/java/main/com/severalcircles/flames/features/FlamesPrettyDate.class b/build/classes/java/main/com/severalcircles/flames/features/FlamesPrettyDate.class
diff --git a/...lasses/java/main/com/severalcircles/flames/features/external/ParameterStringBuilder.class b/...lasses/java/main/com/severalcircles/flames/features/external/ParameterStringBuilder.class
diff --git a/...java/main/com/severalcircles/flames/features/external/severalcircles/FlamesAssets$1.class b/...java/main/com/severalcircles/flames/features/external/severalcircles/FlamesAssets$1.class
diff --git a/...s/java/main/com/severalcircles/flames/features/external/severalcircles/FlamesAssets.class b/...s/java/main/com/severalcircles/flames/features/external/severalcircles/FlamesAssets.class
diff --git a/...ses/java/main/com/severalcircles/flames/features/external/spotify/ReconnectRunnable.class b/...ses/java/main/com/severalcircles/flames/features/external/spotify/ReconnectRunnable.class
diff --git a/...classes/java/main/com/severalcircles/flames/features/external/spotify/SpotifyArtist.class b/...classes/java/main/com/severalcircles/flames/features/external/spotify/SpotifyArtist.class
diff --git a/...ses/java/main/com/severalcircles/flames/features/external/spotify/SpotifyConnection.class b/...ses/java/main/com/severalcircles/flames/features/external/spotify/SpotifyConnection.class
diff --git a/build/classes/java/main/com/severalcircles/flames/features/rank/Rank.class b/build/classes/java/main/com/severalcircles/flames/features/rank/Rank.class
diff --git a/build/classes/java/main/com/severalcircles/flames/features/rank/Ranking$1.class b/build/classes/java/main/com/severalcircles/flames/features/rank/Ranking$1.class
diff --git a/build/classes/java/main/com/severalcircles/flames/features/rank/Ranking.class b/build/classes/java/main/com/severalcircles/flames/features/rank/Ranking.class
diff --git a/build/classes/java/main/com/severalcircles/flames/features/safety/Consent.class b/build/classes/java/main/com/severalcircles/flames/features/safety/Consent.class
diff --git a/build/classes/java/main/com/severalcircles/flames/features/today/Today.class b/build/classes/java/main/com/severalcircles/flames/features/today/Today.class
diff --git a/build/classes/java/main/com/severalcircles/flames/system/Flames.class b/build/classes/java/main/com/severalcircles/flames/system/Flames.class
diff --git a/build/classes/java/main/com/severalcircles/flames/system/FlamesProtectException.class b/build/classes/java/main/com/severalcircles/flames/system/FlamesProtectException.class
diff --git a/build/classes/java/main/com/severalcircles/flames/system/updater/FlamesUpdater.class b/build/classes/java/main/com/severalcircles/flames/system/updater/FlamesUpdater.class
diff --git a/build/classes/java/main/org/json/CDL.class b/build/classes/java/main/org/json/CDL.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/CookieList.class b/build/classes/java/main/org/json/CookieList.class
diff --git a/build/classes/java/main/org/json/HTTP.class b/build/classes/java/main/org/json/HTTP.class
diff --git a/build/classes/java/main/org/json/HTTPTokener.class b/build/classes/java/main/org/json/HTTPTokener.class
diff --git a/build/classes/java/main/org/json/JSONArray.class b/build/classes/java/main/org/json/JSONArray.class
diff --git a/build/classes/java/main/org/json/JSONException.class b/build/classes/java/main/org/json/JSONException.class
diff --git a/build/classes/java/main/org/json/JSONML.class b/build/classes/java/main/org/json/JSONML.class
diff --git a/build/classes/java/main/org/json/JSONObject$Null.class b/build/classes/java/main/org/json/JSONObject$Null.class
diff --git a/build/classes/java/main/org/json/JSONObject.class b/build/classes/java/main/org/json/JSONObject.class
diff --git a/build/classes/java/main/org/json/JSONPointer$Builder.class b/build/classes/java/main/org/json/JSONPointer$Builder.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/JSONPointerException.class b/build/classes/java/main/org/json/JSONPointerException.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/Property.class b/build/classes/java/main/org/json/Property.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/XMLParserConfiguration.class b/build/classes/java/main/org/json/XMLParserConfiguration.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/classes/java/main/org/json/XMLXsiTypeConverter.class b/build/classes/java/main/org/json/XMLXsiTypeConverter.class
diff --git a/build/resources/main/Common.properties b/build/resources/main/Common.properties
diff --git a/build/resources/main/templates/error.html b/build/resources/main/templates/error.html
diff --git a/build/resources/main/templates/error/404.html b/build/resources/main/templates/error/404.html
diff --git a/build/resources/main/templates/error/418.html b/build/resources/main/templates/error/418.html
diff --git a/build/resources/main/templates/view/user.html b/build/resources/main/templates/view/user.html
diff --git a/build/scripts/Flames b/build/scripts/Flames
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/lib/Flames-4.2-plain.jar:$APP_HOME/lib/JDA-4.3.0_277.jar:$APP_HOME/lib/google-cloud-language-1.103.2.jar:$APP_HOME/lib/bugsnag-3.6.2.jar:$APP_HOME/lib/spring-boot-starter-web-2.5.5.jar:$APP_HOME/lib/spring-boot-starter-thymeleaf-2.5.5.jar:$APP_HOME/lib/spring-boot-starter-json-2.5.5.jar:$APP_HOME/lib/spring-boot-starter-2.5.5.jar:$APP_HOME/lib/guava-30.1.1-android.jar:$APP_HOME/lib/protobuf-java-3.17.3.jar:$APP_HOME/lib/protobuf-java-util-3.17.3.jar:$APP_HOME/lib/auto-value-annotations-1.8.1.jar:$APP_HOME/lib/proto-google-cloud-language-v1-1.85.2.jar:$APP_HOME/lib/proto-google-cloud-language-v1beta2-0.86.2.jar:$APP_HOME/lib/google-auth-library-credentials-0.26.0.jar:$APP_HOME/lib/google-auth-library-oauth2-http-0.26.0.jar:$APP_HOME/lib/google-http-client-1.39.2.jar:$APP_HOME/lib/google-http-client-gson-1.39.2.jar:$APP_HOME/lib/grpc-alts-1.39.0.jar:$APP_HOME/lib/grpc-api-1.39.0.jar:$APP_HOME/lib/grpc-auth-1.39.0.jar:$APP_HOME/lib/grpc-context-1.39.0.jar:$APP_HOME/lib/grpc-core-1.39.0.jar:$APP_HOME/lib/grpc-grpclb-1.39.0.jar:$APP_HOME/lib/grpc-netty-shaded-1.39.0.jar:$APP_HOME/lib/grpc-protobuf-1.39.0.jar:$APP_HOME/lib/grpc-protobuf-lite-1.39.0.jar:$APP_HOME/lib/grpc-stub-1.39.0.jar:$APP_HOME/lib/api-common-1.10.4.jar:$APP_HOME/lib/gax-1.66.0.jar:$APP_HOME/lib/gax-grpc-1.66.0.jar:$APP_HOME/lib/proto-google-common-protos-2.3.2.jar:$APP_HOME/lib/trove4j-3.0.3.jar:$APP_HOME/lib/jackson-datatype-jsr310-2.12.5.jar:$APP_HOME/lib/jackson-annotations-2.12.5.jar:$APP_HOME/lib/jackson-datatype-jdk8-2.12.5.jar:$APP_HOME/lib/jackson-module-parameter-names-2.12.5.jar:$APP_HOME/lib/jackson-core-2.12.5.jar:$APP_HOME/lib/jackson-databind-2.12.5.jar:$APP_HOME/lib/jsr305-3.0.2.jar:$APP_HOME/lib/annotations-16.0.1.jar:$APP_HOME/lib/thymeleaf-spring5-3.0.12.RELEASE.jar:$APP_HOME/lib/thymeleaf-extras-java8time-3.0.4.RELEASE.jar:$APP_HOME/lib/spring-boot-starter-logging-2.5.5.jar:$APP_HOME/lib/logback-classic-1.2.6.jar:$APP_HOME/lib/log4j-to-slf4j-2.14.1.jar:$APP_HOME/lib/jul-to-slf4j-1.7.32.jar:$APP_HOME/lib/thymeleaf-3.0.12.RELEASE.jar:$APP_HOME/lib/slf4j-api-1.7.32.jar:$APP_HOME/lib/nv-websocket-client-2.14.jar:$APP_HOME/lib/okhttp-3.14.9.jar:$APP_HOME/lib/opus-java-1.1.0.pom:$APP_HOME/lib/commons-collections4-4.1.jar:$APP_HOME/lib/spring-boot-autoconfigure-2.5.5.jar:$APP_HOME/lib/spring-boot-2.5.5.jar:$APP_HOME/lib/spring-boot-starter-tomcat-2.5.5.jar:$APP_HOME/lib/jakarta.annotation-api-1.3.5.jar:$APP_HOME/lib/spring-webmvc-5.3.10.jar:$APP_HOME/lib/spring-web-5.3.10.jar:$APP_HOME/lib/spring-context-5.3.10.jar:$APP_HOME/lib/spring-aop-5.3.10.jar:$APP_HOME/lib/spring-beans-5.3.10.jar:$APP_HOME/lib/spring-expression-5.3.10.jar:$APP_HOME/lib/spring-core-5.3.10.jar:$APP_HOME/lib/snakeyaml-1.28.jar:$APP_HOME/lib/javax.annotation-api-1.3.2.jar:$APP_HOME/lib/failureaccess-1.0.1.jar:$APP_HOME/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar:$APP_HOME/lib/checker-compat-qual-2.5.5.jar:$APP_HOME/lib/error_prone_annotations-2.7.1.jar:$APP_HOME/lib/j2objc-annotations-1.3.jar:$APP_HOME/lib/httpclient-4.5.13.jar:$APP_HOME/lib/commons-logging-1.2.jar:$APP_HOME/lib/commons-codec-1.15.jar:$APP_HOME/lib/httpcore-4.4.14.jar:$APP_HOME/lib/opencensus-contrib-http-util-0.28.0.jar:$APP_HOME/lib/gson-2.8.8.jar:$APP_HOME/lib/opencensus-api-0.28.0.jar:$APP_HOME/lib/perfmark-api-0.23.0.jar:$APP_HOME/lib/annotations-4.1.1.4.jar:$APP_HOME/lib/animal-sniffer-annotations-1.20.jar:$APP_HOME/lib/conscrypt-openjdk-uber-2.5.1.jar:$APP_HOME/lib/threetenbp-1.5.1.jar:$APP_HOME/lib/okio-1.17.2.jar:$APP_HOME/lib/opus-java-api-1.1.0.jar:$APP_HOME/lib/opus-java-natives-1.1.0.jar:$APP_HOME/lib/spring-jcl-5.3.10.jar:$APP_HOME/lib/tomcat-embed-websocket-9.0.53.jar:$APP_HOME/lib/tomcat-embed-core-9.0.53.jar:$APP_HOME/lib/tomcat-embed-el-9.0.53.jar:$APP_HOME/lib/jna-4.4.0.jar:$APP_HOME/lib/logback-core-1.2.6.jar:$APP_HOME/lib/log4j-api-2.14.1.jar:$APP_HOME/lib/attoparser-2.0.5.RELEASE.jar:$APP_HOME/lib/unbescape-1.1.6.RELEASE.jar
+CLASSPATH=$APP_HOME/lib/Flames-SNAPSHOT-4.3a.jar:$APP_HOME/lib/JDA-4.3.0_277.jar:$APP_HOME/lib/google-cloud-language-2.0.2.jar:$APP_HOME/lib/bugsnag-3.6.2.jar:$APP_HOME/lib/protobuf-java-3.17.3.jar:$APP_HOME/lib/protobuf-java-util-3.17.3.jar:$APP_HOME/lib/auto-value-annotations-1.8.2.jar:$APP_HOME/lib/proto-google-cloud-language-v1-2.0.2.jar:$APP_HOME/lib/proto-google-cloud-language-v1beta2-0.87.2.jar:$APP_HOME/lib/google-auth-library-credentials-1.1.0.jar:$APP_HOME/lib/google-auth-library-oauth2-http-1.1.0.jar:$APP_HOME/lib/guava-30.1.1-jre.jar:$APP_HOME/lib/google-http-client-1.39.2.jar:$APP_HOME/lib/google-http-client-gson-1.39.2.jar:$APP_HOME/lib/grpc-alts-1.40.0.jar:$APP_HOME/lib/grpc-api-1.40.0.jar:$APP_HOME/lib/grpc-auth-1.40.0.jar:$APP_HOME/lib/grpc-context-1.40.0.jar:$APP_HOME/lib/grpc-core-1.40.0.jar:$APP_HOME/lib/grpc-grpclb-1.40.0.jar:$APP_HOME/lib/grpc-netty-shaded-1.40.0.jar:$APP_HOME/lib/grpc-protobuf-1.40.0.jar:$APP_HOME/lib/grpc-protobuf-lite-1.40.0.jar:$APP_HOME/lib/grpc-stub-1.40.0.jar:$APP_HOME/lib/api-common-2.0.1.jar:$APP_HOME/lib/gax-2.3.0.jar:$APP_HOME/lib/gax-grpc-2.3.0.jar:$APP_HOME/lib/proto-google-common-protos-2.3.2.jar:$APP_HOME/lib/trove4j-3.0.3.jar:$APP_HOME/lib/jackson-databind-2.10.1.jar:$APP_HOME/lib/jsr305-3.0.2.jar:$APP_HOME/lib/annotations-16.0.1.jar:$APP_HOME/lib/slf4j-api-1.7.25.jar:$APP_HOME/lib/nv-websocket-client-2.14.jar:$APP_HOME/lib/okhttp-3.13.0.jar:$APP_HOME/lib/opus-java-1.1.0.pom:$APP_HOME/lib/commons-collections4-4.1.jar:$APP_HOME/lib/javax.annotation-api-1.3.2.jar:$APP_HOME/lib/failureaccess-1.0.1.jar:$APP_HOME/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar:$APP_HOME/lib/checker-qual-3.8.0.jar:$APP_HOME/lib/error_prone_annotations-2.9.0.jar:$APP_HOME/lib/j2objc-annotations-1.3.jar:$APP_HOME/lib/httpclient-4.5.13.jar:$APP_HOME/lib/commons-logging-1.2.jar:$APP_HOME/lib/commons-codec-1.15.jar:$APP_HOME/lib/httpcore-4.4.14.jar:$APP_HOME/lib/opencensus-contrib-http-util-0.28.0.jar:$APP_HOME/lib/gson-2.8.8.jar:$APP_HOME/lib/opencensus-api-0.28.0.jar:$APP_HOME/lib/perfmark-api-0.23.0.jar:$APP_HOME/lib/annotations-4.1.1.4.jar:$APP_HOME/lib/animal-sniffer-annotations-1.20.jar:$APP_HOME/lib/conscrypt-openjdk-uber-2.5.1.jar:$APP_HOME/lib/threetenbp-1.5.1.jar:$APP_HOME/lib/jackson-annotations-2.10.1.jar:$APP_HOME/lib/jackson-core-2.10.1.jar:$APP_HOME/lib/okio-1.17.2.jar:$APP_HOME/lib/opus-java-api-1.1.0.jar:$APP_HOME/lib/opus-java-natives-1.1.0.jar:$APP_HOME/lib/jna-4.4.0.jar
 
 
 # Determine the Java command to use to start the JVM.

diff --git a/build/scripts/Flames.bat b/build/scripts/Flames.bat
@@ -67,7 +67,7 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\lib\Flames-4.2-plain.jar;%APP_HOME%\lib\JDA-4.3.0_277.jar;%APP_HOME%\lib\google-cloud-language-1.103.2.jar;%APP_HOME%\lib\bugsnag-3.6.2.jar;%APP_HOME%\lib\spring-boot-starter-web-2.5.5.jar;%APP_HOME%\lib\spring-boot-starter-thymeleaf-2.5.5.jar;%APP_HOME%\lib\spring-boot-starter-json-2.5.5.jar;%APP_HOME%\lib\spring-boot-starter-2.5.5.jar;%APP_HOME%\lib\guava-30.1.1-android.jar;%APP_HOME%\lib\protobuf-java-3.17.3.jar;%APP_HOME%\lib\protobuf-java-util-3.17.3.jar;%APP_HOME%\lib\auto-value-annotations-1.8.1.jar;%APP_HOME%\lib\proto-google-cloud-language-v1-1.85.2.jar;%APP_HOME%\lib\proto-google-cloud-language-v1beta2-0.86.2.jar;%APP_HOME%\lib\google-auth-library-credentials-0.26.0.jar;%APP_HOME%\lib\google-auth-library-oauth2-http-0.26.0.jar;%APP_HOME%\lib\google-http-client-1.39.2.jar;%APP_HOME%\lib\google-http-client-gson-1.39.2.jar;%APP_HOME%\lib\grpc-alts-1.39.0.jar;%APP_HOME%\lib\grpc-api-1.39.0.jar;%APP_HOME%\lib\grpc-auth-1.39.0.jar;%APP_HOME%\lib\grpc-context-1.39.0.jar;%APP_HOME%\lib\grpc-core-1.39.0.jar;%APP_HOME%\lib\grpc-grpclb-1.39.0.jar;%APP_HOME%\lib\grpc-netty-shaded-1.39.0.jar;%APP_HOME%\lib\grpc-protobuf-1.39.0.jar;%APP_HOME%\lib\grpc-protobuf-lite-1.39.0.jar;%APP_HOME%\lib\grpc-stub-1.39.0.jar;%APP_HOME%\lib\api-common-1.10.4.jar;%APP_HOME%\lib\gax-1.66.0.jar;%APP_HOME%\lib\gax-grpc-1.66.0.jar;%APP_HOME%\lib\proto-google-common-protos-2.3.2.jar;%APP_HOME%\lib\trove4j-3.0.3.jar;%APP_HOME%\lib\jackson-datatype-jsr310-2.12.5.jar;%APP_HOME%\lib\jackson-annotations-2.12.5.jar;%APP_HOME%\lib\jackson-datatype-jdk8-2.12.5.jar;%APP_HOME%\lib\jackson-module-parameter-names-2.12.5.jar;%APP_HOME%\lib\jackson-core-2.12.5.jar;%APP_HOME%\lib\jackson-databind-2.12.5.jar;%APP_HOME%\lib\jsr305-3.0.2.jar;%APP_HOME%\lib\annotations-16.0.1.jar;%APP_HOME%\lib\thymeleaf-spring5-3.0.12.RELEASE.jar;%APP_HOME%\lib\thymeleaf-extras-java8time-3.0.4.RELEASE.jar;%APP_HOME%\lib\spring-boot-starter-logging-2.5.5.jar;%APP_HOME%\lib\logback-classic-1.2.6.jar;%APP_HOME%\lib\log4j-to-slf4j-2.14.1.jar;%APP_HOME%\lib\jul-to-slf4j-1.7.32.jar;%APP_HOME%\lib\thymeleaf-3.0.12.RELEASE.jar;%APP_HOME%\lib\slf4j-api-1.7.32.jar;%APP_HOME%\lib\nv-websocket-client-2.14.jar;%APP_HOME%\lib\okhttp-3.14.9.jar;%APP_HOME%\lib\opus-java-1.1.0.pom;%APP_HOME%\lib\commons-collections4-4.1.jar;%APP_HOME%\lib\spring-boot-autoconfigure-2.5.5.jar;%APP_HOME%\lib\spring-boot-2.5.5.jar;%APP_HOME%\lib\spring-boot-starter-tomcat-2.5.5.jar;%APP_HOME%\lib\jakarta.annotation-api-1.3.5.jar;%APP_HOME%\lib\spring-webmvc-5.3.10.jar;%APP_HOME%\lib\spring-web-5.3.10.jar;%APP_HOME%\lib\spring-context-5.3.10.jar;%APP_HOME%\lib\spring-aop-5.3.10.jar;%APP_HOME%\lib\spring-beans-5.3.10.jar;%APP_HOME%\lib\spring-expression-5.3.10.jar;%APP_HOME%\lib\spring-core-5.3.10.jar;%APP_HOME%\lib\snakeyaml-1.28.jar;%APP_HOME%\lib\javax.annotation-api-1.3.2.jar;%APP_HOME%\lib\failureaccess-1.0.1.jar;%APP_HOME%\lib\listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar;%APP_HOME%\lib\checker-compat-qual-2.5.5.jar;%APP_HOME%\lib\error_prone_annotations-2.7.1.jar;%APP_HOME%\lib\j2objc-annotations-1.3.jar;%APP_HOME%\lib\httpclient-4.5.13.jar;%APP_HOME%\lib\commons-logging-1.2.jar;%APP_HOME%\lib\commons-codec-1.15.jar;%APP_HOME%\lib\httpcore-4.4.14.jar;%APP_HOME%\lib\opencensus-contrib-http-util-0.28.0.jar;%APP_HOME%\lib\gson-2.8.8.jar;%APP_HOME%\lib\opencensus-api-0.28.0.jar;%APP_HOME%\lib\perfmark-api-0.23.0.jar;%APP_HOME%\lib\annotations-4.1.1.4.jar;%APP_HOME%\lib\animal-sniffer-annotations-1.20.jar;%APP_HOME%\lib\conscrypt-openjdk-uber-2.5.1.jar;%APP_HOME%\lib\threetenbp-1.5.1.jar;%APP_HOME%\lib\okio-1.17.2.jar;%APP_HOME%\lib\opus-java-api-1.1.0.jar;%APP_HOME%\lib\opus-java-natives-1.1.0.jar;%APP_HOME%\lib\spring-jcl-5.3.10.jar;%APP_HOME%\lib\tomcat-embed-websocket-9.0.53.jar;%APP_HOME%\lib\tomcat-embed-core-9.0.53.jar;%APP_HOME%\lib\tomcat-embed-el-9.0.53.jar;%APP_HOME%\lib\jna-4.4.0.jar;%APP_HOME%\lib\logback-core-1.2.6.jar;%APP_HOME%\lib\log4j-api-2.14.1.jar;%APP_HOME%\lib\attoparser-2.0.5.RELEASE.jar;%APP_HOME%\lib\unbescape-1.1.6.RELEASE.jar
+set CLASSPATH=%APP_HOME%\lib\Flames-SNAPSHOT-4.3a.jar;%APP_HOME%\lib\JDA-4.3.0_277.jar;%APP_HOME%\lib\google-cloud-language-2.0.2.jar;%APP_HOME%\lib\bugsnag-3.6.2.jar;%APP_HOME%\lib\protobuf-java-3.17.3.jar;%APP_HOME%\lib\protobuf-java-util-3.17.3.jar;%APP_HOME%\lib\auto-value-annotations-1.8.2.jar;%APP_HOME%\lib\proto-google-cloud-language-v1-2.0.2.jar;%APP_HOME%\lib\proto-google-cloud-language-v1beta2-0.87.2.jar;%APP_HOME%\lib\google-auth-library-credentials-1.1.0.jar;%APP_HOME%\lib\google-auth-library-oauth2-http-1.1.0.jar;%APP_HOME%\lib\guava-30.1.1-jre.jar;%APP_HOME%\lib\google-http-client-1.39.2.jar;%APP_HOME%\lib\google-http-client-gson-1.39.2.jar;%APP_HOME%\lib\grpc-alts-1.40.0.jar;%APP_HOME%\lib\grpc-api-1.40.0.jar;%APP_HOME%\lib\grpc-auth-1.40.0.jar;%APP_HOME%\lib\grpc-context-1.40.0.jar;%APP_HOME%\lib\grpc-core-1.40.0.jar;%APP_HOME%\lib\grpc-grpclb-1.40.0.jar;%APP_HOME%\lib\grpc-netty-shaded-1.40.0.jar;%APP_HOME%\lib\grpc-protobuf-1.40.0.jar;%APP_HOME%\lib\grpc-protobuf-lite-1.40.0.jar;%APP_HOME%\lib\grpc-stub-1.40.0.jar;%APP_HOME%\lib\api-common-2.0.1.jar;%APP_HOME%\lib\gax-2.3.0.jar;%APP_HOME%\lib\gax-grpc-2.3.0.jar;%APP_HOME%\lib\proto-google-common-protos-2.3.2.jar;%APP_HOME%\lib\trove4j-3.0.3.jar;%APP_HOME%\lib\jackson-databind-2.10.1.jar;%APP_HOME%\lib\jsr305-3.0.2.jar;%APP_HOME%\lib\annotations-16.0.1.jar;%APP_HOME%\lib\slf4j-api-1.7.25.jar;%APP_HOME%\lib\nv-websocket-client-2.14.jar;%APP_HOME%\lib\okhttp-3.13.0.jar;%APP_HOME%\lib\opus-java-1.1.0.pom;%APP_HOME%\lib\commons-collections4-4.1.jar;%APP_HOME%\lib\javax.annotation-api-1.3.2.jar;%APP_HOME%\lib\failureaccess-1.0.1.jar;%APP_HOME%\lib\listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar;%APP_HOME%\lib\checker-qual-3.8.0.jar;%APP_HOME%\lib\error_prone_annotations-2.9.0.jar;%APP_HOME%\lib\j2objc-annotations-1.3.jar;%APP_HOME%\lib\httpclient-4.5.13.jar;%APP_HOME%\lib\commons-logging-1.2.jar;%APP_HOME%\lib\commons-codec-1.15.jar;%APP_HOME%\lib\httpcore-4.4.14.jar;%APP_HOME%\lib\opencensus-contrib-http-util-0.28.0.jar;%APP_HOME%\lib\gson-2.8.8.jar;%APP_HOME%\lib\opencensus-api-0.28.0.jar;%APP_HOME%\lib\perfmark-api-0.23.0.jar;%APP_HOME%\lib\annotations-4.1.1.4.jar;%APP_HOME%\lib\animal-sniffer-annotations-1.20.jar;%APP_HOME%\lib\conscrypt-openjdk-uber-2.5.1.jar;%APP_HOME%\lib\threetenbp-1.5.1.jar;%APP_HOME%\lib\jackson-annotations-2.10.1.jar;%APP_HOME%\lib\jackson-core-2.10.1.jar;%APP_HOME%\lib\okio-1.17.2.jar;%APP_HOME%\lib\opus-java-api-1.1.0.jar;%APP_HOME%\lib\opus-java-natives-1.1.0.jar;%APP_HOME%\lib\jna-4.4.0.jar
 
 
 @rem Execute Flames

diff --git a/build/scriptsShadow/Flames b/build/scriptsShadow/Flames
@@ -64,7 +64,7 @@ case "`uname`" in
     ;;
 esac
 
-CLASSPATH=$APP_HOME/lib/Flames-4.2-all.jar
+CLASSPATH=$APP_HOME/lib/Flames-SNAPSHOT-4.3a-all.jar
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then

diff --git a/build/scriptsShadow/Flames.bat b/build/scriptsShadow/Flames.bat
@@ -63,7 +63,7 @@ set CMD_LINE_ARGS=%*
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\lib\Flames-4.2-all.jar
+set CLASSPATH=%APP_HOME%\lib\Flames-SNAPSHOT-4.3a-all.jar
 
 @rem Execute Flames
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %FLAMES_OPTS%  -jar "%CLASSPATH%" %CMD_LINE_ARGS%

diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1,2 @@
 rootProject.name = 'Flames'
+
diff --git a/src/main/java/com/severalcircles/flames/api/DataController.java b/src/main/java/com/severalcircles/flames/api/DataController.java