From a2a59d3231730b9e625b9a0c3a1fcf58d5b6a938 Mon Sep 17 00:00:00 2001 From: object-Object Date: Mon, 3 Feb 2025 14:18:53 -0500 Subject: [PATCH 1/3] Remove The Media Cube category; move The Media Cube entry into Items and make it secret --- .../resources/assets/hexcasting/lang/en_us.flatten.json5 | 6 +----- .../thehexbook/en_us/categories/creative_unlocker.json | 7 ------- .../media_cube.json => items/creative_unlocker.json} | 8 ++++---- 3 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/categories/creative_unlocker.json rename Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/{creative_unlocker/media_cube.json => items/creative_unlocker.json} (76%) diff --git a/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 b/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 index 9e82f1cfd9..f8f479170e 100644 --- a/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 +++ b/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 @@ -1128,16 +1128,12 @@ It's probably just the ramblings of extinct traditionalists, though -- a pattern's a pattern.$(br2)\ What could possibly go wrong?", }, - creative_unlocker: { - "": "The Media Cube", - desc: "I have found a source of near limitless power, The Media Cube.", - } }, // ^ categories entry: { media: "Media", - media_cube: "The Media Cube", + creative_unlocker: "The Media Cube", geodes: "Geodes", couldnt_cast: "A Frustration", start_to_see: "WHAT DID I SEE", diff --git a/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/categories/creative_unlocker.json b/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/categories/creative_unlocker.json deleted file mode 100644 index bfb372c2c2..0000000000 --- a/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/categories/creative_unlocker.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "hexcasting.category.creative_unlocker", - "icon": "hexcasting:creative_unlocker", - "description": "hexcasting.category.creative_unlocker.desc", - "sortnum": 99, - "secret": true -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/creative_unlocker/media_cube.json b/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/items/creative_unlocker.json similarity index 76% rename from Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/creative_unlocker/media_cube.json rename to Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/items/creative_unlocker.json index fc8e245733..441fe924be 100644 --- a/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/creative_unlocker/media_cube.json +++ b/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/items/creative_unlocker.json @@ -1,10 +1,10 @@ { - "name": "hexcasting.entry.media_cube", + "name": "hexcasting.entry.creative_unlocker", "icon": "hexcasting:creative_unlocker", - "category": "hexcasting:creative_unlocker", - "sortnum": 0, - "priority": true, + "category": "hexcasting:items", + "sortnum": 99, "advancement": "hexcasting:creative_unlocker", + "secret": true, "pages": [ { "type": "patchouli:text", From 222113b2753b601c26a2970d21b47072b4323695 Mon Sep 17 00:00:00 2001 From: object-Object Date: Mon, 3 Feb 2025 16:38:01 -0500 Subject: [PATCH 2/3] Tag hexcasting:creative_unlocker advancement as spoilered so the media cube entry is blurred in hexdoc --- doc/resources/data/hexdoc/tags/advancements/spoilered.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/resources/data/hexdoc/tags/advancements/spoilered.json b/doc/resources/data/hexdoc/tags/advancements/spoilered.json index 7c3cdddc8a..b2845dfeca 100644 --- a/doc/resources/data/hexdoc/tags/advancements/spoilered.json +++ b/doc/resources/data/hexdoc/tags/advancements/spoilered.json @@ -4,6 +4,7 @@ "hexcasting:opened_eyes", "hexcasting:y_u_no_cast_angy", "hexcasting:enlightenment", - "hexcasting:lore/*" + "hexcasting:lore/*", + "hexcasting:creative_unlocker" ] } \ No newline at end of file From 580a86757afe1588eb5ea7eb093bd2a439cd20a7 Mon Sep 17 00:00:00 2001 From: object-Object Date: Mon, 3 Feb 2025 17:29:52 -0500 Subject: [PATCH 3/3] Rename media cube entry to creative items and add spotlights --- .../hexcasting/lang/en_us.flatten.json5 | 16 ++++++---- .../en_us/entries/items/creative_items.json | 30 +++++++++++++++++++ .../entries/items/creative_unlocker.json | 22 -------------- 3 files changed, 41 insertions(+), 27 deletions(-) create mode 100644 Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/items/creative_items.json delete mode 100644 Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/items/creative_unlocker.json diff --git a/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 b/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 index f8f479170e..68ebbbd5d8 100644 --- a/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 +++ b/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 @@ -1133,7 +1133,7 @@ entry: { media: "Media", - creative_unlocker: "The Media Cube", + creative_items: "Creative-Only Items", geodes: "Geodes", couldnt_cast: "A Frustration", start_to_see: "WHAT DID I SEE", @@ -1232,12 +1232,18 @@ // ^ entries page: { - creative_unlocker: { - "1": "The $(#74b3f2)Media Cube/$ is a near-limitless source of power, acting as an infinite source of _media for whatever _Hexes I wish to cast. It also looks quite tasty. Eating it might perhaps reveal more about the world, possibly delving into spoiler territory...", + creative_items: { + "1": "I have invented some fanciful items that can only be acquired through $(italic)creative/$ means.", + creative_unlocker: "The $(#74b3f2)Media Cube/$ is a near-limitless source of power, acting as an infinite source of _media for whatever _Hexes I wish to cast. It also looks quite tasty. Eating it might perhaps reveal more about the world, possibly delving into spoiler territory...", "2": "Additionally, it seems that by renaming a $(#74b3f2)Media Cube/$ at an Anvil, I should be able to utilize it to test and understand more about my _Hexes. If I have somehow acquired Creative power over the world, I might wish to turn that off before attempting any of the following.", - "3": "By renaming the $(#74b3f2)Media Cube/$ to 'debug media', I will be given feedback in the chat window about the amount of media consumed.", + debug_media: { + // do not localize 'debug media' in the title or description, the item must be named exactly that + // TODO: we can remove the title if hexdoc-dev/hexdoc#85 is implemented, since the title in Patchouli already defaults to the item name + title: "debug media", + desc: "By renaming the $(#74b3f2)Media Cube/$ to 'debug media', I will be given feedback in the chat window about the amount of media consumed.", + }, // NOTE: The following feature documented is broken in the current implementation. It should be uncommented and the page in patchouli should be updated when the feature is fixed. - //"4": "By renaming the $(#74b3f2)Media Cube/$ to 'debug patterns', I will be given feedback in the chat window about the order patterns are ran." + //debug_patterns: "By renaming the $(#74b3f2)Media Cube/$ to 'debug patterns', I will be given feedback in the chat window about the order patterns are ran." }, media: { "1": "_Media is a form of mental energy external to a mind. All living creatures generate trace amounts of _media when thinking about anything; after the thought is finished, the media is released into the environment.$(br2)The art of casting _Hexes is all about manipulating _media to do your bidding.", diff --git a/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/items/creative_items.json b/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/items/creative_items.json new file mode 100644 index 0000000000..31ba2000c5 --- /dev/null +++ b/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/items/creative_items.json @@ -0,0 +1,30 @@ +{ + "name": "hexcasting.entry.creative_items", + "icon": "hexcasting:creative_unlocker", + "category": "hexcasting:items", + "sortnum": 99, + "advancement": "hexcasting:creative_unlocker", + "secret": true, + "pages": [ + { + "type": "patchouli:text", + "text": "hexcasting.page.creative_items.1" + }, + { + "type": "patchouli:spotlight", + "text": "hexcasting.page.creative_items.creative_unlocker", + "item": "hexcasting:creative_unlocker", + "link_recipe": true + }, + { + "type": "patchouli:text", + "text": "hexcasting.page.creative_items.2" + }, + { + "type": "patchouli:spotlight", + "title": "hexcasting.page.creative_items.debug_media.title", + "text": "hexcasting.page.creative_items.debug_media.desc", + "item": "hexcasting:creative_unlocker{display:{Name:'{\\\"text\\\":\\\"debug media\\\"}'}}" + } + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/items/creative_unlocker.json b/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/items/creative_unlocker.json deleted file mode 100644 index 441fe924be..0000000000 --- a/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/items/creative_unlocker.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "hexcasting.entry.creative_unlocker", - "icon": "hexcasting:creative_unlocker", - "category": "hexcasting:items", - "sortnum": 99, - "advancement": "hexcasting:creative_unlocker", - "secret": true, - "pages": [ - { - "type": "patchouli:text", - "text": "hexcasting.page.creative_unlocker.1" - }, - { - "type": "patchouli:text", - "text": "hexcasting.page.creative_unlocker.2" - }, - { - "type": "patchouli:text", - "text": "hexcasting.page.creative_unlocker.3" - } - ] -} \ No newline at end of file