From 187c15342b2d31e755ec0477b10e9b443e0b787c Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Fri, 29 Nov 2024 18:38:16 -0500 Subject: [PATCH 1/4] quests and recipe conflicts --- .../quests/chapters/0EFE9E753A92388D.snbt | 22 +++++++++++++++++++ config/ftbquests/quests/lang/en_us.snbt | 11 ++++++++++ 2 files changed, 33 insertions(+) diff --git a/config/ftbquests/quests/chapters/0EFE9E753A92388D.snbt b/config/ftbquests/quests/chapters/0EFE9E753A92388D.snbt index 9765c002..ec33a8b1 100644 --- a/config/ftbquests/quests/chapters/0EFE9E753A92388D.snbt +++ b/config/ftbquests/quests/chapters/0EFE9E753A92388D.snbt @@ -279,5 +279,27 @@ x: -0.5d y: -0.5d } + { + dependencies: ["6AFCA9F187AE6EB2"] + id: "1272A1D0BD9934AE" + rewards: [{ + id: "72813948A0F5A6D4" + item: { + components: { + "patchouli:book": "productivetrees:guide" + } + count: 1 + id: "patchouli:guide_book" + } + type: "item" + }] + tasks: [{ + id: "2E4DEB3FEE0D15CD" + item: { components: { "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(minecraft:saplings)" }, count: 1, id: "ftbfiltersystem:smart_filter" } + type: "item" + }] + x: 1.0d + y: -1.5d + } ] } diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index d6cb9146..93b289f5 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -556,6 +556,14 @@ "When the Coal and Iron are fully engulfed by the goo, they’ll be replaced by a crystal that can be broken to obtain the transmuted materials" ] quest.11FE0DE653577AFB.quest_desc: ["A humble, but cheap, charging station. It will charge any FE based equipment inserted into it."] + quest.1272A1D0BD9934AE.quest_desc: [ + "Looking for some fancy new wood to build with? " + "" + "Productive Trees has just about anything you could ask for. " + "" + "Working with the mod is straightforward but be sure to check out the Guidebook for an in-depth walkthrough on cross-pollination. " + ] + quest.1272A1D0BD9934AE.title: "Productive Trees" quest.128669F9F6431E0A.quest_desc: [ "The Bio Reactor is a more advanced generator which produces more FE per tick based on the number of items it is burning. " "" @@ -1049,6 +1057,7 @@ "" "She’ll automatically pull items from a linked storage to do her crafting and can be instructed what to craft by placing the items on an adjacent Arcane Pedestal. " ] + quest.20C038E5D70CDB52.title: "Wixie Cauldron" quest.211E0844F3ACD244.quest_desc: [ "Ender IO has a host of important alloys, making the Alloy Smelter one of the most important basic machines to craft. " "" @@ -3256,6 +3265,7 @@ "" "Unlike a normal Enchanting Apparatus, the Arcane Pedestals are only used to specify a recipe. She does not need them for ingredients." ] + quest.6242CD0203DCBDC7.title: "Wixie Enchanting Apparatus" quest.626E31B97CA1F815.quest_desc: [ "While capable of producing enormous power, the allure of Fission Reactors within Mekanism is mostly to process Uranium into more useful materials, like Plutonium and Polonium. " "&n &r" @@ -4319,6 +4329,7 @@ task.2914EFBE380196D0.title: "Dense Smart Cables" task.2D436B66D664DACD.title: "Visit The End" task.2DF31416CB56A844.title: "Sal Ammoniac" + task.2E4DEB3FEE0D15CD.title: "Any Sapling" task.2E84D0BE1079BF3C.title: "Energy Cubes" task.3153DDF073D649E4.title: "Divination Rods" task.328C56BA23A70B8F.title: "Power" From 8beb8eefd3f3421c37533178b063f1fdbc0c866e Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Fri, 29 Nov 2024 19:02:13 -0500 Subject: [PATCH 2/4] conflicts --- .../quests/chapters/irons_spellbooks.snbt | 48 +++++++++++-------- .../recipes/actuallyadditions/shaped.js | 26 ++++++++++ .../recipes/enigmatica/remove.js | 3 +- .../recipes/glassential/shaped.js | 21 ++++++++ 4 files changed, 77 insertions(+), 21 deletions(-) create mode 100644 kubejs/server_scripts/recipes/actuallyadditions/shaped.js create mode 100644 kubejs/server_scripts/recipes/glassential/shaped.js diff --git a/config/ftbquests/quests/chapters/irons_spellbooks.snbt b/config/ftbquests/quests/chapters/irons_spellbooks.snbt index 1e00cee4..ea307468 100644 --- a/config/ftbquests/quests/chapters/irons_spellbooks.snbt +++ b/config/ftbquests/quests/chapters/irons_spellbooks.snbt @@ -6,14 +6,9 @@ group: "440488E780593120" icon: { components: { - "irons_spellbooks:spell_container": { - data: [ ] - maxSpells: 6 - mustEquip: 1b - spellWheel: 1b - } + "patchouli:book": "irons_spellbooks:iss_guide_book" } - id: "irons_spellbooks:iron_spell_book" + id: "patchouli:guide_book" } id: "52D510F5F28EA5FE" order_index: 4 @@ -27,22 +22,35 @@ id: "ftbquests:custom_icon" } id: "01E9BF979ED779AE" - rewards: [{ - id: "2936D7B921082E89" - item: { - components: { - "irons_spellbooks:spell_container": { - data: [ ] - maxSpells: 5 - mustEquip: 1b - spellWheel: 1b + rewards: [ + { + id: "2936D7B921082E89" + item: { + components: { + "irons_spellbooks:spell_container": { + data: [ ] + maxSpells: 5 + mustEquip: 1b + spellWheel: 1b + } } + count: 1 + id: "irons_spellbooks:copper_spell_book" } - count: 1 - id: "irons_spellbooks:copper_spell_book" + type: "item" } - type: "item" - }] + { + id: "089AF77048A97F37" + item: { + components: { + "patchouli:book": "irons_spellbooks:iss_guide_book" + } + count: 1 + id: "patchouli:guide_book" + } + type: "item" + } + ] tasks: [{ id: "6E7E348A13CC713C" item: { count: 1, id: "minecraft:copper_ingot" } diff --git a/kubejs/server_scripts/recipes/actuallyadditions/shaped.js b/kubejs/server_scripts/recipes/actuallyadditions/shaped.js new file mode 100644 index 00000000..695176c1 --- /dev/null +++ b/kubejs/server_scripts/recipes/actuallyadditions/shaped.js @@ -0,0 +1,26 @@ +ServerEvents.recipes((event) => { + const id_prefix = 'enigmatica:actuallyadditions/shaped/'; + + const recipes = [ + { + output: '2x actuallyadditions:rice_dough', + pattern: ['AA', 'A '], + key: { + A: '#c:crops/rice' + }, + id: `actuallyadditions:rice_dough` + }, + { + output: '3x minecraft:paper', + pattern: ['A ', ' A ', ' A'], + key: { + A: '#c:crops/rice' + }, + id: `actuallyadditions:rice_paper` + } + ]; + + recipes.forEach((recipe) => { + event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id); + }); +}); diff --git a/kubejs/server_scripts/recipes/enigmatica/remove.js b/kubejs/server_scripts/recipes/enigmatica/remove.js index 29bcb3a1..e3a2315d 100644 --- a/kubejs/server_scripts/recipes/enigmatica/remove.js +++ b/kubejs/server_scripts/recipes/enigmatica/remove.js @@ -16,7 +16,8 @@ ServerEvents.recipes((event) => { { id: /powah:crafting\/cable_(basic|hardened|blazing|niotic|spirited|nitro)$/ }, { mod: 'cobblegengalore' }, { id: /actuallyadditions:crushing\/(copper|iron|gold)_ore/ }, - { id: /industrialforegoing:laser_drill_ore.*yellor(ite|ium)/ } + { id: /industrialforegoing:laser_drill_ore.*yellor(ite|ium)/ }, + { id: `utilitarian:utility/green_dye` } ]; recipes.forEach((recipe) => { diff --git a/kubejs/server_scripts/recipes/glassential/shaped.js b/kubejs/server_scripts/recipes/glassential/shaped.js new file mode 100644 index 00000000..175a1722 --- /dev/null +++ b/kubejs/server_scripts/recipes/glassential/shaped.js @@ -0,0 +1,21 @@ +ServerEvents.recipes((event) => { + const id_prefix = 'enigmatica:glassential/shaped/'; + + const recipes = []; + + colors.forEach((color) => { + recipes.push({ + output: `2x glassential:${color}_glass_trapdoor`, + pattern: ['BA', 'AB'], + key: { + A: `minecraft:${color}_stained_glass`, + B: 'glassential:glass_slab' + }, + id: `glassential:${color}_glass_trapdoor_recipe` + }); + }); + + recipes.forEach((recipe) => { + event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id); + }); +}); From 814ee69f7b268b01cee388819cd35280a0ed13c2 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Fri, 29 Nov 2024 20:15:43 -0500 Subject: [PATCH 3/4] xp --- CHANGELOG.md | 1 + .../constants/experience_fluids.js | 7 +++++++ .../recipes/enderio/sag_milling.js | 2 +- kubejs/server_scripts/recipes/enderio/tank.js | 20 +++++++++++++++++++ .../recipes/enigmatica/remove.js | 4 +++- .../recipes/enigmatica/replace_input.js | 10 +++++----- .../dissolution_chamber.js | 10 ++++++++++ 7 files changed, 47 insertions(+), 7 deletions(-) create mode 100644 kubejs/server_scripts/constants/experience_fluids.js create mode 100644 kubejs/server_scripts/recipes/enderio/tank.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f3f1144..f25de827 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Dragons in drygmy farms will now drop eggs, heads, and breath at a reduced rate [(\#218)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/218) - Theurgy Creature Salt may be crafted from meat and fish now [(\#221)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/221) - Unify EIO's Organic Dyes [(\#239)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/239) +- More recipes for xp bottles [(\#249)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/249) #### 🦟 Bugs Fixed diff --git a/kubejs/server_scripts/constants/experience_fluids.js b/kubejs/server_scripts/constants/experience_fluids.js new file mode 100644 index 00000000..018c0cec --- /dev/null +++ b/kubejs/server_scripts/constants/experience_fluids.js @@ -0,0 +1,7 @@ +const experience_fluids = [ + 'enderio:fluid_xp_juice_still', + 'industrialforegoing:essence', + 'pneumaticcraft:memory_essence', + 'sophisticatedcore:xp_still', + 'justdirethings:xp_fluid_source' +]; diff --git a/kubejs/server_scripts/recipes/enderio/sag_milling.js b/kubejs/server_scripts/recipes/enderio/sag_milling.js index dfb771b6..cf94ad24 100644 --- a/kubejs/server_scripts/recipes/enderio/sag_milling.js +++ b/kubejs/server_scripts/recipes/enderio/sag_milling.js @@ -175,7 +175,7 @@ ServerEvents.recipes((event) => { id: `${id_prefix}${material.primary}_ore` }, { - input: { id: AlmostUnified.getTagTargetItem(`c:raw_materials/${material.primary}`).getId() }, + input: { tag: `c:raw_materials/${material.primary}` }, outputs: [ { item: { id: AlmostUnified.getTagTargetItem(`c:dusts/${material.primary}`).getId(), count: 1 } }, { diff --git a/kubejs/server_scripts/recipes/enderio/tank.js b/kubejs/server_scripts/recipes/enderio/tank.js new file mode 100644 index 00000000..c267a4db --- /dev/null +++ b/kubejs/server_scripts/recipes/enderio/tank.js @@ -0,0 +1,20 @@ +ServerEvents.recipes((event) => { + const id_prefix = 'enigmatica:enderio/tank/'; + + const recipes = []; + + experience_fluids.forEach((fluid) => { + recipes.push({ + fluid: { id: fluid, amount: 250 }, + input: { item: 'minecraft:glass_bottle' }, + output: { id: 'minecraft:experience_bottle', count: 1 }, + mode: 'fill', + id: `${id_prefix}experience_bottle_from_${fluid.replace(':', '_')}` + }); + }); + + recipes.forEach((recipe) => { + recipe.type = 'enderio:tank'; + event.custom(recipe).id(recipe.id); + }); +}); diff --git a/kubejs/server_scripts/recipes/enigmatica/remove.js b/kubejs/server_scripts/recipes/enigmatica/remove.js index e3a2315d..b28b31ed 100644 --- a/kubejs/server_scripts/recipes/enigmatica/remove.js +++ b/kubejs/server_scripts/recipes/enigmatica/remove.js @@ -17,7 +17,9 @@ ServerEvents.recipes((event) => { { mod: 'cobblegengalore' }, { id: /actuallyadditions:crushing\/(copper|iron|gold)_ore/ }, { id: /industrialforegoing:laser_drill_ore.*yellor(ite|ium)/ }, - { id: `utilitarian:utility/green_dye` } + { id: `utilitarian:utility/green_dye` }, + { id: `enderio:tank_fill/experience_bottle` }, + { id: `industrialforegoing:dissolution_chamber/xp_bottles` } ]; recipes.forEach((recipe) => { diff --git a/kubejs/server_scripts/recipes/enigmatica/replace_input.js b/kubejs/server_scripts/recipes/enigmatica/replace_input.js index 1df2778f..68452838 100644 --- a/kubejs/server_scripts/recipes/enigmatica/replace_input.js +++ b/kubejs/server_scripts/recipes/enigmatica/replace_input.js @@ -74,12 +74,12 @@ ServerEvents.recipes((event) => { filter: [{ mod: 'prettypipes' }, { mod: 'ppfluids' }], to_replace: '#c:storage_blocks/redstone', replace_with: '#c:dusts/redstone' + }, + { + filter: [{ id: /actuallyadditions:black_quartz_(wall|stair|slab)/ }], + to_replace: 'actuallyadditions:black_quartz_pillar_block', + replace_with: 'actuallyadditions:black_quartz_block' } - // { - // filter: [{}], - // to_replace: '#c:chests', - // replace_with: '#c:chests/wooden' - // } ]; recipes.forEach((recipe) => { diff --git a/kubejs/server_scripts/recipes/industrialforegoing/dissolution_chamber.js b/kubejs/server_scripts/recipes/industrialforegoing/dissolution_chamber.js index 2aad24e0..0bf49a19 100644 --- a/kubejs/server_scripts/recipes/industrialforegoing/dissolution_chamber.js +++ b/kubejs/server_scripts/recipes/industrialforegoing/dissolution_chamber.js @@ -11,6 +11,16 @@ ServerEvents.recipes((event) => { } ]; + experience_fluids.forEach((fluid) => { + recipes.push({ + input: [], + inputFluid: { id: fluid, amount: 250 }, + output: { id: 'minecraft:experience_bottle', count: 1 }, + processingTime: 5, + id: `${id_prefix}experience_bottle_from_${fluid.replace(':', '_')}` + }); + }); + recipes.forEach((recipe) => { recipe.type = 'industrialforegoing:dissolution_chamber'; event.custom(recipe).id(recipe.id); From 2432682b208b82a4d3534ab81dfb31af8554255c Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Fri, 29 Nov 2024 20:17:54 -0500 Subject: [PATCH 4/4] Update en_us.snbt --- config/ftbquests/quests/lang/en_us.snbt | 1 + 1 file changed, 1 insertion(+) diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index 93b289f5..2da2ee25 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -3760,6 +3760,7 @@ "Making them by hand isn’t particularly difficult, but it can be a little tedious. So, finding a way to automate this process is recommended. " "" "In short, you’ll need to find some way to start a fire automatically. " + "&n &r" "" "Start a fire on Deepslate or Bedrock and wait a bit. The fire will go out and some Grains will be generated. " ""