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

Improve /entity, add entity equipment and item lore (#1238)

Browse source 
* Update Entitycmd.cs
* Update Entitycmd.cs
* Update Entitycmd.cs
* Update Entitycmd.cs
* Update Entitycmd.cs
* Update Entitycmd.cs
* Update Entitycmd.cs
* Color fix
* Update Entitycmd.cs
* Update Entitycmd.cs
* Entities list CustomName fix
* Update Entity.cs
* Update McClient.cs
* Update Entity.cs
* Update Entity.cs
* Update Entitycmd.cs
* Crash fixes
* Update Entitycmd.cs
* Update McClient.cs
* Update Entitycmd.cs
* Remove extra space
* Space add
* Update Item.cs
* Update McClient.cs
* Update Entitycmd.cs
* Replace item slot if already set
This commit is contained in:
Рома Данилов 2020-08-26 21:58:45 +05:00 • committed by GitHub
parent 9b8213eca5
commit 896cabb6ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 129 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

111
MinecraftClient/Commands/Entitycmd.cs
View file

@ -1,7 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Drawing;
using System.Text;
using MinecraftClient.Inventory; using MinecraftClient.Inventory;
using MinecraftClient.Mapping; using MinecraftClient.Mapping;
@ -10,7 +9,7 @@ namespace MinecraftClient.Commands
class Entitycmd : Command class Entitycmd : Command
{ {
public override string CMDName { get { return "entity"; } } public override string CMDName { get { return "entity"; } }
public override string CMDDesc { get { return "entity <id|entitytype> <list|attack|use>"; } } public override string CMDDesc { get { return "entity <id|entitytype> <attack|use>"; } }
public override string Run(McClient handler, string command, Dictionary<string, object> localVars) public override string Run(McClient handler, string command, Dictionary<string, object> localVars)
{ {
@ -25,29 +24,86 @@ namespace MinecraftClient.Commands
int.TryParse(args[0], out entityID); int.TryParse(args[0], out entityID);
if (entityID != 0) if (entityID != 0)
{ {
string action = args.Length > 1 if (handler.GetEntities().ContainsKey(entityID))
? args[1].ToLower()
: "list";
switch (action)
{ {
case "attack": string action = args.Length > 1
handler.InteractEntity(entityID, 1); ? args[1].ToLower()
return "Entity attacked"; : "list";
case "use": switch (action)
handler.InteractEntity(entityID, 0); {
return "Entity used"; case "attack":
default: handler.InteractEntity(entityID, 1);
return CMDDesc; return "Entity attacked";
case "use":
handler.InteractEntity(entityID, 0);
return "Entity used";
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 = String.Format("X:{0}, Y:{1}, Z:{2}", Math.Round(entity.Location.X, 2), Math.Round(entity.Location.Y, 2), Math.Round(entity.Location.Y, 2));
string done = String.Format("Entity: {0}\n [MCC] Type: {1}", id, type);
if (!String.IsNullOrEmpty(nickname))
done += String.Format("\n [MCC] Nickname: {0}", nickname);
else if (!String.IsNullOrEmpty(customname))
done += String.Format("\n [MCC] CustomName: {0}§8", customname.Replace("&", "§"));
if (type == EntityType.Player)
done += String.Format("\n [MCC] Latency: {0}", 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 += String.Format("\n [MCC] Item: {0} x{1}", item.Type, item.Count);
else
done += String.Format("\n [MCC] Item: {0} x{1} - {2}§8", item.Type, item.Count, displayName);
}
if (entity.Equipment.Count >= 1 && entity.Equipment != null)
{
done += String.Format("\n [MCC] Equipment:");
if (entity.Equipment.ContainsKey(0) && entity.Equipment[0] != null)
done += String.Format("\n [MCC] MainHand: {0} x{1}", entity.Equipment[0].Type, entity.Equipment[0].Count);
if (entity.Equipment.ContainsKey(1) && entity.Equipment[1] != null)
done += String.Format("\n [MCC] OffHand: {0} x{1}", entity.Equipment[1].Type, entity.Equipment[1].Count);
if (entity.Equipment.ContainsKey(5) && entity.Equipment[5] != null)
done += String.Format("\n [MCC] Helmet: {0} x{1}", entity.Equipment[5].Type, entity.Equipment[5].Count);
if (entity.Equipment.ContainsKey(4) && entity.Equipment[4] != null)
done += String.Format("\n [MCC] Chestplate: {0} x{1}", entity.Equipment[4].Type, entity.Equipment[4].Count);
if (entity.Equipment.ContainsKey(3) && entity.Equipment[3] != null)
done += String.Format("\n [MCC] Leggings: {0} x{1}", entity.Equipment[3].Type, entity.Equipment[3].Count);
if (entity.Equipment.ContainsKey(2) && entity.Equipment[2] != null)
done += String.Format("\n [MCC] Boots: {0} x{1}", entity.Equipment[2].Type, entity.Equipment[2].Count);
}
done += String.Format("\n [MCC] Pose: {0}", pose);
done += String.Format("\n [MCC] Health: {0}", color + health + "§8");
done += String.Format("\n [MCC] Distance: {0}", distance);
done += String.Format("\n [MCC] Location: {0}", location);
return done;
}
} }
else return "Entity not found";
} }
else else
{ {
EntityType interacttype = EntityType.Player; EntityType interacttype = EntityType.Player;
Enum.TryParse(args[0], out interacttype); Enum.TryParse(args[0], out interacttype);
Dictionary<int, Mapping.Entity> entities = handler.GetEntities();
string actionst = "Entity attacked"; string actionst = "Entity attacked";
int actioncount = 0; int actioncount = 0;
foreach (var entity2 in entities) foreach (var entity2 in handler.GetEntities())
{ {
if (entity2.Value.Type == interacttype) if (entity2.Value.Type == interacttype)
{ {
@ -81,12 +137,23 @@ namespace MinecraftClient.Commands
response.Add("Entities:"); response.Add("Entities:");
foreach (var entity2 in entities) foreach (var entity2 in entities)
{ {
if (entity2.Value.Type == EntityType.Item || entity2.Value.Type == EntityType.ItemFrame || entity2.Value.Type == Mapping.EntityType.EyeOfEnder || entity2.Value.Type == Mapping.EntityType.Egg || entity2.Value.Type == Mapping.EntityType.EnderPearl || entity2.Value.Type == Mapping.EntityType.Potion || entity2.Value.Type == Mapping.EntityType.Fireball || entity2.Value.Type == Mapping.EntityType.FireworkRocket) int id = entity2.Key;
response.Add(String.Format(" #{0}: Type: {1}, Item: {2}, Location: {3}", entity2.Key, entity2.Value.Type, entity2.Value.Item.Type, entity2.Value.Location)); float health = entity2.Value.Health;
else if (entity2.Value.Type == Mapping.EntityType.Player && entity2.Value.Name != string.Empty) int latency = entity2.Value.Latency;
response.Add(String.Format(" #{0}: Type: {1}, Nickname: {2}, Latency: {3}, Health: {4}, Pose: {5}, Location: {6}", entity2.Key, entity2.Value.Type, entity2.Value.Name, entity2.Value.Latency, entity2.Value.Health, entity2.Value.Pose, entity2.Value.Location)); string nickname = entity2.Value.Name;
string customname = entity2.Value.CustomName;
EntityPose pose = entity2.Value.Pose;
EntityType type = entity2.Value.Type;
string location = String.Format("X:{0}, Y:{1}, Z:{2}", Math.Round(entity2.Value.Location.X, 2), Math.Round(entity2.Value.Location.Y, 2), Math.Round(entity2.Value.Location.Y, 2));
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)
response.Add(String.Format(" #{0}: Type: {1}, Item: {2}, Location: {3}", id, type, entity2.Value.Item.Type, location));
else if (type == Mapping.EntityType.Player && !String.IsNullOrEmpty(nickname))
response.Add(String.Format(" #{0}: Type: {1}, Nickname: §8{2}§8, Latency: {3}, Health: {4}, Pose: {5}, Location: {6}", id, type, nickname, latency, health, pose, location));
else if (type == Mapping.EntityType.Player && !String.IsNullOrEmpty(customname))
response.Add(String.Format(" #{0}: Type: {1}, CustomName: §8{2}§8, Latency: {3}, Health: {4}, Pose: {5}, Location: {6}", id, type, customname.Replace("&", "§"), latency, health, pose, location));
else else
response.Add(String.Format(" #{0}: Type: {1}, Health: {2}, Location: {3}", entity2.Key, entity2.Value.Type, entity2.Value.Health, entity2.Value.Location)); response.Add(String.Format(" #{0}: Type: {1}, Health: {2}, Location: {3}", id, type, health, location));
} }
response.Add(CMDDesc); response.Add(CMDDesc);
return String.Join("\n", response); return String.Join("\n", response);

28
MinecraftClient/Inventory/Item.cs
View file

@ -70,7 +70,33 @@ namespace MinecraftClient.Inventory
return null; return null;
} }
} }
/// <summary>
/// Retrieve item lores from NBT properties. Returns null if no lores is defined.
/// </summary>
public string[] Lores
{
get
{
List<string> lores = new List<string>();
if (NBT != null && NBT.ContainsKey("display"))
{
var displayProperties = NBT["display"] as Dictionary<string, object>;
if (displayProperties != null && displayProperties.ContainsKey("Lore"))
{
object[] displayName = displayProperties["Lore"] as object[];
foreach (string st in displayName)
{
string str = MinecraftClient.Protocol.ChatParser.ParseText(st.ToString());
lores.Add(str);
}
return lores.ToArray();
}
}
return null;
}
}
/// <summary> /// <summary>
/// Retrieve item damage from NBT properties. Returns 0 if no damage is defined. /// Retrieve item damage from NBT properties. Returns 0 if no damage is defined.
/// </summary> /// </summary>

9
MinecraftClient/Mapping/Entity.cs
View file

@ -73,7 +73,12 @@ namespace MinecraftClient.Mapping
/// Entity metadata /// Entity metadata
/// </summary> /// </summary>
public Dictionary<int, object> Metadata; public Dictionary<int, object> Metadata;
/// <summary>
/// Entity equipment
/// </summary>
public Dictionary<int, Item> Equipment;
/// <summary> /// <summary>
/// Create a new entity based on Entity ID, Entity Type and location /// Create a new entity based on Entity ID, Entity Type and location
/// </summary> /// </summary>
@ -86,6 +91,7 @@ namespace MinecraftClient.Mapping
this.Type = type; this.Type = type;
this.Location = location; this.Location = location;
this.Health = 1.0f; this.Health = 1.0f;
this.Equipment = new Dictionary<int, Item>();
} }
/// <summary> /// <summary>
/// Create a new entity based on Entity ID, Entity Type, location, name and UUID /// Create a new entity based on Entity ID, Entity Type, location, name and UUID
@ -103,6 +109,7 @@ namespace MinecraftClient.Mapping
this.UUID = uuid; this.UUID = uuid;
this.Name = name; this.Name = name;
this.Health = 1.0f; this.Health = 1.0f;
this.Equipment = new Dictionary<int, Item>();
} }
} }
} }

5
MinecraftClient/McClient.cs
View file

@ -1877,6 +1877,11 @@ namespace MinecraftClient
{ {
if (entities.ContainsKey(entityid)) if (entities.ContainsKey(entityid))
{ {
Entity entity = entities[entityid];
if (entity.Equipment.ContainsKey(slot))
entity.Equipment.Remove(slot);
if (item != null)
entity.Equipment[slot] = item;
DispatchBotEvent(bot => bot.OnEntityEquipment(entities[entityid], slot, item)); DispatchBotEvent(bot => bot.OnEntityEquipment(entities[entityid], slot, item));
} }
} }