BREAKING CHANGES: From org.sysapp.runkang10.universalMCAPI to io.gith…

…ub.runkang10.UniversalMCAPI.common
Runkang10 · Oct 24, 2024 · 01910a8 · 01910a8
1 parent 73d6f26
commit 01910a8
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 34 deletions.
diff --git a/src/main/kotlin/io/github/runkang10/UniversalMCAPI/UniversalMCAPI.kt b/src/main/kotlin/io/github/runkang10/UniversalMCAPI/UniversalMCAPI.kt
@@ -1,9 +1,9 @@
-package org.sysapp.runkang10.universalMCAPI
+package io.github.runkang10.UniversalMCAPI
 
+import io.github.runkang10.UniversalMCAPI.common.TryCatchRunner
 import org.bukkit.plugin.java.JavaPlugin
-import org.sysapp.runkang10.universalMCAPI.paper.TryCatchRunner
-import org.sysapp.runkang10.universalMCAPI.paper.plugin.PaperPluginLoader
-import org.sysapp.runkang10.universalMCAPI.paper.console.SendConsoleMessage
+import io.github.runkang10.UniversalMCAPI.paper.PaperPluginLoader
+import io.github.runkang10.UniversalMCAPI.paper.console.SendConsoleMessage
 
 class UniversalMCAPI : JavaPlugin() {
     private lateinit var instance: UniversalMCAPI
@@ -34,6 +34,10 @@ class UniversalMCAPI : JavaPlugin() {
         return instance
     }
 
+    fun getTryCatchRunner(): TryCatchRunner {
+        return tryCatchRunner
+    }
+
     fun getPluginInfo(): PaperPluginLoader {
         return pluginInfo
     }

diff --git a/src/main/kotlin/io/github/runkang10/UniversalMCAPI/common/TryCatchRunner.kt b/src/main/kotlin/io/github/runkang10/UniversalMCAPI/common/TryCatchRunner.kt
@@ -1,4 +1,4 @@
-package io.github.runkang10.UniversalMCAPI
+package io.github.runkang10.UniversalMCAPI.common
 
 import org.bukkit.plugin.java.JavaPlugin
 import io.github.runkang10.UniversalMCAPI.paper.console.SendConsoleMessage

diff --git a/src/main/kotlin/io/github/runkang10/UniversalMCAPI/folia/FoliaAPI.kt b/src/main/kotlin/io/github/runkang10/UniversalMCAPI/folia/FoliaAPI.kt
@@ -1,21 +1,22 @@
-package org.sysapp.runkang10.universalMCAPI.folia
+package io.github.runkang10.UniversalMCAPI.folia
 
+import io.github.runkang10.UniversalMCAPI.common.TryCatchRunner
 import io.papermc.paper.threadedregions.scheduler.GlobalRegionScheduler
 import org.bukkit.Bukkit
 import org.bukkit.plugin.java.JavaPlugin
-import org.sysapp.runkang10.universalMCAPI.UniversalMCAPI
-import org.sysapp.runkang10.universalMCAPI.paper.console.SendConsoleMessage
+import io.github.runkang10.UniversalMCAPI.UniversalMCAPI
+import io.github.runkang10.UniversalMCAPI.paper.console.SendConsoleMessage
 
 class FoliaAPI(private var plugin: JavaPlugin) {
-    private var isfolia: Boolean = this.isFolia()
-    private var logger: SendConsoleMessage = UniversalMCAPI().getServerLogger()
+    private val isfolia: Boolean = this.isFolia()
+    private val trycatchrunner: TryCatchRunner = UniversalMCAPI().getTryCatchRunner()
+    private val logger: SendConsoleMessage = UniversalMCAPI().getServerLogger()
     private lateinit var globalRegionScheduler: GlobalRegionScheduler
 
     fun init() {
-        this.run {
+        if (isfolia)
             globalRegionScheduler = plugin.server.globalRegionScheduler
-            logger.info("Folia configuration has been set up successfully.")
-        }
+            logger.info("Detected Folia server.")
     }
 
     private fun isFolia(): Boolean {
@@ -27,23 +28,27 @@ class FoliaAPI(private var plugin: JavaPlugin) {
         }
     }
 
-    fun runFoliaCode(action: () -> Unit, async: Boolean = false): Boolean {
-        return if (isfolia) {
-            if (async) {
-                Bukkit.getScheduler().runTaskAsynchronously(plugin, Runnable {
-                    action.invoke()
-                })
-            } else {
-                action.invoke()
+    fun runFoliaCode(action: () -> Unit, async: Boolean = false) {
+        trycatchrunner.execute(
+            action = {
+                return@execute if (isfolia) {
+                    if (async) {
+                        Bukkit.getScheduler().runTaskAsynchronously(plugin, Runnable {
+                            action.invoke()
+                        })
+                    } else {
+                        action.invoke()
+                    }
+                    true
+                } else {
+                    logger.warning("=================================================")
+                    logger.warning("  Cannot use `$action` on this server.")
+                    logger.warning("")
+                    logger.warning("  Please check if your server uses Folia.")
+                    logger.warning("=================================================")
+                    false
+                }
             }
-            true
-        } else {
-            logger.warning("=================================================")
-            logger.warning("  Cannot use `$action` on this server.")
-            logger.warning("")
-            logger.warning("  Please check if your server uses Folia.")
-            logger.warning("=================================================")
-            false
-        }
+        )
     }
 }
diff --git a/src/main/kotlin/io/github/runkang10/UniversalMCAPI/paper/PaperPluginLoader.kt b/src/main/kotlin/io/github/runkang10/UniversalMCAPI/paper/PaperPluginLoader.kt
@@ -1,4 +1,4 @@
-package io.github.runkang10.UniversalMCAPI.paper.plugin
+package io.github.runkang10.UniversalMCAPI.paper
 
 import org.bukkit.configuration.file.YamlConfiguration
 import org.bukkit.plugin.java.JavaPlugin

diff --git a/src/main/kotlin/io/github/runkang10/UniversalMCAPI/paper/console/SendConsoleMessage.kt b/src/main/kotlin/io/github/runkang10/UniversalMCAPI/paper/console/SendConsoleMessage.kt
@@ -1,9 +1,9 @@
-package org.sysapp.runkang10.universalMCAPI.paper.console
+package io.github.runkang10.UniversalMCAPI.paper.console
 
 import net.kyori.adventure.text.Component
 import net.kyori.adventure.text.format.NamedTextColor
 import org.bukkit.plugin.java.JavaPlugin
-import org.sysapp.runkang10.universalMCAPI.paper.TryCatchRunner
+import io.github.runkang10.UniversalMCAPI.common.TryCatchRunner
 
 enum class SendConsoleMessageTypes {
     INFO,

diff --git a/src/main/resources/paper-plugin.yml b/src/main/resources/paper-plugin.yml
@@ -1,6 +1,6 @@
 name: UniversalMCAPI
 version: ${version}
-main: org.sysapp.runkang10.universalMCAPI.UniversalMCAPI
+main: ${group}
 api-version: '1.21'
 load: STARTUP
 authors: [ Runkang10 ]