From fc760191aa5090e9dac6c3014739a12dc7fc5dfb Mon Sep 17 00:00:00 2001
From: MattMX <mangrovethefox@outlook.com>
Date: Fri, 28 Jun 2024 12:46:52 +0100
Subject: [PATCH] Resolve merge conflicts

---
 .idea/gradle.xml                              |  1 -
 .idea/modules/plugin/ktgui.plugin.test.iml    |  1 +
 .../caches/paperweight/taskCache/reobfJar.log |  4 +-
 api/build.gradle.kts                          |  2 +-
 .../declarative/ChainCommandBuilder.kt        |  4 ++
 .../commands/declarative/arg/argTests.kt      |  6 +--
 .../arg/impl/MultiChoiceArgument.kt           | 14 ++++++
 .../ktgui/papi/PlaceholderExpansionWrapper.kt | 12 ++---
 .../mattmx/ktgui/scheduling/TaskTracker.kt    | 49 +++++++++++++------
 .../ktgui/scheduling/TaskTrackerTask.kt       |  2 +-
 .../mattmx/ktgui/scheduling/builder/Task.kt   |  2 -
 .../ktgui/scoreboards/ScoreboardBuilder.kt    |  3 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 plugin/build.gradle.kts                       |  2 +-
 14 files changed, 69 insertions(+), 35 deletions(-)
 create mode 100644 api/src/main/kotlin/com/mattmx/ktgui/commands/declarative/arg/impl/MultiChoiceArgument.kt

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 291d995..c52e764 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,6 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
           <set>
diff --git a/.idea/modules/plugin/ktgui.plugin.test.iml b/.idea/modules/plugin/ktgui.plugin.test.iml
index c0b28ad..b1f816c 100644
--- a/.idea/modules/plugin/ktgui.plugin.test.iml
+++ b/.idea/modules/plugin/ktgui.plugin.test.iml
@@ -5,6 +5,7 @@
       <configuration>
         <autoDetectTypes>
           <platformType>PAPER</platformType>
+          <platformType>MCP</platformType>
           <platformType>ADVENTURE</platformType>
         </autoDetectTypes>
         <projectReimportVersion>1</projectReimportVersion>
diff --git a/api/.gradle/caches/paperweight/taskCache/reobfJar.log b/api/.gradle/caches/paperweight/taskCache/reobfJar.log
index a6b0599..491225f 100644
--- a/api/.gradle/caches/paperweight/taskCache/reobfJar.log
+++ b/api/.gradle/caches/paperweight/taskCache/reobfJar.log
@@ -1,2 +1,2 @@
-Command: C:\Users\Mangr\.gradle\jdks\adoptium-21-x64-hotspot-windows\bin\java.exe -Xmx1G -classpath C:\Users\Mangr\.gradle\caches\modules-2\files-2.1\net.fabricmc\tiny-remapper\0.10.1\c293b2384ae12af74f407fa3aaa553bba4ac6763\tiny-remapper-0.10.1-fat.jar net.fabricmc.tinyremapper.Main D:\PC\Projects\KtBukkitGui\api\build\libs\ktgui-2.4.0-dev-all.jar D:\PC\Projects\KtBukkitGui\api\build\libs\api-2.4.0.jar C:\Users\Mangr\.gradle\caches\paperweight-userdev\383bcea64446e2cc830258ba4061f82beae144700277ae2c736ef37b9c989d6c\module\io.papermc.paper\dev-bundle\1.20.4-R0.1-SNAPSHOT\paperweight\setupCache\extractDevBundle.dir\data\mojang+yarn-spigot-reobf.tiny mojang+yarn spigot C:\Users\Mangr\.gradle\caches\paperweight-userdev\383bcea64446e2cc830258ba4061f82beae144700277ae2c736ef37b9c989d6c\module\io.papermc.paper\dev-bundle\1.20.4-R0.1-SNAPSHOT\paperweight\setupCache\applyMojangMappedPaperclipPatch.jar --threads=1
-Finished after 2799.54 ms.
+Command: C:\Users\Mangr\.gradle\jdks\adoptium-21-x64-hotspot-windows\bin\java.exe -Xmx1G -classpath C:\Users\Mangr\.gradle\caches\modules-2\files-2.1\net.fabricmc\tiny-remapper\0.10.1\c293b2384ae12af74f407fa3aaa553bba4ac6763\tiny-remapper-0.10.1-fat.jar net.fabricmc.tinyremapper.Main D:\PC\Projects\KtBukkitGui\api\build\libs\ktgui-2.4.0-dev-all.jar D:\PC\Projects\KtBukkitGui\api\build\libs\api-2.4.0.jar C:\Users\Mangr\.gradle\caches\paperweight-userdev\ff775525efc29c3503a07d1006e63e5695a742b7505cf63e157d49d32419c69f\module\io.papermc.paper\dev-bundle\1.20.4-R0.1-SNAPSHOT\paperweight\setupCache\extractDevBundle.dir\data\mojang+yarn-spigot-reobf.tiny mojang+yarn spigot C:\Users\Mangr\.gradle\caches\paperweight-userdev\ff775525efc29c3503a07d1006e63e5695a742b7505cf63e157d49d32419c69f\module\io.papermc.paper\dev-bundle\1.20.4-R0.1-SNAPSHOT\paperweight\setupCache\applyMojangMappedPaperclipPatch.jar --threads=1
+Finished after 2887.82 ms.
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
index 509dabd..116f2b9 100644
--- a/api/build.gradle.kts
+++ b/api/build.gradle.kts
@@ -29,7 +29,7 @@ version = rootProject.version
 sourceSets["main"].resources.srcDir("src/resources/")
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "17"
+    kotlinOptions.jvmTarget = "21"
 }
 
 tasks {
diff --git a/api/src/main/kotlin/com/mattmx/ktgui/commands/declarative/ChainCommandBuilder.kt b/api/src/main/kotlin/com/mattmx/ktgui/commands/declarative/ChainCommandBuilder.kt
index 9ede97e..558b87f 100644
--- a/api/src/main/kotlin/com/mattmx/ktgui/commands/declarative/ChainCommandBuilder.kt
+++ b/api/src/main/kotlin/com/mattmx/ktgui/commands/declarative/ChainCommandBuilder.kt
@@ -2,8 +2,10 @@ package com.mattmx.ktgui.commands.declarative
 
 import com.mattmx.ktgui.commands.declarative.arg.Argument
 import com.mattmx.ktgui.commands.declarative.arg.impl.MultiArgument
+import com.mattmx.ktgui.commands.declarative.invocation.RunnableCommandContext
 import com.mattmx.ktgui.utils.JavaCompatibility
 import org.bukkit.block.data.type.Chain
+import org.bukkit.command.CommandSender
 
 class ChainCommandBuilder(val name: String) {
     val arguments = arrayListOf<Argument<*>>()
@@ -19,6 +21,8 @@ class ChainCommandBuilder(val name: String) {
         subcommands.addAll(command)
     }
 
+    inline infix fun <reified S : CommandSender> runs(noinline block: RunnableCommandContext<S>.() -> Unit) = build().runs(block)
+
     fun build() = build(DeclarativeCommandBuilder(name))
 
     fun <T : DeclarativeCommandBuilder> build(existing: T) = existing.apply {
diff --git a/api/src/main/kotlin/com/mattmx/ktgui/commands/declarative/arg/argTests.kt b/api/src/main/kotlin/com/mattmx/ktgui/commands/declarative/arg/argTests.kt
index df08b31..60219d0 100644
--- a/api/src/main/kotlin/com/mattmx/ktgui/commands/declarative/arg/argTests.kt
+++ b/api/src/main/kotlin/com/mattmx/ktgui/commands/declarative/arg/argTests.kt
@@ -80,9 +80,9 @@ fun main() {
     processor.takeOne("username")
     processor.takeRemaining("msg")
 
-    username consumes single()
-    msg consumes until { false }
-    msg consumes remaining()
+//    username consumes single()
+//    msg consumes until { false }
+//    msg consumes remaining()
 
     println(processor)
 }
\ No newline at end of file
diff --git a/api/src/main/kotlin/com/mattmx/ktgui/commands/declarative/arg/impl/MultiChoiceArgument.kt b/api/src/main/kotlin/com/mattmx/ktgui/commands/declarative/arg/impl/MultiChoiceArgument.kt
new file mode 100644
index 0000000..686eda5
--- /dev/null
+++ b/api/src/main/kotlin/com/mattmx/ktgui/commands/declarative/arg/impl/MultiChoiceArgument.kt
@@ -0,0 +1,14 @@
+package com.mattmx.ktgui.commands.declarative.arg.impl
+
+import com.mattmx.ktgui.commands.declarative.arg.Argument
+import com.mattmx.ktgui.commands.declarative.arg.consumer.ArgumentConsumer
+
+class MultiChoiceArgument<T : Any>(
+    name: String,
+    typeName: String,
+    consumer: ArgumentConsumer
+) : Argument<T>(name, typeName, consumer) {
+
+
+
+}
\ No newline at end of file
diff --git a/api/src/main/kotlin/com/mattmx/ktgui/papi/PlaceholderExpansionWrapper.kt b/api/src/main/kotlin/com/mattmx/ktgui/papi/PlaceholderExpansionWrapper.kt
index 4c56186..e0551e1 100644
--- a/api/src/main/kotlin/com/mattmx/ktgui/papi/PlaceholderExpansionWrapper.kt
+++ b/api/src/main/kotlin/com/mattmx/ktgui/papi/PlaceholderExpansionWrapper.kt
@@ -10,16 +10,16 @@ class PlaceholderExpansionWrapper(
     private val placeholders = arrayListOf<Placeholder>()
     var id = owner.name
         private set
-    var author = owner.pluginMeta.authors.joinToString(", ")
+    var _author = owner.pluginMeta.authors.joinToString(", ")
         private set
-    var version = owner.pluginMeta.version
+    var _version = owner.pluginMeta.version
         private set
     var splitArgs = { params: String -> params.split("_") }
         private set
 
     override fun getIdentifier() = id
-    override fun getAuthor() = author
-    override fun getVersion() = version
+    override fun getAuthor() = _author
+    override fun getVersion() = _version
     override fun getPlaceholders() = placeholders.map { it.toString() }.toMutableList()
 
     infix fun id(id: String) = apply {
@@ -27,11 +27,11 @@ class PlaceholderExpansionWrapper(
     }
 
     infix fun author(author: String) = apply {
-        this.author = author
+        this._author = author
     }
 
     infix fun version(version: String) = apply {
-        this.version = version
+        this._version = version
     }
 
     infix fun splitArgs(splitArgs: (String) -> List<String>) = apply {
diff --git a/api/src/main/kotlin/com/mattmx/ktgui/scheduling/TaskTracker.kt b/api/src/main/kotlin/com/mattmx/ktgui/scheduling/TaskTracker.kt
index b6aa67d..2c8d20f 100644
--- a/api/src/main/kotlin/com/mattmx/ktgui/scheduling/TaskTracker.kt
+++ b/api/src/main/kotlin/com/mattmx/ktgui/scheduling/TaskTracker.kt
@@ -10,38 +10,38 @@ import java.util.*
  * Any scheduled tasks will be added to [list].
  */
 class TaskTracker : Invokable<TaskTracker> {
-    private val list = Collections.synchronizedList(arrayListOf<BukkitTask>())
+    private val list = Collections.synchronizedList(arrayListOf<IteratingTask>())
 
-    fun runAsync(block: TaskTrackerTask.() -> Unit) {
+    infix fun runAsync(block: TaskTrackerTask.() -> Unit) {
         var task: TaskTrackerTask? = null
         task = TaskTrackerTask(this, async {
             block(task!!)
-            list.remove(this)
-        }.apply { list.add(this) })
+            list.remove(task!!)
+        }).apply { list.add(this) }
     }
 
-    fun runSync(block: TaskTrackerTask.() -> Unit) {
+    infix fun runSync(block: TaskTrackerTask.() -> Unit) {
         var task: TaskTrackerTask? = null
         task = TaskTrackerTask(this, sync {
             block(task!!)
-            list.remove(this)
-        }.apply { list.add(this) })
+            list.remove(task!!)
+        }).apply { list.add(this) }
     }
 
     fun runAsyncLater(period: Long, block: TaskTrackerTask.() -> Unit) {
         var task: TaskTrackerTask? = null
         task = TaskTrackerTask(this, asyncDelayed(period) {
             block(task!!)
-            list.remove(this)
-        }.apply { list.add(this) })
+            list.remove(task!!)
+        }).apply { list.add(this) }
     }
 
     fun runSyncLater(period: Long, block: TaskTrackerTask.() -> Unit) {
         var task: TaskTrackerTask? = null
         task = TaskTrackerTask(this, syncDelayed(period) {
             block(task!!)
-            list.remove(this)
-        }.apply { list.add(this) })
+            list.remove(task!!)
+        }).apply { list.add(this) }
     }
 
     fun runAsyncRepeat(delay: Long, period: Long = 0L, block: TaskTrackerTask.() -> Unit) {
@@ -49,7 +49,7 @@ class TaskTracker : Invokable<TaskTracker> {
         task = TaskTrackerTask(this, asyncRepeat(delay, period) {
             block(task!!)
             task!!.iterations++
-        }.apply { list.add(this) })
+        }).apply { list.add(this) }
     }
 
     fun runSyncRepeat(delay: Long, period: Long = 0L, block: TaskTrackerTask.() -> Unit) {
@@ -57,15 +57,34 @@ class TaskTracker : Invokable<TaskTracker> {
         task = TaskTrackerTask(this, syncRepeat(delay, period) {
             block(task!!)
             task!!.iterations++
-        }.apply { list.add(this) })
+        }).apply { list.add(this) }
     }
 
     fun cancelAll() = list.apply {
-        forEach { it.cancel() }
+        val temp = this.toList()
+        temp.forEach { it.cancel() }
         list.clear()
     }
 
-    fun removeTask(task: BukkitTask) {
+    infix fun cancelIf(predicate: (IteratingTask) -> Boolean): List<IteratingTask> {
+        val removed = arrayListOf<IteratingTask>()
+        val it = list.iterator()
+        while (it.hasNext()) {
+            val t = it.next()
+            if (predicate(t)) {
+                it.remove()
+                removed.add(t)
+            }
+        }
+        return removed.toList()
+    }
+
+    inline fun <reified T : TaskTrackerTask> cancelIfInstance() =
+        cancelIf { it is T } as List<T>
+
+    infix fun removeTask(task: BukkitTask) = cancelIf { it.task == task }
+
+    infix fun removeTask(task: TaskTrackerTask) {
         list.remove(task)
     }
 
diff --git a/api/src/main/kotlin/com/mattmx/ktgui/scheduling/TaskTrackerTask.kt b/api/src/main/kotlin/com/mattmx/ktgui/scheduling/TaskTrackerTask.kt
index d46444f..0681d82 100644
--- a/api/src/main/kotlin/com/mattmx/ktgui/scheduling/TaskTrackerTask.kt
+++ b/api/src/main/kotlin/com/mattmx/ktgui/scheduling/TaskTrackerTask.kt
@@ -5,7 +5,7 @@ import org.bukkit.scheduler.BukkitTask
 /**
  * Wrapper class for the [BukkitTask] task.
  */
-class TaskTrackerTask(
+open class TaskTrackerTask(
     private val owner: TaskTracker,
     task: BukkitTask
 ) : IteratingTask(task) {
diff --git a/api/src/main/kotlin/com/mattmx/ktgui/scheduling/builder/Task.kt b/api/src/main/kotlin/com/mattmx/ktgui/scheduling/builder/Task.kt
index f9cdf07..afbe1ea 100644
--- a/api/src/main/kotlin/com/mattmx/ktgui/scheduling/builder/Task.kt
+++ b/api/src/main/kotlin/com/mattmx/ktgui/scheduling/builder/Task.kt
@@ -1,7 +1,5 @@
 package com.mattmx.ktgui.scheduling.builder
 
-import com.mattmx.ktgui.scheduling.asyncDelayed
-import com.mattmx.ktgui.scheduling.asyncRepeat
 import com.mattmx.ktgui.utils.seconds
 
 object Task {
diff --git a/api/src/main/kotlin/com/mattmx/ktgui/scoreboards/ScoreboardBuilder.kt b/api/src/main/kotlin/com/mattmx/ktgui/scoreboards/ScoreboardBuilder.kt
index 6f5ee9e..1eecdc5 100644
--- a/api/src/main/kotlin/com/mattmx/ktgui/scoreboards/ScoreboardBuilder.kt
+++ b/api/src/main/kotlin/com/mattmx/ktgui/scoreboards/ScoreboardBuilder.kt
@@ -1,9 +1,8 @@
 package com.mattmx.ktgui.scoreboards
 
 import com.mattmx.ktgui.extensions.removeScoreboard
-import com.mattmx.ktgui.utils.legacyColor
-import com.mattmx.ktgui.scheduling.not
 import com.mattmx.ktgui.utils.JavaCompatibility
+import com.mattmx.ktgui.utils.legacyColor
 import com.mattmx.ktgui.utils.not
 import net.kyori.adventure.text.Component
 import org.bukkit.Bukkit
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index aa991fc..a595206 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
index 20d96b9..0376223 100644
--- a/plugin/build.gradle.kts
+++ b/plugin/build.gradle.kts
@@ -30,7 +30,7 @@ tasks.test {
 sourceSets["main"].resources.srcDir("src/resources/")
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "17"
+    kotlinOptions.jvmTarget = "21"
 }
 
 fun getCheckedOutGitCommitHash(): String = grgit.head().abbreviatedId