From 711871dd01a197feaa6d67d0133f6949f57337b8 Mon Sep 17 00:00:00 2001
From: okx-code <okx@okx.sh>
Date: Tue, 7 Oct 2025 05:19:40 +0100
Subject: [PATCH] update proxy rabbit

---
 ansible/templates/stacks/minecraft.yml.j2     |  1 -
 .../kiragatewayvelocity/KiraGateway.java      |  2 ++
 .../rabbit/RabbitCommands.java                |  3 +-
 .../rabbit/RabbitHandler.java                 | 33 ++++++++++---------
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/ansible/templates/stacks/minecraft.yml.j2 b/ansible/templates/stacks/minecraft.yml.j2
index 7fa46f2c6..72b26fda3 100644
--- a/ansible/templates/stacks/minecraft.yml.j2
+++ b/ansible/templates/stacks/minecraft.yml.j2
@@ -131,7 +131,6 @@ services:
             - /opt/PrivateConfig/paper/plugins/packetevents-spigot-2.9.4.jar:/config/plugins/packetevents-spgiot-2.9.4.jar
             - /opt/PrivateConfig/paper/config/Vulcan/config.yml:/config/plugins/Vulcan/config.yml
             - /opt/PrivateConfig/paper/config/HiddenOre/config.yml:/config/plugins/HiddenOre/config.yml
-            - /opt/PrivateConfig/paper/config/KiraBukkitGateway/config.yml:/config/plugins/KirraBukkitGateway/config.yml
             - /opt/PrivateConfig/paper/config/BreweryX/config.yml:/config/plugins/BreweryX/config.yml
             - /opt/PrivateConfig/paper/config/BreweryX/cauldron.yml:/config/plugins/BreweryX/cauldron.yml
             - /opt/PrivateConfig/paper/config/BreweryX/custom-items.yml:/config/plugins/BreweryX/custom-items.yml
diff --git a/plugins/kiragateway-velocity/src/main/java/net/civmc/kiragatewayvelocity/KiraGateway.java b/plugins/kiragateway-velocity/src/main/java/net/civmc/kiragatewayvelocity/KiraGateway.java
index 10e759686..03e1c31a8 100644
--- a/plugins/kiragateway-velocity/src/main/java/net/civmc/kiragatewayvelocity/KiraGateway.java
+++ b/plugins/kiragateway-velocity/src/main/java/net/civmc/kiragatewayvelocity/KiraGateway.java
@@ -27,6 +27,8 @@ import net.civmc.kiragatewayvelocity.rabbit.RabbitHandler;
 )
 public class KiraGateway {
 
+    public static final String PROXY_SERVER_NAME = "proxy";
+
     private final ProxyServer proxy;
     public final Logger logger;
     public final Path dataDirectory;
diff --git a/plugins/kiragateway-velocity/src/main/java/net/civmc/kiragatewayvelocity/rabbit/RabbitCommands.java b/plugins/kiragateway-velocity/src/main/java/net/civmc/kiragatewayvelocity/rabbit/RabbitCommands.java
index 3188a704d..4e5d80d47 100644
--- a/plugins/kiragateway-velocity/src/main/java/net/civmc/kiragatewayvelocity/rabbit/RabbitCommands.java
+++ b/plugins/kiragateway-velocity/src/main/java/net/civmc/kiragatewayvelocity/rabbit/RabbitCommands.java
@@ -3,6 +3,7 @@ package net.civmc.kiragatewayvelocity.rabbit;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import java.util.UUID;
+import net.civmc.kiragatewayvelocity.KiraGateway;
 import net.civmc.kiragatewayvelocity.KiraUtil;
 
 public class RabbitCommands {
@@ -23,7 +24,7 @@ public class RabbitCommands {
     }
 
     private void sendInternal(String id, JsonObject json) {
-        json.addProperty("server", "proxy");
+        json.addProperty("server", KiraGateway.PROXY_SERVER_NAME);
         json.addProperty("timestamp", System.currentTimeMillis());
         json.addProperty("packettype", id);
         Gson gson = new Gson();
diff --git a/plugins/kiragateway-velocity/src/main/java/net/civmc/kiragatewayvelocity/rabbit/RabbitHandler.java b/plugins/kiragateway-velocity/src/main/java/net/civmc/kiragatewayvelocity/rabbit/RabbitHandler.java
index 22c62f862..29739a720 100644
--- a/plugins/kiragateway-velocity/src/main/java/net/civmc/kiragatewayvelocity/rabbit/RabbitHandler.java
+++ b/plugins/kiragateway-velocity/src/main/java/net/civmc/kiragatewayvelocity/rabbit/RabbitHandler.java
@@ -6,6 +6,7 @@ import com.rabbitmq.client.ConnectionFactory;
 import java.io.IOException;
 import java.util.concurrent.TimeoutException;
 import com.rabbitmq.client.DeliverCallback;
+import net.civmc.kiragatewayvelocity.KiraGateway;
 import org.slf4j.Logger;
 
 public class RabbitHandler {
@@ -42,23 +43,25 @@ public class RabbitHandler {
     }
 
     public void beginAsyncListen() {
-        DeliverCallback deliverCallback = (consumerTag, delivery) -> {
+        KiraGateway.getInstance().getProxy().getScheduler().buildTask(KiraGateway.getInstance(), () -> {
+            DeliverCallback deliverCallback = (consumerTag, delivery) -> {
+                try {
+                    String message = new String(delivery.getBody(), "UTF-8");
+                    logger.info(" [x] Received '" + message + "'");
+                    inputProcessor.handle(message);
+                } catch (Exception e) {
+                    logger.error("Exception in rabbit handling", e);
+                }
+            };
             try {
-                String message = new String(delivery.getBody(), "UTF-8");
-                logger.info(" [x] Received '" + message + "'");
-                inputProcessor.handle(message);
-            } catch (Exception e) {
-                logger.error("Exception in rabbit handling", e);
+                String queue = incomingChannel.queueDeclare().getQueue();
+                incomingChannel.queueBind(queue, incomingQueue, KiraGateway.PROXY_SERVER_NAME);
+                incomingChannel.basicConsume(queue, true, deliverCallback, consumerTag -> {
+                });
+            } catch (IOException e) {
+                logger.error("Error in rabbit listener", e);
             }
-        };
-        try {
-            String queue = incomingChannel.queueDeclare().getQueue();
-            incomingChannel.queueBind(queue, incomingQueue, "proxy");
-            incomingChannel.basicConsume(queue, true, deliverCallback, consumerTag -> {
-            });
-        } catch (IOException e) {
-            logger.error("Error in rabbit listener", e);
-        }
+        }).schedule();
     }
 
     public void shutdown() {