Skip to content

Auto PR: Merge dev into master #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DrakDv merged 1 commit into from
Jul 29, 2025
Merged

Auto PR: Merge dev into master #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions singularity-api/src/main/java/singularity/configs/given/GivenConfigs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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() {
Expand Down
4 changes: 0 additions & 4 deletions singularity-api/src/main/java/singularity/redis/RedisClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
}
Expand Down
6 changes: 4 additions & 2 deletions singularity-api/src/main/java/singularity/redis/RedisListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -39,5 +39,7 @@ public void registerAndLoad() {
load();
}

abstract String[] getChannelsArray();
public String[] getChannelsArray() {
return new String[] {};
}
}