BLOCKFANTASY
/
LOOHP-Limbo
Template
mirror of https://github.com/LOOHP/Limbo.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #88 from Kas-tle/feature/prefer-limbo-yml 

Prefer use of limbo.yml for plugin loading
This commit is contained in:
LOOHP 2025-07-17 20:34:46 +01:00 committed by GitHub
parent b19bba7140 a0382bd64c
commit 94ad6d8460
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 61 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/com/loohp/limbo/plugins/PluginManager.java
View File

@ -55,18 +55,35 @@ public class PluginManager {
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;
ZipEntry pluginYmlEntry = null;
while (true) { while (true) {
ZipEntry entry = zip.getNextEntry(); ZipEntry entry = zip.getNextEntry();
if (entry == null) { if (entry == null) {
break; break;
} }
String name = entry.getName(); String name = entry.getName();
if (name.endsWith("plugin.yml") || name.endsWith("limbo.yml")) { if (name.endsWith("limbo.yml")) {
found = true; limboYmlEntry = entry;
} else if (name.endsWith("plugin.yml")) {
pluginYmlEntry = entry;
}
}
FileConfiguration pluginYaml = new FileConfiguration(zip); ZipEntry chosenEntry = limboYmlEntry != null ? limboYmlEntry : pluginYmlEntry;
if (chosenEntry != null) {
try (ZipInputStream processZip = new ZipInputStream(new FileInputStream(file))) {
while (true) {
ZipEntry currentEntry = processZip.getNextEntry();
if (currentEntry == null) {
break;
}
if (currentEntry.getName().equals(chosenEntry.getName())) {
FileConfiguration pluginYaml = new FileConfiguration(processZip);
String main = pluginYaml.get("main", String.class); String main = pluginYaml.get("main", String.class);
String pluginName = pluginYaml.get("name", String.class); String pluginName = pluginYaml.get("name", String.class);
@ -74,6 +91,7 @@ public class PluginManager {
System.err.println("Ambiguous plugin name in " + file.getName() + " with the plugin \"" + plugins.get(pluginName).getClass().getName() + "\""); System.err.println("Ambiguous plugin name in " + file.getName() + " with the plugin \"" + plugins.get(pluginName).getClass().getName() + "\"");
break; break;
} }
URLClassLoader child = new URLClassLoader(new URL[]{file.toURI().toURL()}, Limbo.getInstance().getClass().getClassLoader()); URLClassLoader child = new URLClassLoader(new URL[]{file.toURI().toURL()}, Limbo.getInstance().getClass().getClassLoader());
Class<?> clazz = Class.forName(main, true, child); Class<?> clazz = Class.forName(main, true, child);
LimboPlugin plugin = (LimboPlugin) clazz.getDeclaredConstructor().newInstance(); LimboPlugin plugin = (LimboPlugin) clazz.getDeclaredConstructor().newInstance();
@ -84,13 +102,14 @@ public class PluginManager {
break; break;
} }
} }
}
} else {
System.err.println("Jar file " + file.getName() + " has no plugin.yml or limbo.yml!");
}
} catch (Exception e) { } catch (Exception e) {
System.err.println("Unable to load plugin \"" + file.getName() + "\""); System.err.println("Unable to load plugin \"" + file.getName() + "\"");
e.printStackTrace(); e.printStackTrace();
} }
if (!found) {
System.err.println("Jar file " + file.getName() + " has no plugin.yml!");
}
} }
} }
} }