Add shapeless focus holder filling recipe

Author: object-Object

Common/src/generated/resources/data/hexdebug/recipes/focus_holder_filling_shapeless.json

@@ -0,0 +1,4 @@
+{
+  "type": "hexdebug:focus_holder_filling_shapeless",
+  "category": "misc"
+}

Common/src/main/kotlin/gay/object/hexdebug/recipes/FocusHolderFillingShapedRecipe.kt

@@ -27,8 +27,6 @@ class FocusHolderFillingShapedRecipe(
     result: ItemStack,
     showNotification: Boolean,
 ) : ShapedRecipe(id, group, category, width, height, recipeItems, result, showNotification) {
-    override fun getSerializer() = HexDebugRecipeSerializers.FOCUS_HOLDER_FILLING_SHAPED.value
-
     override fun matches(container: CraftingContainer, level: Level): Boolean {
         if (!super.matches(container, level)) return false
         for (ingredient in container.items) {
@@ -51,6 +49,8 @@ class FocusHolderFillingShapedRecipe(
         return result
     }
 
+    override fun getSerializer() = HexDebugRecipeSerializers.FOCUS_HOLDER_FILLING_SHAPED.value
+
     companion object {
         private fun fromShapedRecipe(recipe: ShapedRecipe): FocusHolderFillingShapedRecipe {
             return recipe.run {
@@ -62,7 +62,9 @@ class FocusHolderFillingShapedRecipe(
                     width = width,
                     height = height,
                     recipeItems = ingredients,
-                    result = getResultItem(null).apply { putIotaStack(ItemStack(HexItems.FOCUS)) },
+                    result = getResultItem(null).apply {
+                        putIotaStack(ItemStack(HexItems.FOCUS))
+                    },
                     showNotification = showNotification(),
                 )
             }

Common/src/main/kotlin/gay/object/hexdebug/recipes/FocusHolderFillingShapelessRecipe.kt

@@ -0,0 +1,72 @@
+package gay.`object`.hexdebug.recipes
+
+import at.petrak.hexcasting.common.lib.HexItems
+import gay.`object`.hexdebug.items.FocusHolderBlockItem.Companion.hasIotaStack
+import gay.`object`.hexdebug.items.FocusHolderBlockItem.Companion.putIotaStack
+import gay.`object`.hexdebug.registry.HexDebugBlocks
+import gay.`object`.hexdebug.registry.HexDebugRecipeSerializers
+import net.minecraft.core.NonNullList
+import net.minecraft.core.RegistryAccess
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.world.inventory.CraftingContainer
+import net.minecraft.world.item.ItemStack
+import net.minecraft.world.item.crafting.CraftingBookCategory
+import net.minecraft.world.item.crafting.CustomRecipe
+import net.minecraft.world.item.crafting.Ingredient
+import net.minecraft.world.level.Level
+
+class FocusHolderFillingShapelessRecipe(id: ResourceLocation, category: CraftingBookCategory) : CustomRecipe(id, category) {
+    private val resultItem = ItemStack(HexDebugBlocks.FOCUS_HOLDER.item).apply {
+        putIotaStack(ItemStack(HexItems.FOCUS))
+    }
+
+    override fun matches(container: CraftingContainer, level: Level): Boolean {
+        return findItems(container) != null
+    }
+
+    override fun assemble(container: CraftingContainer, registryAccess: RegistryAccess): ItemStack {
+        val (holder, focus) = findItems(container) ?: return ItemStack.EMPTY
+        return holder.copyWithCount(1).apply {
+            putIotaStack(focus)
+        }
+    }
+
+    override fun getIngredients(): NonNullList<Ingredient> = NonNullList.of(
+        Ingredient.of(HexDebugBlocks.FOCUS_HOLDER.item),
+        Ingredient.of(HexItems.FOCUS),
+    )
+
+    override fun getResultItem(registryAccess: RegistryAccess) = resultItem
+
+    override fun canCraftInDimensions(width: Int, height: Int): Boolean {
+        return width * height >= 2
+    }
+
+    override fun getSerializer() = HexDebugRecipeSerializers.FOCUS_HOLDER_FILLING_SHAPELESS.value
+
+    private fun findItems(container: CraftingContainer): Pair<ItemStack, ItemStack>? {
+        var holder: ItemStack? = null
+        var focus: ItemStack? = null
+
+        for (itemStack in container.items) {
+            if (itemStack.isEmpty) continue
+
+            when (itemStack.item) {
+                HexDebugBlocks.FOCUS_HOLDER.item -> {
+                    if (holder != null || itemStack.hasIotaStack) return null
+                    holder = itemStack
+                }
+                HexItems.FOCUS -> {
+                    if (focus != null) return null
+                    focus = itemStack
+                }
+                else -> return null
+            }
+        }
+
+        return Pair(
+            holder ?: return null,
+            focus ?: return null,
+        )
+    }
+}

Common/src/main/kotlin/gay/object/hexdebug/registry/HexDebugRecipeSerializers.kt

@@ -1,14 +1,21 @@
 package gay.`object`.hexdebug.registry
 
 import gay.`object`.hexdebug.recipes.FocusHolderFillingShapedRecipe
+import gay.`object`.hexdebug.recipes.FocusHolderFillingShapelessRecipe
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
 import net.minecraft.world.item.crafting.RecipeSerializer
+import net.minecraft.world.item.crafting.SimpleCraftingRecipeSerializer
+
 object HexDebugRecipeSerializers : HexDebugRegistrar<RecipeSerializer<*>>(
     Registries.RECIPE_SERIALIZER,
     { BuiltInRegistries.RECIPE_SERIALIZER },
 ) {
     val FOCUS_HOLDER_FILLING_SHAPED = register("focus_holder_filling_shaped") {
         FocusHolderFillingShapedRecipe.Serializer()
     }
+
+    val FOCUS_HOLDER_FILLING_SHAPELESS = register("focus_holder_filling_shapeless") {
+        SimpleCraftingRecipeSerializer(::FocusHolderFillingShapelessRecipe)
+    }
 }

Forge/src/main/kotlin/gay/object/hexdebug/forge/datagen/HexDebugRecipes.kt

@@ -8,11 +8,15 @@ import gay.`object`.hexdebug.HexDebug
 import gay.`object`.hexdebug.datagen.recipes.FocusHolderFillingShapedRecipeBuilder
 import gay.`object`.hexdebug.registry.HexDebugBlocks
 import gay.`object`.hexdebug.registry.HexDebugItems
+import gay.`object`.hexdebug.registry.HexDebugRecipeSerializers
+import gay.`object`.hexdebug.registry.RegistrarEntry
 import net.minecraft.data.PackOutput
 import net.minecraft.data.recipes.FinishedRecipe
 import net.minecraft.data.recipes.RecipeCategory
 import net.minecraft.data.recipes.ShapedRecipeBuilder
+import net.minecraft.data.recipes.SpecialRecipeBuilder
 import net.minecraft.world.item.Items
+import net.minecraft.world.item.crafting.RecipeSerializer
 import net.minecraft.world.level.ItemLike
 import java.util.function.Consumer
 
@@ -75,6 +79,9 @@ class HexDebugRecipes(output: PackOutput) : PaucalRecipeProvider(output, HexDebu
             .pattern(" LG")
             .unlockedBy("has_item", hasItem(HexItems.FOCUS))
             .save(writer, HexDebug.id("focus_holder_filling_shaped/new_focus"))
+
+        // existing focus holder with existing focus
+        specialRecipe(writer, HexDebugRecipeSerializers.FOCUS_HOLDER_FILLING_SHAPELESS)
     }
 
     @Suppress("SameParameterValue")
@@ -89,4 +96,8 @@ class HexDebugRecipes(output: PackOutput) : PaucalRecipeProvider(output, HexDebu
             .pattern(" CC")
             .pattern(" UC")
             .pattern("L  ")
+
+    private fun specialRecipe(writer: Consumer<FinishedRecipe>, entry: RegistrarEntry<RecipeSerializer<*>>) {
+        SpecialRecipeBuilder(entry.value).save(writer, entry.id.toString())
+    }
 }