Skip to content

Commit 983d660

Browse files
authored
Merge pull request #691 from ArikSquad/feat/redis-upgrade
feat: upgrade Jedis to 7.2.0 and upgrade AtlasRedisAPI
2 parents bb821c2 + d262c4d commit 983d660

File tree

7 files changed

+7
-10
lines changed

7 files changed

+7
-10
lines changed

proxy.api/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ repositories {
2020

2121
dependencies {
2222
implementation(project(":commons"))
23-
implementation("com.github.Swofty-Developments:AtlasRedisAPI:1.1.3")
24-
// implementation("net.swofty:AtlasRedisAPI:1.1.4")
23+
implementation("com.github.Swofty-Developments:AtlasRedisAPI:1.1.5")
2524
compileOnly("net.minestom:minestom:2025.12.20c-1.21.11") {
2625
exclude(group = "org.jboss.shrinkwrap.resolver", module = "shrinkwrap-resolver-depchain")
2726
}

proxy.api/src/main/java/net/swofty/proxyapi/ProxyAPI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public ProxyAPI(String URI, UUID serverUUID) {
1616
this.serverUUID = serverUUID;
1717

1818
RedisAPI.generateInstance(URI);
19-
RedisAPI.getInstance().setFilterID(serverUUID.toString());
19+
RedisAPI.getInstance().setFilterId(serverUUID.toString());
2020
}
2121

2222
public void registerFromProxyHandler(ProxyToClient handler) {

service.generic/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ repositories {
2020

2121
dependencies {
2222
implementation(project(":commons"))
23-
implementation("com.github.Swofty-Developments:AtlasRedisAPI:1.1.3")
24-
// implementation("net.swofty:AtlasRedisAPI:1.1.4")
23+
implementation("com.github.Swofty-Developments:AtlasRedisAPI:1.1.5")
2524
implementation("net.kyori:adventure-api:4.26.1")
2625
implementation("net.kyori:adventure-text-serializer-gson:4.26.1")
2726
}

service.generic/src/main/java/net/swofty/service/generic/redis/ServiceRedisManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
public class ServiceRedisManager {
77
public static void connect(String URI, ServiceType type) {
88
RedisAPI.generateInstance(URI);
9-
RedisAPI.getInstance().setFilterID(type.name());
9+
RedisAPI.getInstance().setFilterId(type.name());
1010
}
1111
}

type.generic/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies {
2626
implementation("org.mongodb:bson:5.6.2")
2727
implementation("org.mongodb:mongodb-driver-sync:5.6.2")
2828
// Must match AtlasRedisAPI's Jedis version to avoid conflicts
29-
implementation("redis.clients:jedis:4.2.3")
29+
implementation("redis.clients:jedis:7.2.0")
3030
implementation("org.tinylog:tinylog-api:2.7.0")
3131
implementation("org.tinylog:tinylog-impl:2.7.0")
3232
implementation("org.jetbrains.kotlin:kotlin-stdlib:2.3.0")

velocity.extension/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ dependencies {
2828
annotationProcessor("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT")
2929
compileOnly(files("velocity-proxy-3.4.0-SNAPSHOT.jar"))
3030

31-
implementation("com.github.Swofty-Developments:AtlasRedisAPI:1.1.3")
32-
// implementation("net.swofty:AtlasRedisAPI:1.1.4")
31+
implementation("com.github.Swofty-Developments:AtlasRedisAPI:1.1.5")
3332
implementation(project(":commons"))
3433
implementation(project(":proxy.api"))
3534

velocity.extension/src/main/java/net/swofty/velocity/SkyBlockVelocity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ public void onProxyInitialization(ProxyInitializeEvent event) {
190190

191191
// Setup Redis
192192
RedisAPI.generateInstance(ConfigProvider.settings().getRedisUri());
193-
RedisAPI.getInstance().setFilterID("proxy");
193+
RedisAPI.getInstance().setFilterId("proxy");
194194
loopThroughPackage("net.swofty.velocity.redis.listeners", RedisListener.class)
195195
.forEach(listener -> {
196196
RedisAPI.getInstance().registerChannel(

0 commit comments

Comments
 (0)