From ea9d4ca8e45c5702b316f8fdb18676b51f856b46 Mon Sep 17 00:00:00 2001 From: tracer4b <61507029+tracer4b@users.noreply.github.com> Date: Tue, 9 Jul 2024 18:18:25 +0800 Subject: [PATCH] Add Packaged Draconic (#776) [FEATURE] [QOL] [DETAILS] detail="Makes Automating your Draconic Evolution Fusion Setups Much Easier!" [DETAILS] --------- Co-authored-by: Integer Limit <103940576+IntegerLimit@users.noreply.github.com> --- manifest.json | 5 ++ .../expert/betterquesting/DefaultQuests.json | 30 +-------- .../normal/betterquesting/DefaultQuests.json | 30 +-------- .../config/betterquesting/DefaultQuests.json | 30 +-------- .../saved_quests/ExpertQuests.json | 30 +-------- .../General/Late-Game/draconicFusion.groovy | 66 +++++++++++++++++++ 6 files changed, 83 insertions(+), 108 deletions(-) diff --git a/manifest.json b/manifest.json index 2dfe91f..1b08043 100644 --- a/manifest.json +++ b/manifest.json @@ -719,6 +719,11 @@ "fileID": 5043404, "required": true }, + { + "projectID": 833931, + "fileID": 5299168, + "required": true + }, { "projectID": 845779, "fileID": 5006537, diff --git a/overrides/config-overrides/expert/betterquesting/DefaultQuests.json b/overrides/config-overrides/expert/betterquesting/DefaultQuests.json index cea1b64..b49f47e 100644 --- a/overrides/config-overrides/expert/betterquesting/DefaultQuests.json +++ b/overrides/config-overrides/expert/betterquesting/DefaultQuests.json @@ -49644,13 +49644,13 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "You\u0027re going to craft a LOT of stuff using §bDraconic Evolution §6Fusion§r. Therefore, a way to automate it is crucial.\n\nFirst, place an §6Item Laser Relay§r on each §aInjector§r, one on the §aCore§r, and one on an §aItem Interface§r. You\u0027ll notice that you will need 2 more item lasers than your amount of Injectors.\n\nConnect them all to the Item Interface with your §6Laser Wrench§r. Pretty much, just click on one of the lasers, and click on your Item Interface.\n\n§eOne important thing to note is that lasers appear to be \"placed\" on a particular block but they will interact with all adjacent (non-laser) blocks.§r \n\n§cWarning: be careful not to place a second laser on a laser network adjacent to the network\u0027s Item Interface. This will immediately crash your game because it creates a cycle in the network. You will have to either restore from backup or edit the level.dat directly to remove the block to play again.§r\n\nUse the §6Compass§r to change the Laser on the core\u0027s piority to 1. \n\nFinally, place the §aRedstone Clock§r next to the core. \n\nYou also need to setup some mechanism to take the finished item out of the core. A Phantomface works well here, as it will only output the output item, and not the input item.\n\nImport into the Item Interface. You can use the Extended Processing Pattern Terminal and an Interface with Blocking Mode to do this.", + "desc:8": "You\u0027re going to craft a LOT of stuff using §bDraconic Evolution §6Fusion§r. Therefore, a way to automate it is crucial.\n\nUsing §bPackagedDraconic§r, Draconic Fusion recipes can be easily automated through PackagedAuto. To get started, place a §6Fusion Package Crafter§r next to an §6Unpackager§r and surround it with §6Marked Fusion Crafting Injectors§r like a normal Fusion setup. Then, you can handle recipes through the Unpackager just like any other PAuto setup.", "globalshare:1": 0, "icon:10": { "Count:3": 1, "Damage:2": 0, "OreDict:8": "", - "id:8": "actuallyadditions:block_laser_relay_item" + "id:8": "packageddraconic:fusion_crafter" }, "ignoresview:1": 0, "ismain:1": 0, @@ -49680,34 +49680,10 @@ "partialMatch:1": 1, "requiredItems:9": { "0:10": { - "Count:3": 10, - "Damage:2": 0, - "OreDict:8": "", - "id:8": "actuallyadditions:block_laser_relay_item" - }, - "1:10": { "Count:3": 1, "Damage:2": 0, "OreDict:8": "", - "id:8": "actuallyadditions:block_item_viewer" - }, - "2:10": { - "Count:3": 1, - "Damage:2": 0, - "OreDict:8": "", - "id:8": "actuallyadditions:item_laser_wrench" - }, - "3:10": { - "Count:3": 1, - "Damage:2": 0, - "OreDict:8": "", - "id:8": "minecraft:compass" - }, - "4:10": { - "Count:3": 1, - "Damage:2": 0, - "OreDict:8": "", - "id:8": "extrautils2:redstoneclock" + "id:8": "packageddraconic:fusion_crafter" } }, "taskID:8": "bq_standard:retrieval" diff --git a/overrides/config-overrides/normal/betterquesting/DefaultQuests.json b/overrides/config-overrides/normal/betterquesting/DefaultQuests.json index 7c18ec8..6665bb9 100644 --- a/overrides/config-overrides/normal/betterquesting/DefaultQuests.json +++ b/overrides/config-overrides/normal/betterquesting/DefaultQuests.json @@ -63001,13 +63001,13 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "You\u0027re going to craft a LOT of stuff using §bDraconic Evolution §6Fusion§r. Therefore, a way to automate it is crucial.\n\nFirst, place an §6Item Laser Relay§r on each §aInjector§r, one on the §aCore§r, and one on an §aItem Interface§r. You\u0027ll notice that you will need 2 more item lasers than your amount of Injectors.\n\nConnect them all to the Item Interface with your §6Laser Wrench§r. Pretty much, just click on one of the lasers, and click on your Item Interface.\n\n§eOne important thing to note is that lasers appear to be \"placed\" on a particular block but they will interact with all adjacent (non-laser) blocks.§r \n\n§cWarning: be careful not to place a second laser on a laser network adjacent to the network\u0027s Item Interface. This will immediately crash your game because it creates a cycle in the network. You will have to either restore from backup or edit the level.dat directly to remove the block to play again.§r\n\nUse the §6Compass§r to change the Laser on the core\u0027s piority to 1. \n\nFinally, place the §aRedstone Clock§r next to the core. \n\nYou also need to setup some mechanism to take the finished item out of the core. A Phantomface works well here, as it will only output the output item, and not the input item.\n\nImport into the Item Interface. You can use the Extended Processing Pattern Terminal and an Interface with Blocking Mode to do this.", + "desc:8": "You\u0027re going to craft a LOT of stuff using §bDraconic Evolution §6Fusion§r. Therefore, a way to automate it is crucial.\n\nUsing §bPackagedDraconic§r, Draconic Fusion recipes can be easily automated through PackagedAuto. To get started, place a §6Fusion Package Crafter§r next to an §6Unpackager§r and surround it with §6Marked Fusion Crafting Injectors§r like a normal Fusion setup. Then, you can handle recipes through the Unpackager just like any other PAuto setup.", "globalshare:1": 0, "icon:10": { "Count:3": 1, "Damage:2": 0, "OreDict:8": "", - "id:8": "actuallyadditions:block_laser_relay_item" + "id:8": "packageddraconic:fusion_crafter" }, "ignoresview:1": 0, "ismain:1": 0, @@ -63050,34 +63050,10 @@ "partialMatch:1": 1, "requiredItems:9": { "0:10": { - "Count:3": 10, - "Damage:2": 0, - "OreDict:8": "", - "id:8": "actuallyadditions:block_laser_relay_item" - }, - "1:10": { "Count:3": 1, "Damage:2": 0, "OreDict:8": "", - "id:8": "actuallyadditions:block_item_viewer" - }, - "2:10": { - "Count:3": 1, - "Damage:2": 0, - "OreDict:8": "", - "id:8": "actuallyadditions:item_laser_wrench" - }, - "3:10": { - "Count:3": 1, - "Damage:2": 0, - "OreDict:8": "", - "id:8": "minecraft:compass" - }, - "4:10": { - "Count:3": 1, - "Damage:2": 0, - "OreDict:8": "", - "id:8": "extrautils2:redstoneclock" + "id:8": "packageddraconic:fusion_crafter" } }, "taskID:8": "bq_standard:retrieval" diff --git a/overrides/config/betterquesting/DefaultQuests.json b/overrides/config/betterquesting/DefaultQuests.json index 7c18ec8..6665bb9 100644 --- a/overrides/config/betterquesting/DefaultQuests.json +++ b/overrides/config/betterquesting/DefaultQuests.json @@ -63001,13 +63001,13 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "You\u0027re going to craft a LOT of stuff using §bDraconic Evolution §6Fusion§r. Therefore, a way to automate it is crucial.\n\nFirst, place an §6Item Laser Relay§r on each §aInjector§r, one on the §aCore§r, and one on an §aItem Interface§r. You\u0027ll notice that you will need 2 more item lasers than your amount of Injectors.\n\nConnect them all to the Item Interface with your §6Laser Wrench§r. Pretty much, just click on one of the lasers, and click on your Item Interface.\n\n§eOne important thing to note is that lasers appear to be \"placed\" on a particular block but they will interact with all adjacent (non-laser) blocks.§r \n\n§cWarning: be careful not to place a second laser on a laser network adjacent to the network\u0027s Item Interface. This will immediately crash your game because it creates a cycle in the network. You will have to either restore from backup or edit the level.dat directly to remove the block to play again.§r\n\nUse the §6Compass§r to change the Laser on the core\u0027s piority to 1. \n\nFinally, place the §aRedstone Clock§r next to the core. \n\nYou also need to setup some mechanism to take the finished item out of the core. A Phantomface works well here, as it will only output the output item, and not the input item.\n\nImport into the Item Interface. You can use the Extended Processing Pattern Terminal and an Interface with Blocking Mode to do this.", + "desc:8": "You\u0027re going to craft a LOT of stuff using §bDraconic Evolution §6Fusion§r. Therefore, a way to automate it is crucial.\n\nUsing §bPackagedDraconic§r, Draconic Fusion recipes can be easily automated through PackagedAuto. To get started, place a §6Fusion Package Crafter§r next to an §6Unpackager§r and surround it with §6Marked Fusion Crafting Injectors§r like a normal Fusion setup. Then, you can handle recipes through the Unpackager just like any other PAuto setup.", "globalshare:1": 0, "icon:10": { "Count:3": 1, "Damage:2": 0, "OreDict:8": "", - "id:8": "actuallyadditions:block_laser_relay_item" + "id:8": "packageddraconic:fusion_crafter" }, "ignoresview:1": 0, "ismain:1": 0, @@ -63050,34 +63050,10 @@ "partialMatch:1": 1, "requiredItems:9": { "0:10": { - "Count:3": 10, - "Damage:2": 0, - "OreDict:8": "", - "id:8": "actuallyadditions:block_laser_relay_item" - }, - "1:10": { "Count:3": 1, "Damage:2": 0, "OreDict:8": "", - "id:8": "actuallyadditions:block_item_viewer" - }, - "2:10": { - "Count:3": 1, - "Damage:2": 0, - "OreDict:8": "", - "id:8": "actuallyadditions:item_laser_wrench" - }, - "3:10": { - "Count:3": 1, - "Damage:2": 0, - "OreDict:8": "", - "id:8": "minecraft:compass" - }, - "4:10": { - "Count:3": 1, - "Damage:2": 0, - "OreDict:8": "", - "id:8": "extrautils2:redstoneclock" + "id:8": "packageddraconic:fusion_crafter" } }, "taskID:8": "bq_standard:retrieval" diff --git a/overrides/config/betterquesting/saved_quests/ExpertQuests.json b/overrides/config/betterquesting/saved_quests/ExpertQuests.json index cea1b64..b49f47e 100644 --- a/overrides/config/betterquesting/saved_quests/ExpertQuests.json +++ b/overrides/config/betterquesting/saved_quests/ExpertQuests.json @@ -49644,13 +49644,13 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "You\u0027re going to craft a LOT of stuff using §bDraconic Evolution §6Fusion§r. Therefore, a way to automate it is crucial.\n\nFirst, place an §6Item Laser Relay§r on each §aInjector§r, one on the §aCore§r, and one on an §aItem Interface§r. You\u0027ll notice that you will need 2 more item lasers than your amount of Injectors.\n\nConnect them all to the Item Interface with your §6Laser Wrench§r. Pretty much, just click on one of the lasers, and click on your Item Interface.\n\n§eOne important thing to note is that lasers appear to be \"placed\" on a particular block but they will interact with all adjacent (non-laser) blocks.§r \n\n§cWarning: be careful not to place a second laser on a laser network adjacent to the network\u0027s Item Interface. This will immediately crash your game because it creates a cycle in the network. You will have to either restore from backup or edit the level.dat directly to remove the block to play again.§r\n\nUse the §6Compass§r to change the Laser on the core\u0027s piority to 1. \n\nFinally, place the §aRedstone Clock§r next to the core. \n\nYou also need to setup some mechanism to take the finished item out of the core. A Phantomface works well here, as it will only output the output item, and not the input item.\n\nImport into the Item Interface. You can use the Extended Processing Pattern Terminal and an Interface with Blocking Mode to do this.", + "desc:8": "You\u0027re going to craft a LOT of stuff using §bDraconic Evolution §6Fusion§r. Therefore, a way to automate it is crucial.\n\nUsing §bPackagedDraconic§r, Draconic Fusion recipes can be easily automated through PackagedAuto. To get started, place a §6Fusion Package Crafter§r next to an §6Unpackager§r and surround it with §6Marked Fusion Crafting Injectors§r like a normal Fusion setup. Then, you can handle recipes through the Unpackager just like any other PAuto setup.", "globalshare:1": 0, "icon:10": { "Count:3": 1, "Damage:2": 0, "OreDict:8": "", - "id:8": "actuallyadditions:block_laser_relay_item" + "id:8": "packageddraconic:fusion_crafter" }, "ignoresview:1": 0, "ismain:1": 0, @@ -49680,34 +49680,10 @@ "partialMatch:1": 1, "requiredItems:9": { "0:10": { - "Count:3": 10, - "Damage:2": 0, - "OreDict:8": "", - "id:8": "actuallyadditions:block_laser_relay_item" - }, - "1:10": { "Count:3": 1, "Damage:2": 0, "OreDict:8": "", - "id:8": "actuallyadditions:block_item_viewer" - }, - "2:10": { - "Count:3": 1, - "Damage:2": 0, - "OreDict:8": "", - "id:8": "actuallyadditions:item_laser_wrench" - }, - "3:10": { - "Count:3": 1, - "Damage:2": 0, - "OreDict:8": "", - "id:8": "minecraft:compass" - }, - "4:10": { - "Count:3": 1, - "Damage:2": 0, - "OreDict:8": "", - "id:8": "extrautils2:redstoneclock" + "id:8": "packageddraconic:fusion_crafter" } }, "taskID:8": "bq_standard:retrieval" diff --git a/overrides/groovy/postInit/Post-Initial/Main/General/Late-Game/draconicFusion.groovy b/overrides/groovy/postInit/Post-Initial/Main/General/Late-Game/draconicFusion.groovy index e7856c9..4d06c14 100755 --- a/overrides/groovy/postInit/Post-Initial/Main/General/Late-Game/draconicFusion.groovy +++ b/overrides/groovy/postInit/Post-Initial/Main/General/Late-Game/draconicFusion.groovy @@ -1,4 +1,5 @@ import static com.nomiceu.nomilabs.groovy.GroovyHelpers.MiscHelpers.removeDraconicFusionRecipe +import static gregtech.api.GTValues.* // Wyvern Core removeDraconicFusionRecipe(item('minecraft:emerald_block'), item('draconicevolution:wyvern_core')) @@ -155,4 +156,69 @@ mods.draconicevolution.fusion.recipeBuilder() .output(item('draconicevolution:dislocator_advanced')) .energy(10000000) .tierDraconic() + +// Packaged Draconic Recipes +// Fusion Package Crafter +removeDraconicFusionRecipe(item('draconicevolution:fusion_crafting_core'), item('packageddraconic:fusion_crafter')) +mods.gregtech.assembler.recipeBuilder() + .inputs(item('draconicevolution:fusion_crafting_core'), item('extendedcrafting:interface') * 4, item('packagedauto:me_package_component') * 4, item('extendedcrafting:material', 12) * 4, metaitem('field.generator.iv'), metaitem('wireFineRuridit') * 64) + .fluidInputs(fluid('soldering_alloy') * 576) + .outputs(item('packageddraconic:fusion_crafter')) + .duration(400).EUt(VA[LuV]).buildAndRegister(); + +// Marked Fusion Pedestals +crafting.remove('packageddraconic:marked_basic_injector') +crafting.remove('packageddraconic:marked_draconic_injector') +crafting.remove('packageddraconic:marked_wyvern_injector') +crafting.remove('packageddraconic:marked_chaotic_injector') + +mods.gregtech.assembler.recipeBuilder() + .inputs(item('draconicevolution:crafting_injector'), item('extendedcrafting:material', 19), metaitem('sensor.iv'), ore('gearDraconium')) + .outputs(item('packageddraconic:marked_basic_injector')) + .duration(100).EUt(VA[IV]).buildAndRegister() + +mods.gregtech.assembler.recipeBuilder() + .inputs(item('draconicevolution:crafting_injector', 1), item('extendedcrafting:material', 19), metaitem('sensor.iv'), ore('gearDraconium')) + .outputs(item('packageddraconic:marked_wyvern_injector')) + .duration(100).EUt(VA[IV]).buildAndRegister() + +mods.gregtech.assembler.recipeBuilder() + .inputs(item('draconicevolution:crafting_injector', 2), item('extendedcrafting:material', 19), metaitem('sensor.iv'), ore('gearDraconium')) + .outputs(item('packageddraconic:marked_draconic_injector')) + .duration(100).EUt(VA[IV]).buildAndRegister() + +mods.gregtech.assembler.recipeBuilder() + .inputs(item('draconicevolution:crafting_injector', 3), item('extendedcrafting:material', 19), metaitem('sensor.iv'), ore('gearDraconium')) + .outputs(item('packageddraconic:marked_chaotic_injector')) + .duration(100).EUt(VA[IV]).buildAndRegister() + +mods.draconicevolution.fusion.recipeBuilder() + .catalyst(item('packageddraconic:marked_basic_injector')) + .input(item('draconicevolution:wyvern_core'), item('draconicevolution:draconic_core'), item('minecraft:nether_star'), item('minecraft:nether_star'), item('draconicevolution:draconic_core'), ore('blockDraconium'), item('minecraft:nether_star'), item('minecraft:nether_star')) + .output(item('packageddraconic:marked_wyvern_injector')) + .energy(256000) + .tierNormal() .register() + +mods.draconicevolution.fusion.recipeBuilder() + .catalyst(item('packageddraconic:marked_wyvern_injector')) + .input(item('minecraft:nether_star'), item('minecraft:dragon_egg'), item('draconicevolution:wyvern_core'), item('draconicevolution:wyvern_core'), item('minecraft:dragon_egg'), item('minecraft:nether_star')) + .output(item('packageddraconic:marked_draconic_injector')) + .energy(1000000000) + .tierWyvern() + .register() + +mods.draconicevolution.fusion.recipeBuilder() + .catalyst(item('packageddraconic:marked_draconic_injector')) + .input(item('draconicevolution:chaos_shard'), item('draconicevolution:chaos_shard'), metaitem('ingotNeutronium'), metaitem('ingotNeutronium'), metaitem('nomilabs:blockCrystalMatrix'), metaitem('nomilabs:blockCrystalMatrix'), metaitem('ingotNeutronium'), metaitem('ingotNeutronium'), item('draconicevolution:chaos_shard'), item('draconicevolution:chaos_shard')) + .output(item('packageddraconic:marked_chaotic_injector')) + .energy(3000000000) + .tierDraconic() + .register() + +crafting.addShapeless(item('draconicevolution:crafting_injector'), [item('packageddraconic:marked_basic_injector')]) +crafting.addShapeless(item('draconicevolution:crafting_injector', 1), [item('packageddraconic:marked_wyvern_injector')]) +crafting.addShapeless(item('draconicevolution:crafting_injector', 2), [item('packageddraconic:marked_draconic_injector')]) +crafting.addShapeless(item('draconicevolution:crafting_injector', 3), [item('packageddraconic:marked_chaotic_injector')]) + +