mirror of
https://github.com/MCCTeam/Minecraft-Console-Client
synced 2025-10-14 21:22:49 +00:00
Implemented 1.19.4, fixed multiple bugs in multiple versions
- Implemented 1.19.4 - Changed the Entity Metadata Code to use Palettes (1.13 - 1.19.4 supported) - Implemented Particles Reading code for 1.13 - 1.19.4 - Fixed Elytra flyby crashing the bot when rocket was used (incorrect particles reading cause this) - Fixed a crash on 1.15.X - Fixed a crash on 1.14.X
This commit is contained in:
Anon
GitHub
commit
f467f4d6e4
23 changed files with 4963 additions and 572 deletions
|
|
@ -188,6 +188,7 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
y = (int)((locEncoded >> 26) & 0xFFF);
|
||||
z = (int)(locEncoded << 38 >> 38);
|
||||
}
|
||||
|
||||
if (x >= 0x02000000) // 33,554,432
|
||||
x -= 0x04000000; // 67,108,864
|
||||
if (y >= 0x00000800) // 2,048
|
||||
|
|
@ -309,6 +310,7 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
if (j > 5) throw new OverflowException("VarInt too big");
|
||||
if ((b & 0x80) != 128) break;
|
||||
}
|
||||
|
||||
return i;
|
||||
}
|
||||
|
||||
|
|
@ -329,6 +331,7 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
i |= (b & 0x7F) << j++ * 7;
|
||||
if (j > 5) throw new OverflowException("VarInt too big");
|
||||
} while ((b & 0x80) == 128);
|
||||
|
||||
return i;
|
||||
}
|
||||
|
||||
|
|
@ -360,6 +363,7 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
low &= 0x7FFF;
|
||||
high = ReadNextByte(cache);
|
||||
}
|
||||
|
||||
return ((high & 0xFF) << 15) | low;
|
||||
}
|
||||
|
||||
|
|
@ -385,6 +389,7 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
throw new OverflowException("VarLong is too big");
|
||||
}
|
||||
} while ((read & 0x80) != 0);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
@ -413,13 +418,18 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
/// <returns>The item that was read or NULL for an empty slot</returns>
|
||||
public Item? ReadNextItemSlot(Queue<byte> cache, ItemPalette itemPalette)
|
||||
{
|
||||
// MC 1.13.2 and greater
|
||||
if (protocolversion > Protocol18Handler.MC_1_13_Version)
|
||||
{
|
||||
// MC 1.13 and greater
|
||||
bool itemPresent = ReadNextBool(cache);
|
||||
if (itemPresent)
|
||||
{
|
||||
ItemType type = itemPalette.FromId(ReadNextVarInt(cache));
|
||||
int itemID = ReadNextVarInt(cache);
|
||||
|
||||
if (itemID == -1)
|
||||
return null;
|
||||
|
||||
ItemType type = itemPalette.FromId(itemID);
|
||||
byte itemCount = ReadNextByte(cache);
|
||||
Dictionary<string, object> nbt = ReadNextNbt(cache);
|
||||
return new Item(type, itemCount, nbt);
|
||||
|
|
@ -428,12 +438,17 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
}
|
||||
else
|
||||
{
|
||||
// MC 1.12.2 and lower
|
||||
// MC 1.13 and lower
|
||||
short itemID = ReadNextShort(cache);
|
||||
|
||||
if (itemID == -1)
|
||||
return null;
|
||||
|
||||
byte itemCount = ReadNextByte(cache);
|
||||
short itemDamage = ReadNextShort(cache);
|
||||
|
||||
if(protocolversion < Protocol18Handler.MC_1_13_Version)
|
||||
ReadNextShort(cache);
|
||||
|
||||
Dictionary<string, object> nbt = ReadNextNbt(cache);
|
||||
return new Item(itemPalette.FromId(itemID), itemCount, nbt);
|
||||
}
|
||||
|
|
@ -487,7 +502,8 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
short velocityY = ReadNextShort(cache);
|
||||
short velocityZ = ReadNextShort(cache);
|
||||
|
||||
return new Entity(entityID, entityType, new Location(entityX, entityY, entityZ), entityYaw, entityPitch, metadata);
|
||||
return new Entity(entityID, entityType, new Location(entityX, entityY, entityZ), entityYaw, entityPitch,
|
||||
metadata);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -504,6 +520,7 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
cache.Dequeue();
|
||||
return nbtData;
|
||||
}
|
||||
|
||||
if (cache.Peek() != 10) // TAG_Compound
|
||||
throw new System.IO.InvalidDataException("Failed to decode NBT: Does not start with TAG_Compound");
|
||||
ReadNextByte(cache); // Tag type (TAG_Compound)
|
||||
|
|
@ -582,74 +599,62 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
}
|
||||
}
|
||||
|
||||
public Dictionary<int, object?> ReadNextMetadata(Queue<byte> cache, ItemPalette itemPalette)
|
||||
//TODO: Refactor this to use new Entity Metadata Palettes
|
||||
public Dictionary<int, object?> ReadNextMetadata(Queue<byte> cache, ItemPalette itemPalette, EntityMetadataPalette metadataPalette)
|
||||
{
|
||||
if (protocolversion <= Protocol18Handler.MC_1_8_Version)
|
||||
throw new NotImplementedException(); // Require sepcial implementation
|
||||
|
||||
Dictionary<int, object?> data = new();
|
||||
byte key = ReadNextByte(cache);
|
||||
|
||||
while (key != 0xff)
|
||||
{
|
||||
int type = ReadNextVarInt(cache);
|
||||
int typeId = ReadNextVarInt(cache);
|
||||
EntityMetaDataType type;
|
||||
try
|
||||
{
|
||||
type = metadataPalette.GetDataType(typeId);
|
||||
}
|
||||
catch (KeyNotFoundException)
|
||||
{
|
||||
throw new System.IO.InvalidDataException("Unknown Metadata Type ID " + typeId + ". Is this up to date for new MC Version?");
|
||||
}
|
||||
|
||||
// Value's data type is depended on Type
|
||||
object? value = null;
|
||||
|
||||
// starting from 1.13, Optional Chat is inserted as number 5 in 1.13 and IDs after 5 got shifted.
|
||||
// Increase type ID by 1 if
|
||||
// - below 1.13
|
||||
// - type ID larger than 4
|
||||
if (protocolversion < Protocol18Handler.MC_1_13_Version)
|
||||
{
|
||||
if (type > 4)
|
||||
++type;
|
||||
}
|
||||
else if (protocolversion >= Protocol18Handler.MC_1_19_3_Version)
|
||||
{
|
||||
if (type == 2)
|
||||
{
|
||||
value = ReadNextVarLong(cache);
|
||||
type = -1;
|
||||
}
|
||||
else if (type >= 3)
|
||||
{
|
||||
--type;
|
||||
}
|
||||
}
|
||||
|
||||
// This is backward compatible since new type is appended to the end
|
||||
// Version upgrade note
|
||||
// - Check type ID got shifted or not
|
||||
// - Add new type if any
|
||||
switch (type)
|
||||
{
|
||||
case -1: // already readed
|
||||
break;
|
||||
case 0: // byte
|
||||
case EntityMetaDataType.Byte: // byte
|
||||
value = ReadNextByte(cache);
|
||||
break;
|
||||
case 1: // VarInt
|
||||
case EntityMetaDataType.VarInt: // VarInt
|
||||
value = ReadNextVarInt(cache);
|
||||
break;
|
||||
case 2: // Float
|
||||
case EntityMetaDataType.VarLong: // Long
|
||||
value = ReadNextVarLong(cache);
|
||||
break;
|
||||
case EntityMetaDataType.Float: // Float
|
||||
value = ReadNextFloat(cache);
|
||||
break;
|
||||
case 3: // String
|
||||
case EntityMetaDataType.String: // String
|
||||
value = ReadNextString(cache);
|
||||
break;
|
||||
case 4: // Chat
|
||||
case EntityMetaDataType.Chat: // Chat
|
||||
value = ReadNextString(cache);
|
||||
break;
|
||||
case 5: // Optional Chat
|
||||
case EntityMetaDataType.OptionalChat: // Optional Chat
|
||||
if (ReadNextBool(cache))
|
||||
value = ReadNextString(cache);
|
||||
break;
|
||||
case 6: // Slot
|
||||
case EntityMetaDataType.Slot: // Slot
|
||||
value = ReadNextItemSlot(cache, itemPalette);
|
||||
break;
|
||||
case 7: // Boolean
|
||||
case EntityMetaDataType.Boolean: // Boolean
|
||||
value = ReadNextBool(cache);
|
||||
break;
|
||||
case 8: // Rotation (3x floats)
|
||||
case EntityMetaDataType.Rotation: // Rotation (3x floats)
|
||||
value = new List<float>
|
||||
{
|
||||
ReadNextFloat(cache),
|
||||
|
|
@ -657,103 +662,38 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
ReadNextFloat(cache)
|
||||
};
|
||||
break;
|
||||
case 9: // Position
|
||||
case EntityMetaDataType.Position: // Position
|
||||
value = ReadNextLocation(cache);
|
||||
break;
|
||||
case 10: // Optional Position
|
||||
case EntityMetaDataType.OptionalPosition: // Optional Position
|
||||
if (ReadNextBool(cache))
|
||||
{
|
||||
value = ReadNextLocation(cache);
|
||||
}
|
||||
break;
|
||||
case 11: // Direction (VarInt)
|
||||
case EntityMetaDataType.Direction: // Direction (VarInt)
|
||||
value = ReadNextVarInt(cache);
|
||||
break;
|
||||
case 12: // Optional UUID
|
||||
case EntityMetaDataType.OptionalUuid: // Optional UUID
|
||||
if (ReadNextBool(cache))
|
||||
{
|
||||
value = ReadNextUUID(cache);
|
||||
}
|
||||
break;
|
||||
case 13: // Optional BlockID (VarInt)
|
||||
case EntityMetaDataType.BlockId: // BlockID (VarInt)
|
||||
value = ReadNextVarInt(cache);
|
||||
break;
|
||||
case 14: // NBT
|
||||
case EntityMetaDataType.OptionalBlockId: // Optional BlockID (VarInt)
|
||||
value = ReadNextVarInt(cache);
|
||||
break;
|
||||
case EntityMetaDataType.Nbt: // NBT
|
||||
value = ReadNextNbt(cache);
|
||||
break;
|
||||
case 15: // Particle
|
||||
// Currecutly not handled. Reading data only
|
||||
int ParticleID = ReadNextVarInt(cache);
|
||||
// Need to check the exact version where the change occurred!!!!!
|
||||
if (protocolversion >= Protocol18Handler.MC_1_19_3_Version)
|
||||
{
|
||||
switch (ParticleID)
|
||||
{
|
||||
case 2:
|
||||
ReadNextVarInt(cache);
|
||||
break;
|
||||
case 3:
|
||||
ReadNextVarInt(cache);
|
||||
break;
|
||||
case 14:
|
||||
ReadNextFloat(cache);
|
||||
ReadNextFloat(cache);
|
||||
ReadNextFloat(cache);
|
||||
ReadNextFloat(cache);
|
||||
break;
|
||||
case 15:
|
||||
ReadNextFloat(cache);
|
||||
ReadNextFloat(cache);
|
||||
ReadNextFloat(cache);
|
||||
ReadNextFloat(cache);
|
||||
ReadNextFloat(cache);
|
||||
ReadNextFloat(cache);
|
||||
ReadNextFloat(cache);
|
||||
break;
|
||||
case 24:
|
||||
ReadNextVarInt(cache);
|
||||
break;
|
||||
case 35:
|
||||
ReadNextItemSlot(cache, itemPalette);
|
||||
break;
|
||||
case 36:
|
||||
string positionSourceType = ReadNextString(cache);
|
||||
if (positionSourceType == "minecraft:block")
|
||||
{
|
||||
ReadNextLocation(cache);
|
||||
}
|
||||
else if (positionSourceType == "minecraft:entity")
|
||||
{
|
||||
ReadNextVarInt(cache);
|
||||
ReadNextFloat(cache);
|
||||
}
|
||||
ReadNextVarInt(cache);
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
switch (ParticleID)
|
||||
{
|
||||
case 3:
|
||||
ReadNextVarInt(cache);
|
||||
break;
|
||||
case 14:
|
||||
ReadNextFloat(cache);
|
||||
ReadNextFloat(cache);
|
||||
ReadNextFloat(cache);
|
||||
ReadNextFloat(cache);
|
||||
break;
|
||||
case 23:
|
||||
ReadNextVarInt(cache);
|
||||
break;
|
||||
case 32:
|
||||
ReadNextItemSlot(cache, itemPalette);
|
||||
break;
|
||||
}
|
||||
}
|
||||
case EntityMetaDataType.Particle: // Particle
|
||||
// Skip data only, not used
|
||||
ReadParticleData(cache, itemPalette);
|
||||
break;
|
||||
case 16: // Villager Data (3x VarInt)
|
||||
case EntityMetaDataType.VillagerData: // Villager Data (3x VarInt)
|
||||
value = new List<int>
|
||||
{
|
||||
ReadNextVarInt(cache),
|
||||
|
|
@ -761,42 +701,223 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
ReadNextVarInt(cache)
|
||||
};
|
||||
break;
|
||||
case 17: // Optional VarInt
|
||||
case EntityMetaDataType.OptionalVarInt: // Optional VarInt
|
||||
if (ReadNextBool(cache))
|
||||
{
|
||||
value = ReadNextVarInt(cache);
|
||||
}
|
||||
break;
|
||||
case 18: // Pose
|
||||
case EntityMetaDataType.Pose: // Pose
|
||||
value = ReadNextVarInt(cache);
|
||||
break;
|
||||
case 19: // Cat Variant
|
||||
case EntityMetaDataType.CatVariant: // Cat Variant
|
||||
value = ReadNextVarInt(cache);
|
||||
break;
|
||||
case 20: // Frog Varint
|
||||
case EntityMetaDataType.FrogVariant: // Frog Varint
|
||||
value = ReadNextVarInt(cache);
|
||||
break;
|
||||
case 21: // GlobalPos at 1.19.2+; Painting Variant at 1.19-
|
||||
if (protocolversion <= Protocol18Handler.MC_1_19_Version)
|
||||
value = ReadNextVarInt(cache);
|
||||
else
|
||||
case EntityMetaDataType.GlobalPosition: // GlobalPos
|
||||
// Dimension and blockPos, currently not in use
|
||||
value = new Tuple<string, Location>(ReadNextString(cache), ReadNextLocation(cache));
|
||||
break;
|
||||
case EntityMetaDataType.OptionalGlobalPosition:
|
||||
// FIXME: wiki.vg is bool + string + location
|
||||
// but minecraft-data is bool + string
|
||||
if (ReadNextBool(cache))
|
||||
{
|
||||
// Dimension and blockPos, currently not in use
|
||||
value = new Tuple<string, Location>(ReadNextString(cache), ReadNextLocation(cache));
|
||||
}
|
||||
break;
|
||||
case 22: // Painting Variant
|
||||
case EntityMetaDataType.PaintingVariant: // Painting Variant
|
||||
value = ReadNextVarInt(cache);
|
||||
break;
|
||||
default:
|
||||
throw new System.IO.InvalidDataException("Unknown Metadata Type ID " + type + ". Is this up to date for new MC Version?");
|
||||
case EntityMetaDataType.SnifferState: // Sniffer state
|
||||
value = ReadNextVarInt(cache);
|
||||
break;
|
||||
case EntityMetaDataType.Vector3: // Vector 3f
|
||||
value = new List<float>
|
||||
{
|
||||
ReadNextFloat(cache),
|
||||
ReadNextFloat(cache),
|
||||
ReadNextFloat(cache)
|
||||
};
|
||||
break;
|
||||
case EntityMetaDataType.Quaternion: // Quaternion
|
||||
value = new List<float>
|
||||
{
|
||||
ReadNextFloat(cache),
|
||||
ReadNextFloat(cache),
|
||||
ReadNextFloat(cache),
|
||||
ReadNextFloat(cache)
|
||||
};
|
||||
break;
|
||||
}
|
||||
|
||||
data[key] = value;
|
||||
key = ReadNextByte(cache);
|
||||
}
|
||||
return data;
|
||||
}
|
||||
|
||||
// Currently not handled. Reading data only
|
||||
protected void ReadParticleData(Queue<byte> cache, ItemPalette itemPalette)
|
||||
{
|
||||
if (protocolversion < Protocol18Handler.MC_1_13_Version)
|
||||
return;
|
||||
|
||||
int ParticleID = ReadNextVarInt(cache);
|
||||
|
||||
// Refernece:
|
||||
// 1.19.3 - https://wiki.vg/index.php?title=Data_types&oldid=17986
|
||||
// 1.18 - https://wiki.vg/index.php?title=Data_types&oldid=17180
|
||||
// 1.17 - https://wiki.vg/index.php?title=Data_types&oldid=16740
|
||||
// 1.15 - https://wiki.vg/index.php?title=Data_types&oldid=15338
|
||||
// 1.13 - https://wiki.vg/index.php?title=Data_types&oldid=14271
|
||||
|
||||
switch (ParticleID)
|
||||
{
|
||||
case 2:
|
||||
// 1.18 +
|
||||
if (protocolversion > Protocol18Handler.MC_1_17_1_Version)
|
||||
ReadNextVarInt(cache); // Block state (minecraft:block)
|
||||
break;
|
||||
case 3:
|
||||
if (protocolversion < Protocol18Handler.MC_1_17_Version
|
||||
|| protocolversion > Protocol18Handler.MC_1_17_1_Version)
|
||||
ReadNextVarInt(cache); // Block State (minecraft:block before 1.18, minecraft:block_marker after 1.18)
|
||||
break;
|
||||
case 4:
|
||||
if (protocolversion == Protocol18Handler.MC_1_17_Version
|
||||
|| protocolversion == Protocol18Handler.MC_1_17_1_Version)
|
||||
ReadNextVarInt(cache); // Block State (minecraft:block)
|
||||
break;
|
||||
case 11:
|
||||
// 1.13 - 1.14.4
|
||||
if (protocolversion < Protocol18Handler.MC_1_15_Version)
|
||||
ReadDustParticle(cache);
|
||||
break;
|
||||
case 14:
|
||||
// 1.15 - 1.16.5 and 1.18 - 1.19.4
|
||||
if ((protocolversion >= Protocol18Handler.MC_1_15_Version && protocolversion < Protocol18Handler.MC_1_17_Version)
|
||||
|| protocolversion > Protocol18Handler.MC_1_17_1_Version)
|
||||
ReadDustParticle(cache);
|
||||
break;
|
||||
case 15:
|
||||
if (protocolversion == Protocol18Handler.MC_1_17_Version || protocolversion == Protocol18Handler.MC_1_17_1_Version)
|
||||
ReadDustParticle(cache);
|
||||
else
|
||||
{
|
||||
if (protocolversion > Protocol18Handler.MC_1_17_1_Version)
|
||||
ReadDustParticleColorTransition(cache);
|
||||
}
|
||||
break;
|
||||
case 16:
|
||||
if (protocolversion == Protocol18Handler.MC_1_17_Version || protocolversion == Protocol18Handler.MC_1_17_1_Version)
|
||||
ReadDustParticleColorTransition(cache);
|
||||
break;
|
||||
case 23:
|
||||
// 1.15 - 1.16.5
|
||||
if (protocolversion >= Protocol18Handler.MC_1_15_Version && protocolversion < Protocol18Handler.MC_1_17_Version)
|
||||
ReadNextVarInt(cache); // Block State (minecraft:falling_dust)
|
||||
break;
|
||||
case 24:
|
||||
// 1.18 - 1.19.2 onwards
|
||||
if (protocolversion > Protocol18Handler.MC_1_17_1_Version && protocolversion < Protocol18Handler.MC_1_19_3_Version)
|
||||
ReadNextVarInt(cache); // Block State (minecraft:falling_dust)
|
||||
break;
|
||||
case 25:
|
||||
// 1.17 - 1.17.1 and 1.19.3 onwards
|
||||
if (protocolversion == Protocol18Handler.MC_1_17_Version
|
||||
|| protocolversion == Protocol18Handler.MC_1_17_1_Version
|
||||
|| protocolversion >= Protocol18Handler.MC_1_19_3_Version)
|
||||
ReadNextVarInt(cache); // Block State (minecraft:falling_dust)
|
||||
break;
|
||||
case 27:
|
||||
// 1.13 - 1.14.4
|
||||
if (protocolversion < Protocol18Handler.MC_1_15_Version)
|
||||
ReadNextItemSlot(cache, itemPalette); // Item (minecraft:item)
|
||||
break;
|
||||
case 30:
|
||||
if (protocolversion >= Protocol18Handler.MC_1_19_3_Version)
|
||||
ReadNextFloat(cache); // Roll (minecraft:sculk_charge)
|
||||
break;
|
||||
case 32:
|
||||
// 1.15 - 1.16.5
|
||||
if (protocolversion >= Protocol18Handler.MC_1_15_Version && protocolversion < Protocol18Handler.MC_1_17_Version)
|
||||
ReadNextItemSlot(cache, itemPalette); // Item (minecraft:item)
|
||||
break;
|
||||
case 36:
|
||||
// 1.17 - 1.17.1
|
||||
if (protocolversion == Protocol18Handler.MC_1_17_Version || protocolversion == Protocol18Handler.MC_1_17_1_Version)
|
||||
{
|
||||
ReadNextItemSlot(cache, itemPalette); // Item (minecraft:item)
|
||||
}
|
||||
else if (protocolversion > Protocol18Handler.MC_1_17_1_Version && protocolversion < Protocol18Handler.MC_1_19_3_Version)
|
||||
{
|
||||
// minecraft:vibration
|
||||
ReadNextLocation(cache); // Origin (Starting Position)
|
||||
ReadNextLocation(cache); // Desitination (Ending Position)
|
||||
ReadNextVarInt(cache); // Ticks
|
||||
}
|
||||
break;
|
||||
case 37:
|
||||
// minecraft:vibration
|
||||
if (protocolversion == Protocol18Handler.MC_1_17_Version
|
||||
|| protocolversion == Protocol18Handler.MC_1_17_1_Version)
|
||||
{
|
||||
ReadNextDouble(cache); // Origin X
|
||||
ReadNextDouble(cache); // Origin Y
|
||||
ReadNextDouble(cache); // Origin Z
|
||||
ReadNextDouble(cache); // Destination X
|
||||
ReadNextDouble(cache); // Destination Y
|
||||
ReadNextDouble(cache); // Destination Z
|
||||
ReadNextInt(cache); // Ticks
|
||||
}
|
||||
break;
|
||||
case 39:
|
||||
if (protocolversion >= Protocol18Handler.MC_1_19_3_Version)
|
||||
ReadNextItemSlot(cache, itemPalette); // Item (minecraft:item)
|
||||
break;
|
||||
case 40:
|
||||
if (protocolversion >= Protocol18Handler.MC_1_19_3_Version)
|
||||
{
|
||||
string positionSourceType = ReadNextString(cache);
|
||||
if (positionSourceType == "minecraft:block")
|
||||
{
|
||||
ReadNextLocation(cache);
|
||||
}
|
||||
else if (positionSourceType == "minecraft:entity")
|
||||
{
|
||||
ReadNextVarInt(cache);
|
||||
ReadNextFloat(cache);
|
||||
}
|
||||
|
||||
ReadNextVarInt(cache);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
private void ReadDustParticle(Queue<byte> cache)
|
||||
{
|
||||
ReadNextFloat(cache); // Red
|
||||
ReadNextFloat(cache); // Green
|
||||
ReadNextFloat(cache); // Blue
|
||||
ReadNextFloat(cache); // Scale
|
||||
}
|
||||
|
||||
private void ReadDustParticleColorTransition(Queue<byte> cache)
|
||||
{
|
||||
ReadNextFloat(cache); // From red
|
||||
ReadNextFloat(cache); // From green
|
||||
ReadNextFloat(cache); // From blue
|
||||
ReadNextFloat(cache); // Scale
|
||||
ReadNextFloat(cache); // To red
|
||||
ReadNextFloat(cache); // To green
|
||||
ReadNextFloat(cache); // To Blue
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Read a single villager trade from a cache of bytes and remove it from the cache
|
||||
/// </summary>
|
||||
|
|
@ -823,7 +944,8 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
int specialPrice = ReadNextInt(cache);
|
||||
float priceMultiplier = ReadNextFloat(cache);
|
||||
int demand = ReadNextInt(cache);
|
||||
return new VillagerTrade(inputItem1, outputItem, inputItem2, tradeDisabled, numberOfTradeUses, maximumNumberOfTradeUses, xp, specialPrice, priceMultiplier, demand);
|
||||
return new VillagerTrade(inputItem1, outputItem, inputItem2, tradeDisabled, numberOfTradeUses,
|
||||
maximumNumberOfTradeUses, xp, specialPrice, priceMultiplier, demand);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -956,11 +1078,13 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
subsequentItemsBytes.AddRange(GetNbtField(item, out byte subsequentItemType));
|
||||
if (subsequentItemType != firstItemType)
|
||||
throw new System.IO.InvalidDataException(
|
||||
"GetNbt: Cannot encode object[] list with mixed types: " + firstItemTypeString + ", " + item.GetType().Name + " into NBT!");
|
||||
"GetNbt: Cannot encode object[] list with mixed types: " + firstItemTypeString + ", " +
|
||||
item.GetType().Name + " into NBT!");
|
||||
}
|
||||
|
||||
// Build NBT list: type, length, item array
|
||||
return ConcatBytes(new[] { firstItemType }, GetInt(arrayLengthTotal), firstItemBytes, subsequentItemsBytes.ToArray());
|
||||
return ConcatBytes(new[] { firstItemType }, GetInt(arrayLengthTotal), firstItemBytes,
|
||||
subsequentItemsBytes.ToArray());
|
||||
}
|
||||
else if (obj is Dictionary<string, object>)
|
||||
{
|
||||
|
|
@ -1008,6 +1132,7 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
bytes.Add((byte)(paramInt & 127 | 128));
|
||||
paramInt = (int)(((uint)paramInt) >> 7);
|
||||
}
|
||||
|
||||
bytes.Add((byte)paramInt);
|
||||
return bytes.ToArray();
|
||||
}
|
||||
|
|
@ -1152,9 +1277,15 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
byte[] locationBytes;
|
||||
if (protocolversion >= Protocol18Handler.MC_1_14_Version)
|
||||
{
|
||||
locationBytes = BitConverter.GetBytes(((((ulong)location.X) & 0x3FFFFFF) << 38) | ((((ulong)location.Z) & 0x3FFFFFF) << 12) | (((ulong)location.Y) & 0xFFF));
|
||||
locationBytes = BitConverter.GetBytes(((((ulong)location.X) & 0x3FFFFFF) << 38) |
|
||||
((((ulong)location.Z) & 0x3FFFFFF) << 12) |
|
||||
(((ulong)location.Y) & 0xFFF));
|
||||
}
|
||||
else locationBytes = BitConverter.GetBytes(((((ulong)location.X) & 0x3FFFFFF) << 38) | ((((ulong)location.Y) & 0xFFF) << 26) | (((ulong)location.Z) & 0x3FFFFFF));
|
||||
else
|
||||
locationBytes = BitConverter.GetBytes(((((ulong)location.X) & 0x3FFFFFF) << 38) |
|
||||
((((ulong)location.Y) & 0xFFF) << 26) |
|
||||
(((ulong)location.Z) & 0x3FFFFFF));
|
||||
|
||||
Array.Reverse(locationBytes); //Endianness
|
||||
return locationBytes;
|
||||
}
|
||||
|
|
@ -1193,6 +1324,7 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
slotData.AddRange(GetNbt(item.NBT));
|
||||
}
|
||||
}
|
||||
|
||||
return slotData.ToArray();
|
||||
}
|
||||
|
||||
|
|
@ -1278,17 +1410,18 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
public byte[] GetLastSeenMessageList(Message.LastSeenMessageList msgList, bool isOnlineMode)
|
||||
{
|
||||
if (!isOnlineMode)
|
||||
return GetVarInt(0); // Message list size
|
||||
return GetVarInt(0); // Message list size
|
||||
else
|
||||
{
|
||||
List<byte> fields = new();
|
||||
fields.AddRange(GetVarInt(msgList.entries.Length)); // Message list size
|
||||
fields.AddRange(GetVarInt(msgList.entries.Length)); // Message list size
|
||||
foreach (Message.LastSeenMessageList.AcknowledgedMessage entry in msgList.entries)
|
||||
{
|
||||
fields.AddRange(entry.profileId.ToBigEndianBytes()); // UUID
|
||||
fields.AddRange(GetVarInt(entry.signature.Length)); // Signature length
|
||||
fields.AddRange(entry.signature); // Signature data
|
||||
fields.AddRange(entry.profileId.ToBigEndianBytes()); // UUID
|
||||
fields.AddRange(GetVarInt(entry.signature.Length)); // Signature length
|
||||
fields.AddRange(entry.signature); // Signature data
|
||||
}
|
||||
|
||||
return fields.ToArray();
|
||||
}
|
||||
}
|
||||
|
|
@ -1304,15 +1437,16 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
List<byte> fields = new();
|
||||
fields.AddRange(GetLastSeenMessageList(ack.lastSeen, isOnlineMode));
|
||||
if (!isOnlineMode || ack.lastReceived == null)
|
||||
fields.AddRange(GetBool(false)); // Has last received message
|
||||
fields.AddRange(GetBool(false)); // Has last received message
|
||||
else
|
||||
{
|
||||
fields.AddRange(GetBool(true));
|
||||
fields.AddRange(ack.lastReceived.profileId.ToBigEndianBytes()); // Has last received message
|
||||
fields.AddRange(GetVarInt(ack.lastReceived.signature.Length)); // Last received message signature length
|
||||
fields.AddRange(ack.lastReceived.signature); // Last received message signature data
|
||||
fields.AddRange(ack.lastReceived.profileId.ToBigEndianBytes()); // Has last received message
|
||||
fields.AddRange(GetVarInt(ack.lastReceived.signature.Length)); // Last received message signature length
|
||||
fields.AddRange(ack.lastReceived.signature); // Last received message signature data
|
||||
}
|
||||
|
||||
return fields.ToArray();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,188 @@
|
|||
using System.Collections.Generic;
|
||||
|
||||
namespace MinecraftClient.Protocol.Handlers.PacketPalettes
|
||||
{
|
||||
public class PacketPalette1194 : PacketTypePalette
|
||||
{
|
||||
private readonly Dictionary<int, PacketTypesIn> typeIn = new()
|
||||
{
|
||||
{ 0x00, PacketTypesIn.Bundle }, // Added in 1.19.4
|
||||
{ 0x01, PacketTypesIn.SpawnEntity }, // Changed in 1.19 (Wiki name: Spawn Entity)
|
||||
{ 0x02, PacketTypesIn.SpawnExperienceOrb }, // (Wiki name: Spawn Exeprience Orb)
|
||||
{ 0x03, PacketTypesIn.SpawnPlayer }, //
|
||||
{ 0x04, PacketTypesIn.EntityAnimation }, // (Wiki name: Entity Animation (clientbound))
|
||||
{ 0x05, PacketTypesIn.Statistics }, // (Wiki name: Award Statistics)
|
||||
{ 0x06, PacketTypesIn.BlockChangedAck }, // Added 1.19 (Wiki name: Acknowledge Block Change)
|
||||
{ 0x07, PacketTypesIn.BlockBreakAnimation }, // (Wiki name: Set Block Destroy Stage)
|
||||
{ 0x08, PacketTypesIn.BlockEntityData }, //
|
||||
{ 0x09, PacketTypesIn.BlockAction }, //
|
||||
{ 0x0A, PacketTypesIn.BlockChange }, // (Wiki name: Block Update)
|
||||
{ 0x0B, PacketTypesIn.BossBar }, //
|
||||
{ 0x0C, PacketTypesIn.ServerDifficulty }, // (Wiki name: Change Difficulty)
|
||||
{ 0x0D, PacketTypesIn.ChunksBiomes }, // Added in 1.19.4
|
||||
{ 0x0E, PacketTypesIn.ClearTiles }, //
|
||||
{ 0x0F, PacketTypesIn.TabComplete }, // (Wiki name: Command Suggestions Response)
|
||||
{ 0x10, PacketTypesIn.DeclareCommands }, // (Wiki name: Commands)
|
||||
{ 0x11, PacketTypesIn.CloseWindow }, // (Wiki name: Close Container (clientbound))
|
||||
{ 0x12, PacketTypesIn.WindowItems }, // (Wiki name: Set Container Content)
|
||||
{ 0x13, PacketTypesIn.WindowProperty }, // (Wiki name: Set Container Property)
|
||||
{ 0x14, PacketTypesIn.SetSlot }, // (Wiki name: Set Container Slot)
|
||||
{ 0x15, PacketTypesIn.SetCooldown }, //
|
||||
{ 0x16, PacketTypesIn.ChatSuggestions }, // Added in 1.19.1
|
||||
{ 0x17, PacketTypesIn.PluginMessage }, // (Wiki name: Plugin Message (clientbound))
|
||||
{ 0x18, PacketTypesIn.DamageEvent }, // Added in 1.19.4
|
||||
{ 0x19, PacketTypesIn.HideMessage }, // Added in 1.19.1
|
||||
{ 0x1A, PacketTypesIn.Disconnect }, //
|
||||
{ 0x1B, PacketTypesIn.ProfilelessChatMessage }, // Added in 1.19.3 (Wiki name: Disguised Chat Message)
|
||||
{ 0x1C, PacketTypesIn.EntityStatus }, // (Wiki name: Entity Event)
|
||||
{ 0x1D, PacketTypesIn.Explosion }, // Changed in 1.19 (Location fields are now Double instead of Float) (Wiki name: Explosion)
|
||||
{ 0x1E, PacketTypesIn.UnloadChunk }, // (Wiki name: Forget Chunk)
|
||||
{ 0x1F, PacketTypesIn.ChangeGameState }, // (Wiki name: Game Event)
|
||||
{ 0x20, PacketTypesIn.OpenHorseWindow }, // (Wiki name: Horse Screen Open)
|
||||
{ 0x21, PacketTypesIn.HurtAnimation }, // 1.19.4
|
||||
{ 0x22, PacketTypesIn.InitializeWorldBorder }, //
|
||||
{ 0x23, PacketTypesIn.KeepAlive }, //
|
||||
{ 0x24, PacketTypesIn.ChunkData }, //
|
||||
{ 0x25, PacketTypesIn.Effect }, // (Wiki name: World Event)
|
||||
{ 0x26, PacketTypesIn.Particle }, // Changed in 1.19 ("Particle Data" field is now "Max Speed", it's the same Float data type) (Wiki name: Level Particle) (No need to be implemented)
|
||||
{ 0x27, PacketTypesIn.UpdateLight }, // (Wiki name: Light Update)
|
||||
{ 0x28, PacketTypesIn.JoinGame }, // Changed in 1.19 (lot's of changes) (Wiki name: Login (play))
|
||||
{ 0x29, PacketTypesIn.MapData }, // (Wiki name: Map Item Data)
|
||||
{ 0x2A, PacketTypesIn.TradeList }, // (Wiki name: Merchant Offers)
|
||||
{ 0x2B, PacketTypesIn.EntityPosition }, // (Wiki name: Move Entity Position)
|
||||
{ 0x2C, PacketTypesIn.EntityPositionAndRotation }, // (Wiki name: Move Entity Position and Rotation)
|
||||
{ 0x2D, PacketTypesIn.EntityRotation }, // (Wiki name: Move Entity Rotation)
|
||||
{ 0x2E, PacketTypesIn.VehicleMove }, // (Wiki name: Move Vehicle)
|
||||
{ 0x2F, PacketTypesIn.OpenBook }, //
|
||||
{ 0x30, PacketTypesIn.OpenWindow }, // (Wiki name: Open Screen)
|
||||
{ 0x31, PacketTypesIn.OpenSignEditor }, //
|
||||
{ 0x32, PacketTypesIn.Ping }, // (Wiki name: Ping (play))
|
||||
{ 0x33, PacketTypesIn.CraftRecipeResponse }, // (Wiki name: Place Ghost Recipe)
|
||||
{ 0x34, PacketTypesIn.PlayerAbilities }, //
|
||||
{ 0x35, PacketTypesIn.ChatMessage }, // Changed in 1.19 (Completely changed) (Wiki name: Player Chat Message) - TODO
|
||||
{ 0x36, PacketTypesIn.EndCombatEvent }, // (Wiki name: Player Combat End)
|
||||
{ 0x37, PacketTypesIn.EnterCombatEvent }, // (Wiki name: Player Combat Enter)
|
||||
{ 0x38, PacketTypesIn.DeathCombatEvent }, // (Wiki name: Player Combat Kill)
|
||||
{ 0x39, PacketTypesIn.PlayerRemove }, // Added in 1.19.3 (Not used)
|
||||
{ 0x3A, PacketTypesIn.PlayerInfo }, // Changed in 1.19 (Heavy changes)
|
||||
{ 0x3B, PacketTypesIn.FacePlayer }, // (Wiki name: Player Look At)
|
||||
{ 0x3C, PacketTypesIn.PlayerPositionAndLook }, // (Wiki name: Player Position)
|
||||
{ 0x3D, PacketTypesIn.UnlockRecipes }, // (Wiki name: Recipe)
|
||||
{ 0x3E, PacketTypesIn.DestroyEntities }, // (Wiki name: Remove Entites)
|
||||
{ 0x3F, PacketTypesIn.RemoveEntityEffect }, //
|
||||
{ 0x40, PacketTypesIn.ResourcePackSend }, // (Wiki name: Resource Pack)
|
||||
{ 0x41, PacketTypesIn.Respawn }, // Changed in 1.19 (Heavy changes)
|
||||
{ 0x42, PacketTypesIn.EntityHeadLook }, // (Wiki name: Rotate Head)
|
||||
{ 0x43, PacketTypesIn.MultiBlockChange }, // (Wiki name: Sections Block Update)
|
||||
{ 0x44, PacketTypesIn.SelectAdvancementTab }, //
|
||||
{ 0x45, PacketTypesIn.ServerData }, // Added in 1.19
|
||||
{ 0x46, PacketTypesIn.ActionBar }, // (Wiki name: Set Action Bar Text)
|
||||
{ 0x47, PacketTypesIn.WorldBorderCenter }, // (Wiki name: Set Border Center)
|
||||
{ 0x48, PacketTypesIn.WorldBorderLerpSize }, //
|
||||
{ 0x49, PacketTypesIn.WorldBorderSize }, // (Wiki name: Set World Border Size)
|
||||
{ 0x4A, PacketTypesIn.WorldBorderWarningDelay }, // (Wiki name: Set World Border Warning Delay)
|
||||
{ 0x4B, PacketTypesIn.WorldBorderWarningReach }, // (Wiki name: Set Border Warning Distance)
|
||||
{ 0x4C, PacketTypesIn.Camera }, // (Wiki name: Set Camera)
|
||||
{ 0x4D, PacketTypesIn.HeldItemChange }, // (Wiki name: Set Carried Item (clientbound))
|
||||
{ 0x4E, PacketTypesIn.UpdateViewPosition }, // (Wiki name: Set Chunk Cache Center)
|
||||
{ 0x4F, PacketTypesIn.UpdateViewDistance }, // (Wiki name: Set Chunk Cache Radius)
|
||||
{ 0x50, PacketTypesIn.SpawnPosition }, // (Wiki name: Set Default Spawn Position)
|
||||
{ 0x51, PacketTypesIn.DisplayScoreboard }, // (Wiki name: Set Display Objective)
|
||||
{ 0x52, PacketTypesIn.EntityMetadata }, // (Wiki name: Set Entity Metadata)
|
||||
{ 0x53, PacketTypesIn.AttachEntity }, // (Wiki name: Set Entity Link)
|
||||
{ 0x54, PacketTypesIn.EntityVelocity }, // (Wiki name: Set Entity Motion)
|
||||
{ 0x55, PacketTypesIn.EntityEquipment }, // (Wiki name: Set Equipment)
|
||||
{ 0x56, PacketTypesIn.SetExperience }, //
|
||||
{ 0x57, PacketTypesIn.UpdateHealth }, // (Wiki name: Set Health)
|
||||
{ 0x58, PacketTypesIn.ScoreboardObjective }, // (Wiki name: Set Objective)
|
||||
{ 0x59, PacketTypesIn.SetPassengers }, //
|
||||
{ 0x5A, PacketTypesIn.Teams }, // (Wiki name: Set Player Team)
|
||||
{ 0x5B, PacketTypesIn.UpdateScore }, // (Wiki name: Set Score)
|
||||
{ 0x5C, PacketTypesIn.UpdateSimulationDistance }, // (Wiki name: Set Simulation Distance)
|
||||
{ 0x5D, PacketTypesIn.SetTitleSubTitle }, // (Wiki name: Set Subtitle Test)
|
||||
{ 0x5E, PacketTypesIn.TimeUpdate }, // (Wiki name: Set Time)
|
||||
{ 0x5F, PacketTypesIn.SetTitleText }, // (Wiki name: Set Title)
|
||||
{ 0x60, PacketTypesIn.SetTitleTime }, // (Wiki name: Set Titles Animation)
|
||||
{ 0x61, PacketTypesIn.EntitySoundEffect }, // (Wiki name: Sound Entity)
|
||||
{ 0x62, PacketTypesIn.SoundEffect }, // Changed in 1.19 (Added "Seed" field) (Wiki name: Sound Effect) (No need to be implemented)
|
||||
{ 0x63, PacketTypesIn.StopSound }, //
|
||||
{ 0x64, PacketTypesIn.SystemChat }, // Added in 1.19 (Wiki name: System Chat Message)
|
||||
{ 0x65, PacketTypesIn.PlayerListHeaderAndFooter }, // (Wiki name: Tab List)
|
||||
{ 0x66, PacketTypesIn.NBTQueryResponse }, // (Wiki name: Tab Query)
|
||||
{ 0x67, PacketTypesIn.CollectItem }, // (Wiki name: Take Item Entity)
|
||||
{ 0x68, PacketTypesIn.EntityTeleport }, // (Wiki name: Teleport Entity)
|
||||
{ 0x69, PacketTypesIn.Advancements }, // (Wiki name: Update Advancements)
|
||||
{ 0x6A, PacketTypesIn.EntityProperties }, // (Wiki name: Update Attributes)
|
||||
{ 0x6B, PacketTypesIn.FeatureFlags }, // Added in 1.19.3 (Not yet clear what is the purpose of this packet)
|
||||
{ 0x6C, PacketTypesIn.EntityEffect }, // Changed in 1.19 (Added "Has Factor Data" and "Factor Codec" fields) (Wiki name: Entity Effect)
|
||||
{ 0x6D, PacketTypesIn.DeclareRecipes }, // (Wiki name: Update Recipes)
|
||||
{ 0x6E, PacketTypesIn.Tags }, // (Wiki name: Update Tags)
|
||||
};
|
||||
|
||||
private readonly Dictionary<int, PacketTypesOut> typeOut = new()
|
||||
{
|
||||
{ 0x00, PacketTypesOut.TeleportConfirm }, // (Wiki name: Confirm Teleportation)
|
||||
{ 0x01, PacketTypesOut.QueryBlockNBT }, // (Wiki name: Query Block Entity Tag)
|
||||
{ 0x02, PacketTypesOut.SetDifficulty }, // (Wiki name: Change Difficutly)
|
||||
{ 0x03, PacketTypesOut.MessageAcknowledgment }, // Added in 1.19.1
|
||||
{ 0x04, PacketTypesOut.ChatCommand }, // Added in 1.19
|
||||
{ 0x05, PacketTypesOut.ChatMessage }, // Changed in 1.19 (Completely changed) (Wiki name: Chat)
|
||||
{ 0x06, PacketTypesOut.PlayerSession }, // Added in 1.19.3
|
||||
{ 0x07, PacketTypesOut.ClientStatus }, // (Wiki name: Client Command)
|
||||
{ 0x08, PacketTypesOut.ClientSettings }, // (Wiki name: Client Information)
|
||||
{ 0x09, PacketTypesOut.TabComplete }, // (Wiki name: Command Suggestions Request)
|
||||
{ 0x0A, PacketTypesOut.ClickWindowButton }, // (Wiki name: Click Container Button)
|
||||
{ 0x0B, PacketTypesOut.ClickWindow }, // (Wiki name: Click Container)
|
||||
{ 0x0C, PacketTypesOut.CloseWindow }, // (Wiki name: Close Container (serverbound))
|
||||
{ 0x0D, PacketTypesOut.PluginMessage }, // (Wiki name: Plugin Message (serverbound))
|
||||
{ 0x0E, PacketTypesOut.EditBook }, //
|
||||
{ 0x0F, PacketTypesOut.EntityNBTRequest }, // (Wiki name: Query Entity Tag)
|
||||
{ 0x10, PacketTypesOut.InteractEntity }, // (Wiki name: Interact)
|
||||
{ 0x11, PacketTypesOut.GenerateStructure }, // (Wiki name: Jigsaw Generate)
|
||||
{ 0x12, PacketTypesOut.KeepAlive }, //
|
||||
{ 0x13, PacketTypesOut.LockDifficulty }, //
|
||||
{ 0x14, PacketTypesOut.PlayerPosition }, // (Wiki name: Move Player Position)
|
||||
{ 0x15, PacketTypesOut.PlayerPositionAndRotation }, // (Wiki name: Set Player Position and Rotation)
|
||||
{ 0x16, PacketTypesOut.PlayerRotation }, // (Wiki name: Set Player Rotation)
|
||||
{ 0x17, PacketTypesOut.PlayerMovement }, // (Wiki name: Set Player On Ground)
|
||||
{ 0x18, PacketTypesOut.VehicleMove }, // (Wiki name: Move Vehicle (serverbound))
|
||||
{ 0x19, PacketTypesOut.SteerBoat }, // (Wiki name: Paddle Boat)
|
||||
{ 0x1A, PacketTypesOut.PickItem }, //
|
||||
{ 0x1B, PacketTypesOut.CraftRecipeRequest }, // (Wiki name: Place recipe)
|
||||
{ 0x1C, PacketTypesOut.PlayerAbilities }, //
|
||||
{ 0x1D, PacketTypesOut.PlayerDigging }, // Changed in 1.19 (Added a "Sequence" field) (Wiki name: Player Action)
|
||||
{ 0x1E, PacketTypesOut.EntityAction }, // (Wiki name: Player Command)
|
||||
{ 0x1F, PacketTypesOut.SteerVehicle }, // (Wiki name: Player Input)
|
||||
{ 0x20, PacketTypesOut.Pong }, // (Wiki name: Pong (play))
|
||||
|
||||
{ 0x21, PacketTypesOut.SetDisplayedRecipe }, // (Wiki name: Recipe Book Change Settings)
|
||||
{ 0x22, PacketTypesOut.SetRecipeBookState }, // (Wiki name: Recipe Book Seen Recipe)
|
||||
{ 0x23, PacketTypesOut.NameItem }, // (Wiki name: Rename Item)
|
||||
{ 0x24, PacketTypesOut.ResourcePackStatus }, // (Wiki name: Resource Pack (serverbound))
|
||||
{ 0x25, PacketTypesOut.AdvancementTab }, // (Wiki name: Seen Advancements)
|
||||
{ 0x26, PacketTypesOut.SelectTrade }, //
|
||||
{ 0x27, PacketTypesOut.SetBeaconEffect }, // Changed in 1.19 (Added a "Secondary Effect Present" and "Secondary Effect" fields) (Wiki name: Set Beacon) - (No need to be implemented)
|
||||
{ 0x28, PacketTypesOut.HeldItemChange }, // (Wiki name: Set Carried Item (serverbound))
|
||||
{ 0x29, PacketTypesOut.UpdateCommandBlock }, // (Wiki name: Set Command Block)
|
||||
{ 0x2A, PacketTypesOut.UpdateCommandBlockMinecart }, //
|
||||
{ 0x2B, PacketTypesOut.CreativeInventoryAction }, // (Wiki name: Set Creative Mode Slot)
|
||||
{ 0x2C, PacketTypesOut.UpdateJigsawBlock }, // (Wiki name: Set Jigsaw Block)
|
||||
{ 0x2D, PacketTypesOut.UpdateStructureBlock }, // (Wiki name: Set Structure Block)
|
||||
{ 0x2E, PacketTypesOut.UpdateSign }, // (Wiki name: Sign Update)
|
||||
{ 0x2F, PacketTypesOut.Animation }, // (Wiki name: Swing)
|
||||
{ 0x30, PacketTypesOut.Spectate }, // (Wiki name: Teleport To Entity)
|
||||
{ 0x31, PacketTypesOut.PlayerBlockPlacement }, // Changed in 1.19 (Added a "Sequence" field) (Wiki name: Use Item On)
|
||||
{ 0x32, PacketTypesOut.UseItem }, // Changed in 1.19 (Added a "Sequence" field) (Wiki name: Use Item)
|
||||
};
|
||||
|
||||
protected override Dictionary<int, PacketTypesIn> GetListIn()
|
||||
{
|
||||
return typeIn;
|
||||
}
|
||||
|
||||
protected override Dictionary<int, PacketTypesOut> GetListOut()
|
||||
{
|
||||
return typeOut;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -47,7 +47,7 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
public PacketTypePalette GetTypeHandler(int protocol)
|
||||
{
|
||||
PacketTypePalette p;
|
||||
if (protocol > Protocol18Handler.MC_1_19_3_Version)
|
||||
if (protocol > Protocol18Handler.MC_1_19_4_Version)
|
||||
throw new NotImplementedException(Translations.exception_palette_packet);
|
||||
|
||||
if (protocol <= Protocol18Handler.MC_1_8_Version)
|
||||
|
|
@ -60,7 +60,7 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
p = new PacketPalette1122();
|
||||
else if (protocol < Protocol18Handler.MC_1_14_Version)
|
||||
p = new PacketPalette113();
|
||||
else if (protocol <= Protocol18Handler.MC_1_15_Version)
|
||||
else if (protocol < Protocol18Handler.MC_1_15_Version)
|
||||
p = new PacketPalette114();
|
||||
else if (protocol <= Protocol18Handler.MC_1_15_2_Version)
|
||||
p = new PacketPalette115();
|
||||
|
|
@ -76,8 +76,10 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
p = new PacketPalette119();
|
||||
else if (protocol <= Protocol18Handler.MC_1_19_2_Version)
|
||||
p = new PacketPalette1192();
|
||||
else
|
||||
else if (protocol <= Protocol18Handler.MC_1_19_3_Version)
|
||||
p = new PacketPalette1193();
|
||||
else
|
||||
p = new PacketPalette1194();
|
||||
|
||||
p.SetForgeEnabled(forgeEnabled);
|
||||
return p;
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
ActionBar, //
|
||||
Advancements, //
|
||||
AttachEntity, //
|
||||
Bundle, // Added in 1.19.4
|
||||
BlockAction, //
|
||||
BlockBreakAnimation, //
|
||||
BlockChange, //
|
||||
|
|
@ -20,12 +21,14 @@
|
|||
ChatMessage, //
|
||||
ChatPreview, // Added in 1.19
|
||||
ChatSuggestions, // Added in 1.19.1 (1.19.2)
|
||||
ChunksBiomes, // Added in 1.19.4
|
||||
ChunkData, //
|
||||
ClearTiles, //
|
||||
CloseWindow, //
|
||||
CollectItem, //
|
||||
CombatEvent, //
|
||||
CraftRecipeResponse, //
|
||||
DamageEvent, // Added in 1.19.4
|
||||
DeathCombatEvent, //
|
||||
DeclareCommands, //
|
||||
DeclareRecipes, //
|
||||
|
|
@ -54,6 +57,7 @@
|
|||
FeatureFlags, // Added in 1.19.3
|
||||
HeldItemChange, //
|
||||
HideMessage, // Added in 1.19.1 (1.19.2)
|
||||
HurtAnimation, // Added in 1.19.4
|
||||
InitializeWorldBorder, //
|
||||
JoinGame, //
|
||||
KeepAlive, //
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -4,15 +4,19 @@ namespace MinecraftClient.Protocol.Message
|
|||
{
|
||||
public class ChatMessage
|
||||
{
|
||||
// in 1.19 and above, isSignedChat = true
|
||||
/// <summary>
|
||||
/// In 1.19 and above, isSignedChat = true
|
||||
/// </summary>
|
||||
public bool isSignedChat;
|
||||
|
||||
public string content;
|
||||
|
||||
public bool isJson, isSenderJson;
|
||||
|
||||
// 0: chat (chat box), 1: system message (chat box), 2: game info (above hotbar), 3: say command,
|
||||
// 4: msg command, 5: team msg command, 6: emote command, 7: tellraw command
|
||||
/// <summary>
|
||||
/// 0: chat (chat box), 1: system message (chat box), 2: game info (above hotbar), 3: say command,
|
||||
/// 4: msg command, 5: team msg command, 6: emote command, 7: tellraw command
|
||||
/// </summary>
|
||||
public int chatTypeId;
|
||||
|
||||
public Guid senderUUID;
|
||||
|
|
|
|||
|
|
@ -142,34 +142,7 @@ namespace MinecraftClient.Protocol.Message
|
|||
default:
|
||||
goto case MessageType.CHAT;
|
||||
}
|
||||
string color = string.Empty;
|
||||
if (message.isSystemChat)
|
||||
{
|
||||
if (Config.Signature.MarkSystemMessage)
|
||||
color = "§7▌§r"; // Background Gray
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((bool)message.isSignatureLegal!)
|
||||
{
|
||||
if (Config.Signature.ShowModifiedChat && message.unsignedContent != null)
|
||||
{
|
||||
if (Config.Signature.MarkModifiedMsg)
|
||||
color = "§6▌§r"; // Background Yellow
|
||||
}
|
||||
else
|
||||
{
|
||||
if (Config.Signature.MarkLegallySignedMsg)
|
||||
color = "§2▌§r"; // Background Green
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (Config.Signature.MarkIllegallySignedMsg)
|
||||
color = "§4▌§r"; // Background Red
|
||||
}
|
||||
}
|
||||
return color + text;
|
||||
return text;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ namespace MinecraftClient.Protocol
|
|||
if (Array.IndexOf(supportedVersions_Protocol16, ProtocolVersion) > -1)
|
||||
return new Protocol16Handler(Client, ProtocolVersion, Handler);
|
||||
|
||||
int[] supportedVersions_Protocol18 = { 4, 5, 47, 107, 108, 109, 110, 210, 315, 316, 335, 338, 340, 393, 401, 404, 477, 480, 485, 490, 498, 573, 575, 578, 735, 736, 751, 753, 754, 755, 756, 757, 758, 759, 760, 761 };
|
||||
int[] supportedVersions_Protocol18 = { 4, 5, 47, 107, 108, 109, 110, 210, 315, 316, 335, 338, 340, 393, 401, 404, 477, 480, 485, 490, 498, 573, 575, 578, 735, 736, 751, 753, 754, 755, 756, 757, 758, 759, 760, 761, 762 };
|
||||
|
||||
if (Array.IndexOf(supportedVersions_Protocol18, ProtocolVersion) > -1)
|
||||
return new Protocol18Handler(Client, ProtocolVersion, Handler, forgeInfo);
|
||||
|
|
@ -315,6 +315,8 @@ namespace MinecraftClient.Protocol
|
|||
return 760;
|
||||
case "1.19.3":
|
||||
return 761;
|
||||
case "1.19.4":
|
||||
return 762;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -392,6 +394,7 @@ namespace MinecraftClient.Protocol
|
|||
case 759: return "1.19";
|
||||
case 760: return "1.19.2";
|
||||
case 761: return "1.19.3";
|
||||
case 762: return "1.19.4";
|
||||
default: return "0.0";
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue