Change ListIota to use Vector

Co-authored-by: Sirius902 <10891979+Sirius902@users.noreply.github.com>

Author: s5bug

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

@@ -6,6 +6,7 @@ import at.petrak.hexcasting.api.casting.iota.*
 import at.petrak.hexcasting.api.casting.math.HexPattern
 import at.petrak.hexcasting.api.casting.mishaps.MishapInvalidIota
 import at.petrak.hexcasting.api.casting.mishaps.MishapNotEnoughArgs
+import at.petrak.hexcasting.api.utils.Vector
 import at.petrak.hexcasting.api.utils.asTranslatedComponent
 import com.mojang.datafixers.util.Either
 import net.minecraft.core.BlockPos
@@ -41,7 +42,7 @@ fun List<Iota>.getEntity(idx: Int, argc: Int = 0): Entity {
     }
 }
 
-fun List<Iota>.getList(idx: Int, argc: Int = 0): SpellList {
+fun List<Iota>.getList(idx: Int, argc: Int = 0): Vector<Iota> {
     val x = this.getOrElse(idx) { throw MishapNotEnoughArgs(idx + 1, this.size) }
     if (x is ListIota) {
         return x.list
@@ -269,7 +270,7 @@ fun List<Iota>.getNumOrVec(idx: Int, argc: Int = 0): Either<Double, Vec3> {
     }
 }
 
-fun List<Iota>.getLongOrList(idx: Int, argc: Int = 0): Either<Long, SpellList> {
+fun List<Iota>.getLongOrList(idx: Int, argc: Int = 0): Either<Long, Vector<Iota>> {
     val datum = this.getOrElse(idx) { throw MishapNotEnoughArgs(idx + 1, this.size) }
     if (datum is DoubleIota) {
         val double = datum.double
@@ -287,7 +288,7 @@ fun List<Iota>.getLongOrList(idx: Int, argc: Int = 0): Either<Long, SpellList> {
     )
 }
 
-fun evaluatable(datum: Iota, reverseIdx: Int): Either<Iota, SpellList> =
+fun evaluatable(datum: Iota, reverseIdx: Int): Either<Iota, Vector<Iota>> =
     when (datum) {
         is ListIota -> Either.right(datum.list)
         else -> if (datum.executable()) Either.left(datum) else throw MishapInvalidIota(
@@ -312,8 +313,8 @@ inline val Boolean.asActionResult get() = listOf(BooleanIota(this))
 inline val Double.asActionResult get() = listOf(DoubleIota(this))
 inline val Number.asActionResult get() = listOf(DoubleIota(this.toDouble()))
 
-inline val SpellList.asActionResult get() = listOf(ListIota(this))
-inline val List<Iota>.asActionResult get() = listOf(ListIota(this))
+inline val SpellList.asActionResult get() = listOf(ListIota(Vector.from(this)))
+inline val List<Iota>.asActionResult get() = listOf(ListIota(Vector.from(this)))
 
 inline val BlockPos.asActionResult get() = listOf(Vec3Iota(Vec3.atCenterOf(this)))
 inline val Vector3f.asActionResult get() = listOf(Vec3Iota(Vec3(this)))

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

@@ -45,7 +45,7 @@ data class CastingImage private constructor(
             tag.put(TAG_IOTAS, ListTag())
             tag.put(TAG_ESCAPED, ListTag())
         } else {
-            tag.put(TAG_IOTAS, ListIota(this.map { it.iota }).serialize())
+            tag.put(TAG_IOTAS, ListIota(Vector.from(this).map { it.iota }).serialize())
             tag.put(TAG_ESCAPED, this.map { it.escaped }.serializeToNBT())
         }
 

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

@@ -219,7 +219,7 @@ class CastingVM(var image: CastingImage, val env: CastingEnvironment) {
                         displayDepth--
                         if (newParenCount == 0) {
                             val newStack = this.image.stack.toMutableList()
-                            newStack.add(ListIota(this.image.parenthesized.toList().map { it.iota }))
+                            newStack.add(ListIota(Vector.from(this.image.parenthesized.toList().map { it.iota })))
                             this.image.copy(
                                 stack = newStack,
                                 parenCount = newParenCount,

Common/src/main/java/at/petrak/hexcasting/api/casting/eval/vm/FrameEvaluate.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.ListIota
 import at.petrak.hexcasting.api.utils.NBTBuilder
+import at.petrak.hexcasting.api.utils.Vector
 import at.petrak.hexcasting.api.utils.getList
 import at.petrak.hexcasting.api.utils.serializeToNBT
 import at.petrak.hexcasting.common.lib.hex.HexEvalSounds
@@ -44,7 +45,7 @@ data class FrameEvaluate(val list: SpellList, val isMetacasting: Boolean) : Cont
             }
         } else {
             // If there are no patterns (e.g. empty Hermes), just return OK.
-            CastResult(ListIota(list), continuation, null, listOf(), ResolvedPatternType.EVALUATED, HexEvalSounds.HERMES)
+            CastResult(ListIota(Vector.from(list)), continuation, null, listOf(), ResolvedPatternType.EVALUATED, HexEvalSounds.HERMES)
         }
     }
 
@@ -62,10 +63,10 @@ data class FrameEvaluate(val list: SpellList, val isMetacasting: Boolean) : Cont
         val TYPE: ContinuationFrame.Type<FrameEvaluate> = object : ContinuationFrame.Type<FrameEvaluate> {
             override fun deserializeFromNBT(tag: CompoundTag, world: ServerLevel): FrameEvaluate {
                 return FrameEvaluate(
-                    HexIotaTypes.LIST.deserialize(
+                    SpellList.LList(0, HexIotaTypes.LIST.deserialize(
                         tag.getList("patterns", Tag.TAG_COMPOUND),
                         world
-                    )!!.list,
+                    )!!.list),
                     tag.getBoolean("isMetacasting"))
             }
 

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

@@ -69,7 +69,7 @@ data class FrameForEach(
         val tStack = stack.toMutableList()
         tStack.add(stackTop)
         return CastResult(
-            ListIota(code),
+            ListIota(Vector.from(code)),
             newCont,
             // reset escapes so they don't carry over to other iterations or out of thoth
             newImage.withResetEscape().copy(stack = tStack),
@@ -96,8 +96,8 @@ data class FrameForEach(
         val TYPE: ContinuationFrame.Type<FrameForEach> = object : ContinuationFrame.Type<FrameForEach> {
             override fun deserializeFromNBT(tag: CompoundTag, world: ServerLevel): FrameForEach {
                 return FrameForEach(
-                    HexIotaTypes.LIST.deserialize(tag.getList("data", Tag.TAG_COMPOUND), world)!!.list,
-                    HexIotaTypes.LIST.deserialize(tag.getList("code", Tag.TAG_COMPOUND), world)!!.list,
+                    SpellList.LList(0, HexIotaTypes.LIST.deserialize(tag.getList("data", Tag.TAG_COMPOUND), world)!!.list),
+                    SpellList.LList(0, HexIotaTypes.LIST.deserialize(tag.getList("code", Tag.TAG_COMPOUND), world)!!.list),
                     if (tag.hasList("base", Tag.TAG_COMPOUND))
                         HexIotaTypes.LIST.deserialize(tag.getList("base", Tag.TAG_COMPOUND), world)!!.list.toList()
                     else

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

@@ -1,7 +1,7 @@
 package at.petrak.hexcasting.api.casting.iota;
 
-import at.petrak.hexcasting.api.casting.SpellList;
 import at.petrak.hexcasting.api.utils.HexUtils;
+import at.petrak.hexcasting.api.utils.Vector;
 import at.petrak.hexcasting.common.lib.hex.HexIotaTypes;
 import net.minecraft.ChatFormatting;
 import net.minecraft.nbt.CompoundTag;
@@ -12,19 +12,18 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Iterator;
 
 import static java.lang.Math.max;
 
 /**
- * This is a <i>wrapper</i> for {@link SpellList}.
+ * This is a <i>wrapper</i> for {@link Vector<Iota>}.
  */
 public class ListIota extends Iota {
     private final int depth;
     private final int size;
 
-    public ListIota(@NotNull SpellList list) {
+    public ListIota(@NotNull Vector<Iota> list) {
         super(HexIotaTypes.LIST, list);
         int maxChildDepth = 0;
         int totalSize = 1;
@@ -36,17 +35,13 @@ public ListIota(@NotNull SpellList list) {
         size = totalSize;
     }
 
-    public ListIota(@NotNull List<Iota> list) {
-        this(new SpellList.LList(list));
-    }
-
-    public SpellList getList() {
-        return (SpellList) this.payload;
+    public Vector<Iota> getList() {
+        return (Vector<Iota>) this.payload;
     }
 
     @Override
     public boolean isTruthy() {
-        return this.getList().getNonEmpty();
+        return !this.getList().isEmpty();
     }
 
     @Override
@@ -60,7 +55,7 @@ public boolean toleratesOther(Iota that) {
         }
         var b = list.getList();
 
-        SpellList.SpellListIterator aIter = a.iterator(), bIter = b.iterator();
+        Iterator<Iota> aIter = a.iterator(), bIter = b.iterator();
         for (; ; ) {
             if (!aIter.hasNext() && !bIter.hasNext()) {
                 // we ran out together!
@@ -106,18 +101,18 @@ public int depth() {
         @Override
         public ListIota deserialize(Tag tag, ServerLevel world) throws IllegalArgumentException {
             var listTag = HexUtils.downcast(tag, ListTag.TYPE);
-            var out = new ArrayList<Iota>(listTag.size());
+            var out = new Vector.VectorBuilder<Iota>();
 
             for (var sub : listTag) {
                 var csub = HexUtils.downcast(sub, CompoundTag.TYPE);
                 var subiota = IotaType.deserialize(csub, world);
                 if (subiota == null) {
                     return null;
                 }
-                out.add(subiota);
+                out.addOne(subiota);
             }
 
-            return new ListIota(out);
+            return new ListIota(out.result());
         }
 
         @Override

Common/src/main/java/at/petrak/hexcasting/api/utils/HexUtils.kt

@@ -265,7 +265,7 @@ fun Iterable<Iota>.serializeToNBT() =
     if (IotaType.isTooLargeToSerialize(this))
         ListTag()
     else
-        ListIota(this.toList()).serialize()
+        ListIota(Vector.from(this)).serialize()
 
 fun Iterable<Boolean>.serializeToNBT(): ByteArrayTag {
     val out = ByteArray(if (this is Collection<*>) this.size else 10)

Common/src/main/java/at/petrak/hexcasting/common/casting/actions/eval/OpEval.kt

@@ -30,7 +30,7 @@ object OpEval : Action {
                     continuation.pushFrame(FrameFinishEval) // install a break-boundary after eval
                 }
 
-        val instrsList = instrs.map({ SpellList.LList(0, listOf(it)) }, { it })
+        val instrsList = instrs.map({ SpellList.LList(0, listOf(it)) }, { SpellList.LList(0, it) })
         val frame = FrameEvaluate(instrsList, true)
 
         val image2 = image.withUsedOp().copy(stack = newStack)

Common/src/main/java/at/petrak/hexcasting/common/casting/actions/eval/OpForEach.kt

@@ -1,13 +1,13 @@
 package at.petrak.hexcasting.common.casting.actions.eval
 
+import at.petrak.hexcasting.api.casting.SpellList
 import at.petrak.hexcasting.api.casting.castables.Action
 import at.petrak.hexcasting.api.casting.eval.CastingEnvironment
 import at.petrak.hexcasting.api.casting.eval.OperationResult
 import at.petrak.hexcasting.api.casting.eval.vm.CastingImage
 import at.petrak.hexcasting.api.casting.eval.vm.FrameForEach
 import at.petrak.hexcasting.api.casting.eval.vm.SpellContinuation
 import at.petrak.hexcasting.api.casting.getList
-import at.petrak.hexcasting.api.casting.iota.Iota
 import at.petrak.hexcasting.api.casting.mishaps.MishapNotEnoughArgs
 import at.petrak.hexcasting.api.utils.Vector
 import at.petrak.hexcasting.common.lib.hex.HexEvalSounds
@@ -24,7 +24,7 @@ object OpForEach : Action {
         stack.removeLastOrNull()
         stack.removeLastOrNull()
 
-        val frame = FrameForEach(datums, instrs, null, Vector.empty<Iota>())
+        val frame = FrameForEach(SpellList.LList(0, datums), SpellList.LList(0, instrs), null, Vector.empty())
         val image2 = image.withUsedOp().copy(stack = stack)
 
         return OperationResult(image2, listOf(), continuation.pushFrame(frame), HexEvalSounds.THOTH)

Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpCons.kt

@@ -12,6 +12,6 @@ object OpCons : ConstMediaAction {
     override fun execute(args: List<Iota>, env: CastingEnvironment): List<Iota> {
         val bottom = args.getList(0, argc)
         val top = args[1]
-        return SpellList.LPair(top, bottom).asActionResult
+        return SpellList.LPair(top, SpellList.LList(0, bottom)).asActionResult
     }
 }