Merge remote-tracking branch 'origin/master' into brigadier

2 files changed, 52 insertions, 0 deletions

diff --git a/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.kt b/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.kt
index 7647ca2c..805ff114 100644
--- a/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.kt
+++ b/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.kt
@@ -212,6 +212,16 @@ class DevTestCommand {
                 MiscUtils.copyToClipboard(tabList)
                 reply("Copied tablist to clipboard!")
             }.withHelp("Copy the tab list")
+            thenLiteralExecute("useragent") {
+                thenArgumentExecute("newuseragent", RestArgumentType) { userAgent ->
+                    reply("Setting your user agent to ${this[userAgent]}")
+                    NotEnoughUpdates.INSTANCE.config.hidden.customUserAgent = this[userAgent]
+                }.withHelp("Set a custom user agent for all HTTP requests")
+                thenExecute {
+                    reply("Resetting your user agent.")
+                    NotEnoughUpdates.INSTANCE.config.hidden.customUserAgent = null
+                }
+            }.withHelp("Reset the custom user agent")
         }
         hook.beforeCommand = Predicate {
             if (!canPlayerExecute(it.context.source)) {
diff --git a/src/main/kotlin/io/github/moulberry/notenoughupdates/events/ProfileDataLoadedEvent.kt b/src/main/kotlin/io/github/moulberry/notenoughupdates/events/ProfileDataLoadedEvent.kt
new file mode 100644
index 00000000..00a535c6
--- /dev/null
+++ b/src/main/kotlin/io/github/moulberry/notenoughupdates/events/ProfileDataLoadedEvent.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2022 NotEnoughUpdates contributors
+ *
+ * This file is part of NotEnoughUpdates.
+ *
+ * NotEnoughUpdates is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * NotEnoughUpdates is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with NotEnoughUpdates. If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.github.moulberry.notenoughupdates.events
+
+import com.google.gson.JsonObject
+
+//TODO extend the usage of this event (accessory bag and storage data)
+class ProfileDataLoadedEvent(val uuid: String, val data: JsonObject?) : NEUEvent() {
+    val profileInfo: JsonObject? by lazy { readProfileInfo() }
+
+    private fun readProfileInfo(): JsonObject? {
+        if (data == null) return null
+
+        val skyblockProfiles = data["profiles"].asJsonArray
+        for (profileEle in skyblockProfiles) {
+            val profile = profileEle.asJsonObject
+            if (!profile.has("members")) continue
+            val members = profile["members"].asJsonObject
+            if (!members.has(uuid)) continue
+            if (profile.has("selected") && profile["selected"].asBoolean) {
+                return members[uuid].asJsonObject
+            }
+        }
+        return null
+    }
+}