WebSocket API

Author: cyhcyh2

ModuLake-Server/src/main/java/com/eternalstarmc/modulake/dependency/InjectManagerImpl.java

@@ -74,6 +74,7 @@ private Object createDependency(Class<?> type, Object object, Class<?> objectCla
                 log.warn("无法为 {} 创建依赖，请检查是否已注册依赖创建器，需注入依赖的类实例 {}", type, object);
                 return null;
             }
+            return creator.createDependency(object);
         }
         creator = dependenciesAll.get(type);
         if (creator == null) {
@@ -88,5 +89,6 @@ private Object createDependency(Class<?> type, Object object, Class<?> objectCla
 
     public void cleanup() {
         dependenciesAll.clear();
+        dependenciesOnly.clear();
     }
 }

ModuLake-Server/src/main/java/com/eternalstarmc/modulake/plugin/PluginClassLoaderImpl.java

@@ -9,8 +9,6 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import static com.eternalstarmc.modulake.Main.PLUGIN_MANAGER;
-
 
 @Impl("PLUGIN_SYSTEM, PluginClassLoaderImpl")
 public class PluginClassLoaderImpl extends PluginClassLoader {
@@ -22,17 +20,22 @@ public PluginClassLoaderImpl(URL[] urls) {
     }
 
     @Override
-    protected Class<?> findClass (String name) throws ClassNotFoundException {
-        try {return super.findClass(name);} catch (ClassNotFoundException ignored) {}
-
-        PluginManagerImpl manager = (PluginManagerImpl) PLUGIN_MANAGER;
-        for (AbsPlugin absPlugin : manager.getPluginsMap().values()) {
-            PluginClassLoaderImpl loader = (PluginClassLoaderImpl) absPlugin.getClassLoader();
-            return loader.findClass0(name);
+    protected Class<?> findClass(String name) throws ClassNotFoundException {
+        try {
+            return super.findClass(name);
+        } catch (ClassNotFoundException ignored) {}
+
+        // 遍历所有依赖，直到找到类或全部检查完
+        for (PluginClassLoaderImpl clazzLoader : dependencies.values()) {
+            try {
+                return clazzLoader.findClass0(name);
+            } catch (ClassNotFoundException ignored) {
+            }
         }
         throw new ClassNotFoundException(name);
     }
 
+
     protected Class<?> findClass0 (String name) throws ClassNotFoundException {
         return super.findClass(name);
     }