diff --git a/common-util/src/main/java/taboolib/common/OpenAPI.java b/common/src/main/java/taboolib/common/OpenAPI.java similarity index 100% rename from common-util/src/main/java/taboolib/common/OpenAPI.java rename to common/src/main/java/taboolib/common/OpenAPI.java diff --git a/common-util/src/main/java/taboolib/common/OpenListener.java b/common/src/main/java/taboolib/common/OpenListener.java similarity index 100% rename from common-util/src/main/java/taboolib/common/OpenListener.java rename to common/src/main/java/taboolib/common/OpenListener.java diff --git a/common-util/src/main/java/taboolib/common/OpenResult.java b/common/src/main/java/taboolib/common/OpenResult.java similarity index 100% rename from common-util/src/main/java/taboolib/common/OpenResult.java rename to common/src/main/java/taboolib/common/OpenResult.java diff --git a/common/src/main/java/taboolib/common/classloader/IsolatedClassLoader.java b/common/src/main/java/taboolib/common/classloader/IsolatedClassLoader.java index 5f7ba9922..72a084755 100644 --- a/common/src/main/java/taboolib/common/classloader/IsolatedClassLoader.java +++ b/common/src/main/java/taboolib/common/classloader/IsolatedClassLoader.java @@ -51,8 +51,10 @@ public IsolatedClassLoader(URL[] urls, ClassLoader parent) { excludedClasses.add("taboolib.common.ClassAppender$Callback"); // 其他插件访问 - excludedClasses.add("taboolib.common.OpenAPI"); excludedClasses.add("taboolib.common.platform.Plugin"); + excludedClasses.add("taboolib.common.OpenAPI"); + excludedClasses.add("taboolib.common.OpenListener"); + excludedClasses.add("taboolib.common.OpenResult"); // 交叉访问 excludedClasses.add("taboolib.common.LifeCycle"); diff --git a/platform/platform-bukkit-impl/src/main/kotlin/taboolib/platform/type/BukkitContainer.kt b/platform/platform-bukkit-impl/src/main/kotlin/taboolib/platform/type/BukkitContainer.kt index 4fa5d1107..ee472e946 100644 --- a/platform/platform-bukkit-impl/src/main/kotlin/taboolib/platform/type/BukkitContainer.kt +++ b/platform/platform-bukkit-impl/src/main/kotlin/taboolib/platform/type/BukkitContainer.kt @@ -1,12 +1,10 @@ package taboolib.platform.type import org.bukkit.plugin.Plugin -import org.tabooproject.reflex.Reflex.Companion.invokeLocalMethod import org.tabooproject.reflex.Reflex.Companion.invokeMethod import taboolib.common.OpenContainer import taboolib.common.OpenResult import taboolib.common.io.groupId -import taboolib.common.io.isDebugMode import taboolib.common.io.taboolibId /** @@ -22,8 +20,8 @@ class BukkitContainer(val plugin: Plugin) : OpenContainer { private val api = try { Class.forName("${plugin::class.java.groupId}.${taboolibId}.common.OpenAPI") } catch (ex: ClassNotFoundException) { - // 在调试模式下输出错误信息 - if (isDebugMode) ex.printStackTrace() + // 总是输出错误信息 + ex.printStackTrace() null } @@ -39,7 +37,8 @@ class BukkitContainer(val plugin: Plugin) : OpenContainer { return try { OpenResult.cast(api?.invokeMethod("call", name, args, isStatic = true, remap = false) ?: error("OpenAPI not found in ${getName()}")) } catch (ex: NoSuchMethodException) { - if (isDebugMode) ex.printStackTrace() + // 总是输出错误信息 + ex.printStackTrace() OpenResult.failed() } }