Cleaned up and generalized existing Spell Circle error messages

Author: Stick404

Common/src/main/java/at/petrak/hexcasting/api/casting/circles/CircleExecutionState.java

@@ -56,7 +56,7 @@ public class CircleExecutionState {
     public @Nullable UUID caster;
     public @Nullable FrozenPigment casterPigment;
     // This controls the speed of the current slate
-    public Long reachedSlate;
+    public long reachedSlate;
 
     // Tracks the highest pos, and lowest pos of the AABB
     public BlockPos positivePos;
@@ -116,7 +116,6 @@ protected CircleExecutionState(BlockPos impetusPos, Direction impetusDir,
         BlockPos firstBlock = null;
         HashMap<ChunkPos, ChunkAccess> chunkMap = new HashMap<>();
         while (!todo.isEmpty()) {
-
             var pair = todo.pop();
             var enterDir = pair.getFirst();
             var herePos = pair.getSecond();
@@ -294,7 +293,7 @@ public boolean tick(BlockEntityAbstractImpetus impetus) {
 
         executorBlockState = executor.startEnergized(this.currentPos, executorBlockState, world);
         this.reachedPositions.add(this.currentPos);
-        this.reachedSlate = this.reachedSlate +1;
+        this.reachedSlate +=1;
 
         // Do the execution!
         boolean halt = false;
@@ -321,7 +320,7 @@ public boolean tick(BlockEntityAbstractImpetus impetus) {
                                 Component.literal(this.currentPos.toShortString()).withStyle(ChatFormatting.RED)),
                             new ItemStack(Items.COMPASS));
                         ICircleComponent.sfx(this.currentPos, executorBlockState, world,
-                                Objects.requireNonNull(env.getImpetus()), false);
+                            Objects.requireNonNull(env.getImpetus()), false);
                         halt = true;
                         break;
                     } else {
@@ -353,7 +352,7 @@ public boolean tick(BlockEntityAbstractImpetus impetus) {
      * How many ticks should pass between activations, given the number of blocks encountered so far.
      */
     protected int getTickSpeed() {
-        return Math.toIntExact(Math.max(2, 10 - (this.reachedSlate - 1) / 3));
+        return (int) Math.max(2, 10 - (this.reachedSlate - 1) / 3);
     }
 
     public void endExecution(BlockEntityAbstractImpetus impetus) {

Common/src/main/java/at/petrak/hexcasting/api/casting/circles/ICircleComponent.java

@@ -11,10 +11,10 @@
 import at.petrak.hexcasting.common.lib.HexItems;
 import at.petrak.hexcasting.common.lib.HexSounds;
 import com.mojang.datafixers.util.Pair;
+import net.minecraft.ChatFormatting;
 import net.minecraft.Util;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.util.Mth;
@@ -147,7 +147,7 @@ static void sfx(BlockPos pos, BlockState bs, Level world, BlockEntityAbstractImp
      */
     default void fakeThrowMishap(BlockPos pos, BlockState bs, CastingImage image, CircleCastEnv env, Mishap mishap) {
         Mishap.Context errorCtx = new Mishap.Context(null,
-            bs.getBlock().getName().append(" (").append(Component.literal(pos.toShortString())).append(")"));
+            bs.getBlock().getName().withStyle(ChatFormatting.LIGHT_PURPLE));
         var sideEffect = new OperatorSideEffect.DoMishap(mishap, errorCtx);
         var vm = new CastingVM(image, env);
         sideEffect.performEffect(vm);

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

@@ -4,7 +4,6 @@ import at.petrak.hexcasting.api.casting.eval.CastingEnvironment
 import at.petrak.hexcasting.api.casting.iota.Iota
 import at.petrak.hexcasting.api.casting.mishaps.Mishap
 import at.petrak.hexcasting.api.pigment.FrozenPigment
-import at.petrak.hexcasting.api.utils.withStyle
 import net.minecraft.ChatFormatting
 import net.minecraft.core.BlockPos
 import net.minecraft.network.chat.Component
@@ -22,5 +21,6 @@ class MishapBoolDirectrixEmptyStack(
     }
 
     override fun errorMessage(ctx: CastingEnvironment, errorCtx: Context): Component =
-        error("circle.bool_directrix.empty_stack", pos.toShortString().withStyle(ChatFormatting.RED))
+        error("circle.empty_stack", 1,
+            Component.literal("(").append(pos.toShortString()).append(")").withStyle(ChatFormatting.RED))
 }

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

@@ -4,6 +4,7 @@ import at.petrak.hexcasting.api.casting.eval.CastingEnvironment
 import at.petrak.hexcasting.api.casting.iota.Iota
 import at.petrak.hexcasting.api.casting.mishaps.Mishap
 import at.petrak.hexcasting.api.pigment.FrozenPigment
+import net.minecraft.ChatFormatting
 import net.minecraft.core.BlockPos
 import net.minecraft.network.chat.Component
 import net.minecraft.world.item.DyeColor
@@ -21,5 +22,7 @@ class MishapBoolDirectrixNotBool(
     }
 
     override fun errorMessage(ctx: CastingEnvironment, errorCtx: Context): Component =
-        error("circle.bool_directrix_no_bool", pos.toShortString(), perpetrator.display())
+        error("circle.invalid_value", "boolean", 0,
+            Component.literal("(").append(pos.toShortString()).append(")").withStyle(ChatFormatting.RED),
+            perpetrator.display())
 }

Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5

@@ -1105,10 +1105,10 @@
         sapling: "a sapling",
         replaceable: "somewhere to place a block",
       },
-      
-      "circle.bool_directrix": {
-        no_bool: "the iota encountered at %s was %s, not a bool",
-        empty_stack: "the stack was empty at %s",
+
+      circle: {
+        empty_stack: "expected %s or more arguments but the stack was empty at %s",
+        invalid_value: "expected %s at index %s of the stack at %s, but got %s"
       },
     },
     // ^ mishap