Prefer use of limbo.yml ofr plugin loading

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
This commit is contained in:
Joshua Castle 2025-07-14 09:22:11 -07:00
parent 1bfe4cf7d4
commit a0382bd64c
No known key found for this signature in database
GPG Key ID: 7ECA1A2FC38ABA9F
1 changed files with 61 additions and 42 deletions

View File

@ -52,48 +52,67 @@ public class PluginManager {
this.plugins = new LinkedHashMap<>(); this.plugins = new LinkedHashMap<>();
} }
protected void loadPlugins() { protected void loadPlugins() {
for (File file : pluginFolder.listFiles()) { for (File file : pluginFolder.listFiles()) {
if (file.isFile() && file.getName().endsWith(".jar")) { if (file.isFile() && file.getName().endsWith(".jar")) {
boolean found = false; try (ZipInputStream zip = new ZipInputStream(new FileInputStream(file))) {
try (ZipInputStream zip = new ZipInputStream(new FileInputStream(file))) { ZipEntry limboYmlEntry = null;
while (true) { ZipEntry pluginYmlEntry = null;
ZipEntry entry = zip.getNextEntry();
if (entry == null) { while (true) {
break; ZipEntry entry = zip.getNextEntry();
} if (entry == null) {
String name = entry.getName(); break;
if (name.endsWith("plugin.yml") || name.endsWith("limbo.yml")) { }
found = true; String name = entry.getName();
if (name.endsWith("limbo.yml")) {
FileConfiguration pluginYaml = new FileConfiguration(zip); limboYmlEntry = entry;
String main = pluginYaml.get("main", String.class); } else if (name.endsWith("plugin.yml")) {
String pluginName = pluginYaml.get("name", String.class); pluginYmlEntry = entry;
}
if (plugins.containsKey(pluginName)) { }
System.err.println("Ambiguous plugin name in " + file.getName() + " with the plugin \"" + plugins.get(pluginName).getClass().getName() + "\"");
break; ZipEntry chosenEntry = limboYmlEntry != null ? limboYmlEntry : pluginYmlEntry;
}
URLClassLoader child = new URLClassLoader(new URL[] {file.toURI().toURL()}, Limbo.getInstance().getClass().getClassLoader()); if (chosenEntry != null) {
Class<?> clazz = Class.forName(main, true, child); try (ZipInputStream processZip = new ZipInputStream(new FileInputStream(file))) {
LimboPlugin plugin = (LimboPlugin) clazz.getDeclaredConstructor().newInstance(); while (true) {
plugin.setInfo(pluginYaml, file); ZipEntry currentEntry = processZip.getNextEntry();
plugins.put(plugin.getName(), plugin); if (currentEntry == null) {
plugin.onLoad(); break;
Limbo.getInstance().getConsole().sendMessage("Loading plugin " + file.getName() + " " + plugin.getInfo().getVersion() + " by " + plugin.getInfo().getAuthor()); }
break;
} if (currentEntry.getName().equals(chosenEntry.getName())) {
} FileConfiguration pluginYaml = new FileConfiguration(processZip);
} catch (Exception e) { String main = pluginYaml.get("main", String.class);
System.err.println("Unable to load plugin \"" + file.getName() + "\""); String pluginName = pluginYaml.get("name", String.class);
e.printStackTrace();
} if (plugins.containsKey(pluginName)) {
if (!found) { System.err.println("Ambiguous plugin name in " + file.getName() + " with the plugin \"" + plugins.get(pluginName).getClass().getName() + "\"");
System.err.println("Jar file " + file.getName() + " has no plugin.yml!"); break;
} }
}
} URLClassLoader child = new URLClassLoader(new URL[]{file.toURI().toURL()}, Limbo.getInstance().getClass().getClassLoader());
} Class<?> clazz = Class.forName(main, true, child);
LimboPlugin plugin = (LimboPlugin) clazz.getDeclaredConstructor().newInstance();
plugin.setInfo(pluginYaml, file);
plugins.put(plugin.getName(), plugin);
plugin.onLoad();
Limbo.getInstance().getConsole().sendMessage("Loading plugin " + file.getName() + " " + plugin.getInfo().getVersion() + " by " + plugin.getInfo().getAuthor());
break;
}
}
}
} else {
System.err.println("Jar file " + file.getName() + " has no plugin.yml or limbo.yml!");
}
} catch (Exception e) {
System.err.println("Unable to load plugin \"" + file.getName() + "\"");
e.printStackTrace();
}
}
}
}
public List<LimboPlugin> getPlugins() { public List<LimboPlugin> getPlugins() {
return new ArrayList<>(plugins.values()); return new ArrayList<>(plugins.values());