update topper

Author: HSGamer

plugin/src/main/java/me/hsgamer/topper/spigot/plugin/TopperPlugin.java

@@ -12,27 +12,24 @@
 import me.hsgamer.topper.spigot.plugin.config.MessageConfig;
 import me.hsgamer.topper.spigot.plugin.hook.HookSystem;
 import me.hsgamer.topper.spigot.plugin.listener.JoinListener;
-import me.hsgamer.topper.spigot.plugin.manager.NameProviderManager;
 import me.hsgamer.topper.spigot.plugin.manager.ValueProviderManager;
 import me.hsgamer.topper.spigot.plugin.template.SpigotStorageSupplierTemplate;
 import me.hsgamer.topper.spigot.plugin.template.SpigotTopTemplate;
 import org.bstats.bukkit.Metrics;
+import org.bukkit.Bukkit;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Level;
 
 public class TopperPlugin extends BasePlugin {
-    public static final String GROUP = "topper";
-
     @Override
     protected List<Object> getComponents() {
         return Arrays.asList(
                 ConfigGenerator.newInstance(MainConfig.class, new BukkitConfig(this)),
                 ConfigGenerator.newInstance(MessageConfig.class, new BukkitConfig(this, "messages.yml")),
 
                 new ValueProviderManager(),
-                new NameProviderManager(),
 
                 new HookSystem(this),
 
@@ -51,6 +48,7 @@ protected List<Object> getComponents() {
     @Override
     public void load() {
         MessageUtils.setPrefix(get(MessageConfig.class)::getPrefix);
+        get(SpigotTopTemplate.class).getNameProviderManager().setDefaultNameProvider(uuid -> Bukkit.getOfflinePlayer(uuid).getName());
     }
 
     @Override

plugin/src/main/java/me/hsgamer/topper/spigot/plugin/hook/lastloginapi/LastLoginAPIHook.java

@@ -4,9 +4,8 @@
 import com.alessiodp.lastloginapi.api.interfaces.LastLoginPlayer;
 import io.github.projectunified.minelib.plugin.base.Loadable;
 import me.hsgamer.topper.spigot.plugin.TopperPlugin;
-import me.hsgamer.topper.spigot.plugin.manager.NameProviderManager;
+import me.hsgamer.topper.spigot.plugin.template.SpigotTopTemplate;
 
-import java.util.Optional;
 import java.util.UUID;
 
 import static com.alessiodp.lastloginapi.api.LastLogin.getApi;
@@ -21,7 +20,7 @@ public LastLoginAPIHook(TopperPlugin plugin) {
 
     @Override
     public void enable() {
-        disableRunnable = plugin.get(NameProviderManager.class).addNameProvider(this::getName);
+        disableRunnable = plugin.get(SpigotTopTemplate.class).getNameProviderManager().addNameProvider(this::getName);
     }
 
     @Override
@@ -31,9 +30,10 @@ public void disable() {
         }
     }
 
-    private Optional<String> getName(UUID uuid) {
+    private String getName(UUID uuid) {
         LastLoginAPI api = getApi();
         LastLoginPlayer player = api.getPlayer(uuid);
-        return Optional.of(player.getName()).filter(name -> !name.isEmpty());
+        String name = player.getName();
+        return name.isEmpty() ? null : name;
     }
 }

plugin/src/main/java/me/hsgamer/topper/spigot/plugin/hook/luckperms/LuckPermsHook.java

@@ -2,13 +2,11 @@
 
 import io.github.projectunified.minelib.plugin.base.Loadable;
 import me.hsgamer.topper.spigot.plugin.TopperPlugin;
-import me.hsgamer.topper.spigot.plugin.manager.NameProviderManager;
+import me.hsgamer.topper.spigot.plugin.template.SpigotTopTemplate;
 import net.luckperms.api.LuckPerms;
 import net.luckperms.api.LuckPermsProvider;
 import net.luckperms.api.model.user.User;
 
-import java.util.Optional;
-
 public class LuckPermsHook implements Loadable {
     private final TopperPlugin instance;
     private Runnable disableRunnable;
@@ -23,7 +21,13 @@ public void enable() {
         TopContextCalculator contextCalculator = new TopContextCalculator(instance);
         api.getContextManager().registerCalculator(contextCalculator);
 
-        Runnable unregisterNameProvider = instance.get(NameProviderManager.class).addNameProvider(uuid -> Optional.ofNullable(api.getUserManager().getUser(uuid)).map(User::getUsername));
+        Runnable unregisterNameProvider = instance.get(SpigotTopTemplate.class).getNameProviderManager().addNameProvider(uuid -> {
+            User user = api.getUserManager().getUser(uuid);
+            if (user == null) {
+                return null;
+            }
+            return user.getUsername();
+        });
 
         disableRunnable = () -> {
             api.getContextManager().unregisterCalculator(contextCalculator);

plugin/src/main/java/me/hsgamer/topper/spigot/plugin/manager/NameProviderManager.java

@@ -11,7 +11,6 @@
 import me.hsgamer.topper.spigot.plugin.TopperPlugin;
 import me.hsgamer.topper.spigot.plugin.config.MainConfig;
 import me.hsgamer.topper.spigot.plugin.event.GenericEntryUpdateEvent;
-import me.hsgamer.topper.spigot.plugin.manager.NameProviderManager;
 import me.hsgamer.topper.spigot.plugin.manager.ValueProviderManager;
 import me.hsgamer.topper.spigot.query.forward.plugin.PluginContext;
 import me.hsgamer.topper.storage.core.DataStorage;
@@ -50,11 +49,6 @@ public Optional<ValueProvider<UUID, Double>> createValueProvider(Map<String, Obj
         return plugin.get(ValueProviderManager.class).build(settings);
     }
 
-    @Override
-    public String getName(UUID uuid) {
-        return plugin.get(NameProviderManager.class).getName(uuid);
-    }
-
     @Override
     public Agent createTaskAgent(Runnable runnable, boolean async, long delay) {
         return new SpigotRunnableAgent(runnable, async ? AsyncScheduler.get(plugin) : GlobalScheduler.get(plugin), delay);

plugin/src/main/java/me/hsgamer/topper/spigot/plugin/template/SpigotTopTemplate.java

@@ -48,7 +48,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <minelib.version>1.2.5</minelib.version>
-        <topper.version>4.10.0</topper.version>
+        <topper.version>4.11.0</topper.version>
         <core.version>4.6.0</core.version>
         <java.version>1.8</java.version>
     </properties>