mirror of
https://github.com/MCCTeam/Minecraft-Console-Client
synced 2025-11-07 17:36:07 +00:00
Fully implemented Map Data packet.
This commit is contained in:
Milutinke
parent
59e02c2da9
commit
f47c240920
6 changed files with 175 additions and 61 deletions
|
|
@ -156,7 +156,7 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
entityPalette = new EntityPalette114();
|
||||
else if (protocolVersion >= MC_1_13_Version)
|
||||
entityPalette = new EntityPalette113();
|
||||
else
|
||||
else
|
||||
entityPalette = new EntityPalette112();
|
||||
|
||||
// Item palette
|
||||
|
|
@ -173,7 +173,7 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
itemPalette = new ItemPalette1162();
|
||||
else if (protocolVersion >= MC_1_16_1_Version)
|
||||
itemPalette = new ItemPalette1161();
|
||||
else
|
||||
else
|
||||
itemPalette = new ItemPalette115();
|
||||
|
||||
// MessageType
|
||||
|
|
@ -586,7 +586,7 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
byte[] bodyDigest = dataTypes.ReadNextByteArray(packetData);
|
||||
|
||||
bool verifyResult;
|
||||
|
||||
|
||||
if (!isOnlineMode)
|
||||
verifyResult = false;
|
||||
else if (senderUUID == handler.GetUserUuid())
|
||||
|
|
@ -594,7 +594,7 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
else
|
||||
{
|
||||
PlayerInfo? player = handler.GetPlayerInfo(senderUUID);
|
||||
|
||||
|
||||
if (player == null || !player.IsMessageChainLegal())
|
||||
verifyResult = false;
|
||||
else
|
||||
|
|
@ -783,7 +783,7 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
case PacketTypesIn.MapData:
|
||||
int mapid = dataTypes.ReadNextVarInt(packetData);
|
||||
byte scale = dataTypes.ReadNextByte(packetData);
|
||||
bool trackingposition = protocolVersion >= MC_1_17_Version ? false : dataTypes.ReadNextBool(packetData);
|
||||
bool trackingPosition = protocolVersion >= MC_1_17_Version ? false : dataTypes.ReadNextBool(packetData);
|
||||
bool locked = false;
|
||||
if (protocolVersion >= MC_1_14_Version)
|
||||
{
|
||||
|
|
@ -791,10 +791,48 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
}
|
||||
if (protocolVersion >= MC_1_17_Version)
|
||||
{
|
||||
trackingposition = dataTypes.ReadNextBool(packetData);
|
||||
trackingPosition = dataTypes.ReadNextBool(packetData);
|
||||
}
|
||||
int iconcount = dataTypes.ReadNextVarInt(packetData);
|
||||
handler.OnMapData(mapid, scale, trackingposition, locked, iconcount);
|
||||
|
||||
int iconcount = 0;
|
||||
List<MapIcon> icons = new();
|
||||
|
||||
if (trackingPosition)
|
||||
{
|
||||
iconcount = dataTypes.ReadNextVarInt(packetData);
|
||||
|
||||
for (int i = 0; i < iconcount; i++)
|
||||
{
|
||||
MapIcon mapIcon = new();
|
||||
|
||||
mapIcon.Type = (MapIconType)dataTypes.ReadNextVarInt(packetData);
|
||||
mapIcon.X = dataTypes.ReadNextByte(packetData);
|
||||
mapIcon.Z = dataTypes.ReadNextByte(packetData);
|
||||
mapIcon.Direction = dataTypes.ReadNextByte(packetData);
|
||||
bool mapIconHasDisplayName = dataTypes.ReadNextBool(packetData);
|
||||
|
||||
if (mapIconHasDisplayName)
|
||||
mapIcon.DisplayName = ChatParser.ParseText(dataTypes.ReadNextString(packetData));
|
||||
|
||||
icons.Add(mapIcon);
|
||||
}
|
||||
}
|
||||
|
||||
byte columnsUpdated = dataTypes.ReadNextByte(packetData); // width
|
||||
byte rowsUpdated = 0; // height
|
||||
byte mapCoulmnX = 0;
|
||||
byte mapRowZ = 0;
|
||||
byte[]? colors = null;
|
||||
|
||||
if (columnsUpdated > 0)
|
||||
{
|
||||
rowsUpdated = dataTypes.ReadNextByte(packetData); // height
|
||||
mapCoulmnX = dataTypes.ReadNextByte(packetData);
|
||||
mapRowZ = dataTypes.ReadNextByte(packetData);
|
||||
colors = dataTypes.ReadNextByteArray(packetData);
|
||||
}
|
||||
|
||||
handler.OnMapData(mapid, scale, trackingPosition, locked, icons, columnsUpdated, rowsUpdated, mapCoulmnX, mapRowZ, colors);
|
||||
break;
|
||||
case PacketTypesIn.TradeList:
|
||||
if ((protocolVersion >= MC_1_14_Version) && (handler.GetInventoryEnabled()))
|
||||
|
|
@ -1365,7 +1403,7 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
{
|
||||
int entityid = dataTypes.ReadNextVarInt(packetData);
|
||||
Inventory.Effects effect = Effects.Speed;
|
||||
int effectId = protocolVersion >= MC_1_18_2_Version ?
|
||||
int effectId = protocolVersion >= MC_1_18_2_Version ?
|
||||
dataTypes.ReadNextVarInt(packetData) : dataTypes.ReadNextByte(packetData);
|
||||
if (Enum.TryParse(effectId.ToString(), out effect))
|
||||
{
|
||||
|
|
@ -1657,7 +1695,8 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
{
|
||||
netMain.Item2.Cancel();
|
||||
}
|
||||
if (netReader != null){
|
||||
if (netReader != null)
|
||||
{
|
||||
netReader.Item2.Cancel();
|
||||
socketWrapper.Disconnect();
|
||||
}
|
||||
|
|
@ -2192,7 +2231,7 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
DateTimeOffset timeNow = DateTimeOffset.UtcNow;
|
||||
fields.AddRange(dataTypes.GetLong(timeNow.ToUnixTimeMilliseconds()));
|
||||
|
||||
List<Tuple<string, string>>? needSigned =
|
||||
List<Tuple<string, string>>? needSigned =
|
||||
playerKeyPair != null ? CollectCommandArguments(command) : null; // List< Argument Name, Argument Value >
|
||||
if (needSigned == null || needSigned!.Count == 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ namespace MinecraftClient.Protocol
|
|||
/// This method is called when the protocol handler receives a title
|
||||
/// </summary>
|
||||
void OnTitle(int action, string titletext, string subtitletext, string actionbartext, int fadein, int stay, int fadeout, string json);
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Called when receiving a connection keep-alive from the server
|
||||
/// </summary>
|
||||
|
|
@ -216,7 +216,7 @@ namespace MinecraftClient.Protocol
|
|||
/// </summary>
|
||||
/// <param name="entity">Spawned entity</param>
|
||||
void OnSpawnEntity(Entity entity);
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Called when an entity has spawned
|
||||
/// </summary>
|
||||
|
|
@ -224,7 +224,7 @@ namespace MinecraftClient.Protocol
|
|||
/// <param name="slot">Equipment slot. 0: main hand, 1: off hand, 2–5: armor slot (2: boots, 3: leggings, 4: chestplate, 5: helmet)/param>
|
||||
/// <param name="item">Item/param>
|
||||
void OnEntityEquipment(int entityid, int slot, Item item);
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Called when a player spawns or enters the client's render distance
|
||||
/// </summary>
|
||||
|
|
@ -312,7 +312,7 @@ namespace MinecraftClient.Protocol
|
|||
/// <param name="entityID">Entity ID</param>
|
||||
/// <param name="health">The health of the entity</param>
|
||||
void OnEntityHealth(int entityID, float health);
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Called when entity metadata or metadata changed.
|
||||
/// </summary>
|
||||
|
|
@ -334,14 +334,14 @@ namespace MinecraftClient.Protocol
|
|||
/// <param name="uuid">Affected player's UUID</param>
|
||||
/// <param name="gamemode">New game mode</param>
|
||||
void OnGamemodeUpdate(Guid uuid, int gamemode);
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Called when a player's latency has changed
|
||||
/// </summary>
|
||||
/// <param name="uuid">Affected player's UUID</param>
|
||||
/// <param name="latency">latency</param>
|
||||
void OnLatencyUpdate(Guid uuid, int latency);
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Called when Experience bar is updated
|
||||
/// </summary>
|
||||
|
|
@ -356,17 +356,23 @@ namespace MinecraftClient.Protocol
|
|||
/// <remarks>Used for setting player slot after joining game</remarks>
|
||||
/// <param name="slot"></param>
|
||||
void OnHeldItemChange(byte slot);
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Called map data
|
||||
/// Called when an update of the map is sent by the server, take a look at https://wiki.vg/Protocol#Map_Data for more info on the fields
|
||||
/// Map format and colors: https://minecraft.fandom.com/wiki/Map_item_format
|
||||
/// </summary>
|
||||
/// <param name="mapid"></param>
|
||||
/// <param name="scale"></param>
|
||||
/// <param name="trackingposition"></param>
|
||||
/// <param name="locked"></param>
|
||||
/// <param name="iconcount"></param>
|
||||
void OnMapData(int mapid, byte scale, bool trackingposition, bool locked, int iconcount);
|
||||
|
||||
/// <param name="mapid">Map ID of the map being modified</param>
|
||||
/// <param name="scale">A scale of the Map, from 0 for a fully zoomed-in map (1 block per pixel) to 4 for a fully zoomed-out map (16 blocks per pixel)</param>
|
||||
/// <param name="trackingposition">Specifies whether player and item frame icons are shown </param>
|
||||
/// <param name="locked">True if the map has been locked in a cartography table </param>
|
||||
/// <param name="icons">A list of MapIcon objects of map icons, send only if trackingPosition is true</param>
|
||||
/// <param name="columnsUpdated">Numbs of columns that were updated (map width) (NOTE: If it is 0, the next fields are not used/are set to default values of 0 and null respectively)</param>
|
||||
/// <param name="rowsUpdated">Map height</param>
|
||||
/// <param name="mapCoulmnX">x offset of the westernmost column</param>
|
||||
/// <param name="mapRowZ">z offset of the northernmost row</param>
|
||||
/// <param name="colors">a byte array of colors on the map</param>
|
||||
void OnMapData(int mapid, byte scale, bool trackingPosition, bool locked, List<MapIcon> icons, byte columnsUpdated, byte rowsUpdated, byte mapCoulmnX, byte mapRowZ, byte[]? colors);
|
||||
|
||||
/// <summary>
|
||||
/// Called when the Player entity ID has been received from the server
|
||||
/// </summary>
|
||||
|
|
@ -393,7 +399,7 @@ namespace MinecraftClient.Protocol
|
|||
/// <param name="objectivevalue">Only if mode is 0 or 2. The text to be displayed for the score</param>
|
||||
/// <param name="type">Only if mode is 0 or 2. 0 = "integer", 1 = "hearts".</param>
|
||||
void OnScoreboardObjective(string objectivename, byte mode, string objectivevalue, int type);
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Called when DisplayScoreboard
|
||||
/// </summary>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue