Remove focus holder filling/emptying recipes, update notebook entry (close #52)

Author: object-Object

CHANGELOG.md

@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
 
 ### Added
 
+- Added (official) support for inserting iota-holding items other than foci into the Focal Frame.
 - Added a tag (`hexdebug:focus_holder/blacklist`) to prevent specific items from being inserted into the Focal Frame.
 - Added new methods to the `SplicingTableIotaRenderers` class to allow iota renderers to contain or reference other renderers.
 - New Splicing Table iota renderer types:
@@ -29,6 +30,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
 
 - Fixed a few bugs allowing arbitrary items to be inserted into the Splicing Table and Focal Frame using hoppers or modded item transportation ([#38](https://github.com/object-Object/HexDebug/issues/38), [#53](https://github.com/object-Object/HexDebug/issues/38)).
 
+### Removed
+
+- Removed most recipes related to filling/emptying Focal Frames, other than the recipe to fill empty frames with new foci using stackable ingredients.
+
 ## `0.6.0+1.20.1` - 2025-09-29
 
 ### Added

…cus_holder_filling_shaped/new_focus.json …c/focus_holder_filling_shaped/focus.jsonCommon/src/generated/resources/data/hexdebug/advancements/recipes/misc/focus_holder_filling_shaped/new_focus.json renamed to Common/src/generated/resources/data/hexdebug/advancements/recipes/misc/focus_holder_filling_shaped/focus.json Common/src/generated/resources/data/hexdebug/advancements/recipes/misc/focus_holder_filling_shaped/new_focus.json renamed to Common/src/generated/resources/data/hexdebug/advancements/recipes/misc/focus_holder_filling_shaped/focus.json

@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "hexdebug:focus_holder_filling_shaped/new_focus"
+        "recipe": "hexdebug:focus_holder_filling_shaped/focus"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "hexdebug:focus_holder_filling_shaped/new_focus"
+      "hexdebug:focus_holder_filling_shaped/focus"
     ]
   },
   "sends_telemetry_event": false

Common/src/generated/resources/data/hexdebug/advancements/recipes/misc/focus_holder_filling_shaped/new_holder.json

@@ -26,5 +26,8 @@
   "result": {
     "item": "hexdebug:focus_holder"
   },
+  "result_inner": {
+    "item": "hexcasting:focus"
+  },
   "show_notification": true
 }

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

@@ -3,6 +3,7 @@ package gay.`object`.hexdebug.datagen.recipes
 import com.google.gson.JsonObject
 import gay.`object`.hexdebug.registry.HexDebugBlocks
 import gay.`object`.hexdebug.registry.HexDebugRecipeSerializers
+import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.data.recipes.FinishedRecipe
 import net.minecraft.data.recipes.RecipeCategory
 import net.minecraft.data.recipes.ShapedRecipeBuilder
@@ -13,24 +14,20 @@ import java.util.function.Consumer
 class FocusHolderFillingShapedRecipeBuilder(
     category: RecipeCategory,
     result: ItemLike,
-    count: Int,
+    private val resultInner: ItemLike,
+    count: Int = 1,
 ) : ShapedRecipeBuilder(category, result, count) {
     override fun save(finishedRecipeConsumer: Consumer<FinishedRecipe>, recipeId: ResourceLocation) {
         if (result !== HexDebugBlocks.FOCUS_HOLDER.item) {
             throw IllegalStateException("Expected result item to be ${HexDebugBlocks.FOCUS_HOLDER.id} but got $result")
         }
-        super.save({ finishedRecipeConsumer.accept(Result(it)) }, recipeId)
+        super.save({ finishedRecipeConsumer.accept(Result(it, resultInner)) }, recipeId)
     }
 
-    companion object {
-        fun shaped(category: RecipeCategory, result: ItemLike): FocusHolderFillingShapedRecipeBuilder =
-            shaped(category, result, 1)
-
-        fun shaped(category: RecipeCategory, result: ItemLike, count: Int): FocusHolderFillingShapedRecipeBuilder =
-            FocusHolderFillingShapedRecipeBuilder(category, result, count)
-    }
-
-    private class Result(private val inner: FinishedRecipe) : FinishedRecipe {
+    private class Result(
+        private val inner: FinishedRecipe,
+        private val resultInner: ItemLike,
+    ) : FinishedRecipe {
         override fun getType() = HexDebugRecipeSerializers.FOCUS_HOLDER_FILLING_SHAPED.value
 
         override fun getId(): ResourceLocation = inner.id
@@ -39,6 +36,9 @@ class FocusHolderFillingShapedRecipeBuilder(
 
         override fun serializeRecipeData(json: JsonObject) {
             inner.serializeRecipeData(json)
+            json.add("result_inner", JsonObject().also {
+                it.addProperty("item", BuiltInRegistries.ITEM.getKey(resultInner.asItem()).toString())
+            })
         }
 
         override fun serializeAdvancement(): JsonObject? {

…cus_holder_filling_shaped/new_focus.json …s/focus_holder_filling_shaped/focus.jsonCommon/src/generated/resources/data/hexdebug/recipes/focus_holder_filling_shaped/new_focus.json renamed to Common/src/generated/resources/data/hexdebug/recipes/focus_holder_filling_shaped/focus.json Common/src/generated/resources/data/hexdebug/recipes/focus_holder_filling_shaped/new_focus.json renamed to Common/src/generated/resources/data/hexdebug/recipes/focus_holder_filling_shaped/focus.json

@@ -2,59 +2,28 @@ package gay.`object`.hexdebug.interop
 
 import at.petrak.hexcasting.common.lib.HexItems
 import dev.emi.emi.api.EmiRegistry
-import dev.emi.emi.api.recipe.EmiCraftingRecipe
 import dev.emi.emi.api.stack.Comparison
 import dev.emi.emi.api.stack.EmiStack
 import dev.emi.emi.api.widget.Bounds
 import gay.`object`.hexdebug.gui.splicing.SplicingTableScreen
-import gay.`object`.hexdebug.items.FocusHolderBlockItem
-import gay.`object`.hexdebug.items.FocusHolderBlockItem.Companion.hasIotaStack
-import gay.`object`.hexdebug.recipes.FocusHolderEmptyingRecipe
-import gay.`object`.hexdebug.recipes.FocusHolderFillingShapelessRecipe
+import gay.`object`.hexdebug.items.FocusHolderBlockItem.Companion.getIotaStack
+import gay.`object`.hexdebug.items.FocusHolderBlockItem.Companion.setIotaStack
 import gay.`object`.hexdebug.registry.HexDebugBlocks
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.world.item.crafting.RecipeType
+import net.minecraft.world.item.ItemStack
 
 object HexDebugEmiPlugin {
     fun register(registry: EmiRegistry) {
         // if a recipe calls for an empty focus holder, disallow filled, and vice versa
         registry.setDefaultComparison(
             HexDebugBlocks.FOCUS_HOLDER.item,
-            Comparison.compareData { it.itemStack.hasIotaStack },
+            Comparison.compareData { it.itemStack.getIotaStack().first.item },
         )
 
         // show filled focus holder in sidebar
-        // necessary because otherwise there's no good way to see the recipe for a new holder with existing focus
-        registry.addEmiStack(EmiStack.of(FocusHolderBlockItem.withFocus()))
-
-        // better recipes for focus holder filling/emptying
-        for (recipe in registry.recipeManager.getAllRecipesFor(RecipeType.CRAFTING)) {
-            val emiRecipe = when (recipe) {
-                is FocusHolderEmptyingRecipe -> EmiCraftingRecipe(
-                    listOf(
-                        EmiStack.of(FocusHolderBlockItem.withFocus())
-                            .setRemainder(EmiStack.of(HexDebugBlocks.FOCUS_HOLDER.item)),
-                    ),
-                    EmiStack.of(HexItems.FOCUS),
-                    synthetic(recipe.id),
-                    true,
-                )
-
-                is FocusHolderFillingShapelessRecipe -> EmiCraftingRecipe(
-                    listOf(
-                        EmiStack.of(HexDebugBlocks.FOCUS_HOLDER.item),
-                        EmiStack.of(HexItems.FOCUS),
-                    ),
-                    EmiStack.of(FocusHolderBlockItem.withFocus()),
-                    synthetic(recipe.id),
-                    true,
-                )
-
-                else -> continue
-            }
-            registry.removeRecipes(recipe.id)
-            registry.addRecipe(emiRecipe)
-        }
+        registry.addEmiStack(EmiStack.of(
+            ItemStack(HexDebugBlocks.FOCUS_HOLDER)
+                .setIotaStack(ItemStack(HexItems.FOCUS))
+        ))
 
         // screen exclusions for splicing table
         registry.addExclusionArea(SplicingTableScreen::class.java) { screen, consumer ->
@@ -94,6 +63,4 @@ object HexDebugEmiPlugin {
             }
         }
     }
-
-    private fun synthetic(id: ResourceLocation) = id.withPrefix("/")
 }

Common/src/generated/resources/data/hexdebug/recipes/focus_holder_filling_shaped/new_holder.json

@@ -4,13 +4,11 @@ import at.petrak.hexcasting.api.casting.iota.Iota
 import at.petrak.hexcasting.api.item.IotaHolderItem
 import at.petrak.hexcasting.api.utils.asTranslatedComponent
 import at.petrak.hexcasting.api.utils.getList
-import at.petrak.hexcasting.common.lib.HexItems
 import gay.`object`.hexdebug.HexDebug
 import gay.`object`.hexdebug.blocks.focusholder.FocusHolderBlockEntity
 import gay.`object`.hexdebug.items.base.ItemPredicateProvider
 import gay.`object`.hexdebug.items.base.ModelPredicateEntry
 import gay.`object`.hexdebug.registry.HexDebugBlockEntities
-import gay.`object`.hexdebug.registry.HexDebugBlocks
 import gay.`object`.hexdebug.utils.asItemPredicate
 import gay.`object`.hexdebug.utils.isNotEmpty
 import gay.`object`.hexdebug.utils.styledHoverName
@@ -124,13 +122,6 @@ class FocusHolderBlockItem(block: Block, properties: Properties) :
     companion object {
         val HAS_ITEM = HexDebug.id("has_item")
 
-        fun withFocus(stack: ItemStack? = null): ItemStack {
-            val result = stack?.copy() ?: ItemStack(HexDebugBlocks.FOCUS_HOLDER.item)
-            return result.apply {
-                setIotaStack(ItemStack(HexItems.FOCUS))
-            }
-        }
-
         val ItemStack.hasIotaStack get() = getBlockEntityData(this)
             ?.getList("Items", Tag.TAG_COMPOUND)
             ?.let { it.size > 0 }
@@ -146,7 +137,7 @@ class FocusHolderBlockItem(block: Block, properties: Properties) :
             return Pair(iotaStack, iotaStack.item as? IotaHolderItem)
         }
 
-        fun ItemStack.setIotaStack(iotaStack: ItemStack) {
+        fun ItemStack.setIotaStack(iotaStack: ItemStack): ItemStack {
             val tag = if (iotaStack.isEmpty) {
                 CompoundTag()
             } else {
@@ -155,6 +146,7 @@ class FocusHolderBlockItem(block: Block, properties: Properties) :
             }
 
             setBlockEntityData(this, HexDebugBlockEntities.FOCUS_HOLDER.value, tag)
+            return this
         }
     }
 }