Merge pull request #113 from colorfulFlames/v6

V6
colorfulFlames · Oct 25, 2022 · f874fba · f874fba
2 parents 28aa16d + 0845b76
commit f874fba
Show file tree

Hide file tree

Showing 146 changed files with 1,595 additions and 600 deletions.
diff --git a/.github/workflows/gradle-javadoc.yml b/.github/workflows/gradle-javadoc.yml
@@ -31,7 +31,7 @@ jobs:
     # The USERNAME and TOKEN need to correspond to the credentials environment variables used in
     # the publishing section of your build.gradle
     - name: Build Javadoc
-      run: gradle javadoc
+      run: gradle javadoc -Xdoclint:none
     - name: Copy Javadoc to Pages
       run: cp -R ./build/docs/javadoc/* ./docs
     - name: Commit files

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/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock
diff --git a/.gradle/checksums/md5-checksums.bin b/.gradle/checksums/md5-checksums.bin
diff --git a/.gradle/checksums/sha1-checksums.bin b/.gradle/checksums/sha1-checksums.bin
diff --git a/.idea/encodings.xml~release_v6 b/.idea/encodings.xml~release_v6
diff --git a/.idea/resourceBundles.xml b/.idea/resourceBundles.xml
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Aidan Veney
+Copyright (c) 2021-2022 Aidan Veney
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/build.gradle b/build.gradle
@@ -8,8 +8,8 @@ plugins {
 }
 
 mainClassName = 'com.severalcircles.flames.Flames'
-version '6.0'
-def jdaVersion = '4.3.0_277'
+version '6.4.1c'
+def jdaVersion = '5.0.0-alpha.9'
 
 sourceCompatibility = targetCompatibility = 1.8
 group 'com.severalcircles.flames'
@@ -33,11 +33,11 @@ task createProperties(dependsOn: processResources) {
 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 platform('com.google.cloud:libraries-bom:24.3.0')
+    implementation 'com.google.cloud:google-cloud-dialogflow'
     implementation 'com.google.cloud:google-cloud-language:2.1.4'
     implementation 'com.bugsnag:bugsnag:3.6.2'
-
 }
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/scripts/Flames b/build/scripts/Flames
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/lib/Flames-6.0.jar:$APP_HOME/lib/JDA-4.3.0_277.jar:$APP_HOME/lib/google-cloud-language-2.1.4.jar:$APP_HOME/lib/bugsnag-3.6.2.jar:$APP_HOME/lib/protobuf-java-3.19.1.jar:$APP_HOME/lib/protobuf-java-util-3.19.1.jar:$APP_HOME/lib/auto-value-annotations-1.8.2.jar:$APP_HOME/lib/proto-google-cloud-language-v1-2.1.4.jar:$APP_HOME/lib/proto-google-cloud-language-v1beta2-0.88.4.jar:$APP_HOME/lib/google-auth-library-credentials-1.3.0.jar:$APP_HOME/lib/google-auth-library-oauth2-http-1.3.0.jar:$APP_HOME/lib/guava-31.0.1-jre.jar:$APP_HOME/lib/google-http-client-1.40.1.jar:$APP_HOME/lib/google-http-client-gson-1.40.1.jar:$APP_HOME/lib/grpc-alts-1.42.1.jar:$APP_HOME/lib/grpc-api-1.42.1.jar:$APP_HOME/lib/grpc-auth-1.42.1.jar:$APP_HOME/lib/grpc-context-1.42.1.jar:$APP_HOME/lib/grpc-core-1.42.1.jar:$APP_HOME/lib/grpc-grpclb-1.42.1.jar:$APP_HOME/lib/grpc-netty-shaded-1.42.1.jar:$APP_HOME/lib/grpc-protobuf-1.42.1.jar:$APP_HOME/lib/grpc-protobuf-lite-1.42.1.jar:$APP_HOME/lib/grpc-services-1.42.1.jar:$APP_HOME/lib/grpc-stub-1.42.1.jar:$APP_HOME/lib/api-common-2.1.1.jar:$APP_HOME/lib/gax-2.7.1.jar:$APP_HOME/lib/gax-grpc-2.7.1.jar:$APP_HOME/lib/proto-google-common-protos-2.7.0.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.19.0.jar:$APP_HOME/lib/error_prone_annotations-2.10.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/opencensus-api-0.28.0.jar:$APP_HOME/lib/conscrypt-openjdk-uber-2.5.1.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/grpc-xds-1.42.1.jar:$APP_HOME/lib/gson-2.8.9.jar:$APP_HOME/lib/re2j-1.5.jar:$APP_HOME/lib/bcpkix-jdk15on-1.67.jar:$APP_HOME/lib/bcprov-jdk15on-1.67.jar:$APP_HOME/lib/opencensus-proto-0.2.0.jar:$APP_HOME/lib/threetenbp-1.5.2.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
+CLASSPATH=$APP_HOME/lib/Flames-6.4.1c.jar:$APP_HOME/lib/JDA-5.0.0-alpha.9.jar:$APP_HOME/lib/google-cloud-dialogflow-4.5.0.jar:$APP_HOME/lib/google-cloud-language-2.1.6.jar:$APP_HOME/lib/bugsnag-3.6.2.jar:$APP_HOME/lib/protobuf-java-3.19.3.jar:$APP_HOME/lib/protobuf-java-util-3.19.3.jar:$APP_HOME/lib/proto-google-cloud-dialogflow-v2-4.5.0.jar:$APP_HOME/lib/proto-google-cloud-dialogflow-v2beta1-0.103.0.jar:$APP_HOME/lib/auto-value-annotations-1.9.jar:$APP_HOME/lib/proto-google-cloud-language-v1-2.1.6.jar:$APP_HOME/lib/proto-google-cloud-language-v1beta2-0.88.6.jar:$APP_HOME/lib/google-auth-library-credentials-1.4.0.jar:$APP_HOME/lib/google-auth-library-oauth2-http-1.4.0.jar:$APP_HOME/lib/guava-31.0.1-jre.jar:$APP_HOME/lib/google-http-client-1.41.2.jar:$APP_HOME/lib/google-http-client-gson-1.41.2.jar:$APP_HOME/lib/grpc-alts-1.44.0.jar:$APP_HOME/lib/grpc-api-1.44.0.jar:$APP_HOME/lib/grpc-auth-1.44.0.jar:$APP_HOME/lib/grpc-context-1.44.0.jar:$APP_HOME/lib/grpc-core-1.44.0.jar:$APP_HOME/lib/grpc-grpclb-1.44.0.jar:$APP_HOME/lib/grpc-netty-shaded-1.44.0.jar:$APP_HOME/lib/grpc-protobuf-1.44.0.jar:$APP_HOME/lib/grpc-protobuf-lite-1.44.0.jar:$APP_HOME/lib/grpc-services-1.44.0.jar:$APP_HOME/lib/grpc-stub-1.44.0.jar:$APP_HOME/lib/api-common-2.1.3.jar:$APP_HOME/lib/gax-2.11.0.jar:$APP_HOME/lib/gax-grpc-2.11.0.jar:$APP_HOME/lib/proto-google-common-protos-2.7.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.1.jar:$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.21.1.jar:$APP_HOME/lib/error_prone_annotations-2.11.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.15.jar:$APP_HOME/lib/opencensus-contrib-http-util-0.31.0.jar:$APP_HOME/lib/opencensus-api-0.31.0.jar:$APP_HOME/lib/conscrypt-openjdk-uber-2.5.1.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/grpc-xds-1.44.0.jar:$APP_HOME/lib/gson-2.8.9.jar:$APP_HOME/lib/re2j-1.5.jar:$APP_HOME/lib/bcpkix-jdk15on-1.67.jar:$APP_HOME/lib/bcprov-jdk15on-1.67.jar:$APP_HOME/lib/opencensus-proto-0.2.0.jar:$APP_HOME/lib/threetenbp-1.5.2.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.1.jar:$APP_HOME/lib/opus-java-natives-1.1.1.jar:$APP_HOME/lib/jna-4.4.0.jar
 
 
 # Determine the Java command to use to start the JVM.