-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
qmake & qunmake fixed, changed base Q pattern, added book stuff for CNs
- Loading branch information
1 parent
8c50e8d
commit ee333cd
Showing
8 changed files
with
133 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 1 addition & 10 deletions
11
common/src/main/java/dev/kineticcat/complexhex/casting/arithmetic/quaternion/OpQunmake.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,16 @@ | ||
| package dev.kineticcat.complexhex.casting.arithmetic.quaternion | ||
|
|
||
| import at.petrak.hexcasting.api.casting.arithmetic.operator.Operator | ||
| import at.petrak.hexcasting.api.casting.arithmetic.operator.OperatorBasic | ||
| import at.petrak.hexcasting.api.casting.castables.ConstMediaAction | ||
| import at.petrak.hexcasting.api.casting.asActionResult | ||
| 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.iota.Vec3Iota | ||
| import dev.kineticcat.complexhex.api.casting.iota.ComplexHexIotaTypes | ||
| import dev.kineticcat.complexhex.api.casting.iota.QuaternionIota | ||
| import dev.kineticcat.complexhex.stuff.Quaternion | ||
| import net.minecraft.world.phys.Vec3 | ||
| import kotlin.math.sign | ||
|
|
||
| object OpQunmake : OperatorBasic(1, QuaternionArithmetic.ACCEPTS_Q) { | ||
| override fun apply(iotas: Iterable<Iota>, env: CastingEnvironment): Iterable<Iota> { | ||
| val it = iotas.iterator() | ||
| val Q = Operator.downcast(it.next(), ComplexHexIotaTypes.QUATERNION).quaternion | ||
| val Q = (iotas.iterator().next() as QuaternionIota).quaternion | ||
| return listOf(DoubleIota(Q.a), Vec3Iota(Vec3(Q.b, Q.c, Q.d))) | ||
| } | ||
|
|
||
| } |
2 changes: 1 addition & 1 deletion
2
...t/complexhex/casting/spells/OpCongrats.kt → ...at/complexhex/casting/spell/OpCongrats.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 16 additions & 4 deletions
20
common/src/main/resources/assets/complexhex/lang/en_us.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,19 @@ | ||
| { | ||
| "complexhex.entry.complexities": "Complexities", | ||
| "hexcasting.action.book.complexhex:const/complex/i": "Constant Imagination", | ||
| "complexhex.entry.complex_actions": "Complexities", | ||
| "complexhex.page.complex_actions.const.i": "Pushes 0 + 1i to the stack", | ||
|
|
||
|
|
||
| "complexhex.page.complexities.const.i": "Pushes 0 + 1i to the stack.", | ||
| "hexcasting.action.book.complexhex:const/complex/1": "Constant Realisation", | ||
| "complexhex.page.complexities.add": "Preforms Addition, num will be treated as num + 0i.", | ||
| "complexhex.page.complexities.sub": "Preforms Subtraction, num will be treated as num + 0i.", | ||
| "complexhex.page.complexities.mul": "Preforms Scalar Multiplication.", | ||
| "complexhex.page.complexities.div": "Preforms Scalar Division.", | ||
| "complexhex.page.complexities.abs": "Pushes the Argument (the length).", | ||
| "hexcasting.action.book.complexhex:cmul": "Complex Multiplication", | ||
| "complexhex.page.complexities.cmul": "Preforms Complex Multiplication.", | ||
| "hexcasting.action.book.complexhex:real": "Realising Complexities", | ||
| "complexhex.page.complexities.real": "Pushes the real coefficient.", | ||
| "hexcasting.action.book.complexhex:imaginary": "Imagining Complexities", | ||
| "complexhex.page.complexities.imaginary": "Pushes the imaginary coefficient.", | ||
| "hexcasting.action.book.complexhex:conjugate": "Conjugation Purification", | ||
| "complexhex.page.complexities.conjugate": "Negates the imaginary coefficient of the topmost iota" | ||
| } |
98 changes: 98 additions & 0 deletions
98
...ces/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/patterns/complexities.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| { | ||
| "name": "complexhex.entry.complexities", | ||
| "category": "hexcasting:patterns", | ||
| "icon": "minecraft:phantom_membrane", | ||
| "sortnum": 0, | ||
| "advancement": "hexcasting:root", | ||
| "read_by_default": true, | ||
| "pages": [ | ||
| { | ||
| "type": "hexcasting:pattern", | ||
| "op_id": "complexhex:const/complex/i", | ||
| "anchor": "complexhex:const/complex/i", | ||
| "input": "", | ||
| "output": "complex", | ||
| "text": "complexhex.page.complexities.const.i" | ||
| }, | ||
| { | ||
| "type": "hexcasting:pattern", | ||
| "op_id": "complexhex:const/complex/1", | ||
| "anchor": "complexhex:const/complex/1", | ||
| "input": "", | ||
| "output": "complex", | ||
| "text": "complexhex.page.complexities.const.1" | ||
| }, | ||
| { | ||
| "type": "hexcasting:pattern", | ||
| "op_id": "hexcasting:add", | ||
| "anchor": "hexcasting:add", | ||
| "input": "complex, complex/num", | ||
| "output": "complex", | ||
| "text": "complexhex.page.complexities.add" | ||
| }, | ||
| { | ||
| "type": "hexcasting:pattern", | ||
| "op_id": "hexcasting:sub", | ||
| "anchor": "hexcasting:sub", | ||
| "input": "complex, complex/num", | ||
| "output": "complex", | ||
| "text": "complexhex.page.complexities.sub" | ||
| }, | ||
| { | ||
| "type": "hexcasting:pattern", | ||
| "op_id": "hexcasting:mul", | ||
| "anchor": "hexcasting:mul", | ||
| "input": "complex, num", | ||
| "output": "complex", | ||
| "text": "complexhex.page.complexities.mul" | ||
| }, | ||
| { | ||
| "type": "hexcasting:pattern", | ||
| "op_id": "hexcasting:div", | ||
| "anchor": "hexcasting:div", | ||
| "input": "complex, num", | ||
| "output": "complex", | ||
| "text": "complexhex.page.complexities.div" | ||
| }, | ||
| { | ||
| "type": "hexcasting:pattern", | ||
| "op_id": "complexhex:cmul", | ||
| "anchor": "complexhex:cmul", | ||
| "input": "complex, complex", | ||
| "output": "complex", | ||
| "text": "complexhex.page.complexities.cmul" | ||
| }, | ||
| { | ||
| "type": "hexcasting:pattern", | ||
| "op_id": "hexcasting:abs", | ||
| "anchor": "hexcasting:abs", | ||
| "input": "complex", | ||
| "output": "num", | ||
| "text": "complexhex.page.complexities.abs" | ||
| }, | ||
| { | ||
| "type": "hexcasting:pattern", | ||
| "op_id": "complexhex:real", | ||
| "anchor": "complexhex:real", | ||
| "input": "complex", | ||
| "output": "num", | ||
| "text": "complexhex.page.complexities.real" | ||
| }, | ||
| { | ||
| "type": "hexcasting:pattern", | ||
| "op_id": "complexhex:imaginary", | ||
| "anchor": "complexhex:imaginary", | ||
| "input": "complex", | ||
| "output": "num", | ||
| "text": "complexhex.page.complexities.imaginary" | ||
| }, | ||
| { | ||
| "type": "hexcasting:pattern", | ||
| "op_id": "complexhex:conjugate", | ||
| "anchor": "complexhex:conjugate", | ||
| "input": "complex", | ||
| "output": "num", | ||
| "text": "complexhex.page.complexities.conjugate" | ||
| } | ||
| ] | ||
| } |
18 changes: 0 additions & 18 deletions
18
...es/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/patterns/dummy_actions.json
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters