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

Inventory handling

Browse source
This commit is contained in:
ReinforceZwei 2020-03-26 15:01:42 +08:00 • committed by ORelio
parent c870f080f2
commit bc449b404e
20 changed files with 538 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

91
MinecraftClient/McTcpClient.cs
View file

@ -10,6 +10,7 @@ using MinecraftClient.Protocol;
using MinecraftClient.Proxy;
using MinecraftClient.Protocol.Handlers.Forge;
using MinecraftClient.Mapping;
using MinecraftClient.Inventory;
namespace MinecraftClient
{
@ -26,7 +27,7 @@ namespace MinecraftClient
private readonly List<ChatBot> bots = new List<ChatBot>();
private static readonly List<ChatBot> botsOnHold = new List<ChatBot>();
private static List<Inventory> inventories = new List<Inventory>();
private static List<Container> inventories = new List<Container>();
private readonly Dictionary<string, List<ChatBot>> registeredBotPluginChannels = new Dictionary<string, List<ChatBot>>();
private readonly List<string> registeredServerPluginChannels = new List<String>();
@ -52,14 +53,14 @@ namespace MinecraftClient
private string username;
private string uuid;
private string sessionid;
private Inventory playerInventory;
private Container playerInventory = new Container(ContainerType.PlayerInventory);
private DateTime lastKeepAlive;
private object lastKeepAliveLock = new object();
private int playerEntityID;
// not really understand the Inventory Class
// so I use a Dict instead for player inventory
private Dictionary<int, Item> playerItems;
//private Dictionary<int, Inventory.Item> playerItems;
// Entity handling
private Dictionary<int, Entity> entities = new Dictionary<int, Entity>();
@ -567,9 +568,9 @@ namespace MinecraftClient
/// Get client player's inventory items
/// </summary>
/// <returns> Item Dictionary indexed by Slot ID (Check wiki.vg for slot ID)</returns>
public Dictionary<int, Item> GetPlayerInventory()
public Container GetPlayerInventory()
{
return playerItems;
return playerInventory;
}
// TODO: add command for displaying player inventory
@ -737,13 +738,14 @@ namespace MinecraftClient
/// When an inventory is opened
/// </summary>
/// <param name="inventory">Location to reach</param>
public void OnInventoryOpen(Inventory inventory)
public void OnInventoryOpen(Container inventory)
{
//TODO: Handle Inventory
if (!inventories.Contains(inventory))
{
inventories.Add(inventory);
}
ConsoleIO.WriteLine(inventory.Type.ToString());
}
/// <summary>
@ -754,9 +756,9 @@ namespace MinecraftClient
{
for (int i = 0; i < inventories.Count; i++)
{
Inventory inventory = inventories[i];
Container inventory = inventories[i];
if (inventory == null) continue;
if (inventory.id == inventoryID)
if (inventory.Type == Container.GetContainerType(inventoryID))
{
inventories.Remove(inventory);
return;
@ -769,11 +771,27 @@ namespace MinecraftClient
/// </summary>
/// <param name="type"></param>
/// <param name="itemList"></param>
public void OnWindowItems(int type, Dictionary<int, Item> itemList)
public void OnWindowItems(int type, Dictionary<int, Inventory.Item> itemList)
{
// 0 is player inventory
if (type == 0)
playerItems = itemList;
playerInventory.Items = itemList;
}
public void OnSetSlot(byte WindowID, short SlotID, bool Present)
{
if(WindowID == 0)
{
if (playerInventory.Items.ContainsKey(SlotID))
playerInventory.Items.Remove(SlotID);
}
}
public void OnSetSlot(byte WindowID, short SlotID, bool Present, int ItemID, byte Count, Dictionary<string, object> NBT)
{
if (WindowID == 0)
{
playerInventory.Items[SlotID] = new Inventory.Item(ItemID, Count, SlotID, NBT);
}
}
/// <summary>
@ -1081,12 +1099,12 @@ namespace MinecraftClient
/// Called when a non-living entity spawned (fishing hook, minecart, etc)
/// </summary>
/// <param name="EntityID"></param>
/// <param name="EntityType"></param>
/// <param name="TypeID"></param>
/// <param name="UUID"></param>
/// <param name="location"></param>
public void OnSpawnEntity(int EntityID, int EntityType, Guid UUID, Location location)
public void OnSpawnEntity(int EntityID, int TypeID, Guid UUID, Location location)
{
Entity entity = new Entity(EntityID, EntityType, location);
Entity entity = new Entity(EntityID, TypeID, EntityType.NonLivingThings, location);
entities.Add(EntityID, entity);
foreach (ChatBot bot in bots.ToArray())
bot.OnEntitySpawn(entity);
@ -1096,12 +1114,29 @@ namespace MinecraftClient
/// Called when an Entity was created/spawned.
/// </summary>
/// <param name="EntityID"></param>
/// <param name="EntityType"></param>
/// <param name="TypeID"></param>
/// <param name="UUID"></param>
/// <param name="location"></param>
public void OnSpawnLivingEntity(int EntityID, int EntityType, Guid UUID, Location location)
/// <remarks>Cannot determine is a Mob or a Cuty Animal</remarks>
public void OnSpawnLivingEntity(int EntityID, int TypeID, Guid UUID, Location location)
{
Entity entity = new Entity(EntityID, EntityType, location);
Entity entity = new Entity(EntityID, TypeID, EntityType.MobAndAnimal, location);
entities.Add(EntityID, entity);
foreach (ChatBot bot in bots.ToArray())
bot.OnEntitySpawn(entity);
}
/// <summary>
/// Called when a player was spawned/in the render distance
/// </summary>
/// <param name="EntityID"></param>
/// <param name="UUID"></param>
/// <param name="location"></param>
/// <param name="Yaw"></param>
/// <param name="Pitch"></param>
public void OnSpawnPlayer(int EntityID, Guid UUID, Location location, byte Yaw, byte Pitch)
{
Entity entity = new Entity(EntityID, EntityType.Player, location);
entities.Add(EntityID, entity);
foreach (ChatBot bot in bots.ToArray())
bot.OnEntitySpawn(entity);
@ -1118,7 +1153,7 @@ namespace MinecraftClient
if (entities.ContainsKey(a))
{
foreach (ChatBot bot in bots.ToArray())
bot.OnEntityDespawn(new Entity(entities[a].ID, entities[a].Type, entities[a].Location));
bot.OnEntityDespawn(new Entity(entities[a].ID, entities[a].TypeID, entities[a].Type, entities[a].Location));
entities.Remove(a);
}
}
@ -1143,7 +1178,7 @@ namespace MinecraftClient
entities[EntityID].Location = L;
foreach (ChatBot bot in bots.ToArray())
bot.OnEntityMove(new Entity(entities[EntityID].ID, entities[EntityID].Type, entities[EntityID].Location));
bot.OnEntityMove(new Entity(entities[EntityID].ID, entities[EntityID].TypeID, entities[EntityID].Type, entities[EntityID].Location));
}
}
@ -1163,7 +1198,7 @@ namespace MinecraftClient
entities[EntityID].Location = location;
foreach (ChatBot bot in bots.ToArray())
bot.OnEntityMove(new Entity(entities[EntityID].ID, entities[EntityID].Type, entities[EntityID].Location));
bot.OnEntityMove(new Entity(entities[EntityID].ID, entities[EntityID].TypeID, entities[EntityID].Type, entities[EntityID].Location));
}
}
@ -1236,5 +1271,23 @@ namespace MinecraftClient
{
return handler.SendInteractEntityPacket(EntityID, type);
}
// not work :(
public bool PlaceBlock(Location location)
{
ConsoleIO.WriteLine(location.ToString());
return handler.SendPlayerBlockPlacement(0, location, 1, 0.5f, 0.5f, 0.5f, false);
}
public bool ChangeSlot(short slot)
{
if (slot >= 0 && slot <= 8)
{
return handler.SendHeldItemChange(slot);
}
else
{
return false;
}
}
}
}