use forked messenger

https://github.com/Hexaoxide/Messenger
Hexaoxide · Sep 12, 2023 · 78c34da · 78c34da
1 parent df1be68
commit 78c34da
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 401 deletions.
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -48,7 +48,6 @@ dependencies {
   api(libs.messengerNats)
   api(libs.messengerRabbitmq)
   api(libs.messengerRedis)
-  compileOnly(libs.jedis)
   compileOnlyApi(libs.netty)
 
   api(libs.event)

diff --git a/common/src/main/java/net/draycia/carbon/common/CarbonChatInternal.java b/common/src/main/java/net/draycia/carbon/common/CarbonChatInternal.java
@@ -126,14 +126,14 @@ protected void init() {
         // Load channels
         this.channelRegistry().loadConfigChannels(this.carbonMessages);
 
+        this.messagingManager.get();
+
         CompletableFuture.runAsync(() -> {
             if (!this.injector.getInstance(ConfigManager.class).primaryConfig().updateChecker()) {
                 return;
             }
             new UpdateChecker(this.logger).checkVersion();
         });
-
-        this.messagingManager.get();
     }
 
     protected void shutdown() {

diff --git a/common/src/main/java/net/draycia/carbon/common/messaging/MessagingManager.java b/common/src/main/java/net/draycia/carbon/common/messaging/MessagingManager.java
@@ -54,6 +54,7 @@
 import ninja.egg82.messenger.NATSMessagingService;
 import ninja.egg82.messenger.PacketManager;
 import ninja.egg82.messenger.RabbitMQMessagingService;
+import ninja.egg82.messenger.RedisMessagingService;
 import ninja.egg82.messenger.handler.AbstractServerMessagingHandler;
 import ninja.egg82.messenger.handler.MessagingHandler;
 import ninja.egg82.messenger.handler.MessagingHandlerImpl;
@@ -124,13 +125,7 @@ public MessagingManager(
         PacketManager.register(LocalPlayerChangePacket.class, LocalPlayerChangePacket::new);
         PacketManager.register(WhisperPacket.class, WhisperPacket::new);
 
-        this.packetService = new PacketService(4, false, protocolVersion) {
-            // todo super is broken - calls remove on COWIterator
-            @Override
-            public boolean removeMessenger(final @NonNull String serviceName) {
-                return true;
-            }
-        };
+        this.packetService = new PacketService(4, false, protocolVersion);
         this.scheduledExecutor = new ExceptionLoggingScheduledThreadPoolExecutor(4,
             ConcurrentUtil.carbonThreadFactory(logger, "MessagingManager"), logger);