Auto PR: Merge dev into master

api/src/main/java/net/streamline/api/base/commands/PTagCommand.java

@@ -52,12 +52,12 @@ public void run(CommandContext<CosmicCommand> context) {
             return;
         }
 
-        if (context.getArgCount() == 2) {
-            other.sendMessage(getWithOther(context.getSender(), this.messageTagsGet, playerName));
+        if (context.getArgCount() == 1) {
+            context.sendMessage(getWithOther(context.getSender(), this.messageTagsGet, playerName));
             return;
         }
 
-        if (context.getArgCount() < 4) {
+        if (context.getArgCount() < 3) {
             context.sendMessage(MainMessagesHandler.MESSAGES.INVALID.ARGUMENTS_TOO_FEW.get());
             return;
         }

api/src/main/java/net/streamline/api/base/commands/PlaytimeCommand.java

@@ -51,7 +51,7 @@ public void run(CommandContext<CosmicCommand> context) {
         }
 
         if (context.getArgCount() == 1) {
-            other.sendMessage(getWithOther(context.getSender(), this.messageGet, playerName));
+            context.sendMessage(getWithOther(context.getSender(), this.messageGet, playerName));
             return;
         }
 

api/src/main/java/net/streamline/api/base/listeners/BaseListener.java

@@ -1,12 +1,12 @@
 package net.streamline.api.base.listeners;
 
+import gg.drak.thebase.events.BaseEventHandler;
+import gg.drak.thebase.events.BaseEventListener;
+import gg.drak.thebase.events.processing.BaseProcessor;
 import singularity.Singularity;
 import net.streamline.api.base.module.BaseModule;
 import singularity.messages.events.ProxyMessageInEvent;
 import singularity.messages.proxied.ProxiedMessageManager;
-import tv.quaint.events.BaseEventHandler;
-import tv.quaint.events.BaseEventListener;
-import tv.quaint.events.processing.BaseProcessor;
 
 public class BaseListener implements BaseEventListener {
     public BaseListener() {

api/src/main/java/net/streamline/api/base/module/BaseModule.java

@@ -2,7 +2,6 @@
 
 import lombok.Getter;
 import lombok.Setter;
-import net.streamline.api.base.commands.GivenCommands;
 import net.streamline.api.base.ratapi.LuckpermsExpansion;
 import singularity.Singularity;
 import net.streamline.api.base.listeners.BaseListener;

api/src/main/java/net/streamline/api/base/ratapi/LuckpermsExpansion.java

@@ -1,5 +1,6 @@
 package net.streamline.api.base.ratapi;
 
+import gg.drak.thebase.objects.AtomicString;
 import net.luckperms.api.LuckPerms;
 import net.luckperms.api.LuckPermsProvider;
 import net.luckperms.api.model.group.Group;
@@ -11,7 +12,6 @@
 import singularity.placeholders.expansions.RATExpansion;
 import singularity.placeholders.replaceables.IdentifiedUserReplaceable;
 import singularity.utils.UserUtils;
-import tv.quaint.objects.AtomicString;
 
 import java.util.Optional;
 import java.util.UUID;

api/src/main/java/net/streamline/api/base/ratapi/StreamlineExpansion.java

@@ -1,5 +1,6 @@
 package net.streamline.api.base.ratapi;
 
+import gg.drak.thebase.utils.MatcherUtils;
 import singularity.Singularity;
 import net.streamline.api.base.module.BaseModule;
 import singularity.configs.given.MainMessagesHandler;
@@ -11,7 +12,6 @@
 import singularity.placeholders.replaceables.IdentifiedReplaceable;
 import singularity.placeholders.replaceables.IdentifiedUserReplaceable;
 import singularity.utils.UserUtils;
-import tv.quaint.utils.MatcherUtils;
 
 import java.util.ArrayList;
 import java.util.Optional;

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

@@ -7,7 +7,6 @@
 import singularity.utils.MessageUtils;
 
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentSkipListMap;
 import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;

api/src/main/java/net/streamline/api/permissions/MetaGrabberImpl.java

@@ -1,5 +1,7 @@
 package net.streamline.api.permissions;
 
+import gg.drak.thebase.objects.AtomicString;
+import gg.drak.thebase.utils.MathUtils;
 import net.luckperms.api.LuckPerms;
 import net.luckperms.api.model.group.Group;
 import net.luckperms.api.model.user.User;
@@ -13,8 +15,6 @@
 import singularity.permissions.MetaKey;
 import singularity.permissions.MetaValue;
 import singularity.utils.UUIDFetcher;
-import tv.quaint.objects.AtomicString;
-import tv.quaint.utils.MathUtils;
 
 import java.util.Objects;
 import java.util.Optional;

backend-api/src/main/java/net/streamline/apib/craft/SavedEulerAngle.java

@@ -1,9 +1,9 @@
 package net.streamline.apib.craft;
 
+import gg.drak.thebase.lib.leonhard.storage.sections.FlatFileSection;
 import lombok.Getter;
 import lombok.Setter;
 import org.bukkit.util.EulerAngle;
-import tv.quaint.thebase.lib.leonhard.storage.sections.FlatFileSection;
 
 @Getter
 public class SavedEulerAngle {

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

@@ -1,11 +1,11 @@
 package net.streamline.base.events;
 
+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 singularity.events.player.updates.properties.PlayerIPUpdateEvent;
 import singularity.utils.MessageUtils;
-import tv.quaint.events.processing.BaseProcessor;
 
 public class BungeeBaseListener extends BaseListener {
     public BungeeBaseListener() {

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

@@ -6,15 +6,12 @@
 import net.md_5.bungee.api.event.ServerConnectEvent;
 import net.streamline.api.base.timers.AbstractPlayerTeleporter;
 import net.streamline.base.Streamline;
-import singularity.configs.given.GivenConfigs;
 import singularity.data.teleportation.TPTicket;
 import singularity.utils.MessageUtils;
 
 import java.util.Date;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentSkipListSet;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 public class PlayerTeleporter extends AbstractPlayerTeleporter {
 //    private static final ExecutorService executor = Executors.newFixedThreadPool(4); // Adjust as needed

bungee/src/main/java/net/streamline/platform/BasePlugin.java

@@ -1,5 +1,6 @@
 package net.streamline.platform;
 
+import gg.drak.thebase.events.BaseEventHandler;
 import lombok.Getter;
 import lombok.Setter;
 import net.md_5.bungee.api.CommandSender;
@@ -35,7 +36,6 @@
 import singularity.interfaces.ISingularityExtension;
 import singularity.scheduler.TaskManager;
 import singularity.utils.UserUtils;
-import tv.quaint.events.BaseEventHandler;
 
 import java.io.File;
 import java.util.*;

bungee/src/main/java/net/streamline/platform/listeners/PlatformListener.java

@@ -24,6 +24,7 @@
 import singularity.messages.proxied.ProxiedMessage;
 import singularity.modules.ModuleManager;
 import singularity.modules.ModuleUtils;
+import singularity.objects.CosmicFavicon;
 import singularity.objects.PingedResponse;
 import net.streamline.base.Streamline;
 import net.streamline.platform.Messenger;
@@ -184,10 +185,17 @@ public void onPing(ProxyPingEvent event) {
         PingedResponse.Players players = new PingedResponse.Players(ping.getPlayers().getMax(), ping.getPlayers().getOnline(),
                 infos.toArray(new PingedResponse.PlayerInfo[0]));
         PingedResponse response;
-        if (ping.getFaviconObject() != null) {
-            response = new PingedResponse(protocol, players, ping.getDescriptionComponent().toLegacyText(), ping.getFaviconObject().getEncoded());
-        } else {
-            response = new PingedResponse(protocol, players, ping.getDescriptionComponent().toLegacyText());
+        try {
+            if (ping.getFaviconObject() != null) {
+                response = new PingedResponse(protocol, players, ping.getDescriptionComponent().toLegacyText(), ping.getFaviconObject().getEncoded());
+            } else {
+                response = new PingedResponse(protocol, players, ping.getDescriptionComponent().toLegacyText());
+            }
+        } catch (Throwable e) {
+            MessageUtils.logWarning("Failed to get favicon from ping response: " + e.getMessage());
+            MessageUtils.logWarning(e.getStackTrace());
+
+            return;
         }
 
         PingReceivedEvent pingReceivedEvent = new PingReceivedEvent(response, hostName).fire();
@@ -215,8 +223,11 @@ public void onPing(ProxyPingEvent event) {
         ping.setDescriptionComponent(new TextComponent(Messenger.getInstance().codedText(pingReceivedEvent.getResponse().getDescription())));
 
         try {
-            Favicon favicon = Favicon.create(pingReceivedEvent.getResponse().getFavicon().getEncoded());
-            ping.setFavicon(favicon);
+            CosmicFavicon favicon = pingReceivedEvent.getResponse().getFavicon();
+            if (favicon != null) {
+                Favicon fav = Favicon.create(favicon.getImage());
+                ping.setFavicon(fav);
+            }
         } catch (Exception e) {
             // do nothing.
         }

gradle.properties

@@ -9,8 +9,6 @@ org.gradle.vfs.watch = false
 # Other properties
 name = StreamlineCore
 group = com.github.Streamline-Essentials.StreamlineCore
-version = 2.5.3.0
-
-base-version = 6f2e7e2d
+version = 2.5.4.0
 
 plugin.main = default

singularity-api/build.gradle

@@ -23,9 +23,6 @@ dependencies {
     // JetBrains.
     annotationProcessor(shadow(implementation('org.jetbrains:annotations:20.1.0')))
 
-    // Caffeine.
-    shadow(implementation('com.github.ben-manes.caffeine:caffeine:3.1.8'))
-
     // Files.
 //    implementation(shadow(files(FILES)));
 }

singularity-api/src/main/java/singularity/Singularity.java

@@ -1,5 +1,7 @@
 package singularity;
 
+import gg.drak.thebase.objects.SingleSet;
+import gg.drak.thebase.objects.handling.derived.PluginEventable;
 import lombok.Getter;
 import lombok.Setter;
 import singularity.configs.given.GivenConfigs;
@@ -22,8 +24,6 @@
 import singularity.scheduler.ModuleTaskManager;
 import singularity.utils.MessageUtils;
 import singularity.utils.UserUtils;
-import tv.quaint.objects.SingleSet;
-import tv.quaint.objects.handling.derived.PluginEventable;
 
 import java.io.File;
 import java.io.IOException;

singularity-api/src/main/java/singularity/board/data/BoardData.java

@@ -1,12 +1,12 @@
 package singularity.board.data;
 
+import gg.drak.thebase.lib.re2j.Matcher;
+import gg.drak.thebase.utils.MatcherUtils;
 import lombok.Getter;
 import lombok.Setter;
 import singularity.board.data.constructor.BoardConstructable;
 import singularity.board.data.constructor.StringConstructable;
-import tv.quaint.utils.MatcherUtils;
 import org.jetbrains.annotations.NotNull;
-import tv.quaint.thebase.lib.re2j.Matcher;
 
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;

singularity-api/src/main/java/singularity/command/CommandHandler.java

@@ -5,7 +5,11 @@
 import singularity.Singularity;
 import singularity.interfaces.IProperCommand;
 
+import java.util.Arrays;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentSkipListMap;
+import java.util.concurrent.ConcurrentSkipListSet;
+import java.util.concurrent.atomic.AtomicReference;
 
 public class CommandHandler {
     @Getter @Setter
@@ -81,4 +85,55 @@ public static void flushProperCommands() {
             iProperCommand.unregister();
         });
     }
+
+    public static ConcurrentSkipListSet<String> getAllAliases() {
+        ConcurrentSkipListSet<String> r = new ConcurrentSkipListSet<>();
+
+        getLoadedStreamlineCommands().forEach((s, command) -> {
+            r.addAll(Arrays.asList(command.getAliases()));
+
+            r.add(command.getBase());
+        });
+
+        getLoadedModuleCommands().forEach((s, command) -> {
+            r.addAll(Arrays.asList(command.getAliases()));
+
+            r.add(command.getBase());
+        });
+
+        return r;
+    }
+
+    public static CosmicCommand getCommandByAlias(String alias) {
+        CosmicCommand command = getStreamlineCommand(alias);
+        if (command != null) return command;
+
+        AtomicReference<CosmicCommand> commandRef = new AtomicReference<>(null);
+
+        getLoadedStreamlineCommands().forEach((s, c) -> {
+            if (commandRef.get() != null) return;
+
+            for (String a : c.getAliases()) {
+                if (a.equalsIgnoreCase(alias)) {
+                    commandRef.set(c);
+                    break;
+                }
+            }
+        });
+
+        if (commandRef.get() != null) return commandRef.get();
+
+        getLoadedModuleCommands().forEach((s, c) -> {
+            if (commandRef.get() != null) return;
+
+            for (String a : c.getAliases()) {
+                if (a.equalsIgnoreCase(alias)) {
+                    commandRef.set(c);
+                    break;
+                }
+            }
+        });
+
+        return commandRef.get();
+    }
 }

singularity-api/src/main/java/singularity/command/ModuleCommand.java

@@ -14,7 +14,6 @@ public ModuleCommand(ModuleLike module, String base, String permission, String..
         this(module, base, permission, new File(module.getDataFolder(), Singularity.getCommandsFolderChild()), aliases);
     }
 
-
     public ModuleCommand(ModuleLike module, String base, String permission, File parentDirectory, String... aliases) {
         super(module.getIdentifier(), base, permission, parentDirectory, aliases);
         this.owningModule = module;
@@ -34,14 +33,10 @@ public ModuleCommand(ModuleLike module, String base, String permission, File par
 //    }
 
     public void modulize() {
-        if (isEnabled()) return;
-
         getOwningModule().addCommand(this);
     }
 
     public void demodulize() {
-        if (! isEnabled()) return;
-
         getOwningModule().removeCommand(this);
     }
 
@@ -50,13 +45,17 @@ public void register() {
         if (! isEnabled()) return;
 
         CommandHandler.registerModuleCommand(this);
+
+        modulize();
     }
 
     @Override
     public void unregister() {
         if (! isEnabled()) if (! CommandHandler.getLoadedModuleCommands().containsKey(getIdentifier())) return;
 
         CommandHandler.unregisterModuleCommand(this);
+
+        demodulize();
     }
 
     @Override

singularity-api/src/main/java/singularity/configs/CommandResource.java

@@ -1,12 +1,12 @@
 package singularity.configs;
 
+import gg.drak.thebase.storage.resources.flat.simple.SimpleConfiguration;
 import lombok.Getter;
 import lombok.Setter;
 import singularity.command.CommandHandler;
 import singularity.command.CosmicCommand;
 import singularity.modules.ModuleLike;
 import singularity.modules.CosmicModule;
-import tv.quaint.storage.resources.flat.simple.SimpleConfiguration;
 
 import java.io.File;
 import java.util.Arrays;

singularity-api/src/main/java/singularity/configs/ModularizedConfig.java

@@ -1,8 +1,8 @@
 package singularity.configs;
 
+import gg.drak.thebase.storage.resources.flat.simple.SimpleConfiguration;
 import lombok.Getter;
 import singularity.modules.ModuleLike;
-import tv.quaint.storage.resources.flat.simple.SimpleConfiguration;
 
 import java.io.File;