SpigotMC-Mirrors
/
PlaceholderAPI
mirror of https://github.com/PlaceholderAPI/PlaceholderAPI
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleaned up fileutil and expansion manager

This commit is contained in:
Sxtanna 2020-07-20 18:55:37 -04:00
parent 42992de312
commit e7ce84e7fc
2 changed files with 229 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

191
src/main/java/me/clip/placeholderapi/expansion/ExpansionManager.java
View File

@ -28,29 +28,42 @@ import me.clip.placeholderapi.util.FileUtil;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File; import java.io.File;
import java.lang.reflect.Constructor;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.logging.Level;
public final class ExpansionManager { public final class ExpansionManager
{
@NotNull
private final File folder;
@NotNull
private final PlaceholderAPIPlugin plugin; private final PlaceholderAPIPlugin plugin;
public ExpansionManager(PlaceholderAPIPlugin instance) { public ExpansionManager(@NotNull final PlaceholderAPIPlugin plugin)
plugin = instance; {
this.plugin = plugin;
this.folder = new File(plugin.getDataFolder(), "expansions");
File f = new File(PlaceholderAPIPlugin.getInstance().getDataFolder(), "expansions"); if (!this.folder.exists() && !folder.mkdirs())
if (!f.exists()) { {
f.mkdirs(); plugin.getLogger().log(Level.WARNING, "failed to create expansions folder!");
} }
} }
public PlaceholderExpansion getRegisteredExpansion(String name) { public PlaceholderExpansion getRegisteredExpansion(String name)
for (Entry<String, PlaceholderHook> hook : PlaceholderAPI.getPlaceholders().entrySet()) { {
if (hook.getValue() instanceof PlaceholderExpansion) { for (Entry<String, PlaceholderHook> hook : PlaceholderAPI.getPlaceholders().entrySet())
if (name.equalsIgnoreCase(hook.getKey())) { {
if (hook.getValue() instanceof PlaceholderExpansion)
{
if (name.equalsIgnoreCase(hook.getKey()))
{
return (PlaceholderExpansion) hook.getValue(); return (PlaceholderExpansion) hook.getValue();
} }
} }
@ -59,30 +72,41 @@ public final class ExpansionManager {
return null; return null;
} }
public boolean registerExpansion(PlaceholderExpansion expansion) { public boolean registerExpansion(@NotNull final PlaceholderExpansion expansion)
if (expansion == null || expansion.getIdentifier() == null) { {
if (expansion.getIdentifier() == null)
{
return false; return false;
} }
if (expansion instanceof Configurable) { if (expansion instanceof Configurable)
{
Map<String, Object> defaults = ((Configurable) expansion).getDefaults(); Map<String, Object> defaults = ((Configurable) expansion).getDefaults();
String pre = "expansions." + expansion.getIdentifier() + "."; String pre = "expansions." + expansion.getIdentifier() + ".";
FileConfiguration cfg = plugin.getConfig(); FileConfiguration cfg = plugin.getConfig();
boolean save = false; boolean save = false;
if (defaults != null) { if (defaults != null)
for (Entry<String, Object> entries : defaults.entrySet()) { {
if (entries.getKey() == null || entries.getKey().isEmpty()) { for (Entry<String, Object> entries : defaults.entrySet())
{
if (entries.getKey() == null || entries.getKey().isEmpty())
{
continue; continue;
} }
if (entries.getValue() == null) { if (entries.getValue() == null)
if (cfg.contains(pre + entries.getKey())) { {
if (cfg.contains(pre + entries.getKey()))
{
save = true; save = true;
cfg.set(pre + entries.getKey(), null); cfg.set(pre + entries.getKey(), null);
} }
} else { }
if (!cfg.contains(pre + entries.getKey())) { else
{
if (!cfg.contains(pre + entries.getKey()))
{
save = true; save = true;
cfg.set(pre + entries.getKey(), entries.getValue()); cfg.set(pre + entries.getKey(), entries.getValue());
} }
@ -90,15 +114,18 @@ public final class ExpansionManager {
} }
} }
if (save) { if (save)
{
plugin.saveConfig(); plugin.saveConfig();
plugin.reloadConfig(); plugin.reloadConfig();
} }
} }
if (expansion instanceof VersionSpecific) { if (expansion instanceof VersionSpecific)
{
VersionSpecific nms = (VersionSpecific) expansion; VersionSpecific nms = (VersionSpecific) expansion;
if (!nms.isCompatibleWith(PlaceholderAPIPlugin.getServerVersion())) { if (!nms.isCompatibleWith(PlaceholderAPIPlugin.getServerVersion()))
{
plugin.getLogger() plugin.getLogger()
.info( .info(
"Your server version is not compatible with expansion: " + expansion.getIdentifier() "Your server version is not compatible with expansion: " + expansion.getIdentifier()
@ -107,32 +134,33 @@ public final class ExpansionManager {
} }
} }
if (!expansion.canRegister()) { if (!expansion.canRegister() || !expansion.register())
{
return false; return false;
} }
if (!expansion.register()) { if (expansion instanceof Listener)
return false; {
} Bukkit.getPluginManager().registerEvents(((Listener) expansion), plugin);
if (expansion instanceof Listener) {
Listener l = (Listener) expansion;
Bukkit.getPluginManager().registerEvents(l, plugin);
} }
plugin.getLogger().info("Successfully registered expansion: " + expansion.getIdentifier()); plugin.getLogger().info("Successfully registered expansion: " + expansion.getIdentifier());
if (expansion instanceof Taskable) { if (expansion instanceof Taskable)
{
((Taskable) expansion).start(); ((Taskable) expansion).start();
} }
if (plugin.getExpansionCloud() != null) { if (plugin.getExpansionCloud() != null)
CloudExpansion ce = plugin.getExpansionCloud().getCloudExpansion(expansion.getIdentifier()); {
final CloudExpansion cloudExpansion = plugin.getExpansionCloud().getCloudExpansion(expansion.getIdentifier());
if (ce != null) { if (cloudExpansion != null)
ce.setHasExpansion(true); {
if (!ce.getLatestVersion().equals(expansion.getVersion())) { cloudExpansion.setHasExpansion(true);
ce.setShouldUpdate(true); if (!cloudExpansion.getLatestVersion().equals(expansion.getVersion()))
{
cloudExpansion.setShouldUpdate(true);
} }
} }
} }
@ -141,73 +169,66 @@ public final class ExpansionManager {
} }
public PlaceholderExpansion registerExpansion(String fileName) { @Nullable
List<Class<?>> subs = FileUtil.getClasses("expansions", fileName, PlaceholderExpansion.class); public PlaceholderExpansion registerExpansion(@NotNull final String fileName)
if (subs == null || subs.isEmpty()) { {
final List<Class<? extends PlaceholderExpansion>> subs = FileUtil.getClasses(folder, PlaceholderExpansion.class, fileName);
if (subs.isEmpty())
{
return null; return null;
} }
// only register the first instance found as an expansion jar should only have 1 class // only register the first instance found as an expansion jar should only have 1 class
// extending PlaceholderExpansion // extending PlaceholderExpansion
PlaceholderExpansion ex = createInstance(subs.get(0)); final PlaceholderExpansion expansion = createInstance(subs.get(0));
if (registerExpansion(ex)) { if (expansion != null && registerExpansion(expansion))
return ex; {
return expansion;
} }
return null; return null;
} }
public void registerAllExpansions() { public void registerAllExpansions()
if (plugin == null) { {
final List<@NotNull Class<? extends PlaceholderExpansion>> subs = FileUtil.getClasses(folder, PlaceholderExpansion.class);
if (subs.isEmpty())
{
return; return;
} }
List<Class<?>> subs = FileUtil.getClasses("expansions", null, PlaceholderExpansion.class); for (final Class<? extends PlaceholderExpansion> clazz : subs)
if (subs == null || subs.isEmpty()) { {
return; final PlaceholderExpansion expansion = createInstance(clazz);
if (expansion == null)
{
continue;
} }
for (Class<?> klass : subs) { try
PlaceholderExpansion ex = createInstance(klass); {
if (ex != null) { registerExpansion(expansion);
try {
registerExpansion(ex);
} catch (Exception e) {
plugin.getLogger().info("Couldn't register " + ex.getIdentifier() + " expansion");
e.printStackTrace();
} }
catch (final Exception ex)
{
plugin.getLogger().log(Level.WARNING, "Couldn't register " + expansion.getIdentifier() + " expansion", ex);
} }
} }
} }
private PlaceholderExpansion createInstance(Class<?> klass) { @Nullable
if (klass == null) { private PlaceholderExpansion createInstance(@NotNull final Class<? extends PlaceholderExpansion> clazz)
{
try
{
return clazz.getDeclaredConstructor().newInstance();
}
catch (final Throwable ex)
{
plugin.getLogger().log(Level.SEVERE, "Failed to load placeholder expansion from class: " + clazz.getName(), ex);
}
return null; return null;
} }
PlaceholderExpansion ex = null;
if (!PlaceholderExpansion.class.isAssignableFrom(klass)) {
return null;
}
try {
Constructor<?>[] c = klass.getConstructors();
if (c.length == 0) {
ex = (PlaceholderExpansion) klass.newInstance();
} else {
for (Constructor<?> con : c) {
if (con.getParameterTypes().length == 0) {
ex = (PlaceholderExpansion) klass.newInstance();
break;
}
}
}
} catch (Throwable t) {
plugin.getLogger()
.severe("Failed to init placeholder expansion from class: " + klass.getName());
plugin.getLogger().severe(t.getMessage());
}
return ex;
}
} }

100
src/main/java/me/clip/placeholderapi/util/FileUtil.java
View File

@ -20,89 +20,85 @@
*/ */
package me.clip.placeholderapi.util; package me.clip.placeholderapi.util;
import me.clip.placeholderapi.PlaceholderAPIPlugin; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File; import java.io.File;
import java.io.FilenameFilter; import java.io.FilenameFilter;
import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.jar.JarEntry; import java.util.jar.JarEntry;
import java.util.jar.JarInputStream; import java.util.jar.JarInputStream;
public class FileUtil { public class FileUtil
{
public static List<Class<?>> getClasses(String folder, Class<?> type) { @NotNull
return getClasses(folder, null, type); public static <T> List<@NotNull Class<? extends T>> getClasses(@NotNull final File folder, @NotNull final Class<T> clazz)
{
return getClasses(folder, clazz, null);
} }
public static List<Class<?>> getClasses(String folder, String fileName, Class<?> type) { @NotNull
List<Class<?>> list = new ArrayList<>(); public static <T> List<@NotNull Class<? extends T>> getClasses(@NotNull final File folder, @NotNull final Class<T> clazz, @Nullable final String target)
{
try { if (!folder.exists())
File f = new File(PlaceholderAPIPlugin.getInstance().getDataFolder(), folder); {
if (!f.exists()) { return Collections.emptyList();
return list;
} }
FilenameFilter fileNameFilter = (dir, name) -> { try
if (fileName != null) { {
return name.endsWith(".jar") && name.replace(".jar", "") final FilenameFilter filter =
.equalsIgnoreCase(fileName.replace(".jar", "")); (dir, name) -> name.endsWith(".jar") && (target == null || name.replace(".jar", "").equalsIgnoreCase(target.replace(".jar", "")));
final File[] jars = folder.listFiles(filter);
if (jars == null)
{
return Collections.emptyList();
} }
return name.endsWith(".jar"); final List<@NotNull Class<? extends T>> list = new ArrayList<>();
};
File[] jars = f.listFiles(fileNameFilter); for (File file : jars)
if (jars == null) { {
return list; gather(file.toURI().toURL(), clazz, list);
}
for (File file : jars) {
list = gather(file.toURI().toURL(), list, type);
} }
return list; return list;
} catch (Throwable t) { }
catch (Throwable t)
{
// THIS SHOULD NOT BE EATEN LIKE THIS.
} }
return null; return Collections.emptyList();
} }
private static List<Class<?>> gather(URL jar, List<Class<?>> list, Class<?> clazz) { private static <T> void gather(@NotNull final URL jar, @NotNull final Class<T> clazz, @NotNull final List<@NotNull Class<? extends T>> list) throws IOException, ClassNotFoundException
if (list == null) { {
list = new ArrayList<>(); try (final URLClassLoader loader = new URLClassLoader(new URL[]{jar}, clazz.getClassLoader()); final JarInputStream stream = new JarInputStream(jar.openStream()))
} {
JarEntry entry;
try (URLClassLoader cl = new URLClassLoader(new URL[]{jar}, clazz.getClassLoader()); while ((entry = stream.getNextJarEntry()) != null)
JarInputStream jis = new JarInputStream(jar.openStream())) { {
final String name = entry.getName();
while (true) { if (name == null || name.isEmpty() || !name.endsWith(".class"))
JarEntry j = jis.getNextJarEntry(); {
if (j == null) {
break;
}
String name = j.getName();
if (name == null || name.isEmpty()) {
continue; continue;
} }
if (name.endsWith(".class")) { final Class<?> loaded = loader.loadClass(name.substring(0, name.lastIndexOf('.')).replace('/', '.'));
name = name.replace("/", "."); if (clazz.isAssignableFrom(loaded))
String cname = name.substring(0, name.lastIndexOf(".class")); {
list.add(loaded.asSubclass(clazz));
Class<?> c = cl.loadClass(cname);
if (clazz.isAssignableFrom(c)) {
list.add(c);
} }
} }
} }
} catch (Throwable t) {
} }
return list;
}
} }