Implement crafting and fix Tags SourceGeneration (#494)

Author: Tides

Obsidian.API/Containers/BaseContainer.cs

@@ -7,7 +7,7 @@ public abstract class BaseContainer : IEnumerable<ItemStack>
 {
     protected ItemStack?[] items;
 
-    public int Size => this.items.Length;
+    public short Size => (short)this.items.Length;
 
     public InventoryType Type { get; }
 
@@ -117,8 +117,8 @@ public virtual bool RemoveItem(int slot, int amount, out ItemStack? removedItem)
         return this.RemoveItem(slot, amount);
     }
 
-    public virtual (int slot, bool forPlayer) GetDifference(int clickedSlot) =>
-        clickedSlot > this.Size ? (clickedSlot - this.Size + 9, true) : (clickedSlot, false);
+    public virtual (short slot, bool forPlayer) GetDifference(short clickedSlot) =>
+        clickedSlot > this.Size ? ((short)(clickedSlot - this.Size + 9), true) : (clickedSlot, false);
 
     public virtual void Resize(int newSize) => Array.Resize(ref this.items, newSize);
 

Obsidian.API/Containers/CraftingTable.cs

@@ -4,22 +4,14 @@ namespace Obsidian.API.Containers;
 
 public sealed class CraftingTable : ResultContainer
 {
-    public CraftingTable() : base(10, InventoryType.Crafting)
-    {
-        this.Title = "Crafting Table";
-    }
-
-    public override void SetResult(ItemStack? result) => throw new NotImplementedException();
-    public override ItemStack? GetResult() => throw new NotImplementedException();
-}
-
-public sealed class Crafter : ResultContainer
-{
-    public Crafter() : base(3 * 3, InventoryType.Crafter)
+    public CraftingTable(InventoryType type = InventoryType.Crafting) : base(10, type)
     {
+        if(type != InventoryType.Crafting || type != InventoryType.Crafter)
+            throw new ArgumentException("CraftingTable must be of type InventoryType.Crafting or InventoryType.Crafter", nameof(type));
 
+        this.Title = type == InventoryType.Crafting ? "Crafting Table" : "Crafter";
     }
 
-    public override ItemStack? GetResult() => throw new NotImplementedException();
     public override void SetResult(ItemStack? result) => throw new NotImplementedException();
+    public override ItemStack? GetResult() => throw new NotImplementedException();
 }

Obsidian.API/Crafting/Ingredient.cs

@@ -18,11 +18,12 @@ public Ingredient()
 
     public void Remove(ItemStack item) => this.items.Remove(item);
 
-    /// <inheritdoc/>
     public IEnumerator<ItemStack> GetEnumerator() => new IngredientEnumerator(this.items);
 
     IEnumerator IEnumerable.GetEnumerator() => (IEnumerator)this;
 
+    public bool CanBe(ItemStack item) => this.items.Any(x => x.Equals(item));
+
     private class IngredientEnumerator : IEnumerator<ItemStack>
     {
         public int Position { get; set; } = -1;

Obsidian.API/Effects/ConsumeEffect.cs

@@ -1,5 +1,5 @@
 namespace Obsidian.API.Effects;
-public readonly struct ConsumeEffect
+public readonly record struct ConsumeEffect
 {
     public required string Type { get; init; }
 

Obsidian.API/Events/ContainerClickEventArgs.cs

@@ -7,7 +7,7 @@ public sealed class ContainerClickEventArgs : ContainerEventArgs, ICancellable
     /// <summary>
     /// Gets the current item that was clicked. />
     /// </summary>
-    public ItemStack? Item => this.Container.GetItem(this.ClickedSlot);
+    public ItemStack? Item => this.ClickedSlot != -999 ? this.Container.GetItem(this.ClickedSlot) : null;
 
     public bool IsPlayerInventory => this.ContainerId == 0;
 
@@ -22,7 +22,7 @@ public sealed class ContainerClickEventArgs : ContainerEventArgs, ICancellable
     /// <summary>
     /// Gets the slot that was clicked
     /// </summary>
-    public required int ClickedSlot { get; init; }
+    public required short ClickedSlot { get; init; }
 
     /// <summary>
     /// The button that was clicked in the inventory. Can vary depending on the inventory type.

Obsidian.API/Inventory/AttributeModifier.cs

@@ -1,5 +1,5 @@
 namespace Obsidian.API.Inventory;
-public readonly struct AttributeModifier : INetworkSerializable<AttributeModifier>
+public readonly record struct AttributeModifier : INetworkSerializable<AttributeModifier>
 {
     public required int Id { get; init; }
 

Obsidian.API/Inventory/DataComponent.cs

@@ -0,0 +1,11 @@
+namespace Obsidian.API.Inventory;
+public abstract record DataComponent
+{
+    public abstract DataComponentType Type { get; }
+
+    public abstract string Identifier { get; }
+
+    public virtual void Write(INetStreamWriter writer) { }
+
+    public virtual void Read(INetStreamReader reader) { }
+}

Obsidian.API/Inventory/DataComponents/BlockPredicatesDataComponent.cs

@@ -1,38 +1,36 @@
-namespace Obsidian.API.Inventory.DataComponents;
-public abstract class BlockPredicatesDataComponent : IDataComponent
+using Obsidian.Nbt;
+
+namespace Obsidian.API.Inventory.DataComponents;
+public abstract record class BlockPredicatesDataComponent : DataComponent
 {
-    public abstract DataComponentType Type { get; }
+    public override DataComponentType Type { get; }
 
-    public abstract string Identifier { get; }
+    public override string Identifier { get; }
 
     public List<BlockPredicate> Predicates { get; init; }
 
     public bool ShowInTooltip { get; init; }
 
-    public virtual void Read(INetStreamReader reader) => throw new NotImplementedException();
-    public virtual void Write(INetStreamWriter writer) => throw new NotImplementedException();
     public void WriteHashed(INetStreamWriter writer) => throw new NotImplementedException();
 }
 
 
-public readonly struct BlockPredicate
+public readonly record struct BlockPredicate
 {
     public bool HasBlocks => this.BlockIds.Count > 0;
 
     public List<string> BlockIds { get; init; }
 
-
     public bool HasProperties => this.Properties.Count > 0;
 
     public List<BlockProperty> Properties { get; init; }
 
     public bool HasNbt => this.Nbt != null;
 
-    //WE NEED NBT PAIN
-    public object? Nbt { get; init; }
+    public NbtCompound? Nbt { get; init; }
 }
 
-public readonly struct BlockProperty
+public readonly record struct BlockProperty
 {
     public required string Name { get; init; }
 

Obsidian.API/Inventory/DataComponents/CanPlaceOnDataComponent.cs

@@ -1,12 +1,12 @@
 namespace Obsidian.API.Inventory.DataComponents;
-public sealed class CanPlaceOnDataComponent : BlockPredicatesDataComponent
+public sealed record class CanPlaceOnDataComponent : BlockPredicatesDataComponent
 {
     public override DataComponentType Type => DataComponentType.CanPlaceOn;
 
     public override string Identifier => "minecraft:can_place_on";
 }
 
-public sealed class CanBreakDataComponent : BlockPredicatesDataComponent
+public sealed record class CanBreakDataComponent : BlockPredicatesDataComponent
 {
     public override DataComponentType Type => DataComponentType.CanPlaceOn;
 

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

@@ -4,7 +4,7 @@ namespace Obsidian.API.Inventory.DataComponents;
 public partial class ComponentBuilder
 {
     //TODO SOURCE GENERATE THIS
-    internal static ImmutableArray<Func<IDataComponent?>> ComponentsMap { get; } = new List<Func<IDataComponent?>>
+    internal static ImmutableArray<Func<DataComponent?>> ComponentsMap { get; } = new List<Func<DataComponent?>>
     {
         () => CustomData,
         () => MaxStackSize,