Fix iota renderers being cached when they shouldn't be

Author: object-Object

Common/src/main/kotlin/gay/object/hexdebug/HexDebugClient.kt

@@ -5,6 +5,7 @@ import at.petrak.hexcasting.api.client.ScryingLensOverlayRegistry
 import at.petrak.hexcasting.api.utils.asTextComponent
 import at.petrak.hexcasting.api.utils.gray
 import at.petrak.hexcasting.api.utils.plusAssign
+import dev.architectury.event.events.client.ClientPlayerEvent
 import gay.`object`.hexdebug.HexDebug.LOGGER
 import gay.`object`.hexdebug.adapter.proxy.DebugProxyClient
 import gay.`object`.hexdebug.api.client.splicing.SplicingTableIotaRenderers
@@ -13,6 +14,7 @@ import gay.`object`.hexdebug.config.HexDebugClientConfig
 import gay.`object`.hexdebug.config.HexDebugServerConfig
 import gay.`object`.hexdebug.gui.splicing.renderers.*
 import gay.`object`.hexdebug.gui.splicing.renderers.conditional.IfPathExistsRendererProvider
+import gay.`object`.hexdebug.gui.splicing.widgets.BaseIotaButton
 import gay.`object`.hexdebug.registry.HexDebugBlocks
 import gay.`object`.hexdebug.utils.styledHoverName
 import gay.`object`.hexdebug.utils.toComponent
@@ -22,6 +24,7 @@ import net.minecraft.client.gui.screens.Screen
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.network.chat.Component
 import net.minecraft.network.chat.Style
+import net.minecraft.world.InteractionResult
 import net.minecraft.world.item.Item
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.Items
@@ -39,6 +42,7 @@ object HexDebugClient {
         DebugProxyClient.init()
         addScryingLensOverlays()
         registerSplicingTableIotaRenderers()
+        invalidateIotaRendererCacheWhenThingsHappenThatShouldInvalidateIt()
     }
 
     fun getConfigScreen(parent: Screen): Screen {
@@ -104,4 +108,17 @@ object HexDebugClient {
             SplicingTableIotaRenderers.register(HexDebug.id(name), parser)
         }
     }
+
+    private fun invalidateIotaRendererCacheWhenThingsHappenThatShouldInvalidateIt() {
+        // for rainbow bracket configs
+        HexDebugClientConfig.holder.registerSaveListener { _, _ ->
+            BaseIotaButton.invalidateRendererCache()
+            InteractionResult.PASS
+        }
+
+        // cached iotas from one world are probably not applicable to others
+        ClientPlayerEvent.CLIENT_PLAYER_QUIT.register {
+            BaseIotaButton.invalidateRendererCache()
+        }
+    }
 }

Common/src/main/kotlin/gay/object/hexdebug/gui/splicing/widgets/BaseIotaButton.kt

@@ -9,8 +9,9 @@ import gay.`object`.hexdebug.api.client.splicing.SplicingTableIotaRenderer
 import gay.`object`.hexdebug.api.client.splicing.SplicingTableIotaRenderers
 import gay.`object`.hexdebug.api.splicing.SplicingTableIotaClientView
 import net.minecraft.client.gui.GuiGraphics
-import net.minecraft.client.gui.components.Tooltip
 import net.minecraft.network.chat.Component
+import java.util.*
+import kotlin.jvm.optionals.getOrNull
 
 abstract class BaseIotaButton(x: Int, y: Int) : HexagonButton(
     x = x,
@@ -61,25 +62,30 @@ abstract class BaseIotaButton(x: Int, y: Int) : HexagonButton(
 
         active = true
 
-        val (renderer, tooltip) = rendererCache.get(iotaView) {
-            try {
-                val renderer = SplicingTableIotaRenderers.getProvider(iotaType)
-                    ?.createRenderer(iotaType, iotaView, x, y)
-                renderer to renderer?.createTooltip()
-            } catch (e: Exception) {
-                HexDebug.LOGGER.error("Caught exception while preparing renderer for ${iotaType.typeName().string}", e)
-                null to null
-            }
+        try {
+            val renderer = rendererCache.get(iotaView) {
+                Optional.ofNullable(
+                    SplicingTableIotaRenderers.getProvider(iotaType)
+                        ?.createRenderer(iotaType, iotaView, x, y)
+                )
+            }.getOrNull()
+            renderer?.x = x
+            renderer?.y = y
+            this.renderer = renderer
+            this.tooltip = renderer?.createTooltip()
+        } catch (e: Exception) {
+            HexDebug.LOGGER.error("Caught exception while preparing renderer for ${iotaType.typeName().string}", e)
+            renderer = null
         }
-        renderer?.x = x
-        renderer?.y = y
-        this.renderer = renderer
-        this.tooltip = tooltip
     }
 
     companion object {
         private val rendererCache = CacheBuilder.newBuilder()
             .maximumSize(HexIotaTypes.MAX_SERIALIZATION_TOTAL * 2L)
-            .build<SplicingTableIotaClientView, Pair<SplicingTableIotaRenderer?, Tooltip?>>()
+            .build<SplicingTableIotaClientView, Optional<SplicingTableIotaRenderer>>()
+
+        fun invalidateRendererCache() {
+            rendererCache.invalidateAll()
+        }
     }
 }

Common/src/main/kotlin/gay/object/hexdebug/resources/splicing/SplicingTableIotasResourceReloadListener.kt

@@ -8,6 +8,7 @@ import com.google.gson.JsonObject
 import com.google.gson.JsonParseException
 import gay.`object`.hexdebug.HexDebug
 import gay.`object`.hexdebug.api.client.splicing.SplicingTableIotaRenderers
+import gay.`object`.hexdebug.gui.splicing.widgets.BaseIotaButton
 import gay.`object`.hexdebug.utils.contains
 import gay.`object`.hexdebug.utils.getAsResourceLocation
 import gay.`object`.hexdebug.utils.getOrNull
@@ -68,6 +69,8 @@ object SplicingTableIotasResourceReloadListener :
     ) {
         HexDebug.LOGGER.info("Loading splicing table iota renderers...")
 
+        BaseIotaButton.invalidateRendererCache()
+
         fallback = null
         providersByType.clear()