From 1478898e9747004e4cb8749cf8fec89757e3146f Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Wed, 23 Mar 2022 22:49:00 -0400 Subject: [PATCH] quest updates, BG and Schematicanon patterns, final recipes, hide stuff! --- .../masterful_machinery/wicked_altar.json | 78 ++++++++++++++++++ .../quests/chapters/blood_magic_wip.snbt | 13 --- .../ftbquests/quests/chapters/gates_wip.snbt | 2 + .../quests/chapters/hidden_quests.snbt | 2 +- kubejs/client_scripts/constants.js | 6 +- .../recipetypes/bloodmagic/soulforge.js | 28 +++++++ .../recipetypes/masterful_machinery/shaped.js | 43 ++++++++++ .../masterful_machinery/wicked_altar.js | 4 +- schematics/MM_wicked_altar.nbt | Bin 0 -> 746 bytes 9 files changed, 159 insertions(+), 17 deletions(-) create mode 100644 building_gadgets_patterns/masterful_machinery/wicked_altar.json create mode 100644 schematics/MM_wicked_altar.nbt diff --git a/building_gadgets_patterns/masterful_machinery/wicked_altar.json b/building_gadgets_patterns/masterful_machinery/wicked_altar.json new file mode 100644 index 0000000000..d91100ba97 --- /dev/null +++ b/building_gadgets_patterns/masterful_machinery/wicked_altar.json @@ -0,0 +1,78 @@ +{ + "header": { + "version": "2.1.0", + "mc_version": "1.16.5", + "name": "Wicked Altar", + "author": "Enigmatica", + "bounding_box": { + "min_x": 0, + "min_y": 0, + "min_z": 0, + "max_x": 6, + "max_y": 3, + "max_z": 6 + }, + "material_list": { + "root_type": "buildinggadgets:entries", + "root_entry": [ + { + "item_type": "buildinggadgets:simple_item", + "count": 34, + "item": { + "id": "eidolon:polished_planks" + } + }, + { + "item_type": "buildinggadgets:simple_item", + "count": 6, + "item": { + "id": "eidolon:stone_altar" + } + }, + { + "item_type": "buildinggadgets:simple_item", + "count": 1, + "item": { + "id": "eidolon:unholy_effigy" + } + }, + { + "item_type": "buildinggadgets:simple_item", + "count": 16, + "item": { + "id": "ars_nouveau:warding_stone" + } + }, + { + "item_type": "buildinggadgets:simple_item", + "count": 1, + "item": { + "id": "masterfulmachinery:wicked_altar_controller" + } + }, + { + "item_type": "buildinggadgets:simple_item", + "count": 1, + "item": { + "id": "masterfulmachinery:wicked_altar_fluid_port_fluids_input" + } + }, + { + "item_type": "buildinggadgets:simple_item", + "count": 1, + "item": { + "id": "masterfulmachinery:wicked_altar_item_port_items_input" + } + }, + { + "item_type": "buildinggadgets:simple_item", + "count": 1, + "item": { + "id": "masterfulmachinery:wicked_altar_item_port_items_output" + } + } + ] + } + }, + "body": "H4sIAAAAAAAAAM2VTY/TMBCGJ7Ed2myhSAghbnvmDkiVOPADQHtAYtlL5G2c1lrHrmyHbvfX449puwekbVGptqr6Th37mcn4jVMDjIG23PMaAF7XOQYCtRNWciUfhA0XoAbmPPeihvrKmpWwXgo3gqrjc6kXwLSxfgkjoN95L+A9t67RZvgt+DBbc9uGOY3zRotI+rcUVHDnT5NhC3knZGuU0bOVUdItRdusFNd37gjE5z5UJWw3qJ7Pl1ILu5mt5fwusLjy3DadGmTghvbk0DVSrwZ/fB8u1mHMKrNYiBaot0OooVzd70J9D6zjyqXhh/3wAw7vWvdme9epXbnM05Wzq0HvSztDOTuXrMWpXHJQhg9P7f/caG+NUuKQm9pSPz1FlV702VQxco0Z/JlNlcJn46lzVfP3w+jtNt+gl0ZtGtF1crE5Yr8/Hrvf5zlD9n1/Fvv9v8vZvcxceJwOe5mNgayMo4H5JYJLyB+SfgugkEfLIitBpQXgjPxlSUsoiqwlKkGlqCwpQkNYJU1hGbMWRf5fohJUispQq6QUyjIqA5K0wtJfxHoI8gnyg44inyCfIJ8gnyCfIJ/E5gQ+ie0mSS+gJFFTHop8ivygk8inyKfIp8inyKfID/oy8oO+ivyg09gcFpUlTf1kyGPIY8hjyEvz881PsbhphFW4rsJ1Fa6raqiWgrfCBsPw4BNjYfJt8OKHFJ0K1gjXb82gW0eA9lL/yk2N4fU25Pc3IapyGCeQHF5vR6W+SZscLKijBSc/02Fw+TUZe/zYz6Nko8vbQapozAVvF8K7WTv0/aZ5ZPs/u6gqOekJAAA\u003d" +} diff --git a/config/ftbquests/quests/chapters/blood_magic_wip.snbt b/config/ftbquests/quests/chapters/blood_magic_wip.snbt index 76a0031304..ea98df8d4a 100644 --- a/config/ftbquests/quests/chapters/blood_magic_wip.snbt +++ b/config/ftbquests/quests/chapters/blood_magic_wip.snbt @@ -943,19 +943,6 @@ item: "bloodmagic:itemrouterfilterexact" count: 2 } - { - id: "24C9A479B52447B3" - type: "item" - item: { - id: "bloodmagic:noderouter" - Count: 1b - tag: { - zCoord: 0 - yCoord: 0 - xCoord: 0 - } - } - } ] } { diff --git a/config/ftbquests/quests/chapters/gates_wip.snbt b/config/ftbquests/quests/chapters/gates_wip.snbt index a224f3db12..86d239d461 100644 --- a/config/ftbquests/quests/chapters/gates_wip.snbt +++ b/config/ftbquests/quests/chapters/gates_wip.snbt @@ -24,6 +24,8 @@ "" "" "Please note that mods are rarely \"strictly\" gated - Some of their items will be obtainable prior to the Gate being unlocked, and not all things will be immediately obtainable once the Gate is unlocked." + "" + "Also, while efforts have been made to alter manuals where possible, in some cases they’ll still show invalid recipes. Always refer to JEI as the primary source when it comes to crafting information. " ] dependencies: ["0000000000000FEB"] hide: true diff --git a/config/ftbquests/quests/chapters/hidden_quests.snbt b/config/ftbquests/quests/chapters/hidden_quests.snbt index 55a4f5fab8..a1204c2dc2 100644 --- a/config/ftbquests/quests/chapters/hidden_quests.snbt +++ b/config/ftbquests/quests/chapters/hidden_quests.snbt @@ -112,7 +112,7 @@ rewards: [{ id: "6D36A253466E98C9" type: "gamestage" - title: "Hellfire Forge" + title: "Lesser Tartaric Gem" auto: "invisible" stage: "lesser_tartaric_gem" }] diff --git a/kubejs/client_scripts/constants.js b/kubejs/client_scripts/constants.js index 17124e867e..202a70055a 100644 --- a/kubejs/client_scripts/constants.js +++ b/kubejs/client_scripts/constants.js @@ -220,6 +220,7 @@ const itemsToHide = [ 'masterfulmachinery:industrial_deuterium_plant_energy_port_energy_output', 'masterfulmachinery:industrial_deuterium_plant_spinny_port_create_rotation_output', 'masterfulmachinery:industrial_deuterium_plant_pressure_port_pncr_pressure_output', + 'masterfulmachinery:wicked_altar_fluid_port_fluids_output', 'mctb:cherry_crafting_table', 'mctb:dead_crafting_table', @@ -584,7 +585,10 @@ const recipesToHide = [ 'bloodmagic:soulforge/sentientpickaxe', 'bloodmagic:soulforge/sentientshovel', 'bloodmagic:soulforge/sentientscythe', - 'bloodmagic:soulforge/node_router' + 'bloodmagic:soulforge/node_router', + 'bloodmagic:soulforge/routing_node', + 'bloodmagic:soulforge/output_routing_node', + 'bloodmagic:soulforge/input_routing_node' ] } ]; diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/bloodmagic/soulforge.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/bloodmagic/soulforge.js index 92e1eaa5c8..2ec5dd64a6 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/bloodmagic/soulforge.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/bloodmagic/soulforge.js @@ -154,6 +154,34 @@ onEvent('recipes', (event) => { minimumDrain: 0.0, drain: 0.0, id: 'bloodmagic:soulforge/node_router' + }, + { + inputs: ['kubejs:altered_recipe_indicator'], + output: Item.of('bloodmagic:itemroutingnode'), + minimumDrain: 0.0, + drain: 0.0, + id: 'bloodmagic:soulforge/routing_node' + }, + { + inputs: ['kubejs:altered_recipe_indicator'], + output: Item.of('bloodmagic:outputroutingnode'), + minimumDrain: 0.0, + drain: 0.0, + id: 'bloodmagic:soulforge/output_routing_node' + }, + { + inputs: ['kubejs:altered_recipe_indicator'], + output: Item.of('bloodmagic:inputroutingnode'), + minimumDrain: 0.0, + drain: 0.0, + id: 'bloodmagic:soulforge/input_routing_node' + }, + { + inputs: ['kubejs:altered_recipe_indicator'], + output: Item.of('bloodmagic:masterroutingnode'), + minimumDrain: 0.0, + drain: 0.0, + id: 'bloodmagic:soulforge/master_routing_node' } ] }; diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/masterful_machinery/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/masterful_machinery/shaped.js index 03b28aeeef..7835f66c99 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/masterful_machinery/shaped.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/masterful_machinery/shaped.js @@ -317,6 +317,49 @@ onEvent('recipes', (event) => { D: '#botania:runes/mana' }, id: `${id_prefix}enigmatic_tree_of_life_mana_port_botania_mana_input` + }, + { + output: 'masterfulmachinery:wicked_altar_controller', + pattern: ['ABA', 'BCB', 'ABA'], + key: { + A: 'eidolon:polished_wood_pillar', + B: 'bloodmagic:blankslate', + C: 'minecraft:conduit' + }, + id: `${id_prefix}wicked_altar_controller` + }, + { + output: 'masterfulmachinery:wicked_altar_item_port_items_output', + pattern: ['ABA', 'BCB', 'ADA'], + key: { + A: 'eidolon:polished_wood_pillar', + B: '#forge:ingots/silicon_bronze', + C: 'ironchest:silver_chest', + D: 'atum:linen_red' + }, + id: `${id_prefix}wicked_altar_item_port_items_output` + }, + { + output: 'masterfulmachinery:wicked_altar_item_port_items_input', + pattern: ['ABA', 'BCB', 'ADA'], + key: { + A: 'eidolon:polished_wood_pillar', + B: '#forge:ingots/silicon_bronze', + C: 'ironchest:silver_chest', + D: 'atum:linen_lime' + }, + id: `${id_prefix}wicked_altar_item_port_items_input` + }, + { + output: 'masterfulmachinery:wicked_altar_fluid_port_fluids_input', + pattern: ['ABA', 'BCB', 'ADA'], + key: { + A: 'eidolon:polished_wood_pillar', + B: '#forge:ingots/silicon_bronze', + C: 'pneumaticcraft:small_tank', + D: 'atum:linen_lime' + }, + id: `${id_prefix}wicked_altar_fluid_port_fluids_input` } ]; diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/masterful_machinery/wicked_altar.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/masterful_machinery/wicked_altar.js index 714cfd98b5..3430d0467e 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/masterful_machinery/wicked_altar.js +++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/masterful_machinery/wicked_altar.js @@ -276,7 +276,7 @@ onEvent('recipes', (event) => { id: `${id_prefix}itemroutingnode` }, { - outputs: [{ type: 'masterfulmachinery:items', data: { item: 'bloodmagic:inputroutingnode', count: 2 } }], + outputs: [{ type: 'masterfulmachinery:items', data: { item: 'bloodmagic:inputroutingnode', count: 1 } }], inputs: [ { type: 'masterfulmachinery:items', data: { item: 'bloodmagic:itemroutingnode', count: 1 } }, { type: 'masterfulmachinery:items', data: { tag: 'forge:nuggets/lumium', count: 1 } }, @@ -291,7 +291,7 @@ onEvent('recipes', (event) => { id: `${id_prefix}inputroutingnode` }, { - outputs: [{ type: 'masterfulmachinery:items', data: { item: 'bloodmagic:outputroutingnode', count: 2 } }], + outputs: [{ type: 'masterfulmachinery:items', data: { item: 'bloodmagic:outputroutingnode', count: 1 } }], inputs: [ { type: 'masterfulmachinery:items', data: { item: 'bloodmagic:itemroutingnode', count: 1 } }, { type: 'masterfulmachinery:items', data: { tag: 'forge:nuggets/signalum', count: 1 } }, diff --git a/schematics/MM_wicked_altar.nbt b/schematics/MM_wicked_altar.nbt new file mode 100644 index 0000000000000000000000000000000000000000..f2a812d45fe6215cd76735a69897fe96bc166285 GIT binary patch literal 746 zcmVY5LEvCgG+m0@vvW5iKD<-*e8z7>)sE5F2sJ2>`VFk=x_;{|u&FT44n@ z&~7tGE=!eNnPd0m+YCsp3=YCAB0!C0mUknD7}8@VBTVdJCLJ^JXdy#;Oti;DJ454j zkV!msNI)GDP$wR!Lq-^19XimT{W{3_`jZS?)BQTgkN_t3FwkAIzE(WKkN_t3FcaJZ z80ul7j)4Hir-h6!J2JlP$oR5H2jogT%BHVin9bx)f$q3We zIvSX(`&!cxrmr;{VftFf?nC6IodT)M0?sZ}BlC~O>L#;|=2M774xcJ!EZ0R-RxDcz z$@O}^64@2cQ&w80(@aULRatWFN?Z2}zDNu`iux8$I(he3$ZHqsqHIL|i&Y%XDkqd_ zR@gbOYP%+oe6O54yD73Y_VpoSMO!YdmA2bMlL}ckcH|+@Z}6-CoDqosxK}54{(J`X zr{&c)Vdvw^Lq3EXv9-}2nN&4)+(y4auMe^D`A{3aX7p#tY3Cw_X|4ISP>uQ5ZCmA2 zE^<{WIp;+o7VCjYPWFPGIp(NlCAXHh@0oAhO#H1?&2{@8I)$WQnUD*h(%D_QfbnKl zoHK1wshVrfn)!<9+%c)KN^%$}5U;qgPZ&>)yI4;$z*(39MBZaFYgG!fbXTt~nRNHm zp1{e1