ChomeNS/chomens-bot-java
3
1
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

make better disconnect message reason

Browse source
This commit is contained in:
Chayapak 2023-04-09 12:06:17 +07:00
parent 313c50e6a8
commit 876a1a658a
2 changed files with 45 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/DiscordPlugin.java
View file

@ -1,8 +1,11 @@
package land.chipmunk.chayapak.chomens_bot.plugins; package land.chipmunk.chayapak.chomens_bot.plugins;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundDisconnectPacket;
import com.github.steveice10.packetlib.Session;
import com.github.steveice10.packetlib.event.session.ConnectedEvent; import com.github.steveice10.packetlib.event.session.ConnectedEvent;
import com.github.steveice10.packetlib.event.session.DisconnectedEvent; import com.github.steveice10.packetlib.event.session.DisconnectedEvent;
import com.github.steveice10.packetlib.event.session.SessionAdapter; import com.github.steveice10.packetlib.event.session.SessionAdapter;
import com.github.steveice10.packetlib.packet.Packet;
import land.chipmunk.chayapak.chomens_bot.Bot; import land.chipmunk.chayapak.chomens_bot.Bot;
import land.chipmunk.chayapak.chomens_bot.Configuration; import land.chipmunk.chayapak.chomens_bot.Configuration;
import land.chipmunk.chayapak.chomens_bot.Main; import land.chipmunk.chayapak.chomens_bot.Main;
@ -45,9 +48,32 @@ public class DiscordPlugin {
for (Bot bot : Main.allBots) { for (Bot bot : Main.allBots) {
String channelId = servers.get(bot.host() + ":" + bot.port()); String channelId = servers.get(bot.host() + ":" + bot.port());
// toooooo ohio fix
final boolean[] disconencted = {false};
bot.addListener(new SessionAdapter() { bot.addListener(new SessionAdapter() {
@Override
public void packetReceived(Session session, Packet packet) {
if (packet instanceof ClientboundDisconnectPacket) packetReceived((ClientboundDisconnectPacket) packet);
}
public void packetReceived (ClientboundDisconnectPacket packet) {
disconencted[0] = true;
final String reason = ComponentUtilities.stringifyAnsi(packet.getReason());
sendMessageInstantly(
"Disconnected: \n" +
"```ansi\n" +
reason.replace("`", "\\`") +
"\n```"
, channelId
);
}
@Override @Override
public void connected (ConnectedEvent event) { public void connected (ConnectedEvent event) {
disconencted[0] = false;
boolean channelAlreadyAddedListeners = alreadyAddedListeners.getOrDefault(channelId, false); boolean channelAlreadyAddedListeners = alreadyAddedListeners.getOrDefault(channelId, false);
sendMessageInstantly("Successfully connected to: " + "`" + bot.host() + ":" + bot.port() + "`", channelId); sendMessageInstantly("Successfully connected to: " + "`" + bot.host() + ":" + bot.port() + "`", channelId);
@ -155,6 +181,7 @@ public class DiscordPlugin {
@Override @Override
public void disconnected(DisconnectedEvent event) { public void disconnected(DisconnectedEvent event) {
if (disconencted[0]) return;
sendMessageInstantly("Disconnected: " + "`" + event.getReason().replace("`", "\\`") + "`", channelId); sendMessageInstantly("Disconnected: " + "`" + event.getReason().replace("`", "\\`") + "`", channelId);
} }
}); });

18
src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/LoggerPlugin.java
View file

@ -1,8 +1,11 @@
package land.chipmunk.chayapak.chomens_bot.plugins; package land.chipmunk.chayapak.chomens_bot.plugins;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundDisconnectPacket;
import com.github.steveice10.packetlib.Session;
import com.github.steveice10.packetlib.event.session.ConnectedEvent; import com.github.steveice10.packetlib.event.session.ConnectedEvent;
import com.github.steveice10.packetlib.event.session.DisconnectedEvent; import com.github.steveice10.packetlib.event.session.DisconnectedEvent;
import com.github.steveice10.packetlib.event.session.SessionAdapter; import com.github.steveice10.packetlib.event.session.SessionAdapter;
import com.github.steveice10.packetlib.packet.Packet;
import land.chipmunk.chayapak.chomens_bot.Bot; import land.chipmunk.chayapak.chomens_bot.Bot;
import land.chipmunk.chayapak.chomens_bot.Logger; import land.chipmunk.chayapak.chomens_bot.Logger;
import land.chipmunk.chayapak.chomens_bot.util.ComponentUtilities; import land.chipmunk.chayapak.chomens_bot.util.ComponentUtilities;
@ -13,10 +16,24 @@ public class LoggerPlugin extends ChatPlugin.ChatListener {
private boolean addedListener = false; private boolean addedListener = false;
private boolean disconencted = false;
public LoggerPlugin(Bot bot) { public LoggerPlugin(Bot bot) {
this.bot = bot; this.bot = bot;
bot.addListener(new SessionAdapter() { bot.addListener(new SessionAdapter() {
@Override
public void packetReceived(Session session, Packet packet) {
if (packet instanceof ClientboundDisconnectPacket) packetReceived((ClientboundDisconnectPacket) packet);
}
public void packetReceived (ClientboundDisconnectPacket packet) {
disconencted = true;
final String reason = ComponentUtilities.stringifyAnsi(packet.getReason());
log("Disconnected from " + bot.host() + ":" + bot.port() + ", reason: " + reason);
}
@Override @Override
public void connected (ConnectedEvent event) { public void connected (ConnectedEvent event) {
log("Successfully connected to: " + bot.host() + ":" + bot.port()); log("Successfully connected to: " + bot.host() + ":" + bot.port());
@ -28,6 +45,7 @@ public class LoggerPlugin extends ChatPlugin.ChatListener {
@Override @Override
public void disconnected (DisconnectedEvent event) { public void disconnected (DisconnectedEvent event) {
if (disconencted) return;
log("Disconnected from " + bot.host() + ":" + bot.port() + ", reason: " + event.getReason()); log("Disconnected from " + bot.host() + ":" + bot.port() + ", reason: " + event.getReason());
} }
}); });