Main to next chunk 2

Common/src/main/java/at/petrak/hexcasting/api/casting/eval/env/PlayerBasedCastEnv.java

@@ -70,11 +70,10 @@ public ServerPlayer getCaster() {
     @Override
     protected double getCostModifier(PatternShapeMatch match) {
         ResourceLocation loc = actionKey(match);
-        if (isOfTag(IXplatAbstractions.INSTANCE.getActionRegistry(), loc, HexTags.Actions.CANNOT_MODIFY_COST)) {
+        if (loc != null && isOfTag(IXplatAbstractions.INSTANCE.getActionRegistry(), loc, HexTags.Actions.CANNOT_MODIFY_COST)) {
             return 1.0;
-        } else {
-            return this.caster.getAttributeValue(HexAttributes.MEDIA_CONSUMPTION_MODIFIER);
         }
+        return this.caster.getAttributeValue(HexAttributes.MEDIA_CONSUMPTION_MODIFIER);
     }
 
     @Override

Common/src/main/java/at/petrak/hexcasting/api/casting/eval/vm/CastingVM.kt

@@ -12,6 +12,7 @@ import at.petrak.hexcasting.api.casting.iota.PatternIota
 import at.petrak.hexcasting.api.casting.math.HexDir
 import at.petrak.hexcasting.api.casting.math.HexPattern
 import at.petrak.hexcasting.api.casting.mishaps.Mishap
+import at.petrak.hexcasting.api.casting.mishaps.MishapEvalTooMuch
 import at.petrak.hexcasting.api.casting.mishaps.MishapInternalException
 import at.petrak.hexcasting.api.casting.mishaps.MishapStackSize
 import at.petrak.hexcasting.api.casting.mishaps.MishapTooManyCloseParens
@@ -69,6 +70,13 @@ class CastingVM(var image: CastingImage, val env: CastingEnvironment) {
                         resolutionType = ResolvedPatternType.ERRORED,
                         sound = HexEvalSounds.MISHAP,
                     )
+                } else if (result.newData != null && result.newData.opsConsumed > env.maxOpCount()) {
+                    result.copy(
+                        newData = null,
+                        sideEffects = listOf(OperatorSideEffect.DoMishap(MishapEvalTooMuch(), Mishap.Context(null, null))),
+                        resolutionType = ResolvedPatternType.ERRORED,
+                        sound = HexEvalSounds.MISHAP,
+                    )
                 } else {
                     result
                 }

Common/src/main/java/at/petrak/hexcasting/api/casting/eval/vm/FrameForEach.kt

@@ -6,6 +6,7 @@ import at.petrak.hexcasting.api.casting.eval.ResolvedPatternType
 import at.petrak.hexcasting.api.casting.iota.Iota
 import at.petrak.hexcasting.api.casting.iota.IotaType
 import at.petrak.hexcasting.api.casting.iota.ListIota
+import at.petrak.hexcasting.api.utils.TreeList
 import at.petrak.hexcasting.common.lib.hex.HexEvalSounds
 import com.mojang.serialization.MapCodec
 import com.mojang.serialization.codecs.RecordCodecBuilder
@@ -29,14 +30,13 @@ data class FrameForEach(
     val data: SpellList,
     val code: SpellList,
     val baseStack: List<Iota>?,
-    val acc: MutableList<Iota>
+    val acc: TreeList<Iota>
 ) : ContinuationFrame {
 
     /** When halting, we add the stack state at halt to the stack accumulator, then return the original pre-Thoth stack, plus the accumulator. */
     override fun breakDownwards(stack: List<Iota>): Pair<Boolean, List<Iota>> {
         val newStack = baseStack?.toMutableList() ?: mutableListOf()
-        acc.addAll(stack)
-        newStack.add(ListIota(acc))
+        newStack.add(ListIota(acc.appendedAll(stack)))
         return true to newStack
     }
 
@@ -47,21 +47,20 @@ data class FrameForEach(
         harness: CastingVM
     ): CastResult {
         // If this isn't the very first Thoth step (i.e. no Thoth computations run yet)...
-        val stack = if (baseStack == null) {
-            // init stack to the VM stack...
-            harness.image.stack.toList()
+        val (stack, newAcc) = if (baseStack == null) {
+            // init stack to the harness stack...
+            harness.image.stack.toList() to acc
         } else {
             // else save the stack to the accumulator and reuse the saved base stack.
-            acc.addAll(harness.image.stack)
-            baseStack
+            baseStack to acc.appendedAll(harness.image.stack)
         }
 
         // If we still have data to process...
         val (stackTop, newImage, newCont) = if (data.nonEmpty) {
             // push the next datum to the top of the stack,
             val cont2 = continuation
                 // put the next Thoth object back on the stack for the next Thoth cycle,
-                .pushFrame(FrameForEach(data.cdr, code, stack, acc))
+                .pushFrame(FrameForEach(data.cdr, code, stack, newAcc))
                 // and prep the Thoth'd code block for evaluation.
                 .pushFrame(FrameEvaluate(code, true))
             Triple(data.car, harness.image.withUsedOp(), cont2)
@@ -96,7 +95,7 @@ data class FrameForEach(
                     IotaType.TYPED_CODEC.listOf().optionalFieldOf("base").forGetter { Optional.ofNullable(it.baseStack) },
                     IotaType.TYPED_CODEC.listOf().fieldOf("accumulator").forGetter { it.acc }
                 ).apply(inst) { a, b, c, d ->
-                    FrameForEach(a, b, c.getOrNull(), d)
+                    FrameForEach(a, b, c.getOrNull(), TreeList.from(d))
                 }
             }
             val STREAM_CODEC = StreamCodec.composite(
@@ -107,7 +106,7 @@ data class FrameForEach(
                 IotaType.TYPED_STREAM_CODEC
                     .apply(ByteBufCodecs.list()), FrameForEach::acc
             ) { a, b, c, d ->
-                FrameForEach(a, b, c.getOrNull(), d)
+                FrameForEach(a, b, c.getOrNull(), TreeList.from(d))
             }
 
 

Common/src/main/java/at/petrak/hexcasting/api/casting/iota/ListIota.java

@@ -1,6 +1,7 @@
 package at.petrak.hexcasting.api.casting.iota;
 
 import at.petrak.hexcasting.api.casting.SpellList;
+import at.petrak.hexcasting.api.utils.TreeList;
 import at.petrak.hexcasting.common.lib.hex.HexIotaTypes;
 import com.mojang.serialization.MapCodec;
 import net.minecraft.ChatFormatting;
@@ -35,6 +36,10 @@ public ListIota(@NotNull SpellList list) {
         size = totalSize;
     }
 
+    public ListIota(@NotNull TreeList<Iota> list) {
+        this(new SpellList.LList(list));
+    }
+
     public ListIota(@NotNull List<Iota> list) {
         this(new SpellList.LList(list));
     }

Common/src/main/java/at/petrak/hexcasting/api/casting/iota/PatternIota.java

@@ -65,7 +65,7 @@ public boolean toleratesOther(Iota that) {
     public @NotNull CastResult execute(CastingVM vm, ServerLevel world, SpellContinuation continuation) {
         Supplier<@Nullable Component> castedName = () -> null;
         try {
-            var lookup = PatternRegistryManifest.matchPattern(this.getPattern(), vm.getEnv(), false);
+            var lookup = PatternRegistryManifest.matchPattern(this.getPattern(), vm.getEnv());
             vm.getEnv().precheckAction(lookup);
 
             Action action;
@@ -102,10 +102,6 @@ public boolean toleratesOther(Iota that) {
                     continuation
             );
 
-            if (result.getNewImage().getOpsConsumed() > vm.getEnv().maxOpCount()) {
-                throw new MishapEvalTooMuch();
-            }
-
             var cont2 = result.getNewContinuation();
             // TODO parens also break prescience
             var sideEffects = result.getSideEffects();

Common/src/main/java/at/petrak/hexcasting/api/casting/mishaps/circle/MishapBoolDirectrixNotBool.kt

@@ -21,5 +21,5 @@ class MishapBoolDirectrixNotBool(
     }
 
     override fun errorMessage(ctx: CastingEnvironment, errorCtx: Context): Component =
-        error("circle.bool_directrix_no_bool", pos.toShortString(), perpetrator.display())
+        error("circle.bool_directrix.no_bool", pos.toShortString(), perpetrator.display())
 }

Common/src/main/java/at/petrak/hexcasting/api/mod/HexConfig.java

@@ -41,6 +41,8 @@ public interface CommonConfigAccess {
     public interface ClientConfigAccess {
         boolean ctrlTogglesOffStrokeOrder();
 
+        boolean disableInworldScrolling();
+
         boolean invertSpellbookScrollDirection();
 
         boolean invertAbacusScrollDirection();
@@ -49,11 +51,15 @@ public interface ClientConfigAccess {
 
         boolean clickingTogglesDrawing();
 
+        boolean staticActiveSlates();
+
         boolean DEFAULT_CTRL_TOGGLES_OFF_STROKE_ORDER = false;
+        boolean DEFAULT_DISABLE_INWORLD_SCROLLING = false;
         boolean DEFAULT_INVERT_SPELLBOOK_SCROLL = false;
         boolean DEFAULT_INVERT_ABACUS_SCROLL = false;
         double DEFAULT_GRID_SNAP_THRESHOLD = 0.5;
         boolean DEFAULT_CLICKING_TOGGLES_DRAWING = false;
+        boolean DEFAULT_STATIC_ACTIVE_SLATES = false;
     }
 
     public interface ServerConfigAccess {