Skip to content

Commit

Permalink
1.20.2 update (#391)
Browse files Browse the repository at this point in the history
* Update protocol version & client states

* Add configuration packets

* Move some packets outside

Mostly because these packets are used in configuration phase now too

* Handle configuration packets

* Send keep alives for configuration/play state

* Finish configuration state stuff

* Update login packet

* Please 😭

* Update assets

* Make boolean types actual booleans

* Add armor trims to registry

* Write Armor trim codecs to registry

* Update clientbound packet ids

* Update serverbound packet ids

* Update serverbound packet ids in ClientHandler

* Update the rest of the assets

* Oop

* Set server version to 1.20.2

* Don't send nbt root tag name if networked
  • Loading branch information
Tides authored Nov 15, 2023
1 parent 4f14c58 commit 63c15a8
Show file tree
Hide file tree
Showing 132 changed files with 21,128 additions and 19,307 deletions.
7 changes: 7 additions & 0 deletions Obsidian.API/Registry/Codecs/ArmorTrims/TrimDescription.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
namespace Obsidian.API.Registry.Codecs.ArmorTrims;
public sealed class TrimDescription
{
public required string Translate { get; init; }

public string? Color { get; init; }
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
namespace Obsidian.API.Registry.Codecs.ArmorTrims.TrimMaterial;
public sealed class TrimMaterialCodec : ICodec
{
public required string Name { get; init; }

public required int Id { get; init; }

public required TrimMaterialElement Element { get; init; }
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
namespace Obsidian.API.Registry.Codecs.ArmorTrims.TrimMaterial;
public sealed class TrimMaterialElement
{
public required string Ingredient { get; init; }

public required string AssetName { get; init; }

public required double ItemModelIndex { get; init; }

public required TrimDescription Description { get; init; }

public Dictionary<string, string>? OverrideArmorMaterials { get; init; }
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
namespace Obsidian.API.Registry.Codecs.ArmorTrims.TrimPattern;
public sealed class TrimPatternCodec : ICodec
{
public required string Name { get; init; }

public required int Id { get; init; }

public required TrimPatternElement Element { get; init; }
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
namespace Obsidian.API.Registry.Codecs.ArmorTrims.TrimPattern;
public sealed class TrimPatternElement
{
public required string TemplateItem { get; init; }

public required TrimDescription Description { get; init; }

public required string AssetId { get; init; }

public required bool Decal { get; init; }
}
4 changes: 2 additions & 2 deletions Obsidian.API/_Enums/GameEvent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ public enum GameEvent : int
EntityInteract,
EntityMount,
EntityPlace,
EntityRoar,
EntityShake,
EntityAction,
Equip,
Explode,
Flap,
Expand All @@ -47,6 +46,7 @@ public enum GameEvent : int
Step,
Swim,
Teleport,
Unequip,
Resonate1,
Resonate2,
Resonate3,
Expand Down
5 changes: 4 additions & 1 deletion Obsidian.API/_Enums/ProtocolVersion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,8 @@ public enum ProtocolVersion
v1_19_4 = 762,

[Description("1.20")]
v1_20 = 763
v1_20 = 763,

[Description("1.20.2")]
v1_20_2 = 764
}
Loading

0 comments on commit 63c15a8

Please sign in to comment.