Anvilcraft/HexCasting
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

change everything to use | for type unions and [X] for list of X

Browse source
This commit is contained in:
Talia-12 2023-06-02 00:42:38 +10:00
parent 208ffce914
commit 343338d66d
6 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1136,7 +1136,7 @@
"numbers.3": "In certain cases it might be easier to just use an $(l:items/abacus)$(item)Abacus/$. But, it's worth knowing the \"proper\" way to do things.",
"math.numvec": "Many mathematical operations function on both numbers and vectors. Such arguments are written as \"num/vec\".",
"math.numvec": "Many mathematical operations function on both numbers and vectors. Such arguments are written as \"num|vec\".",
"math.add.1": "Perform addition.",
"math.add.2": "As such:$(li)With two numbers at the top of the stack, combines them into their sum.$(li)With a number and a vector, removes the number from the stack and adds it to each element of the vector.$(li)With two vectors, combines them by summing corresponding components into a new vector (i.e. [1, 2, 3] + [0, 4, -1] = [1, 6, 2]).",
"math.sub.1": "Perform subtraction.",
@ -1168,7 +1168,7 @@
"advanced_math.logarithm": "Removes the number at the top of the stack, then takes the logarithm of the number at the top using the other number as its base. Related to the value of $(l:patterns/consts#hexcasting:const/double/e)$(thing)$(italic)e/$.",
"sets.numlist": "Set operations are odd, in that some of them can accept two numbers or two lists, but not a combination thereof. Such arguments will be written as \"num, num/list, list\".$(br2)When numbers are used in those operations, they are being used as so-called binary \"bitsets\", lists of 1 and 0, true and false, \"on\" and \"off\".",
"sets.numlist": "Set operations are odd, in that some of them can accept two numbers or two lists, but not a combination thereof. Such arguments will be written as \"(num, num)|(list, list)\".$(br2)When numbers are used in those operations, they are being used as so-called binary \"bitsets\", lists of 1 and 0, true and false, \"on\" and \"off\".",
"sets.or.1": "Unifies two sets.",
"sets.or.2": "As such:$(li)With two numbers at the top of the stack, combines them into a bitset containing every \"on\" bit in either bitset.$(li)With two lists, this creates a list of every element from the first list, plus every element from the second list that is not in the first list. This is similar to $(l:patterns/lists#hexcasting:concat)$(action)Combination Distillation/$.",
"sets.and.1": "Takes the intersection of two sets.",

6
Common/src/main/resources/data/hexcasting/patchouli_books/thehexbook/en_us/entries/patterns/basics.json
View file

@ -43,7 +43,7 @@
"op_id": "hexcasting:raycast",
"anchor": "hexcasting:raycast",
"input": "vector, vector",
"output": "vector/null",
"output": "vector | null",
"text": "hexcasting.page.basics_pattern.raycast.1"
},
{
@ -55,7 +55,7 @@
"op_id": "hexcasting:raycast/axis",
"anchor": "hexcasting:raycast/axis",
"input": "vector, vector",
"output": "vector/null",
"output": "vector | null",
"text": "hexcasting.page.basics_pattern.raycast/axis.1"
},
{
@ -67,7 +67,7 @@
"op_id": "hexcasting:raycast/entity",
"anchor": "hexcasting:raycast/entity",
"input": "vector, vector",
"output": "entity/null",
"output": "entity | null",
"text": "hexcasting.page.basics_pattern.raycast/entity"
},
{

2
Common/src/main/resources/data/hexcasting/patchouli_books/thehexbook/en_us/entries/patterns/great_spells/teleport.json
View file

@ -1,5 +1,5 @@
{
"name": "hexcasting.action.hexcasting:teleport",
"name": "hexcasting.action.hexcasting:teleport/great",
"category": "hexcasting:patterns/great_spells",
"icon": "minecraft:ender_pearl",
"sortnum": 3,

38
Common/src/main/resources/data/hexcasting/patchouli_books/thehexbook/en_us/entries/patterns/math.json
View file

@ -17,8 +17,8 @@
"type": "hexcasting:pattern",
"op_id": "hexcasting:add",
"anchor": "hexcasting:add",
"input": "num/vec, num/vec",
"output": "num/vec",
"input": "num|vec, num|vec",
"output": "num|vec",
"text": "hexcasting.page.math.add.1"
},
{
@ -29,8 +29,8 @@
"type": "hexcasting:pattern",
"op_id": "hexcasting:sub",
"anchor": "hexcasting:sub",
"input": "num/vec, num/vec",
"output": "num/vec",
"input": "num|vec, num|vec",
"output": "num|vec",
"text": "hexcasting.page.math.sub.1"
},
{
@ -41,8 +41,8 @@
"type": "hexcasting:pattern",
"op_id": "hexcasting:mul",
"anchor": "hexcasting:mul",
"input": "num/vec, num/vec",
"output": "num/vec",
"input": "num|vec, num|vec",
"output": "num|vec",
"text": "hexcasting.page.math.mul.1"
},
{
@ -53,8 +53,8 @@
"type": "hexcasting:pattern",
"op_id": "hexcasting:div",
"anchor": "hexcasting:div",
"input": "num/vec, num/vec",
"output": "num/vec",
"input": "num|vec, num|vec",
"output": "num|vec",
"text": "hexcasting.page.math.div.1"
},
{
@ -65,7 +65,7 @@
"type": "hexcasting:pattern",
"op_id": "hexcasting:abs",
"anchor": "hexcasting:abs",
"input": "num/vec",
"input": "num|vec",
"output": "number",
"text": "hexcasting.page.math.abs.1"
},
@ -77,8 +77,8 @@
"type": "hexcasting:pattern",
"op_id": "hexcasting:pow",
"anchor": "hexcasting:pow",
"input": "num/vec, num/vec",
"output": "num/vec",
"input": "num|vec, num|vec",
"output": "num|vec",
"text": "hexcasting.page.math.pow.1"
},
{
@ -89,16 +89,16 @@
"type": "hexcasting:pattern",
"op_id": "hexcasting:floor",
"anchor": "hexcasting:floor",
"input": "num/vec",
"output": "num/vec",
"input": "num|vec",
"output": "num|vec",
"text": "hexcasting.page.math.floor"
},
{
"type": "hexcasting:pattern",
"op_id": "hexcasting:ceil",
"anchor": "hexcasting:ceil",
"input": "num/vec",
"output": "num/vec",
"input": "num|vec",
"output": "num|vec",
"text": "hexcasting.page.math.ceil"
},
{
@ -121,16 +121,16 @@
"type": "hexcasting:pattern",
"op_id": "hexcasting:modulo",
"anchor": "hexcasting:modulo",
"input": "num/vec, num/vec",
"output": "num/vec",
"input": "num|vec, num|vec",
"output": "num|vec",
"text": "hexcasting.page.math.modulo"
},
{
"type": "hexcasting:pattern",
"op_id": "hexcasting:coerce_axial",
"anchor": "hexcasting:coerce_axial",
"input": "vec/num",
"output": "vec/num",
"input": "vec|num",
"output": "vec|num",
"text": "hexcasting.page.math.coerce_axial"
},
{

12
Common/src/main/resources/data/hexcasting/patchouli_books/thehexbook/en_us/entries/patterns/sets.json
View file

@ -17,8 +17,8 @@
"type": "hexcasting:pattern",
"op_id": "hexcasting:or",
"anchor": "hexcasting:or",
"input": "num, num/list, list",
"output": "num/list",
"input": "(num, num)|(list, list)",
"output": "num|list",
"text": "hexcasting.page.sets.or.1"
},
{
@ -29,8 +29,8 @@
"type": "hexcasting:pattern",
"op_id": "hexcasting:and",
"anchor": "hexcasting:and",
"input": "num, num/list, list",
"output": "num/list",
"input": "(num, num)|(list, list)",
"output": "num|list",
"text": "hexcasting.page.sets.and.1"
},
{
@ -41,8 +41,8 @@
"type": "hexcasting:pattern",
"op_id": "hexcasting:xor",
"anchor": "hexcasting:xor",
"input": "num, num/list, list",
"output": "num/list",
"input": "(num, num)|(list, list)",
"output": "num|list",
"text": "hexcasting.page.sets.xor.1"
},
{

6
Common/src/main/resources/data/hexcasting/patchouli_books/thehexbook/en_us/entries/patterns/spells/hexcasting.json
View file

@ -14,7 +14,7 @@
"type": "hexcasting:pattern",
"op_id": "hexcasting:craft/cypher",
"anchor": "hexcasting:craft/cypher",
"input": "entity, list of patterns",
"input": "entity, [pattern]",
"output": "",
"text": "hexcasting.page.hexcasting_spell.craft/cypher"
},
@ -22,7 +22,7 @@
"type": "hexcasting:pattern",
"op_id": "hexcasting:craft/trinket",
"anchor": "hexcasting:craft/trinket",
"input": "entity, list of patterns",
"input": "entity, [pattern]",
"output": "",
"text": "hexcasting.page.hexcasting_spell.craft/trinket",
"hex_size": 8
@ -31,7 +31,7 @@
"type": "hexcasting:pattern",
"op_id": "hexcasting:craft/artifact",
"anchor": "hexcasting:craft/artifact",
"input": "entity, list of patterns",
"input": "entity, [pattern]",
"output": "",
"text": "hexcasting.page.hexcasting_spell.craft/artifact",
"hex_size": 5