make HoverEventProvider and ClickEventProvider closing

Author: LukynkaCZE

.gitignore

@@ -1,6 +1,5 @@
 .gradle
 build/
-!gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
 
@@ -42,5 +41,4 @@ bin/
 .DS_Store
 gradlew.bat
 gradlew
-.idea
-gradle/wrapper
+.idea

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 }
 
 group = "io.github.dockyardmc"
-version = "2.7"
+version = "2.8"
 
 repositories {
     mavenCentral()

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/io/github/dockyardmc/scroll/providers/default/ClickEventProvider.kt

@@ -3,16 +3,20 @@ package io.github.dockyardmc.scroll.providers.default
 import io.github.dockyardmc.scroll.ClickAction
 import io.github.dockyardmc.scroll.ClickEvent
 import io.github.dockyardmc.scroll.Component
+import io.github.dockyardmc.scroll.providers.ClosingNamedFormatProvider
 import io.github.dockyardmc.scroll.providers.FormatProviderContext
-import io.github.dockyardmc.scroll.providers.NamedFormatProvider
 
-class ClickEventProvider: NamedFormatProvider("click") {
+class ClickEventProvider : ClosingNamedFormatProvider("click", listOf()) {
 
-    override fun format(context: FormatProviderContext, component: Component) {
+    override fun formatNormal(context: FormatProviderContext, component: Component) {
         val action = ClickAction.valueOf(context.getArgument(0).uppercase())
         val value = context.getArgument(1)
         val clickEvent = ClickEvent(action, value)
 
         component.clickEvent = clickEvent
     }
+
+    override fun formatClosing(context: FormatProviderContext, component: Component) {
+        component.clickEvent = null
+    }
 }

src/main/kotlin/io/github/dockyardmc/scroll/providers/default/HoverEventProvider.kt

@@ -4,16 +4,20 @@ import io.github.dockyardmc.scroll.Component
 import io.github.dockyardmc.scroll.HoverAction
 import io.github.dockyardmc.scroll.HoverEvent
 import io.github.dockyardmc.scroll.Scroll
+import io.github.dockyardmc.scroll.providers.ClosingNamedFormatProvider
 import io.github.dockyardmc.scroll.providers.FormatProviderContext
-import io.github.dockyardmc.scroll.providers.NamedFormatProvider
 
-class HoverEventProvider: NamedFormatProvider("hover") {
+class HoverEventProvider: ClosingNamedFormatProvider("hover", listOf()) {
 
-    override fun format(context: FormatProviderContext, component: Component) {
+    override fun formatNormal(context: FormatProviderContext, component: Component) {
         val action = HoverAction.valueOf(context.getArgument(0).uppercase())
         val value = Scroll.parse(context.getArgument(1))
         val hoverEvent = HoverEvent(action, value)
 
         component.hoverEvent = hoverEvent
     }
+
+    override fun formatClosing(context: FormatProviderContext, component: Component) {
+        component.hoverEvent = null
+    }
 }