Move codecs and item registry to api (#461)

ObsidianMC · Dec 10, 2024 · d08ae37 · d08ae37
1 parent 2b99b43
commit d08ae37
Show file tree

Hide file tree

Showing 24 changed files with 64 additions and 71 deletions.
diff --git a/Obsidian.API/Obsidian.API.csproj b/Obsidian.API/Obsidian.API.csproj
@@ -41,6 +41,9 @@
 		<AdditionalFiles Include="..\Obsidian\Assets\items.json" Link="Assets\items.json" />
 		<AdditionalFiles Include="..\Obsidian\Assets\fluids.json" Link="Assets\fluids.json" />
 		<AdditionalFiles Include="..\Obsidian\Assets\sounds.json" Link="Assets\sounds.json" />
+		<AdditionalFiles Include="..\Obsidian\Assets\tags.json" Link="Assets\tags.json" />
+
+		<AdditionalFiles Include="..\Obsidian\Assets\Codecs\**\*.json" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/Obsidian/Registries/CodecRegistry.cs → Obsidian.API/Registries/CodecRegistry.cs b/Obsidian/Registries/CodecRegistry.cs → Obsidian.API/Registries/CodecRegistry.cs
@@ -3,15 +3,16 @@
 using Obsidian.API.Registry.Codecs.Dimensions;
 using System.Diagnostics.CodeAnalysis;
 
-namespace Obsidian.Registries;
+namespace Obsidian.API.Registries;
 public static partial class CodecRegistry
 {
-    public static bool TryGetChatType(string resourceId, [MaybeNullWhen(false)] out ChatTypeCodec codec) =>
+    public static bool TryGetChatType(string resourceId, [MaybeNullWhen(false)] out ChatTypeCodec? codec) =>
         ChatType.All.TryGetValue(resourceId, out codec);
 
-    public static bool TryGetBiome(string resourceId, [MaybeNullWhen(false)] out BiomeCodec codec) =>
+    public static bool TryGetBiome(string resourceId, [MaybeNullWhen(false)] out BiomeCodec? codec) =>
         Biomes.All.TryGetValue(resourceId, out codec);
 
-    public static bool TryGetDimension(string resourceId, [MaybeNullWhen(false)] out DimensionCodec codec) =>
+    public static bool TryGetDimension(string resourceId, [MaybeNullWhen(false)] out DimensionCodec? codec) =>
         Dimensions.All.TryGetValue(resourceId, out codec);
 }
+
diff --git a/Obsidian/Registries/ItemsRegistry.cs → Obsidian.API/Registries/ItemsRegistry.cs b/Obsidian/Registries/ItemsRegistry.cs → Obsidian.API/Registries/ItemsRegistry.cs
@@ -1,14 +1,16 @@
 using Obsidian.API.Crafting;
 using Obsidian.API.Utilities;
 
-namespace Obsidian.Registries;
+namespace Obsidian.API.Registries;
 public static partial class ItemsRegistry
 {
     public static Item Get(int id) => Items.Values.SingleOrDefault(x => x.Id == id);
     public static Item Get(Material mat) => Items.GetValueOrDefault(mat);
     public static Item Get(string unlocalizedName) =>
         Items.Values.SingleOrDefault(x => x.UnlocalizedName.EqualsIgnoreCase(unlocalizedName));
 
+    public static bool TryGet(Material mat, out Item item) => Items.TryGetValue(mat, out item);
+
     public static ItemStack Get(string unlocalizedName, short count, ItemMeta? meta = null) => new(Get(unlocalizedName).Type, count, meta);
 
     public static ItemStack GetSingleItem(Material mat, ItemMeta? meta = null) => new(mat, 1, meta);
@@ -30,8 +32,8 @@ public static Ingredient GetIngredientFromTag(string tag, short count)
         return ingredient;
     }
 
-    public static Ingredient GetIngredientFromName(string name, short count) => new()
-    {
+    public static Ingredient GetIngredientFromName(string name, short count) =>
+    [
         Get(name, count)
-    };
+    ];
 }
diff --git a/Obsidian.API/_Types/Inventory/Item.cs b/Obsidian.API/_Types/Inventory/Item.cs
@@ -1,20 +1,24 @@
-namespace Obsidian.API;
+using System.Diagnostics.CodeAnalysis;
 
-public struct Item
+namespace Obsidian.API;
+
+public readonly struct Item
 {
-    public string UnlocalizedName { get; }
+    public required string UnlocalizedName { get; init; }
 
-    public Material Type { get; }
+    public required Material Type { get; init; }
 
-    public short Id { get; internal set; }
+    public required short Id { get; init; }
 
+    [SetsRequiredMembers]
     public Item(int id, string unlocalizedName, Material type)
     {
         this.Id = (short)id;
         this.UnlocalizedName = unlocalizedName;
         this.Type = type;
     }
 
+    [SetsRequiredMembers]
     public Item(Item item)
     {
         this.Id = item.Id;

diff --git a/Obsidian.API/_Types/Tag.cs b/Obsidian.API/_Types/Tag.cs
@@ -0,0 +1,9 @@
+namespace Obsidian.API;
+public sealed record class Tag
+{
+    public required string Name { get; init; }
+    public required string Type { get; init; }
+    public bool Replace { get; init; }
+    public required int[] Entries { get; init; }
+    public int Count => Entries.Length;
+}
diff --git a/Obsidian.SourceGenerators/Registry/RegistryAssetsGenerator.Codecs.cs b/Obsidian.SourceGenerators/Registry/RegistryAssetsGenerator.Codecs.cs
@@ -23,7 +23,7 @@ private static void GenerateCodecs(Assets assets, SourceProductionContext ctx)
             .Using("Obsidian.API.Registry.Codecs.PaintingVariant")
             .Using("System.Collections.Frozen")
             .Line()
-            .Namespace("Obsidian.Registries")
+            .Namespace("Obsidian.API.Registries")
             .Line()
             .Type("public static partial class CodecRegistry");
 
@@ -59,6 +59,11 @@ private static void GenerateCodecs(Assets assets, SourceProductionContext ctx)
                     builder.ParseProperty(value, ctx);
                     return;
                 }
+                else if (value.ValueKind == JsonValueKind.Array)
+                {
+                    builder.ParseArray(value, ctx);
+                    return;
+                }
 
                 builder.AppendValueType(value, ctx);
             }, ctx);

diff --git a/Obsidian.SourceGenerators/Registry/RegistryAssetsGenerator.Items.cs b/Obsidian.SourceGenerators/Registry/RegistryAssetsGenerator.Items.cs
@@ -8,23 +8,31 @@ private static void GenerateItems(Assets assets, SourceProductionContext context
     {
         var builder = new CodeBuilder();
         builder.Using("System.Collections.Generic");
+        builder.Using("System.Collections.Frozen");
         builder.Using("Obsidian.API");
         builder.Using("Obsidian.API.Inventory");
         builder.Line();
-        builder.Namespace("Obsidian.Registries");
+        builder.Namespace("Obsidian.API.Registries");
         builder.Line();
         builder.Type("public static partial class ItemsRegistry");
 
-        builder.Statement("internal static Dictionary<Material, Item> Items = new()");
+        foreach (Item item in assets.Items)
+        {
+            var name = item.Name;
+
+            builder.Line($"public static Item {name} {{ get; }} = new Item({item.Id}, \"{item.Tag}\", Material.{name});");
+        }
+
+        builder.Statement("internal static FrozenDictionary<Material, Item> Items = new Dictionary<Material, Item>()");
 
         foreach (Item item in assets.Items)
         {
             var name = item.Name;
 
-            builder.Line($"{{ Material.{name}, new Item({item.Id}, \"{item.Tag}\", Material.{name}) }},");
+            builder.Line($"{{ Material.{name}, {name} }},");
         }
 
-        builder.EndScope(semicolon: true);
+        builder.EndScope(".ToFrozenDictionary()", semicolon: true);
 
         builder.EndScope();
 

diff --git a/Obsidian.SourceGenerators/Registry/RegistryAssetsGenerator.Tags.cs b/Obsidian.SourceGenerators/Registry/RegistryAssetsGenerator.Tags.cs
@@ -8,11 +8,10 @@ public partial class RegistryAssetsGenerator
     private static void GenerateTags(Assets assets, SourceProductionContext context)
     {
         var builder = new CodeBuilder();
-        builder.Using("Obsidian.Net.Packets.Play.Clientbound");
         builder.Line();
-        builder.Namespace("Obsidian.Registries");
+        builder.Namespace("Obsidian.API.Registries");
         builder.Line();
-        builder.Type("internal static class TagsRegistry");
+        builder.Type("public static class TagsRegistry");
 
         var tags = assets.Tags.GroupBy(tag => tag.Parent).ToDictionary(x => x.Key, x => x.ToImmutableList());
         var skip = new List<string>();

diff --git a/Obsidian.SourceGenerators/Registry/RegistryAssetsGenerator.cs b/Obsidian.SourceGenerators/Registry/RegistryAssetsGenerator.cs
@@ -25,13 +25,13 @@ private void Generate(SourceProductionContext context, (Compilation compilation,
 
         if (assembly == "Obsidian")
         {
-            GenerateTags(assets, context);
-            GenerateItems(assets, context);
             GenerateBlockIds(assets, context);
-            GenerateCodecs(assets, context);
         }
         else if (assembly == "Obsidian.API")
         {
+            GenerateTags(assets, context);
+            GenerateItems(assets, context);
+            GenerateCodecs(assets, context);
             GenerateMaterials(assets, context);
             GenerateSounds(assets, context);
         }

diff --git a/Obsidian/Assets/biomes.json → Obsidian/Assets/Codecs/biomes.json b/Obsidian/Assets/biomes.json → Obsidian/Assets/Codecs/biomes.json
diff --git a/Obsidian/Assets/chat_type.json → Obsidian/Assets/Codecs/chat_type.json b/Obsidian/Assets/chat_type.json → Obsidian/Assets/Codecs/chat_type.json
diff --git a/Obsidian/Assets/damage_type.json → Obsidian/Assets/Codecs/damage_type.json b/Obsidian/Assets/damage_type.json → Obsidian/Assets/Codecs/damage_type.json
diff --git a/Obsidian/Assets/dimensions.json → Obsidian/Assets/Codecs/dimensions.json b/Obsidian/Assets/dimensions.json → Obsidian/Assets/Codecs/dimensions.json
diff --git a/Obsidian/Assets/painting_variant.json → Obsidian/Assets/Codecs/painting_variant.json b/Obsidian/Assets/painting_variant.json → Obsidian/Assets/Codecs/painting_variant.json
diff --git a/Obsidian/Assets/trim_material.json → Obsidian/Assets/Codecs/trim_material.json b/Obsidian/Assets/trim_material.json → Obsidian/Assets/Codecs/trim_material.json
diff --git a/Obsidian/Assets/trim_pattern.json → Obsidian/Assets/Codecs/trim_pattern.json b/Obsidian/Assets/trim_pattern.json → Obsidian/Assets/Codecs/trim_pattern.json
diff --git a/Obsidian/Assets/wolf_variant.json → Obsidian/Assets/Codecs/wolf_variant.json b/Obsidian/Assets/wolf_variant.json → Obsidian/Assets/Codecs/wolf_variant.json
diff --git a/Obsidian/BlockUpdate.cs b/Obsidian/BlockUpdate.cs
@@ -1,5 +1,4 @@
-using Obsidian.Registries;
-using Obsidian.WorldData;
+using Obsidian.WorldData;
 
 namespace Obsidian;
 

diff --git a/Obsidian/GlobalUsings.cs b/Obsidian/GlobalUsings.cs
@@ -1,4 +1,5 @@
 global using Obsidian.API;
+global using Obsidian.API.Registries;
 global using Obsidian.Utilities;
 global using System;
 global using System.Collections.Concurrent;

diff --git a/Obsidian/Obsidian.csproj b/Obsidian/Obsidian.csproj
@@ -44,10 +44,6 @@
 		</None>
 	</ItemGroup>
 
-	<ItemGroup>
-		<Compile Remove="Serializer\Enums\FieldType.cs" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 	</ItemGroup>
@@ -62,27 +58,13 @@
 		<PackageReference Include="SharpNoise" Version="0.12.1.1" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<EmbeddedResource Include="Assets/*.*" CopyToOutputDirectory="PreserveNewest" />
-		<EmbeddedResource Include="Assets/Structures/*.*" CopyToOutputDirectory="PreserveNewest" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<Compile Remove="$(CompilerGeneratedFilesOutputPath)/**/*.cs" />
-		<Compile Remove="Commands\Framework\ArgumentParsers\**" />
 	</ItemGroup>
 
 	<ItemGroup>
 		<AdditionalFiles Include="Assets\**\*.json" />
-	</ItemGroup>
-
-	<ItemGroup>
-	  <EmbeddedResource Remove="Commands\Framework\ArgumentParsers\**" />
-	  <None Remove="Commands\Framework\ArgumentParsers\**" />
-	</ItemGroup>
-
-	<ItemGroup>
-	  <AdditionalFiles Remove="Assets\sounds.json" />
+		<EmbeddedResource Include="Assets\**\*.*" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/Obsidian/Registries/BlocksRegistry.cs b/Obsidian/Registries/BlocksRegistry.cs
@@ -4,6 +4,8 @@ namespace Obsidian.Registries;
 
 internal static partial class BlocksRegistry
 {
+    private static string[] illegalBlockNames = ["Obsidian", "TrialSpawner", "Vault"];
+
     public static int GlobalBitsPerBlocks { get; private set; }
     static BlocksRegistry()
     {
@@ -83,7 +85,7 @@ public static IBlock Get(string resourceId, IBlockState? state = null)
             blockTypeCache.TryAdd(blockName, type!);
         }
 
-        var ctor = type!.GetConstructor(Type.EmptyTypes);
+        var ctor = type!.GetConstructor(Type.EmptyTypes)!;
 
         var expression = Expression.New(ctor);
 
@@ -136,16 +138,6 @@ public static IBlock Get(Material material, IBlockState? state = null)
         return block;
     }
 
-    private static string GetSanitizedName(string value)
-    {
-        var sanitizedBlockName = value;
-        if (sanitizedBlockName == "Obsidian")
-            sanitizedBlockName = "ObsidianBlock";
-        if (sanitizedBlockName == "TrialSpawner")
-            sanitizedBlockName = "TrialSpawnerBlock";
-        if (sanitizedBlockName == "Vault")
-            sanitizedBlockName = "VaultBlock";
-
-        return sanitizedBlockName;
-    }
+    private static string GetSanitizedName(string value) =>
+        illegalBlockNames.Contains(value) ? $"{value}Block" : string.Empty;
 }
diff --git a/Obsidian/Registries/CommandsRegistry.cs b/Obsidian/Registries/CommandsRegistry.cs
@@ -3,9 +3,6 @@
 using Obsidian.Commands.Parsers;
 using Obsidian.Net.Packets.Play.Clientbound;
 using Obsidian.Utilities.Interfaces;
-using System.Xml;
-using System;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace Obsidian.Registries;
 public static class CommandsRegistry

diff --git a/Obsidian/Registries/RecipesRegistry.cs b/Obsidian/Registries/RecipesRegistry.cs
@@ -4,7 +4,7 @@
 namespace Obsidian.Registries;
 public static partial class RecipesRegistry
 {
-    public static readonly Dictionary<string, IRecipe> Recipes = new();
+    public static readonly Dictionary<string, IRecipe> Recipes = [];
 
     public static async Task InitializeAsync()
     {

diff --git a/Obsidian/Tag.cs b/Obsidian/Tag.cs