reactive components redone

src/main/kotlin/com/neptuneclient/voidui/ui/Component.kt

@@ -1,20 +1,20 @@
 package com.neptuneclient.voidui.ui
 
+/**
+ * Components are a small reusable chunk of drawables. Syntactically they are very similar to screens, but instead of being
+ * displayed on the screen, you can use them just like elements within other parts of your UI.
+ *
+ * There are two types of components:
+ * * [StaticComponent]: It is rendered once when the screen is built and is used to display static information.
+ * * [ReactiveComponent]: It can hold variables which will, when changed, will rebuild the component.
+ */
 sealed class Component(
     var x: Int? = null,
     var y: Int? = null,
-    width: Int? = null,
-    height: Int? = null
-) {
-    var width = width ?: 0
-    var height = height ?: 0
+    var width: Int? = null,
+    var height: Int? = null
+) : Drawable {
 
-    abstract fun build(): Component
-
-    val Number.cw
-        get() = (this.toDouble() / 100) * width
-
-    val Number.ch
-        get() = (this.toDouble() / 100) * height
+    abstract fun build(): Drawable
 
 }

src/main/kotlin/com/neptuneclient/voidui/ui/Drawable.kt

@@ -0,0 +1,9 @@
+package com.neptuneclient.voidui.ui
+
+import com.neptuneclient.voidui.ui.elements.Element
+
+/**
+ * For now this is just so [Component] and [Element] have the same superclass.
+ */
+interface Drawable {
+}

src/main/kotlin/com/neptuneclient/voidui/ui/ReactiveComponent.kt

@@ -1,40 +1,21 @@
 package com.neptuneclient.voidui.ui
 
-import com.neptuneclient.voidui.event.EventManager
-import com.neptuneclient.voidui.event.Subscribe
-import com.neptuneclient.voidui.event.impl.StateChangeEvent
+import kotlin.properties.Delegates
 
+/**
+ * @see Component
+ */
 abstract class ReactiveComponent : Component() {
-    val states = mutableListOf<State<*>>()
 
     init {
-        EventManager.instance.register(this)
-        for (field in this.javaClass.declaredFields) {
-            if (field.type == State::class.java) {
-                field.isAccessible = true
-                val state = field.get(this) as State<*>
-                state.init()
-                states.add(state)
-                state.subscribe { newValue ->
-                    // Here you can react to changes in the state.
-                    // For example, you can rebuild the component.
-                    rebuild()
-                }
+        for (field in javaClass.declaredFields) {
+            if (!field.isAnnotationPresent(State::class.java)) continue
+            val fieldObserver = Delegates.observable(field.get(this)) { _, _, new ->
+                this.build()
+                // TODO do proper rebuilding in the component tree
             }
+            field.set(this, fieldObserver)
         }
     }
 
-    override fun build(): Component {
-        return this
-    }
-
-    open fun rebuild() {
-        // This method is called when a state changes.
-        // You can override it to rebuild the component.
-    }
-
-    @Subscribe(target = StateChangeEvent::class)
-    fun onStateChange(event: StateChangeEvent<*>) {
-        println("State changed from ${event.state.prev} to ${event.state.value}")
-    }
 }

src/main/kotlin/com/neptuneclient/voidui/ui/Screen.kt

@@ -4,15 +4,6 @@ import com.neptuneclient.voidui.VoidUI
 
 abstract class Screen(private val void: VoidUI) {
 
-    var width = 0
-    var height = 0
-
     abstract fun build(): Component
 
-    val Number.vw
-        get() = (this.toDouble() / 100) * width
-
-    val Number.vh
-        get() = (this.toDouble() / 100) * height
-
 }

src/main/kotlin/com/neptuneclient/voidui/ui/State.kt

@@ -1,32 +1,10 @@
 package com.neptuneclient.voidui.ui
 
-import com.neptuneclient.voidui.event.EventManager
-import com.neptuneclient.voidui.event.impl.StateChangeEvent
-
-class State<T : Any>(initial: T) {
-    var value: T = initial
-        set(value) {
-            field = value
-            changed()
-        }
-
-    var prev: T = initial
-    private val listeners = mutableListOf<(T) -> Unit>()
-
-    fun init() {
-        EventManager.instance.register(this)
-        println("State initialized")
-    }
-
-    fun changed() {
-        EventManager.instance.fire(
-            StateChangeEvent(this)
-        )
-        prev = this.value
-        listeners.forEach { it(value) } // Notify all listeners about the change
-    }
-
-    fun subscribe(listener: (T) -> Unit) {
-        listeners.add(listener)
-    }
-}
+/**
+ * Used in implementations of [ReactiveComponent] to declare fields as state.
+ *
+ * For more info check out [ReactiveComponent].
+ */
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.FIELD, AnnotationTarget.PROPERTY)
+annotation class State()

src/main/kotlin/com/neptuneclient/voidui/ui/StaticComponent.kt

@@ -1,4 +1,7 @@
 package com.neptuneclient.voidui.ui
 
+/**
+ * @see Component
+ */
 abstract class StaticComponent : Component() {
 }

src/main/kotlin/com/neptuneclient/voidui/ui/elements/Element.kt

@@ -1,6 +1,12 @@
 package com.neptuneclient.voidui.ui.elements
 
-sealed class Element {
+import com.neptuneclient.voidui.ui.Drawable
+
+/**
+ * Elements are the core building blocks of the library. They can not be created by the user and do not have children.
+ * Instead, they are rendered directly to the screen, and have also custom style properties (coming soon™).
+ */
+sealed class Element : Drawable {
 
     abstract fun render()
 

src/main/kotlin/com/neptuneclient/voidui/ui/elements/TestElement.kt

@@ -0,0 +1,9 @@
+package com.neptuneclient.voidui.ui.elements
+
+class TestElement : Element() {
+
+    override fun render() {
+        println("please kill me")
+    }
+
+}

test-mod/src/main/kotlin/com/neptuneclient/voidui/testmod/example/Label.kt

@@ -0,0 +1,17 @@
+package com.neptuneclient.voidui.testmod.example
+
+import com.neptuneclient.voidui.ui.Drawable
+import com.neptuneclient.voidui.ui.ReactiveComponent
+import com.neptuneclient.voidui.ui.State
+import com.neptuneclient.voidui.ui.elements.TestElement
+
+class Label : ReactiveComponent() {
+
+    @State
+    private var counter = 0
+
+    override fun build(): Drawable {
+        return TestElement()
+    }
+
+}