diff --git a/src/main/resources/data/spectrum/advancements/unlocks/blocks/modular_explosives.json b/src/main/resources/data/spectrum/advancements/unlocks/blocks/modular_explosives.json index 36ac51bde0..b0b3ecbee0 100644 --- a/src/main/resources/data/spectrum/advancements/unlocks/blocks/modular_explosives.json +++ b/src/main/resources/data/spectrum/advancements/unlocks/blocks/modular_explosives.json @@ -1,9 +1,9 @@ { "criteria": { - "collected_stratine_gem": { + "collected_stratine": { "trigger": "revelationary:advancement_gotten", "conditions": { - "advancement_identifier": "spectrum:hidden/collect_stratine_gem" + "advancement_identifier": "spectrum:midgame/collect_stratine" } }, "collected_midnight_chip": { diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/equipment/modular_explosives.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/equipment/modular_explosives.json new file mode 100644 index 0000000000..09914fc0cc --- /dev/null +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/equipment/modular_explosives.json @@ -0,0 +1,67 @@ +{ + "name": "book.spectrum.guidebook.modular_explosives.name", + "condition": { + "type": "modonomicon:advancement", + "advancement_id": "spectrum:unlocks/blocks/modular_explosives" + }, + "icon": "spectrum:parametric_mining_device", + "category": "spectrum:equipment", + "hide_while_locked": true, + "parents": [], + "background_u_index": 0, + "background_v_index": 0, + "x": 3, + "y": 6, + "pages": [ + { + "type": "modonomicon:text", + "title": "book.spectrum.guidebook.modular_explosives.name", + "text": "book.spectrum.guidebook.modular_explosives.page0.text" + }, + { + "type": "modonomicon:text", + "title": "book.spectrum.guidebook.modular_explosives.page1.title", + "text": "book.spectrum.guidebook.modular_explosives.page1.text" + }, + { + "type": "spectrum:pedestal_crafting", + "text": "book.spectrum.guidebook.modular_explosives.page2.text", + "recipe_id": "spectrum:pedestal/tier3/boom/threat_conflux" + }, + { + "type": "spectrum:pedestal_crafting", + "text": "book.spectrum.guidebook.modular_explosives.page3.text", + "recipe_id": "spectrum:pedestal/tier3/boom/parametric_mining_device" + }, + { + "type": "modonomicon:text", + "title": "book.spectrum.guidebook.modular_explosives.page4.title", + "text": "book.spectrum.guidebook.modular_explosives.page4.text" + }, + { + "type": "modonomicon:text", + "title": "book.spectrum.guidebook.modular_explosives.page5.title", + "text": "book.spectrum.guidebook.modular_explosives.page5.text" + }, + { + "type": "modonomicon:text", + "title": "book.spectrum.guidebook.modular_explosives.page6.title", + "text": "book.spectrum.guidebook.modular_explosives.page6.text" + }, + { + "type": "modonomicon:text", + "title": "book.spectrum.guidebook.modular_explosives.page7.title", + "text": "book.spectrum.guidebook.modular_explosives.page7.text" + }, + { + "type": "modonomicon:text", + "title": "book.spectrum.guidebook.modular_explosives.page8.title", + "text": "book.spectrum.guidebook.modular_explosives.page8.text" + }, + { + "type": "modonomicon:text", + "title": "book.spectrum.guidebook.modular_explosives.page9.title", + "text": "book.spectrum.guidebook.modular_explosives.page9.text" + } + ] +} diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/equipment/perturbed_eye.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/equipment/perturbed_eye.json index de5c69ab70..5a66d35286 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/equipment/perturbed_eye.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/equipment/perturbed_eye.json @@ -10,8 +10,8 @@ "parents": [], "background_u_index": 0, "background_v_index": 0, - "x": 3, - "y": 6, + "x": 2, + "y": 4, "pages": [ { "type": "modonomicon:text", diff --git a/src/main/resources/data/spectrum/recipes/pedestal/tier3/boom/parametric_mining_device.json b/src/main/resources/data/spectrum/recipes/pedestal/tier3/boom/parametric_mining_device.json index ff881980ec..b8e73ecaa0 100644 --- a/src/main/resources/data/spectrum/recipes/pedestal/tier3/boom/parametric_mining_device.json +++ b/src/main/resources/data/spectrum/recipes/pedestal/tier3/boom/parametric_mining_device.json @@ -9,9 +9,9 @@ "black": 1, "experience": 1.0, "pattern": [ - "MGM", - "GSG", - "MGM" + "SGS", + "GMG", + "SGS" ], "key": { "M": { @@ -21,7 +21,7 @@ "item": "minecraft:gunpowder" }, "S": { - "item": "spectrum:stratine_gem" + "item": "spectrum:stratine_fragments" } }, "result": { diff --git a/src/main/resources/data/spectrum/recipes/pedestal/tier3/boom/threat_conflux.json b/src/main/resources/data/spectrum/recipes/pedestal/tier3/boom/threat_conflux.json index 5f6fd1bffb..745c4a4a87 100644 --- a/src/main/resources/data/spectrum/recipes/pedestal/tier3/boom/threat_conflux.json +++ b/src/main/resources/data/spectrum/recipes/pedestal/tier3/boom/threat_conflux.json @@ -9,9 +9,9 @@ "black": 1, "experience": 1.0, "pattern": [ - " M ", - "MGM", - "GSG" + " S ", + "SGS", + "GMG" ], "key": { "M": { @@ -21,7 +21,7 @@ "item": "minecraft:gunpowder" }, "S": { - "item": "spectrum:stratine_gem" + "item": "spectrum:stratine_fragments" } }, "result": {