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

Add Window Confirmation

Browse source
This commit is contained in:
ReinforceZwei 2020-07-31 16:34:16 +08:00 • committed by ORelio
parent 83b8c65e50
commit beebe506d1
4 changed files with 45 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
MinecraftClient/Protocol/Handlers/PacketIncomingType.cs
View file

@ -33,6 +33,7 @@ namespace MinecraftClient.Protocol.Handlers
CloseWindow, CloseWindow,
OpenWindow, OpenWindow,
WindowItems, WindowItems,
WindowConfirmation,
SetSlot, SetSlot,
SpawnEntity, SpawnEntity,
SpawnLivingEntity, SpawnLivingEntity,

1
MinecraftClient/Protocol/Handlers/PacketOutgoingType.cs
View file

@ -30,6 +30,7 @@ namespace MinecraftClient.Protocol.Handlers
UseItem, UseItem,
ClickWindow, ClickWindow,
CloseWindow, CloseWindow,
WindowConfirmation,
PlayerBlockPlacement, PlayerBlockPlacement,
CreativeInventoryAction, CreativeInventoryAction,
Animation, Animation,

28
MinecraftClient/Protocol/Handlers/Protocol18.cs
View file

@ -695,6 +695,18 @@ namespace MinecraftClient.Protocol.Handlers
handler.OnSetSlot(windowID, slotID, item); handler.OnSetSlot(windowID, slotID, item);
} }
break; break;
case PacketIncomingType.WindowConfirmation:
if (handler.GetInventoryEnabled())
{
byte windowID = dataTypes.ReadNextByte(packetData);
short actionID = dataTypes.ReadNextShort(packetData);
bool accepted = dataTypes.ReadNextBool(packetData);
if (!accepted)
{
SendWindowConfirmation(windowID, actionID, accepted);
}
}
break;
case PacketIncomingType.ResourcePackSend: case PacketIncomingType.ResourcePackSend:
string url = dataTypes.ReadNextString(packetData); string url = dataTypes.ReadNextString(packetData);
string hash = dataTypes.ReadNextString(packetData); string hash = dataTypes.ReadNextString(packetData);
@ -1729,5 +1741,21 @@ namespace MinecraftClient.Protocol.Handlers
} }
else { return false; } else { return false; }
} }
public bool SendWindowConfirmation(byte windowID, short actionID, bool accepted)
{
try
{
List<byte> packet = new List<byte>();
packet.Add(windowID);
packet.AddRange(dataTypes.GetShort(actionID));
packet.Add(accepted ? (byte)1 : (byte)0);
SendPacket(PacketOutgoingType.WindowConfirmation, packet);
return true;
}
catch (SocketException) { return false; }
catch (System.IO.IOException) { return false; }
catch (ObjectDisposedException) { return false; }
}
} }
} }

15
MinecraftClient/Protocol/Handlers/Protocol18PacketTypes.cs
View file

@ -47,6 +47,7 @@ namespace MinecraftClient.Protocol.Handlers
case 0x2E: return PacketIncomingType.CloseWindow; case 0x2E: return PacketIncomingType.CloseWindow;
case 0x2D: return PacketIncomingType.OpenWindow; case 0x2D: return PacketIncomingType.OpenWindow;
case 0x30: return PacketIncomingType.WindowItems; case 0x30: return PacketIncomingType.WindowItems;
case 0x32: return PacketIncomingType.WindowConfirmation;
case 0x2F: return PacketIncomingType.SetSlot; case 0x2F: return PacketIncomingType.SetSlot;
case 0x0E: return PacketIncomingType.SpawnEntity; case 0x0E: return PacketIncomingType.SpawnEntity;
case 0x0F: return PacketIncomingType.SpawnLivingEntity; case 0x0F: return PacketIncomingType.SpawnLivingEntity;
@ -94,6 +95,7 @@ namespace MinecraftClient.Protocol.Handlers
case 0x12: return PacketIncomingType.CloseWindow; case 0x12: return PacketIncomingType.CloseWindow;
case 0x13: return PacketIncomingType.OpenWindow; case 0x13: return PacketIncomingType.OpenWindow;
case 0x14: return PacketIncomingType.WindowItems; case 0x14: return PacketIncomingType.WindowItems;
case 0x11: return PacketIncomingType.WindowConfirmation;
case 0x16: return PacketIncomingType.SetSlot; case 0x16: return PacketIncomingType.SetSlot;
case 0x00: return PacketIncomingType.SpawnEntity; case 0x00: return PacketIncomingType.SpawnEntity;
case 0x03: return PacketIncomingType.SpawnLivingEntity; case 0x03: return PacketIncomingType.SpawnLivingEntity;
@ -141,6 +143,7 @@ namespace MinecraftClient.Protocol.Handlers
case 0x12: return PacketIncomingType.CloseWindow; case 0x12: return PacketIncomingType.CloseWindow;
case 0x13: return PacketIncomingType.OpenWindow; case 0x13: return PacketIncomingType.OpenWindow;
case 0x14: return PacketIncomingType.WindowItems; case 0x14: return PacketIncomingType.WindowItems;
case 0x11: return PacketIncomingType.WindowConfirmation;
case 0x16: return PacketIncomingType.SetSlot; case 0x16: return PacketIncomingType.SetSlot;
case 0x00: return PacketIncomingType.SpawnEntity; case 0x00: return PacketIncomingType.SpawnEntity;
case 0x03: return PacketIncomingType.SpawnLivingEntity; case 0x03: return PacketIncomingType.SpawnLivingEntity;
@ -188,6 +191,7 @@ namespace MinecraftClient.Protocol.Handlers
case 0x12: return PacketIncomingType.CloseWindow; case 0x12: return PacketIncomingType.CloseWindow;
case 0x13: return PacketIncomingType.OpenWindow; case 0x13: return PacketIncomingType.OpenWindow;
case 0x14: return PacketIncomingType.WindowItems; case 0x14: return PacketIncomingType.WindowItems;
case 0x11: return PacketIncomingType.WindowConfirmation;
case 0x16: return PacketIncomingType.SetSlot; case 0x16: return PacketIncomingType.SetSlot;
case 0x00: return PacketIncomingType.SpawnEntity; case 0x00: return PacketIncomingType.SpawnEntity;
case 0x03: return PacketIncomingType.SpawnLivingEntity; case 0x03: return PacketIncomingType.SpawnLivingEntity;
@ -235,6 +239,7 @@ namespace MinecraftClient.Protocol.Handlers
case 0x13: return PacketIncomingType.CloseWindow; case 0x13: return PacketIncomingType.CloseWindow;
case 0x14: return PacketIncomingType.OpenWindow; case 0x14: return PacketIncomingType.OpenWindow;
case 0x15: return PacketIncomingType.WindowItems; case 0x15: return PacketIncomingType.WindowItems;
case 0x12: return PacketIncomingType.WindowConfirmation;
case 0x17: return PacketIncomingType.SetSlot; case 0x17: return PacketIncomingType.SetSlot;
case 0x00: return PacketIncomingType.SpawnEntity; case 0x00: return PacketIncomingType.SpawnEntity;
case 0x03: return PacketIncomingType.SpawnLivingEntity; case 0x03: return PacketIncomingType.SpawnLivingEntity;
@ -282,6 +287,7 @@ namespace MinecraftClient.Protocol.Handlers
case 0x13: return PacketIncomingType.CloseWindow; case 0x13: return PacketIncomingType.CloseWindow;
case 0x2E: return PacketIncomingType.OpenWindow; case 0x2E: return PacketIncomingType.OpenWindow;
case 0x14: return PacketIncomingType.WindowItems; case 0x14: return PacketIncomingType.WindowItems;
case 0x12: return PacketIncomingType.WindowConfirmation;
case 0x16: return PacketIncomingType.SetSlot; case 0x16: return PacketIncomingType.SetSlot;
case 0x00: return PacketIncomingType.SpawnEntity; case 0x00: return PacketIncomingType.SpawnEntity;
case 0x03: return PacketIncomingType.SpawnLivingEntity; case 0x03: return PacketIncomingType.SpawnLivingEntity;
@ -329,6 +335,7 @@ namespace MinecraftClient.Protocol.Handlers
case 0x14: return PacketIncomingType.CloseWindow; case 0x14: return PacketIncomingType.CloseWindow;
case 0x2F: return PacketIncomingType.OpenWindow; case 0x2F: return PacketIncomingType.OpenWindow;
case 0x15: return PacketIncomingType.WindowItems; case 0x15: return PacketIncomingType.WindowItems;
case 0x13: return PacketIncomingType.WindowConfirmation;
case 0x17: return PacketIncomingType.SetSlot; case 0x17: return PacketIncomingType.SetSlot;
case 0x00: return PacketIncomingType.SpawnEntity; case 0x00: return PacketIncomingType.SpawnEntity;
case 0x03: return PacketIncomingType.SpawnLivingEntity; case 0x03: return PacketIncomingType.SpawnLivingEntity;
@ -375,6 +382,7 @@ namespace MinecraftClient.Protocol.Handlers
case 0x13: return PacketIncomingType.CloseWindow; case 0x13: return PacketIncomingType.CloseWindow;
case 0x2E: return PacketIncomingType.OpenWindow; case 0x2E: return PacketIncomingType.OpenWindow;
case 0x14: return PacketIncomingType.WindowItems; case 0x14: return PacketIncomingType.WindowItems;
case 0x12: return PacketIncomingType.WindowConfirmation;
case 0x16: return PacketIncomingType.SetSlot; case 0x16: return PacketIncomingType.SetSlot;
case 0x00: return PacketIncomingType.SpawnEntity; case 0x00: return PacketIncomingType.SpawnEntity;
case 0x02: return PacketIncomingType.SpawnLivingEntity; case 0x02: return PacketIncomingType.SpawnLivingEntity;
@ -437,6 +445,7 @@ namespace MinecraftClient.Protocol.Handlers
case PacketOutgoingType.UseItem: throw new InvalidOperationException("Use item is not supported in protocol " + protocol); case PacketOutgoingType.UseItem: throw new InvalidOperationException("Use item is not supported in protocol " + protocol);
case PacketOutgoingType.ClickWindow: return 0x0E; case PacketOutgoingType.ClickWindow: return 0x0E;
case PacketOutgoingType.CloseWindow: return 0x0D; case PacketOutgoingType.CloseWindow: return 0x0D;
case PacketOutgoingType.WindowConfirmation: return 0x0f;
case PacketOutgoingType.PlayerBlockPlacement: return 0x08; case PacketOutgoingType.PlayerBlockPlacement: return 0x08;
case PacketOutgoingType.CreativeInventoryAction: return 0x10; case PacketOutgoingType.CreativeInventoryAction: return 0x10;
case PacketOutgoingType.Animation: return 0x0A; case PacketOutgoingType.Animation: return 0x0A;
@ -465,6 +474,7 @@ namespace MinecraftClient.Protocol.Handlers
case PacketOutgoingType.UseItem: return 0x1D; case PacketOutgoingType.UseItem: return 0x1D;
case PacketOutgoingType.ClickWindow: return 0x07; case PacketOutgoingType.ClickWindow: return 0x07;
case PacketOutgoingType.CloseWindow: return 0x08; case PacketOutgoingType.CloseWindow: return 0x08;
case PacketOutgoingType.WindowConfirmation: return 0x05;
case PacketOutgoingType.PlayerBlockPlacement: return 0x1C; case PacketOutgoingType.PlayerBlockPlacement: return 0x1C;
case PacketOutgoingType.CreativeInventoryAction: return 0x18; case PacketOutgoingType.CreativeInventoryAction: return 0x18;
case PacketOutgoingType.Animation: return 0x1A; case PacketOutgoingType.Animation: return 0x1A;
@ -493,6 +503,7 @@ namespace MinecraftClient.Protocol.Handlers
case PacketOutgoingType.UseItem: return 0x20; case PacketOutgoingType.UseItem: return 0x20;
case PacketOutgoingType.ClickWindow: return 0x07; case PacketOutgoingType.ClickWindow: return 0x07;
case PacketOutgoingType.CloseWindow: return 0x08; case PacketOutgoingType.CloseWindow: return 0x08;
case PacketOutgoingType.WindowConfirmation: return 0x06;
case PacketOutgoingType.PlayerBlockPlacement: return 0x1F; case PacketOutgoingType.PlayerBlockPlacement: return 0x1F;
case PacketOutgoingType.CreativeInventoryAction: return 0x1B; case PacketOutgoingType.CreativeInventoryAction: return 0x1B;
case PacketOutgoingType.Animation: return 0x1D; case PacketOutgoingType.Animation: return 0x1D;
@ -521,6 +532,7 @@ namespace MinecraftClient.Protocol.Handlers
case PacketOutgoingType.UseItem: return 0x20; case PacketOutgoingType.UseItem: return 0x20;
case PacketOutgoingType.ClickWindow: return 0x07; case PacketOutgoingType.ClickWindow: return 0x07;
case PacketOutgoingType.CloseWindow: return 0x08; case PacketOutgoingType.CloseWindow: return 0x08;
case PacketOutgoingType.WindowConfirmation: return 0x05;
case PacketOutgoingType.PlayerBlockPlacement: return 0x1F; case PacketOutgoingType.PlayerBlockPlacement: return 0x1F;
case PacketOutgoingType.CreativeInventoryAction: return 0x1B; case PacketOutgoingType.CreativeInventoryAction: return 0x1B;
case PacketOutgoingType.Animation: return 0x1D; case PacketOutgoingType.Animation: return 0x1D;
@ -549,6 +561,7 @@ namespace MinecraftClient.Protocol.Handlers
case PacketOutgoingType.UseItem: return 0x2A; case PacketOutgoingType.UseItem: return 0x2A;
case PacketOutgoingType.ClickWindow: return 0x08; case PacketOutgoingType.ClickWindow: return 0x08;
case PacketOutgoingType.CloseWindow: return 0x09; case PacketOutgoingType.CloseWindow: return 0x09;
case PacketOutgoingType.WindowConfirmation: return 0x06;
case PacketOutgoingType.PlayerBlockPlacement: return 0x29; case PacketOutgoingType.PlayerBlockPlacement: return 0x29;
case PacketOutgoingType.CreativeInventoryAction: return 0x24; case PacketOutgoingType.CreativeInventoryAction: return 0x24;
case PacketOutgoingType.Animation: return 0x27; case PacketOutgoingType.Animation: return 0x27;
@ -577,6 +590,7 @@ namespace MinecraftClient.Protocol.Handlers
case PacketOutgoingType.UseItem: return 0x2D; case PacketOutgoingType.UseItem: return 0x2D;
case PacketOutgoingType.ClickWindow: return 0x09; case PacketOutgoingType.ClickWindow: return 0x09;
case PacketOutgoingType.CloseWindow: return 0x0A; case PacketOutgoingType.CloseWindow: return 0x0A;
case PacketOutgoingType.WindowConfirmation: return 0x07;
case PacketOutgoingType.PlayerBlockPlacement: return 0x2C; case PacketOutgoingType.PlayerBlockPlacement: return 0x2C;
case PacketOutgoingType.CreativeInventoryAction: return 0x26; case PacketOutgoingType.CreativeInventoryAction: return 0x26;
case PacketOutgoingType.Animation: return 0x2A; case PacketOutgoingType.Animation: return 0x2A;
@ -605,6 +619,7 @@ namespace MinecraftClient.Protocol.Handlers
case PacketOutgoingType.UseItem: return 0x2E; case PacketOutgoingType.UseItem: return 0x2E;
case PacketOutgoingType.ClickWindow: return 0x09; case PacketOutgoingType.ClickWindow: return 0x09;
case PacketOutgoingType.CloseWindow: return 0x0A; case PacketOutgoingType.CloseWindow: return 0x0A;
case PacketOutgoingType.WindowConfirmation: return 0x07;
case PacketOutgoingType.PlayerBlockPlacement: return 0x2D; case PacketOutgoingType.PlayerBlockPlacement: return 0x2D;
case PacketOutgoingType.CreativeInventoryAction: return 0x27; case PacketOutgoingType.CreativeInventoryAction: return 0x27;
case PacketOutgoingType.Animation: return 0x2B; case PacketOutgoingType.Animation: return 0x2B;