mongo uri auth now

98ping · Jan 4, 2023 · 0401e48 · 0401e48
1 parent 6c50912
commit 0401e48
Show file tree

Hide file tree

Showing 88 changed files with 33 additions and 12 deletions.
diff --git a/.gradle/7.1/executionHistory/executionHistory.bin b/.gradle/7.1/executionHistory/executionHistory.bin
diff --git a/.gradle/7.1/executionHistory/executionHistory.lock b/.gradle/7.1/executionHistory/executionHistory.lock
diff --git a/.gradle/7.1/fileHashes/fileHashes.bin b/.gradle/7.1/fileHashes/fileHashes.bin
diff --git a/.gradle/7.1/fileHashes/fileHashes.lock b/.gradle/7.1/fileHashes/fileHashes.lock
diff --git a/.gradle/7.1/fileHashes/resourceHashesCache.bin b/.gradle/7.1/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/sha1-checksums.bin b/.gradle/checksums/sha1-checksums.bin
diff --git a/.idea/codestream.xml b/.idea/codestream.xml
diff --git a/...ild/classes/kotlin/main/ltd/matrixstudios/alchemist/AlchemistSpigotPlugin$Companion.class b/...ild/classes/kotlin/main/ltd/matrixstudios/alchemist/AlchemistSpigotPlugin$Companion.class
diff --git a/...ld/classes/kotlin/main/ltd/matrixstudios/alchemist/AlchemistSpigotPlugin$onEnable$1.class b/...ld/classes/kotlin/main/ltd/matrixstudios/alchemist/AlchemistSpigotPlugin$onEnable$1.class
diff --git a/spigot/build/classes/kotlin/main/ltd/matrixstudios/alchemist/AlchemistSpigotPlugin.class b/spigot/build/classes/kotlin/main/ltd/matrixstudios/alchemist/AlchemistSpigotPlugin.class
diff --git a/spigot/build/kotlin/compileKotlin/build-history.bin b/spigot/build/kotlin/compileKotlin/build-history.bin
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.keystream b/spigot/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.keystream
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len b/spigot/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.len b/spigot/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.len
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at b/spigot/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab_i b/spigot/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab_i
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.keystream b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.keystream
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.keystream.len b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.keystream.len
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.len b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.len
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.values.at b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.values.at
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab_i b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab_i
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
diff --git a/...ot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream b/...ot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream
diff --git a/...uild/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len b/...uild/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len
diff --git a/...ot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at b/...ot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab
diff --git a/...ot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream b/...ot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream
diff --git a/...uild/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len b/...uild/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len
diff --git a/...ot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/...ot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.len b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.len
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab_i b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab_i
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab.len b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab.len
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i b/spigot/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab
@@ -1,2 +1,2 @@
-339
+179
 0
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.keystream b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.keystream
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.len b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.len
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab_i b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab_i
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.s b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.s
@@ -1 +1 @@
-Ǹ㗘淥영훊ǂ�힑˃훵Ǿ！Ǿ쨁ǜ更ǪǾǍǶ쌁
+��G�m�
diff --git a/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i b/spigot/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i
diff --git a/spigot/build/kotlin/compileKotlin/last-build.bin b/spigot/build/kotlin/compileKotlin/last-build.bin
diff --git a/spigot/build/resources/main/config.yml b/spigot/build/resources/main/config.yml
@@ -8,6 +8,9 @@ mongo:
   authDB: ""
   database: "Alchemist"
 
+#leave blank to not use!
+uri: ""
+
 #all redis information. This is used for messaging from server to server
 redis:
   host: "127.0.0.1"

diff --git a/spigot/build/tmp/kapt3/incApCache/main/classpath-structure.bin b/spigot/build/tmp/kapt3/incApCache/main/classpath-structure.bin
diff --git a/spigot/build/tmp/kapt3/incApCache/main/java-cache.bin b/spigot/build/tmp/kapt3/incApCache/main/java-cache.bin
diff --git a/spigot/lib/honey.jar b/spigot/lib/honey.jar
diff --git a/spigot/src/main/kotlin/ltd/matrixstudios/alchemist/AlchemistSpigotPlugin.kt b/spigot/src/main/kotlin/ltd/matrixstudios/alchemist/AlchemistSpigotPlugin.kt
@@ -3,6 +3,7 @@ package ltd.matrixstudios.alchemist
 import co.aikar.commands.PaperCommandManager
 import io.github.nosequel.data.connection.mongo.AuthenticatedMongoConnectionPool
 import io.github.nosequel.data.connection.mongo.NoAuthMongoConnectionPool
+import io.github.nosequel.data.connection.mongo.URIMongoConnectionPool
 import ltd.matrixstudios.alchemist.aikar.ACFCommandController
 import ltd.matrixstudios.alchemist.commands.grants.*
 import ltd.matrixstudios.alchemist.commands.player.*
@@ -52,8 +53,22 @@ class AlchemistSpigotPlugin : JavaPlugin() {
 
         val startMongo = System.currentTimeMillis()
         val authEnabled = config.getBoolean("mongo.auth")
+        val uri = config.getString("uri")
 
-        if (authEnabled) {
+        if (uri != "") {
+            val connectionPool = URIMongoConnectionPool().apply {
+                this.databaseName = config.getString("mongo.database")
+                this.uri = uri
+
+            }
+
+            Alchemist.start(connectionPool,
+                config.getString("redis.host"),
+                config.getInt("redis.port"),
+                (if (config.getString("redis.username") == "") null else config.getString("redis.username")),
+                (if (config.getString("redis.password") == "") null else config.getString("redis.password"))
+            )
+        } else if (authEnabled) {
             val connectionPool = AuthenticatedMongoConnectionPool().apply {
                 hostname = config.getString("mongo.host")
                 password = config.getString("mongo.password")

diff --git a/spigot/src/main/resources/config.yml b/spigot/src/main/resources/config.yml
@@ -8,6 +8,9 @@ mongo:
   authDB: ""
   database: "Alchemist"
 
+#leave blank to not use!
+uri: ""
+
 #all redis information. This is used for messaging from server to server
 redis:
   host: "127.0.0.1"