mirror of
https://github.com/PlaceholderAPI/PlaceholderAPI
synced 2024-10-31 19:44:03 +01:00
Merge 545f7f0bbdf1e2179d194f831b09ee0a07562f47 into 882b7c59651ed8f3bb64b179691f49eb330b99a1
This commit is contained in:
commit
82641e96bb
@ -61,6 +61,7 @@ import org.bukkit.event.HandlerList;
|
|||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
import org.bukkit.event.player.PlayerQuitEvent;
|
import org.bukkit.event.player.PlayerQuitEvent;
|
||||||
import org.bukkit.event.server.PluginDisableEvent;
|
import org.bukkit.event.server.PluginDisableEvent;
|
||||||
|
import org.bukkit.scheduler.BukkitRunnable;
|
||||||
import org.jetbrains.annotations.ApiStatus;
|
import org.jetbrains.annotations.ApiStatus;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
@ -352,43 +353,48 @@ public final class LocalExpansionManager implements Listener {
|
|||||||
private void registerAll(@NotNull final CommandSender sender) {
|
private void registerAll(@NotNull final CommandSender sender) {
|
||||||
Msg.info("Placeholder expansion registration initializing...");
|
Msg.info("Placeholder expansion registration initializing...");
|
||||||
|
|
||||||
Futures.onMainThread(plugin, findExpansionsOnDisk(), (classes, exception) -> {
|
new BukkitRunnable() {
|
||||||
if (exception != null) {
|
@Override
|
||||||
Msg.severe("Failed to load class files of expansion.", exception);
|
public void run() {
|
||||||
return;
|
Futures.onMainThread(plugin, findExpansionsOnDisk(), (classes, exception) -> {
|
||||||
|
if (exception != null) {
|
||||||
|
Msg.severe("Failed to load class files of expansion.", exception);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
final List<PlaceholderExpansion> registered = classes.stream()
|
||||||
|
.filter(Objects::nonNull)
|
||||||
|
.map(LocalExpansionManager.this::register)
|
||||||
|
.filter(Optional::isPresent)
|
||||||
|
.map(Optional::get)
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
|
final long needsUpdate = registered.stream()
|
||||||
|
.map(expansion -> plugin.getCloudExpansionManager().findCloudExpansionByName(expansion.getName()).orElse(null))
|
||||||
|
.filter(Objects::nonNull)
|
||||||
|
.filter(CloudExpansion::shouldUpdate)
|
||||||
|
.count();
|
||||||
|
|
||||||
|
StringBuilder message = new StringBuilder(registered.size() == 0 ? "&6" : "&a")
|
||||||
|
.append(registered.size())
|
||||||
|
.append(' ')
|
||||||
|
.append("placeholder hook(s) registered!");
|
||||||
|
|
||||||
|
if (needsUpdate > 0) {
|
||||||
|
message.append(' ')
|
||||||
|
.append("&6")
|
||||||
|
.append(needsUpdate)
|
||||||
|
.append(' ')
|
||||||
|
.append("placeholder hook(s) have an update available.");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Msg.msg(sender, message.toString());
|
||||||
|
|
||||||
|
Bukkit.getPluginManager().callEvent(new ExpansionsLoadedEvent(registered));
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
}.runTaskLater(plugin, 1L);
|
||||||
final List<PlaceholderExpansion> registered = classes.stream()
|
|
||||||
.filter(Objects::nonNull)
|
|
||||||
.map(this::register)
|
|
||||||
.filter(Optional::isPresent)
|
|
||||||
.map(Optional::get)
|
|
||||||
.collect(Collectors.toList());
|
|
||||||
|
|
||||||
final long needsUpdate = registered.stream()
|
|
||||||
.map(expansion -> plugin.getCloudExpansionManager().findCloudExpansionByName(expansion.getName()).orElse(null))
|
|
||||||
.filter(Objects::nonNull)
|
|
||||||
.filter(CloudExpansion::shouldUpdate)
|
|
||||||
.count();
|
|
||||||
|
|
||||||
StringBuilder message = new StringBuilder(registered.size() == 0 ? "&6" : "&a")
|
|
||||||
.append(registered.size())
|
|
||||||
.append(' ')
|
|
||||||
.append("placeholder hook(s) registered!");
|
|
||||||
|
|
||||||
if (needsUpdate > 0) {
|
|
||||||
message.append(' ')
|
|
||||||
.append("&6")
|
|
||||||
.append(needsUpdate)
|
|
||||||
.append(' ')
|
|
||||||
.append("placeholder hook(s) have an update available.");
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Msg.msg(sender, message.toString());
|
|
||||||
|
|
||||||
Bukkit.getPluginManager().callEvent(new ExpansionsLoadedEvent(registered));
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void unregisterAll() {
|
private void unregisterAll() {
|
||||||
|
Loading…
Reference in New Issue
Block a user