CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-18 00:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

update proxy rabbit

Browse Source
This commit is contained in:
okx-code
2025-10-07 05:19:40 +01:00
parent 743b0b9918
commit 711871dd01
4 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/templates/stacks/minecraft.yml.j2
View File

@@ -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

2
plugins/kiragateway-velocity/src/main/java/net/civmc/kiragatewayvelocity/KiraGateway.java
View File

@@ -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;

3
plugins/kiragateway-velocity/src/main/java/net/civmc/kiragatewayvelocity/rabbit/RabbitCommands.java
View File

@@ -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();

33
plugins/kiragateway-velocity/src/main/java/net/civmc/kiragatewayvelocity/rabbit/RabbitHandler.java
View File

@@ -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() {