From d20955eed01701dd2f4b7c9ec61e0376cd794bd2 Mon Sep 17 00:00:00 2001 From: Florian Meyer Date: Mon, 27 Jul 2026 15:50:10 +0200 Subject: [PATCH] chore: cleanup unused action classes --- .../common/casting/actions/lists/OpAppend.kt | 17 ------- .../common/casting/actions/lists/OpConcat.kt | 17 ------- .../common/casting/actions/lists/OpCons.kt | 17 ------- .../common/casting/actions/lists/OpIndex.kt | 19 ------- .../common/casting/actions/lists/OpIndexOf.kt | 18 ------- .../casting/actions/lists/OpListSize.kt | 15 ------ .../casting/actions/lists/OpModifyInPlace.kt | 19 ------- .../common/casting/actions/lists/OpRemove.kt | 22 --------- .../casting/actions/lists/OpReverski.kt | 14 ------ .../common/casting/actions/lists/OpSlice.kt | 24 --------- .../common/casting/actions/lists/OpUnCons.kt | 19 ------- .../common/casting/actions/math/OpAbsLen.kt | 19 ------- .../common/casting/actions/math/OpAdd.kt | 30 ------------ .../common/casting/actions/math/OpCeil.kt | 19 ------- .../casting/actions/math/OpConstructVec.kt | 18 ------- .../casting/actions/math/OpDeconstructVec.kt | 15 ------ .../common/casting/actions/math/OpDivCross.kt | 42 ---------------- .../common/casting/actions/math/OpFloor.kt | 18 ------- .../common/casting/actions/math/OpLog.kt | 22 --------- .../common/casting/actions/math/OpModulo.kt | 22 --------- .../common/casting/actions/math/OpMulDot.kt | 29 ----------- .../common/casting/actions/math/OpPowProj.kt | 49 ------------------- .../common/casting/actions/math/OpSub.kt | 30 ------------ .../common/casting/actions/math/bit/OpAnd.kt | 28 ----------- .../common/casting/actions/math/bit/OpNot.kt | 16 ------ .../common/casting/actions/math/bit/OpOr.kt | 28 ----------- .../casting/actions/math/bit/OpToSet.kt | 24 --------- .../common/casting/actions/math/bit/OpXor.kt | 37 -------------- .../casting/actions/math/logic/OpBoolAnd.kt | 17 ------- .../casting/actions/math/logic/OpBoolOr.kt | 17 ------- .../actions/math/logic/OpBoolToNumber.kt | 16 ------ .../casting/actions/math/logic/OpBoolXor.kt | 17 ------- .../casting/actions/math/logic/OpCompare.kt | 22 --------- .../casting/actions/math/trig/OpArcCos.kt | 18 ------- .../casting/actions/math/trig/OpArcSin.kt | 18 ------- .../casting/actions/math/trig/OpArcTan.kt | 18 ------- .../casting/actions/math/trig/OpArcTan2.kt | 19 ------- .../common/casting/actions/math/trig/OpCos.kt | 18 ------- .../common/casting/actions/math/trig/OpSin.kt | 18 ------- .../common/casting/actions/math/trig/OpTan.kt | 23 --------- .../common/casting/actions/stack/OpMask.kt | 21 -------- .../operator/list/OperatorUnique.kt | 4 +- .../hexcasting/common/lib/hex/HexActions.java | 4 -- 43 files changed, 1 insertion(+), 896 deletions(-) delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpAppend.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpConcat.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpCons.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpIndex.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpIndexOf.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpListSize.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpModifyInPlace.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpRemove.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpReverski.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpSlice.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpUnCons.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpAbsLen.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpAdd.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpCeil.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpConstructVec.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpDeconstructVec.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpDivCross.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpFloor.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpLog.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpModulo.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpMulDot.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpPowProj.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpSub.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/bit/OpAnd.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/bit/OpNot.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/bit/OpOr.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/bit/OpToSet.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/bit/OpXor.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/logic/OpBoolAnd.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/logic/OpBoolOr.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/logic/OpBoolToNumber.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/logic/OpBoolXor.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/logic/OpCompare.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpArcCos.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpArcSin.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpArcTan.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpArcTan2.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpCos.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpSin.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpTan.kt delete mode 100644 Common/src/main/java/at/petrak/hexcasting/common/casting/actions/stack/OpMask.kt diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpAppend.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpAppend.kt deleted file mode 100644 index 1834166ee2..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpAppend.kt +++ /dev/null @@ -1,17 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.lists - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getList -import at.petrak.hexcasting.api.casting.iota.Iota - -object OpAppend : ConstMediaAction { - override val argc = 2 - override fun execute(args: List, env: CastingEnvironment): List { - val list = args.getList(0, argc).toMutableList() - val datum = args[1] - list.add(datum) - return list.asActionResult - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpConcat.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpConcat.kt deleted file mode 100644 index 2e77b35673..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpConcat.kt +++ /dev/null @@ -1,17 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.lists - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getList -import at.petrak.hexcasting.api.casting.iota.Iota - -object OpConcat : ConstMediaAction { - override val argc = 2 - override fun execute(args: List, env: CastingEnvironment): List { - val lhs = args.getList(0, argc).toMutableList() - val rhs = args.getList(1, argc) - lhs.addAll(rhs) - return lhs.asActionResult - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpCons.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpCons.kt deleted file mode 100644 index b0ec3173fc..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpCons.kt +++ /dev/null @@ -1,17 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.lists - -import at.petrak.hexcasting.api.casting.SpellList -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getList -import at.petrak.hexcasting.api.casting.iota.Iota - -object OpCons : ConstMediaAction { - override val argc = 2 - override fun execute(args: List, env: CastingEnvironment): List { - val bottom = args.getList(0, argc) - val top = args[1] - return SpellList.LPair(top, bottom).asActionResult - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpIndex.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpIndex.kt deleted file mode 100644 index dacaa022a8..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpIndex.kt +++ /dev/null @@ -1,19 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.lists - -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getDouble -import at.petrak.hexcasting.api.casting.getList -import at.petrak.hexcasting.api.casting.iota.Iota -import at.petrak.hexcasting.api.casting.iota.NullIota -import kotlin.math.roundToInt - -object OpIndex : ConstMediaAction { - override val argc = 2 - override fun execute(args: List, env: CastingEnvironment): List { - val list = args.getList(0, argc).toMutableList() - val index = args.getDouble(1, argc) - val x = list.getOrElse(index.roundToInt()) { NullIota() } - return listOf(x) - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpIndexOf.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpIndexOf.kt deleted file mode 100644 index 98209c9b08..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpIndexOf.kt +++ /dev/null @@ -1,18 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.lists - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getList -import at.petrak.hexcasting.api.casting.iota.Iota - -object OpIndexOf : ConstMediaAction { - override val argc: Int - get() = 2 - - override fun execute(args: List, env: CastingEnvironment): List { - val list = args.getList(0, argc).toMutableList() - val value = args[1] - return list.indexOfFirst { Iota.tolerates(value, it) }.asActionResult - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpListSize.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpListSize.kt deleted file mode 100644 index 0df98e1653..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpListSize.kt +++ /dev/null @@ -1,15 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.lists - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getList -import at.petrak.hexcasting.api.casting.iota.Iota - -// it's still called beancounter's distillation in my heart -object OpListSize : ConstMediaAction { - override val argc = 1 - override fun execute(args: List, env: CastingEnvironment): List { - return args.getList(0, argc).toList().size.asActionResult // mmm one-liner - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpModifyInPlace.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpModifyInPlace.kt deleted file mode 100644 index f54ec91edb..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpModifyInPlace.kt +++ /dev/null @@ -1,19 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.lists - -import at.petrak.hexcasting.api.casting.SpellList -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getList -import at.petrak.hexcasting.api.casting.getPositiveIntUnder -import at.petrak.hexcasting.api.casting.iota.Iota - -object OpModifyInPlace : ConstMediaAction { - override val argc = 3 - override fun execute(args: List, env: CastingEnvironment): List { - val list = args.getList(0, argc) - val index = args.getPositiveIntUnder(1, list.size(), argc) - val iota = args[2] - return list.modifyAt(index) { SpellList.LPair(iota, it.cdr) }.asActionResult - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpRemove.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpRemove.kt deleted file mode 100644 index 586b679eb0..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpRemove.kt +++ /dev/null @@ -1,22 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.lists - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getInt -import at.petrak.hexcasting.api.casting.getList -import at.petrak.hexcasting.api.casting.iota.Iota - -object OpRemove : ConstMediaAction { - override val argc: Int - get() = 2 - - override fun execute(args: List, env: CastingEnvironment): List { - val list = args.getList(0, argc).toMutableList() - val index = args.getInt(1, argc) - if (index < 0 || index >= list.size) - return list.asActionResult - list.removeAt(index) - return list.asActionResult - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpReverski.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpReverski.kt deleted file mode 100644 index ffee540359..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpReverski.kt +++ /dev/null @@ -1,14 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.lists - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getList -import at.petrak.hexcasting.api.casting.iota.Iota - -object OpReverski : ConstMediaAction { - override val argc = 1 - override fun execute(args: List, env: CastingEnvironment): List { - return args.getList(0, argc).toList().asReversed().asActionResult // okay kotlin kinda pogged for this - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpSlice.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpSlice.kt deleted file mode 100644 index f83daf7614..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpSlice.kt +++ /dev/null @@ -1,24 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.lists - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getList -import at.petrak.hexcasting.api.casting.getPositiveIntUnderInclusive -import at.petrak.hexcasting.api.casting.iota.Iota -import kotlin.math.max -import kotlin.math.min - -object OpSlice : ConstMediaAction { - override val argc = 3 - override fun execute(args: List, env: CastingEnvironment): List { - val list = args.getList(0, argc).toList() - val index1 = args.getPositiveIntUnderInclusive(1, list.size, argc) - val index2 = args.getPositiveIntUnderInclusive(2, list.size, argc) - - if (index1 == index2) - return emptyList().asActionResult - - return list.subList(min(index1, index2), max(index1, index2)).asActionResult - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpUnCons.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpUnCons.kt deleted file mode 100644 index 211e91283d..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpUnCons.kt +++ /dev/null @@ -1,19 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.lists - -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getList -import at.petrak.hexcasting.api.casting.iota.Iota -import at.petrak.hexcasting.api.casting.iota.ListIota -import at.petrak.hexcasting.api.casting.iota.NullIota - -object OpUnCons : ConstMediaAction { - override val argc = 1 - override fun execute(args: List, env: CastingEnvironment): List { - val list = args.getList(0, argc) - if (list.nonEmpty) { - return listOf(ListIota(list.cdr), list.car) - } - return listOf(args[0], NullIota()) - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpAbsLen.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpAbsLen.kt deleted file mode 100644 index b78bb09a9b..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpAbsLen.kt +++ /dev/null @@ -1,19 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getNumOrVec -import at.petrak.hexcasting.api.casting.iota.Iota -import kotlin.math.absoluteValue - -object OpAbsLen : ConstMediaAction { - override val argc: Int - get() = 1 - - override fun execute(args: List, env: CastingEnvironment): List { - val x = args.getNumOrVec(0, argc) - - return x.map({ num -> num.absoluteValue }, { vec -> vec.length() }).asActionResult - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpAdd.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpAdd.kt deleted file mode 100644 index cdb1cea4d9..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpAdd.kt +++ /dev/null @@ -1,30 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getNumOrVec -import at.petrak.hexcasting.api.casting.iota.Iota - -object OpAdd : ConstMediaAction { - override val argc: Int - get() = 2 - - override fun execute(args: List, env: CastingEnvironment): List { - val lhs = args.getNumOrVec(0, argc) - val rhs = args.getNumOrVec(1, argc) - - return lhs.map( - { lnum -> - rhs.map( - { rnum -> (lnum + rnum).asActionResult }, { rvec -> rvec.add(lnum, lnum, lnum).asActionResult } - ) - }, - { lvec -> - rhs.map( - { rnum -> lvec.add(rnum, rnum, rnum).asActionResult }, { rvec -> lvec.add(rvec).asActionResult } - ) - } - ) - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpCeil.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpCeil.kt deleted file mode 100644 index d9b7cbd6af..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpCeil.kt +++ /dev/null @@ -1,19 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math - -import at.petrak.hexcasting.api.casting.aplKinnie -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getNumOrVec -import at.petrak.hexcasting.api.casting.iota.Iota -import kotlin.math.ceil - -object OpCeil : ConstMediaAction { - override val argc: Int - get() = 1 - - override fun execute(args: List, env: CastingEnvironment): List { - val value = args.getNumOrVec(0, argc) - // i hate this fucking syntax what the hell is ::ceil are you a goddamn homestuck ::c - return listOf(aplKinnie(value, ::ceil)) - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpConstructVec.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpConstructVec.kt deleted file mode 100644 index 3a94ea1e54..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpConstructVec.kt +++ /dev/null @@ -1,18 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getDouble -import at.petrak.hexcasting.api.casting.iota.Iota -import net.minecraft.world.phys.Vec3 - -object OpConstructVec : ConstMediaAction { - override val argc = 3 - override fun execute(args: List, env: CastingEnvironment): List { - val x = args.getDouble(0, argc) - val y = args.getDouble(1, argc) - val z = args.getDouble(2, argc) - return Vec3(x, y, z).asActionResult - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpDeconstructVec.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpDeconstructVec.kt deleted file mode 100644 index 68a979d206..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpDeconstructVec.kt +++ /dev/null @@ -1,15 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math - -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getVec3 -import at.petrak.hexcasting.api.casting.iota.DoubleIota -import at.petrak.hexcasting.api.casting.iota.Iota - -object OpDeconstructVec : ConstMediaAction { - override val argc = 1 - override fun execute(args: List, env: CastingEnvironment): List { - val v = args.getVec3(0, argc) - return listOf(DoubleIota(v.x), DoubleIota(v.y), DoubleIota(v.z)) - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpDivCross.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpDivCross.kt deleted file mode 100644 index f83c97b43f..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpDivCross.kt +++ /dev/null @@ -1,42 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getNumOrVec -import at.petrak.hexcasting.api.casting.iota.Iota -import at.petrak.hexcasting.api.casting.mishaps.MishapDivideByZero -import net.minecraft.world.phys.Vec3 - -object OpDivCross : ConstMediaAction { - override val argc: Int - get() = 2 - - override fun execute(args: List, env: CastingEnvironment): List { - val lhs = args.getNumOrVec(0, argc) - val rhs = args.getNumOrVec(1, argc) - val theMishap = MishapDivideByZero.of(args[0], args[1]) - - return lhs.map( - { lnum -> - rhs.map( - { rnum -> - if (rnum == 0.0) throw theMishap // throw theMishap throw theMishap badumbadum - (lnum / rnum).asActionResult - }, - { rvec -> - if (rvec.x == 0.0 || rvec.y == 0.0 || rvec.z == 0.0) throw theMishap - Vec3(lnum / rvec.x, lnum / rvec.y, lnum / rvec.z).asActionResult - } - ) - }, { lvec -> - rhs.map( - { rnum -> - if (lvec == Vec3.ZERO) throw theMishap - lvec.scale(1.0 / rnum).asActionResult - }, - { rvec -> lvec.cross(rvec).asActionResult } - ) - }) - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpFloor.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpFloor.kt deleted file mode 100644 index 761888de93..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpFloor.kt +++ /dev/null @@ -1,18 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math - -import at.petrak.hexcasting.api.casting.aplKinnie -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getNumOrVec -import at.petrak.hexcasting.api.casting.iota.Iota -import kotlin.math.floor - -object OpFloor : ConstMediaAction { - override val argc: Int - get() = 1 - - override fun execute(args: List, env: CastingEnvironment): List { - val value = args.getNumOrVec(0, argc) - return listOf(aplKinnie(value, ::floor)) - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpLog.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpLog.kt deleted file mode 100644 index 054debb4a4..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpLog.kt +++ /dev/null @@ -1,22 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getDouble -import at.petrak.hexcasting.api.casting.iota.Iota -import at.petrak.hexcasting.api.casting.mishaps.MishapDivideByZero -import kotlin.math.log - -object OpLog : ConstMediaAction { - override val argc: Int - get() = 2 - - override fun execute(args: List, env: CastingEnvironment): List { - val value = args.getDouble(0, argc) - val base = args.getDouble(1, argc) - if (value <= 0.0 || base <= 0.0 || base == 1.0) - throw MishapDivideByZero.of(args[0], args[1], "logarithm") - return log(value, base).asActionResult - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpModulo.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpModulo.kt deleted file mode 100644 index 57753f8fb4..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpModulo.kt +++ /dev/null @@ -1,22 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getDouble -import at.petrak.hexcasting.api.casting.iota.Iota -import at.petrak.hexcasting.api.casting.mishaps.MishapDivideByZero - -object OpModulo : ConstMediaAction { - override val argc: Int - get() = 2 - - override fun execute(args: List, env: CastingEnvironment): List { - // TODO: some wAckY vector operation to go in the vector x vector overload - val l = args.getDouble(0, argc) - val r = args.getDouble(1, argc) - if (r == 0.0) - throw MishapDivideByZero.of(args[0], args[1]) - return (l % r).asActionResult - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpMulDot.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpMulDot.kt deleted file mode 100644 index fe5324ddd1..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpMulDot.kt +++ /dev/null @@ -1,29 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getNumOrVec -import at.petrak.hexcasting.api.casting.iota.Iota - -object OpMulDot : ConstMediaAction { - override val argc: Int - get() = 2 - - override fun execute(args: List, env: CastingEnvironment): List { - val lhs = args.getNumOrVec(0, OpAdd.argc) - val rhs = args.getNumOrVec(1, OpAdd.argc) - - return lhs.map( - { lnum -> - rhs.map( - { rnum -> (lnum * rnum).asActionResult }, { rvec -> rvec.scale(lnum).asActionResult } - ) - }, { lvec -> - rhs.map( - { rnum -> lvec.scale(rnum).asActionResult }, { rvec -> lvec.dot(rvec).asActionResult } - ) - }) - - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpPowProj.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpPowProj.kt deleted file mode 100644 index 814fca39d7..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpPowProj.kt +++ /dev/null @@ -1,49 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getNumOrVec -import at.petrak.hexcasting.api.casting.iota.Iota -import at.petrak.hexcasting.api.casting.mishaps.MishapDivideByZero -import net.minecraft.world.phys.Vec3 -import kotlin.math.pow - -object OpPowProj : ConstMediaAction { - override val argc: Int - get() = 2 - - override fun execute(args: List, env: CastingEnvironment): List { - val lhs = args.getNumOrVec(0, OpAdd.argc) - val rhs = args.getNumOrVec(1, OpAdd.argc) - val theMishap = MishapDivideByZero.of(args[0], args[1], "exponent") - - return lhs.map( - { lnum -> - rhs.map( - { rnum -> - if (rnum == 0.0 && lnum == 0.0) - throw theMishap - lnum.pow(rnum).asActionResult - }, { rvec -> - if (lnum == 0.0 && (rvec.x == 0.0 || rvec.y == 0.0 || rvec.z == 0.0)) - throw theMishap - Vec3(lnum.pow(rvec.x), lnum.pow(rvec.y), lnum.pow(rvec.z)).asActionResult - } - ) - }, { lvec -> - rhs.map( - { rnum -> - if (rnum == 0.0 && (lvec.x == 0.0 || lvec.y == 0.0 || lvec.z == 0.0)) - throw theMishap - Vec3(lvec.x.pow(rnum), lvec.y.pow(rnum), lvec.z.pow(rnum)).asActionResult - }, - { rvec -> - if (lvec == Vec3.ZERO) - throw MishapDivideByZero.of(args[0], args[1], "project") - lvec.scale(rvec.dot(lvec) / lvec.dot(lvec)).asActionResult - } - ) - }) - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpSub.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpSub.kt deleted file mode 100644 index e5aec943ca..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/OpSub.kt +++ /dev/null @@ -1,30 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getNumOrVec -import at.petrak.hexcasting.api.casting.iota.Iota -import net.minecraft.world.phys.Vec3 - -object OpSub : ConstMediaAction { - override val argc: Int - get() = 2 - - override fun execute(args: List, env: CastingEnvironment): List { - val lhs = args.getNumOrVec(0, OpAdd.argc) - val rhs = args.getNumOrVec(1, OpAdd.argc) - - return lhs.map({ lnum -> - rhs.map( - { rnum -> (lnum - rnum).asActionResult }, - { rvec -> Vec3(lnum - rvec.x, lnum - rvec.y, lnum - rvec.z).asActionResult } - ) - }, { lvec -> - rhs.map( - { rnum -> lvec.subtract(rnum, rnum, rnum).asActionResult }, - { rvec -> lvec.subtract(rvec).asActionResult } - ) - }) - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/bit/OpAnd.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/bit/OpAnd.kt deleted file mode 100644 index 60ec2eecb8..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/bit/OpAnd.kt +++ /dev/null @@ -1,28 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math.bit - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getList -import at.petrak.hexcasting.api.casting.getLong -import at.petrak.hexcasting.api.casting.getLongOrList -import at.petrak.hexcasting.api.casting.iota.Iota - -object OpAnd : ConstMediaAction { - override val argc = 2 - - override fun execute(args: List, env: CastingEnvironment): List { - val firstParam = args.getLongOrList(0, argc) - - return firstParam.map( - { num1 -> - val num2 = args.getLong(1, argc) - (num1 and num2).asActionResult - }, - { list1 -> - val list2 = args.getList(1, argc) - list1.filter { x -> list2.any { Iota.tolerates(x, it) } }.asActionResult - } - ) - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/bit/OpNot.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/bit/OpNot.kt deleted file mode 100644 index 435b1706f0..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/bit/OpNot.kt +++ /dev/null @@ -1,16 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math.bit - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getLong -import at.petrak.hexcasting.api.casting.iota.Iota - -object OpNot : ConstMediaAction { - override val argc = 1 - - override fun execute(args: List, env: CastingEnvironment): List { - val num = args.getLong(0, argc) - return num.inv().asActionResult - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/bit/OpOr.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/bit/OpOr.kt deleted file mode 100644 index 220ff72468..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/bit/OpOr.kt +++ /dev/null @@ -1,28 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math.bit - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getList -import at.petrak.hexcasting.api.casting.getLong -import at.petrak.hexcasting.api.casting.getLongOrList -import at.petrak.hexcasting.api.casting.iota.Iota - -object OpOr : ConstMediaAction { - override val argc = 2 - - override fun execute(args: List, env: CastingEnvironment): List { - val firstParam = args.getLongOrList(0, argc) - - return firstParam.map( - { num1 -> - val num2 = args.getLong(1, argc) - (num1 or num2).asActionResult - }, - { list1 -> - val list2 = args.getList(1, argc) - (list1 + list2.filter { x -> list1.none { Iota.tolerates(x, it) } }).asActionResult - } - ) - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/bit/OpToSet.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/bit/OpToSet.kt deleted file mode 100644 index 94ddcba5c1..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/bit/OpToSet.kt +++ /dev/null @@ -1,24 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math.bit - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getList -import at.petrak.hexcasting.api.casting.iota.Iota - -object OpToSet : ConstMediaAction { - override val argc = 1 - - override fun execute(args: List, env: CastingEnvironment): List { - val list = args.getList(0, argc) - val out = mutableListOf() - - for (subiota in list) { - if (out.none { Iota.tolerates(it, subiota) }) { - out.add(subiota) - } - } - - return out.asActionResult - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/bit/OpXor.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/bit/OpXor.kt deleted file mode 100644 index d45323de52..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/bit/OpXor.kt +++ /dev/null @@ -1,37 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math.bit - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getList -import at.petrak.hexcasting.api.casting.getLong -import at.petrak.hexcasting.api.casting.getLongOrList -import at.petrak.hexcasting.api.casting.iota.Iota - -object OpXor : ConstMediaAction { - override val argc = 2 - - override fun execute(args: List, env: CastingEnvironment): List { - val firstParam = args.getLongOrList(0, argc) - - return firstParam.map( - { num1 -> - val num2 = args.getLong(1, argc) - (num1 xor num2).asActionResult - }, - { list1 -> - val list2 = args.getList(1, argc) - val out = - list1.filter { x1 -> - list2.none { - Iota.tolerates( - x1, - it - ) - } - } + list2.filter { x2 -> list1.none { Iota.tolerates(x2, it) } } - out.asActionResult - } - ) - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/logic/OpBoolAnd.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/logic/OpBoolAnd.kt deleted file mode 100644 index db3e8b0e7e..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/logic/OpBoolAnd.kt +++ /dev/null @@ -1,17 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math.logic - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getBool -import at.petrak.hexcasting.api.casting.iota.Iota - -object OpBoolAnd : ConstMediaAction { - override val argc = 2 - - override fun execute(args: List, env: CastingEnvironment): List { - val lhs = args.getBool(0, argc) - val rhs = args.getBool(1, argc) - return (lhs && rhs).asActionResult - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/logic/OpBoolOr.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/logic/OpBoolOr.kt deleted file mode 100644 index 7c2123b159..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/logic/OpBoolOr.kt +++ /dev/null @@ -1,17 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math.logic - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getBool -import at.petrak.hexcasting.api.casting.iota.Iota - -object OpBoolOr : ConstMediaAction { - override val argc = 2 - - override fun execute(args: List, env: CastingEnvironment): List { - val lhs = args.getBool(0, argc) - val rhs = args.getBool(1, argc) - return (lhs || rhs).asActionResult - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/logic/OpBoolToNumber.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/logic/OpBoolToNumber.kt deleted file mode 100644 index cc3902893c..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/logic/OpBoolToNumber.kt +++ /dev/null @@ -1,16 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math.logic - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getBool -import at.petrak.hexcasting.api.casting.iota.Iota - -object OpBoolToNumber : ConstMediaAction { - override val argc = 1 - - override fun execute(args: List, env: CastingEnvironment): List { - val arg = args.getBool(0, argc) - return (if (arg) 1.0 else 0.0).asActionResult - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/logic/OpBoolXor.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/logic/OpBoolXor.kt deleted file mode 100644 index 5c1af93652..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/logic/OpBoolXor.kt +++ /dev/null @@ -1,17 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math.logic - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getBool -import at.petrak.hexcasting.api.casting.iota.Iota - -object OpBoolXor : ConstMediaAction { - override val argc = 2 - - override fun execute(args: List, env: CastingEnvironment): List { - val lhs = args.getBool(0, argc) - val rhs = args.getBool(1, argc) - return (lhs xor rhs).asActionResult - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/logic/OpCompare.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/logic/OpCompare.kt deleted file mode 100644 index 98c479aa6e..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/logic/OpCompare.kt +++ /dev/null @@ -1,22 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math.logic - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getDouble -import at.petrak.hexcasting.api.casting.iota.DoubleIota -import at.petrak.hexcasting.api.casting.iota.Iota -import java.util.function.BiPredicate - -class OpCompare(val acceptsEqual: Boolean, val cmp: BiPredicate) : ConstMediaAction { - override val argc = 2 - - override fun execute(args: List, env: CastingEnvironment): List { - val lhs = args.getDouble(0, argc) - val rhs = args.getDouble(1, argc) - if (DoubleIota.tolerates(lhs, rhs)) - return acceptsEqual.asActionResult - - return cmp.test(lhs, rhs).asActionResult - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpArcCos.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpArcCos.kt deleted file mode 100644 index 49dce7e697..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpArcCos.kt +++ /dev/null @@ -1,18 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math.trig - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getDoubleBetween -import at.petrak.hexcasting.api.casting.iota.Iota -import kotlin.math.acos - -object OpArcCos : ConstMediaAction { - override val argc: Int - get() = 1 - - override fun execute(args: List, env: CastingEnvironment): List { - val value = args.getDoubleBetween(0, -1.0, 1.0, argc) - return acos(value).asActionResult - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpArcSin.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpArcSin.kt deleted file mode 100644 index 49e82a21df..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpArcSin.kt +++ /dev/null @@ -1,18 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math.trig - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getDoubleBetween -import at.petrak.hexcasting.api.casting.iota.Iota -import kotlin.math.asin - -object OpArcSin : ConstMediaAction { - override val argc: Int - get() = 1 - - override fun execute(args: List, env: CastingEnvironment): List { - val value = args.getDoubleBetween(0, -1.0, 1.0, OpArcCos.argc) - return asin(value).asActionResult - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpArcTan.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpArcTan.kt deleted file mode 100644 index 45b07c6ea5..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpArcTan.kt +++ /dev/null @@ -1,18 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math.trig - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getDouble -import at.petrak.hexcasting.api.casting.iota.Iota -import kotlin.math.atan - -object OpArcTan : ConstMediaAction { - override val argc: Int - get() = 1 - - override fun execute(args: List, env: CastingEnvironment): List { - val value = args.getDouble(0, argc) - return atan(value).asActionResult - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpArcTan2.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpArcTan2.kt deleted file mode 100644 index 6418ccfa5e..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpArcTan2.kt +++ /dev/null @@ -1,19 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math.trig - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getDouble -import at.petrak.hexcasting.api.casting.iota.Iota -import kotlin.math.atan2 - -object OpArcTan2 : ConstMediaAction { - override val argc: Int - get() = 2 - - override fun execute(args: List, env: CastingEnvironment): List { - val y = args.getDouble(0, argc) - val x = args.getDouble(1, argc) - return atan2(y, x).asActionResult - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpCos.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpCos.kt deleted file mode 100644 index 7411c3b8ad..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpCos.kt +++ /dev/null @@ -1,18 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math.trig - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getDouble -import at.petrak.hexcasting.api.casting.iota.Iota -import kotlin.math.cos - -object OpCos : ConstMediaAction { - override val argc: Int - get() = 1 - - override fun execute(args: List, env: CastingEnvironment): List { - val angle = args.getDouble(0, argc) - return cos(angle).asActionResult - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpSin.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpSin.kt deleted file mode 100644 index de67f35c65..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpSin.kt +++ /dev/null @@ -1,18 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math.trig - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getDouble -import at.petrak.hexcasting.api.casting.iota.Iota -import kotlin.math.sin - -object OpSin : ConstMediaAction { - override val argc: Int - get() = 1 - - override fun execute(args: List, env: CastingEnvironment): List { - val angle = args.getDouble(0, argc) - return sin(angle).asActionResult - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpTan.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpTan.kt deleted file mode 100644 index b6b7687276..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/math/trig/OpTan.kt +++ /dev/null @@ -1,23 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.math.trig - -import at.petrak.hexcasting.api.casting.asActionResult -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.getDouble -import at.petrak.hexcasting.api.casting.iota.DoubleIota -import at.petrak.hexcasting.api.casting.iota.Iota -import at.petrak.hexcasting.api.casting.mishaps.MishapDivideByZero -import kotlin.math.cos -import kotlin.math.tan - -object OpTan : ConstMediaAction { - override val argc: Int - get() = 1 - - override fun execute(args: List, env: CastingEnvironment): List { - val angle = args.getDouble(0, argc) - if (cos(angle) == 0.0) - throw MishapDivideByZero.tan(args[0] as DoubleIota) - return tan(angle).asActionResult - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/stack/OpMask.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/stack/OpMask.kt deleted file mode 100644 index 3e15480bfd..0000000000 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/stack/OpMask.kt +++ /dev/null @@ -1,21 +0,0 @@ -package at.petrak.hexcasting.common.casting.actions.stack - -import at.petrak.hexcasting.api.casting.castables.ConstMediaAction -import at.petrak.hexcasting.api.casting.eval.CastingEnvironment -import at.petrak.hexcasting.api.casting.iota.Iota -import it.unimi.dsi.fastutil.booleans.BooleanList -import net.minecraft.resources.ResourceLocation - -class OpMask(val mask: BooleanList, val key: ResourceLocation) : ConstMediaAction { - override val argc: Int - get() = mask.size - - override fun execute(args: List, env: CastingEnvironment): List { - val out = ArrayList(this.mask.size) - for ((i, include) in this.mask.withIndex()) { - if (include) - out.add(args[i]) - } - return out - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/arithmetic/operator/list/OperatorUnique.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/arithmetic/operator/list/OperatorUnique.kt index b3cb19ec28..a88b874016 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/arithmetic/operator/list/OperatorUnique.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/arithmetic/operator/list/OperatorUnique.kt @@ -1,6 +1,5 @@ package at.petrak.hexcasting.common.casting.arithmetic.operator.list -import at.petrak.hexcasting.api.casting.arithmetic.operator.Operator import at.petrak.hexcasting.api.casting.arithmetic.operator.OperatorBasic import at.petrak.hexcasting.api.casting.arithmetic.predicates.IotaMultiPredicate import at.petrak.hexcasting.api.casting.arithmetic.predicates.IotaPredicate @@ -8,13 +7,12 @@ import at.petrak.hexcasting.api.casting.asActionResult import at.petrak.hexcasting.api.casting.eval.CastingEnvironment import at.petrak.hexcasting.api.casting.iota.Iota import at.petrak.hexcasting.common.casting.arithmetic.operator.nextList -import at.petrak.hexcasting.common.casting.actions.math.bit.OpToSet import at.petrak.hexcasting.common.lib.hex.HexIotaTypes.LIST object OperatorUnique : OperatorBasic(1, IotaMultiPredicate.all(IotaPredicate.ofType(LIST))) { override fun apply(iotas: Iterable, env: CastingEnvironment): Iterable { val it = iotas.iterator().withIndex() - val list = it.nextList(OpToSet.argc) + val list = it.nextList() val out = mutableListOf() for (subiota in list) { diff --git a/Common/src/main/java/at/petrak/hexcasting/common/lib/hex/HexActions.java b/Common/src/main/java/at/petrak/hexcasting/common/lib/hex/HexActions.java index 2550c8de6d..23103fac87 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/lib/hex/HexActions.java +++ b/Common/src/main/java/at/petrak/hexcasting/common/lib/hex/HexActions.java @@ -549,14 +549,10 @@ public class HexActions { new OperationAction(HexPattern.fromAngles("edqde", HexDir.SOUTH_WEST))); public static final ActionRegistryEntry UNAPPEND = make("unappend", new OperationAction(HexPattern.fromAngles("qaeaq", HexDir.NORTH_WEST))); - // public static final ActionRegistryEntry CONCAT = make("concat", -// new ActionRegistryEntry(HexPattern.fromAngles("qaeaq", HexDir.NORTH_WEST), OpConcat.INSTANCE)); public static final ActionRegistryEntry INDEX = make("index", new OperationAction(HexPattern.fromAngles("deeed", HexDir.NORTH_WEST))); public static final ActionRegistryEntry FOR_EACH = make("for_each", new ActionRegistryEntry(HexPattern.fromAngles("dadad", HexDir.NORTH_EAST), OpForEach.INSTANCE)); - // public static final ActionRegistryEntry LIST_SIZE = make("list_size", -// new ActionRegistryEntry(HexPattern.fromAngles("aqaeaq", HexDir.EAST), OpListSize.INSTANCE)); public static final ActionRegistryEntry SINGLETON = make("singleton", new ActionRegistryEntry(HexPattern.fromAngles("adeeed", HexDir.EAST), OpSingleton.INSTANCE)); public static final ActionRegistryEntry EMPTY_LIST = make("empty_list",