mirror of
https://github.com/MCCTeam/Minecraft-Console-Client
synced 2025-10-14 21:22:49 +00:00
Implemented 1.19.4, first pass, light testing
This commit is contained in:
parent
e44ade8688
commit
5d4ea515a7
6 changed files with 250 additions and 9 deletions
|
|
@ -46,7 +46,7 @@ namespace MinecraftClient
|
||||||
|
|
||||||
public const string Version = MCHighestVersion;
|
public const string Version = MCHighestVersion;
|
||||||
public const string MCLowestVersion = "1.4.6";
|
public const string MCLowestVersion = "1.4.6";
|
||||||
public const string MCHighestVersion = "1.19.3";
|
public const string MCHighestVersion = "1.19.4";
|
||||||
public static readonly string? BuildInfo = null;
|
public static readonly string? BuildInfo = null;
|
||||||
|
|
||||||
private static Tuple<Thread, CancellationTokenSource>? offlinePrompt = null;
|
private static Tuple<Thread, CancellationTokenSource>? offlinePrompt = null;
|
||||||
|
|
|
||||||
|
|
@ -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)
|
public PacketTypePalette GetTypeHandler(int protocol)
|
||||||
{
|
{
|
||||||
PacketTypePalette p;
|
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);
|
throw new NotImplementedException(Translations.exception_palette_packet);
|
||||||
|
|
||||||
if (protocol <= Protocol18Handler.MC_1_8_Version)
|
if (protocol <= Protocol18Handler.MC_1_8_Version)
|
||||||
|
|
@ -76,8 +76,10 @@ namespace MinecraftClient.Protocol.Handlers
|
||||||
p = new PacketPalette119();
|
p = new PacketPalette119();
|
||||||
else if (protocol <= Protocol18Handler.MC_1_19_2_Version)
|
else if (protocol <= Protocol18Handler.MC_1_19_2_Version)
|
||||||
p = new PacketPalette1192();
|
p = new PacketPalette1192();
|
||||||
else
|
else if (protocol <= Protocol18Handler.MC_1_19_3_Version)
|
||||||
p = new PacketPalette1193();
|
p = new PacketPalette1193();
|
||||||
|
else
|
||||||
|
p = new PacketPalette1194();
|
||||||
|
|
||||||
p.SetForgeEnabled(forgeEnabled);
|
p.SetForgeEnabled(forgeEnabled);
|
||||||
return p;
|
return p;
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@
|
||||||
ActionBar, //
|
ActionBar, //
|
||||||
Advancements, //
|
Advancements, //
|
||||||
AttachEntity, //
|
AttachEntity, //
|
||||||
|
Bundle, // Added in 1.19.4
|
||||||
BlockAction, //
|
BlockAction, //
|
||||||
BlockBreakAnimation, //
|
BlockBreakAnimation, //
|
||||||
BlockChange, //
|
BlockChange, //
|
||||||
|
|
@ -20,12 +21,14 @@
|
||||||
ChatMessage, //
|
ChatMessage, //
|
||||||
ChatPreview, // Added in 1.19
|
ChatPreview, // Added in 1.19
|
||||||
ChatSuggestions, // Added in 1.19.1 (1.19.2)
|
ChatSuggestions, // Added in 1.19.1 (1.19.2)
|
||||||
|
ChunksBiomes, // Added in 1.19.4
|
||||||
ChunkData, //
|
ChunkData, //
|
||||||
ClearTiles, //
|
ClearTiles, //
|
||||||
CloseWindow, //
|
CloseWindow, //
|
||||||
CollectItem, //
|
CollectItem, //
|
||||||
CombatEvent, //
|
CombatEvent, //
|
||||||
CraftRecipeResponse, //
|
CraftRecipeResponse, //
|
||||||
|
DamageEvent, // Added in 1.19.4
|
||||||
DeathCombatEvent, //
|
DeathCombatEvent, //
|
||||||
DeclareCommands, //
|
DeclareCommands, //
|
||||||
DeclareRecipes, //
|
DeclareRecipes, //
|
||||||
|
|
@ -54,6 +57,7 @@
|
||||||
FeatureFlags, // Added in 1.19.3
|
FeatureFlags, // Added in 1.19.3
|
||||||
HeldItemChange, //
|
HeldItemChange, //
|
||||||
HideMessage, // Added in 1.19.1 (1.19.2)
|
HideMessage, // Added in 1.19.1 (1.19.2)
|
||||||
|
HurtAnimation, // Added in 1.19.4
|
||||||
InitializeWorldBorder, //
|
InitializeWorldBorder, //
|
||||||
JoinGame, //
|
JoinGame, //
|
||||||
KeepAlive, //
|
KeepAlive, //
|
||||||
|
|
|
||||||
|
|
@ -64,6 +64,7 @@ namespace MinecraftClient.Protocol.Handlers
|
||||||
internal const int MC_1_19_Version = 759;
|
internal const int MC_1_19_Version = 759;
|
||||||
internal const int MC_1_19_2_Version = 760;
|
internal const int MC_1_19_2_Version = 760;
|
||||||
internal const int MC_1_19_3_Version = 761;
|
internal const int MC_1_19_3_Version = 761;
|
||||||
|
internal const int MC_1_19_4_Version = 762;
|
||||||
|
|
||||||
private int compression_treshold = 0;
|
private int compression_treshold = 0;
|
||||||
private int autocomplete_transaction_id = 0;
|
private int autocomplete_transaction_id = 0;
|
||||||
|
|
@ -477,6 +478,35 @@ namespace MinecraftClient.Protocol.Handlers
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
case PacketTypesIn.Bundle: // Empty as of 1.19.4, just skip
|
||||||
|
return true;
|
||||||
|
case PacketTypesIn.DamageEvent:
|
||||||
|
dataTypes.SkipNextVarInt(packetData);
|
||||||
|
var sourceType = dataTypes.ReadNextVarInt(packetData);
|
||||||
|
|
||||||
|
if (sourceType != 0)
|
||||||
|
{
|
||||||
|
if(dataTypes.ReadNextBool(packetData))
|
||||||
|
dataTypes.SkipNextVarInt(packetData);
|
||||||
|
|
||||||
|
if(dataTypes.ReadNextBool(packetData))
|
||||||
|
dataTypes.SkipNextVarInt(packetData);
|
||||||
|
|
||||||
|
if(dataTypes.ReadNextBool(packetData))
|
||||||
|
dataTypes.ReadNextLocation(packetData);
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: Write a function to use this data
|
||||||
|
break;
|
||||||
|
case PacketTypesIn.HurtAnimation:
|
||||||
|
dataTypes.SkipNextVarInt(packetData);
|
||||||
|
dataTypes.ReadNextFloat(packetData);
|
||||||
|
// TODO: Write a function to use this data
|
||||||
|
break;
|
||||||
|
case PacketTypesIn.ChunksBiomes:
|
||||||
|
// TODO: Use ?
|
||||||
|
// Not clear for what this is used as right of now.
|
||||||
|
return true;
|
||||||
case PacketTypesIn.DeclareCommands:
|
case PacketTypesIn.DeclareCommands:
|
||||||
if (protocolVersion >= MC_1_19_Version)
|
if (protocolVersion >= MC_1_19_Version)
|
||||||
{
|
{
|
||||||
|
|
@ -925,8 +955,11 @@ namespace MinecraftClient.Protocol.Handlers
|
||||||
LastYaw = yaw; LastPitch = pitch;
|
LastYaw = yaw; LastPitch = pitch;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (protocolVersion >= MC_1_17_Version)
|
if (protocolVersion >= MC_1_17_Version && protocolVersion < MC_1_19_4_Version)
|
||||||
dataTypes.ReadNextBool(packetData); // Dismount Vehicle - 1.17 and above
|
dataTypes.ReadNextBool(packetData); // Dismount Vehicle - 1.17 and abo
|
||||||
|
|
||||||
|
if(protocolVersion < MC_1_19_4_Version)
|
||||||
|
dataTypes.ReadNextVarInt(packetData);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case PacketTypesIn.ChunkData:
|
case PacketTypesIn.ChunkData:
|
||||||
|
|
@ -1257,9 +1290,20 @@ namespace MinecraftClient.Protocol.Handlers
|
||||||
break;
|
break;
|
||||||
case PacketTypesIn.ServerData:
|
case PacketTypesIn.ServerData:
|
||||||
string motd = "-";
|
string motd = "-";
|
||||||
bool hasMotd = dataTypes.ReadNextBool(packetData);
|
|
||||||
if (hasMotd)
|
bool hasMotd = false;
|
||||||
|
if (protocolVersion < MC_1_19_4_Version)
|
||||||
|
{
|
||||||
|
hasMotd = dataTypes.ReadNextBool(packetData);
|
||||||
|
|
||||||
|
if (hasMotd)
|
||||||
|
motd = ChatParser.ParseText(dataTypes.ReadNextString(packetData));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
hasMotd = true;
|
||||||
motd = ChatParser.ParseText(dataTypes.ReadNextString(packetData));
|
motd = ChatParser.ParseText(dataTypes.ReadNextString(packetData));
|
||||||
|
}
|
||||||
|
|
||||||
string iconBase64 = "-";
|
string iconBase64 = "-";
|
||||||
bool hasIcon = dataTypes.ReadNextBool(packetData);
|
bool hasIcon = dataTypes.ReadNextBool(packetData);
|
||||||
|
|
@ -1899,7 +1943,7 @@ namespace MinecraftClient.Protocol.Handlers
|
||||||
Dictionary<int, object?> metadata = dataTypes.ReadNextMetadata(packetData, itemPalette);
|
Dictionary<int, object?> metadata = dataTypes.ReadNextMetadata(packetData, itemPalette);
|
||||||
|
|
||||||
int healthField; // See https://wiki.vg/Entity_metadata#Living_Entity
|
int healthField; // See https://wiki.vg/Entity_metadata#Living_Entity
|
||||||
if (protocolVersion > MC_1_19_3_Version)
|
if (protocolVersion > MC_1_19_4_Version)
|
||||||
throw new NotImplementedException(Translations.exception_palette_healthfield);
|
throw new NotImplementedException(Translations.exception_palette_healthfield);
|
||||||
else if (protocolVersion >= MC_1_17_Version) // 1.17 and above
|
else if (protocolVersion >= MC_1_17_Version) // 1.17 and above
|
||||||
healthField = 9;
|
healthField = 9;
|
||||||
|
|
|
||||||
|
|
@ -134,7 +134,7 @@ namespace MinecraftClient.Protocol
|
||||||
if (Array.IndexOf(supportedVersions_Protocol16, ProtocolVersion) > -1)
|
if (Array.IndexOf(supportedVersions_Protocol16, ProtocolVersion) > -1)
|
||||||
return new Protocol16Handler(Client, ProtocolVersion, Handler);
|
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)
|
if (Array.IndexOf(supportedVersions_Protocol18, ProtocolVersion) > -1)
|
||||||
return new Protocol18Handler(Client, ProtocolVersion, Handler, forgeInfo);
|
return new Protocol18Handler(Client, ProtocolVersion, Handler, forgeInfo);
|
||||||
|
|
@ -315,6 +315,8 @@ namespace MinecraftClient.Protocol
|
||||||
return 760;
|
return 760;
|
||||||
case "1.19.3":
|
case "1.19.3":
|
||||||
return 761;
|
return 761;
|
||||||
|
case "1.19.4":
|
||||||
|
return 762;
|
||||||
default:
|
default:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
@ -392,6 +394,7 @@ namespace MinecraftClient.Protocol
|
||||||
case 759: return "1.19";
|
case 759: return "1.19";
|
||||||
case 760: return "1.19.2";
|
case 760: return "1.19.2";
|
||||||
case 761: return "1.19.3";
|
case 761: return "1.19.3";
|
||||||
|
case 762: return "1.19.4";
|
||||||
default: return "0.0";
|
default: return "0.0";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue