Change "harness" to "VM" wherever it won't break stuff

Author: Robotgiggle

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

@@ -7,7 +7,7 @@ import at.petrak.hexcasting.api.casting.eval.vm.SpellContinuation
 import at.petrak.hexcasting.api.casting.iota.Iota
 
 /**
- * The result of doing something to a cast harness.
+ * The result of doing something to a casting VM.
  *
  * Contains the iota that was executed to produce this CastResult,
  * the next thing to execute after this is finished, the modified state of the stack,

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

@@ -64,7 +64,7 @@ class CastingVM(var image: CastingImage, val env: CastingEnvironment) {
                 }
             }
 
-            // Then write all pertinent data back to the harness for the next iteration.
+            // Then write all pertinent data back to the VM for the next iteration.
             if (image2.newData != null) {
                 this.image = image2.newData
             }

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

@@ -47,7 +47,7 @@ data class FrameForEach(
     ): 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 harness stack...
+            // init stack to the VM stack...
             harness.image.stack.toList()
         } else {
             // else save the stack to the accumulator and reuse the saved base stack.

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

@@ -3,7 +3,7 @@ package at.petrak.hexcasting.api.casting.eval.vm
 import at.petrak.hexcasting.api.casting.iota.Iota
 
 /**
- * A change to the data in a CastHarness after a pattern is drawn.
+ * A change to the data in a CastingVM after a pattern is drawn.
  */
 data class FunctionalData(
     val stack: List<Iota>,

Common/src/main/java/at/petrak/hexcasting/common/items/ItemStaff.java

@@ -37,9 +37,9 @@ public InteractionResultHolder<ItemStack> use(Level world, Player player, Intera
         }
 
         if (!world.isClientSide() && player instanceof ServerPlayer serverPlayer) {
-            var harness = IXplatAbstractions.INSTANCE.getStaffcastVM(serverPlayer, hand);
+            var vm = IXplatAbstractions.INSTANCE.getStaffcastVM(serverPlayer, hand);
             var patterns = IXplatAbstractions.INSTANCE.getPatternsSavedInUi(serverPlayer);
-            var descs = harness.generateDescs();
+            var descs = vm.generateDescs();
 
             IXplatAbstractions.INSTANCE.sendPacketToPlayer(serverPlayer,
                 new MsgOpenSpellGuiS2C(hand, patterns, descs.getFirst(), descs.getSecond(),

Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemPackagedHex.java

@@ -128,8 +128,8 @@ public InteractionResultHolder<ItemStack> use(Level world, Player player, Intera
         }
         var sPlayer = (ServerPlayer) player;
         var ctx = new PackagedItemCastEnv(sPlayer, usedHand);
-        var harness = CastingVM.empty(ctx);
-        var clientView = harness.queueExecuteAndWrapIotas(instrs, sPlayer.serverLevel());
+        var vm = CastingVM.empty(ctx);
+        var clientView = vm.queueExecuteAndWrapIotas(instrs, sPlayer.serverLevel());
 
         var patterns = instrs.stream()
                 .filter(i -> i instanceof PatternIota)

Fabric/src/main/java/at/petrak/hexcasting/fabric/cc/CCStaffcastImage.java

@@ -10,7 +10,7 @@
 import org.jetbrains.annotations.Nullable;
 
 public class CCStaffcastImage implements Component {
-    public static final String TAG_HARNESS = "harness";
+    public static final String TAG_VM = "harness";
 
     private final ServerPlayer owner;
     private CompoundTag lazyLoadedTag = new CompoundTag();
@@ -39,11 +39,11 @@ public void setImage(@Nullable CastingImage image) {
 
     @Override
     public void readFromNbt(CompoundTag tag) {
-        this.lazyLoadedTag = tag.getCompound(TAG_HARNESS);
+        this.lazyLoadedTag = tag.getCompound(TAG_VM);
     }
 
     @Override
     public void writeToNbt(CompoundTag tag) {
-        tag.put(TAG_HARNESS, this.lazyLoadedTag);
+        tag.put(TAG_VM, this.lazyLoadedTag);
     }
 }

Forge/src/main/java/at/petrak/hexcasting/forge/xplat/ForgeXplatImpl.java

@@ -220,7 +220,7 @@ public void setSentinel(Player player, @Nullable Sentinel sentinel) {
 
     @Override
     public void setStaffcastImage(ServerPlayer player, @Nullable CastingImage image) {
-        player.getPersistentData().put(TAG_HARNESS, image == null ? new CompoundTag() : image.serializeToNbt());
+        player.getPersistentData().put(TAG_VM, image == null ? new CompoundTag() : image.serializeToNbt());
     }
 
     @Override
@@ -285,9 +285,9 @@ public Sentinel getSentinel(Player player) {
 
     @Override
     public CastingVM getStaffcastVM(ServerPlayer player, InteractionHand hand) {
-        // This is always from a staff because we don't need to load the harness when casting from item
+        // This is always from a staff because we don't need to load the VM when casting from item
         var ctx = new StaffCastEnv(player, hand);
-        return new CastingVM(CastingImage.loadFromNbt(player.getPersistentData().getCompound(TAG_HARNESS),
+        return new CastingVM(CastingImage.loadFromNbt(player.getPersistentData().getCompound(TAG_VM),
             player.serverLevel()), ctx);
     }
 
@@ -305,7 +305,7 @@ public List<ResolvedPattern> getPatternsSavedInUi(ServerPlayer player) {
 
     @Override
     public void clearCastingData(ServerPlayer player) {
-        player.getPersistentData().remove(TAG_HARNESS);
+        player.getPersistentData().remove(TAG_VM);
         player.getPersistentData().remove(TAG_PATTERNS);
     }
 
@@ -585,6 +585,6 @@ public void setScale(Entity e, float scale) {
 
     public static final UUID ALTIORA_ATTRIBUTE_ID = UUID.fromString("91897c79-3ebb-468c-a265-40418ed01c41");
 
-    public static final String TAG_HARNESS = "hexcasting:spell_harness";
+    public static final String TAG_VM = "hexcasting:spell_harness";
     public static final String TAG_PATTERNS = "hexcasting:spell_patterns";
 }