mirror of
https://github.com/MCCTeam/Minecraft-Console-Client
synced 2025-10-14 21:22:49 +00:00
Implemented 1.20.2
Implemented 1.20.2
This commit is contained in:
Anon
GitHub
commit
f6797cb4b5
12 changed files with 3012 additions and 2544 deletions
|
|
@ -786,7 +786,7 @@ namespace MinecraftClient.ChatBots
|
|||
{
|
||||
var playerInventory = GetPlayerInventory();
|
||||
|
||||
if (playerInventory.Items.TryGetValue(GetCurrentSlot() - 36, out Item value) && value.Type == itemType)
|
||||
if (playerInventory.Items.TryGetValue(GetCurrentSlot() - 36, out var value) && value.Type == itemType)
|
||||
return true; // Already selected
|
||||
|
||||
// Search the full inventory
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ public abstract class EntityMetadataPalette
|
|||
<= Protocol18Handler.MC_1_12_2_Version => new EntityMetadataPalette1122(), // 1.9 - 1.12.2
|
||||
<= Protocol18Handler.MC_1_19_2_Version => new EntityMetadataPalette1191(), // 1.13 - 1.19.2
|
||||
<= Protocol18Handler.MC_1_19_3_Version => new EntityMetadataPalette1193(), // 1.19.3
|
||||
<= Protocol18Handler.MC_1_20_Version => new EntityMetadataPalette1194(), // 1.19.4 - 1.20 +
|
||||
<= Protocol18Handler.MC_1_20_2_Version => new EntityMetadataPalette1194(), // 1.19.4 - 1.20.2 +
|
||||
_ => throw new NotImplementedException()
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ namespace MinecraftClient
|
|||
|
||||
public const string Version = MCHighestVersion;
|
||||
public const string MCLowestVersion = "1.4.6";
|
||||
public const string MCHighestVersion = "1.20.1";
|
||||
public const string MCHighestVersion = "1.20.2";
|
||||
public static readonly string? BuildInfo = null;
|
||||
|
||||
private static Tuple<Thread, CancellationTokenSource>? offlinePrompt = null;
|
||||
|
|
|
|||
|
|
@ -446,7 +446,7 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
|
||||
byte itemCount = ReadNextByte(cache);
|
||||
|
||||
if(protocolversion < Protocol18Handler.MC_1_13_Version)
|
||||
if (protocolversion < Protocol18Handler.MC_1_13_Version)
|
||||
ReadNextShort(cache);
|
||||
|
||||
Dictionary<string, object> nbt = ReadNextNbt(cache);
|
||||
|
|
@ -521,7 +521,8 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
|
||||
// Data
|
||||
data = protocolversion >= Protocol18Handler.MC_1_19_Version
|
||||
? ReadNextVarInt(cache) : ReadNextInt(cache);
|
||||
? ReadNextVarInt(cache)
|
||||
: ReadNextInt(cache);
|
||||
}
|
||||
|
||||
// In 1.8 those 3 fields for Velocity are optional
|
||||
|
|
@ -541,7 +542,8 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
ReadNextShort(cache);
|
||||
}
|
||||
|
||||
return new Entity(entityID, entityType, new Location(entityX, entityY, entityZ), entityYaw, entityPitch, data);
|
||||
return new Entity(entityID, entityType, new Location(entityX, entityY, entityZ), entityYaw, entityPitch,
|
||||
data);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -563,12 +565,15 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
throw new System.IO.InvalidDataException("Failed to decode NBT: Does not start with TAG_Compound");
|
||||
ReadNextByte(cache); // Tag type (TAG_Compound)
|
||||
|
||||
if (protocolversion < Protocol18Handler.MC_1_20_2_Version)
|
||||
{
|
||||
// NBT root name
|
||||
string rootName = Encoding.ASCII.GetString(ReadData(ReadNextUShort(cache), cache));
|
||||
var rootName = Encoding.ASCII.GetString(ReadData(ReadNextUShort(cache), cache));
|
||||
|
||||
if (!String.IsNullOrEmpty(rootName))
|
||||
if (!string.IsNullOrEmpty(rootName))
|
||||
nbtData[""] = rootName;
|
||||
}
|
||||
}
|
||||
|
||||
while (true)
|
||||
{
|
||||
|
|
@ -646,7 +651,8 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
/// <returns></returns>
|
||||
/// <exception cref="NotImplementedException"></exception>
|
||||
/// <exception cref="System.IO.InvalidDataException"></exception>
|
||||
public Dictionary<int, object?> ReadNextMetadata(Queue<byte> cache, ItemPalette itemPalette, EntityMetadataPalette metadataPalette)
|
||||
public Dictionary<int, object?> ReadNextMetadata(Queue<byte> cache, ItemPalette itemPalette,
|
||||
EntityMetadataPalette metadataPalette)
|
||||
{
|
||||
Dictionary<int, object?> data = new();
|
||||
byte key = ReadNextByte(cache);
|
||||
|
|
@ -668,7 +674,8 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
}
|
||||
catch (KeyNotFoundException)
|
||||
{
|
||||
throw new System.IO.InvalidDataException("Unknown Metadata Type ID " + typeId + ". Is this up to date for new MC Version?");
|
||||
throw new System.IO.InvalidDataException("Unknown Metadata Type ID " + typeId +
|
||||
". Is this up to date for new MC Version?");
|
||||
}
|
||||
|
||||
if (protocolversion <= Protocol18Handler.MC_1_8_Version)
|
||||
|
|
@ -737,6 +744,7 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
{
|
||||
value = ReadNextLocation(cache);
|
||||
}
|
||||
|
||||
break;
|
||||
case EntityMetaDataType.Direction: // Direction (VarInt)
|
||||
value = ReadNextVarInt(cache);
|
||||
|
|
@ -746,6 +754,7 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
{
|
||||
value = ReadNextUUID(cache);
|
||||
}
|
||||
|
||||
break;
|
||||
case EntityMetaDataType.BlockId: // BlockID (VarInt)
|
||||
value = ReadNextVarInt(cache);
|
||||
|
|
@ -773,6 +782,7 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
{
|
||||
value = ReadNextVarInt(cache);
|
||||
}
|
||||
|
||||
break;
|
||||
case EntityMetaDataType.Pose: // Pose
|
||||
value = ReadNextVarInt(cache);
|
||||
|
|
@ -795,6 +805,7 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
// Dimension and blockPos, currently not in use
|
||||
value = new Tuple<string, Location>(ReadNextString(cache), ReadNextLocation(cache));
|
||||
}
|
||||
|
||||
break;
|
||||
case EntityMetaDataType.PaintingVariant: // Painting Variant
|
||||
value = ReadNextVarInt(cache);
|
||||
|
|
@ -824,6 +835,7 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
data[key] = value;
|
||||
key = ReadNextByte(cache);
|
||||
}
|
||||
|
||||
return data;
|
||||
}
|
||||
|
||||
|
|
@ -856,7 +868,8 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
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)
|
||||
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
|
||||
|
|
@ -870,31 +883,37 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
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)
|
||||
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)
|
||||
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)
|
||||
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)
|
||||
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)
|
||||
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:
|
||||
|
|
@ -915,22 +934,26 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
break;
|
||||
case 32:
|
||||
// 1.15 - 1.16.5
|
||||
if (protocolversion >= Protocol18Handler.MC_1_15_Version && protocolversion < Protocol18Handler.MC_1_17_Version)
|
||||
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)
|
||||
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)
|
||||
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
|
||||
|
|
@ -945,6 +968,7 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
ReadNextDouble(cache); // Destination Z
|
||||
ReadNextInt(cache); // Ticks
|
||||
}
|
||||
|
||||
break;
|
||||
case 39:
|
||||
if (protocolversion >= Protocol18Handler.MC_1_19_3_Version)
|
||||
|
|
@ -966,6 +990,7 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
|
||||
ReadNextVarInt(cache);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -1186,7 +1211,8 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
}
|
||||
else
|
||||
{
|
||||
throw new System.IO.InvalidDataException("GetNbt: Cannot encode data type " + obj.GetType().Name + " into NBT!");
|
||||
throw new System.IO.InvalidDataException("GetNbt: Cannot encode data type " + obj.GetType().Name +
|
||||
" into NBT!");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ namespace MinecraftClient.Protocol.Handlers.PacketPalettes
|
|||
{ 0x2E, PacketTypesIn.Ping }, // (Wiki name: Ping (play))
|
||||
{ 0x2F, PacketTypesIn.CraftRecipeResponse }, // (Wiki name: Place Ghost Recipe)
|
||||
{ 0x30, PacketTypesIn.PlayerAbilities }, //
|
||||
{ 0x31, PacketTypesIn.ChatMessage }, // Changed in 1.19 (Completely changed) (Wiki name: Player Chat Message) - TODO
|
||||
{ 0x31, PacketTypesIn.ChatMessage }, // Changed in 1.19 (Completely changed) (Wiki name: Player Chat Message)
|
||||
{ 0x32, PacketTypesIn.EndCombatEvent }, // (Wiki name: Player Combat End)
|
||||
{ 0x33, PacketTypesIn.EnterCombatEvent }, // (Wiki name: Player Combat Enter)
|
||||
{ 0x34, PacketTypesIn.DeathCombatEvent }, // (Wiki name: Player Combat Kill)
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ namespace MinecraftClient.Protocol.Handlers.PacketPalettes
|
|||
{ 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
|
||||
{ 0x35, PacketTypesIn.ChatMessage }, // Changed in 1.19 (Completely changed) (Wiki name: Player Chat Message)
|
||||
{ 0x36, PacketTypesIn.EndCombatEvent }, // (Wiki name: Player Combat End)
|
||||
{ 0x37, PacketTypesIn.EnterCombatEvent }, // (Wiki name: Player Combat Enter)
|
||||
{ 0x38, PacketTypesIn.DeathCombatEvent }, // (Wiki name: Player Combat Kill)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,192 @@
|
|||
using System.Collections.Generic;
|
||||
|
||||
namespace MinecraftClient.Protocol.Handlers.PacketPalettes
|
||||
{
|
||||
public class PacketPalette1202 : 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.EntityAnimation }, // (Wiki name: Entity Animation (clientbound))
|
||||
{ 0x04, PacketTypesIn.Statistics }, // (Wiki name: Award Statistics)
|
||||
{ 0x05, PacketTypesIn.BlockChangedAck }, // Added 1.19 (Wiki name: Acknowledge Block Change)
|
||||
{ 0x06, PacketTypesIn.BlockBreakAnimation }, // (Wiki name: Set Block Destroy Stage)
|
||||
{ 0x07, PacketTypesIn.BlockEntityData }, //
|
||||
{ 0x08, PacketTypesIn.BlockAction }, //
|
||||
{ 0x09, PacketTypesIn.BlockChange }, // (Wiki name: Block Update)
|
||||
{ 0x0A, PacketTypesIn.BossBar }, //
|
||||
{ 0x0B, PacketTypesIn.ServerDifficulty }, // (Wiki name: Change Difficulty)
|
||||
{ 0x0C, PacketTypesIn.ChunkBatchFinished }, // Added in 1.20.2 - TODO
|
||||
{ 0x0D, PacketTypesIn.ChunkBatchStarted }, // Added in 1.20.2 - TODO
|
||||
{ 0x0E, PacketTypesIn.ChunksBiomes }, // Added in 1.19.4
|
||||
{ 0x0F, PacketTypesIn.ClearTiles }, //
|
||||
{ 0x10, PacketTypesIn.TabComplete }, // (Wiki name: Command Suggestions Response)
|
||||
{ 0x11, PacketTypesIn.DeclareCommands }, // (Wiki name: Commands)
|
||||
{ 0x12, PacketTypesIn.CloseWindow }, // (Wiki name: Close Container (clientbound))
|
||||
{ 0x13, PacketTypesIn.WindowItems }, // (Wiki name: Set Container Content)
|
||||
{ 0x14, PacketTypesIn.WindowProperty }, // (Wiki name: Set Container Property)
|
||||
{ 0x15, PacketTypesIn.SetSlot }, // (Wiki name: Set Container Slot)
|
||||
{ 0x16, PacketTypesIn.SetCooldown }, //
|
||||
{ 0x17, PacketTypesIn.ChatSuggestions }, // Added in 1.19.1
|
||||
{ 0x18, PacketTypesIn.PluginMessage }, // (Wiki name: Plugin Message (clientbound))
|
||||
{ 0x19, PacketTypesIn.DamageEvent }, // Added in 1.19.4
|
||||
{ 0x1A, PacketTypesIn.HideMessage }, // Added in 1.19.1
|
||||
{ 0x1B, PacketTypesIn.Disconnect }, //
|
||||
{ 0x1C, PacketTypesIn.ProfilelessChatMessage }, // Added in 1.19.3 (Wiki name: Disguised Chat Message)
|
||||
{ 0x1D, PacketTypesIn.EntityStatus }, // (Wiki name: Entity Event)
|
||||
{ 0x1E, PacketTypesIn.Explosion }, // Changed in 1.19 (Location fields are now Double instead of Float) (Wiki name: Explosion)
|
||||
{ 0x1F, PacketTypesIn.UnloadChunk }, // (Wiki name: Forget Chunk)
|
||||
{ 0x20, PacketTypesIn.ChangeGameState }, // (Wiki name: Game Event)
|
||||
{ 0x21, PacketTypesIn.OpenHorseWindow }, // (Wiki name: Horse Screen Open)
|
||||
{ 0x22, PacketTypesIn.HurtAnimation }, // Added in 1.19.4
|
||||
{ 0x23, PacketTypesIn.InitializeWorldBorder }, //
|
||||
{ 0x24, PacketTypesIn.KeepAlive }, //
|
||||
{ 0x25, PacketTypesIn.ChunkData }, //
|
||||
{ 0x26, PacketTypesIn.Effect }, // (Wiki name: World Event)
|
||||
{ 0x27, 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)
|
||||
{ 0x28, PacketTypesIn.UpdateLight }, // (Wiki name: Light Update)
|
||||
{ 0x29, PacketTypesIn.JoinGame }, // Changed in 1.20.2 (Wiki name: Login (play)) - TODO
|
||||
{ 0x2A, PacketTypesIn.MapData }, // (Wiki name: Map Item Data)
|
||||
{ 0x2B, PacketTypesIn.TradeList }, // (Wiki name: Merchant Offers)
|
||||
{ 0x2C, PacketTypesIn.EntityPosition }, // (Wiki name: Move Entity Position)
|
||||
{ 0x2D, PacketTypesIn.EntityPositionAndRotation }, // (Wiki name: Move Entity Position and Rotation)
|
||||
{ 0x2E, PacketTypesIn.EntityRotation }, // (Wiki name: Move Entity Rotation)
|
||||
{ 0x2F, PacketTypesIn.VehicleMove }, // (Wiki name: Move Vehicle)
|
||||
{ 0x30, PacketTypesIn.OpenBook }, //
|
||||
{ 0x31, PacketTypesIn.OpenWindow }, // (Wiki name: Open Screen)
|
||||
{ 0x32, PacketTypesIn.OpenSignEditor }, //
|
||||
{ 0x33, PacketTypesIn.Ping }, // (Wiki name: Ping (play))
|
||||
{ 0x34, PacketTypesIn.PingResponse }, // Added in 1.20.2 - TODO
|
||||
{ 0x35, PacketTypesIn.CraftRecipeResponse }, // (Wiki name: Place Ghost Recipe)
|
||||
{ 0x36, PacketTypesIn.PlayerAbilities }, //
|
||||
{ 0x37, PacketTypesIn.ChatMessage }, // Changed in 1.19 (Completely changed) (Wiki name: Player Chat Message)
|
||||
{ 0x38, PacketTypesIn.EndCombatEvent }, // (Wiki name: End Combat)
|
||||
{ 0x39, PacketTypesIn.EnterCombatEvent }, // (Wiki name: Enter Combat)
|
||||
{ 0x3A, PacketTypesIn.DeathCombatEvent }, // (Wiki name: Combat Death)
|
||||
{ 0x3B, PacketTypesIn.PlayerRemove }, // Added in 1.19.3 (Not used)
|
||||
{ 0x3C, PacketTypesIn.PlayerInfo }, // Changed in 1.19 (Heavy changes)
|
||||
{ 0x3D, PacketTypesIn.FacePlayer }, // (Wiki name: Player Look At)
|
||||
{ 0x3E, PacketTypesIn.PlayerPositionAndLook }, // (Wiki name: Synchronize Player Position)
|
||||
{ 0x3F, PacketTypesIn.UnlockRecipes }, // (Wiki name: Update Recipe Book)
|
||||
{ 0x40, PacketTypesIn.DestroyEntities }, // (Wiki name: Remove Entites)
|
||||
{ 0x41, PacketTypesIn.RemoveEntityEffect }, //
|
||||
{ 0x42, PacketTypesIn.ResourcePackSend }, // (Wiki name: Resource Pack)
|
||||
{ 0x43, PacketTypesIn.Respawn }, // Changed in 1.20.2 - TODO
|
||||
{ 0x44, PacketTypesIn.EntityHeadLook }, // (Wiki name: Set Head Rotation)
|
||||
{ 0x45, PacketTypesIn.MultiBlockChange }, // (Wiki name: Update Section Blocks)
|
||||
{ 0x46, PacketTypesIn.SelectAdvancementTab }, //
|
||||
{ 0x47, PacketTypesIn.ServerData }, // Added in 1.19
|
||||
{ 0x48, PacketTypesIn.ActionBar }, // (Wiki name: Set Action Bar Text)
|
||||
{ 0x49, PacketTypesIn.WorldBorderCenter }, // (Wiki name: Set Border Center)
|
||||
{ 0x4A, PacketTypesIn.WorldBorderLerpSize }, //
|
||||
{ 0x4B, PacketTypesIn.WorldBorderSize }, // (Wiki name: Set World Border Size)
|
||||
{ 0x4C, PacketTypesIn.WorldBorderWarningDelay }, // (Wiki name: Set World Border Warning Delay)
|
||||
{ 0x4D, PacketTypesIn.WorldBorderWarningReach }, // (Wiki name: Set Border Warning Distance)
|
||||
{ 0x4E, PacketTypesIn.Camera }, // (Wiki name: Set Camera)
|
||||
{ 0x4F, PacketTypesIn.HeldItemChange }, // (Wiki name: Set Held Item)
|
||||
{ 0x50, PacketTypesIn.UpdateViewPosition }, // (Wiki name: Set Center Chunk)
|
||||
{ 0x51, PacketTypesIn.UpdateViewDistance }, // (Wiki name: Set Render Distance)
|
||||
{ 0x52, PacketTypesIn.SpawnPosition }, // (Wiki name: Set Default Spawn Position)
|
||||
{ 0x53, PacketTypesIn.DisplayScoreboard }, // (Wiki name: Set Display Objective) - TODO
|
||||
{ 0x54, PacketTypesIn.EntityMetadata }, // (Wiki name: Set Entity Metadata)
|
||||
{ 0x55, PacketTypesIn.AttachEntity }, // (Wiki name: Link Entities)
|
||||
{ 0x56, PacketTypesIn.EntityVelocity }, // (Wiki name: Set Entity Velocity)
|
||||
{ 0x57, PacketTypesIn.EntityEquipment }, // (Wiki name: Set Equipment)
|
||||
{ 0x58, PacketTypesIn.SetExperience }, // Changed in 1.20.2 - TODO
|
||||
{ 0x59, PacketTypesIn.UpdateHealth }, // (Wiki name: Set Health)
|
||||
{ 0x5A, PacketTypesIn.ScoreboardObjective }, // (Wiki name: Update Objectives)
|
||||
{ 0x5B, PacketTypesIn.SetPassengers }, //
|
||||
{ 0x5C, PacketTypesIn.Teams }, // (Wiki name: Update Teams)
|
||||
{ 0x5D, PacketTypesIn.UpdateScore }, // (Wiki name: Update Score)
|
||||
{ 0x5E, PacketTypesIn.UpdateSimulationDistance }, // (Wiki name: Set Simulation Distance)
|
||||
{ 0x5F, PacketTypesIn.SetTitleSubTitle }, // (Wiki name: Set Subtitle Test)
|
||||
{ 0x60, PacketTypesIn.TimeUpdate }, // (Wiki name: Set Time)
|
||||
{ 0x61, PacketTypesIn.SetTitleText }, // (Wiki name: Set Title)
|
||||
{ 0x62, PacketTypesIn.SetTitleTime }, // (Wiki name: Set Title Animation Times)
|
||||
{ 0x63, PacketTypesIn.EntitySoundEffect }, // (Wiki name: Sound Entity)
|
||||
{ 0x64, PacketTypesIn.SoundEffect }, // Changed in 1.19 (Added "Seed" field) (Wiki name: Sound Effect) (No need to be implemented)
|
||||
{ 0x65, PacketTypesIn.StartConfiguration }, // Added in 1.20.2 - TODO
|
||||
{ 0x66, PacketTypesIn.StopSound }, //
|
||||
{ 0x67, PacketTypesIn.SystemChat }, // Added in 1.19 (Wiki name: System Chat Message)
|
||||
{ 0x68, PacketTypesIn.PlayerListHeaderAndFooter }, // (Wiki name: Set Tab List Header And Footer)
|
||||
{ 0x69, PacketTypesIn.NBTQueryResponse }, // (Wiki name: Tag Query Response)
|
||||
{ 0x6A, PacketTypesIn.CollectItem }, // (Wiki name: Pickup Item)
|
||||
{ 0x6B, PacketTypesIn.EntityTeleport }, // (Wiki name: Teleport Entity)
|
||||
{ 0x6C, PacketTypesIn.Advancements }, // (Wiki name: Update Advancements) (Unused)
|
||||
{ 0x6D, PacketTypesIn.EntityProperties }, // (Wiki name: Update Attributes)
|
||||
{ 0x6E, PacketTypesIn.EntityEffect }, // Changed in 1.19 (Added "Has Factor Data" and "Factor Codec" fields) (Wiki name: Entity Effect)
|
||||
{ 0x6F, PacketTypesIn.DeclareRecipes }, // (Wiki name: Update Recipes) (Unused)
|
||||
{ 0x70, 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 Difficulty)
|
||||
{ 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.ChunkBatchReceived }, // Added in 1.20.2 - TODO
|
||||
{ 0x08, PacketTypesOut.ClientStatus }, // (Wiki name: Client Command)
|
||||
{ 0x09, PacketTypesOut.ClientSettings }, // (Wiki name: Client Information)
|
||||
{ 0x0A, PacketTypesOut.TabComplete }, // (Wiki name: Command Suggestions Request)
|
||||
{ 0x0B, PacketTypesOut.AcknowledgeConfiguration }, // Added in 1.20.2 - TODO
|
||||
{ 0x0C, PacketTypesOut.ClickWindowButton }, // (Wiki name: Click Container Button)
|
||||
{ 0x0D, PacketTypesOut.ClickWindow }, // (Wiki name: Click Container)
|
||||
{ 0x0E, PacketTypesOut.CloseWindow }, // (Wiki name: Close Container (serverbound))
|
||||
{ 0x0F, PacketTypesOut.PluginMessage }, // (Wiki name: Serverbound Plugin Message)
|
||||
{ 0x10, PacketTypesOut.EditBook }, //
|
||||
{ 0x11, PacketTypesOut.EntityNBTRequest }, // (Wiki name: Query Entity Tag)
|
||||
{ 0x12, PacketTypesOut.InteractEntity }, // (Wiki name: Interact)
|
||||
{ 0x13, PacketTypesOut.GenerateStructure }, // (Wiki name: Jigsaw Generate)
|
||||
{ 0x14, PacketTypesOut.KeepAlive }, // (Wiki name: Serverbound Keep Alive (play))
|
||||
{ 0x15, PacketTypesOut.LockDifficulty }, //
|
||||
{ 0x16, PacketTypesOut.PlayerPosition }, // (Wiki name: Move Player Position)
|
||||
{ 0x17, PacketTypesOut.PlayerPositionAndRotation }, // (Wiki name: Set Player Position and Rotation)
|
||||
{ 0x18, PacketTypesOut.PlayerRotation }, // (Wiki name: Set Player Rotation)
|
||||
{ 0x19, PacketTypesOut.PlayerMovement }, // (Wiki name: Set Player On Ground)
|
||||
{ 0x1A, PacketTypesOut.VehicleMove }, // (Wiki name: Move Vehicle (serverbound))
|
||||
{ 0x1B, PacketTypesOut.SteerBoat }, // (Wiki name: Paddle Boat)
|
||||
{ 0x1C, PacketTypesOut.PickItem }, //
|
||||
{ 0x1D, PacketTypesOut.PingRequest }, // Added in 1.20.2 - TODO
|
||||
{ 0x1E, PacketTypesOut.CraftRecipeRequest }, // (Wiki name: Place recipe)
|
||||
{ 0x1F, PacketTypesOut.PlayerAbilities }, //
|
||||
{ 0x20, PacketTypesOut.PlayerDigging }, // Changed in 1.19 (Added a "Sequence" field) (Wiki name: Player Action)
|
||||
{ 0x21, PacketTypesOut.EntityAction }, // (Wiki name: Player Command)
|
||||
{ 0x22, PacketTypesOut.SteerVehicle }, // (Wiki name: Player Input)
|
||||
{ 0x23, PacketTypesOut.Pong }, // (Wiki name: Pong (play))
|
||||
{ 0x24, PacketTypesOut.SetDisplayedRecipe }, // (Wiki name: Recipe Book Change Settings)
|
||||
{ 0x25, PacketTypesOut.SetRecipeBookState }, // (Wiki name: Recipe Book Seen Recipe)
|
||||
{ 0x26, PacketTypesOut.NameItem }, // (Wiki name: Rename Item)
|
||||
{ 0x27, PacketTypesOut.ResourcePackStatus }, // (Wiki name: Resource Pack (serverbound))
|
||||
{ 0x28, PacketTypesOut.AdvancementTab }, // (Wiki name: Seen Advancements)
|
||||
{ 0x29, PacketTypesOut.SelectTrade }, //
|
||||
{ 0x2A, PacketTypesOut.SetBeaconEffect }, // Changed in 1.19 (Added a "Secondary Effect Present" and "Secondary Effect" fields) (Wiki name: Set Beacon) - (No need to be implemented)
|
||||
{ 0x2B, PacketTypesOut.HeldItemChange }, // (Wiki name: Set Carried Item (serverbound))
|
||||
{ 0x2C, PacketTypesOut.UpdateCommandBlock }, // (Wiki name: Program Command Block)
|
||||
{ 0x2D, PacketTypesOut.UpdateCommandBlockMinecart }, // (Wiki name: Program Command Block Minecart)
|
||||
{ 0x2E, PacketTypesOut.CreativeInventoryAction }, // (Wiki name: Set Creative Mode Slot)
|
||||
{ 0x2F, PacketTypesOut.UpdateJigsawBlock }, // (Wiki name: Program Jigsaw Block)
|
||||
{ 0x30, PacketTypesOut.UpdateStructureBlock }, // (Wiki name: Program Structure Block)
|
||||
{ 0x31, PacketTypesOut.UpdateSign }, // (Wiki name: Update Sign)
|
||||
{ 0x32, PacketTypesOut.Animation }, // (Wiki name: Swing Arm)
|
||||
{ 0x33, PacketTypesOut.Spectate }, // (Wiki name: Teleport To Entity)
|
||||
{ 0x34, PacketTypesOut.PlayerBlockPlacement }, // Changed in 1.19 (Added a "Sequence" field) (Wiki name: Use Item On)
|
||||
{ 0x35, 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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -48,7 +48,7 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
{
|
||||
PacketTypePalette p = protocol switch
|
||||
{
|
||||
> Protocol18Handler.MC_1_20_Version => throw new NotImplementedException(Translations
|
||||
> Protocol18Handler.MC_1_20_2_Version => throw new NotImplementedException(Translations
|
||||
.exception_palette_packet),
|
||||
<= Protocol18Handler.MC_1_8_Version => new PacketPalette17(),
|
||||
<= Protocol18Handler.MC_1_11_2_Version => new PacketPalette110(),
|
||||
|
|
@ -64,7 +64,8 @@ namespace MinecraftClient.Protocol.Handlers
|
|||
<= Protocol18Handler.MC_1_19_Version => new PacketPalette119(),
|
||||
<= Protocol18Handler.MC_1_19_2_Version => new PacketPalette1192(),
|
||||
<= Protocol18Handler.MC_1_19_3_Version => new PacketPalette1193(),
|
||||
_ => new PacketPalette1194()
|
||||
< Protocol18Handler.MC_1_20_2_Version => new PacketPalette1194(),
|
||||
_ => new PacketPalette1202()
|
||||
};
|
||||
|
||||
p.SetForgeEnabled(forgeEnabled);
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@
|
|||
ChatMessage, //
|
||||
ChatPreview, // Added in 1.19
|
||||
ChatSuggestions, // Added in 1.19.1 (1.19.2)
|
||||
ChunkBatchFinished, // Added in 1.20.2
|
||||
ChunkBatchStarted, // Added in 1.12.2
|
||||
ChunksBiomes, // Added in 1.19.4
|
||||
ChunkData, //
|
||||
ClearTiles, //
|
||||
|
|
@ -73,6 +75,7 @@
|
|||
OpenWindow, //
|
||||
Particle, //
|
||||
Ping, //
|
||||
PingResponse, // Added in 1.20.2
|
||||
PlayerAbilities, //
|
||||
PlayerInfo, //
|
||||
PlayerListHeaderAndFooter, //
|
||||
|
|
@ -105,6 +108,7 @@
|
|||
SpawnPlayer, //
|
||||
SpawnPosition, //
|
||||
SpawnWeatherEntity, //
|
||||
StartConfiguration, // Added in 1.20.2
|
||||
Statistics, //
|
||||
StopSound, //
|
||||
SystemChat, // Added in 1.19
|
||||
|
|
|
|||
|
|
@ -5,11 +5,13 @@
|
|||
/// </summary>
|
||||
public enum PacketTypesOut
|
||||
{
|
||||
AcknowledgeConfiguration, // Added in 1.20.2
|
||||
AdvancementTab, //
|
||||
Animation, //
|
||||
ChatCommand, // Added in 1.19
|
||||
ChatMessage, //
|
||||
ChatPreview, // Added in 1.19
|
||||
ChunkBatchReceived, // Added in 1.20.2
|
||||
ClickWindow, //
|
||||
ClickWindowButton, //
|
||||
ClientSettings, //
|
||||
|
|
@ -29,6 +31,7 @@
|
|||
MessageAcknowledgment, // Added in 1.19.1 (1.19.2)
|
||||
NameItem, //
|
||||
PickItem, //
|
||||
PingRequest, // Added in 1.20.2
|
||||
PlayerAbilities, //
|
||||
PlayerBlockPlacement, //
|
||||
PlayerDigging, //
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -136,7 +136,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, 762, 763};
|
||||
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, 763, 764};
|
||||
|
||||
if (Array.IndexOf(supportedVersions_Protocol18, ProtocolVersion) > -1)
|
||||
return new Protocol18Handler(Client, ProtocolVersion, Handler, forgeInfo);
|
||||
|
|
@ -322,6 +322,8 @@ namespace MinecraftClient.Protocol
|
|||
case "1.20":
|
||||
case "1.20.1":
|
||||
return 763;
|
||||
case "1.20.2":
|
||||
return 764;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -401,6 +403,7 @@ namespace MinecraftClient.Protocol
|
|||
761 => "1.19.3",
|
||||
762 => "1.19.4",
|
||||
763 => "1.20",
|
||||
764 => "1.20.2",
|
||||
_ => "0.0"
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue