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

Added an option to match by colors in Auto Respond bot.

Browse source 
Added an option to match by colors in Auto Respond bot.
This commit is contained in:
Anon 2022-09-21 16:03:38 +00:00 • committed by GitHub
commit c945a33f8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 37 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

7
MinecraftClient/ChatBots/AutoRespond.cs
View file

@ -12,6 +12,7 @@ namespace MinecraftClient.ChatBots
class AutoRespond : ChatBot
{
private string matchesFile;
private bool matchColors;
private List<RespondRule> respondRules;
private enum MessageType { Public, Private, Other };
@ -19,9 +20,10 @@ namespace MinecraftClient.ChatBots
/// Create a new AutoRespond bot
/// </summary>
/// <param name="matchesFile">INI File to load matches from</param>
public AutoRespond(string matchesFile)
public AutoRespond(string matchesFile, bool matchColors)
{
this.matchesFile = matchesFile;
this.matchColors = matchColors;
}
/// <summary>
@ -262,7 +264,8 @@ namespace MinecraftClient.ChatBots
public override void GetText(string text)
{
//Remove colour codes
text = GetVerbatim(text);
if (!this.matchColors)
text = GetVerbatim(text);
//Get Message type
string sender = "", message = "";

2
MinecraftClient/McClient.cs
View file

@ -187,7 +187,7 @@ namespace MinecraftClient
if (Settings.AutoRelog_Enabled) { BotLoad(new ChatBots.AutoRelog(Settings.AutoRelog_Delay_Min, Settings.AutoRelog_Delay_Max, Settings.AutoRelog_Retries)); }
if (Settings.ScriptScheduler_Enabled) { BotLoad(new ChatBots.ScriptScheduler(Settings.ExpandVars(Settings.ScriptScheduler_TasksFile))); }
if (Settings.RemoteCtrl_Enabled) { BotLoad(new ChatBots.RemoteControl()); }
if (Settings.AutoRespond_Enabled) { BotLoad(new ChatBots.AutoRespond(Settings.AutoRespond_Matches)); }
if (Settings.AutoRespond_Enabled) { BotLoad(new ChatBots.AutoRespond(Settings.AutoRespond_Matches, Settings.AutoRespond_MatchColors)); }
if (Settings.AutoAttack_Enabled) { BotLoad(new ChatBots.AutoAttack(Settings.AutoAttack_Mode, Settings.AutoAttack_Priority, Settings.AutoAttack_OverrideAttackSpeed, Settings.AutoAttack_CooldownSeconds, Settings.AutoAttack_Interaction)); }
if (Settings.AutoFishing_Enabled) { BotLoad(new ChatBots.AutoFishing()); }
if (Settings.AutoEat_Enabled) { BotLoad(new ChatBots.AutoEat(Settings.AutoEat_hungerThreshold)); }

1
MinecraftClient/Resources/config/MinecraftClient.ini
View file

@ -188,6 +188,7 @@ tpaccepteveryone=false
# /!\ This bot may get spammy depending on your rules, although the global messagecooldown setting can help you avoiding accidental spam
enabled=false
matchesfile=matches.ini
matchcolors=false # Do not remove colors from text (Note: Your matches will have to include color codes (ones using the § character) in order to work)
[AutoAttack]
# Automatically attack hostile mobs around you

38
MinecraftClient/Scripting/ChatBot.cs
View file

@ -145,7 +145,7 @@ namespace MinecraftClient
/// <param name="text">Text from the server</param>
/// <param name="json">Raw JSON from the server. This parameter will be NULL on MC 1.5 or lower!</param>
public virtual void GetText(string text, string? json) { }
/// <summary>
/// Is called when the client has been disconnected fom the server
/// </summary>
@ -245,7 +245,7 @@ namespace MinecraftClient
/// <param name="uuid">Player UUID</param>
/// <param name="gamemode">New Game Mode (0: Survival, 1: Creative, 2: Adventure, 3: Spectator).</param>
public virtual void OnGamemodeUpdate(string playername, Guid uuid, int gamemode) { }
/// <summary>
/// Called when the Latency has been updated for a player
/// </summary>
@ -253,7 +253,7 @@ namespace MinecraftClient
/// <param name="uuid">Player UUID</param>
/// <param name="latency">Latency.</param>
public virtual void OnLatencyUpdate(string playername, Guid uuid, int latency) { }
/// <summary>
/// Called when the Latency has been updated for a player
/// </summary>
@ -262,7 +262,7 @@ namespace MinecraftClient
/// <param name="uuid">Player UUID</param>
/// <param name="latency">Latency.</param>
public virtual void OnLatencyUpdate(Entity entity, string playername, Guid uuid, int latency) { }
/// <summary>
/// Called when a map was updated
/// </summary>
@ -319,7 +319,7 @@ namespace MinecraftClient
/// <param name="objectivevalue">Only if mode is 0 or 2. The text to be displayed for the score</param>
/// <param name="type">Only if mode is 0 or 2. 0 = "integer", 1 = "hearts".</param>
public virtual void OnScoreboardObjective(string objectivename, byte mode, string objectivevalue, int type, string json) { }
/// <summary>
/// Called when a scoreboard updated
/// </summary>
@ -360,12 +360,12 @@ namespace MinecraftClient
/// <param name="uuid">UUID of the player</param>
/// <param name="name">Name of the player</param>
public virtual void OnPlayerLeave(Guid uuid, string? name) { }
/// <summary>
/// Called when the player deaths
/// </summary>
public virtual void OnDeath() { }
/// <summary>
/// Called when the player respawns
/// </summary>
@ -451,14 +451,14 @@ namespace MinecraftClient
/// </summary>
public static string GetVerbatim(string text)
{
if ( String.IsNullOrEmpty(text) )
if (String.IsNullOrEmpty(text))
return String.Empty;
int idx = 0;
var data = new char[text.Length];
for ( int i = 0; i < text.Length; i++ )
if ( text[i] != '§' )
for (int i = 0; i < text.Length; i++)
if (text[i] != '§')
data[idx++] = text[i];
else
i++;
@ -478,7 +478,7 @@ namespace MinecraftClient
if (!((c >= 'a' && c <= 'z')
|| (c >= 'A' && c <= 'Z')
|| (c >= '0' && c <= '9')
|| c == '_') )
|| c == '_'))
return false;
return true;
@ -950,7 +950,7 @@ namespace MinecraftClient
return Handler.GetWorld();
return null;
}
/// <summary>
/// Get all Entities
/// </summary>
@ -968,7 +968,7 @@ namespace MinecraftClient
{
return Handler.GetPlayersLatency();
}
/// <summary>
/// Get the current location of the player (Feet location)
/// </summary>
@ -1002,7 +1002,7 @@ namespace MinecraftClient
{
return Handler.ClientIsMoving();
}
/// <summary>
/// Look at the specified location
/// </summary>
@ -1086,7 +1086,7 @@ namespace MinecraftClient
{
return Handler.GetUsername();
}
/// <summary>
/// Return the Gamemode of the current account
/// </summary>
@ -1361,7 +1361,7 @@ namespace MinecraftClient
{
return Handler.GetCurrentSlot();
}
/// <summary>
/// Clean all inventory
/// </summary>
@ -1370,7 +1370,7 @@ namespace MinecraftClient
{
return Handler.ClearInventories();
}
/// <summary>
/// Update sign text
/// </summary>
@ -1410,7 +1410,7 @@ namespace MinecraftClient
{
return Handler.SpectateByUUID(UUID);
}
/// <summary>
/// Update command block
/// </summary>
@ -1456,7 +1456,7 @@ namespace MinecraftClient
{
return Handler.GetMaxChatMessageLength();
}
/// <summary>
/// Respawn player
/// </summary>

6
MinecraftClient/Settings.cs
View file

@ -191,6 +191,7 @@ namespace MinecraftClient
//Auto Respond
public static bool AutoRespond_Enabled = false;
public static string AutoRespond_Matches = "matches.ini";
public static bool AutoRespond_MatchColors = false;
//Auto Attack
public static bool AutoAttack_Enabled = false;
@ -206,7 +207,7 @@ namespace MinecraftClient
public static bool AutoFishing_Mainhand = true;
public static bool AutoFishing_AutoStart = true;
public static double AutoFishing_CastDelay = 0.4;
public static double AutoFishing_FishingDelay = 3.0;
public static double AutoFishing_FishingDelay = 3.0;
public static double AutoFishing_FishingTimeout = 300.0;
public static double AutoFishing_DurabilityLimit = 2;
public static bool AutoFishing_AutoRodSwitch = true;
@ -697,6 +698,7 @@ namespace MinecraftClient
{
case "enabled": AutoRespond_Enabled = str2bool(argValue); return true;
case "matchesfile": AutoRespond_Matches = argValue; return true;
case "matchcolors": AutoRespond_MatchColors = str2bool(argValue); return true;
}
break;
@ -733,7 +735,7 @@ namespace MinecraftClient
case "fishing_delay": AutoFishing_FishingDelay = str2double(argValue); return true;
case "fishing_timeout": AutoFishing_FishingTimeout = str2double(argValue); return true;
case "durability_limit": AutoFishing_DurabilityLimit = str2int(argValue); return true;
case "auto_rod_switch": AutoFishing_AutoRodSwitch = str2bool(argValue); return true;
case "auto_rod_switch": AutoFishing_AutoRodSwitch = str2bool(argValue); return true;
case "stationary_threshold": AutoFishing_StationaryThreshold = str2double(argValue); return true;
case "hook_threshold": AutoFishing_HookThreshold = str2double(argValue); return true;
case "log_fishing_bobber": AutoFishing_LogFishingBobber = str2bool(argValue); return true;

7
MinecraftClient/config/sample-matches.ini
View file

@ -63,5 +63,12 @@ match=hello
action=send hello!
cooldown=60
# Example of matching colored text when "matchcolors" is set to "true"
# §a stands for green text
# List of all color codes: https://minecraft.tools/en/color-code.php
[Match]
match=§ahello
action=send Hello back!
# Enjoy!
# - ORelio