Add EMI plugin for exclusion areas and better recipe support

object-Object · object-Object · commit b07f04895504 · 2025-09-16T23:35:19.000-04:00
diff --git a/Common/build.gradle.kts b/Common/build.gradle.kts
@@ -31,4 +31,6 @@ dependencies {
     implementation(libs.bundles.ktor)
 
     modApi(libs.ioticblocks.common)
+
+    modImplementation(libs.emi.xplat)
 }
diff --git a/Common/src/main/kotlin/gay/object/hexdebug/gui/splicing/SplicingTableScreen.kt b/Common/src/main/kotlin/gay/object/hexdebug/gui/splicing/SplicingTableScreen.kt
@@ -49,7 +49,7 @@ class SplicingTableScreen(
     val data get() = menu.clientView
 
     private val hasMediaItem get() = menu.mediaSlot.hasItem()
-    private val hasStaffItem get() = menu.staffSlot.hasItem()
+    val hasStaffItem get() = menu.staffSlot.hasItem()
 
     var guiSpellcasting = GuiSpellcasting(
         InteractionHand.MAIN_HAND, mutableListOf(), listOf(), null, 1
@@ -67,10 +67,45 @@ class SplicingTableScreen(
     // so offset up if taller or down if shorter
     private val staffOffsetY: Int = ((32 * 6) - staffHeight) / 2
 
-    private val staffMaxX get() = leftPos - 14
-    private val staffMinX get() = staffMaxX - staffWidth
-    private val staffMinY get() = topPos + staffOffsetY
-    private val staffMaxY get() = staffMinY + staffHeight
+    // relative to top left (for hasClickedOutside)
+    private val staffMaxXOffset = -14
+    private val staffMinXOffset = staffMaxXOffset - staffWidth
+    private val staffMinYOffset = staffOffsetY
+    private val staffMaxYOffset = staffMinYOffset + staffHeight
+
+    private val staffSlotWidth = 23
+    private val staffSlotHeight = 24
+
+    private val staffSlotMinXOffset = -24
+    private val staffSlotMaxXOffset = staffSlotMinXOffset + staffSlotWidth
+    private val staffSlotMinYOffset = 165
+    private val staffSlotMaxYOffset = staffSlotMinYOffset + staffSlotHeight
+
+    private val storageMinXOffset = 192
+    private val storageMaxXOffset = storageMinXOffset + 46
+    private val storageMinYOffset = 103
+    private val storageMaxYOffset = storageMinYOffset + 87
+
+    // absolute
+    val staffMinX get() = leftPos + staffMinXOffset
+    val staffMaxX get() = leftPos + staffMaxXOffset
+    val staffMinY get() = topPos + staffMinYOffset
+    val staffMaxY get() = topPos + staffMaxYOffset
+
+    val staffSlotMinX get() = leftPos + staffSlotMinXOffset
+    val staffSlotMaxX get() = leftPos + staffSlotMaxXOffset
+    val staffSlotMinY get() = topPos + staffSlotMinYOffset
+    val staffSlotMaxY get() = topPos + staffSlotMaxYOffset
+
+    val storageMinX get() = leftPos + storageMinXOffset
+    val storageMaxX get() = leftPos + storageMaxXOffset
+    val storageMinY get() = topPos + storageMinYOffset
+    val storageMaxY get() = topPos + storageMaxYOffset
+
+    val exportButtonX get() = leftPos + 194
+    val exportButtonY get() = topPos + 18
+    val exportButtonWidth = 24
+    val exportButtonHeight = 24
 
     private val predicateButtons = mutableListOf<Pair<AbstractButton, () -> Boolean>>()
 
@@ -124,12 +159,12 @@ class SplicingTableScreen(
         predicateButtons += listOf(
             // export hexpattern
             object : SpriteButton(
-                x = leftPos + 194,
-                y = topPos + 18,
+                x = exportButtonX,
+                y = exportButtonY,
                 uOffset = 432,
                 vOffset = 392,
-                width = 24,
-                height = 24,
+                width = exportButtonWidth,
+                height = exportButtonHeight,
                 message = buttonText("export"),
                 onPress = {
                     exportToSystemClipboard()
@@ -521,10 +556,16 @@ class SplicingTableScreen(
     private fun isInStaffGrid(mouseX: Double, mouseY: Double, button: Int?) =
         staffMinX <= mouseX && mouseX <= staffMaxX && staffMinY <= mouseY && mouseY <= staffMaxY
         // avoid interacting with the grid when inserting the staff item...
-        && (button == null || hasClickedOutside(mouseX, mouseY, leftPos, topPos, button))
+        && (button == null || isOutsideStaffItemSlot(mouseX, mouseY, leftPos, topPos))
         // or when clicking the clear grid button
         && !(clearGridButton?.testHitbox(mouseX, mouseY) ?: false)
 
+    private fun isOutsideStaffItemSlot(mouseX: Double, mouseY: Double, guiLeft: Int, guiTop: Int) =
+        mouseX < guiLeft + staffSlotMinXOffset
+        || mouseY < guiTop + staffSlotMinYOffset
+        || mouseX >= guiLeft + staffSlotMaxXOffset
+        || mouseY >= guiTop + staffSlotMaxYOffset
+
     override fun hasClickedOutside(
         mouseX: Double,
         mouseY: Double,
@@ -536,9 +577,14 @@ class SplicingTableScreen(
             // main gui
             super.hasClickedOutside(mouseX, mouseY, guiLeft, guiTop, mouseButton)
             // storage/media
-            && (mouseX < guiLeft + 192 || mouseY < guiTop + 103 || mouseX >= guiLeft + 192 + 46 || mouseY >= guiTop + 103 + 87)
-            // staff
-            && (mouseX < guiLeft - 22 || mouseY < guiTop + 167 || mouseX >= guiLeft - 22 + 20 || mouseY >= guiTop + 167 + 20)
+            && (
+                mouseX < guiLeft + storageMinXOffset
+                || mouseY < guiTop + storageMinYOffset
+                || mouseX >= guiLeft + storageMaxXOffset
+                || mouseY >= guiTop + storageMaxYOffset
+            )
+            // staff item slot
+            && isOutsideStaffItemSlot(mouseX, mouseY, guiLeft, guiTop)
         )
     }
 
@@ -600,10 +646,10 @@ class SplicingTableScreen(
             blitSprite(guiGraphics, x = staffMaxX - 1, y = staffMaxY - 1, uOffset = 184, vOffset = 9, width = 8, height = 9)
 
             // staff slot without icon
-            blitSprite(guiGraphics, x = leftPos - 24, y = topPos + 165, uOffset = 232, vOffset = 293, width = 23, height = 24)
+            blitSprite(guiGraphics, x = staffSlotMinX, y = staffSlotMinY, uOffset = 232, vOffset = 293, width = staffSlotWidth, height = staffSlotHeight)
         } else {
             // staff slot with icon
-            blitSprite(guiGraphics, x = leftPos - 24, y = topPos + 165, uOffset = 232, vOffset = 328, width = 23, height = 24)
+            blitSprite(guiGraphics, x = staffSlotMinX, y = staffSlotMinY, uOffset = 232, vOffset = 328, width = staffSlotWidth, height = staffSlotHeight)
         }
     }
 
diff --git a/Common/src/main/kotlin/gay/object/hexdebug/interop/HexDebugEmiPlugin.kt b/Common/src/main/kotlin/gay/object/hexdebug/interop/HexDebugEmiPlugin.kt
@@ -0,0 +1,93 @@
+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.registry.HexDebugBlocks
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.world.item.crafting.RecipeType
+
+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 },
+        )
+
+        // 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)
+        }
+
+        // screen exclusions for splicing table
+        registry.addExclusionArea(SplicingTableScreen::class.java) { screen, consumer ->
+            screen.apply {
+                consumer.accept(Bounds(
+                    exportButtonX,
+                    exportButtonY,
+                    exportButtonWidth,
+                    exportButtonHeight,
+                ))
+                consumer.accept(Bounds(
+                    storageMinX,
+                    storageMinY,
+                    storageMaxX - storageMinX,
+                    storageMaxY - storageMinY,
+                ))
+                consumer.accept(Bounds(
+                    staffSlotMinX,
+                    staffSlotMinY,
+                    staffSlotMaxX - staffSlotMinX,
+                    staffSlotMaxY - staffSlotMinY,
+                ))
+                if (hasStaffItem) {
+                    consumer.accept(Bounds(
+                        staffMinX,
+                        staffMinY,
+                        staffMaxX - staffMinX,
+                        staffMaxY - staffMinY,
+                    ))
+                }
+            }
+        }
+    }
+
+    private fun synthetic(id: ResourceLocation) = id.withPrefix("/")
+}
diff --git a/Common/src/main/kotlin/gay/object/hexdebug/items/FocusHolderBlockItem.kt b/Common/src/main/kotlin/gay/object/hexdebug/items/FocusHolderBlockItem.kt
@@ -4,10 +4,12 @@ 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.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.styledHoverName
 import net.minecraft.core.NonNullList
@@ -69,6 +71,13 @@ 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 }
diff --git a/Common/src/main/kotlin/gay/object/hexdebug/recipes/FocusHolderFillingShapedRecipe.kt b/Common/src/main/kotlin/gay/object/hexdebug/recipes/FocusHolderFillingShapedRecipe.kt
@@ -2,6 +2,7 @@ package gay.`object`.hexdebug.recipes
 
 import at.petrak.hexcasting.common.lib.HexItems
 import com.google.gson.JsonObject
+import gay.`object`.hexdebug.items.FocusHolderBlockItem
 import gay.`object`.hexdebug.items.FocusHolderBlockItem.Companion.hasIotaStack
 import gay.`object`.hexdebug.items.FocusHolderBlockItem.Companion.setIotaStack
 import gay.`object`.hexdebug.registry.HexDebugBlocks
@@ -62,9 +63,7 @@ class FocusHolderFillingShapedRecipe(
                     width = width,
                     height = height,
                     recipeItems = ingredients,
-                    result = getResultItem(null).apply {
-                        setIotaStack(ItemStack(HexItems.FOCUS))
-                    },
+                    result = FocusHolderBlockItem.withFocus(getResultItem(null)),
                     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
@@ -1,6 +1,7 @@
 package gay.`object`.hexdebug.recipes
 
 import at.petrak.hexcasting.common.lib.HexItems
+import gay.`object`.hexdebug.items.FocusHolderBlockItem
 import gay.`object`.hexdebug.items.FocusHolderBlockItem.Companion.hasIotaStack
 import gay.`object`.hexdebug.items.FocusHolderBlockItem.Companion.setIotaStack
 import gay.`object`.hexdebug.registry.HexDebugBlocks
@@ -16,9 +17,7 @@ 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 {
-        setIotaStack(ItemStack(HexItems.FOCUS))
-    }
+    private val resultItem = FocusHolderBlockItem.withFocus()
 
     override fun matches(container: CraftingContainer, level: Level): Boolean {
         return findItems(container) != null
diff --git a/Fabric/build.gradle.kts b/Fabric/build.gradle.kts
@@ -29,6 +29,7 @@ hexdebugModDependencies {
     requires("fabric-api")
     requires("fabric-language-kotlin")
 
+    optional("emi")
     optional("modmenu")
 }
 
@@ -78,6 +79,8 @@ dependencies {
     modLocalRuntime(libs.devAuth.fabric)
 
     modApi(libs.ioticblocks.fabric)
+
+    modImplementation(libs.emi.fabric)
 }
 
 publishMods {
diff --git a/Fabric/src/main/kotlin/gay/object/hexdebug/fabric/interop/FabricHexDebugEmiPlugin.kt b/Fabric/src/main/kotlin/gay/object/hexdebug/fabric/interop/FabricHexDebugEmiPlugin.kt
@@ -0,0 +1,11 @@
+package gay.`object`.hexdebug.fabric.interop
+
+import dev.emi.emi.api.EmiPlugin
+import dev.emi.emi.api.EmiRegistry
+import gay.`object`.hexdebug.interop.HexDebugEmiPlugin
+
+object FabricHexDebugEmiPlugin : EmiPlugin {
+    override fun register(registry: EmiRegistry) {
+        HexDebugEmiPlugin.register(registry)
+    }
+}
diff --git a/Fabric/src/main/kotlin/gay/object/hexdebug/fabric/interop/FabricHexDebugModMenu.kt b/Fabric/src/main/kotlin/gay/object/hexdebug/fabric/interop/FabricHexDebugModMenu.kt
@@ -1,4 +1,4 @@
-package gay.`object`.hexdebug.fabric
+package gay.`object`.hexdebug.fabric.interop
 
 import com.terraformersmc.modmenu.api.ConfigScreenFactory
 import com.terraformersmc.modmenu.api.ModMenuApi
diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json
@@ -23,9 +23,13 @@
       "adapter": "kotlin",
       "value": "gay.object.hexdebug.fabric.FabricHexDebugClient"
     }],
+    "emi": [{
+      "adapter": "kotlin",
+      "value": "gay.object.hexdebug.fabric.interop.FabricHexDebugEmiPlugin"
+    }],
     "modmenu": [{
       "adapter": "kotlin",
-      "value": "gay.object.hexdebug.fabric.FabricHexDebugModMenu"
+      "value": "gay.object.hexdebug.fabric.interop.FabricHexDebugModMenu"
     }]
   },
   "mixins": [
@@ -42,6 +46,7 @@
     "ioticblocks": ">=${versions.ioticblocks}"
   },
   "suggests": {
+    "emi": ">=${versions.emi}",
     "modmenu": ">=${versions.modMenu}"
   }
 }
diff --git a/Forge/build.gradle.kts b/Forge/build.gradle.kts
@@ -53,6 +53,8 @@ hexdebugModDependencies {
     requires("ioticblocks")
 
     requires("kotlin-for-forge")
+
+    optional("emi")
 }
 
 dependencies {
@@ -94,6 +96,8 @@ dependencies {
     modLocalRuntime(libs.devAuth.forge)
 
     modApi(libs.ioticblocks.forge)
+
+    modImplementation(libs.emi.forge)
 }
 
 tasks {
diff --git a/Forge/src/main/kotlin/gay/object/hexdebug/forge/interop/ForgeHexDebugEmiPlugin.kt b/Forge/src/main/kotlin/gay/object/hexdebug/forge/interop/ForgeHexDebugEmiPlugin.kt
@@ -0,0 +1,13 @@
+package gay.`object`.hexdebug.forge.interop
+
+import dev.emi.emi.api.EmiEntrypoint
+import dev.emi.emi.api.EmiPlugin
+import dev.emi.emi.api.EmiRegistry
+import gay.`object`.hexdebug.interop.HexDebugEmiPlugin
+
+@EmiEntrypoint
+object ForgeHexDebugEmiPlugin : EmiPlugin {
+    override fun register(registry: EmiRegistry) {
+        HexDebugEmiPlugin.register(registry)
+    }
+}
diff --git a/Forge/src/main/resources/META-INF/mods.toml b/Forge/src/main/resources/META-INF/mods.toml
@@ -53,3 +53,10 @@ mandatory = true
 versionRange = "[${versions.ioticblocks},)"
 ordering = "NONE"
 side = "BOTH"
+
+[[dependencies.hexdebug]]
+modId = "emi"
+mandatory = false
+versionRange = "[${versions.emi},)"
+ordering = "NONE"
+side = "CLIENT"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml

Original file line number	Diff line number	Diff line change
`@@ -31,4 +31,6 @@ dependencies {`
`31`	`31`	`implementation(libs.bundles.ktor)`
`32`	`32`
`33`	`33`	`modApi(libs.ioticblocks.common)`
	`34`	`+`
	`35`	`+ modImplementation(libs.emi.xplat)`
`34`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ hexdebugModDependencies {`
`29`	`29`	`requires("fabric-api")`
`30`	`30`	`requires("fabric-language-kotlin")`
`31`	`31`
	`32`	`+ optional("emi")`
`32`	`33`	`optional("modmenu")`
`33`	`34`	`}`
`34`	`35`
`@@ -78,6 +79,8 @@ dependencies {`
`78`	`79`	`modLocalRuntime(libs.devAuth.fabric)`
`79`	`80`
`80`	`81`	`modApi(libs.ioticblocks.fabric)`
	`82`	`+`
	`83`	`+ modImplementation(libs.emi.fabric)`
`81`	`84`	`}`
`82`	`85`
`83`	`86`	`publishMods {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-package gay.`object`.hexdebug.fabric
	`1`	+package gay.`object`.hexdebug.fabric.interop
`2`	`2`
`3`	`3`	`import com.terraformersmc.modmenu.api.ConfigScreenFactory`
`4`	`4`	`import com.terraformersmc.modmenu.api.ModMenuApi`