Merge pull request #26 from Streamline-Essentials/dev

Auto PR: Merge dev into master

Author: DrakDv

singularity-api/src/main/java/singularity/configs/given/GivenConfigs.java

@@ -33,9 +33,6 @@ public class GivenConfigs {
     @Getter @Setter
     private static CoreDBOperator mainDatabase;
 
-    @Getter @Setter
-    private static RedisClient redisClient;
-
     public static void init() {
         setMainConfig(new MainConfigHandler());
         setMainMessages(new MainMessagesHandler());
@@ -53,12 +50,6 @@ public static void init() {
         } catch (Exception e) {
             e.printStackTrace();
         }
-
-        try {
-            setRedisClient(new RedisClient());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
     }
 
     public static void ensureFolders() {

singularity-api/src/main/java/singularity/redis/RedisClient.java

@@ -75,10 +75,6 @@ public static void withJedis(Consumer<Jedis> consumer, boolean silent) {
         });
     }
 
-    public static RedisClient getInstance() {
-        return GivenConfigs.getRedisClient();
-    }
-
     public static void sendMessage(RedisMessage message) {
         withJedis(j -> j.publish(message.getChannel(), message.getMessage()));
     }

singularity-api/src/main/java/singularity/redis/RedisListener.java

@@ -7,7 +7,7 @@
 import singularity.utils.MessageUtils;
 
 @Getter @Setter
-public abstract class RedisListener extends JedisPubSub implements Identifiable {
+public class RedisListener extends JedisPubSub implements Identifiable {
     private String identifier;
 
     public RedisListener(String identifier) {
@@ -39,5 +39,7 @@ public void registerAndLoad() {
         load();
     }
 
-    abstract String[] getChannelsArray();
+    public String[] getChannelsArray() {
+        return new String[] {};
+    }
 }