Merge pull request #22 from Streamline-Essentials/dev

Auto PR: Merge dev into master

Author: DrakDv

api/src/main/java/net/streamline/api/base/timers/AbstractPlayerTeleporter.java

@@ -102,6 +102,10 @@ public void run() {
     private static AtomicReference<CompletableFuture<ConcurrentSkipListSet<TPTicket>>> atomicTicketsPending = new AtomicReference<>(null);
 
     public CompletableFuture<ConcurrentSkipListSet<TPTicket>> getTicketsPending() {
+        if (GivenConfigs.getMainDatabase() == null) {
+            return CompletableFuture.completedFuture(new ConcurrentSkipListSet<>());
+        }
+
         if (getAtomicTicketsPending().get() == null) {
             getAtomicTicketsPending().set(GivenConfigs.getMainDatabase().pullAllTPTickets());
         }

backend-api/src/main/java/net/streamline/apib/depends/PAPIDepend.java

@@ -60,7 +60,7 @@ public boolean register() {
 
         @Override
         public @Nullable String onRequest(OfflinePlayer player, @NotNull String params) {
-            CosmicPlayer streamPlayer = ModuleUtils.getOrCreatePlayer(player.getUniqueId().toString());
+            CosmicPlayer streamPlayer = ModuleUtils.getOrCreatePlayer(player.getUniqueId().toString()).orElse(null);
             if (streamPlayer == null) return MainMessagesHandler.MESSAGES.DEFAULTS.PLACEHOLDERS.IS_NULL.get();
             String toParse;
             if (params.startsWith("!")) toParse = "%" + params.substring("!".length()) + "%";

…java/net/streamline/base/Streamline.java …et/streamline/base/StreamlineBungee.javabungee/src/main/java/net/streamline/base/Streamline.java renamed to bungee/src/main/java/net/streamline/base/StreamlineBungee.java bungee/src/main/java/net/streamline/base/Streamline.java renamed to bungee/src/main/java/net/streamline/base/StreamlineBungee.java

@@ -7,7 +7,7 @@
 import net.streamline.metrics.Metrics;
 import net.streamline.platform.BasePlugin;
 
-public class Streamline extends BasePlugin {
+public class StreamlineBungee extends BasePlugin {
     @Getter @Setter
     private static ServerPusher serverPusher;
 
@@ -21,10 +21,12 @@ public void enable() {
             e.printStackTrace();
         }
 
-        Metrics metrics = new Metrics(this, 16973);
+        Metrics metrics = new Metrics(this, 26272);
         metrics.addCustomChart(new Metrics.SimplePie("plugin_version", () -> getDescription().getVersion()));
         metrics.addCustomChart(new Metrics.SimplePie("modules_loaded_count", () -> String.valueOf(ModuleManager.getLoadedModules().size())));
         metrics.addCustomChart(new Metrics.SimplePie("modules_enabled_count", () -> String.valueOf(ModuleManager.getEnabledModules().size())));
+        metrics.addCustomChart(new Metrics.SingleLineChart("total_modules_loaded", () -> ModuleManager.getLoadedModules().size()));
+        metrics.addCustomChart(new Metrics.SingleLineChart("total_modules_enabled", () -> ModuleManager.getEnabledModules().size()));
     }
 
     @Override

bungee/src/main/java/net/streamline/base/events/BungeeBaseListener.java

@@ -3,7 +3,7 @@
 import gg.drak.thebase.events.processing.BaseProcessor;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.streamline.api.base.listeners.BaseListener;
-import net.streamline.base.Streamline;
+import net.streamline.base.StreamlineBungee;
 import singularity.events.player.updates.properties.PlayerIPUpdateEvent;
 import singularity.utils.MessageUtils;
 
@@ -14,7 +14,7 @@ public BungeeBaseListener() {
 
     @BaseProcessor
     public void onPlayerIPUpdateEvent(PlayerIPUpdateEvent event) {
-        ProxiedPlayer player = Streamline.getPlayer(event.getPlayerUuid());
+        ProxiedPlayer player = StreamlineBungee.getPlayer(event.getPlayerUuid());
         if (player == null) {
             MessageUtils.logWarning("PlayerIPUpdateEvent: Player is null!");
             return;

bungee/src/main/java/net/streamline/base/runnables/PlayerChecker.java

@@ -1,7 +1,7 @@
 package net.streamline.base.runnables;
 
 import net.md_5.bungee.api.connection.Server;
-import net.streamline.base.Streamline;
+import net.streamline.base.StreamlineBungee;
 import net.streamline.platform.savables.UserManager;
 import singularity.data.players.CosmicPlayer;
 import singularity.scheduler.BaseRunnable;
@@ -14,10 +14,11 @@ public PlayerChecker() {
 
     @Override
     public void run() {
-        Streamline.getPlayersByUUID().forEach((uuid, player) -> {
+        StreamlineBungee.getPlayersByUUID().forEach((uuid, player) -> {
             if (UserUtils.isLoaded(player.getUniqueId().toString())) return;
 
-            CosmicPlayer streamPlayer = UserUtils.getOrCreatePlayer(player.getUniqueId().toString());
+            CosmicPlayer streamPlayer = UserUtils.getOrCreatePlayer(player.getUniqueId().toString()).orElse(null);
+            if (streamPlayer == null) return;
 
             streamPlayer.setCurrentIp(UserManager.getInstance().parsePlayerIP(player));
             streamPlayer.setCurrentName(player.getName());

bungee/src/main/java/net/streamline/base/runnables/PlayerTeleporter.java

@@ -5,7 +5,7 @@
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.ServerConnectEvent;
 import net.streamline.api.base.timers.AbstractPlayerTeleporter;
-import net.streamline.base.Streamline;
+import net.streamline.base.StreamlineBungee;
 import singularity.data.teleportation.TPTicket;
 import singularity.utils.MessageUtils;
 
@@ -43,7 +43,7 @@ private void processTicket(TPTicket ticket) {
                 return;
             }
 
-            ProxiedPlayer player = Streamline.getInstance().getProxy().getPlayer(UUID.fromString(ticket.getIdentifier()));
+            ProxiedPlayer player = StreamlineBungee.getInstance().getProxy().getPlayer(UUID.fromString(ticket.getIdentifier()));
             if (player == null) {
                 clearTicket(ticket, 2);
                 return;
@@ -57,7 +57,7 @@ private void processTicket(TPTicket ticket) {
     }
 
     private void teleportPlayerAsync(ProxiedPlayer player, String server) {
-        ServerInfo targetServer = Streamline.getInstance().getProxy().getServerInfo(server);
+        ServerInfo targetServer = StreamlineBungee.getInstance().getProxy().getServerInfo(server);
         if (targetServer != null) {
             ServerConnectRequest request = ServerConnectRequest.builder()
                     .target(targetServer)