diff --git a/nms/v1_21R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/scheduler/FoliaScheduler.kt b/nms/v1_20R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/scheduler/FoliaScheduler.kt similarity index 56% rename from nms/v1_21R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/scheduler/FoliaScheduler.kt rename to nms/v1_20R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/scheduler/FoliaScheduler.kt index 3318b94..a9bd79f 100644 --- a/nms/v1_21R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/scheduler/FoliaScheduler.kt +++ b/nms/v1_20R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/scheduler/FoliaScheduler.kt @@ -10,13 +10,12 @@ class FoliaScheduler : TaskScheduler { override fun scheduleGlobally(plugin: Plugin, task: Runnable, time: Long): Any? { if(time < 1){ return Bukkit.getGlobalRegionScheduler().run( - plugin, - Consumer { scheduledTask: ScheduledTask? -> task.run() } - ) + plugin + ) { scheduledTask: ScheduledTask? -> task.run() } } return Bukkit.getGlobalRegionScheduler().runDelayed( plugin, - Consumer { scheduledTask: ScheduledTask? -> task.run() }, + { scheduledTask: ScheduledTask? -> task.run() }, time ) } @@ -26,27 +25,16 @@ class FoliaScheduler : TaskScheduler { if(time < 1){ return entity.scheduler.run( plugin, - Consumer { scheduledTask: ScheduledTask? -> task.run() }, - Runnable {} + { scheduledTask: ScheduledTask? -> task.run() }, + {} ) } return entity.scheduler.runDelayed( plugin, - Consumer { scheduledTask: ScheduledTask? -> task.run() }, - Runnable {}, + { scheduledTask: ScheduledTask? -> task.run() }, + {}, time ) } - - companion object { - fun isFolia(): Boolean { - try { - Class.forName("io.papermc.paper.threadedregions.RegionizedServer") - return true - } catch (e: ClassNotFoundException) { - return false - } - } - } } diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt index 0a5246b..f122068 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt @@ -25,7 +25,7 @@ object DependencyManager { val pluginManager = Bukkit.getPluginManager() // Bukkit or Paper scheduler ? - isFolia = FoliaScheduler.isFolia() + isFolia = testIsFolia() scheduler = if(isFolia) { CustomAnvil.instance.logger.info("Folia detected... Custom Anvil Folia support is experimental. issues are more likely to happens.") @@ -92,4 +92,14 @@ object DependencyManager { return bypass } + + private fun testIsFolia(): Boolean { + try { + Class.forName("io.papermc.paper.threadedregions.RegionizedServer") + return true + } catch (e: ClassNotFoundException) { + return false + } + } + }