From 5a57b3afbf654eb8d413ee608e0744ae95ca7923 Mon Sep 17 00:00:00 2001 From: alexcrea Date: Wed, 9 Jul 2025 11:14:55 +0200 Subject: [PATCH] remove more nms sub modules --- build.gradle.kts | 5 --- .../dependency/scheduler/TaskScheduler.kt | 18 ---------- nms/v1_21R1/.gitignore | 1 - nms/v1_21R1/build.gradle.kts | 35 ------------------- .../gui/version/v1_21R1_ExternGuiTester.kt | 17 --------- nms/v1_21R2/.gitignore | 1 - nms/v1_21R2/build.gradle.kts | 35 ------------------- .../gui/version/v1_21R2_ExternGuiTester.kt | 17 --------- nms/v1_21R3/.gitignore | 1 - nms/v1_21R3/build.gradle.kts | 35 ------------------- .../gui/version/v1_21R3_ExternGuiTester.kt | 17 --------- nms/v1_21R4/.gitignore | 1 - nms/v1_21R4/build.gradle.kts | 34 ------------------ .../gui/version/v1_21R4_ExternGuiTester.kt | 34 ------------------ nms/v1_21R5/.gitignore | 1 - nms/v1_21R5/build.gradle.kts | 34 ------------------ .../gui/version/v1_21R5_ExternGuiTester.kt | 34 ------------------ settings.gradle.kts | 10 ------ .../cuanvil/dependency/DependencyManager.kt | 13 +++---- .../cuanvil/dependency/gui/ExternGuiTester.kt | 17 ++++++--- .../dependency/gui/GuiTesterSelector.kt | 15 ++++---- .../dependency/scheduler/FoliaScheduler.kt | 14 ++++++-- 22 files changed, 34 insertions(+), 355 deletions(-) delete mode 100644 nms/nms-common/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/scheduler/TaskScheduler.kt delete mode 100644 nms/v1_21R1/.gitignore delete mode 100644 nms/v1_21R1/build.gradle.kts delete mode 100644 nms/v1_21R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_21R1_ExternGuiTester.kt delete mode 100644 nms/v1_21R2/.gitignore delete mode 100644 nms/v1_21R2/build.gradle.kts delete mode 100644 nms/v1_21R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_21R2_ExternGuiTester.kt delete mode 100644 nms/v1_21R3/.gitignore delete mode 100644 nms/v1_21R3/build.gradle.kts delete mode 100644 nms/v1_21R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_21R3_ExternGuiTester.kt delete mode 100644 nms/v1_21R4/.gitignore delete mode 100644 nms/v1_21R4/build.gradle.kts delete mode 100644 nms/v1_21R4/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_21R4_ExternGuiTester.kt delete mode 100644 nms/v1_21R5/.gitignore delete mode 100644 nms/v1_21R5/build.gradle.kts delete mode 100644 nms/v1_21R5/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_21R5_ExternGuiTester.kt rename {nms/nms-common/src => src}/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/ExternGuiTester.kt (73%) diff --git a/build.gradle.kts b/build.gradle.kts index a9a9cce..bcc3703 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -68,11 +68,6 @@ dependencies { // Include nms implementation(project(":nms:nms-common")) - implementation(project(":nms:v1_21R1")) - implementation(project(":nms:v1_21R2")) - implementation(project(":nms:v1_21R3")) - implementation(project(":nms:v1_21R4")) - implementation(project(":nms:v1_21R5")) // include kotlin for the offline jar implementation(kotlin("stdlib")) diff --git a/nms/nms-common/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/scheduler/TaskScheduler.kt b/nms/nms-common/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/scheduler/TaskScheduler.kt deleted file mode 100644 index e6a70dd..0000000 --- a/nms/nms-common/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/scheduler/TaskScheduler.kt +++ /dev/null @@ -1,18 +0,0 @@ -package xyz.alexcrea.cuanvil.dependency.scheduler - -import org.bukkit.entity.Entity -import org.bukkit.plugin.Plugin - -interface TaskScheduler { - - fun scheduleGlobally(plugin: Plugin, task: Runnable, time: Long): Any? - fun scheduleGlobally(plugin: Plugin, task: Runnable): Any?{ - return scheduleGlobally(plugin, task, 0L) - } - - fun scheduleOnEntity(plugin: Plugin, entity: Entity, task: Runnable, time: Long): Any? - fun scheduleOnEntity(plugin: Plugin, entity: Entity, task: Runnable): Any?{ - return scheduleOnEntity(plugin, entity, task, 0L) - } - -} \ No newline at end of file diff --git a/nms/v1_21R1/.gitignore b/nms/v1_21R1/.gitignore deleted file mode 100644 index 47374f1..0000000 --- a/nms/v1_21R1/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.lastDeploymentsId \ No newline at end of file diff --git a/nms/v1_21R1/build.gradle.kts b/nms/v1_21R1/build.gradle.kts deleted file mode 100644 index ba50b31..0000000 --- a/nms/v1_21R1/build.gradle.kts +++ /dev/null @@ -1,35 +0,0 @@ -import org.jetbrains.kotlin.gradle.dsl.JvmTarget - -group = rootProject.group -version = rootProject.version - -plugins { - id("io.papermc.paperweight.userdev") -} - -dependencies { - implementation(project(":nms:nms-common")) - - // Used for nms - paperweight.paperDevBundle("1.21.1-R0.1-SNAPSHOT") -} - -repositories { - maven("https://repo.papermc.io/repository/maven-public/") - -} - -// Set target version -tasks.withType().configureEach { - sourceCompatibility = "21" - targetCompatibility = "21" - - options.encoding = "UTF-8" -} - -kotlin { - compilerOptions { - apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0) - jvmTarget.set(JvmTarget.JVM_21) - } -} diff --git a/nms/v1_21R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_21R1_ExternGuiTester.kt b/nms/v1_21R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_21R1_ExternGuiTester.kt deleted file mode 100644 index 7cb55f7..0000000 --- a/nms/v1_21R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_21R1_ExternGuiTester.kt +++ /dev/null @@ -1,17 +0,0 @@ -package xyz.alexcrea.cuanvil.dependency.gui.version - -import org.bukkit.craftbukkit.inventory.CraftInventoryView -import org.bukkit.inventory.InventoryView -import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester - -class v1_21R1_ExternGuiTester : ExternGuiTester { - override val wesjdAnvilGuiName = "Wrapper1_21_R1" - - override fun getContainerClass(view: InventoryView): Class? { - if (view !is CraftInventoryView<*, *>) return null - val container = view.handle - - return container.javaClass - } - -} diff --git a/nms/v1_21R2/.gitignore b/nms/v1_21R2/.gitignore deleted file mode 100644 index 47374f1..0000000 --- a/nms/v1_21R2/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.lastDeploymentsId \ No newline at end of file diff --git a/nms/v1_21R2/build.gradle.kts b/nms/v1_21R2/build.gradle.kts deleted file mode 100644 index f9bc521..0000000 --- a/nms/v1_21R2/build.gradle.kts +++ /dev/null @@ -1,35 +0,0 @@ -import org.jetbrains.kotlin.gradle.dsl.JvmTarget - -group = rootProject.group -version = rootProject.version - -plugins { - id("io.papermc.paperweight.userdev") -} - -dependencies { - implementation(project(":nms:nms-common")) - - // Used for nms - paperweight.paperDevBundle("1.21.3-R0.1-SNAPSHOT") -} - -repositories { - maven("https://repo.papermc.io/repository/maven-public/") - -} - -// Set target version -tasks.withType().configureEach { - sourceCompatibility = "21" - targetCompatibility = "21" - - options.encoding = "UTF-8" -} - -kotlin { - compilerOptions { - apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0) - jvmTarget.set(JvmTarget.JVM_21) - } -} diff --git a/nms/v1_21R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_21R2_ExternGuiTester.kt b/nms/v1_21R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_21R2_ExternGuiTester.kt deleted file mode 100644 index 9f980ab..0000000 --- a/nms/v1_21R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_21R2_ExternGuiTester.kt +++ /dev/null @@ -1,17 +0,0 @@ -package xyz.alexcrea.cuanvil.dependency.gui.version - -import org.bukkit.craftbukkit.inventory.CraftInventoryView -import org.bukkit.inventory.InventoryView -import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester - -class v1_21R2_ExternGuiTester : ExternGuiTester { - override val wesjdAnvilGuiName = "Wrapper1_21_R2" - - override fun getContainerClass(view: InventoryView): Class? { - if (view !is CraftInventoryView<*, *>) return null - val container = view.handle - - return container.javaClass - } - -} diff --git a/nms/v1_21R3/.gitignore b/nms/v1_21R3/.gitignore deleted file mode 100644 index 47374f1..0000000 --- a/nms/v1_21R3/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.lastDeploymentsId \ No newline at end of file diff --git a/nms/v1_21R3/build.gradle.kts b/nms/v1_21R3/build.gradle.kts deleted file mode 100644 index 4a64d69..0000000 --- a/nms/v1_21R3/build.gradle.kts +++ /dev/null @@ -1,35 +0,0 @@ -import org.jetbrains.kotlin.gradle.dsl.JvmTarget - -group = rootProject.group -version = rootProject.version - -plugins { - id("io.papermc.paperweight.userdev") -} - -dependencies { - implementation(project(":nms:nms-common")) - - // Used for nms - paperweight.paperDevBundle("1.21.4-R0.1-SNAPSHOT") -} - -repositories { - maven("https://repo.papermc.io/repository/maven-public/") - -} - -// Set target version -tasks.withType().configureEach { - sourceCompatibility = "21" - targetCompatibility = "21" - - options.encoding = "UTF-8" -} - -kotlin { - compilerOptions { - apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0) - jvmTarget.set(JvmTarget.JVM_21) - } -} diff --git a/nms/v1_21R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_21R3_ExternGuiTester.kt b/nms/v1_21R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_21R3_ExternGuiTester.kt deleted file mode 100644 index 70c5df9..0000000 --- a/nms/v1_21R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_21R3_ExternGuiTester.kt +++ /dev/null @@ -1,17 +0,0 @@ -package xyz.alexcrea.cuanvil.dependency.gui.version - -import org.bukkit.craftbukkit.inventory.CraftInventoryView -import org.bukkit.inventory.InventoryView -import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester - -class v1_21R3_ExternGuiTester: ExternGuiTester { - override val wesjdAnvilGuiName = "Wrapper1_21_R3" - - override fun getContainerClass(view: InventoryView): Class? { - if(view !is CraftInventoryView<*, *>) return null - val container = view.handle - - return container.javaClass - } - -} diff --git a/nms/v1_21R4/.gitignore b/nms/v1_21R4/.gitignore deleted file mode 100644 index 47374f1..0000000 --- a/nms/v1_21R4/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.lastDeploymentsId \ No newline at end of file diff --git a/nms/v1_21R4/build.gradle.kts b/nms/v1_21R4/build.gradle.kts deleted file mode 100644 index 1a1c8ee..0000000 --- a/nms/v1_21R4/build.gradle.kts +++ /dev/null @@ -1,34 +0,0 @@ -import org.jetbrains.kotlin.gradle.dsl.JvmTarget - -group = rootProject.group -version = rootProject.version - -plugins { - id("io.papermc.paperweight.userdev") -} - -dependencies { - implementation(project(":nms:nms-common")) - - // Used for nms - paperweight.paperDevBundle("1.21.5-R0.1-SNAPSHOT") -} - -repositories { - maven("https://repo.papermc.io/repository/maven-public/") -} - -// Set target version -tasks.withType().configureEach { - sourceCompatibility = "21" - targetCompatibility = "21" - - options.encoding = "UTF-8" -} - -kotlin { - compilerOptions { - apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0) - jvmTarget.set(JvmTarget.JVM_21) - } -} diff --git a/nms/v1_21R4/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_21R4_ExternGuiTester.kt b/nms/v1_21R4/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_21R4_ExternGuiTester.kt deleted file mode 100644 index 8e830a9..0000000 --- a/nms/v1_21R4/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_21R4_ExternGuiTester.kt +++ /dev/null @@ -1,34 +0,0 @@ -package xyz.alexcrea.cuanvil.dependency.gui.version - -import org.bukkit.craftbukkit.inventory.CraftInventoryView -import org.bukkit.inventory.InventoryView -import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester - -class v1_21R4_ExternGuiTester : ExternGuiTester { - override val wesjdAnvilGuiName = "Wrapper1_21_R4" - - var tested = false - var possible = false - - override fun getContainerClass(view: InventoryView): Class? { - // In case we are in a test environment - if (!tested) testClassExist() - if (!possible) return null - - if (view !is CraftInventoryView<*, *>) return null - val container = view.handle - - return container.javaClass - } - - fun testClassExist() { - tested = true - try { - Class.forName("org.bukkit.craftbukkit.inventory.CraftInventoryView") - possible = true - } catch (e: ClassNotFoundException) { - possible = false - } - } - -} diff --git a/nms/v1_21R5/.gitignore b/nms/v1_21R5/.gitignore deleted file mode 100644 index 47374f1..0000000 --- a/nms/v1_21R5/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.lastDeploymentsId \ No newline at end of file diff --git a/nms/v1_21R5/build.gradle.kts b/nms/v1_21R5/build.gradle.kts deleted file mode 100644 index 712c447..0000000 --- a/nms/v1_21R5/build.gradle.kts +++ /dev/null @@ -1,34 +0,0 @@ -import org.jetbrains.kotlin.gradle.dsl.JvmTarget - -group = rootProject.group -version = rootProject.version - -plugins { - id("io.papermc.paperweight.userdev") -} - -dependencies { - implementation(project(":nms:nms-common")) - - // Used for nms - paperweight.paperDevBundle("1.21.6-R0.1-SNAPSHOT") -} - -repositories { - maven("https://repo.papermc.io/repository/maven-public/") -} - -// Set target version -tasks.withType().configureEach { - sourceCompatibility = "21" - targetCompatibility = "21" - - options.encoding = "UTF-8" -} - -kotlin { - compilerOptions { - apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0) - jvmTarget.set(JvmTarget.JVM_21) - } -} diff --git a/nms/v1_21R5/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_21R5_ExternGuiTester.kt b/nms/v1_21R5/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_21R5_ExternGuiTester.kt deleted file mode 100644 index 59eadbc..0000000 --- a/nms/v1_21R5/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_21R5_ExternGuiTester.kt +++ /dev/null @@ -1,34 +0,0 @@ -package xyz.alexcrea.cuanvil.dependency.gui.version - -import org.bukkit.craftbukkit.inventory.CraftInventoryView -import org.bukkit.inventory.InventoryView -import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester - -class v1_21R5_ExternGuiTester: ExternGuiTester { - override val wesjdAnvilGuiName = "Wrapper1_21_R5" - - var tested = false; - var possible = false; - - override fun getContainerClass(view: InventoryView): Class? { - // In case we are in a test environment - if(!tested) testClassExist() - if(!possible) return null - - if(view !is CraftInventoryView<*, *>) return null - val container = view.handle - - return container.javaClass - } - - fun testClassExist(){ - tested = true; - try { - Class.forName("org.bukkit.craftbukkit.inventory.CraftInventoryView") - possible = true - } catch (e: ClassNotFoundException){ - possible = false - } - } - -} diff --git a/settings.gradle.kts b/settings.gradle.kts index bbda37b..8931037 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,14 +3,4 @@ rootProject.name = "CustomAnvil" // NMS subproject include("nms:nms-common") findProject(":nms:nms-common")?.name = "nms-common" -include("nms:v1_21R1") -findProject(":nms:v1_21R1")?.name = "v1_21R1" -include("nms:v1_21R2") -findProject(":nms:v1_21R2")?.name = "v1_21R2" -include("nms:v1_21R3") -findProject(":nms:v1_21R3")?.name = "v1_21R3" -include("nms:v1_21R4") -findProject(":nms:v1_21R4")?.name = "v1_21R4" -include("nms:v1_21R5") -findProject(":nms:v1_21R5")?.name = "v1_21R5" diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt index 4d44bb5..29635b6 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt @@ -17,23 +17,20 @@ import org.bukkit.inventory.view.AnvilView import xyz.alexcrea.cuanvil.config.ConfigHolder import xyz.alexcrea.cuanvil.dependency.datapack.DataPackDependency import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester -import xyz.alexcrea.cuanvil.dependency.gui.GuiTesterSelector import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerBase import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerSelector import xyz.alexcrea.cuanvil.dependency.plugins.* -import xyz.alexcrea.cuanvil.dependency.scheduler.TaskScheduler +import xyz.alexcrea.cuanvil.dependency.scheduler.FoliaScheduler import xyz.alexcrea.cuanvil.listener.PrepareAnvilListener.Companion.ANVIL_OUTPUT_SLOT import xyz.alexcrea.cuanvil.util.AnvilUseType import java.util.logging.Level - @Suppress("unstableApiUsage") object DependencyManager { var isFolia: Boolean = false - lateinit var scheduler: TaskScheduler + lateinit var scheduler: FoliaScheduler lateinit var packetManager: PacketManagerBase - private var externGuiTester: ExternGuiTester? = null var enchantmentSquaredCompatibility: EnchantmentSquaredDependency? = null private var ecoEnchantCompatibility: EcoEnchantDependency? = null @@ -54,11 +51,11 @@ object DependencyManager { if (isFolia) { CustomAnvil.instance.logger.info("Folia detected... Custom Anvil Folia support is experimental. issues are more likely to happens.") } + scheduler = FoliaScheduler() // Packet Manager val forceProtocolib = ConfigHolder.DEFAULT_CONFIG.config.getBoolean("force_protocolib", false) packetManager = PacketManagerSelector.selectPacketManager(forceProtocolib) - externGuiTester = GuiTesterSelector.selectGuiTester // Enchantment Squared dependency if (pluginManager.isPluginEnabled("EnchantsSquared")) { @@ -158,7 +155,7 @@ object DependencyManager { var bypass = bypassEvent.isCancelled // Test if the inventory is a gui(version specific) - if (!bypass && (externGuiTester?.testIfGui(event.view) == true)) bypass = true + if (!bypass && ExternGuiTester.testIfGui(event.view)) bypass = true // Test if in an ax player warp rating gui if (!bypass && (axPlayerWarpsCompatibility?.testIfGui(player) == true)) bypass = true @@ -289,7 +286,7 @@ object DependencyManager { } // Test if the inventory is a gui(version specific) - if (!bypass && (externGuiTester?.testIfGui(event.view) == true)) bypass = true + if (!bypass && ExternGuiTester.testIfGui(event.view)) bypass = true // Test if in an ax player warp rating gui if (!bypass && (axPlayerWarpsCompatibility?.testIfGui(event.player) == true)) bypass = true diff --git a/nms/nms-common/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/ExternGuiTester.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/ExternGuiTester.kt similarity index 73% rename from nms/nms-common/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/ExternGuiTester.kt rename to src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/ExternGuiTester.kt index 0fd38fc..005ce3a 100644 --- a/nms/nms-common/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/ExternGuiTester.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/ExternGuiTester.kt @@ -1,12 +1,16 @@ package xyz.alexcrea.cuanvil.dependency.gui +import org.bukkit.craftbukkit.inventory.CraftInventoryView import org.bukkit.inventory.InventoryView -interface ExternGuiTester { +object ExternGuiTester { - val wesjdAnvilGuiName: String? + fun getContainerClass(view: InventoryView): Class? { + if (view !is CraftInventoryView<*, *>) return null + val container = view.handle - fun getContainerClass(view: InventoryView): Class? + return container.javaClass + } fun testIfGui(view: InventoryView): Boolean { // this mean we are on test @@ -25,7 +29,10 @@ interface ExternGuiTester { } fun expectWesjd(name: String): Boolean { - val expectedWesjdGuiPath = "anvilgui.version.$wesjdAnvilGuiName" + val spigotVer = GuiTesterSelector.spigotVersionString + if(spigotVer == null) return false + + val expectedWesjdGuiPath = "anvilgui.version.Wrapper${spigotVer}" return name.contains(expectedWesjdGuiPath) } @@ -46,4 +53,4 @@ interface ExternGuiTester { return name == expected } -} \ No newline at end of file +} diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/GuiTesterSelector.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/GuiTesterSelector.kt index 298fcf9..038c5db 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/GuiTesterSelector.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/GuiTesterSelector.kt @@ -1,24 +1,21 @@ package xyz.alexcrea.cuanvil.dependency.gui -import xyz.alexcrea.cuanvil.dependency.gui.version.* import xyz.alexcrea.cuanvil.update.UpdateUtils object GuiTesterSelector { - val selectGuiTester: ExternGuiTester? + val spigotVersionString: String? get() { val versionParts = UpdateUtils.currentMinecraftVersionArray() if (versionParts[0] != 1) return null return when (versionParts[1]) { - // Can't support 1.16.5 bc 1.16.5 paper userdev do not exist - 21 -> when (versionParts[2]) { - 0, 1 -> v1_21R1_ExternGuiTester() - 2, 3 -> v1_21R2_ExternGuiTester() - 4 -> v1_21R3_ExternGuiTester() - 5 -> v1_21R4_ExternGuiTester() - 6, 7, 8 -> v1_21R5_ExternGuiTester() + 0, 1 -> "1_21_R1" + 2, 3 -> "1_21_R2" + 4 -> "1_21_R3" + 5 -> "1_21_R4" + 6, 7, 8 -> "1_21_R5" else -> null } diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/scheduler/FoliaScheduler.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/scheduler/FoliaScheduler.kt index da9d8bc..5497860 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/scheduler/FoliaScheduler.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/scheduler/FoliaScheduler.kt @@ -5,9 +5,10 @@ import org.bukkit.Bukkit import org.bukkit.entity.Entity import org.bukkit.plugin.Plugin -class FoliaScheduler : TaskScheduler { +//TODO replace usage of this to in code correct version +class FoliaScheduler { - override fun scheduleGlobally(plugin: Plugin, task: Runnable, time: Long): Any { + fun scheduleGlobally(plugin: Plugin, task: Runnable, time: Long): Any { if (time < 1) { return Bukkit.getGlobalRegionScheduler().run( plugin @@ -20,8 +21,11 @@ class FoliaScheduler : TaskScheduler { ) } + fun scheduleGlobally(plugin: Plugin, task: Runnable): Any?{ + return scheduleGlobally(plugin, task, 0L) + } - override fun scheduleOnEntity(plugin: Plugin, entity: Entity, task: Runnable, time: Long): Any? { + fun scheduleOnEntity(plugin: Plugin, entity: Entity, task: Runnable, time: Long): Any? { if (time < 1) { return entity.scheduler.run( plugin, @@ -36,4 +40,8 @@ class FoliaScheduler : TaskScheduler { time ) } + + fun scheduleOnEntity(plugin: Plugin, entity: Entity, task: Runnable): Any?{ + return scheduleOnEntity(plugin, entity, task, 0L) + } }