From 88e4f72cac05da974a6ae9f8f8b86918c279cb9d Mon Sep 17 00:00:00 2001 From: AlexProgrammerDE <40795980+AlexProgrammerDE@users.noreply.github.com> Date: Mon, 18 Sep 2023 12:37:49 +0200 Subject: [PATCH] Update cli flags --- CLI_FLAGS.md | 35 ++++++++++++------- .../serverwrecker/ServerWreckerBootstrap.java | 1 + .../{ => cli}/SWCommandDefinition.java | 3 +- 3 files changed, 26 insertions(+), 13 deletions(-) rename src/main/java/net/pistonmaster/serverwrecker/{ => cli}/SWCommandDefinition.java (98%) diff --git a/CLI_FLAGS.md b/CLI_FLAGS.md index ebb5335bf..8df319c13 100644 --- a/CLI_FLAGS.md +++ b/CLI_FLAGS.md @@ -9,7 +9,7 @@ | `-a`, `--amount` | `1` | Amount of bots to connect to the server | | `--min-join-delay` | `1000` | The minimum delay between bot connections, in milliseconds | | `--max-join-delay` | `3000` | The maximum delay between bot connections, in milliseconds | -| `-mc`, `--mc-version` | `1.20` | Minecraft version of the server to connect to | +| `-mc`, `--mc-version` | `1.20/1.20.1` | Minecraft version of the server to connect to | | `--read-timeout` | `30` | Bot read timeout | | `--write-timeout` | `0` | Bot write timeout | | `--connect-timeout` | `30` | Bot connect timeout | @@ -29,6 +29,17 @@ | `--auto-reconnect` | `true` | Reconnect bots after being disconnected | | `--reconnect-min-delay` | `1` | Minimum delay between reconnects | | `--reconnect-max-delay` | `5` | Maximum delay between reconnects | +| `--log-chat` | `true` | Log chat to terminal | +| `--chat-interval` | `2` | Minimum delay between logging chat | +| `--auto-jump` | `false` | Do auto jump? | +| `--jump-min-delay` | `2` | Minimum delay between jumps | +| `--jump-max-delay` | `5` | Maximum delay between jumps | +| `--auto-eat` | `true` | Do auto eat? | +| `--eat-min-delay` | `1` | Minimum delay between eating | +| `--eat-max-delay` | `2` | Maximum delay between eating | +| `--auto-totem` | `true` | Do auto totem? | +| `--totem-min-delay` | `1` | Minimum delay between using totems | +| `--totem-max-delay` | `2` | Maximum delay between using totems | | `--send-client-settings` | `true` | Send client settings | | `--client-locale` | `en_gb` | Client locale | | `--render-distance` | `8` | Render distance | @@ -44,22 +55,22 @@ | `--hand-preference` | `RIGHT_HAND` | Hand preference | | `--text-filtering-enabled` | `true` | Text filtering enabled | | `--allows-listing` | `true` | Allows listing | -| `--send-client-brand` | `true` | Send client brand | -| `--client-brand` | `vanilla` | Client brand | +| `--server-list-bypass` | `false` | Do server list bypass? | +| `--server-list-bypass-min-delay` | `1` | Minimum join delay after pinging the server | +| `--server-list-bypass-max-delay` | `3` | Maximum join delay after pinging the server | +| `--auto-respawn` | `true` | Respawn bots after death | +| `--respawn-min-delay` | `1` | Minimum delay between respawns | +| `--respawn-max-delay` | `3` | Maximum delay between respawns | | `--auto-register` | `false` | Make bots run the /register and /login command after joining | | `--register-command` | `/register %password% %password%` | Command to be executed to register | | `--login-command` | `/login %password%` | Command to be executed to log in | | `--captcha-command` | `/captcha %captcha%` | Command to be executed to confirm a captcha | | `--password-format` | `ServerWrecker` | The password for registering | -| `--auto-respawn` | `true` | Respawn bots after death | -| `--respawn-min-delay` | `1` | Minimum delay between respawns | -| `--respawn-max-delay` | `3` | Maximum delay between respawns | -| `--auto-jump` | `false` | Do auto jump? | -| `--jump-min-delay` | `2` | Minimum delay between jumps | -| `--jump-max-delay` | `5` | Maximum delay between jumps | -| `--server-list-bypass` | `false` | Do server list bypass? | -| `--server-list-bypass-min-delay` | `1` | Minimum join delay after pinging the server | -| `--server-list-bypass-max-delay` | `3` | Maximum join delay after pinging the server | +| `--send-client-brand` | `true` | Send client brand | +| `--client-brand` | `vanilla` | Client brand | +| `--auto-armor` | `true` | Do auto armor? | +| `--armor-min-delay` | `1` | Minimum delay between putting on armor | +| `--armor-max-delay` | `2` | Maximum delay between putting on armor | ## Example usage diff --git a/src/main/java/net/pistonmaster/serverwrecker/ServerWreckerBootstrap.java b/src/main/java/net/pistonmaster/serverwrecker/ServerWreckerBootstrap.java index c53e4da74..aa4b36ec6 100644 --- a/src/main/java/net/pistonmaster/serverwrecker/ServerWreckerBootstrap.java +++ b/src/main/java/net/pistonmaster/serverwrecker/ServerWreckerBootstrap.java @@ -23,6 +23,7 @@ import net.pistonmaster.serverwrecker.addons.*; import net.pistonmaster.serverwrecker.api.ServerWreckerAPI; import net.pistonmaster.serverwrecker.api.event.lifecycle.CommandManagerInitEvent; +import net.pistonmaster.serverwrecker.cli.SWCommandDefinition; import net.pistonmaster.serverwrecker.common.OperationMode; import net.pistonmaster.serverwrecker.grpc.RPCClient; import net.pistonmaster.serverwrecker.gui.GUIManager; diff --git a/src/main/java/net/pistonmaster/serverwrecker/SWCommandDefinition.java b/src/main/java/net/pistonmaster/serverwrecker/cli/SWCommandDefinition.java similarity index 98% rename from src/main/java/net/pistonmaster/serverwrecker/SWCommandDefinition.java rename to src/main/java/net/pistonmaster/serverwrecker/cli/SWCommandDefinition.java index 22b588929..d35d1c7e2 100644 --- a/src/main/java/net/pistonmaster/serverwrecker/SWCommandDefinition.java +++ b/src/main/java/net/pistonmaster/serverwrecker/cli/SWCommandDefinition.java @@ -17,11 +17,12 @@ * License along with this program. If not, see * . */ -package net.pistonmaster.serverwrecker; +package net.pistonmaster.serverwrecker.cli; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import lombok.RequiredArgsConstructor; import lombok.Setter; +import net.pistonmaster.serverwrecker.ServerWrecker; import net.pistonmaster.serverwrecker.auth.AccountSettings; import net.pistonmaster.serverwrecker.auth.AuthType; import net.pistonmaster.serverwrecker.builddata.BuildData;