move more things

Common/src/main/java/at/petrak/hexcasting/README.md

@@ -4,6 +4,6 @@ The "flavor text" words for things in this mod and the internal names are differ
 
 - A "Hex" is a `Cast`, cast through a [`CastingHarness`](api/casting/eval/CastingHarness.kt)
 - A "Pattern" is a [`HexPattern`](api/casting/math/HexPattern.kt)
-- An "Action" is an [`Operator`](api/casting/Action.kt)
-- An action that pushes a spell is a [`Spell`](api/casting/SpellAction.kt)
+- An "Action" is an [`Operator`](api/casting/castables/Action.kt)
+- An action that pushes a spell is a [`Spell`](api/casting/castables/SpellAction.kt)
 

Common/src/main/java/at/petrak/hexcasting/api/HexAPI.java

@@ -1,7 +1,7 @@
 package at.petrak.hexcasting.api;
 
 import at.petrak.hexcasting.api.casting.ActionRegistryEntry;
-import at.petrak.hexcasting.api.casting.SpecialHandler;
+import at.petrak.hexcasting.api.casting.castables.SpecialHandler;
 import com.google.common.base.Suppliers;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;

Common/src/main/java/at/petrak/hexcasting/api/casting/ActionRegistryEntry.java

@@ -1,5 +1,6 @@
 package at.petrak.hexcasting.api.casting;
 
+import at.petrak.hexcasting.api.casting.castables.Action;
 import at.petrak.hexcasting.api.casting.math.HexPattern;
 
 /**

Common/src/main/java/at/petrak/hexcasting/api/casting/PatternShapeMatch.java

@@ -1,5 +1,6 @@
 package at.petrak.hexcasting.api.casting;
 
+import at.petrak.hexcasting.api.casting.castables.SpecialHandler;
 import net.minecraft.resources.ResourceKey;
 
 /**

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

@@ -1,5 +1,6 @@
-package at.petrak.hexcasting.api.casting
+package at.petrak.hexcasting.api.casting.castables
 
+import at.petrak.hexcasting.api.casting.OperationResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.eval.vm.SpellContinuation
 import at.petrak.hexcasting.api.casting.iota.Iota

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

@@ -1,5 +1,6 @@
-package at.petrak.hexcasting.api.casting
+package at.petrak.hexcasting.api.casting.castables
 
+import at.petrak.hexcasting.api.casting.OperationResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.eval.vm.SpellContinuation
 import at.petrak.hexcasting.api.casting.eval.sideeffects.OperatorSideEffect

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

@@ -1,4 +1,4 @@
-package at.petrak.hexcasting.api.casting;
+package at.petrak.hexcasting.api.casting.castables;
 
 import at.petrak.hexcasting.api.casting.math.HexPattern;
 import net.minecraft.network.chat.Component;
@@ -15,18 +15,18 @@ import org.jetbrains.annotations.Nullable;
  * {@link Action} instances on the client. We can have SpecialHandlers on the client though because they're just
  * wrappers.
  */
-public abstract class SpecialHandler {
+public interface SpecialHandler {
     /**
      * Convert this to an action, for modification of the stack and state.
      * <p>
      * This is called on the SERVER-SIDE ONLY.
      */
-    public abstract Action act();
+    Action act();
 
     /**
      * Get the name of this handler.
      */
-    public abstract Component getName();
+    Component getName();
 
     /**
      * Given a pattern, possibly make up the special handler from it.

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

@@ -1,5 +1,8 @@
-package at.petrak.hexcasting.api.casting
+package at.petrak.hexcasting.api.casting.castables
 
+import at.petrak.hexcasting.api.casting.OperationResult
+import at.petrak.hexcasting.api.casting.ParticleSpray
+import at.petrak.hexcasting.api.casting.RenderedSpell
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.eval.sideeffects.OperatorSideEffect
 import at.petrak.hexcasting.api.casting.eval.vm.SpellContinuation

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

@@ -0,0 +1,20 @@
+package at.petrak.hexcasting.api.casting.eval
+
+import at.petrak.hexcasting.api.casting.eval.sideeffects.EvalSound
+import at.petrak.hexcasting.api.casting.eval.sideeffects.OperatorSideEffect
+import at.petrak.hexcasting.api.casting.eval.vm.FunctionalData
+import at.petrak.hexcasting.api.casting.eval.vm.SpellContinuation
+
+/**
+ * The result of doing something to a cast harness.
+ *
+ * Contains the next thing to execute after this is finished, the modified state of the stack,
+ * and side effects, as well as display information for the client.
+ */
+data class CastResult(
+    val continuation: SpellContinuation,
+    val newData: FunctionalData?,
+    val sideEffects: List<OperatorSideEffect>,
+    val resolutionType: ResolvedPatternType,
+    val sound: EvalSound,
+)

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

@@ -3,7 +3,7 @@ package at.petrak.hexcasting.api.casting.eval
 import at.petrak.hexcasting.api.HexAPI.modLoc
 import at.petrak.hexcasting.api.misc.DiscoveryHandlers
 import at.petrak.hexcasting.api.mod.HexConfig
-import at.petrak.hexcasting.api.casting.Action
+import at.petrak.hexcasting.api.casting.castables.Action
 import at.petrak.hexcasting.api.casting.mishaps.MishapEntityTooFarAway
 import at.petrak.hexcasting.api.casting.mishaps.MishapEvalTooDeep
 import at.petrak.hexcasting.api.casting.mishaps.MishapLocationTooFarAway

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

@@ -3,12 +3,11 @@ package at.petrak.hexcasting.api.casting.eval
 import at.petrak.hexcasting.api.HexAPI
 import at.petrak.hexcasting.api.advancements.HexAdvancementTriggers
 import at.petrak.hexcasting.api.block.circle.BlockEntityAbstractImpetus
-import at.petrak.hexcasting.api.casting.Action
 import at.petrak.hexcasting.api.casting.ParticleSpray
 import at.petrak.hexcasting.api.casting.PatternShapeMatch
 import at.petrak.hexcasting.api.casting.PatternShapeMatch.*
 import at.petrak.hexcasting.api.casting.SpellList
-import at.petrak.hexcasting.api.casting.eval.sideeffects.EvalSound
+import at.petrak.hexcasting.api.casting.castables.Action
 import at.petrak.hexcasting.api.casting.eval.sideeffects.OperatorSideEffect
 import at.petrak.hexcasting.api.casting.eval.vm.FrameEvaluate
 import at.petrak.hexcasting.api.casting.eval.vm.FunctionalData
@@ -149,14 +148,13 @@ class CastingHarness private constructor(
             // ALSO TODO need to add reader macro-style things
             try {
                 this.handleParentheses(iota)?.let { (data, resolutionType) ->
-                    return@getUpdate CastResult(continuation, data, resolutionType, listOf(), HexEvalSounds.OPERATOR)
+                    return@getUpdate CastResult(continuation, data, listOf(), resolutionType, HexEvalSounds.OPERATOR)
                 }
             } catch (e: MishapTooManyCloseParens) {
                 // This is ridiculous and needs to be fixed
                 return CastResult(
                     continuation,
                     null,
-                    ResolvedPatternType.ERRORED,
                     listOf(
                         OperatorSideEffect.DoMishap(
                             e,
@@ -166,6 +164,7 @@ class CastingHarness private constructor(
                             )
                         )
                     ),
+                    ResolvedPatternType.ERRORED,
                     HexEvalSounds.MISHAP
                 )
             }
@@ -176,13 +175,13 @@ class CastingHarness private constructor(
                 return CastResult(
                     continuation,
                     null,
-                    ResolvedPatternType.INVALID, // Should never matter
                     listOf(
                         OperatorSideEffect.DoMishap(
                             MishapUnescapedValue(iota),
                             Mishap.Context(HexPattern(HexDir.WEST), null)
                         )
-                    ),
+                    ), // Should never matter
+                    ResolvedPatternType.INVALID,
                     HexEvalSounds.MISHAP
                 )
             }
@@ -192,7 +191,6 @@ class CastingHarness private constructor(
             return CastResult(
                 continuation,
                 null,
-                ResolvedPatternType.ERRORED,
                 listOf(
                     OperatorSideEffect.DoMishap(
                         MishapError(exception),
@@ -202,6 +200,7 @@ class CastingHarness private constructor(
                         )
                     )
                 ),
+                ResolvedPatternType.ERRORED,
                 HexEvalSounds.MISHAP
             )
         }
@@ -313,8 +312,8 @@ class CastingHarness private constructor(
             return CastResult(
                 cont2,
                 fd,
-                ResolvedPatternType.EVALUATED,
                 sideEffects,
+                ResolvedPatternType.EVALUATED,
                 soundType,
             )
 
@@ -322,8 +321,8 @@ class CastingHarness private constructor(
             return CastResult(
                 continuation,
                 null,
-                mishap.resolutionType(ctx),
                 listOf(OperatorSideEffect.DoMishap(mishap, Mishap.Context(newPat, castedName))),
+                mishap.resolutionType(ctx),
                 HexEvalSounds.MISHAP
             )
         }
@@ -663,12 +662,4 @@ class CastingHarness private constructor(
     data class TempControllerInfo(
         var earlyExit: Boolean,
     )
-
-    data class CastResult(
-        val continuation: SpellContinuation,
-        val newData: FunctionalData?,
-        val resolutionType: ResolvedPatternType,
-        val sideEffects: List<OperatorSideEffect>,
-        val sound: EvalSound,
-    )
 }

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

@@ -2,7 +2,7 @@ package at.petrak.hexcasting.api.casting.eval.vm
 
 import at.petrak.hexcasting.api.casting.SpellList
 import at.petrak.hexcasting.api.casting.eval.CastingHarness
-import at.petrak.hexcasting.api.casting.eval.CastingHarness.CastResult
+import at.petrak.hexcasting.api.casting.eval.CastResult
 import at.petrak.hexcasting.api.casting.iota.Iota
 import at.petrak.hexcasting.api.utils.getList
 import at.petrak.hexcasting.api.utils.hasList

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

@@ -1,6 +1,7 @@
 package at.petrak.hexcasting.api.casting.eval.vm
 
 import at.petrak.hexcasting.api.casting.SpellList
+import at.petrak.hexcasting.api.casting.eval.CastResult
 import at.petrak.hexcasting.api.casting.eval.CastingHarness
 import at.petrak.hexcasting.api.casting.eval.ResolvedPatternType
 import at.petrak.hexcasting.api.casting.iota.Iota
@@ -23,7 +24,7 @@ data class FrameEvaluate(val list: SpellList, val isMetacasting: Boolean) : Cont
         continuation: SpellContinuation,
         level: ServerLevel,
         harness: CastingHarness
-    ): CastingHarness.CastResult {
+    ): CastResult {
         // If there are patterns left...
         return if (list.nonEmpty) {
             val newCont = if (list.cdr.nonEmpty) { // yay TCO
@@ -39,7 +40,7 @@ data class FrameEvaluate(val list: SpellList, val isMetacasting: Boolean) : Cont
             }
         } else {
             // If there are no patterns (e.g. empty Hermes), just return OK.
-            CastingHarness.CastResult(continuation, null, ResolvedPatternType.EVALUATED, listOf(), HexEvalSounds.HERMES)
+            CastResult(continuation, null, listOf(), ResolvedPatternType.EVALUATED, HexEvalSounds.HERMES)
         }
     }
 

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

@@ -1,5 +1,6 @@
 package at.petrak.hexcasting.api.casting.eval.vm
 
+import at.petrak.hexcasting.api.casting.eval.CastResult
 import at.petrak.hexcasting.api.casting.eval.CastingHarness
 import at.petrak.hexcasting.api.casting.eval.ResolvedPatternType
 import at.petrak.hexcasting.api.casting.iota.Iota
@@ -20,12 +21,12 @@ object FrameFinishEval : ContinuationFrame {
         continuation: SpellContinuation,
         level: ServerLevel,
         harness: CastingHarness
-    ): CastingHarness.CastResult {
-        return CastingHarness.CastResult(
+    ): CastResult {
+        return CastResult(
             continuation,
             FunctionalData(harness.stack.toList(), 0, listOf(), false, harness.ravenmind),
-            ResolvedPatternType.EVALUATED,
             listOf(),
+            ResolvedPatternType.EVALUATED,
             HexEvalSounds.NOTHING,
         )
     }

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

@@ -1,6 +1,7 @@
 package at.petrak.hexcasting.api.casting.eval.vm
 
 import at.petrak.hexcasting.api.casting.SpellList
+import at.petrak.hexcasting.api.casting.eval.CastResult
 import at.petrak.hexcasting.api.casting.eval.CastingHarness
 import at.petrak.hexcasting.api.casting.eval.ResolvedPatternType
 import at.petrak.hexcasting.api.casting.iota.Iota
@@ -39,7 +40,7 @@ data class FrameForEach(
         continuation: SpellContinuation,
         level: ServerLevel,
         harness: CastingHarness
-    ): CastingHarness.CastResult {
+    ): 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...
@@ -67,11 +68,11 @@ data class FrameForEach(
         val tStack = stack.toMutableList()
         tStack.add(stackTop)
         // TODO: this means we could have Thoth casting do a different sound
-        return CastingHarness.CastResult(
+        return CastResult(
             newCont,
             FunctionalData(tStack, 0, listOf(), false, harness.ravenmind),
-            ResolvedPatternType.EVALUATED,
             listOf(),
+            ResolvedPatternType.EVALUATED,
             HexEvalSounds.THOTH,
         )
     }

Common/src/main/java/at/petrak/hexcasting/common/casting/PatternRegistryManifest.java

@@ -3,7 +3,7 @@ package at.petrak.hexcasting.common.casting;
 import at.petrak.hexcasting.api.HexAPI;
 import at.petrak.hexcasting.api.casting.ActionRegistryEntry;
 import at.petrak.hexcasting.api.casting.PatternShapeMatch;
-import at.petrak.hexcasting.api.casting.SpecialHandler;
+import at.petrak.hexcasting.api.casting.castables.SpecialHandler;
 import at.petrak.hexcasting.api.casting.math.EulerPathFinder;
 import at.petrak.hexcasting.api.casting.math.HexPattern;
 import at.petrak.hexcasting.api.mod.HexTags;

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpBlockAxisRaycast.kt

@@ -1,8 +1,8 @@
 package at.petrak.hexcasting.common.casting.operators
 
 import at.petrak.hexcasting.api.misc.MediaConstants
-import at.petrak.hexcasting.api.casting.Action
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.Action
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getVec3

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpBlockRaycast.kt

@@ -1,8 +1,8 @@
 package at.petrak.hexcasting.common.casting.operators
 
 import at.petrak.hexcasting.api.misc.MediaConstants
-import at.petrak.hexcasting.api.casting.Action
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.Action
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getVec3

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpEntityHeight.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getEntity

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpEntityLook.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getEntity

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpEntityPos.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getEntity

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpEntityRaycast.kt

@@ -1,8 +1,8 @@
 package at.petrak.hexcasting.common.casting.operators
 
 import at.petrak.hexcasting.api.misc.MediaConstants
-import at.petrak.hexcasting.api.casting.Action
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.Action
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getVec3

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpEntityVelocity.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getEntity

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/akashic/OpAkashicRead.kt

@@ -1,7 +1,7 @@
 package at.petrak.hexcasting.common.casting.operators.akashic
 
 import at.petrak.hexcasting.api.misc.MediaConstants
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getBlockPos
 import at.petrak.hexcasting.api.casting.getPattern

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/akashic/OpAkashicWrite.kt

@@ -1,6 +1,7 @@
 package at.petrak.hexcasting.common.casting.operators.akashic
 
 import at.petrak.hexcasting.api.casting.*
+import at.petrak.hexcasting.api.casting.castables.SpellAction
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.iota.Iota
 import at.petrak.hexcasting.api.casting.math.HexPattern

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/circles/OpCircleBounds.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.circles
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.iota.Iota

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/circles/OpImpetusDir.kt

@@ -1,7 +1,7 @@
 package at.petrak.hexcasting.common.casting.operators.circles
 
 import at.petrak.hexcasting.api.block.circle.BlockAbstractImpetus
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.iota.Iota

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/circles/OpImpetusPos.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.circles
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.iota.Iota

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

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.eval
 
-import at.petrak.hexcasting.api.casting.Action
+import at.petrak.hexcasting.api.casting.castables.Action
 import at.petrak.hexcasting.api.casting.OperationResult
 import at.petrak.hexcasting.api.casting.SpellList
 import at.petrak.hexcasting.api.casting.eval.CastingContext

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/eval/OpEvalDelay.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.eval
 
-import at.petrak.hexcasting.api.casting.Action
+import at.petrak.hexcasting.api.casting.castables.Action
 import at.petrak.hexcasting.api.casting.OperationResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.eval.vm.SpellContinuation

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

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.eval
 
-import at.petrak.hexcasting.api.casting.Action
+import at.petrak.hexcasting.api.casting.castables.Action
 import at.petrak.hexcasting.api.casting.OperationResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.eval.vm.FrameForEach

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/eval/OpHalt.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.eval
 
-import at.petrak.hexcasting.api.casting.Action
+import at.petrak.hexcasting.api.casting.castables.Action
 import at.petrak.hexcasting.api.casting.OperationResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.eval.vm.SpellContinuation

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpAppend.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.lists
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getList

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpConcat.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.lists
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getList

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

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.lists
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.SpellList
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpEmptyList.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.lists
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.iota.Iota
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpIndex.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.lists
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getDouble
 import at.petrak.hexcasting.api.casting.getList

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpIndexOf.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.lists
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getList

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpLastNToList.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.lists
 
-import at.petrak.hexcasting.api.casting.Action
+import at.petrak.hexcasting.api.casting.castables.Action
 import at.petrak.hexcasting.api.casting.OperationResult
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpListSize.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.lists
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getList

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpModifyInPlace.kt

@@ -1,6 +1,7 @@
 package at.petrak.hexcasting.common.casting.operators.lists
 
 import at.petrak.hexcasting.api.casting.*
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.iota.Iota
 

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpRemove.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.lists
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getInt

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpReverski.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.lists
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getList

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpSingleton.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.lists
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.iota.Iota

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpSlice.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.lists
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getList

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpSplat.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.lists
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getList
 import at.petrak.hexcasting.api.casting.iota.Iota

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpUnCons.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.lists
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getList
 import at.petrak.hexcasting.api.casting.iota.Iota

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/local/OpPeekLocal.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.local
 
-import at.petrak.hexcasting.api.casting.Action
+import at.petrak.hexcasting.api.casting.castables.Action
 import at.petrak.hexcasting.api.casting.OperationResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.eval.vm.SpellContinuation

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/local/OpPushLocal.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.local
 
-import at.petrak.hexcasting.api.casting.Action
+import at.petrak.hexcasting.api.casting.castables.Action
 import at.petrak.hexcasting.api.casting.OperationResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.eval.vm.SpellContinuation

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpAbsLen.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getNumOrVec

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpAdd.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getNumOrVec

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpCeil.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.aplKinnie
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getNumOrVec

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpCoerceToAxial.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getVec3

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpConstructVec.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getDouble

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpDeconstructVec.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getVec3
 import at.petrak.hexcasting.api.casting.iota.DoubleIota

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpDivCross.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getNumOrVec

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpFloor.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.aplKinnie
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getNumOrVec

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpLog.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getDouble

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpModulo.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getDouble

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpMulDot.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getNumOrVec

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpPowProj.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getNumOrVec

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpRandom.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.iota.Iota

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpSub.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getNumOrVec

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/SpecialHandlerNumberLiteral.kt

@@ -2,10 +2,10 @@ package at.petrak.hexcasting.common.casting.operators.math
 
 import at.petrak.hexcasting.api.HexAPI
 import at.petrak.hexcasting.api.HexAPI.modLoc
-import at.petrak.hexcasting.api.casting.Action
-import at.petrak.hexcasting.api.casting.ConstMediaAction
-import at.petrak.hexcasting.api.casting.SpecialHandler
 import at.petrak.hexcasting.api.casting.asActionResult
+import at.petrak.hexcasting.api.casting.castables.Action
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.SpecialHandler
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.iota.Iota
 import at.petrak.hexcasting.api.casting.math.HexPattern
@@ -14,7 +14,7 @@ import at.petrak.hexcasting.api.utils.lightPurple
 import net.minecraft.network.chat.Component
 import net.minecraft.resources.ResourceLocation
 
-class SpecialHandlerNumberLiteral(val x: Double) : SpecialHandler() {
+class SpecialHandlerNumberLiteral(val x: Double) : SpecialHandler {
     override fun act(): Action {
         return InnerAction(this.x)
     }

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/bit/OpAnd.kt

@@ -1,6 +1,7 @@
 package at.petrak.hexcasting.common.casting.operators.math.bit
 
 import at.petrak.hexcasting.api.casting.*
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.iota.Iota
 

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/bit/OpNot.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math.bit
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getLong

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/bit/OpOr.kt

@@ -1,6 +1,7 @@
 package at.petrak.hexcasting.common.casting.operators.math.bit
 
 import at.petrak.hexcasting.api.casting.*
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.iota.Iota
 

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/bit/OpToSet.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math.bit
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getList

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/bit/OpXor.kt

@@ -1,6 +1,7 @@
 package at.petrak.hexcasting.common.casting.operators.math.bit
 
 import at.petrak.hexcasting.api.casting.*
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.iota.Iota
 

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolAnd.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math.logic
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getBool

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolIf.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math.logic
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getBool
 import at.petrak.hexcasting.api.casting.iota.Iota

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolNot.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math.logic
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getBool

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolOr.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math.logic
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getBool

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolXor.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math.logic
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getBool

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpCoerceToBool.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math.logic
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.iota.Iota

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpCompare.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math.logic
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getDouble

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpEquality.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math.logic
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.iota.Iota

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpArcCos.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math.trig
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getDoubleBetween

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpArcSin.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math.trig
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getDoubleBetween

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpArcTan.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math.trig
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getDouble

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpArcTan2.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math.trig
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getDouble

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpCos.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math.trig
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getDouble

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpSin.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math.trig
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getDouble

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpTan.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.math.trig
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getDouble

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/rw/OpRead.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.rw
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.iota.Iota
 import at.petrak.hexcasting.api.casting.mishaps.MishapBadOffhandItem

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/rw/OpReadable.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.rw
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.iota.Iota

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/rw/OpTheCoolerRead.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.rw
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getEntity
 import at.petrak.hexcasting.api.casting.iota.Iota

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/rw/OpTheCoolerReadable.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.rw
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getEntity

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/rw/OpTheCoolerWritable.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.rw
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getEntity

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/rw/OpTheCoolerWrite.kt

@@ -3,7 +3,7 @@ package at.petrak.hexcasting.common.casting.operators.rw
 import at.petrak.hexcasting.api.addldata.ADIotaHolder
 import at.petrak.hexcasting.api.casting.ParticleSpray
 import at.petrak.hexcasting.api.casting.RenderedSpell
-import at.petrak.hexcasting.api.casting.SpellAction
+import at.petrak.hexcasting.api.casting.castables.SpellAction
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getEntity
 import at.petrak.hexcasting.api.casting.iota.Iota

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/rw/OpWritable.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.rw
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.iota.Iota

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/rw/OpWrite.kt

@@ -3,7 +3,7 @@ package at.petrak.hexcasting.common.casting.operators.rw
 import at.petrak.hexcasting.api.addldata.ADIotaHolder
 import at.petrak.hexcasting.api.casting.ParticleSpray
 import at.petrak.hexcasting.api.casting.RenderedSpell
-import at.petrak.hexcasting.api.casting.SpellAction
+import at.petrak.hexcasting.api.casting.castables.SpellAction
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.iota.Iota
 import at.petrak.hexcasting.api.casting.mishaps.MishapBadOffhandItem

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/selectors/OpGetCaster.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.selectors
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.iota.Iota

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/selectors/OpGetEntitiesBy.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.selectors
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getPositiveDouble

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/selectors/OpGetEntityAt.kt

@@ -1,6 +1,6 @@
 package at.petrak.hexcasting.common.casting.operators.selectors
 
-import at.petrak.hexcasting.api.casting.ConstMediaAction
+import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getVec3

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpAddMotion.kt

@@ -2,6 +2,7 @@ package at.petrak.hexcasting.common.casting.operators.spells
 
 import at.petrak.hexcasting.api.misc.MediaConstants
 import at.petrak.hexcasting.api.casting.*
+import at.petrak.hexcasting.api.casting.castables.SpellAction
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.iota.Iota
 import net.minecraft.world.entity.Entity

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpBeep.kt

@@ -2,6 +2,7 @@ package at.petrak.hexcasting.common.casting.operators.spells
 
 import at.petrak.hexcasting.api.misc.MediaConstants
 import at.petrak.hexcasting.api.casting.*
+import at.petrak.hexcasting.api.casting.castables.SpellAction
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.iota.Iota
 import at.petrak.hexcasting.common.network.MsgBeepAck

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpBlink.kt

@@ -4,6 +4,7 @@ import at.petrak.hexcasting.api.misc.MediaConstants
 import at.petrak.hexcasting.api.mod.HexConfig
 import at.petrak.hexcasting.api.mod.HexTags
 import at.petrak.hexcasting.api.casting.*
+import at.petrak.hexcasting.api.casting.castables.SpellAction
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.iota.Iota
 import at.petrak.hexcasting.api.casting.mishaps.MishapImmuneEntity

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpBreakBlock.kt

@@ -4,7 +4,7 @@ import at.petrak.hexcasting.api.misc.MediaConstants
 import at.petrak.hexcasting.api.mod.HexConfig
 import at.petrak.hexcasting.api.casting.ParticleSpray
 import at.petrak.hexcasting.api.casting.RenderedSpell
-import at.petrak.hexcasting.api.casting.SpellAction
+import at.petrak.hexcasting.api.casting.castables.SpellAction
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.getBlockPos
 import at.petrak.hexcasting.api.casting.iota.Iota

Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpColorize.kt

@@ -5,7 +5,7 @@ import at.petrak.hexcasting.api.misc.MediaConstants
 import at.petrak.hexcasting.api.casting.ParticleSpray
 import at.petrak.hexcasting.api.casting.RenderedSpell
 import at.petrak.hexcasting.api.casting.iota.Iota
-import at.petrak.hexcasting.api.casting.SpellAction
+import at.petrak.hexcasting.api.casting.castables.SpellAction
 import at.petrak.hexcasting.api.casting.eval.CastingContext
 import at.petrak.hexcasting.api.casting.mishaps.MishapBadOffhandItem
 import at.petrak.hexcasting.xplat.IXplatAbstractions