Add tapcubed stufftapcube

[no changelog]

2 files changed, 59 insertions, 56 deletions

diff --git a/src/main/kotlin/util/SBData.kt b/src/main/kotlin/util/SBData.kt
index 353bb06..8b3ad96 100644
--- a/src/main/kotlin/util/SBData.kt
+++ b/src/main/kotlin/util/SBData.kt
@@ -9,59 +9,62 @@ import moe.nea.firmament.events.AllowChatEvent
 import moe.nea.firmament.events.ProcessChatEvent
 import moe.nea.firmament.events.ServerConnectedEvent
 import moe.nea.firmament.events.SkyblockServerUpdateEvent
-import moe.nea.firmament.events.WorldReadyEvent
 
 object SBData {
-    private val profileRegex = "Profile ID: ([a-z0-9\\-]+)".toRegex()
-    val profileSuggestTexts = listOf(
-        "CLICK THIS TO SUGGEST IT IN CHAT [DASHES]",
-        "CLICK THIS TO SUGGEST IT IN CHAT [NO DASHES]",
-    )
-    var profileId: UUID? = null
+	private val profileRegex = "Profile ID: ([a-z0-9\\-]+)".toRegex()
+	val profileSuggestTexts = listOf(
+		"CLICK THIS TO SUGGEST IT IN CHAT [DASHES]",
+		"CLICK THIS TO SUGGEST IT IN CHAT [NO DASHES]",
+	)
+	var profileId: UUID? = null
+	val genericProfileId: String? get() = if (isTabCube) "tabcube-${MC.instance.session.uuidOrNull}" else profileId?.toString()
 
-    private var hasReceivedProfile = false
-    var locraw: Locraw? = null
-    val skyblockLocation: SkyBlockIsland? get() = locraw?.skyblockLocation
-    val hasValidLocraw get() = locraw?.server !in listOf("limbo", null)
-    val isOnSkyblock get() = locraw?.gametype == "SKYBLOCK"
-    var profileIdCommandDebounce = TimeMark.farPast()
-    fun init() {
-        ServerConnectedEvent.subscribe("SBData:onServerConnected") {
-            HypixelModAPI.getInstance().subscribeToEventPacket(ClientboundLocationPacket::class.java)
-        }
-        HypixelModAPI.getInstance().createHandler(ClientboundLocationPacket::class.java) {
-            MC.onMainThread {
-                val lastLocraw = locraw
-                locraw = Locraw(it.serverName,
-                                it.serverType.getOrNull()?.name?.uppercase(),
-                                it.mode.getOrNull(),
-                                it.map.getOrNull())
-                SkyblockServerUpdateEvent.publish(SkyblockServerUpdateEvent(lastLocraw, null))
-                profileIdCommandDebounce = TimeMark.now()
-            }
-        }
-        SkyblockServerUpdateEvent.subscribe("SBData:sendProfileId") {
-            if (!hasReceivedProfile && isOnSkyblock && profileIdCommandDebounce.passedTime() > 10.seconds) {
-                profileIdCommandDebounce = TimeMark.now()
-                MC.sendServerCommand("profileid")
-            }
-        }
-        AllowChatEvent.subscribe("SBData:hideProfileSuggest") { event ->
-            if (event.unformattedString in profileSuggestTexts && profileIdCommandDebounce.passedTime() < 5.seconds) {
-                event.cancel()
-            }
-        }
-        ProcessChatEvent.subscribe(receivesCancelled = true, "SBData:loadProfile") { event ->
-            val profileMatch = profileRegex.matchEntire(event.unformattedString)
-            if (profileMatch != null) {
-                try {
-                    profileId = UUID.fromString(profileMatch.groupValues[1])
-                    hasReceivedProfile = true
-                } catch (e: IllegalArgumentException) {
-                    profileId = null
-                    e.printStackTrace()
-                }
-            }
-        }
-    }
+	private var hasReceivedProfile = false
+	var locraw: Locraw? = null
+	val skyblockLocation: SkyBlockIsland? get() = locraw?.skyblockLocation
+	val hasValidLocraw get() = locraw?.server !in listOf("limbo", null)
+	val isOnSkyblock get() = locraw?.gametype == "SKYBLOCK"
+	var profileIdCommandDebounce = TimeMark.farPast()
+	val connectionAddress: String? get() = MC.networkHandler?.serverInfo?.address
+	val isTabCube get() = connectionAddress == "tapcube.minehut.gg"
+
+	fun init() {
+		ServerConnectedEvent.subscribe("SBData:onServerConnected") {
+			HypixelModAPI.getInstance().subscribeToEventPacket(ClientboundLocationPacket::class.java)
+		}
+		HypixelModAPI.getInstance().createHandler(ClientboundLocationPacket::class.java) {
+			MC.onMainThread {
+				val lastLocraw = locraw
+				locraw = Locraw(it.serverName,
+				                it.serverType.getOrNull()?.name?.uppercase(),
+				                it.mode.getOrNull(),
+				                it.map.getOrNull())
+				SkyblockServerUpdateEvent.publish(SkyblockServerUpdateEvent(lastLocraw, null))
+				profileIdCommandDebounce = TimeMark.now()
+			}
+		}
+		SkyblockServerUpdateEvent.subscribe("SBData:sendProfileId") {
+			if (!hasReceivedProfile && isOnSkyblock && profileIdCommandDebounce.passedTime() > 10.seconds) {
+				profileIdCommandDebounce = TimeMark.now()
+				MC.sendServerCommand("profileid")
+			}
+		}
+		AllowChatEvent.subscribe("SBData:hideProfileSuggest") { event ->
+			if (event.unformattedString in profileSuggestTexts && profileIdCommandDebounce.passedTime() < 5.seconds) {
+				event.cancel()
+			}
+		}
+		ProcessChatEvent.subscribe(receivesCancelled = true, "SBData:loadProfile") { event ->
+			val profileMatch = profileRegex.matchEntire(event.unformattedString)
+			if (profileMatch != null) {
+				try {
+					profileId = UUID.fromString(profileMatch.groupValues[1])
+					hasReceivedProfile = true
+				} catch (e: IllegalArgumentException) {
+					profileId = null
+					e.printStackTrace()
+				}
+			}
+		}
+	}
 }
diff --git a/src/main/kotlin/util/data/ProfileSpecificDataHolder.kt b/src/main/kotlin/util/data/ProfileSpecificDataHolder.kt
index 1cd4f22..2566e4c 100644
--- a/src/main/kotlin/util/data/ProfileSpecificDataHolder.kt
+++ b/src/main/kotlin/util/data/ProfileSpecificDataHolder.kt
@@ -22,10 +22,10 @@ abstract class ProfileSpecificDataHolder<S>(
     private val configDefault: () -> S
 ) : IDataHolder<S?> {
 
-    var allConfigs: MutableMap<UUID, S>
+    var allConfigs: MutableMap<String, S>
 
     override val data: S?
-        get() = SBData.profileId?.let {
+        get() = SBData.genericProfileId?.let {
             allConfigs.computeIfAbsent(it) { configDefault() }
         }
 
@@ -36,7 +36,7 @@ abstract class ProfileSpecificDataHolder<S>(
 
     private val configDirectory: Path get() = Firmament.CONFIG_DIR.resolve("profiles").resolve(configName)
 
-    private fun readValues(): MutableMap<UUID, S> {
+    private fun readValues(): MutableMap<String, S> {
         if (!configDirectory.exists()) {
             configDirectory.createDirectories()
         }
@@ -45,7 +45,7 @@ abstract class ProfileSpecificDataHolder<S>(
             .filter { it.extension == "json" }
             .mapNotNull {
                 try {
-                    UUID.fromString(it.nameWithoutExtension) to Firmament.json.decodeFromString(dataSerializer, it.readText())
+                    (it.nameWithoutExtension) to Firmament.json.decodeFromString(dataSerializer, it.readText())
                 } catch (e: Exception) { /* Expecting IOException and SerializationException, but Kotlin doesn't allow multi catches*/
                     IDataHolder.badLoads.add(configName)
                     Firmament.logger.error(