helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-11-07 17:36:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Crowdin localization support (#2310)

Browse source 
* Switching to use resource files

* Update Crowdin configuration file

* Code cleanup
This commit is contained in:
BruceChen 2022-10-28 11:13:20 +08:00 • committed by GitHub
parent a27491c1b6
commit 077e3a5e9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
193 changed files with 102089 additions and 3564 deletions
Download patch file Download diff file Expand all files Collapse all files

10
MinecraftClient/ChatBots/Alerts.cs
View file

@ -69,7 +69,7 @@ namespace MinecraftClient.ChatBots
if (!checkSuccessed)
{
LogToConsole(BotName, Translations.TryGet("general.bot_unload"));
LogToConsole(BotName, Translations.general_bot_unload);
Enabled = false;
}
}
@ -123,7 +123,7 @@ namespace MinecraftClient.ChatBots
Console.Beep();
Console.Beep();
}
LogToConsole(Translations.TryGet("bot.alerts.start_rain"));
LogToConsole(Translations.bot_alerts_start_rain);
}
}
else if (curRainLevel >= threshold && level < threshold)
@ -134,7 +134,7 @@ namespace MinecraftClient.ChatBots
{
Console.Beep();
}
LogToConsole(Translations.TryGet("bot.alerts.end_rain"));
LogToConsole(Translations.bot_alerts_end_rain);
}
}
curRainLevel = level;
@ -151,7 +151,7 @@ namespace MinecraftClient.ChatBots
Console.Beep();
Console.Beep();
}
LogToConsole(Translations.TryGet("bot.alerts.start_thunderstorm"));
LogToConsole(Translations.bot_alerts_start_thunderstorm);
}
}
else if (curThunderLevel >= threshold && level < threshold)
@ -162,7 +162,7 @@ namespace MinecraftClient.ChatBots
{
Console.Beep();
}
LogToConsole(Translations.TryGet("bot.alerts.end_thunderstorm"));
LogToConsole(Translations.bot_alerts_end_thunderstorm);
}
}
curThunderLevel = level;

6
MinecraftClient/ChatBots/AntiAFK.cs
View file

@ -43,7 +43,7 @@ namespace MinecraftClient.ChatBots
if (Walk_Range <= 0)
{
Walk_Range = 5;
LogToConsole(BotName, Translations.TryGet("bot.antiafk.invalid_walk_range"));
LogToConsole(BotName, Translations.bot_antiafk_invalid_walk_range);
}
Delay.min = Math.Max(1.0, Delay.min);
@ -55,7 +55,7 @@ namespace MinecraftClient.ChatBots
if (Delay.min > Delay.max)
{
(Delay.min, Delay.max) = (Delay.max, Delay.min);
LogToConsole(BotName, Translations.TryGet("bot.antiafk.swapping"));
LogToConsole(BotName, Translations.bot_antiafk_swapping);
}
Command ??= string.Empty;
@ -96,7 +96,7 @@ namespace MinecraftClient.ChatBots
{
if (!GetTerrainEnabled())
{
LogToConsole(Translations.TryGet("bot.antiafk.not_using_terrain_handling"));
LogToConsole(Translations.bot_antiafk_not_using_terrain_handling);
}
}
}

6
MinecraftClient/ChatBots/AutoAttack.cs
View file

@ -48,7 +48,7 @@ namespace MinecraftClient.ChatBots
{
if (Cooldown_Time.Custom && Cooldown_Time.value <= 0)
{
LogToConsole(BotName, Translations.TryGet("bot.autoAttack.invalidcooldown"));
LogToConsole(BotName, Translations.bot_autoAttack_invalidcooldown);
Cooldown_Time.value = 1.0;
}
}
@ -113,8 +113,8 @@ namespace MinecraftClient.ChatBots
{
if (!GetEntityHandlingEnabled())
{
LogToConsoleTranslated("extra.entity_required");
LogToConsoleTranslated("general.bot_unload");
LogToConsole(Translations.extra_entity_required);
LogToConsole(Translations.general_bot_unload);
UnloadBot();
}
}

56
MinecraftClient/ChatBots/AutoCraft.cs
View file

@ -61,11 +61,11 @@ namespace MinecraftClient.ChatBots
if (string.IsNullOrWhiteSpace(recipe.Name))
{
recipe.Name = new Random().NextInt64().ToString();
LogToConsole(BotName, Translations.TryGet("bot.autoCraft.exception.name_miss"));
LogToConsole(BotName, Translations.bot_autoCraft_exception_name_miss);
}
if (nameList.Contains(recipe.Name))
{
LogToConsole(BotName, Translations.TryGet("bot.autoCraft.exception.duplicate", recipe.Name));
LogToConsole(BotName, string.Format(Translations.bot_autoCraft_exception_duplicate, recipe.Name));
do
{
recipe.Name = new Random().NextInt64().ToString();
@ -85,12 +85,12 @@ namespace MinecraftClient.ChatBots
for (int i = 0; i < fixLength; ++i)
Slots[i] = (i < recipe.Slots.Length) ? recipe.Slots[i] : ItemType.Null;
recipe.Slots = Slots;
LogToConsole(BotName, Translations.TryGet("bot.autocraft.invaild_slots"));
LogToConsole(BotName, Translations.bot_autocraft_invaild_slots);
}
if (recipe.Result == ItemType.Air || recipe.Result == ItemType.Null)
{
LogToConsole(BotName, Translations.TryGet("bot.autocraft.invaild_result"));
LogToConsole(BotName, Translations.bot_autocraft_invaild_result);
}
}
}
@ -283,13 +283,13 @@ namespace MinecraftClient.ChatBots
{
if (!GetInventoryEnabled())
{
LogToConsoleTranslated("extra.inventory_required");
LogToConsoleTranslated("general.bot_unload");
LogToConsole(Translations.extra_inventory_required);
LogToConsole(Translations.general_bot_unload);
UnloadBot();
return;
}
RegisterChatBotCommand("autocraft", Translations.Get("bot.autoCraft.cmd"), GetHelp(), CommandHandler);
RegisterChatBotCommand("ac", Translations.Get("bot.autoCraft.alias"), GetHelp(), CommandHandler);
RegisterChatBotCommand("autocraft", Translations.bot_autoCraft_cmd, GetHelp(), CommandHandler);
RegisterChatBotCommand("ac", Translations.bot_autoCraft_alias, GetHelp(), CommandHandler);
}
public string CommandHandler(string cmd, string[] args)
@ -302,7 +302,7 @@ namespace MinecraftClient.ChatBots
StringBuilder nameList = new();
foreach (RecipeConfig recipe in Config.Recipes)
nameList.Append(recipe.Name).Append(", ");
return Translations.Get("bot.autoCraft.cmd.list", Config.Recipes.Length, nameList.ToString());
return string.Format(Translations.bot_autoCraft_cmd_list, Config.Recipes.Length, nameList.ToString());
case "start":
if (args.Length >= 2)
{
@ -327,13 +327,13 @@ namespace MinecraftClient.ChatBots
return "";
}
else
return Translations.Get("bot.autoCraft.recipe_not_exist");
return Translations.bot_autoCraft_recipe_not_exist;
}
else
return Translations.Get("bot.autoCraft.no_recipe_name");
return Translations.bot_autoCraft_no_recipe_name;
case "stop":
StopCrafting();
return Translations.Get("bot.autoCraft.stop");
return Translations.bot_autoCraft_stop;
case "help":
return GetCommandHelp(args.Length >= 2 ? args[1] : "");
default:
@ -345,7 +345,7 @@ namespace MinecraftClient.ChatBots
private static string GetHelp()
{
return Translations.Get("bot.autoCraft.available_cmd", "load, list, reload, resetcfg, start, stop, help");
return string.Format(Translations.bot_autoCraft_available_cmd, "load, list, reload, resetcfg, start, stop, help");
}
private string GetCommandHelp(string cmd)
@ -353,13 +353,13 @@ namespace MinecraftClient.ChatBots
return cmd.ToLower() switch
{
#pragma warning disable format // @formatter:off
"load" => Translations.Get("bot.autocraft.help.load"),
"list" => Translations.Get("bot.autocraft.help.list"),
"reload" => Translations.Get("bot.autocraft.help.reload"),
"resetcfg" => Translations.Get("bot.autocraft.help.resetcfg"),
"start" => Translations.Get("bot.autocraft.help.start"),
"stop" => Translations.Get("bot.autocraft.help.stop"),
"help" => Translations.Get("bot.autocraft.help.help"),
"load" => Translations.bot_autoCraft_help_load,
"list" => Translations.bot_autoCraft_help_list,
"reload" => Translations.bot_autoCraft_help_reload,
"resetcfg" => Translations.bot_autoCraft_help_resetcfg,
"start" => Translations.bot_autoCraft_help_start,
"stop" => Translations.bot_autoCraft_help_stop,
"help" => Translations.bot_autoCraft_help_help,
_ => GetHelp(),
#pragma warning restore format // @formatter:on
};
@ -468,7 +468,7 @@ namespace MinecraftClient.ChatBots
// table required but not found. Try to open one
OpenTable(Config._Table_Location);
waitingForTable = true;
SetTimeout(Translations.Get("bot.autoCraft.table_not_found"));
SetTimeout(Translations.bot_autoCraft_table_not_found);
return;
}
}
@ -495,10 +495,10 @@ namespace MinecraftClient.ChatBots
// Repeat the whole process again
actionSteps.Add(new ActionStep(ActionType.Repeat));
// Start crafting
LogToConsoleTranslated("bot.autoCraft.start", recipe.ResultItem);
LogToConsole(string.Format(Translations.bot_autoCraft_start, recipe.ResultItem));
HandleNextStep();
}
else LogToConsoleTranslated("bot.autoCraft.start_fail", recipe.ResultItem);
else LogToConsole(string.Format(Translations.bot_autoCraft_start_fail, recipe.ResultItem));
}
/// <summary>
@ -516,7 +516,7 @@ namespace MinecraftClient.ChatBots
if (GetInventories().ContainsKey(inventoryInUse))
{
CloseInventory(inventoryInUse);
LogToConsoleTranslated("bot.autoCraft.close_inventory", inventoryInUse);
LogToConsole(string.Format(Translations.bot_autoCraft_close_inventory, inventoryInUse));
}
}
@ -614,12 +614,12 @@ namespace MinecraftClient.ChatBots
if (actionSteps[index - 1].ActionType == ActionType.LeftClick && actionSteps[index - 1].ItemType != ItemType.Air)
{
// Inform user the missing meterial name
LogToConsoleTranslated("bot.autoCraft.missing_material", actionSteps[index - 1].ItemType.ToString());
LogToConsole(string.Format(Translations.bot_autoCraft_missing_material, actionSteps[index - 1].ItemType.ToString()));
}
if (Config.OnFailure == OnFailConfig.abort)
{
StopCrafting();
LogToConsoleTranslated("bot.autoCraft.aborted");
LogToConsole(Translations.bot_autoCraft_aborted);
}
else
{
@ -627,7 +627,7 @@ namespace MinecraftClient.ChatBots
// Even though crafting failed, action step index will still increase
// we want to do that failed step again so decrease index by 1
index--;
LogToConsoleTranslated("bot.autoCraft.craft_fail");
LogToConsole(Translations.bot_autoCraft_craft_fail);
}
}
}
@ -669,7 +669,7 @@ namespace MinecraftClient.ChatBots
private void HandleUpdateTimeout()
{
LogToConsoleTranslated("bot.autoCraft.timeout", timeoutAction);
LogToConsole(string.Format(Translations.bot_autoCraft_timeout, timeoutAction));
}
/// <summary>

48
MinecraftClient/ChatBots/AutoDig.cs
View file

@ -107,17 +107,17 @@ namespace MinecraftClient.ChatBots
{
if (!GetTerrainEnabled())
{
LogToConsoleTranslated("extra.terrainandmovement_required");
LogToConsoleTranslated("general.bot_unload");
LogToConsole(Translations.extra_terrainandmovement_required);
LogToConsole(Translations.general_bot_unload);
UnloadBot();
return;
}
inventoryEnabled = GetInventoryEnabled();
if (!inventoryEnabled && Config.Auto_Tool_Switch)
LogToConsoleTranslated("bot.autodig.no_inv_handle");
LogToConsole(Translations.bot_autodig_no_inv_handle);
RegisterChatBotCommand("digbot", Translations.Get("bot.digbot.cmd"), GetHelp(), CommandHandler);
RegisterChatBotCommand("digbot", Translations.bot_autodig_cmd, GetHelp(), CommandHandler);
}
public string CommandHandler(string cmd, string[] args)
@ -132,10 +132,10 @@ namespace MinecraftClient.ChatBots
counter = 0;
state = State.WaitingStart;
}
return Translations.Get("bot.autodig.start");
return Translations.bot_autodig_start;
case "stop":
StopDigging();
return Translations.Get("bot.autodig.stop");
return Translations.bot_autodig_stop;
case "help":
return GetCommandHelp(args.Length >= 2 ? args[1] : "");
default:
@ -150,7 +150,7 @@ namespace MinecraftClient.ChatBots
if (Config.Auto_Start_Delay > 0)
{
double delay = Config.Auto_Start_Delay;
LogToConsole(Translations.Get("bot.autodig.start_delay", delay));
LogToConsole(string.Format(Translations.bot_autodig_start_delay, delay));
lock (stateLock)
{
counter = Settings.DoubleToTick(delay);
@ -201,7 +201,7 @@ namespace MinecraftClient.ChatBots
case State.Digging:
if (++counter > Settings.DoubleToTick(Config.Dig_Timeout))
{
LogToConsole(GetTimestamp() + ": " + Translations.Get("bot.autodig.dig_timeout"));
LogToConsole(GetTimestamp() + ": " + Translations.bot_autodig_dig_timeout);
state = State.WaitingStart;
counter = 0;
}
@ -223,7 +223,7 @@ namespace MinecraftClient.ChatBots
{
AlreadyWaitting = true;
if (Config.Log_Block_Dig)
LogToConsole(Translations.Get("cmd.dig.too_far"));
LogToConsole(Translations.cmd_dig_too_far);
}
return false;
}
@ -233,7 +233,7 @@ namespace MinecraftClient.ChatBots
{
AlreadyWaitting = true;
if (Config.Log_Block_Dig)
LogToConsole(Translations.Get("cmd.dig.no_block"));
LogToConsole(Translations.cmd_dig_no_block);
}
return false;
}
@ -247,12 +247,12 @@ namespace MinecraftClient.ChatBots
{
currentDig = blockLoc;
if (Config.Log_Block_Dig)
LogToConsole(Translations.Get("cmd.dig.dig", blockLoc.X, blockLoc.Y, blockLoc.Z, block.GetTypeString()));
LogToConsole(string.Format(Translations.cmd_dig_dig, blockLoc.X, blockLoc.Y, blockLoc.Z, block.GetTypeString()));
return true;
}
else
{
LogToConsole(Translations.Get("cmd.dig.fail"));
LogToConsole(Translations.cmd_dig_fail);
return false;
}
}
@ -262,7 +262,7 @@ namespace MinecraftClient.ChatBots
{
AlreadyWaitting = true;
if (Config.Log_Block_Dig)
LogToConsole(Translations.Get("bot.autodig.not_allow"));
LogToConsole(Translations.bot_autodig_not_allow);
}
return false;
}
@ -273,7 +273,7 @@ namespace MinecraftClient.ChatBots
{
AlreadyWaitting = true;
if (Config.Log_Block_Dig)
LogToConsole(Translations.Get("bot.autodig.not_allow"));
LogToConsole(Translations.bot_autodig_not_allow);
}
return false;
}
@ -308,12 +308,12 @@ namespace MinecraftClient.ChatBots
{
currentDig = target;
if (Config.Log_Block_Dig)
LogToConsole(Translations.Get("cmd.dig.dig", target.X, target.Y, target.Z, targetBlock.GetTypeString()));
LogToConsole(string.Format(Translations.cmd_dig_dig, target.X, target.Y, target.Z, targetBlock.GetTypeString()));
return true;
}
else
{
LogToConsole(Translations.Get("cmd.dig.fail"));
LogToConsole(Translations.cmd_dig_fail);
return false;
}
}
@ -323,7 +323,7 @@ namespace MinecraftClient.ChatBots
{
AlreadyWaitting = true;
if (Config.Log_Block_Dig)
LogToConsole(Translations.Get("cmd.dig.no_block"));
LogToConsole(Translations.cmd_dig_no_block);
}
return false;
}
@ -342,12 +342,12 @@ namespace MinecraftClient.ChatBots
{
currentDig = blockLoc;
if (Config.Log_Block_Dig)
LogToConsole(Translations.Get("cmd.dig.dig", blockLoc.X, blockLoc.Y, blockLoc.Z, block.GetTypeString()));
LogToConsole(string.Format(Translations.cmd_dig_dig, blockLoc.X, blockLoc.Y, blockLoc.Z, block.GetTypeString()));
return true;
}
else
{
LogToConsole(Translations.Get("cmd.dig.fail"));
LogToConsole(Translations.cmd_dig_fail);
return false;
}
}
@ -357,7 +357,7 @@ namespace MinecraftClient.ChatBots
{
AlreadyWaitting = true;
if (Config.Log_Block_Dig)
LogToConsole(Translations.Get("cmd.dig.no_block"));
LogToConsole(Translations.cmd_dig_no_block);
}
return false;
}
@ -404,7 +404,7 @@ namespace MinecraftClient.ChatBots
private static string GetHelp()
{
return Translations.Get("bot.autodig.available_cmd", "start, stop, help");
return string.Format(Translations.bot_autodig_available_cmd, "start, stop, help");
}
private string GetCommandHelp(string cmd)
@ -412,9 +412,9 @@ namespace MinecraftClient.ChatBots
return cmd.ToLower() switch
{
#pragma warning disable format // @formatter:off
"start" => Translations.Get("bot.autodig.help.start"),
"stop" => Translations.Get("bot.autodig.help.stop"),
"help" => Translations.Get("bot.autodig.help.help"),
"start" => Translations.bot_autodig_help_start,
"stop" => Translations.bot_autodig_help_stop,
"help" => Translations.bot_autodig_help_help,
_ => GetHelp(),
#pragma warning restore format // @formatter:on
};

40
MinecraftClient/ChatBots/AutoDrop.cs
View file

@ -48,26 +48,26 @@ namespace MinecraftClient.ChatBots
Config.Enabled = true;
inventoryUpdated = 0;
OnUpdateFinish();
return Translations.Get("bot.autoDrop.on");
return Translations.bot_autoDrop_on;
case "off":
Config.Enabled = false;
return Translations.Get("bot.autoDrop.off");
return Translations.bot_autoDrop_off;
case "add":
if (args.Length >= 2)
{
if (Enum.TryParse(args[1], true, out ItemType item))
{
Config.Items.Add(item);
return Translations.Get("bot.autoDrop.added", item.ToString());
return string.Format(Translations.bot_autoDrop_added, item.ToString());
}
else
{
return Translations.Get("bot.autoDrop.incorrect_name", args[1]);
return string.Format(Translations.bot_autoDrop_incorrect_name, args[1]);
}
}
else
{
return Translations.Get("cmd.inventory.help.usage") + ": add <item name>";
return Translations.cmd_inventory_help_usage + ": add <item name>";
}
case "remove":
if (args.Length >= 2)
@ -77,30 +77,30 @@ namespace MinecraftClient.ChatBots
if (Config.Items.Contains(item))
{
Config.Items.Remove(item);
return Translations.Get("bot.autoDrop.removed", item.ToString());
return string.Format(Translations.bot_autoDrop_removed, item.ToString());
}
else
{
return Translations.Get("bot.autoDrop.not_in_list");
return Translations.bot_autoDrop_not_in_list;
}
}
else
{
return Translations.Get("bot.autoDrop.incorrect_name", args[1]);
return string.Format(Translations.bot_autoDrop_incorrect_name, args[1]);
}
}
else
{
return Translations.Get("cmd.inventory.help.usage") + ": remove <item name>";
return Translations.cmd_inventory_help_usage + ": remove <item name>";
}
case "list":
if (Config.Items.Count > 0)
{
return Translations.Get("bot.autoDrop.list", Config.Items.Count, string.Join("\n", Config.Items));
return string.Format(Translations.bot_autoDrop_list, Config.Items.Count, string.Join("\n", Config.Items));
}
else
{
return Translations.Get("bot.autoDrop.no_item");
return Translations.bot_autoDrop_no_item;
}
case "mode":
if (args.Length >= 2)
@ -117,15 +117,15 @@ namespace MinecraftClient.ChatBots
Config.Mode = DropMode.everything;
break;
default:
return Translations.Get("bot.autoDrop.unknown_mode"); // Unknwon mode. Available modes: Include, Exclude, Everything
return Translations.bot_autoDrop_unknown_mode; // Unknwon mode. Available modes: Include, Exclude, Everything
}
inventoryUpdated = 0;
OnUpdateFinish();
return Translations.Get("bot.autoDrop.switched", Config.Mode.ToString()); // Switched to {0} mode.
return string.Format(Translations.bot_autoDrop_switched, Config.Mode.ToString()); // Switched to {0} mode.
}
else
{
return Translations.Get("bot.autoDrop.unknown_mode");
return Translations.bot_autoDrop_unknown_mode;
}
default:
return GetHelp();
@ -139,20 +139,20 @@ namespace MinecraftClient.ChatBots
private static string GetHelp()
{
return Translations.Get("general.available_cmd", "on, off, add, remove, list, mode");
return string.Format(Translations.general_available_cmd, "on, off, add, remove, list, mode");
}
public override void Initialize()
{
if (!GetInventoryEnabled())
{
LogToConsoleTranslated("extra.inventory_required");
LogToConsoleTranslated("general.bot_unload");
LogToConsole(Translations.extra_inventory_required);
LogToConsole(Translations.general_bot_unload);
UnloadBot();
return;
}
RegisterChatBotCommand("autodrop", Translations.Get("bot.autoDrop.cmd"), GetHelp(), CommandHandler);
RegisterChatBotCommand("ad", Translations.Get("bot.autoDrop.alias"), GetHelp(), CommandHandler);
RegisterChatBotCommand("autodrop", Translations.bot_autoDrop_cmd, GetHelp(), CommandHandler);
RegisterChatBotCommand("ad", Translations.bot_autoDrop_alias, GetHelp(), CommandHandler);
}
public override void Update()
@ -185,7 +185,7 @@ namespace MinecraftClient.ChatBots
if (!GetInventories().ContainsKey(inventoryUpdated))
{
// Inventory updated but no inventory ?
LogDebugToConsoleTranslated("bot.autoDrop.no_inventory", inventoryUpdated);
LogDebugToConsole(string.Format(Translations.bot_autoDrop_no_inventory, inventoryUpdated));
return;
}
var inventory = GetInventories()[inventoryUpdated];

56
MinecraftClient/ChatBots/AutoFishing.cs
View file

@ -173,14 +173,14 @@ namespace MinecraftClient.ChatBots
{
if (!GetEntityHandlingEnabled())
{
LogToConsoleTranslated("extra.entity_required");
LogToConsole(Translations.extra_entity_required);
state = FishingState.WaitJoinGame;
}
inventoryEnabled = GetInventoryEnabled();
if (!inventoryEnabled)
LogToConsoleTranslated("bot.autoFish.no_inv_handle");
LogToConsole(Translations.bot_autoFish_no_inv_handle);
RegisterChatBotCommand("fish", Translations.Get("bot.autoFish.cmd"), GetHelp(), CommandHandler);
RegisterChatBotCommand("fish", Translations.bot_autoFish_cmd, GetHelp(), CommandHandler);
}
public string CommandHandler(string cmd, string[] args)
@ -197,7 +197,7 @@ namespace MinecraftClient.ChatBots
counter = 0;
state = FishingState.StartMove;
}
return Translations.Get("bot.autoFish.start");
return Translations.bot_autoFish_start;
case "stop":
isFishing = false;
lock (stateLock)
@ -208,14 +208,14 @@ namespace MinecraftClient.ChatBots
state = FishingState.Stopping;
}
StopFishing();
return Translations.Get("bot.autoFish.stop");
return Translations.bot_autoFish_stop;
case "status":
if (args.Length >= 2)
{
if (args[1] == "clear")
{
fishItemCnt = new();
return Translations.Get("bot.autoFish.status_clear");
return Translations.bot_autoFish_status_clear;
}
else
{
@ -225,12 +225,12 @@ namespace MinecraftClient.ChatBots
else
{
if (fishItemCnt.Count == 0)
return Translations.Get("bot.autoFish.status_info");
return Translations.bot_autoFish_status_info;
List<KeyValuePair<ItemType, uint>> orderedList = fishItemCnt.OrderBy(x => x.Value).ToList();
int maxLen = orderedList[^1].Value.ToString().Length;
StringBuilder sb = new();
sb.Append(Translations.Get("bot.autoFish.status_info"));
sb.Append(Translations.bot_autoFish_status_info);
foreach ((ItemType type, uint cnt) in orderedList)
{
sb.Append(Environment.NewLine);
@ -258,7 +258,7 @@ namespace MinecraftClient.ChatBots
if (Config.Auto_Start)
{
double delay = Config.Fishing_Delay;
LogToConsole(Translations.Get("bot.autoFish.start_at", delay));
LogToConsole(string.Format(Translations.bot_autoFish_start_at, delay));
lock (stateLock)
{
isFishing = false;
@ -321,7 +321,7 @@ namespace MinecraftClient.ChatBots
{
if (castTimeout < 6000)
castTimeout *= 2; // Exponential backoff
LogToConsole(GetShortTimestamp() + ": " + Translations.Get("bot.autoFish.cast_timeout", castTimeout / 10.0));
LogToConsole(GetShortTimestamp() + ": " + string.Format(Translations.bot_autoFish_cast_timeout, castTimeout / 10.0));
counter = Settings.DoubleToTick(Config.Cast_Delay);
state = FishingState.WaitingToCast;
@ -330,7 +330,7 @@ namespace MinecraftClient.ChatBots
case FishingState.WaitingFishToBite:
if (++counter > Settings.DoubleToTick(Config.Fishing_Timeout))
{
LogToConsole(GetShortTimestamp() + ": " + Translations.Get("bot.autoFish.fishing_timeout"));
LogToConsole(GetShortTimestamp() + ": " + Translations.bot_autoFish_fishing_timeout);
counter = Settings.DoubleToTick(Config.Cast_Delay);
state = FishingState.WaitingToCast;
@ -348,7 +348,7 @@ namespace MinecraftClient.ChatBots
}
else
{
LogToConsole(Translations.Get("extra.terrainandmovement_required"));
LogToConsole(Translations.extra_terrainandmovement_required);
state = FishingState.WaitJoinGame;
}
}
@ -364,7 +364,7 @@ namespace MinecraftClient.ChatBots
if (!ClientIsMoving())
{
LookAtLocation(nextYaw, nextPitch);
LogToConsole(Translations.Get("bot.autoFish.update_lookat", nextYaw, nextPitch));
LogToConsole(string.Format(Translations.bot_autoFish_update_lookat, nextYaw, nextPitch));
state = FishingState.DurabilityCheck;
goto case FishingState.DurabilityCheck;
@ -399,7 +399,7 @@ namespace MinecraftClient.ChatBots
fishItemCounter = 15;
LogToConsole(GetShortTimestamp() + ": " + Translations.Get("bot.autoFish.throw"));
LogToConsole(GetShortTimestamp() + ": " + Translations.bot_autoFish_throw);
lock (stateLock)
{
fishingBobber = entity;
@ -426,7 +426,7 @@ namespace MinecraftClient.ChatBots
if (Config.Antidespawn)
{
LogToConsoleTranslated("bot.autoFish.despawn");
LogToConsole(Translations.bot_autoFish_despawn);
lock (stateLock)
{
@ -473,7 +473,7 @@ namespace MinecraftClient.ChatBots
{
fishItemCounter = 15;
Item item = (Item)itemObj!;
LogToConsole(Translations.Get("bot.autoFish.got", item.ToFullString()));
LogToConsole(string.Format(Translations.bot_autoFish_got, item.ToFullString()));
if (fishItemCnt.ContainsKey(item.Type))
fishItemCnt[item.Type] += (uint)item.Count;
else
@ -514,10 +514,10 @@ namespace MinecraftClient.ChatBots
{
++fishCount;
if (Config.Enable_Move && Config.Movements.Length > 0)
LogToConsole(GetShortTimestamp() + ": " + Translations.Get("bot.autoFish.caught_at",
LogToConsole(GetShortTimestamp() + ": " + string.Format(Translations.bot_autoFish_caught_at,
fishingBobber!.Location.X, fishingBobber!.Location.Y, fishingBobber!.Location.Z, fishCount));
else
LogToConsole(GetShortTimestamp() + ": " + Translations.Get("bot.autoFish.caught", fishCount));
LogToConsole(GetShortTimestamp() + ": " + string.Format(Translations.bot_autoFish_caught, fishCount));
lock (stateLock)
{
@ -558,7 +558,7 @@ namespace MinecraftClient.ChatBots
if (!Movement.CheckChunkLoading(GetWorld(), current, goal))
{
isMoveSuccessed = false;
LogToConsole(Translations.Get("cmd.move.chunk_not_loaded", goal.X, goal.Y, goal.Z));
LogToConsole(string.Format(Translations.cmd_move_chunk_not_loaded, goal.X, goal.Y, goal.Z));
}
else
{
@ -568,11 +568,11 @@ namespace MinecraftClient.ChatBots
if (!isMoveSuccessed)
{
(nextYaw, nextPitch) = (GetYaw(), GetPitch());
LogToConsole(Translations.Get("cmd.move.fail", goal));
LogToConsole(string.Format(Translations.cmd_move_fail, goal));
}
else
{
LogToConsole(Translations.Get("cmd.move.walk", goal, current));
LogToConsole(string.Format(Translations.cmd_move_walk, goal, current));
}
}
@ -598,7 +598,7 @@ namespace MinecraftClient.ChatBots
else
{
if (!isWaitingRod)
LogToConsole(GetTimestamp() + ": " + Translations.Get("bot.autoFish.no_rod"));
LogToConsole(GetTimestamp() + ": " + Translations.bot_autoFish_no_rod);
if (Config.Auto_Rod_Switch)
{
@ -609,7 +609,7 @@ namespace MinecraftClient.ChatBots
WindowAction(0, slot, WindowActionType.LeftClick);
WindowAction(0, itemSolt, WindowActionType.LeftClick);
WindowAction(0, slot, WindowActionType.LeftClick);
LogToConsole(GetTimestamp() + ": " + Translations.Get("bot.autoFish.switch", slot, (64 - item.Damage)));
LogToConsole(GetTimestamp() + ": " + string.Format(Translations.bot_autoFish_switch, slot, (64 - item.Damage)));
isWaitingRod = false;
return true;
}
@ -623,7 +623,7 @@ namespace MinecraftClient.ChatBots
private static string GetHelp()
{
return Translations.Get("bot.autoFish.available_cmd", "start, stop, status, help");
return string.Format(Translations.bot_autoFish_available_cmd, "start, stop, status, help");
}
private string GetCommandHelp(string cmd)
@ -631,10 +631,10 @@ namespace MinecraftClient.ChatBots
return cmd.ToLower() switch
{
#pragma warning disable format // @formatter:off
"start" => Translations.Get("bot.autoFish.help.start"),
"stop" => Translations.Get("bot.autoFish.help.stop"),
"status" => Translations.Get("bot.autoFish.help.status"),
"help" => Translations.Get("bot.autoFish.help.help"),
"start" => Translations.bot_autoFish_help_start,
"stop" => Translations.bot_autoFish_help_stop,
"status" => Translations.bot_autoFish_help_status,
"help" => Translations.bot_autoFish_help_help,
_ => GetHelp(),
#pragma warning restore format // @formatter:on
};

14
MinecraftClient/ChatBots/AutoRelog.cs
View file

@ -79,7 +79,7 @@ namespace MinecraftClient.ChatBots
/// <param name="retries">Number of retries if connection fails (-1 = infinite)</param>
public AutoRelog()
{
LogDebugToConsoleTranslated("bot.autoRelog.launch", Config.Retries);
LogDebugToConsole(string.Format(Translations.bot_autoRelog_launch, Config.Retries));
}
public override void Initialize()
@ -87,7 +87,7 @@ namespace MinecraftClient.ChatBots
McClient.ReconnectionAttemptsLeft = Config.Retries;
if (Config.Ignore_Kick_Message)
{
LogDebugToConsoleTranslated("bot.autoRelog.no_kick_msg");
LogDebugToConsole(Translations.bot_autoRelog_no_kick_msg);
}
}
@ -95,14 +95,14 @@ namespace MinecraftClient.ChatBots
{
if (reason == DisconnectReason.UserLogout)
{
LogDebugToConsoleTranslated("bot.autoRelog.ignore_user_logout");
LogDebugToConsole(Translations.bot_autoRelog_ignore_user_logout);
}
else if (Config.Retries < 0 || Configs._BotRecoAttempts < Config.Retries)
{
message = GetVerbatim(message);
string comp = message.ToLower();
LogDebugToConsoleTranslated("bot.autoRelog.disconnect_msg", message);
LogDebugToConsole(string.Format(Translations.bot_autoRelog_disconnect_msg, message));
if (Config.Ignore_Kick_Message)
{
@ -121,7 +121,7 @@ namespace MinecraftClient.ChatBots
}
}
LogDebugToConsoleTranslated("bot.autoRelog.reconnect_ignore");
LogDebugToConsole(Translations.bot_autoRelog_reconnect_ignore);
}
return false;
@ -130,8 +130,8 @@ namespace MinecraftClient.ChatBots
private void LaunchDelayedReconnection(string? msg)
{
double delay = random.NextDouble() * (Config.Delay.max - Config.Delay.min) + Config.Delay.min;
LogDebugToConsoleTranslated(string.IsNullOrEmpty(msg) ? "bot.autoRelog.reconnect_always" : "bot.autoRelog.reconnect", msg);
LogToConsoleTranslated("bot.autoRelog.wait", delay);
LogDebugToConsole(string.Format(string.IsNullOrEmpty(msg) ? Translations.bot_autoRelog_reconnect_always : Translations.bot_autoRelog_reconnect, msg));
LogToConsole(string.Format(Translations.bot_autoRelog_wait, delay));
System.Threading.Thread.Sleep((int)Math.Floor(delay * 1000));
ReconnectToTheServer();
}

20
MinecraftClient/ChatBots/AutoRespond.cs
View file

@ -37,8 +37,8 @@ namespace MinecraftClient.ChatBots
if (!File.Exists(Matches_File))
{
LogToConsole(BotName, Translations.TryGet("bot.autoRespond.file_not_found", Path.GetFullPath(Matches_File)));
LogToConsole(BotName, Translations.TryGet("general.bot_unload"));
LogToConsole(BotName, string.Format(Translations.bot_autoRespond_file_not_found, Path.GetFullPath(Matches_File)));
LogToConsole(BotName, Translations.general_bot_unload);
Enabled = false;
}
}
@ -167,8 +167,8 @@ namespace MinecraftClient.ChatBots
/// <returns></returns>
public override string ToString()
{
return Translations.Get(
"bot.autoRespond.match",
return string.Format(
Translations.bot_autoRespond_match,
match,
regex,
actionPublic,
@ -196,7 +196,7 @@ namespace MinecraftClient.ChatBots
TimeSpan cooldown = TimeSpan.Zero;
respondRules = new List<RespondRule>();
LogDebugToConsoleTranslated("bot.autoRespond.loading", System.IO.Path.GetFullPath(Config.Matches_File));
LogDebugToConsole(string.Format(Translations.bot_autoRespond_loading, System.IO.Path.GetFullPath(Config.Matches_File)));
foreach (string lineRAW in File.ReadAllLines(Config.Matches_File, Encoding.UTF8))
{
@ -243,7 +243,7 @@ namespace MinecraftClient.ChatBots
}
else
{
LogToConsoleTranslated("bot.autoRespond.file_not_found", System.IO.Path.GetFullPath(Config.Matches_File));
LogToConsole(string.Format(Translations.bot_autoRespond_file_not_found, System.IO.Path.GetFullPath(Config.Matches_File)));
UnloadBot(); //No need to keep the bot active
}
}
@ -270,11 +270,11 @@ namespace MinecraftClient.ChatBots
if (matchRegex != null || matchString != null)
{
respondRules!.Add(rule);
LogDebugToConsoleTranslated("bot.autoRespond.loaded_match", rule);
LogDebugToConsole(string.Format(Translations.bot_autoRespond_loaded_match, rule));
}
else LogDebugToConsoleTranslated("bot.autoRespond.no_trigger", rule);
else LogDebugToConsole(string.Format(Translations.bot_autoRespond_no_trigger, rule));
}
else LogDebugToConsoleTranslated("bot.autoRespond.no_action", rule);
else LogDebugToConsole(string.Format(Translations.bot_autoRespond_no_action, rule));
}
}
@ -307,7 +307,7 @@ namespace MinecraftClient.ChatBots
if (!String.IsNullOrEmpty(toPerform))
{
string? response = null;
LogToConsoleTranslated("bot.autoRespond.match_run", toPerform);
LogToConsole(string.Format(Translations.bot_autoRespond_match_run, toPerform));
PerformInternalCommand(toPerform, ref response, localVars);
if (!String.IsNullOrEmpty(response))
LogToConsole(response);

4
MinecraftClient/ChatBots/ChatLog.cs
View file

@ -35,8 +35,8 @@ namespace MinecraftClient.ChatBots
string Log_File_Full = Settings.Config.AppVar.ExpandVars(Log_File);
if (String.IsNullOrEmpty(Log_File_Full) || Log_File_Full.IndexOfAny(Path.GetInvalidPathChars()) >= 0)
{
LogToConsole(BotName, Translations.TryGet("bot.chatLog.invalid_file", Log_File_Full));
LogToConsole(BotName, Translations.TryGet("general.bot_unload"));
LogToConsole(BotName, string.Format(Translations.bot_chatLog_invalid_file, Log_File_Full));
LogToConsole(BotName, Translations.general_bot_unload);
Enabled = false;
}
}

41
MinecraftClient/ChatBots/DiscordBridge.cs
View file

@ -94,13 +94,13 @@ namespace MinecraftClient.ChatBots
if (discordChannel != null)
discordBotClient.SendMessageAsync(discordChannel, new DiscordEmbedBuilder
{
Description = Translations.TryGet("bot.DiscordBridge.disconnected"),
Description = Translations.bot_DiscordBridge_disconnected,
Color = new DiscordColor(0xFF0000)
}).Wait(Config.Message_Send_Timeout * 1000);
}
catch (Exception e)
{
LogToConsole("§w§l§f" + Translations.TryGet("bot.DiscordBridge.canceled_sending"));
LogToConsole("§w§l§f" + Translations.bot_DiscordBridge_canceled_sending);
LogDebugToConsole(e);
}
@ -122,34 +122,33 @@ namespace MinecraftClient.ChatBots
{
string direction = args[1].ToLower().Trim();
string? bridgeName = "";
string bridgeName;
switch (direction)
{
case "b":
case "both":
bridgeName = "bot.DiscordBridge.direction.both";
bridgeName = Translations.bot_DiscordBridge_direction_both;
bridgeDirection = BridgeDirection.Both;
break;
case "mc":
case "minecraft":
bridgeName = "bot.DiscordBridge.direction.minecraft";
bridgeName = Translations.bot_DiscordBridge_direction_minecraft;
bridgeDirection = BridgeDirection.Minecraft;
break;
case "d":
case "dcs":
case "discord":
bridgeName = "bot.DiscordBridge.direction.discord";
bridgeName = Translations.bot_DiscordBridge_direction_discord;
bridgeDirection = BridgeDirection.Discord;
break;
default:
return Translations.TryGet("bot.DiscordBridge.invalid_direction");
return Translations.bot_DiscordBridge_invalid_direction;
}
return Translations.TryGet("bot.DiscordBridge.direction", Translations.TryGet(bridgeName));
return string.Format(Translations.bot_DiscordBridge_direction, bridgeName);
};
}
@ -212,7 +211,7 @@ namespace MinecraftClient.ChatBots
}
catch (Exception e)
{
LogToConsole("§w§l§f" + Translations.TryGet("bot.DiscordBridge.canceled_sending"));
LogToConsole("§w§l§f" + Translations.bot_DiscordBridge_canceled_sending);
LogDebugToConsole(e);
}
}
@ -228,7 +227,7 @@ namespace MinecraftClient.ChatBots
}
catch (Exception e)
{
LogToConsole("§w§l§f" + Translations.TryGet("bot.DiscordBridge.canceled_sending"));
LogToConsole("§w§l§f" + Translations.bot_DiscordBridge_canceled_sending);
LogDebugToConsole(e);
}
}
@ -244,7 +243,7 @@ namespace MinecraftClient.ChatBots
}
catch (Exception e)
{
LogToConsole("§w§l§f" + Translations.TryGet("bot.DiscordBridge.canceled_sending"));
LogToConsole("§w§l§f" + Translations.bot_DiscordBridge_canceled_sending);
LogDebugToConsole(e);
}
}
@ -270,7 +269,7 @@ namespace MinecraftClient.ChatBots
}
catch (Exception e)
{
LogToConsole("§w§l§f" + Translations.TryGet("bot.DiscordBridge.canceled_sending"));
LogToConsole("§w§l§f" + Translations.bot_DiscordBridge_canceled_sending);
LogDebugToConsole(e);
}
}
@ -285,7 +284,7 @@ namespace MinecraftClient.ChatBots
private bool CanSendMessages()
{
return discordBotClient == null || discordChannel == null || bridgeDirection == BridgeDirection.Minecraft ? false : true;
return discordBotClient != null && discordChannel != null && bridgeDirection != BridgeDirection.Minecraft;
}
async Task MainAsync()
@ -294,7 +293,7 @@ namespace MinecraftClient.ChatBots
{
if (string.IsNullOrEmpty(Config.Token.Trim()))
{
LogToConsole(Translations.TryGet("bot.DiscordBridge.missing_token"));
LogToConsole(Translations.bot_DiscordBridge_missing_token);
UnloadBot();
return;
}
@ -317,7 +316,7 @@ namespace MinecraftClient.ChatBots
{
if (e is NotFoundException)
{
LogToConsole(Translations.TryGet("bot.DiscordBridge.guild_not_found", Config.GuildId));
LogToConsole(string.Format(Translations.bot_DiscordBridge_guild_not_found, Config.GuildId));
UnloadBot();
return;
}
@ -334,7 +333,7 @@ namespace MinecraftClient.ChatBots
{
if (e is NotFoundException)
{
LogToConsole(Translations.TryGet("bot.DiscordBridge.channel_not_found", Config.ChannelId));
LogToConsole(string.Format(Translations.bot_DiscordBridge_channel_not_found, Config.ChannelId));
UnloadBot();
return;
}
@ -376,7 +375,7 @@ namespace MinecraftClient.ChatBots
await e.Message.DeleteOwnReactionAsync(DiscordEmoji.FromName(discordBotClient, ":gear:"));
await e.Message.CreateReactionAsync(DiscordEmoji.FromName(discordBotClient, ":white_check_mark:"));
await e.Message.RespondAsync($"{Translations.TryGet("bot.DiscordBridge.command_executed")}:\n```{result}```");
await e.Message.RespondAsync($"{Translations.bot_DiscordBridge_command_executed}:\n```{result}```");
}
else SendText(message);
};
@ -395,17 +394,17 @@ namespace MinecraftClient.ChatBots
await discordBotClient.SendMessageAsync(discordChannel, new DiscordEmbedBuilder
{
Description = Translations.TryGet("bot.DiscordBridge.connected"),
Description = Translations.bot_DiscordBridge_connected,
Color = new DiscordColor(0x00FF00)
});
IsConnected = true;
LogToConsole("§y§l§f" + Translations.TryGet("bot.DiscordBridge.connected"));
LogToConsole("§y§l§f" + Translations.bot_DiscordBridge_connected);
await Task.Delay(-1);
}
catch (Exception e)
{
LogToConsole("§w§l§f" + Translations.TryGet("bot.DiscordBridge.unknown_error"));
LogToConsole("§w§l§f" + Translations.bot_DiscordBridge_unknown_error);
LogToConsole(e);
return;
}

36
MinecraftClient/ChatBots/Farmer.cs
View file

@ -65,19 +65,19 @@ namespace MinecraftClient.ChatBots
{
if (GetProtocolVersion() < Protocol18Handler.MC_1_13_Version)
{
LogToConsole(Translations.TryGet("bot.farmer.not_implemented"));
LogToConsole(Translations.bot_farmer_not_implemented);
return;
}
if (!GetTerrainEnabled())
{
LogToConsole(Translations.TryGet("bot.farmer.needs_terrain"));
LogToConsole(Translations.bot_farmer_needs_terrain);
return;
}
if (!GetInventoryEnabled())
{
LogToConsole(Translations.TryGet("bot.farmer.needs_inventory"));
LogToConsole(Translations.bot_farmer_needs_inventory);
return;
}
@ -91,10 +91,10 @@ namespace MinecraftClient.ChatBots
if (args[0].Equals("stop", StringComparison.OrdinalIgnoreCase))
{
if (!running)
return Translations.TryGet("bot.farmer.already_stopped");
return Translations.bot_farmer_already_stopped;
running = false;
return Translations.TryGet("bot.farmer.stopping");
return Translations.bot_farmer_stopping;
}
if (args[0].Equals("start", StringComparison.OrdinalIgnoreCase))
@ -102,10 +102,10 @@ namespace MinecraftClient.ChatBots
if (args.Length >= 2)
{
if (running)
return Translations.TryGet("bot.farmer.already_running");
return Translations.bot_farmer_already_running;
if (!Enum.TryParse(args[1], true, out CropType whatToFarm))
return Translations.TryGet("bot.farmer.invalid_crop_type");
return Translations.bot_farmer_invalid_crop_type;
int radius = 30;
@ -123,7 +123,7 @@ namespace MinecraftClient.ChatBots
if (!currentArg.Contains(':'))
{
LogToConsole("§x§1§0" + Translations.TryGet("bot.farmer.warining_invalid_parameter", currentArg));
LogToConsole("§x§1§0" + string.Format(Translations.bot_farmer_warining_invalid_parameter, currentArg));
continue;
}
@ -131,7 +131,7 @@ namespace MinecraftClient.ChatBots
if (parts.Length != 2)
{
LogToConsole("§x§1§0" + Translations.TryGet("bot.farmer.warining_invalid_parameter", currentArg));
LogToConsole("§x§1§0" + string.Format(Translations.bot_farmer_warining_invalid_parameter, currentArg));
continue;
}
@ -140,11 +140,11 @@ namespace MinecraftClient.ChatBots
case "r":
case "radius":
if (!int.TryParse(parts[1], NumberStyles.Any, CultureInfo.CurrentCulture, out radius))
LogToConsole("§x§1§0" + Translations.TryGet("bot.farmer.invalid_radius"));
LogToConsole("§x§1§0" + Translations.bot_farmer_invalid_radius);
if (radius <= 0)
{
LogToConsole("§x§1§0" + Translations.TryGet("bot.farmer.invalid_radius"));
LogToConsole("§x§1§0" + Translations.bot_farmer_invalid_radius);
radius = 30;
}
@ -157,7 +157,7 @@ namespace MinecraftClient.ChatBots
if (parts[1].Equals("true") || parts[1].Equals("1"))
{
LogToConsole("§x§1§0" + Translations.TryGet("bot.farmer.warining_force_unsafe"));
LogToConsole("§x§1§0" + Translations.bot_farmer_warining_force_unsafe);
allowUnsafe = true;
}
else allowUnsafe = false;
@ -171,7 +171,7 @@ namespace MinecraftClient.ChatBots
if (parts[1].Equals("true") || parts[1].Equals("1"))
{
LogToConsole("§w§1§f" + Translations.TryGet("bot.farmer.warining_allow_teleport"));
LogToConsole("§w§1§f" + Translations.bot_farmer_warining_allow_teleport);
allowTeleport = true;
}
else allowTeleport = false;
@ -204,7 +204,7 @@ namespace MinecraftClient.ChatBots
}
}
return Translations.TryGet("bot.farmer.desc") + ": " + commandDescription;
return Translations.bot_farmer_desc + ": " + commandDescription;
}
public override void AfterGameJoined()
@ -220,9 +220,9 @@ namespace MinecraftClient.ChatBots
private void MainPorcess()
{
LogToConsole("§y§1§f" + Translations.TryGet("bot.farmer.started"));
LogToConsole("§y§1§f " + Translations.TryGet("bot.farmer.crop_type") + ": " + cropType);
LogToConsole("§y§1§f " + Translations.TryGet("bot.farmer.radius") + ": " + farmingRadius);
LogToConsole("§y§1§f" + Translations.bot_farmer_started);
LogToConsole("§y§1§f " + Translations.bot_farmer_crop_type + ": " + cropType);
LogToConsole("§y§1§f " + Translations.bot_farmer_radius + ": " + farmingRadius);
while (running)
{
@ -442,7 +442,7 @@ namespace MinecraftClient.ChatBots
Thread.Sleep(Config.Delay_Between_Tasks * 1000);
}
LogToConsole(Translations.TryGet("bot.farmer.stopped"));
LogToConsole(Translations.bot_farmer_stopped);
}
private Material GetMaterialForCropType(CropType type)

44
MinecraftClient/ChatBots/FollowPlayer.cs
View file

@ -41,16 +41,16 @@ namespace MinecraftClient.ChatBots
{
if (!GetEntityHandlingEnabled())
{
LogToConsoleTranslated("extra.entity_required");
LogToConsoleTranslated("general.bot_unload");
LogToConsole(Translations.extra_entity_required);
LogToConsole(Translations.general_bot_unload);
UnloadBot();
return;
}
if (!GetTerrainEnabled())
{
LogToConsoleTranslated("extra.terrainandmovement_required");
LogToConsoleTranslated("general.bot_unload");
LogToConsole(Translations.extra_terrainandmovement_required);
LogToConsole(Translations.general_bot_unload);
UnloadBot();
return;
}
@ -65,44 +65,48 @@ namespace MinecraftClient.ChatBots
if (args[0].Equals("stop", StringComparison.OrdinalIgnoreCase))
{
if (_playerToFollow == null)
return Translations.TryGet("cmd.follow.already_stopped");
return Translations.cmd_follow_already_stopped;
_playerToFollow = null;
return Translations.TryGet("cmd.follow.stopping");
return Translations.cmd_follow_stopping;
}
else
{
if (!IsValidName(args[0]))
return Translations.TryGet("cmd.follow.invalid_name");
return Translations.cmd_follow_invalid_name;
Entity? player = GetEntities().Values.ToList().Find(entity =>
entity.Type == EntityType.Player && !string.IsNullOrEmpty(entity.Name) && entity.Name.Equals(args[0], StringComparison.OrdinalIgnoreCase));
if (player == null)
return Translations.TryGet("cmd.follow.invalid_player");
return Translations.cmd_follow_invalid_player;
if (!CanMoveThere(player.Location))
return Translations.TryGet("cmd.follow.cant_reach_player");
return Translations.cmd_follow_cant_reach_player;
if (_playerToFollow != null && _playerToFollow.Equals(args[0], StringComparison.OrdinalIgnoreCase))
return Translations.TryGet("cmd.follow.already_following", _playerToFollow);
return string.Format(Translations.cmd_follow_already_following, _playerToFollow);
string result = Translations.TryGet(_playerToFollow != null ? "cmd.follow.switched" : "cmd.follow.started", player.Name!);
string result;
if (_playerToFollow != null)
result = string.Format(Translations.cmd_follow_switched, player.Name!);
else
result = string.Format(Translations.cmd_follow_started, player.Name!);
_playerToFollow = args[0].Trim().ToLower();
LogToConsoleTranslated("cmd.follow.note");
LogToConsole(Translations.cmd_follow_note);
if (args.Length == 2 && args[1].Equals("-f", StringComparison.OrdinalIgnoreCase))
{
_unsafeEnabled = true;
LogToConsoleTranslated("cmd.follow.unsafe_enabled");
LogToConsole(Translations.cmd_follow_unsafe_enabled);
}
return result;
}
}
return Translations.TryGet("cmd.follow.desc") + ": " + Translations.TryGet("cmd.follow.usage");
return Translations.cmd_follow_desc + ": " + Translations.cmd_follow_usage;
}
public override void Update()
@ -146,8 +150,8 @@ namespace MinecraftClient.ChatBots
if (_playerToFollow != null && !string.IsNullOrEmpty(entity.Name) && _playerToFollow.Equals(entity.Name, StringComparison.OrdinalIgnoreCase))
{
LogToConsoleTranslated("cmd.follow.player_came_to_the_range", _playerToFollow);
LogToConsoleTranslated("cmd.follow.resuming");
LogToConsole(string.Format(Translations.cmd_follow_player_came_to_the_range, _playerToFollow));
LogToConsole(Translations.cmd_follow_resuming);
}
}
@ -158,8 +162,8 @@ namespace MinecraftClient.ChatBots
if (_playerToFollow != null && !string.IsNullOrEmpty(entity.Name) && _playerToFollow.Equals(entity.Name, StringComparison.OrdinalIgnoreCase))
{
LogToConsoleTranslated("cmd.follow.player_left_the_range", _playerToFollow);
LogToConsoleTranslated("cmd.follow.pausing");
LogToConsole(string.Format(Translations.cmd_follow_player_left_the_range, _playerToFollow));
LogToConsole(Translations.cmd_follow_pausing);
}
}
@ -167,8 +171,8 @@ namespace MinecraftClient.ChatBots
{
if (_playerToFollow != null && !string.IsNullOrEmpty(name) && _playerToFollow.Equals(name, StringComparison.OrdinalIgnoreCase))
{
LogToConsoleTranslated("cmd.follow.player_left", _playerToFollow);
LogToConsoleTranslated("cmd.follow.stopping");
LogToConsole(string.Format(Translations.cmd_follow_player_left, _playerToFollow));
LogToConsole(Translations.cmd_follow_stopping);
_playerToFollow = null;
}
}

52
MinecraftClient/ChatBots/Mailer.cs
View file

@ -45,25 +45,25 @@ namespace MinecraftClient.ChatBots
if (Config.MaxDatabaseSize <= 0)
{
LogToConsole(BotName, Translations.TryGet("bot.mailer.init_fail.db_size"));
LogToConsole(BotName, Translations.bot_mailer_init_fail_db_size);
checkSuccessed = false;
}
if (Config.MaxMailsPerPlayer <= 0)
{
LogToConsole(BotName, Translations.TryGet("bot.mailer.init_fail.max_mails"));
LogToConsole(BotName, Translations.bot_mailer_init_fail_max_mails);
checkSuccessed = false;
}
if (Config.MailRetentionDays <= 0)
{
LogToConsole(BotName, Translations.TryGet("bot.mailer.init_fail.mail_retention"));
LogToConsole(BotName, Translations.bot_mailer_init_fail_mail_retention);
checkSuccessed = false;
}
if (!checkSuccessed)
{
LogToConsole(BotName, Translations.TryGet("general.bot_unload"));
LogToConsole(BotName, Translations.general_bot_unload);
Enabled = false;
}
}
@ -218,32 +218,32 @@ namespace MinecraftClient.ChatBots
/// </summary>
public override void Initialize()
{
LogDebugToConsoleTranslated("bot.mailer.init");
LogDebugToConsoleTranslated("bot.mailer.init.db" + Config.DatabaseFile);
LogDebugToConsoleTranslated("bot.mailer.init.ignore" + Config.IgnoreListFile);
LogDebugToConsoleTranslated("bot.mailer.init.public" + Config.PublicInteractions);
LogDebugToConsoleTranslated("bot.mailer.init.max_mails" + Config.MaxMailsPerPlayer);
LogDebugToConsoleTranslated("bot.mailer.init.db_size" + Config.MaxDatabaseSize);
LogDebugToConsoleTranslated("bot.mailer.init.mail_retention" + Config.MailRetentionDays + " days");
LogDebugToConsole(Translations.bot_mailer_init);
LogDebugToConsole(Translations.bot_mailer_init_db + Config.DatabaseFile);
LogDebugToConsole(Translations.bot_mailer_init_ignore + Config.IgnoreListFile);
LogDebugToConsole(Translations.bot_mailer_init_public + Config.PublicInteractions);
LogDebugToConsole(Translations.bot_mailer_init_max_mails + Config.MaxMailsPerPlayer);
LogDebugToConsole(Translations.bot_mailer_init_db_size + Config.MaxDatabaseSize);
LogDebugToConsole(Translations.bot_mailer_init_mail_retention + Config.MailRetentionDays + " days");
if (!File.Exists(Config.DatabaseFile))
{
LogToConsoleTranslated("bot.mailer.create.db", Path.GetFullPath(Config.DatabaseFile));
LogToConsole(string.Format(Translations.bot_mailer_create_db, Path.GetFullPath(Config.DatabaseFile)));
new MailDatabase().SaveToFile(Config.DatabaseFile);
}
if (!File.Exists(Config.IgnoreListFile))
{
LogToConsoleTranslated("bot.mailer.create.ignore", Path.GetFullPath(Config.IgnoreListFile));
LogToConsole(string.Format(Translations.bot_mailer_create_ignore, Path.GetFullPath(Config.IgnoreListFile)));
new IgnoreList().SaveToFile(Config.IgnoreListFile);
}
lock (readWriteLock)
{
LogDebugToConsoleTranslated("bot.mailer.load.db", Path.GetFullPath(Config.DatabaseFile));
LogDebugToConsole(string.Format(Translations.bot_mailer_load_db, Path.GetFullPath(Config.DatabaseFile)));
mailDatabase = MailDatabase.FromFile(Config.DatabaseFile);
LogDebugToConsoleTranslated("bot.mailer.load.ignore", Path.GetFullPath(Config.IgnoreListFile));
LogDebugToConsole(string.Format(Translations.bot_mailer_load_ignore, Path.GetFullPath(Config.IgnoreListFile)));
ignoreList = IgnoreList.FromFile(Config.IgnoreListFile);
}
@ -251,7 +251,7 @@ namespace MinecraftClient.ChatBots
mailDbFileMonitor = new FileMonitor(Path.GetDirectoryName(Config.DatabaseFile)!, Path.GetFileName(Config.DatabaseFile), FileMonitorCallback);
ignoreListFileMonitor = new FileMonitor(Path.GetDirectoryName(Config.IgnoreListFile)!, Path.GetFileName(Config.IgnoreListFile), FileMonitorCallback);
RegisterChatBotCommand("mailer", Translations.Get("bot.mailer.cmd"), "mailer <getmails|addignored|getignored|removeignored>", ProcessInternalCommand);
RegisterChatBotCommand("mailer", Translations.bot_mailer_cmd, "mailer <getmails|addignored|getignored|removeignored>", ProcessInternalCommand);
}
/// <summary>
@ -299,7 +299,7 @@ namespace MinecraftClient.ChatBots
if (message.Length <= maxMessageLength)
{
Mail mail = new(username, recipient, message, anonymous, DateTime.Now);
LogToConsoleTranslated("bot.mailer.saving", mail.ToString());
LogToConsole(string.Format(Translations.bot_mailer_saving, mail.ToString()));
lock (readWriteLock)
{
mailDatabase.Add(mail);
@ -317,7 +317,7 @@ namespace MinecraftClient.ChatBots
break;
}
}
else LogDebugToConsoleTranslated("bot.mailer.user_ignored", username);
else LogDebugToConsole(string.Format(Translations.bot_mailer_user_ignored, username));
}
}
@ -329,7 +329,7 @@ namespace MinecraftClient.ChatBots
DateTime dateNow = DateTime.Now;
if (nextMailSend < dateNow)
{
LogDebugToConsoleTranslated("bot.mailer.process_mails", DateTime.Now);
LogDebugToConsole(string.Format(Translations.bot_mailer_process_mails, DateTime.Now));
// Process at most 3 mails at a time to avoid spamming. Other mails will be processed on next mail send
HashSet<string> onlinePlayersLowercase = new(GetOnlinePlayers().Select(name => name.ToLower()));
@ -338,7 +338,7 @@ namespace MinecraftClient.ChatBots
string sender = mail.Anonymous ? "Anonymous" : mail.Sender;
SendPrivateMessage(mail.Recipient, sender + " mailed: " + mail.Content);
mail.SetDelivered();
LogDebugToConsoleTranslated("bot.mailer.delivered", mail.ToString());
LogDebugToConsole(string.Format(Translations.bot_mailer_delivered, mail.ToString()));
}
lock (readWriteLock)
@ -377,10 +377,10 @@ namespace MinecraftClient.ChatBots
switch (commandName)
{
case "getmails": // Sorry, I (ReinforceZwei) replaced "=" to "-" because it would affect the parsing of translation file (key=value)
return Translations.Get("bot.mailer.cmd.getmails", string.Join("\n", mailDatabase));
return string.Format(Translations.bot_mailer_cmd_getmails, string.Join("\n", mailDatabase));
case "getignored":
return Translations.Get("bot.mailer.cmd.getignored", string.Join("\n", ignoreList));
return string.Format(Translations.bot_mailer_cmd_getignored, string.Join("\n", ignoreList));
case "addignored":
case "removeignored":
@ -397,7 +397,7 @@ namespace MinecraftClient.ChatBots
ignoreList.SaveToFile(Config.IgnoreListFile);
}
}
return Translations.Get("bot.mailer.cmd.ignore.added", args[1]);
return string.Format(Translations.bot_mailer_cmd_ignore_added, args[1]);
}
else
{
@ -409,13 +409,13 @@ namespace MinecraftClient.ChatBots
ignoreList.SaveToFile(Config.IgnoreListFile);
}
}
return Translations.Get("bot.mailer.cmd.ignore.removed", args[1]);
return string.Format(Translations.bot_mailer_cmd_ignore_removed, args[1]);
}
}
else return Translations.Get("bot.mailer.cmd.ignore.invalid", commandName);
else return string.Format(Translations.bot_mailer_cmd_ignore_invalid, commandName);
}
}
return Translations.Get("bot.mailer.cmd.help") + ": /help mailer";
return Translations.bot_mailer_cmd_help + ": /help mailer";
}
}
}

26
MinecraftClient/ChatBots/Map.cs
View file

@ -99,12 +99,12 @@ namespace MinecraftClient.ChatBots
if (args.Length == 0 || (args.Length == 1 && (args[0].ToLower().Equals("list") || args[0].ToLower().Equals("l"))))
{
if (cachedMaps.Count == 0)
return Translations.TryGet("bot.map.no_maps");
return Translations.bot_map_no_maps;
LogToConsoleTranslated("bot.map.received");
LogToConsole(Translations.bot_map_received);
foreach (var (key, value) in new SortedDictionary<int, McMap>(cachedMaps))
LogToConsoleTranslated("bot.map.list_item", key, value.LastUpdated);
LogToConsole(string.Format(Translations.bot_map_list_item, key, value.LastUpdated));
return "";
}
@ -119,7 +119,7 @@ namespace MinecraftClient.ChatBots
if (int.TryParse(args[1], NumberStyles.Any, CultureInfo.CurrentCulture, out int mapId))
{
if (!cachedMaps.ContainsKey(mapId))
return Translations.TryGet("bot.map.cmd.not_found", mapId);
return string.Format(Translations.bot_map_cmd_not_found, mapId);
try
{
@ -135,10 +135,10 @@ namespace MinecraftClient.ChatBots
catch (Exception e)
{
LogDebugToConsole(e.StackTrace!);
return Translations.TryGet("bot.map.failed_to_render", mapId);
return string.Format(Translations.bot_map_failed_to_render, mapId);
}
}
return Translations.TryGet("bot.map.cmd.invalid_id");
return Translations.bot_map_cmd_invalid_id;
}
}
return "";
@ -172,7 +172,7 @@ namespace MinecraftClient.ChatBots
cachedMaps.Add(mapid, map);
if (Config.Notify_On_First_Update)
LogToConsoleTranslated("bot.map.received_map", map.MapId);
LogToConsole(string.Format(Translations.bot_map_received_map, map.MapId));
}
else
{
@ -232,7 +232,7 @@ namespace MinecraftClient.ChatBots
}
file.Close();
LogToConsole(Translations.TryGet("bot.map.rendered", map.MapId, fileName));
LogToConsole(string.Format(Translations.bot_map_rendered, map.MapId, fileName));
if (Config.Rasize_Rendered_Image)
{
@ -243,7 +243,7 @@ namespace MinecraftClient.ChatBots
image.Resize(size);
image.Write(fileName);
LogToConsole(Translations.TryGet("bot.map.resized_rendered_image", map.MapId, Config.Resize_To));
LogToConsole(string.Format(Translations.bot_map_resized_rendered_image, map.MapId, Config.Resize_To));
}
}
@ -292,10 +292,10 @@ namespace MinecraftClient.ChatBots
newFileName = Directory.GetCurrentDirectory() + Path.DirectorySeparatorChar + newFileName;
if (Config.Send_Rendered_To_Discord)
LogToConsole(Translations.TryGet("bot.map.sent_to_discord", map.MapId));
LogToConsole(string.Format(Translations.bot_map_sent_to_discord, map.MapId));
if (Config.Send_Rendered_To_Telegram)
LogToConsole(Translations.TryGet("bot.map.sent_to_telegram", map.MapId));
LogToConsole(string.Format(Translations.bot_map_sent_to_telegram, map.MapId));
// Wait for 2 seconds and then try until file is free for deletion
// 10 seconds timeout
@ -313,7 +313,7 @@ namespace MinecraftClient.ChatBots
if (File.Exists(newFileName))
File.Delete(newFileName);
}
catch (IOException e) { }
catch (IOException) { }
}
});
}
@ -331,7 +331,7 @@ namespace MinecraftClient.ChatBots
int scaleY = (map.Height + consoleHeight - 1) / consoleHeight;
int scale = Math.Max(scaleX, scaleY);
if (scale > 1)
sb.AppendLine(Translations.Get("bot.map.scale", map.Width, map.Height, map.Width / scale, map.Height / scale));
sb.AppendLine(string.Format(Translations.bot_map_scale, map.Width, map.Height, map.Width / scale, map.Height / scale));
for (int base_y = 0; base_y < map.Height; base_y += scale)
{

10
MinecraftClient/ChatBots/ReplayCapture.cs
View file

@ -40,7 +40,7 @@ namespace MinecraftClient.ChatBots
replay.MetaData.serverName = GetServerHost() + GetServerPort();
backupCounter = Settings.DoubleToTick(Config.Backup_Interval);
RegisterChatBotCommand("replay", Translations.Get("bot.replayCapture.cmd"), "replay <save|stop>", Command);
RegisterChatBotCommand("replay", Translations.bot_replayCapture_cmd, "replay <save|stop>", Command);
}
public override void OnNetworkPacket(int packetID, List<byte> packetData, bool isLogin, bool isInbound)
@ -80,18 +80,18 @@ namespace MinecraftClient.ChatBots
case "save":
{
replay.CreateBackupReplay(@"replay_recordings\" + replay.GetReplayDefaultName());
return Translations.Get("bot.replayCapture.created");
return Translations.bot_replayCapture_created;
}
case "stop":
{
replay.OnShutDown();
return Translations.Get("bot.replayCapture.stopped");
return Translations.bot_replayCapture_stopped;
}
}
}
return Translations.Get("general.available_cmd", "save, stop");
return string.Format(Translations.general_available_cmd, "save, stop");
}
else return Translations.Get("bot.replayCapture.restart");
else return Translations.bot_replayCapture_restart;
}
catch (Exception e)
{

10
MinecraftClient/ChatBots/Script.cs
View file

@ -118,7 +118,7 @@ namespace MinecraftClient.ChatBots
caller = type.Name;
}
catch { }
ConsoleIO.WriteLineFormatted(Translations.Get("bot.script.not_found", caller, filename));
ConsoleIO.WriteLineFormatted(string.Format(Translations.bot_script_not_found, caller, filename));
}
return false;
@ -134,14 +134,14 @@ namespace MinecraftClient.ChatBots
thread = null;
if (!String.IsNullOrEmpty(owner))
SendPrivateMessage(owner, Translations.Get("bot.script.pm.loaded", file));
SendPrivateMessage(owner, string.Format(Translations.bot_script_pm_loaded, file));
}
else
{
LogToConsoleTranslated("bot.script.file_not_found", System.IO.Path.GetFullPath(file));
LogToConsole(string.Format(Translations.bot_script_file_not_found, System.IO.Path.GetFullPath(file)));
if (!String.IsNullOrEmpty(owner))
SendPrivateMessage(owner, Translations.Get("bot.script.file_not_found", file));
SendPrivateMessage(owner, string.Format(Translations.bot_script_file_not_found, file));
UnloadBot(); //No need to keep the bot active
}
@ -162,7 +162,7 @@ namespace MinecraftClient.ChatBots
}
catch (CSharpException e)
{
string errorMessage = Translations.Get("bot.script.fail", file, e.ExceptionType);
string errorMessage = string.Format(Translations.bot_script_fail, file, e.ExceptionType);
LogToConsole(errorMessage);
if (owner != null)
SendPrivateMessage(owner, errorMessage);

18
MinecraftClient/ChatBots/ScriptScheduler.cs
View file

@ -58,26 +58,26 @@ namespace MinecraftClient.ChatBots
|| (task.Trigger_On_Interval.Enable && task.Trigger_On_Interval.MinTime > 0))
{
if (Settings.Config.Logging.DebugMessages)
LogToConsole(BotName, Translations.TryGet("bot.scriptScheduler.loaded_task", Task2String(task)));
LogToConsole(BotName, string.Format(Translations.bot_scriptScheduler_loaded_task, Task2String(task)));
task.Trigger_On_Interval_Countdown = Settings.DoubleToTick(task.Trigger_On_Interval.MinTime); //Init countdown for interval
}
else
{
if (Settings.Config.Logging.DebugMessages)
LogToConsole(BotName, Translations.TryGet("bot.scriptScheduler.no_trigger", Task2String(task)));
LogToConsole(BotName, string.Format(Translations.bot_scriptScheduler_no_trigger, Task2String(task)));
}
}
else
{
task.Action ??= string.Empty;
if (Settings.Config.Logging.DebugMessages)
LogToConsole(BotName, Translations.TryGet("bot.scriptScheduler.no_action", Task2String(task)));
LogToConsole(BotName, string.Format(Translations.bot_scriptScheduler_no_action, Task2String(task)));
}
}
if (Enabled && TaskList.Length == 0)
{
LogToConsole(BotName, Translations.TryGet("general.bot_unload"));
LogToConsole(BotName, Translations.general_bot_unload);
Enabled = false;
}
}
@ -189,7 +189,7 @@ namespace MinecraftClient.ChatBots
if (!task.Trigger_On_Time_Already_Triggered)
{
task.Trigger_On_Time_Already_Triggered = true;
LogDebugToConsoleTranslated("bot.scriptScheduler.running_time", task.Action);
LogDebugToConsole(string.Format(Translations.bot_scriptScheduler_running_time, task.Action));
PerformInternalCommand(task.Action);
}
}
@ -207,7 +207,7 @@ namespace MinecraftClient.ChatBots
{
if (task.Trigger_On_Login || (firstlogin_done == false && task.Trigger_On_First_Login))
{
LogDebugToConsoleTranslated("bot.scriptScheduler.running_login", task.Action);
LogDebugToConsole(string.Format(Translations.bot_scriptScheduler_running_login, task.Action));
PerformInternalCommand(task.Action);
}
}
@ -227,7 +227,7 @@ namespace MinecraftClient.ChatBots
task.Trigger_On_Interval_Countdown = random.Next(
Settings.DoubleToTick(task.Trigger_On_Interval.MinTime), Settings.DoubleToTick(task.Trigger_On_Interval.MaxTime)
);
LogDebugToConsoleTranslated("bot.scriptScheduler.running_inverval", task.Action);
LogDebugToConsole(string.Format(Translations.bot_scriptScheduler_running_inverval, task.Action));
PerformInternalCommand(task.Action);
}
else task.Trigger_On_Interval_Countdown--;
@ -243,8 +243,8 @@ namespace MinecraftClient.ChatBots
private static string Task2String(TaskConfig task)
{
return Translations.Get(
"bot.scriptScheduler.task",
return string.Format(
Translations.bot_scriptScheduler_task,
task.Trigger_On_First_Login,
task.Trigger_On_Login,
task.Trigger_On_Times.Enable,

41
MinecraftClient/ChatBots/TelegramBridge.cs
View file

@ -1,10 +1,8 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using DSharpPlus.Entities;
using Telegram.Bot;
using Telegram.Bot.Exceptions;
using Telegram.Bot.Polling;
@ -93,13 +91,13 @@ namespace MinecraftClient.ChatBots
{
try
{
SendMessage(Translations.TryGet("bot.TelegramBridge.disconnected"));
SendMessage(Translations.bot_TelegramBridge_disconnected);
cancellationToken?.Cancel();
botClient = null;
}
catch (Exception e)
{
LogToConsole("§w§l§f" + Translations.TryGet("bot.TelegramBridge.canceled_sending"));
LogToConsole("§w§l§f" + Translations.bot_TelegramBridge_canceled_sending);
LogDebugToConsole(e);
}
@ -120,34 +118,33 @@ namespace MinecraftClient.ChatBots
{
string direction = args[1].ToLower().Trim();
string? bridgeName = "";
string bridgeName;
switch (direction)
{
case "b":
case "both":
bridgeName = "bot.TelegramBridge.direction.both";
bridgeName = Translations.bot_TelegramBridge_direction_both;
bridgeDirection = BridgeDirection.Both;
break;
case "mc":
case "minecraft":
bridgeName = "bot.TelegramBridge.direction.minecraft";
bridgeName = Translations.bot_TelegramBridge_direction_minecraft;
bridgeDirection = BridgeDirection.Minecraft;
break;
case "t":
case "tg":
case "telegram":
bridgeName = "bot.TelegramBridge.direction.discord";
bridgeName = Translations.bot_TelegramBridge_direction_Telegram;
bridgeDirection = BridgeDirection.Telegram;
break;
default:
return Translations.TryGet("bot.TelegramBridge.invalid_direction");
return Translations.bot_TelegramBridge_invalid_direction;
}
return Translations.TryGet("bot.TelegramBridge.direction", Translations.TryGet(bridgeName));
return string.Format(Translations.bot_TelegramBridge_direction, bridgeName);
};
}
@ -191,7 +188,7 @@ namespace MinecraftClient.ChatBots
}
catch (Exception e)
{
LogToConsole("§w§l§f" + Translations.TryGet("bot.TelegramBridge.canceled_sending"));
LogToConsole("§w§l§f" + Translations.bot_TelegramBridge_canceled_sending);
LogDebugToConsole(e);
}
}
@ -214,7 +211,7 @@ namespace MinecraftClient.ChatBots
}
catch (Exception e)
{
LogToConsole("§w§l§f" + Translations.TryGet("bot.TelegramBridge.canceled_sending"));
LogToConsole("§w§l§f" + Translations.bot_TelegramBridge_canceled_sending);
LogDebugToConsole(e);
}
}
@ -230,13 +227,13 @@ namespace MinecraftClient.ChatBots
{
if (string.IsNullOrEmpty(Config.Token.Trim()))
{
LogToConsole(Translations.TryGet("bot.TelegramBridge.missing_token"));
LogToConsole(Translations.bot_TelegramBridge_missing_token);
UnloadBot();
return;
}
if (string.IsNullOrEmpty(Config.ChannelId.Trim()))
LogToConsole("§w§l§f" + Translations.TryGet("bot.TelegramBridge.missing_channel_id"));
LogToConsole("§w§l§f" + Translations.bot_TelegramBridge_missing_channel_id);
botClient = new TelegramBotClient(Config.Token.Trim());
cancellationToken = new CancellationTokenSource();
@ -254,13 +251,13 @@ namespace MinecraftClient.ChatBots
IsConnected = true;
SendMessage("✅ " + Translations.TryGet("bot.TelegramBridge.connected"));
LogToConsole("§y§l§f" + Translations.TryGet("bot.TelegramBridge.connected"));
SendMessage($"✅ {Translations.bot_TelegramBridge_connected}");
LogToConsole($"§y§l§f{Translations.bot_TelegramBridge_connected}");
if (Config.Authorized_Chat_Ids.Length == 0)
{
SendMessage("⚠️ *" + Translations.TryGet("bot.TelegramBridge.missing_authorized_channels") + "* ⚠️");
LogToConsole("§w§l§f" + Translations.TryGet("bot.TelegramBridge.missing_authorized_channels"));
SendMessage($"⚠️ *{Translations.bot_TelegramBridge_missing_authorized_channels}* ⚠️");
LogToConsole($"§w§l§f{Translations.bot_TelegramBridge_missing_authorized_channels}");
return;
}
@ -268,7 +265,7 @@ namespace MinecraftClient.ChatBots
}
catch (Exception e)
{
LogToConsole("§w§l§f" + Translations.TryGet("bot.TelegramBridge.unknown_error"));
LogToConsole($"§w§l§f{Translations.bot_TelegramBridge_unknown_error}");
LogToConsole(e);
return;
}
@ -309,7 +306,7 @@ namespace MinecraftClient.ChatBots
await botClient.SendTextMessageAsync(
chatId: chatId,
replyToMessageId: message.MessageId,
text: Translations.TryGet("bot.TelegramBridge.unauthorized"),
text: Translations.bot_TelegramBridge_unauthorized,
cancellationToken: _cancellationToken,
parseMode: ParseMode.Markdown);
return;
@ -335,7 +332,7 @@ namespace MinecraftClient.ChatBots
chatId: chatId,
replyToMessageId:
message.MessageId,
text: $"{Translations.TryGet("bot.TelegramBridge.command_executed")}:\n\n{result}",
text: $"{Translations.bot_TelegramBridge_command_executed}:\n\n{result}",
cancellationToken: _cancellationToken,
parseMode: ParseMode.Markdown);
}

4
MinecraftClient/ChatBots/TestBot.cs
View file

@ -14,11 +14,11 @@
if (IsPrivateMessage(text, ref message, ref username))
{
LogToConsoleTranslated("bot.testBot.told", username, message);
LogToConsole(string.Format(Translations.bot_testBot_told, username, message));
}
else if (IsChatMessage(text, ref message, ref username))
{
LogToConsoleTranslated("bot.testBot.said", username, message);
LogToConsole(string.Format(Translations.bot_testBot_said, username, message));
}
}
}