feat: add RecipeBookCategory to SerializableRecipe

MineInAbyss · May 13, 2024 · da1921d · da1921d
1 parent 115b79a
commit da1921d
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 16 deletions.
diff --git a/...c/main/kotlin/com/mineinabyss/idofront/serialization/recipes/BlastingRecipeIngredients.kt b/...c/main/kotlin/com/mineinabyss/idofront/serialization/recipes/BlastingRecipeIngredients.kt
@@ -8,18 +8,20 @@ import org.bukkit.inventory.BlastingRecipe
 import org.bukkit.inventory.ItemStack
 import org.bukkit.inventory.Recipe
 import org.bukkit.inventory.RecipeChoice
+import org.bukkit.inventory.recipe.CookingBookCategory
 
 @Serializable
 @SerialName("blasting")
 class BlastingRecipeIngredients(
     val input: SerializableItemStack,
     val experience: Float,
-    val cookingTime: Int
+    val cookingTime: Int,
 ) : SerializableRecipeIngredients() {
-    override fun toRecipe(key: NamespacedKey, result: ItemStack, group: String): Recipe {
+    override fun toRecipe(key: NamespacedKey, result: ItemStack, group: String, category: String): Recipe {
         val recipe = BlastingRecipe(key, result, RecipeChoice.ExactChoice(input.toItemStack()), experience, cookingTime)
 
         recipe.group = group
+        recipe.category = CookingBookCategory.entries.find { it.name == category } ?: CookingBookCategory.MISC
 
         return recipe
     }

diff --git a/...c/main/kotlin/com/mineinabyss/idofront/serialization/recipes/CampfireRecipeIngredients.kt b/...c/main/kotlin/com/mineinabyss/idofront/serialization/recipes/CampfireRecipeIngredients.kt
@@ -8,18 +8,20 @@ import org.bukkit.inventory.CampfireRecipe
 import org.bukkit.inventory.ItemStack
 import org.bukkit.inventory.Recipe
 import org.bukkit.inventory.RecipeChoice
+import org.bukkit.inventory.recipe.CookingBookCategory
 
 @Serializable
 @SerialName("campfire")
 class CampfireRecipeIngredients(
     val input: SerializableItemStack,
     val experience: Float,
-    val cookingTime: Int
+    val cookingTime: Int,
 ) : SerializableRecipeIngredients() {
-    override fun toRecipe(key: NamespacedKey, result: ItemStack, group: String): Recipe {
+    override fun toRecipe(key: NamespacedKey, result: ItemStack, group: String, category: String): Recipe {
         val recipe = CampfireRecipe(key, result, RecipeChoice.ExactChoice(input.toItemStack()), experience, cookingTime)
 
         recipe.group = group
+        recipe.category = CookingBookCategory.entries.find { it.name == category } ?: CookingBookCategory.MISC
 
         return recipe
     }

diff --git a/...rc/main/kotlin/com/mineinabyss/idofront/serialization/recipes/FurnaceRecipeIngredients.kt b/...rc/main/kotlin/com/mineinabyss/idofront/serialization/recipes/FurnaceRecipeIngredients.kt
@@ -8,18 +8,20 @@ import org.bukkit.inventory.FurnaceRecipe
 import org.bukkit.inventory.ItemStack
 import org.bukkit.inventory.Recipe
 import org.bukkit.inventory.RecipeChoice
+import org.bukkit.inventory.recipe.CookingBookCategory
 
 @Serializable
 @SerialName("furnace")
 class FurnaceRecipeIngredients(
     val input: SerializableItemStack,
     val experience: Float,
-    val cookingTime: Int
+    val cookingTime: Int,
 ) : SerializableRecipeIngredients() {
-    override fun toRecipe(key: NamespacedKey, result: ItemStack, group: String): Recipe {
+    override fun toRecipe(key: NamespacedKey, result: ItemStack, group: String, category: String): Recipe {
         val recipe = FurnaceRecipe(key, result, RecipeChoice.ExactChoice(input.toItemStack()), experience, cookingTime)
 
         recipe.group = group
+        recipe.category = CookingBookCategory.entries.find { it.name == category } ?: CookingBookCategory.MISC
 
         return recipe
     }

diff --git a/...zers/src/main/kotlin/com/mineinabyss/idofront/serialization/recipes/SerializableRecipe.kt b/...zers/src/main/kotlin/com/mineinabyss/idofront/serialization/recipes/SerializableRecipe.kt
@@ -10,7 +10,9 @@ class SerializableRecipe(
     val ingredients: SerializableRecipeIngredients,
     val result: SerializableItemStack,
     val group: String = "",
+    val category: String = "MISC"
 ) {
-    fun toCraftingRecipe() =
-        ingredients.toRecipe(key.toMCKey(), result.toItemStack(), group)
+    fun toCraftingRecipe() {
+        ingredients.toRecipe(key.toMCKey(), result.toItemStack(), group, category)
+    }
 }
diff --git a/...in/kotlin/com/mineinabyss/idofront/serialization/recipes/SerializableRecipeIngredients.kt b/...in/kotlin/com/mineinabyss/idofront/serialization/recipes/SerializableRecipeIngredients.kt
@@ -7,5 +7,5 @@ import org.bukkit.inventory.Recipe
 
 @Serializable
 sealed class SerializableRecipeIngredients {
-    abstract fun toRecipe(key: NamespacedKey, result: ItemStack, group: String = ""): Recipe
+    abstract fun toRecipe(key: NamespacedKey, result: ItemStack, group: String = "", category: String = "MISC"): Recipe
 }
diff --git a/...src/main/kotlin/com/mineinabyss/idofront/serialization/recipes/ShapedRecipeIngredients.kt b/...src/main/kotlin/com/mineinabyss/idofront/serialization/recipes/ShapedRecipeIngredients.kt
@@ -11,19 +11,21 @@ import org.bukkit.inventory.ItemStack
 import org.bukkit.inventory.Recipe
 import org.bukkit.inventory.RecipeChoice
 import org.bukkit.inventory.ShapedRecipe
+import org.bukkit.inventory.recipe.CraftingBookCategory
 
 @Serializable
 @SerialName("shaped")
 class ShapedRecipeIngredients(
     val items: Map<String, SerializableItemStack>,
     val configuration: String = "",
 ) : SerializableRecipeIngredients() {
-    override fun toRecipe(key: NamespacedKey, result: ItemStack, group: String): Recipe {
+    override fun toRecipe(key: NamespacedKey, result: ItemStack, group: String, category: String): Recipe {
         val recipe = ShapedRecipe(key, result)
 
         recipe.shape(*configuration.replace("|", "").split("\n").toTypedArray())
 
         recipe.group = group
+        recipe.category = CraftingBookCategory.entries.find { it.name == category } ?: CraftingBookCategory.MISC
 
         items.forEach { (key, ingredient) ->
             if (ingredient.tag?.isNotEmpty() == true) {

diff --git a/.../main/kotlin/com/mineinabyss/idofront/serialization/recipes/ShapelessRecipeIngredients.kt b/.../main/kotlin/com/mineinabyss/idofront/serialization/recipes/ShapelessRecipeIngredients.kt
@@ -11,16 +11,18 @@ import org.bukkit.inventory.ItemStack
 import org.bukkit.inventory.Recipe
 import org.bukkit.inventory.RecipeChoice
 import org.bukkit.inventory.ShapelessRecipe
+import org.bukkit.inventory.recipe.CraftingBookCategory
 
 @Serializable
 @SerialName("shapeless")
 class ShapelessRecipeIngredients(
     val items: List<SerializableItemStack>,
 ) : SerializableRecipeIngredients() {
-    override fun toRecipe(key: NamespacedKey, result: ItemStack, group: String): Recipe {
+    override fun toRecipe(key: NamespacedKey, result: ItemStack, group: String, category: String): Recipe {
         val recipe = ShapelessRecipe(key, result)
 
         recipe.group = group
+        recipe.category = CraftingBookCategory.entries.find { it.name == category } ?: CraftingBookCategory.MISC
 
         items.forEach { ingredient ->
             if (ingredient.tag?.isNotEmpty() == true) {

diff --git a/...tlin/com/mineinabyss/idofront/serialization/recipes/SmithingTransformRecipeIngredients.kt b/...tlin/com/mineinabyss/idofront/serialization/recipes/SmithingTransformRecipeIngredients.kt
@@ -18,7 +18,7 @@ class SmithingTransformRecipeIngredients(
     val addition: SerializableItemStack,
     val copyNbt: Boolean = false
 ) : SerializableRecipeIngredients() {
-    override fun toRecipe(key: NamespacedKey, result: ItemStack, group: String): Recipe {
+    override fun toRecipe(key: NamespacedKey, result: ItemStack, group: String, category: String): Recipe {
         return SmithingTransformRecipe(
             key,
             result,

diff --git a/...in/kotlin/com/mineinabyss/idofront/serialization/recipes/SmithingTrimRecipeIngredients.kt b/...in/kotlin/com/mineinabyss/idofront/serialization/recipes/SmithingTrimRecipeIngredients.kt
@@ -18,7 +18,7 @@ class SmithingTrimRecipeIngredients(
     val addition: SerializableItemStack,
     val copyNbt: Boolean = false
 ) : SerializableRecipeIngredients() {
-    override fun toRecipe(key: NamespacedKey, result: ItemStack, group: String): Recipe {
+    override fun toRecipe(key: NamespacedKey, result: ItemStack, group: String, category: String): Recipe {
         return SmithingTrimRecipe(
             key,
             RecipeChoice.ExactChoice(template.toItemStack()),

diff --git a/...rc/main/kotlin/com/mineinabyss/idofront/serialization/recipes/SmokingRecipeIngredients.kt b/...rc/main/kotlin/com/mineinabyss/idofront/serialization/recipes/SmokingRecipeIngredients.kt
@@ -8,19 +8,21 @@ import org.bukkit.inventory.ItemStack
 import org.bukkit.inventory.Recipe
 import org.bukkit.inventory.RecipeChoice
 import org.bukkit.inventory.SmokingRecipe
+import org.bukkit.inventory.recipe.CookingBookCategory
 
 @Serializable
 @SerialName("smoking")
 class SmokingRecipeIngredients(
     val input: SerializableItemStack,
     val experience: Float,
-    val cookingTime: Int
+    val cookingTime: Int,
 ) : SerializableRecipeIngredients() {
-    override fun toRecipe(key: NamespacedKey, result: ItemStack, group: String): Recipe {
+    override fun toRecipe(key: NamespacedKey, result: ItemStack, group: String, category: String): Recipe {
         val recipe = SmokingRecipe(key, result, RecipeChoice.ExactChoice(input.toItemStack()), experience, cookingTime)
 
         recipe.group = group
 
+        recipe.category = CookingBookCategory.entries.find { it.name == category } ?: CookingBookCategory.MISC
         return recipe
     }
 }
diff --git a/...in/kotlin/com/mineinabyss/idofront/serialization/recipes/StonecuttingRecipeIngredients.kt b/...in/kotlin/com/mineinabyss/idofront/serialization/recipes/StonecuttingRecipeIngredients.kt
@@ -14,7 +14,7 @@ import org.bukkit.inventory.StonecuttingRecipe
 class StonecuttingRecipeIngredients(
     val input: SerializableItemStack,
 ) : SerializableRecipeIngredients() {
-    override fun toRecipe(key: NamespacedKey, result: ItemStack, group: String): Recipe {
+    override fun toRecipe(key: NamespacedKey, result: ItemStack, group: String, category: String): Recipe {
         val recipe = StonecuttingRecipe(key, result, RecipeChoice.ExactChoice(input.toItemStack()))
 
         recipe.group = group