diff --git a/ConsoleInteractive b/ConsoleInteractive index 42074c44..70bd2633 160000 --- a/ConsoleInteractive +++ b/ConsoleInteractive @@ -1 +1 @@ -Subproject commit 42074c449b8cf32e035f982bd83af6dcf75bc764 +Subproject commit 70bd2633b4ec6da62a2554f80a769e8178d825f2 diff --git a/Docker/start-latest.sh b/Docker/start-latest.sh index 6f158287..c05f4bbd 100644 --- a/Docker/start-latest.sh +++ b/Docker/start-latest.sh @@ -18,5 +18,8 @@ unzip MinecraftClient-linux.zip # Remove the ZIP rm -- MinecraftClient-linux.zip +# Set Executable +chmod +x ./MinecraftClient + # Start the Client ./MinecraftClient diff --git a/MinecraftClient/ChatBots/AutoAttack.cs b/MinecraftClient/ChatBots/AutoAttack.cs index 8cd8ee2f..9225e370 100644 --- a/MinecraftClient/ChatBots/AutoAttack.cs +++ b/MinecraftClient/ChatBots/AutoAttack.cs @@ -33,6 +33,9 @@ namespace MinecraftClient.ChatBots [TomlInlineComment("$ChatBot.AutoAttack.Interaction$")] public InteractType Interaction = InteractType.Attack; + [TomlInlineComment("$ChatBot.AutoAttack.Attack_Range$")] + public double Attack_Range = 4.0; + [TomlInlineComment("$ChatBot.AutoAttack.Attack_Hostile$")] public bool Attack_Hostile = true; @@ -52,6 +55,12 @@ namespace MinecraftClient.ChatBots LogToConsole(BotName, Translations.bot_autoAttack_invalidcooldown); Cooldown_Time.value = 1.0; } + + if (Attack_Range < 1.0) + Attack_Range = 1.0; + + if (Attack_Range > 4.0) + Attack_Range = 4.0; } public enum AttackMode { single, multi }; @@ -108,6 +117,7 @@ namespace MinecraftClient.ChatBots attackHostile = Config.Attack_Hostile; attackPassive = Config.Attack_Passive; + attackRange = Config.Attack_Range; } public override void Initialize() diff --git a/MinecraftClient/Resources/ConfigComments/ConfigComments.Designer.cs b/MinecraftClient/Resources/ConfigComments/ConfigComments.Designer.cs index 5619e1c3..82e0532f 100644 --- a/MinecraftClient/Resources/ConfigComments/ConfigComments.Designer.cs +++ b/MinecraftClient/Resources/ConfigComments/ConfigComments.Designer.cs @@ -258,6 +258,15 @@ namespace MinecraftClient { } } + /// + /// Looks up a localized string similar to Capped between 1 to 4. + /// + internal static string ChatBot_AutoAttack_Attack_Range { + get { + return ResourceManager.GetString("ChatBot.AutoAttack.Attack_Range", resourceCulture); + } + } + /// /// Looks up a localized string similar to How long to wait between each attack. Set "Custom = false" to let MCC calculate it.. /// diff --git a/MinecraftClient/Resources/ConfigComments/ConfigComments.resx b/MinecraftClient/Resources/ConfigComments/ConfigComments.resx index 569bdee8..b302fea0 100644 --- a/MinecraftClient/Resources/ConfigComments/ConfigComments.resx +++ b/MinecraftClient/Resources/ConfigComments/ConfigComments.resx @@ -189,6 +189,9 @@ You need to enable Entity Handling to use this bot Allow attacking passive mobs. + + Capped between 1 to 4 + How long to wait between each attack. Set "Custom = false" to let MCC calculate it. diff --git a/docs/yarn.lock b/docs/yarn.lock index 0b93ab1d..8e72992e 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -2803,9 +2803,9 @@ json-schema-traverse@^1.0.0: integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== json5@^2.1.2, json5@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" - integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== + version "2.2.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" + integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== jsonc-parser@^3.0.0: version "3.2.0"