Add focus holder emptying recipe

object-Object · object-Object · commit ec8d702f020e · 2025-09-16T23:35:18.000-04:00
diff --git a/Common/src/generated/resources/data/hexdebug/recipes/focus_holder_emptying.json b/Common/src/generated/resources/data/hexdebug/recipes/focus_holder_emptying.json
@@ -0,0 +1,4 @@
+{
+  "type": "hexdebug:focus_holder_emptying",
+  "category": "misc"
+}
diff --git a/Common/src/main/kotlin/gay/object/hexdebug/items/FocusHolderBlockItem.kt b/Common/src/main/kotlin/gay/object/hexdebug/items/FocusHolderBlockItem.kt
@@ -3,12 +3,11 @@ package gay.`object`.hexdebug.items
 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.getCompound
 import at.petrak.hexcasting.api.utils.getList
-import at.petrak.hexcasting.api.utils.putCompound
 import gay.`object`.hexdebug.HexDebug
 import gay.`object`.hexdebug.items.base.ItemPredicateProvider
 import gay.`object`.hexdebug.items.base.ModelPredicateEntry
+import gay.`object`.hexdebug.registry.HexDebugBlockEntities
 import gay.`object`.hexdebug.utils.asItemPredicate
 import gay.`object`.hexdebug.utils.styledHoverName
 import net.minecraft.core.NonNullList
@@ -44,7 +43,7 @@ class FocusHolderBlockItem(block: Block, properties: Properties) :
         val (iotaStack, iotaHolder) = stack.getIotaStack()
         if (iotaHolder != null) {
             iotaHolder.writeDatum(iotaStack, iota)
-            stack.putIotaStack(iotaStack)
+            stack.setIotaStack(iotaStack)
         }
     }
 
@@ -70,13 +69,13 @@ class FocusHolderBlockItem(block: Block, properties: Properties) :
     companion object {
         val HAS_ITEM = HexDebug.id("has_item")
 
-        val ItemStack.hasIotaStack get() = getCompound(BLOCK_ENTITY_TAG)
+        val ItemStack.hasIotaStack get() = getBlockEntityData(this)
             ?.getList("Items", Tag.TAG_COMPOUND)
             ?.let { it.size > 0 }
             ?: false
 
         fun ItemStack.getIotaStack(): Pair<ItemStack, IotaHolderItem?> {
-            val blockEntityTag = getCompound(BLOCK_ENTITY_TAG) ?: CompoundTag()
+            val blockEntityTag = getBlockEntityData(this) ?: CompoundTag()
 
             val containerStacks = NonNullList.withSize(1, ItemStack.EMPTY)
             ContainerHelper.loadAllItems(blockEntityTag, containerStacks)
@@ -85,13 +84,15 @@ class FocusHolderBlockItem(block: Block, properties: Properties) :
             return Pair(iotaStack, iotaStack.item as? IotaHolderItem)
         }
 
-        fun ItemStack.putIotaStack(iotaStack: ItemStack) {
-            val blockEntityTag = getCompound(BLOCK_ENTITY_TAG) ?: CompoundTag()
+        fun ItemStack.setIotaStack(iotaStack: ItemStack) {
+            val tag = if (iotaStack.isEmpty) {
+                CompoundTag()
+            } else {
+                val containerStacks = NonNullList.of(ItemStack.EMPTY, iotaStack)
+                ContainerHelper.saveAllItems(getBlockEntityData(this) ?: CompoundTag(), containerStacks)
+            }
 
-            val containerStacks = NonNullList.of(ItemStack.EMPTY, iotaStack)
-            ContainerHelper.saveAllItems(blockEntityTag, containerStacks)
-
-            putCompound(BLOCK_ENTITY_TAG, blockEntityTag)
+            setBlockEntityData(this, HexDebugBlockEntities.FOCUS_HOLDER.value, tag)
         }
     }
 }
diff --git a/Common/src/main/kotlin/gay/object/hexdebug/recipes/FocusHolderEmptyingRecipe.kt b/Common/src/main/kotlin/gay/object/hexdebug/recipes/FocusHolderEmptyingRecipe.kt
@@ -0,0 +1,59 @@
+package gay.`object`.hexdebug.recipes
+
+import gay.`object`.hexdebug.items.FocusHolderBlockItem.Companion.getIotaStack
+import gay.`object`.hexdebug.items.FocusHolderBlockItem.Companion.hasIotaStack
+import gay.`object`.hexdebug.items.FocusHolderBlockItem.Companion.setIotaStack
+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.Items
+import net.minecraft.world.item.crafting.CraftingBookCategory
+import net.minecraft.world.item.crafting.CustomRecipe
+import net.minecraft.world.level.Level
+
+class FocusHolderEmptyingRecipe(id: ResourceLocation, category: CraftingBookCategory) : CustomRecipe(id, category) {
+    override fun matches(container: CraftingContainer, level: Level): Boolean {
+        return findItem(container) != null
+    }
+
+    override fun assemble(container: CraftingContainer, registryAccess: RegistryAccess): ItemStack {
+        val holder = findItem(container) ?: return ItemStack.EMPTY
+        return holder.getIotaStack().first.copy()
+    }
+
+    override fun getRemainingItems(container: CraftingContainer): NonNullList<ItemStack> {
+        val remaining = NonNullList.withSize(container.containerSize, ItemStack.EMPTY)
+        for (i in 0..remaining.size) {
+            val itemStack = container.getItem(i)
+            if (itemStack.`is`(HexDebugBlocks.FOCUS_HOLDER.item)) {
+                remaining[i] = itemStack.copy().apply { setIotaStack(ItemStack.EMPTY) }
+            }
+        }
+        return remaining
+    }
+
+    override fun canCraftInDimensions(width: Int, height: Int): Boolean {
+        return width * height >= 1
+    }
+
+    override fun getSerializer() = HexDebugRecipeSerializers.FOCUS_HOLDER_EMPTYING.value
+
+    private fun findItem(container: CraftingContainer): ItemStack? {
+        var holder: ItemStack? = null
+        for (itemStack in container.items) {
+            when (itemStack.item) {
+                HexDebugBlocks.FOCUS_HOLDER.item -> {
+                    if (holder != null || !itemStack.hasIotaStack || itemStack.count > 1) return null
+                    holder = itemStack
+                }
+                Items.AIR -> {}
+                else -> return null
+            }
+        }
+        return holder
+    }
+}
diff --git a/Common/src/main/kotlin/gay/object/hexdebug/recipes/FocusHolderFillingShapedRecipe.kt b/Common/src/main/kotlin/gay/object/hexdebug/recipes/FocusHolderFillingShapedRecipe.kt
@@ -3,7 +3,7 @@ package gay.`object`.hexdebug.recipes
 import at.petrak.hexcasting.common.lib.HexItems
 import com.google.gson.JsonObject
 import gay.`object`.hexdebug.items.FocusHolderBlockItem.Companion.hasIotaStack
-import gay.`object`.hexdebug.items.FocusHolderBlockItem.Companion.putIotaStack
+import gay.`object`.hexdebug.items.FocusHolderBlockItem.Companion.setIotaStack
 import gay.`object`.hexdebug.registry.HexDebugBlocks
 import gay.`object`.hexdebug.registry.HexDebugRecipeSerializers
 import net.minecraft.core.NonNullList
@@ -42,7 +42,7 @@ class FocusHolderFillingShapedRecipe(
         val result = super.assemble(container, registryAccess)
         for (ingredient in container.items) {
             if (ingredient.`is`(HexItems.FOCUS)) {
-                result.putIotaStack(ingredient)
+                result.setIotaStack(ingredient)
                 break
             }
         }
@@ -63,7 +63,7 @@ class FocusHolderFillingShapedRecipe(
                     height = height,
                     recipeItems = ingredients,
                     result = getResultItem(null).apply {
-                        putIotaStack(ItemStack(HexItems.FOCUS))
+                        setIotaStack(ItemStack(HexItems.FOCUS))
                     },
                     showNotification = showNotification(),
                 )
diff --git a/Common/src/main/kotlin/gay/object/hexdebug/recipes/FocusHolderFillingShapelessRecipe.kt b/Common/src/main/kotlin/gay/object/hexdebug/recipes/FocusHolderFillingShapelessRecipe.kt
@@ -2,7 +2,7 @@ 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.items.FocusHolderBlockItem.Companion.setIotaStack
 import gay.`object`.hexdebug.registry.HexDebugBlocks
 import gay.`object`.hexdebug.registry.HexDebugRecipeSerializers
 import net.minecraft.core.NonNullList
@@ -17,7 +17,7 @@ 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))
+        setIotaStack(ItemStack(HexItems.FOCUS))
     }
 
     override fun matches(container: CraftingContainer, level: Level): Boolean {
@@ -27,7 +27,7 @@ class FocusHolderFillingShapelessRecipe(id: ResourceLocation, category: Crafting
     override fun assemble(container: CraftingContainer, registryAccess: RegistryAccess): ItemStack {
         val (holder, focus) = findItems(container) ?: return ItemStack.EMPTY
         return holder.copyWithCount(1).apply {
-            putIotaStack(focus)
+            setIotaStack(focus)
         }
     }
 
diff --git a/Common/src/main/kotlin/gay/object/hexdebug/registry/HexDebugRecipeSerializers.kt b/Common/src/main/kotlin/gay/object/hexdebug/registry/HexDebugRecipeSerializers.kt
@@ -1,5 +1,6 @@
 package gay.`object`.hexdebug.registry
 
+import gay.`object`.hexdebug.recipes.FocusHolderEmptyingRecipe
 import gay.`object`.hexdebug.recipes.FocusHolderFillingShapedRecipe
 import gay.`object`.hexdebug.recipes.FocusHolderFillingShapelessRecipe
 import net.minecraft.core.registries.BuiltInRegistries
@@ -11,6 +12,10 @@ object HexDebugRecipeSerializers : HexDebugRegistrar<RecipeSerializer<*>>(
     Registries.RECIPE_SERIALIZER,
     { BuiltInRegistries.RECIPE_SERIALIZER },
 ) {
+    val FOCUS_HOLDER_EMPTYING = register("focus_holder_emptying") {
+        SimpleCraftingRecipeSerializer(::FocusHolderEmptyingRecipe)
+    }
+
     val FOCUS_HOLDER_FILLING_SHAPED = register("focus_holder_filling_shaped") {
         FocusHolderFillingShapedRecipe.Serializer()
     }
diff --git a/Forge/src/main/kotlin/gay/object/hexdebug/forge/datagen/HexDebugRecipes.kt b/Forge/src/main/kotlin/gay/object/hexdebug/forge/datagen/HexDebugRecipes.kt
@@ -82,6 +82,9 @@ class HexDebugRecipes(output: PackOutput) : PaucalRecipeProvider(output, HexDebu
 
         // existing focus holder with existing focus
         specialRecipe(writer, HexDebugRecipeSerializers.FOCUS_HOLDER_FILLING_SHAPELESS)
+
+        // remove focus from holder
+        specialRecipe(writer, HexDebugRecipeSerializers.FOCUS_HOLDER_EMPTYING)
     }
 
     @Suppress("SameParameterValue")

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type": "hexdebug:focus_holder_emptying",
 +  "category": "misc"
 +}
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,9 @@ class HexDebugRecipes(output: PackOutput) : PaucalRecipeProvider(output, HexDebu`
`82`	`82`
`83`	`83`	`// existing focus holder with existing focus`
`84`	`84`	`specialRecipe(writer, HexDebugRecipeSerializers.FOCUS_HOLDER_FILLING_SHAPELESS)`
	`85`	`+`
	`86`	`+ // remove focus from holder`
	`87`	`+ specialRecipe(writer, HexDebugRecipeSerializers.FOCUS_HOLDER_EMPTYING)`
`85`	`88`	`}`
`86`	`89`
`87`	`90`	`@Suppress("SameParameterValue")`