Book improvements for 0.11.4

CHANGELOG.md

@@ -30,8 +30,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 - Changed Wayfarer's Flight and Anchorite's Flight to both cost 2 dust per unit, and enforced a minimum cost for Anchorite's Flight ([#1040](https://github.com/FallingColors/HexMod/pull/1040)) @Robotgiggle
 - Changed the pattern limit to also include execution of non-pattern iotas like jumps ([#1035](https://github.com/FallingColors/HexMod/pull/1035)) @pythonmcpi
 - Changed the Hasty Retrospection mishap to Absent Introspection as it's now used for anything that only works while parenthesized ([#1047](https://github.com/FallingColors/HexMod/pull/1047)) @Robotgiggle
+- Updated and reorganized various entries in the guidebook to improve clarity ([#1199](https://github.com/FallingColors/HexMod/pull/1199)) @Robotgiggle
+  - Added a new entry defining what a Hex actually is and how it can be represented on the stack
+  - Changed "A Primer on Vectors" to provide its own information rather than linking to Psi's guide
+  - Reordered "Escaping Patterns" to account for the newly added Contemplation pattern
+  - Removed "Influences" and moved relevant info into "Hex Casting 101"
+- Updated the Flay Mind recipe display in EMI and JEI to cycle through all valid entities if the input is an entity tag ([#1023](https://github.com/FallingColors/HexMod/pull/1023)) @YukkuriC
 - All custom recipe displays now work with both EMI and JEI on all platforms, rather than only EMI on Fabric and only JEI on Forge ([#1206](https://github.com/FallingColors/HexMod/pull/1206)) @Robotgiggle
-- Updated the Flay Mind recipe display to cycle through all valid entities if the input is an entity tag ([#1023](https://github.com/FallingColors/HexMod/pull/1023)) @YukkuriC
 - Re-implemented the ability to extract stored media from items in trinket/curio slots ([#996](https://github.com/FallingColors/HexMod/pull/996)) @YukkuriC
 - Patterns involving entity look direction now compensate for the vanilla bug that causes projectiles and phantoms to report the wrong direction ([#1025](https://github.com/FallingColors/HexMod/pull/1025)) @Robotgiggle
 - Edified Panels are now crafted with 9 planks rather than 8 to avoid conflicting with the vanilla chest recipe ([#1080](https://github.com/FallingColors/HexMod/pull/1080)) @Robotgiggle

Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/casting/vectors.json

@@ -7,20 +7,50 @@
   "advancement": "hexcasting:root",
   "pages": [
     {
-      "type": "patchouli:link",
-      "text": "hexcasting.page.vectors.1",
-      "link_text": "hexcasting.page.vectors.1.link_text",
-      "url": "https://www.youtube.com/watch?v=fNk_zzaMoSs"
+      "type": "patchouli:text",
+      "text": "hexcasting.page.vectors.1"
     },
     {
       "type": "patchouli:text",
       "text": "hexcasting.page.vectors.2"
     },
+    {
+      "type": "patchouli:text",
+      "text": "hexcasting.page.vectors.3"
+    },
+    {
+      "type": "patchouli:text",
+      "text": "hexcasting.page.vectors.4"
+    },
+    {
+      "type": "patchouli:text",
+      "text": "hexcasting.page.vectors.5"
+    },
+    {
+      "type": "patchouli:text",
+      "text": "hexcasting.page.vectors.6"
+    },
+    {
+      "type": "patchouli:text",
+      "text": "hexcasting.page.vectors.7"
+    },
+    {
+      "type": "patchouli:text",
+      "text": "hexcasting.page.vectors.8"
+    },
+    {
+      "type": "patchouli:text",
+      "text": "hexcasting.page.vectors.9"
+    },
+    {
+      "type": "patchouli:text",
+      "text": "hexcasting.page.vectors.10"
+    },
     {
       "type": "patchouli:link",
-      "text": "hexcasting.page.vectors.3",
-      "link_text": "hexcasting.page.vectors.3.link_text",
-      "url": "https://psi.vazkii.net/codex.php#vectorPrimer"
+      "text": "hexcasting.page.vectors.11",
+      "link_text": "hexcasting.page.vectors.11.link_text",
+      "url": "https://www.youtube.com/watch?v=fNk_zzaMoSs"
     }
   ]
 }

Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/casting/influences.json → Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/casting/whats_a_hex.json

@@ -1,21 +1,21 @@
 {
-  "name": "hexcasting.entry.influences",
+  "name": "hexcasting.entry.whats_a_hex",
   "category": "hexcasting:casting",
-  "icon": "minecraft:spyglass",
+  "icon": "hexcasting:focus",
   "sortnum": 2,
   "advancement": "hexcasting:root",
   "pages": [
     {
       "type": "patchouli:text",
-      "text": "hexcasting.page.influences.1"
+      "text": "hexcasting.page.whats_a_hex.1"
     },
     {
       "type": "patchouli:text",
-      "text": "hexcasting.page.influences.2"
+      "text": "hexcasting.page.whats_a_hex.2"
     },
     {
       "type": "patchouli:text",
-      "text": "hexcasting.page.influences.3"
+      "text": "hexcasting.page.whats_a_hex.3"
     }
   ]
-}
+}

Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/patterns/meta.json

@@ -10,7 +10,7 @@
       "type": "hexcasting:pattern",
       "op_id": "hexcasting:eval",
       "anchor": "hexcasting:eval",
-      "input": "[pattern] | pattern",
+      "input": "evaluatable",
       "output": "many",
       "text": "hexcasting.page.meta.eval.1"
     },
@@ -22,7 +22,7 @@
       "type": "hexcasting:pattern",
       "op_id": "hexcasting:eval/cc",
       "anchor": "hexcasting:eval/cc",
-      "input": "[pattern] | pattern",
+      "input": "evaluatable",
       "output": "many",
       "text": "hexcasting.page.meta.eval/cc.1"
     },
@@ -34,7 +34,7 @@
       "type": "hexcasting:pattern",
       "op_id": "hexcasting:for_each",
       "anchor": "hexcasting:for_each",
-      "input": "list of patterns, list",
+      "input": "evaluatable, list",
       "output": "list",
       "text": "hexcasting.page.meta.for_each.1"
     },

Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/patterns/patterns_as_iotas.json

@@ -14,6 +14,16 @@
       "type": "patchouli:text",
       "text": "hexcasting.page.patterns_as_iotas.2"
     },
+    {
+      "type": "hexcasting:pattern",
+      "op_id": "hexcasting:runtime_escape",
+      "anchor": "hexcasting:runtime_escape",
+      "text": "hexcasting.page.patterns_as_iotas.runtime_escape.1"
+    },
+    {
+      "type": "patchouli:text",
+      "text": "hexcasting.page.patterns_as_iotas.runtime_escape.2"
+    },
     {
       "type": "hexcasting:pattern",
       "op_id": "hexcasting:open_paren",
@@ -28,25 +38,15 @@
     },
     {
       "type": "hexcasting:pattern",
-      "op_id": "hexcasting:runtime_escape",
-      "anchor": "hexcasting:runtime_escape",
-      "text": "hexcasting.page.patterns_as_iotas.escape.1"
+      "op_id": "hexcasting:undo",
+      "anchor": "hexcasting:undo",
+      "text": "hexcasting.page.patterns_as_iotas.undo"
     },
     {
       "type": "hexcasting:pattern",
       "op_id": "hexcasting:escape",
       "anchor": "hexcasting:escape",
-      "text": "hexcasting.page.patterns_as_iotas.escape.2"
-    },
-    {
-      "type": "patchouli:text",
-      "text": "hexcasting.page.patterns_as_iotas.escape.3"
-    },
-    {
-      "type": "hexcasting:pattern",
-      "op_id": "hexcasting:undo",
-      "anchor": "hexcasting:undo",
-      "text": "hexcasting.page.patterns_as_iotas.undo"
+      "text": "hexcasting.page.patterns_as_iotas.escape"
     },
     {
       "type": "patchouli:text",
@@ -55,6 +55,7 @@
     },
     {
       "type": "patchouli:text",
+      "anchor": "embedding",
       "text": "hexcasting.page.patterns_as_iotas.further_notes.2"
     },
     {

Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/patterns/spells/hexcasting.json

@@ -14,15 +14,15 @@
       "type": "hexcasting:pattern",
       "op_id": "hexcasting:craft/cypher",
       "anchor": "hexcasting:craft/cypher",
-      "input": "entity, [pattern]",
+      "input": "entity, list",
       "output": "",
       "text": "hexcasting.page.hexcasting_spell.craft/cypher"
     },
     {
       "type": "hexcasting:pattern",
       "op_id": "hexcasting:craft/trinket",
       "anchor": "hexcasting:craft/trinket",
-      "input": "entity, [pattern]",
+      "input": "entity, list",
       "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, [pattern]",
+      "input": "entity, list",
       "output": "",
       "text": "hexcasting.page.hexcasting_spell.craft/artifact",
       "hex_size": 5