Update to Hex Casting 0.11.2 and fix compile errors

Author: object-Object

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

@@ -29,7 +29,7 @@ class DebuggerCastEnv(
         printDebugMishap(this, caster, mishap)
     }
 
-    override fun extractMediaEnvironment(cost: Long): Long {
+    override fun extractMediaEnvironment(cost: Long, simulate: Boolean): Long {
         if (caster.isCreative) return 0
 
         var costLeft = cost
@@ -42,13 +42,13 @@ class DebuggerCastEnv(
         // 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)
+            val extracted = casterMediaHolder.withdrawMedia(costLeft.toInt().toLong(), simulate)
             costLeft -= extracted
         }
 
         // debugger can always extract from inventory
         if (costLeft > 0) {
-            costLeft = extractMediaFromInventory(costLeft, canOvercast())
+            costLeft = extractMediaFromInventory(costLeft, canOvercast(), simulate)
         }
 
         return costLeft

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

@@ -25,7 +25,7 @@ class FakeCastEnv(level: ServerLevel) : CastingEnvironment(level) {
 
     override fun mishapSprayPos(): Vec3 = TODO()
 
-    override fun extractMediaEnvironment(cost: Long): Long = cost
+    override fun extractMediaEnvironment(cost: Long, simulate: Boolean): Long = cost
 
     override fun isVecInRangeEnvironment(vec: Vec3?): Boolean = false
 

Common/src/main/kotlin/gay/object/hexdebug/debugger/HexDebugger.kt

@@ -592,11 +592,11 @@ class HexDebugger(
             lastResolutionType = castResult.resolutionType
 
             try {
-                vm.performSideEffects(info, castResult.sideEffects)
+                vm.performSideEffects(castResult.sideEffects)
             } catch (e: Exception) {
                 e.printStackTrace()
                 vm.performSideEffects(
-                    info, listOf(OperatorSideEffect.DoMishap(MishapInternalException(e), Mishap.Context(null, null)))
+                    listOf(OperatorSideEffect.DoMishap(MishapInternalException(e), Mishap.Context(null, null)))
                 )
             }
             info.earlyExit = info.earlyExit || !castResult.resolutionType.success

Fabric/build.gradle.kts

@@ -49,6 +49,7 @@ dependencies {
     modLocalRuntime(libs.cardinalComponents)
     modLocalRuntime(libs.serializationHooks)
     modLocalRuntime(libs.trinkets)
+    modLocalRuntime(libs.inline.fabric)
 
     libs.mixinExtras.also {
         localRuntime(it)

Fabric/src/main/resources/fabric.mod.json

@@ -37,7 +37,7 @@
     "fabric-api": ">=${versions.fabric_api}",
     "fabric-language-kotlin": ">=${versions.kotlin_fabric}",
     "architectury": ">=${versions.architectury}",
-    "hexcasting": ">=${versions.hexcasting}",
+    "hexcasting": ">=${versions.hexcasting_dependency}",
     "cloth-config": ">=${versions.clothConfig}"
   },
   "suggests": {

Forge/build.gradle.kts

@@ -63,6 +63,7 @@ dependencies {
     modImplementation(libs.paucal.forge)
     modLocalRuntime(libs.patchouli.forge)
     modLocalRuntime(libs.caelus)
+    modLocalRuntime(libs.inline.fabric)
 
     modApi(libs.clothConfig.forge)
 

Forge/src/main/resources/META-INF/mods.toml

@@ -43,6 +43,6 @@ side = "BOTH"
 [[dependencies.hexdebug]]
 modId = "hexcasting"
 mandatory = true
-versionRange = "[${versions.hexcasting},)"
+versionRange = "[${versions.hexcasting_dependency},)"
 ordering = "NONE"
 side = "BOTH"

gradle/libs.versions.toml

@@ -22,7 +22,8 @@ forge-dependency = "47" # for mods.toml
 
 # mods
 
-hexcasting = "0.11.1-7-pre-672"
+hexcasting = "0.11.2-pre-701"
+hexcasting-dependency = "0.11.2-pre"
 paucal = "0.6.0-pre-118"
 
 patchouli = "1.20.1-84"
@@ -37,6 +38,7 @@ clothConfig = "11.1.106"
 modMenu = "7.1.0"
 caelus = "3.1.0+1.20"
 devAuth = "1.2.0"
+inline = "1.20.1-1.0.1"
 
 # other non-Minecraft dependencies
 
@@ -99,6 +101,9 @@ clothConfig-forge  = { module="me.shedaniel.cloth:cloth-config-forge", version.r
 devAuth-fabric = { module="me.djtheredstoner:DevAuth-fabric", version.ref="devAuth" }
 devAuth-forge  = { module="me.djtheredstoner:DevAuth-forge-latest", version.ref="devAuth" }
 
+inline-fabric = { module="com.samsthenerd.inline:inline-fabric", version.ref="inline" }
+inline-forge  = { module="com.samsthenerd.inline:inline-forge", version.ref="inline" }
+
 findbugs-jsr305 = { module="com.google.code.findbugs:jsr305", version.ref="findbugs-jsr305" }
 
 asm          = { module="org.ow2.asm:asm", version.ref="asm" }