Update 1.21.5 (#485)

* Update Assets

* Update Protocol version

* Fix generators

* Add WolfSoundVariant and cleanup ICodec api

* Add the rest of the variants to assets

* Load required variants

* Don't send data array length

Author: Tides

Obsidian.API/Inventory/DataComponents/ComponentBuilder.Map.cs

@@ -21,8 +21,8 @@ public partial class ComponentBuilder
         () => new CanBreakDataComponent(),
         () => AttributeModifiers,
         () => CustomModelData,
-        () => HideAdditionalTooltip,
-        () => HideTooltip,
+        //() => HideAdditionalTooltip,
+        //() => HideTooltip,
         () => RepairCost,
         () => CreativeSlotLock,
         () => EnchantmentGlintOverride,

Obsidian.API/Inventory/DataComponents/ComponentBuilder.cs

@@ -50,9 +50,9 @@ public static partial class ComponentBuilder
         (writer, value) => writer.WriteChat(value),
         (reader) => reader.ReadChat());
 
-    public static SimpleDataComponent HideAdditionalTooltip => new(DataComponentType.HideAdditionalTooltip, "minecraft:hide_additional_tooltip");
+    //public static SimpleDataComponent HideAdditionalTooltip => new(DataComponentType.HideAdditionalTooltip, "minecraft:hide_additional_tooltip");
 
-    public static SimpleDataComponent HideTooltip => new(DataComponentType.HideTooltip, "minecraft:hide_tooltip");
+    //public static SimpleDataComponent HideTooltip => new(DataComponentType.HideTooltip, "minecraft:hide_tooltip");
 
     /// <summary>
     /// Accumulated anvil usage cost. The client displays "Too Expensive" if the value is greater than 40 and the player is not in creative mode 

Obsidian.API/Obsidian.API.csproj

@@ -85,6 +85,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<ProjectReference Include="..\Obsidian.Nbt\Obsidian.Nbt.csproj" />
 		<ProjectReference Include="..\Obsidian.SourceGenerators\Obsidian.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
 	</ItemGroup>
 </Project>

Obsidian.API/Registry/Codecs/ArmorTrims/TrimMaterial/TrimMaterialCodec.cs

@@ -1,9 +1,34 @@
-namespace Obsidian.API.Registry.Codecs.ArmorTrims.TrimMaterial;
+using Obsidian.Nbt;
+using Obsidian.Nbt.Interfaces;
+
+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; }
+
+    public void WriteElement(INbtWriter writer)
+    {
+        var description = new NbtList(NbtTagType.String, "description")
+        {
+            new NbtTag<string>("translate", this.Element.Description.Translate),
+            new NbtTag<string>("color", this.Element.Description.Color!)
+        };
+
+        if (this.Element.OverrideArmorAssets is Dictionary<string, string> overrideArmorMats)
+        {
+            var overrideArmorAssets = new NbtCompound("override_armor_assets");
+
+            foreach (var (type, replacement) in overrideArmorMats)
+                overrideArmorAssets.Add(new NbtTag<string>(type, replacement));
+
+            writer.WriteTag(overrideArmorAssets);
+        }
+
+        writer.WriteString("asset_name", this.Element.AssetName);
+        writer.WriteTag(description);
+    }
 }

Obsidian.API/Registry/Codecs/ArmorTrims/TrimMaterial/TrimMaterialElement.cs

@@ -1,10 +1,6 @@
-using Obsidian.API.Registries;
-
-namespace Obsidian.API.Registry.Codecs.ArmorTrims.TrimMaterial;
+namespace Obsidian.API.Registry.Codecs.ArmorTrims.TrimMaterial;
 public sealed class TrimMaterialElement : INetworkSerializable<TrimMaterialElement>
 {
-    public required string Ingredient { get; init; }
-
     public required string AssetName { get; init; }
 
     public required TrimDescription Description { get; init; }
@@ -14,7 +10,6 @@ public sealed class TrimMaterialElement : INetworkSerializable<TrimMaterialEleme
     public static TrimMaterialElement Read(INetStreamReader reader) => new()
     {
         AssetName = reader.ReadString(),
-        Ingredient = ItemsRegistry.Get(reader.ReadVarInt()).UnlocalizedName,
         OverrideArmorAssets = reader.ReadLengthPrefixedArray(() =>
         {
             return (rootId: reader.ReadString(), name: reader.ReadString());
@@ -25,7 +20,6 @@ public sealed class TrimMaterialElement : INetworkSerializable<TrimMaterialEleme
     public static void Write(TrimMaterialElement element, INetStreamWriter writer)
     {
         writer.WriteString(element.AssetName);
-        writer.WriteVarInt(ItemsRegistry.Get(element.Ingredient).Id);
 
         var count = element.OverrideArmorAssets?.Count ?? 0;
         writer.WriteVarInt(count);

Obsidian.API/Registry/Codecs/ArmorTrims/TrimPattern/TrimPatternCodec.cs

@@ -1,9 +1,24 @@
-namespace Obsidian.API.Registry.Codecs.ArmorTrims.TrimPattern;
+using Obsidian.Nbt;
+using Obsidian.Nbt.Interfaces;
+
+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; }
+
+    public void WriteElement(INbtWriter writer)
+    {
+        var description = new NbtList(NbtTagType.String, "description")
+        {
+            new NbtTag<string>("translate", this.Element.Description.Translate)
+        };
+
+        writer.WriteString("asset_id", this.Element.AssetId);
+        writer.WriteBool("decal", this.Element.Decal);
+        writer.WriteTag(description);
+    }
 }

Obsidian.API/Registry/Codecs/ArmorTrims/TrimPattern/TrimPatternElement.cs

@@ -1,10 +1,6 @@
-using Obsidian.API.Registries;
-
-namespace Obsidian.API.Registry.Codecs.ArmorTrims.TrimPattern;
+namespace Obsidian.API.Registry.Codecs.ArmorTrims.TrimPattern;
 public sealed class TrimPatternElement : INetworkSerializable<TrimPatternElement>
 {
-    public required string TemplateItem { get; init; }
-
     public required TrimDescription Description { get; init; }
 
     public required string AssetId { get; init; }
@@ -14,15 +10,13 @@ public sealed class TrimPatternElement : INetworkSerializable<TrimPatternElement
     public static TrimPatternElement Read(INetStreamReader reader) => new()
     {
         AssetId = reader.ReadString(),
-        TemplateItem = ItemsRegistry.Get(reader).UnlocalizedName,
         Description = TrimDescription.Read(reader),
         Decal = reader.ReadBoolean()
     };
 
     public static void Write(TrimPatternElement value, INetStreamWriter writer)
     {
         writer.WriteString(value.AssetId);
-        writer.WriteVarInt(ItemsRegistry.Get(value.TemplateItem).Id);
 
         TrimDescription.Write(value.Description, writer);
         writer.WriteBoolean(value.Decal);

Obsidian.API/Registry/Codecs/BiomeVariantCodec.cs

@@ -0,0 +1,14 @@
+
+using Obsidian.Nbt.Interfaces;
+
+namespace Obsidian.API.Registry.Codecs;
+public sealed class BiomeVariantCodec : ICodec
+{
+    public required string Name { get; init; }
+
+    public required int Id { get; init; }
+
+    public required BiomeVariantElement Element { get; set; }
+
+    public void WriteElement(INbtWriter writer) => this.Element.Write(writer);
+}

Obsidian.API/Registry/Codecs/BiomeVariantElement.cs

@@ -0,0 +1,33 @@
+using Obsidian.Nbt;
+using Obsidian.Nbt.Interfaces;
+
+namespace Obsidian.API.Registry.Codecs;
+public sealed record class BiomeVariantElement : INbtSerializable
+{
+    public required string AssetId { get; set; }
+
+    public string? Model { get; set; }
+
+    public List<SpawnConditionElement> SpawnConditions { get; set; }
+
+    public void Write(INbtWriter writer)
+    {
+        writer.WriteString("asset_id", this.AssetId);
+
+        if(!string.IsNullOrEmpty(this.Model))
+            writer.WriteString("model", this.Model);
+
+        writer.WriteListStart("spawn_conditions", NbtTagType.Compound, this.SpawnConditions.Count);
+
+        foreach (var spawnCondition in this.SpawnConditions)
+        {
+            writer.WriteCompoundStart();
+
+            spawnCondition.Write(writer);
+
+            writer.EndCompound();
+        }
+
+        writer.EndList();
+    }
+}

Obsidian.API/Registry/Codecs/Biomes/BiomeAdditionSound.cs

@@ -1,18 +1,43 @@
-namespace Obsidian.API.Registry.Codecs.Biomes;
+using Obsidian.Nbt;
+using Obsidian.Nbt.Interfaces;
 
-public sealed record class BiomeAdditionSound
+namespace Obsidian.API.Registry.Codecs.Biomes;
+
+public sealed record class BiomeAdditionSound : INbtSerializable
 {
     public required string Sound { get; set; }
 
     public required double TickChance { get; set; }
+
+    public void Write(INbtWriter writer)
+    {
+        writer.WriteCompoundStart("additions_sound");
+
+        writer.WriteString("sound", this.Sound);
+        writer.WriteDouble("tick_chance", this.TickChance);
+
+        writer.EndCompound();
+    }
 }
 
-public sealed record class BiomeMoodSound
+public sealed record class BiomeMoodSound : INbtSerializable
 {
     public required string Sound { get; set; }
 
     public required double Offset { get; set; }
 
     public required int TickDelay { get; set; }
     public required int BlockSearchExtent { get; set; }
+
+    public void Write(INbtWriter writer)
+    {
+        writer.WriteCompoundStart("mood_sound");
+
+        writer.WriteString("sound", this.Sound);
+        writer.WriteDouble("offset", this.Offset);
+        writer.WriteInt("tick_delay", this.TickDelay);
+        writer.WriteInt("block_search_extent", this.BlockSearchExtent);
+
+        writer.EndCompound();
+    }
 }