Upstream
/
HolographicDisplays
mirror of https://github.com/filoghost/HolographicDisplays.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Quick refactoring

This commit is contained in:
filoghost 2022-05-22 00:23:19 +02:00
parent 619bc79cd8
commit 32fc16b2c3
2 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugin/src/main/java/me/filoghost/holographicdisplays/plugin/HolographicDisplays.java
View File

@ -8,6 +8,7 @@ package me.filoghost.holographicdisplays.plugin;
import me.filoghost.fcommons.FCommonsPlugin;
import me.filoghost.fcommons.FeatureSupport;
import me.filoghost.fcommons.logging.ErrorCollector;
import me.filoghost.fcommons.logging.Log;
import me.filoghost.holographicdisplays.api.beta.HolographicDisplaysAPI;
import me.filoghost.holographicdisplays.core.HolographicDisplaysCore;
import me.filoghost.holographicdisplays.core.base.ImmutablePosition;
@ -29,6 +30,7 @@ import me.filoghost.holographicdisplays.plugin.internal.placeholder.AnimationPla
import me.filoghost.holographicdisplays.plugin.internal.placeholder.DefaultPlaceholders;
import me.filoghost.holographicdisplays.plugin.listener.UpdateNotificationListener;
import me.filoghost.holographicdisplays.plugin.log.PrintableErrorCollector;
import me.filoghost.updatechecker.UpdateChecker;
import org.bstats.bukkit.MetricsLite;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
@ -94,16 +96,12 @@ public class HolographicDisplays extends FCommonsPlugin {
internalHologramEditor = new InternalHologramEditor(internalHologramManager, configManager);
new HologramCommandManager(this, internalHologramEditor).register(this);
// Listener
UpdateNotificationListener updateNotificationListener = new UpdateNotificationListener();
registerListener(updateNotificationListener);
// Setup external plugin hooks
PlaceholderAPIHook.setup();
// Register bStats metrics
int pluginID = 3123;
new MetricsLite(this, pluginID);
int bStatsPluginID = 3123;
new MetricsLite(this, bStatsPluginID);
// Log all loading errors at the end
if (errorCollector.hasErrors()) {
@ -112,7 +110,15 @@ public class HolographicDisplays extends FCommonsPlugin {
}
// Run the update checker
updateNotificationListener.runAsyncUpdateCheck(this);
if (Settings.updateNotification) {
int bukkitPluginID = 75097;
UpdateChecker.run(this, bukkitPluginID, (String newVersion) -> {
registerListener(new UpdateNotificationListener(newVersion));
Log.info("Found a new version available: " + newVersion);
Log.info("Download it on Bukkit Dev:");
Log.info("https://dev.bukkit.org/projects/holographic-displays");
});
}
}
public void load(ErrorCollector errorCollector) {

20
plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/UpdateNotificationListener.java
View File

@ -5,37 +5,25 @@
*/
package me.filoghost.holographicdisplays.plugin.listener;
import me.filoghost.fcommons.logging.Log;
import me.filoghost.holographicdisplays.plugin.HolographicDisplays;
import me.filoghost.holographicdisplays.plugin.Permissions;
import me.filoghost.holographicdisplays.plugin.config.Settings;
import me.filoghost.holographicdisplays.plugin.format.ColorScheme;
import me.filoghost.updatechecker.UpdateChecker;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
import org.jetbrains.annotations.Nullable;
public class UpdateNotificationListener implements Listener {
// The new version found by the updater, null if there is no new version
private @Nullable String newVersion;
private final String newVersion;
public void runAsyncUpdateCheck(HolographicDisplays holographicDisplays) {
if (Settings.updateNotification) {
UpdateChecker.run(holographicDisplays, 75097, newVersion -> {
this.newVersion = newVersion;
Log.info("Found a new version available: " + newVersion);
Log.info("Download it on Bukkit Dev:");
Log.info("https://dev.bukkit.org/projects/holographic-displays");
});
}
public UpdateNotificationListener(String newVersion) {
this.newVersion = newVersion;
}
@EventHandler
public void onJoin(PlayerJoinEvent event) {
if (Settings.updateNotification && newVersion != null) {
if (Settings.updateNotification) {
Player player = event.getPlayer();
if (player.hasPermission(Permissions.UPDATE_NOTIFICATION)) {