merge brigadier-dev into milutinke:1.19.3

This commit is contained in:
BruceChen 2023-01-14 20:42:15 +08:00
commit ba0d9ba3fc
139 changed files with 12057 additions and 3183 deletions

View file

@ -1075,6 +1075,61 @@ namespace MinecraftClient {
}
}
/// <summary>
/// Looks up a localized string similar to Console-related settings..
/// </summary>
internal static string Console {
get {
return ResourceManager.GetString("Console", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The settings for command completion suggestions.
///Custom colors are only available when using &quot;vt100_24bit&quot; color mode..
/// </summary>
internal static string Console_CommandSuggestion {
get {
return ResourceManager.GetString("Console.CommandSuggestion", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Whether to display command suggestions in the console..
/// </summary>
internal static string Console_CommandSuggestion_Enable {
get {
return ResourceManager.GetString("Console.CommandSuggestion.Enable", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Enable this option if the arrows in the command suggestions are not displayed properly in your terminal..
/// </summary>
internal static string Console_CommandSuggestion_Use_Basic_Arrow {
get {
return ResourceManager.GetString("Console.CommandSuggestion.Use_Basic_Arrow", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Use &quot;disable&quot;, &quot;legacy_4bit&quot;, &quot;vt100_4bit&quot;, &quot;vt100_8bit&quot; or &quot;vt100_24bit&quot;. If a garbled code like &quot;←[0m&quot; appears on the terminal, you can try switching to &quot;legacy_4bit&quot; mode, or just disable it..
/// </summary>
internal static string Console_General_ConsoleColorMode {
get {
return ResourceManager.GetString("Console.General.ConsoleColorMode", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to You can use &quot;Ctrl+P&quot; to print out the current input and cursor position..
/// </summary>
internal static string Console_General_Display_Input {
get {
return ResourceManager.GetString("Console.General.Display_Input", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Startup Config File
///Please do not record extraneous data in this file as it will be overwritten by MCC.
@ -1505,15 +1560,6 @@ namespace MinecraftClient {
}
}
/// <summary>
/// Looks up a localized string similar to Use &quot;none&quot;, &quot;bit_4&quot;, &quot;bit_8&quot; or &quot;bit_24&quot;. This can be checked by opening the debug log..
/// </summary>
internal static string Main_Advanced_TerminalColorDepth {
get {
return ResourceManager.GetString("Main.Advanced.TerminalColorDepth", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Uses more ram, cpu, bandwidth but allows you to move around..
/// </summary>

View file

@ -535,6 +535,25 @@ When this happens, you'll need to configure chat format below, see https://mccte
<data name="ChatFormat.UserDefined" xml:space="preserve">
<value>Whether to use the custom regular expressions below for detection.</value>
</data>
<data name="Console" xml:space="preserve">
<value>Console-related settings.</value>
</data>
<data name="Console.CommandSuggestion" xml:space="preserve">
<value>The settings for command completion suggestions.
Custom colors are only available when using "vt100_24bit" color mode.</value>
</data>
<data name="Console.CommandSuggestion.Enable" xml:space="preserve">
<value>Whether to display command suggestions in the console.</value>
</data>
<data name="Console.CommandSuggestion.Use_Basic_Arrow" xml:space="preserve">
<value>Enable this option if the arrows in the command suggestions are not displayed properly in your terminal.</value>
</data>
<data name="Console.General.ConsoleColorMode" xml:space="preserve">
<value>Use "disable", "legacy_4bit", "vt100_4bit", "vt100_8bit" or "vt100_24bit". If a garbled code like "←[0m" appears on the terminal, you can try switching to "legacy_4bit" mode, or just disable it.</value>
</data>
<data name="Console.General.Display_Input" xml:space="preserve">
<value>You can use "Ctrl+P" to print out the current input and cursor position.</value>
</data>
<data name="Head" xml:space="preserve">
<value>Startup Config File
Please do not record extraneous data in this file as it will be overwritten by MCC.
@ -683,9 +702,6 @@ Usage examples: "/tell &lt;mybot&gt; connect Server1", "/connect Server2"</value
<data name="Main.Advanced.temporary_fix_badpacket" xml:space="preserve">
<value>Temporary fix for Badpacket issue on some servers. Need to enable "TerrainAndMovements" first.</value>
</data>
<data name="Main.Advanced.TerminalColorDepth" xml:space="preserve">
<value>Use "none", "bit_4", "bit_8" or "bit_24". This can be checked by opening the debug log.</value>
</data>
<data name="Main.Advanced.terrain_and_movements" xml:space="preserve">
<value>Uses more ram, cpu, bandwidth but allows you to move around.</value>
</data>

View file

@ -0,0 +1,73 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace MinecraftClient {
using System;
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
// This class was auto-generated by the StronglyTypedResourceBuilder
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class MinecraftAssets {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal MinecraftAssets() {
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MinecraftClient.Resources.MinecraftAssets", typeof(MinecraftAssets).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set {
resourceCulture = value;
}
}
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] en_us_json {
get {
object obj = ResourceManager.GetObject("en_us.json", resourceCulture);
return ((byte[])(obj));
}
}
}
}

View file

@ -0,0 +1,124 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="en_us.json" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>en_us.json;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>

View file

@ -151,7 +151,7 @@ namespace MinecraftClient {
}
/// <summary>
/// Looks up a localized string similar to Available commands: {0}. Use /autocraft help &lt;cmd name&gt; for more information. You may use /ac as command alias..
/// Looks up a localized string similar to Available commands: {0}. Use /autocraft help &lt;cmd name&gt; for more information..
/// </summary>
internal static string bot_autoCraft_available_cmd {
get {
@ -367,7 +367,7 @@ namespace MinecraftClient {
}
/// <summary>
/// Looks up a localized string similar to Available commands: {0}. Use /digbot help &lt;cmd name&gt; for more information..
/// Looks up a localized string similar to Available commands: {0}. Use /autodig help &lt;cmd name&gt; for more information..
/// </summary>
internal static string bot_autodig_available_cmd {
get {
@ -394,7 +394,7 @@ namespace MinecraftClient {
}
/// <summary>
/// Looks up a localized string similar to Get the command description. Usage: /digbot help &lt;command name&gt;.
/// Looks up a localized string similar to Get the command description. Usage: /autodig help &lt;command name&gt;.
/// </summary>
internal static string bot_autodig_help_help {
get {
@ -2253,7 +2253,7 @@ namespace MinecraftClient {
}
/// <summary>
/// Looks up a localized string similar to Downloading &apos;{0}.lang&apos; from Mojang servers....
/// Looks up a localized string similar to Downloading &apos;{0}.json&apos; from Mojang servers....
/// </summary>
internal static string chat_download {
get {
@ -2270,15 +2270,6 @@ namespace MinecraftClient {
}
}
/// <summary>
/// Looks up a localized string similar to Defaulting to en_GB.lang from your Minecraft directory..
/// </summary>
internal static string chat_from_dir {
get {
return ResourceManager.GetString("chat.from_dir", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Translations file loaded..
/// </summary>
@ -2316,6 +2307,24 @@ namespace MinecraftClient {
}
}
/// <summary>
/// Looks up a localized string similar to Failed to save the file {0}..
/// </summary>
internal static string chat_save_fail {
get {
return ResourceManager.GetString("chat.save_fail", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Switch to use Minecraft&apos;s default language resource &quot;en_us.json&quot;..
/// </summary>
internal static string chat_use_default {
get {
return ResourceManager.GetString("chat.use_default", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to [{0}] Disconnecting and Reconnecting to the Server.
/// </summary>
@ -2425,7 +2434,7 @@ namespace MinecraftClient {
}
/// <summary>
/// Looks up a localized string similar to Searching for a bed in radius of {0}....
/// Looks up a localized string similar to Searching for a bed in radius of {0:0.00}....
/// </summary>
internal static string cmd_bed_searching {
get {
@ -3996,7 +4005,7 @@ namespace MinecraftClient {
}
/// <summary>
/// Looks up a localized string similar to setrnd variable -7to17 OR setrnd variable string1 &quot;\&quot;string2\&quot; string3&quot;.
/// Looks up a localized string similar to setrnd variable -7 to 17 OR setrnd variable string1 &quot;\&quot;string2\&quot; string3&quot;.
/// </summary>
internal static string cmd_setrnd_format {
get {
@ -4005,7 +4014,7 @@ namespace MinecraftClient {
}
/// <summary>
/// Looks up a localized string similar to setrnd variable -7to17.
/// Looks up a localized string similar to setrnd variable -7 to 17.
/// </summary>
internal static string cmd_setrndnum_format {
get {
@ -4112,6 +4121,15 @@ namespace MinecraftClient {
}
}
/// <summary>
/// Looks up a localized string similar to The color code {1} in {0} is in illegal format and the default value has been restored..
/// </summary>
internal static string config_commandsuggestion_illegal_color {
get {
return ResourceManager.GetString("config.commandsuggestion.illegal_color", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Settings have been loaded from {0}.
/// </summary>
@ -5058,7 +5076,8 @@ namespace MinecraftClient {
}
/// <summary>
/// Looks up a localized string similar to help &lt;cmdname&gt;. Available commands: {0}. For server help, use &apos;{1}send /help&apos; instead..
/// Looks up a localized string similar to help &lt;cmdname&gt;. Available commands:
///{0}For server help, use &apos;{1}send /help&apos; instead..
/// </summary>
internal static string icmd_list {
get {
@ -5322,7 +5341,7 @@ namespace MinecraftClient {
}
/// <summary>
/// Looks up a localized string similar to Password(invisible): {0}.
/// Looks up a localized string similar to Password(invisible): .
/// </summary>
internal static string mcc_password_hidden {
get {

View file

@ -148,7 +148,7 @@
<value>Auto-crafting ChatBot command alias</value>
</data>
<data name="bot.autoCraft.available_cmd" xml:space="preserve">
<value>Available commands: {0}. Use /autocraft help &lt;cmd name&gt; for more information. You may use /ac as command alias.</value>
<value>Available commands: {0}. Use /autocraft help &lt;cmd name&gt; for more information.</value>
</data>
<data name="bot.autoCraft.close_inventory" xml:space="preserve">
<value>Inventory #{0} was closed by AutoCraft</value>
@ -220,7 +220,7 @@
<value>Action timeout! Reason: {0}</value>
</data>
<data name="bot.autodig.available_cmd" xml:space="preserve">
<value>Available commands: {0}. Use /digbot help &lt;cmd name&gt; for more information.</value>
<value>Available commands: {0}. Use /autodig help &lt;cmd name&gt; for more information.</value>
</data>
<data name="bot.autodig.cmd" xml:space="preserve">
<value>Auto-digging ChatBot command</value>
@ -229,7 +229,7 @@
<value>Digging block timeout, retry.</value>
</data>
<data name="bot.autodig.help.help" xml:space="preserve">
<value>Get the command description. Usage: /digbot help &lt;command name&gt;</value>
<value>Get the command description. Usage: /autodig help &lt;command name&gt;</value>
</data>
<data name="bot.autodig.help.start" xml:space="preserve">
<value>Start the automatic digging bot.</value>
@ -864,14 +864,11 @@ Add the ID of this chat to "Authorized_Chat_Ids" field in the configuration file
<value>Done. File saved as '{0}'</value>
</data>
<data name="chat.download" xml:space="preserve">
<value>Downloading '{0}.lang' from Mojang servers...</value>
<value>Downloading '{0}.json' from Mojang servers...</value>
</data>
<data name="chat.fail" xml:space="preserve">
<value>Failed to download the file.</value>
</data>
<data name="chat.from_dir" xml:space="preserve">
<value>Defaulting to en_GB.lang from your Minecraft directory.</value>
</data>
<data name="chat.loaded" xml:space="preserve">
<value>Translations file loaded.</value>
</data>
@ -885,6 +882,12 @@ Some messages won't be properly printed without this file.</value>
<data name="chat.request" xml:space="preserve">
<value>Performing request to {0}</value>
</data>
<data name="chat.save_fail" xml:space="preserve">
<value>Failed to save the file {0}.</value>
</data>
<data name="chat.use_default" xml:space="preserve">
<value>Switch to use Minecraft's default language resource "en_us.json".</value>
</data>
<data name="chatbot.reconnect" xml:space="preserve">
<value>[{0}] Disconnecting and Reconnecting to the Server</value>
</data>
@ -922,7 +925,7 @@ Some messages won't be properly printed without this file.</value>
<value>Could not lay in bed. Are you trying to sleep in a bed? (PS: You must use the head block coordinates of the bed)</value>
</data>
<data name="cmd.bed.searching" xml:space="preserve">
<value>Searching for a bed in radius of {0}...</value>
<value>Searching for a bed in radius of {0:0.00}...</value>
</data>
<data name="cmd.bed.trying_to_use" xml:space="preserve">
<value>Trying to sleep in a bed on location (X: {0:0.0}, Y: {1:0.0}, Z: {2:0.0}). Result: {3}</value>
@ -1449,10 +1452,10 @@ You can use "/chunk status {0:0.0} {1:0.0} {2:0.0}" to check the chunk loading s
<value>set a custom %variable% randomly to a given value.</value>
</data>
<data name="cmd.setrnd.format" xml:space="preserve">
<value>setrnd variable -7to17 OR setrnd variable string1 "\"string2\" string3"</value>
<value>setrnd variable -7 to 17 OR setrnd variable string1 "\"string2\" string3"</value>
</data>
<data name="cmd.setrndnum.format" xml:space="preserve">
<value>setrnd variable -7to17</value>
<value>setrnd variable -7 to 17</value>
</data>
<data name="cmd.setrndstr.format" xml:space="preserve">
<value>setrnd variable string1 "\"string2\" string3"</value>
@ -1487,6 +1490,9 @@ You can use "/chunk status {0:0.0} {1:0.0} {2:0.0}" to check the chunk loading s
<data name="config.backup.fail" xml:space="preserve">
<value>Failed to write to backup file {0}</value>
</data>
<data name="config.commandsuggestion.illegal_color" xml:space="preserve">
<value>The color code {1} in {0} is in illegal format and the default value has been restored.</value>
</data>
<data name="config.load" xml:space="preserve">
<value>Settings have been loaded from {0}</value>
</data>
@ -1803,7 +1809,8 @@ You can use "/chunk status {0:0.0} {1:0.0} {2:0.0}" to check the chunk loading s
<value>help &lt;cmdname&gt;: show brief help about a command.</value>
</data>
<data name="icmd.list" xml:space="preserve">
<value>help &lt;cmdname&gt;. Available commands: {0}. For server help, use '{1}send /help' instead.</value>
<value>help &lt;cmdname&gt;. Available commands:
{0}For server help, use '{1}send /help' instead.</value>
</data>
<data name="icmd.unknown" xml:space="preserve">
<value>Unknown command '{0}'. Use 'help' for command list.</value>
@ -1893,7 +1900,7 @@ Type '{0}quit' to leave the server.</value>
<value>Please type the password for {0}.</value>
</data>
<data name="mcc.password_hidden" xml:space="preserve">
<value>Password(invisible): {0}</value>
<value>Password(invisible): </value>
</data>
<data name="mcc.player_dead" xml:space="preserve">
<value>You are dead. Type '{0}respawn' to respawn.</value>

File diff suppressed because it is too large Load diff