Fix debugger media extraction when not holding debugger in original hand

Author: object-Object

CHANGELOG.md

@@ -8,7 +8,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
 
 ### Fixed
 
-- Fixed a bug where the Evaluator was unable to cast any spells requiring media.
+- The Evaluator was unable to cast any spells requiring media.
+- When debugging, spells requiring media would fail if a Debugger was not in the hand that the debug session was started with. 
 
 ## 0.2.0+1.20.1
 

Common/src/main/kotlin/gay/object/hexdebug/casting/eval/DebuggerCastEnv.kt

@@ -4,6 +4,8 @@ import at.petrak.hexcasting.api.casting.castables.Action
 import at.petrak.hexcasting.api.casting.eval.env.PackagedItemCastEnv
 import at.petrak.hexcasting.api.casting.eval.sideeffects.OperatorSideEffect
 import gay.`object`.hexdebug.debugger.DebugStepType
+import gay.`object`.hexdebug.utils.findMediaHolderInHand
+import gay.`object`.hexdebug.utils.otherHand
 import net.minecraft.network.chat.Component
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.InteractionHand
@@ -12,6 +14,8 @@ class DebuggerCastEnv(
     caster: ServerPlayer,
     castingHand: InteractionHand,
 ) : PackagedItemCastEnv(caster, castingHand), IDebugCastEnv {
+    private val item = caster.getItemInHand(castingHand).item
+
     override var lastEvaluatedAction: Action? = null
     override var lastDebugStepType: DebugStepType? = null
 
@@ -24,4 +28,29 @@ class DebuggerCastEnv(
         super.sendMishapMsgToPlayer(mishap)
         printDebugMishap(this, caster, mishap)
     }
+
+    override fun extractMediaEnvironment(cost: Long): Long {
+        if (caster.isCreative) return 0
+
+        var costLeft = cost
+
+        // allow extracting from a debugger item in either hand, preferring the one we started casting with
+        // NOTE: if holding two debuggers and the first is empty, this will take the empty one, not the other one
+        val casterMediaHolder = caster.findMediaHolderInHand(castingHand, item)
+            ?: caster.findMediaHolderInHand(castingHand.otherHand, item)
+
+        // The contracts on the AD and on this function are different.
+        // ADs return the amount extracted, this wants the amount left
+        if (casterMediaHolder != null) {
+            val extracted = casterMediaHolder.withdrawMedia(costLeft.toInt().toLong(), false)
+            costLeft -= extracted
+        }
+
+        // debugger can always extract from inventory
+        if (costLeft > 0) {
+            costLeft = extractMediaFromInventory(costLeft, canOvercast())
+        }
+
+        return costLeft
+    }
 }

Common/src/main/kotlin/gay/object/hexdebug/utils/Extensions.kt

@@ -1,6 +1,9 @@
 package gay.`object`.hexdebug.utils
 
+import at.petrak.hexcasting.xplat.IXplatAbstractions
 import net.minecraft.world.InteractionHand
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.item.Item
 import java.util.concurrent.CompletableFuture
 import kotlin.enums.enumEntries
 import kotlin.math.ceil
@@ -35,6 +38,12 @@ val InteractionHand.otherHand get() = when (this) {
     InteractionHand.OFF_HAND -> InteractionHand.MAIN_HAND
 }
 
+fun LivingEntity.getItemInHand(hand: InteractionHand, item: Item) =
+    getItemInHand(hand).takeIf { it.`is`(item) }
+
+fun LivingEntity.findMediaHolderInHand(hand: InteractionHand, item: Item) =
+    getItemInHand(hand, item)?.let(IXplatAbstractions.INSTANCE::findMediaHolder)
+
 // ceil the denominator to a power of 2 so we don't have issues with eg. 1/3
 @OptIn(ExperimentalStdlibApi::class)
 inline val <reified T : Enum<T>> T.itemPredicate get() =