Skip to content

Commit b271282

Browse files
committed
Fixes #874
allow action and spell action to throw mishaps
1 parent 3c5d9df commit b271282

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

Common/src/main/java/at/petrak/hexcasting/api/casting/castables/Action.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import at.petrak.hexcasting.api.casting.eval.OperationResult
55
import at.petrak.hexcasting.api.casting.eval.vm.CastingImage
66
import at.petrak.hexcasting.api.casting.eval.vm.SpellContinuation
77
import at.petrak.hexcasting.api.casting.iota.Iota
8+
import at.petrak.hexcasting.api.casting.mishaps.Mishap
89
import net.minecraft.world.phys.Vec3
910
import java.text.DecimalFormat
1011

@@ -33,6 +34,7 @@ interface Action {
3334
* The userdata tag is copied for you, so you don't need to worry about mutation messing up things
3435
* behind the scenes.
3536
*/
37+
@Throws(Mishap::class)
3638
fun operate(
3739
env: CastingEnvironment,
3840
image: CastingImage,

Common/src/main/java/at/petrak/hexcasting/api/casting/castables/SpellAction.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import at.petrak.hexcasting.api.casting.iota.Iota
1111
import at.petrak.hexcasting.api.casting.mishaps.MishapNotEnoughArgs
1212
import at.petrak.hexcasting.api.casting.mishaps.MishapNotEnoughMedia
1313
import at.petrak.hexcasting.common.lib.hex.HexEvalSounds
14+
import at.petrak.hexcasting.api.casting.mishaps.Mishap
1415
import net.minecraft.nbt.CompoundTag
1516

1617
interface SpellAction : Action {
@@ -20,11 +21,14 @@ interface SpellAction : Action {
2021

2122
fun awardsCastingStat(ctx: CastingEnvironment): Boolean = true
2223

24+
@Throws(Mishap::class)
2325
fun execute(
2426
args: List<Iota>,
2527
env: CastingEnvironment
2628
): Result
2729

30+
@Throws(Mishap::class)
31+
2832
fun executeWithUserdata(
2933
args: List<Iota>, env: CastingEnvironment, userData: CompoundTag
3034
): Result {

0 commit comments

Comments
 (0)