From cc3616a074968e23734e7a2418d859967f54fc57 Mon Sep 17 00:00:00 2001 From: ZekerZhayard <41327811+ZekerZhayard@users.noreply.github.com> Date: Fri, 8 Mar 2019 13:38:44 +0800 Subject: [PATCH] Add CSLPluginsLoader (#48) * Add CSLPluginsLoader * Remove plugin loader. Add some events. * Use ServiceLoader to load plugins * Remove PluginClassLoader. --- .../loader/ProfileLoader.java | 2 + .../plugin/ICustomSkinLoaderPlugin.java | 7 ++++ .../customskinloader/plugin/PluginLoader.java | 39 +++++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 Common/source/customskinloader/plugin/ICustomSkinLoaderPlugin.java create mode 100644 Common/source/customskinloader/plugin/PluginLoader.java diff --git a/Common/source/customskinloader/loader/ProfileLoader.java b/Common/source/customskinloader/loader/ProfileLoader.java index dbddc1b..b0f87ac 100644 --- a/Common/source/customskinloader/loader/ProfileLoader.java +++ b/Common/source/customskinloader/loader/ProfileLoader.java @@ -5,6 +5,7 @@ import java.util.HashMap; import com.mojang.authlib.GameProfile; import customskinloader.config.SkinSiteProfile; +import customskinloader.plugin.PluginLoader; import customskinloader.profile.UserProfile; public class ProfileLoader { @@ -23,6 +24,7 @@ public class ProfileLoader { for(IProfileLoader loader:DEFAULT_LOADERS){ loaders.put(loader.getName().toLowerCase(), loader); } + loaders.putAll(PluginLoader.loadPlugins()); return loaders; } diff --git a/Common/source/customskinloader/plugin/ICustomSkinLoaderPlugin.java b/Common/source/customskinloader/plugin/ICustomSkinLoaderPlugin.java new file mode 100644 index 0000000..f30bb4f --- /dev/null +++ b/Common/source/customskinloader/plugin/ICustomSkinLoaderPlugin.java @@ -0,0 +1,7 @@ +package customskinloader.plugin; + +import customskinloader.loader.ProfileLoader; + +public interface ICustomSkinLoaderPlugin { + ProfileLoader.IProfileLoader getProfileLoader(); +} diff --git a/Common/source/customskinloader/plugin/PluginLoader.java b/Common/source/customskinloader/plugin/PluginLoader.java new file mode 100644 index 0000000..c04700d --- /dev/null +++ b/Common/source/customskinloader/plugin/PluginLoader.java @@ -0,0 +1,39 @@ +package customskinloader.plugin; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.ServiceLoader; + +import org.apache.commons.io.FileUtils; + +import customskinloader.CustomSkinLoader; +import customskinloader.loader.ProfileLoader; + +public class PluginLoader { + public static HashMap loadPlugins() { + File pluginsDir = new File(CustomSkinLoader.DATA_DIR, "Plugins"); + ArrayList urls = new ArrayList(); + if (!pluginsDir.isDirectory()) { + pluginsDir.mkdirs(); + } else { + for (File plugin : FileUtils.listFiles(pluginsDir, new String[] {"jar", "zip"}, false)) { + try { + urls.add(plugin.toURI().toURL()); + CustomSkinLoader.logger.info("Found a jar or zip file: " + plugin.getName()); + } catch (MalformedURLException ignored) {} + } + } + ServiceLoader sl = ServiceLoader.load(ICustomSkinLoaderPlugin.class, new URLClassLoader(urls.toArray(new URL[0]), PluginLoader.class.getClassLoader())); + HashMap profileLoaders = new HashMap(); + for (ICustomSkinLoaderPlugin cslPlugin : sl) { + ProfileLoader.IProfileLoader profileLoader = cslPlugin.getProfileLoader(); + profileLoaders.put(profileLoader.getName().toLowerCase(), profileLoader); + CustomSkinLoader.logger.info("Add profile loader: " + profileLoader.getName()); + } + return profileLoaders; + } +}