Merge pull request #20 from Streamline-Essentials/dev

Auto PR: Merge dev into master

Author: DrakDv

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() {