misc/chomens-bot-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: better icu self care, no more spam garbage

Browse Source 
it actually works pretty well, now it doesn't spam when you cloop tp the bot or something
also i have tested cloop tp-ing the bot, and it indeed can't refill the core, not really sure how to fix this, but the bot usually is in vanish anyway and this scenario usually happens with some random person doing clooping `tp @a <someone/somewhere>` which affects everyone (except if the selector is like `@a[name=!BubbleCode]`)
also interestingly the bot can still refill the core while being obd leashed
This commit is contained in:
ChomeNS
2025-03-30 17:33:57 +07:00
parent 56aae42a94
commit 9c6c35677c
2 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/me/chayapak1/chomens_bot/plugins/SelfCarePlugin.java
View File

@@ -2,8 +2,8 @@ package me.chayapak1.chomens_bot.plugins;
import me.chayapak1.chomens_bot.Bot;
import me.chayapak1.chomens_bot.Configuration;
import me.chayapak1.chomens_bot.data.player.PlayerEntry;
import net.kyori.adventure.text.Component;
import org.cloudburstmc.math.vector.Vector3d;
import org.geysermc.mcprotocollib.network.Session;
import org.geysermc.mcprotocollib.network.event.session.DisconnectedEvent;
import org.geysermc.mcprotocollib.network.packet.Packet;
@@ -26,7 +26,10 @@ import java.util.Arrays;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
public class SelfCarePlugin extends Bot.Listener implements ChatPlugin.Listener, PositionPlugin.Listener, TickPlugin.Listener {
public class SelfCarePlugin
extends Bot.Listener
implements ChatPlugin.Listener, CommandSpyPlugin.Listener, PositionPlugin.Listener
{
private final Bot bot;
private ScheduledFuture<?> checkTask;
@@ -37,7 +40,6 @@ public class SelfCarePlugin extends Bot.Listener implements ChatPlugin.Listener,
public GameMode gamemode;
public int permissionLevel;
private int positionPacketsPerSecond = 0;
private long usernameStartTime = System.currentTimeMillis();
private boolean cspy = false;
@@ -53,17 +55,12 @@ public class SelfCarePlugin extends Bot.Listener implements ChatPlugin.Listener,
bot.addListener(this);
bot.chat.addListener(this);
bot.commandSpy.addListener(this);
bot.position.addListener(this);
bot.tick.addListener(this);
}
@Override
public void onSecondTick () {
positionPacketsPerSecond = 0;
}
@Override
public boolean systemMessageReceived(Component component, String string, String ansi) {
public boolean systemMessageReceived (Component component, String string, String ansi) {
if (string.equals("Successfully enabled CommandSpy")) cspy = true;
else if (string.equals("Successfully disabled CommandSpy")) cspy = false;
@@ -97,6 +94,23 @@ public class SelfCarePlugin extends Bot.Listener implements ChatPlugin.Listener,
return true;
}
@Override
public void commandReceived (PlayerEntry sender, String command) {
final String trimmedCommand = command.trim();
final String controlPart = " control " + bot.profile.getName();
if (
!bot.config.selfCare.icu.enabled ||
(
!trimmedCommand.equals("/icontrolu:icu" + controlPart) &&
!trimmedCommand.equals("/icu" + controlPart)
)
) return;
bot.core.run("essentials:sudo " + sender.profile.getIdAsString() + " icu stop");
}
public void check () {
final Configuration.SelfCare selfCares = bot.config.selfCare;
@@ -120,7 +134,6 @@ public class SelfCarePlugin extends Bot.Listener implements ChatPlugin.Listener,
else if (selfCares.username && (System.currentTimeMillis() - usernameStartTime) >= 2 * 1000 && !username && kaboom) bot.chat.send("/extras:username " + bot.username);
// core
else if (selfCares.icu.enabled && positionPacketsPerSecond > selfCares.icu.positionPacketsPerSecond) bot.core.run("essentials:sudo * icu stop");
else if (hasEssentials) {
final String usernameOrBlank = !bot.options.useChat ?
bot.username + " " :
@@ -158,7 +171,6 @@ public class SelfCarePlugin extends Bot.Listener implements ChatPlugin.Listener,
socialspy = false;
muted = false;
prefix = false;
positionPacketsPerSecond = 0;
final Runnable task = () -> {
if (!bot.loggedIn) return;
@@ -222,11 +234,6 @@ public class SelfCarePlugin extends Bot.Listener implements ChatPlugin.Listener,
);
}
@Override
public void positionChange(Vector3d position) {
positionPacketsPerSecond++;
}
private void runEssentialsCommand (String command) {
if (bot.options.useChat) bot.chat.sendCommandInstantly(command);
else bot.core.run(command);