Increase default timeout and retry determining properties if they time out

Author: Aeltumn

interfaces/src/main/kotlin/com/noxcrew/interfaces/interfaces/InterfaceProperties.kt

@@ -30,7 +30,7 @@ public open class InterfaceProperties<P : Pane> {
     public var exceptionHandler: InterfacesExceptionHandler = StandardInterfacesExceptionHandler()
 
     /** The timeout to apply to all coroutines for this menu. */
-    public var defaultTimeout: Duration = 2.5.seconds
+    public var defaultTimeout: Duration = 5.seconds
 
     /** Enables debug logs for time spent on various actions. */
     public var debugRenderingTime: Boolean = false

interfaces/src/main/kotlin/com/noxcrew/interfaces/properties/LazyProperty.kt

@@ -22,7 +22,7 @@ public abstract class LazyProperty<T : Any>(
     /** The player this property is for. */
     public val player: Player,
     /** The maximum time an update can take. */
-    private val updateTimeout: Duration = 2.5.seconds,
+    private val updateTimeout: Duration = 5.seconds,
     private val exceptionHandler: InterfacesExceptionHandler = StandardInterfacesExceptionHandler(),
 ) : DelegateTrigger() {
     private var updateJob: Deferred<Unit>? = null
@@ -33,7 +33,7 @@ public abstract class LazyProperty<T : Any>(
     /** A simple lazy property backed by [block]. */
     public class Simple<T : Any>(
         player: Player,
-        updateTimeout: Duration = 2.5.seconds,
+        updateTimeout: Duration = 5.seconds,
         exceptionHandler: StandardInterfacesExceptionHandler,
         private val block: suspend (Boolean) -> T,
     ) : LazyProperty<T>(player, updateTimeout, exceptionHandler) {
@@ -98,9 +98,11 @@ public abstract class LazyProperty<T : Any>(
                         trigger()
                         triggeringUpdate = false
                     }
+
+                    // Only mark initialization done after we finish an update!
+                    initialized = true
                 }
             }
-            initialized = true
             lastRefresh = Instant.now()
             updateJob = null
         }

interfaces/src/main/kotlin/com/noxcrew/interfaces/properties/StateProperty.kt

@@ -29,7 +29,7 @@ public abstract class StateProperty(
     /** The player this property is for. */
     public val player: Player,
     /** The maximum time an update can take. */
-    private val updateTimeout: Duration = 2.5.seconds,
+    private val updateTimeout: Duration = 5.seconds,
     private val exceptionHandler: InterfacesExceptionHandler = StandardInterfacesExceptionHandler(),
     private val delegate: DelegateTrigger = DelegateTrigger(),
 ) : Trigger by delegate {
@@ -69,11 +69,13 @@ public abstract class StateProperty(
             ) {
                 withTimeout(updateTimeout) {
                     update()
+
+                    // Only mark initialization done after we finish an update!
+                    initialized = true
                 }
             }
 
             // Start the timeout after we finish!
-            initialized = true
             lastRefresh = Instant.now()
             updateJob = null
         }

interfaces/src/main/kotlin/com/noxcrew/interfaces/view/AbstractInterfaceView.kt

@@ -277,7 +277,7 @@ public abstract class AbstractInterfaceView<I : InterfacesInventory, T : Interfa
     }
 
     override fun redrawComplete() {
-        applyTransforms(builder.transforms.filter { it.refresh != RefreshMode.TRIGGER_ONLY }, initial = true, renderIfEmpty = true)
+        applyTransforms(builder.transforms.filter { it.refresh != RefreshMode.TRIGGER_ONLY && (it.refresh != RefreshMode.RELOAD || reloadRefresh) }, initial = true, renderIfEmpty = true)
     }
 
     override suspend fun reopen(newParent: InterfaceView?, reload: Boolean): Boolean {