Recipe changes

Obsidian.API/Crafting/CuttingRecipe.cs

@@ -1,14 +1,14 @@
 namespace Obsidian.API.Crafting;
 
-public sealed class CuttingRecipe : IRecipe
+public sealed class CuttingRecipe : IRecipeWithResult
 {
     public required string Identifier { get; init; }
 
     public required CraftingType Type { get; init; }
 
     public string? Group { get; init; }
 
-    public required Ingredient? Result { get; init; }
+    public required Ingredient Result { get; init; }
 
     public required Ingredient Ingredient { get; init; }
 

Obsidian.API/Crafting/IRecipe.cs

@@ -7,6 +7,9 @@ public interface IRecipe
     public CraftingType Type { get; init; }
 
     public string? Group { get; init; }
+}
 
-    public Ingredient? Result { get; init; }
+public interface IRecipeWithResult : IRecipe
+{
+    public Ingredient Result { get; init; }
 }

Obsidian.API/Crafting/ShapedRecipe.cs

@@ -1,6 +1,6 @@
 namespace Obsidian.API.Crafting;
 
-public sealed class ShapedRecipe : IRecipe
+public sealed class ShapedRecipe : IRecipeWithResult
 {
     public required string Identifier { get; init; }
 
@@ -10,7 +10,7 @@ public sealed class ShapedRecipe : IRecipe
 
     public required CraftingBookCategory Category { get; init; }
 
-    public required Ingredient? Result { get; init; }
+    public required Ingredient Result { get; init; }
 
     public required IReadOnlyList<string> Pattern { get; init; }
 

Obsidian.API/Crafting/ShapelessRecipe.cs

@@ -1,6 +1,6 @@
 namespace Obsidian.API.Crafting;
 
-public sealed class ShapelessRecipe : IRecipe
+public sealed class ShapelessRecipe : IRecipeWithResult
 {
     public required string Identifier { get; init; }
 
@@ -10,7 +10,7 @@ public sealed class ShapelessRecipe : IRecipe
 
     public string? Group { get; init; }
 
-    public required Ingredient? Result { get; init; }
+    public required Ingredient Result { get; init; }
 
     public required IReadOnlyList<Ingredient> Ingredients { get; init; }
 

Obsidian.API/Crafting/SmeltingRecipe.cs

@@ -1,14 +1,14 @@
 namespace Obsidian.API.Crafting;
 
-public sealed class SmeltingRecipe : IRecipe
+public sealed class SmeltingRecipe : IRecipeWithResult
 {
     public required string Identifier { get; init; }
 
     public required CraftingType Type { get; init; }
 
     public string? Group { get; init; }
 
-    public required Ingredient? Result { get; init; }
+    public required Ingredient Result { get; init; }
 
     public required Ingredient Ingredient { get; init; }
 

Obsidian.API/Crafting/SmithingRecipe.cs

@@ -1,6 +1,6 @@
 namespace Obsidian.API.Crafting;
 
-public sealed class SmithingRecipe : IRecipe
+public sealed class SmithingRecipe : IRecipeWithResult
 {
     public required string Identifier { get; init; }
 
@@ -24,15 +24,15 @@ public sealed class SmithingRecipe : IRecipe
 /// <remarks>
 /// Only used if 1.20 feature flag was enabled.
 /// </remarks>
-public sealed class SmithingTransformRecipe : IRecipe
+public sealed class SmithingTransformRecipe : IRecipeWithResult
 {
     public required string Identifier { get; init; }
 
     public required CraftingType Type { get; init; }
 
     public string? Group { get; init; }
 
-    public required Ingredient? Result { get; init; }
+    public required Ingredient Result { get; init; }
 
     public required Ingredient Base { get; init; }
 
@@ -64,7 +64,5 @@ public sealed class SmithingTrimRecipe : IRecipe
 
     public required Ingredient Template { get; init; }
 
-    Ingredient? IRecipe.Result { get; init; } = null;
-
     internal SmithingTrimRecipe() { }
 }