mirror of
https://github.com/MCCTeam/Minecraft-Console-Client
synced 2025-10-14 21:22:49 +00:00
Entitycmd: Fixed a bug for which when passing as the second argument
the entity type the command will error out showing its usage description. Also now when the type of interaction isn't passed it shows a list of all the entities with that type.
This commit is contained in:
ITHackerstein
parent
c67a2955cc
commit
3d2b9b22a3
1 changed files with 118 additions and 98 deletions
|
|
@ -13,6 +13,85 @@ namespace MinecraftClient.Commands
|
||||||
public override string CmdUsage { get { return "entity <id|entitytype> <attack|use>"; } }
|
public override string CmdUsage { get { return "entity <id|entitytype> <attack|use>"; } }
|
||||||
public override string CmdDesc { get { return string.Empty; } }
|
public override string CmdDesc { get { return string.Empty; } }
|
||||||
|
|
||||||
|
private static void GetEntityInfoShort(StringBuilder sb, Entity entity)
|
||||||
|
{
|
||||||
|
int id = entity.ID;
|
||||||
|
float health = entity.Health;
|
||||||
|
int latency = entity.Latency;
|
||||||
|
string? nickname = entity.Name;
|
||||||
|
string? customname = entity.CustomName;
|
||||||
|
EntityPose pose = entity.Pose;
|
||||||
|
EntityType type = entity.Type;
|
||||||
|
Item item = entity.Item;
|
||||||
|
string location = $"X:{Math.Round(entity.Location.X, 2)}, Y:{Math.Round(entity.Location.Y, 2)}, Z:{Math.Round(entity.Location.Z, 2)}";
|
||||||
|
|
||||||
|
if (type == EntityType.Item || type == EntityType.ItemFrame || type == EntityType.EyeOfEnder || type == EntityType.Egg || type == EntityType.EnderPearl || type == EntityType.Potion || type == EntityType.Fireball || type == EntityType.FireworkRocket)
|
||||||
|
sb.AppendLine($" #{id}: {Translations.cmd_entityCmd_type}: {entity.GetTypeString()}, {Translations.cmd_entityCmd_item}: {item.GetTypeString()}, {Translations.cmd_entityCmd_location}: {location}");
|
||||||
|
else if (type == EntityType.Player && !string.IsNullOrEmpty(nickname))
|
||||||
|
sb.AppendLine($" #{id}: {Translations.cmd_entityCmd_type}: {entity.GetTypeString()}, {Translations.cmd_entityCmd_nickname}: §8{nickname}§8, {Translations.cmd_entityCmd_latency}: {latency}, {Translations.cmd_entityCmd_health}: {health}, {Translations.cmd_entityCmd_pose}: {pose}, {Translations.cmd_entityCmd_location}: {location}");
|
||||||
|
else if (type == EntityType.Player && !string.IsNullOrEmpty(customname))
|
||||||
|
sb.AppendLine($" #{id}: {Translations.cmd_entityCmd_type}: {entity.GetTypeString()}, {Translations.cmd_entityCmd_customname}: §8{customname.Replace("&", "§")}§8, {Translations.cmd_entityCmd_latency}: {latency}, {Translations.cmd_entityCmd_health}: {health}, {Translations.cmd_entityCmd_pose}: {pose}, {Translations.cmd_entityCmd_location}: {location}");
|
||||||
|
else
|
||||||
|
sb.AppendLine($" #{id}: {Translations.cmd_entityCmd_type}: {entity.GetTypeString()}, {Translations.cmd_entityCmd_health}: {health}, {Translations.cmd_entityCmd_location}: {location}");
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void GetEntityInfoDetailed(StringBuilder sb, McClient handler, Entity entity)
|
||||||
|
{
|
||||||
|
int id = entity.ID;
|
||||||
|
float health = entity.Health;
|
||||||
|
int latency = entity.Latency;
|
||||||
|
Item item = entity.Item;
|
||||||
|
string? nickname = entity.Name;
|
||||||
|
string? customname = entity.CustomName;
|
||||||
|
EntityPose pose = entity.Pose;
|
||||||
|
EntityType type = entity.Type;
|
||||||
|
double distance = Math.Round(entity.Location.Distance(handler.GetCurrentLocation()), 2);
|
||||||
|
|
||||||
|
string color = "§a"; // Green
|
||||||
|
if (health < 10)
|
||||||
|
color = "§c"; // Red
|
||||||
|
else if (health < 15)
|
||||||
|
color = "§e"; // Yellow
|
||||||
|
|
||||||
|
string location = $"X:{Math.Round(entity.Location.X, 2)}, Y:{Math.Round(entity.Location.Y, 2)}, Z:{Math.Round(entity.Location.Z, 2)}";
|
||||||
|
sb.Append($"{Translations.cmd_entityCmd_entity}: {id}\n [MCC] Type: {entity.GetTypeString()}");
|
||||||
|
if (!string.IsNullOrEmpty(nickname))
|
||||||
|
sb.Append($"\n [MCC] {Translations.cmd_entityCmd_nickname}: {nickname}");
|
||||||
|
else if (!string.IsNullOrEmpty(customname))
|
||||||
|
sb.Append($"\n [MCC] {Translations.cmd_entityCmd_customname}: {customname.Replace("&", "§")}§8");
|
||||||
|
if (type == EntityType.Player)
|
||||||
|
sb.Append($"\n [MCC] {Translations.cmd_entityCmd_latency}: {latency}");
|
||||||
|
else if (type == EntityType.Item || type == EntityType.ItemFrame || type == Mapping.EntityType.EyeOfEnder || type == Mapping.EntityType.Egg || type == Mapping.EntityType.EnderPearl || type == Mapping.EntityType.Potion || type == Mapping.EntityType.Fireball || type == Mapping.EntityType.FireworkRocket)
|
||||||
|
{
|
||||||
|
string? displayName = item.DisplayName;
|
||||||
|
if (string.IsNullOrEmpty(displayName))
|
||||||
|
sb.Append($"\n [MCC] {Translations.cmd_entityCmd_item}: {item.GetTypeString()} x{item.Count}");
|
||||||
|
else
|
||||||
|
sb.Append($"\n [MCC] {Translations.cmd_entityCmd_item}: {item.GetTypeString()} x{item.Count} - {displayName}§8");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (entity.Equipment.Count >= 1 && entity.Equipment != null)
|
||||||
|
{
|
||||||
|
sb.Append($"\n [MCC] {Translations.cmd_entityCmd_equipment}:");
|
||||||
|
if (entity.Equipment.ContainsKey(0) && entity.Equipment[0] != null)
|
||||||
|
sb.Append($"\n [MCC] {Translations.cmd_entityCmd_mainhand}: {entity.Equipment[0].GetTypeString()} x{entity.Equipment[0].Count}");
|
||||||
|
if (entity.Equipment.ContainsKey(1) && entity.Equipment[1] != null)
|
||||||
|
sb.Append($"\n [MCC] {Translations.cmd_entityCmd_offhand}: {entity.Equipment[1].GetTypeString()} x{entity.Equipment[1].Count}");
|
||||||
|
if (entity.Equipment.ContainsKey(5) && entity.Equipment[5] != null)
|
||||||
|
sb.Append($"\n [MCC] {Translations.cmd_entityCmd_helmet}: {entity.Equipment[5].GetTypeString()} x{entity.Equipment[5].Count}");
|
||||||
|
if (entity.Equipment.ContainsKey(4) && entity.Equipment[4] != null)
|
||||||
|
sb.Append($"\n [MCC] {Translations.cmd_entityCmd_chestplate}: {entity.Equipment[4].GetTypeString()} x{entity.Equipment[4].Count}");
|
||||||
|
if (entity.Equipment.ContainsKey(3) && entity.Equipment[3] != null)
|
||||||
|
sb.Append($"\n [MCC] {Translations.cmd_entityCmd_leggings}: {entity.Equipment[3].GetTypeString()} x{entity.Equipment[3].Count}");
|
||||||
|
if (entity.Equipment.ContainsKey(2) && entity.Equipment[2] != null)
|
||||||
|
sb.Append($"\n [MCC] {Translations.cmd_entityCmd_boots}: {entity.Equipment[2].GetTypeString()} x{entity.Equipment[2].Count}");
|
||||||
|
}
|
||||||
|
sb.Append($"\n [MCC] {Translations.cmd_entityCmd_pose}: {pose}");
|
||||||
|
sb.Append($"\n [MCC] {Translations.cmd_entityCmd_health}: {color}{health}§8");
|
||||||
|
sb.Append($"\n [MCC] {Translations.cmd_entityCmd_distance}: {distance}");
|
||||||
|
sb.Append($"\n [MCC] {Translations.cmd_entityCmd_location}: {location}");
|
||||||
|
}
|
||||||
|
|
||||||
public override string Run(McClient handler, string command, Dictionary<string, object>? localVars)
|
public override string Run(McClient handler, string command, Dictionary<string, object>? localVars)
|
||||||
{
|
{
|
||||||
if (handler.GetEntityHandlingEnabled())
|
if (handler.GetEntityHandlingEnabled())
|
||||||
|
|
@ -23,94 +102,41 @@ namespace MinecraftClient.Commands
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
int entityID = int.Parse(args[0], NumberStyles.Any, CultureInfo.CurrentCulture);
|
int entityID = int.Parse(args[0], NumberStyles.Any, CultureInfo.CurrentCulture);
|
||||||
if (entityID != 0)
|
if (handler.GetEntities().ContainsKey(entityID))
|
||||||
{
|
{
|
||||||
if (handler.GetEntities().ContainsKey(entityID))
|
string action = args.Length > 1
|
||||||
|
? args[1].ToLower()
|
||||||
|
: "list";
|
||||||
|
switch (action)
|
||||||
{
|
{
|
||||||
string action = args.Length > 1
|
case "attack":
|
||||||
? args[1].ToLower()
|
handler.InteractEntity(entityID, InteractType.Attack);
|
||||||
: "list";
|
return Translations.cmd_entityCmd_attacked;
|
||||||
switch (action)
|
case "use":
|
||||||
{
|
handler.InteractEntity(entityID, InteractType.Interact);
|
||||||
case "attack":
|
return Translations.cmd_entityCmd_used;
|
||||||
handler.InteractEntity(entityID, InteractType.Attack);
|
default:
|
||||||
return Translations.cmd_entityCmd_attacked;
|
Entity entity = handler.GetEntities()[entityID];
|
||||||
case "use":
|
StringBuilder done = new();
|
||||||
handler.InteractEntity(entityID, InteractType.Interact);
|
GetEntityInfoDetailed(done, handler, entity);
|
||||||
return Translations.cmd_entityCmd_used;
|
return done.ToString();
|
||||||
default:
|
|
||||||
Entity entity = handler.GetEntities()[entityID];
|
|
||||||
int id = entity.ID;
|
|
||||||
float health = entity.Health;
|
|
||||||
int latency = entity.Latency;
|
|
||||||
Item item = entity.Item;
|
|
||||||
string? nickname = entity.Name;
|
|
||||||
string? customname = entity.CustomName;
|
|
||||||
EntityPose pose = entity.Pose;
|
|
||||||
EntityType type = entity.Type;
|
|
||||||
double distance = Math.Round(entity.Location.Distance(handler.GetCurrentLocation()), 2);
|
|
||||||
|
|
||||||
string color = "§a"; // Green
|
|
||||||
if (health < 10)
|
|
||||||
color = "§c"; // Red
|
|
||||||
else if (health < 15)
|
|
||||||
color = "§e"; // Yellow
|
|
||||||
|
|
||||||
string location = $"X:{Math.Round(entity.Location.X, 2)}, Y:{Math.Round(entity.Location.Y, 2)}, Z:{Math.Round(entity.Location.Z, 2)}";
|
|
||||||
StringBuilder done = new();
|
|
||||||
done.Append($"{Translations.cmd_entityCmd_entity}: {id}\n [MCC] Type: {entity.GetTypeString()}");
|
|
||||||
if (!string.IsNullOrEmpty(nickname))
|
|
||||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_nickname}: {nickname}");
|
|
||||||
else if (!string.IsNullOrEmpty(customname))
|
|
||||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_customname}: {customname.Replace("&", "§")}§8");
|
|
||||||
if (type == EntityType.Player)
|
|
||||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_latency}: {latency}");
|
|
||||||
else if (type == EntityType.Item || type == EntityType.ItemFrame || type == Mapping.EntityType.EyeOfEnder || type == Mapping.EntityType.Egg || type == Mapping.EntityType.EnderPearl || type == Mapping.EntityType.Potion || type == Mapping.EntityType.Fireball || type == Mapping.EntityType.FireworkRocket)
|
|
||||||
{
|
|
||||||
string? displayName = item.DisplayName;
|
|
||||||
if (string.IsNullOrEmpty(displayName))
|
|
||||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_item}: {item.GetTypeString()} x{item.Count}");
|
|
||||||
else
|
|
||||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_item}: {item.GetTypeString()} x{item.Count} - {displayName}§8");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (entity.Equipment.Count >= 1 && entity.Equipment != null)
|
|
||||||
{
|
|
||||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_equipment}:");
|
|
||||||
if (entity.Equipment.ContainsKey(0) && entity.Equipment[0] != null)
|
|
||||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_mainhand}: {entity.Equipment[0].GetTypeString()} x{entity.Equipment[0].Count}");
|
|
||||||
if (entity.Equipment.ContainsKey(1) && entity.Equipment[1] != null)
|
|
||||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_offhand}: {entity.Equipment[1].GetTypeString()} x{entity.Equipment[1].Count}");
|
|
||||||
if (entity.Equipment.ContainsKey(5) && entity.Equipment[5] != null)
|
|
||||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_helmet}: {entity.Equipment[5].GetTypeString()} x{entity.Equipment[5].Count}");
|
|
||||||
if (entity.Equipment.ContainsKey(4) && entity.Equipment[4] != null)
|
|
||||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_chestplate}: {entity.Equipment[4].GetTypeString()} x{entity.Equipment[4].Count}");
|
|
||||||
if (entity.Equipment.ContainsKey(3) && entity.Equipment[3] != null)
|
|
||||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_leggings}: {entity.Equipment[3].GetTypeString()} x{entity.Equipment[3].Count}");
|
|
||||||
if (entity.Equipment.ContainsKey(2) && entity.Equipment[2] != null)
|
|
||||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_boots}: {entity.Equipment[2].GetTypeString()} x{entity.Equipment[2].Count}");
|
|
||||||
}
|
|
||||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_pose}: {pose}");
|
|
||||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_health}: {color}{health}§8");
|
|
||||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_distance}: {distance}");
|
|
||||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_location}: {location}");
|
|
||||||
return done.ToString();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else return Translations.cmd_entityCmd_not_found;
|
|
||||||
}
|
}
|
||||||
else
|
else return Translations.cmd_entityCmd_not_found;
|
||||||
{
|
}
|
||||||
EntityType interacttype = Enum.Parse<EntityType>(args[0]);
|
catch (FormatException)
|
||||||
|
{
|
||||||
|
EntityType interacttype = Enum.Parse<EntityType>(args[0]);
|
||||||
|
string action = args.Length > 1
|
||||||
|
? args[1].ToLower()
|
||||||
|
: "list";
|
||||||
|
if (action == "attack" || action == "use") {
|
||||||
string actionst = Translations.cmd_entityCmd_attacked;
|
string actionst = Translations.cmd_entityCmd_attacked;
|
||||||
int actioncount = 0;
|
int actioncount = 0;
|
||||||
foreach (var entity2 in handler.GetEntities())
|
foreach (var entity2 in handler.GetEntities())
|
||||||
{
|
{
|
||||||
if (entity2.Value.Type == interacttype)
|
if (entity2.Value.Type == interacttype)
|
||||||
{
|
{
|
||||||
string action = args.Length > 1
|
|
||||||
? args[1].ToLower()
|
|
||||||
: "list";
|
|
||||||
if (action == "attack")
|
if (action == "attack")
|
||||||
{
|
{
|
||||||
handler.InteractEntity(entity2.Key, InteractType.Attack);
|
handler.InteractEntity(entity2.Key, InteractType.Attack);
|
||||||
|
|
@ -128,8 +154,19 @@ namespace MinecraftClient.Commands
|
||||||
}
|
}
|
||||||
return actioncount + " " + actionst;
|
return actioncount + " " + actionst;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
catch (FormatException) { return GetCmdDescTranslated(); }
|
StringBuilder response = new();
|
||||||
|
response.AppendLine(Translations.cmd_entityCmd_entities);
|
||||||
|
foreach (var entity2 in handler.GetEntities())
|
||||||
|
{
|
||||||
|
if (entity2.Value.Type == interacttype)
|
||||||
|
{
|
||||||
|
GetEntityInfoShort(response, entity2.Value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
response.Append(GetCmdDescTranslated());
|
||||||
|
return response.ToString();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
@ -138,24 +175,7 @@ namespace MinecraftClient.Commands
|
||||||
response.AppendLine(Translations.cmd_entityCmd_entities);
|
response.AppendLine(Translations.cmd_entityCmd_entities);
|
||||||
foreach (var entity2 in entities)
|
foreach (var entity2 in entities)
|
||||||
{
|
{
|
||||||
int id = entity2.Key;
|
GetEntityInfoShort(response, entity2.Value);
|
||||||
float health = entity2.Value.Health;
|
|
||||||
int latency = entity2.Value.Latency;
|
|
||||||
string? nickname = entity2.Value.Name;
|
|
||||||
string? customname = entity2.Value.CustomName;
|
|
||||||
EntityPose pose = entity2.Value.Pose;
|
|
||||||
EntityType type = entity2.Value.Type;
|
|
||||||
Item item = entity2.Value.Item;
|
|
||||||
string location = $"X:{Math.Round(entity2.Value.Location.X, 2)}, Y:{Math.Round(entity2.Value.Location.Y, 2)}, Z:{Math.Round(entity2.Value.Location.Z, 2)}";
|
|
||||||
|
|
||||||
if (type == EntityType.Item || type == EntityType.ItemFrame || type == EntityType.EyeOfEnder || type == EntityType.Egg || type == EntityType.EnderPearl || type == EntityType.Potion || type == EntityType.Fireball || type == EntityType.FireworkRocket)
|
|
||||||
response.AppendLine($" #{id}: {Translations.cmd_entityCmd_type}: {entity2.Value.GetTypeString()}, {Translations.cmd_entityCmd_item}: {item.GetTypeString()}, {Translations.cmd_entityCmd_location}: {location}");
|
|
||||||
else if (type == EntityType.Player && !string.IsNullOrEmpty(nickname))
|
|
||||||
response.AppendLine($" #{id}: {Translations.cmd_entityCmd_type}: {entity2.Value.GetTypeString()}, {Translations.cmd_entityCmd_nickname}: §8{nickname}§8, {Translations.cmd_entityCmd_latency}: {latency}, {Translations.cmd_entityCmd_health}: {health}, {Translations.cmd_entityCmd_pose}: {pose}, {Translations.cmd_entityCmd_location}: {location}");
|
|
||||||
else if (type == EntityType.Player && !string.IsNullOrEmpty(customname))
|
|
||||||
response.AppendLine($" #{id}: {Translations.cmd_entityCmd_type}: {entity2.Value.GetTypeString()}, {Translations.cmd_entityCmd_customname}: §8{customname.Replace("&", "§")}§8, {Translations.cmd_entityCmd_latency}: {latency}, {Translations.cmd_entityCmd_health}: {health}, {Translations.cmd_entityCmd_pose}: {pose}, {Translations.cmd_entityCmd_location}: {location}");
|
|
||||||
else
|
|
||||||
response.AppendLine($" #{id}: {Translations.cmd_entityCmd_type}: {entity2.Value.GetTypeString()}, {Translations.cmd_entityCmd_health}: {health}, {Translations.cmd_entityCmd_location}: {location}");
|
|
||||||
}
|
}
|
||||||
response.Append(GetCmdDescTranslated());
|
response.Append(GetCmdDescTranslated());
|
||||||
return response.ToString();
|
return response.ToString();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue