helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-10-14 21:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into pr/2393

Browse source
This commit is contained in:
BruceChen 2023-01-16 14:46:18 +08:00
commit 730cdf92e7
6 changed files with 29 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ConsoleInteractive

@ -1 +1 @@
Subproject commit 42074c449b8cf32e035f982bd83af6dcf75bc764 Subproject commit 70bd2633b4ec6da62a2554f80a769e8178d825f2

3
Docker/start-latest.sh
View file

@ -18,5 +18,8 @@ unzip MinecraftClient-linux.zip
# Remove the ZIP # Remove the ZIP
rm -- MinecraftClient-linux.zip rm -- MinecraftClient-linux.zip
# Set Executable
chmod +x ./MinecraftClient
# Start the Client # Start the Client
./MinecraftClient ./MinecraftClient

10
MinecraftClient/ChatBots/AutoAttack.cs
View file

@ -33,6 +33,9 @@ namespace MinecraftClient.ChatBots
[TomlInlineComment("$ChatBot.AutoAttack.Interaction$")] [TomlInlineComment("$ChatBot.AutoAttack.Interaction$")]
public InteractType Interaction = InteractType.Attack; public InteractType Interaction = InteractType.Attack;
[TomlInlineComment("$ChatBot.AutoAttack.Attack_Range$")]
public double Attack_Range = 4.0;
[TomlInlineComment("$ChatBot.AutoAttack.Attack_Hostile$")] [TomlInlineComment("$ChatBot.AutoAttack.Attack_Hostile$")]
public bool Attack_Hostile = true; public bool Attack_Hostile = true;
@ -52,6 +55,12 @@ namespace MinecraftClient.ChatBots
LogToConsole(BotName, Translations.bot_autoAttack_invalidcooldown); LogToConsole(BotName, Translations.bot_autoAttack_invalidcooldown);
Cooldown_Time.value = 1.0; 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 }; public enum AttackMode { single, multi };
@ -108,6 +117,7 @@ namespace MinecraftClient.ChatBots
attackHostile = Config.Attack_Hostile; attackHostile = Config.Attack_Hostile;
attackPassive = Config.Attack_Passive; attackPassive = Config.Attack_Passive;
attackRange = Config.Attack_Range;
} }
public override void Initialize() public override void Initialize()

9
MinecraftClient/Resources/ConfigComments/ConfigComments.Designer.cs generated
View file

@ -258,6 +258,15 @@ namespace MinecraftClient {
} }
} }
/// <summary>
/// Looks up a localized string similar to Capped between 1 to 4.
/// </summary>
internal static string ChatBot_AutoAttack_Attack_Range {
get {
return ResourceManager.GetString("ChatBot.AutoAttack.Attack_Range", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to How long to wait between each attack. Set &quot;Custom = false&quot; to let MCC calculate it.. /// Looks up a localized string similar to How long to wait between each attack. Set &quot;Custom = false&quot; to let MCC calculate it..
/// </summary> /// </summary>

3
MinecraftClient/Resources/ConfigComments/ConfigComments.resx
View file

@ -189,6 +189,9 @@ You need to enable Entity Handling to use this bot
<data name="ChatBot.AutoAttack.Attack_Passive" xml:space="preserve"> <data name="ChatBot.AutoAttack.Attack_Passive" xml:space="preserve">
<value>Allow attacking passive mobs.</value> <value>Allow attacking passive mobs.</value>
</data> </data>
<data name="ChatBot.AutoAttack.Attack_Range" xml:space="preserve">
<value>Capped between 1 to 4</value>
</data>
<data name="ChatBot.AutoAttack.Cooldown_Time" xml:space="preserve"> <data name="ChatBot.AutoAttack.Cooldown_Time" xml:space="preserve">
<value>How long to wait between each attack. Set "Custom = false" to let MCC calculate it.</value> <value>How long to wait between each attack. Set "Custom = false" to let MCC calculate it.</value>
</data> </data>

6
docs/yarn.lock
View file

@ -2803,9 +2803,9 @@ json-schema-traverse@^1.0.0:
integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
json5@^2.1.2, json5@^2.2.0: json5@^2.1.2, json5@^2.2.0:
version "2.2.1" version "2.2.3"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
jsonc-parser@^3.0.0: jsonc-parser@^3.0.0:
version "3.2.0" version "3.2.0"