diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md index db8628073..eba76b1d8 100644 --- a/changelogs/CHANGELOG.md +++ b/changelogs/CHANGELOG.md @@ -8,11 +8,18 @@ - Crystal Cluster blocks may now be converted to Budding via Right Click Interaction. [\#534](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/534) ([MuteTiefling](https://github.com/MuteTiefling)) - Cooldown for Right Click Interactions has been reduced. [\#534](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/534) ([MuteTiefling](https://github.com/MuteTiefling)) - Allow Therium and Subzero blocks to be broken down into the crystals. [\#538](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/538) ([MuteTiefling](https://github.com/MuteTiefling)) +- Shub Niggurath may now be summoned in the Twilight Forest. [\#548](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/548) ([MuteTiefling](https://github.com/MuteTiefling)) +- Whirlisprigs now love Fireflies and Cicadas to help give a boost to their environment. [\#548](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/548) ([MuteTiefling](https://github.com/MuteTiefling)) +- Chainmail is now cheaper to craft. [\#548](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/548) ([MuteTiefling](https://github.com/MuteTiefling)) +- Powah Capacitors are now cheaper to craft. [\#548](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/548) ([MuteTiefling](https://github.com/MuteTiefling)) +- Powah Energy Cables are cheaper to upgrade. [\#548](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/548) ([MuteTiefling](https://github.com/MuteTiefling)) +- Spawner Rifts will now spawn Wilden as part of the waves. [\#548](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/548) ([MuteTiefling](https://github.com/MuteTiefling)) ### 🐛 Fixed Bugs - Removed faulty drawer recipes [\#536](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/536) ([MuteTiefling](https://github.com/MuteTiefling)) - Fix broken ore processing recipes [\#540](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/540) ([MuteTiefling](https://github.com/MuteTiefling)) +- Hide visible Expert Storage quest. [\#548](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/548) ([MuteTiefling](https://github.com/MuteTiefling)) ### Removed Mods diff --git a/config/ftbquests/quests/chapters/storage_expert.snbt b/config/ftbquests/quests/chapters/storage_expert.snbt index 6c7e2430f..d8bf512cd 100644 --- a/config/ftbquests/quests/chapters/storage_expert.snbt +++ b/config/ftbquests/quests/chapters/storage_expert.snbt @@ -23,6 +23,7 @@ "● $containers/gas" "● $containers/liquid" ] + hide: true icon: "minecraft:chest" id: "49596454693937AC" rewards: [{ diff --git a/kubejs/server_scripts/base/recipes/byg/shaped.js b/kubejs/server_scripts/base/recipes/byg/shaped.js index 80275c243..e679c44c5 100644 --- a/kubejs/server_scripts/base/recipes/byg/shaped.js +++ b/kubejs/server_scripts/base/recipes/byg/shaped.js @@ -35,6 +35,15 @@ ServerEvents.recipes((event) => { A: '#forge:storage_blocks/therium' }, id: 'byg:chiseled_therium' + }, + { + output: '8x byg:chain_plating', + pattern: ['ABA', 'B B', 'ABA'], + key: { + A: '#forge:nuggets/iron', + B: '#forge:ingots/iron' + }, + id: 'byg:chain_plating' } ]; diff --git a/kubejs/server_scripts/base/recipes/gateways/gateways.js b/kubejs/server_scripts/base/recipes/gateways/gateways.js index c0dfc675d..be79bbb77 100644 --- a/kubejs/server_scripts/base/recipes/gateways/gateways.js +++ b/kubejs/server_scripts/base/recipes/gateways/gateways.js @@ -11,7 +11,7 @@ ServerEvents.highPriorityData((event) => { rewards: [ { type: 'stack', - stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } } + stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } } }, { type: 'loot_table', @@ -23,7 +23,7 @@ ServerEvents.highPriorityData((event) => { type: 'loot_table', loot_table: 'enigmatica:loot_boxes/miners_delight', rolls: 1, - desc: `Miner's Delight Gems` + desc: `Miner's Delight` } ], completion_xp: 250, @@ -43,7 +43,7 @@ ServerEvents.highPriorityData((event) => { rewards: [ { type: 'stack', - stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } } + stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } } } ], max_wave_time: 2400, @@ -62,7 +62,7 @@ ServerEvents.highPriorityData((event) => { rewards: [ { type: 'stack', - stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } } + stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } } } ], max_wave_time: 2400, @@ -81,7 +81,26 @@ ServerEvents.highPriorityData((event) => { rewards: [ { type: 'stack', - stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } } + stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } } + } + ], + max_wave_time: 2400, + setup_time: 50 + }, + { + entities: [ + { entity: 'ars_nouveau:wilden_stalker' }, + { entity: 'ars_nouveau:wilden_stalker' }, + { entity: 'ars_nouveau:wilden_stalker' }, + { entity: 'ars_nouveau:wilden_hunter' }, + { entity: 'ars_nouveau:wilden_hunter' }, + { entity: 'ars_nouveau:wilden_guardian' }, + { entity: 'ars_nouveau:wilden_guardian' } + ], + rewards: [ + { + type: 'stack', + stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } } } ], max_wave_time: 2400, @@ -101,7 +120,7 @@ ServerEvents.highPriorityData((event) => { rewards: [ { type: 'stack', - stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } } + stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } } } ], max_wave_time: 2400, @@ -121,7 +140,7 @@ ServerEvents.highPriorityData((event) => { rewards: [ { type: 'stack', - stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } } + stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } } } ], max_wave_time: 2400, @@ -138,7 +157,7 @@ ServerEvents.highPriorityData((event) => { rewards: [ { type: 'stack', - stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } } + stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } } }, { type: 'apotheosis:affix', @@ -169,7 +188,7 @@ ServerEvents.highPriorityData((event) => { rewards: [ { type: 'stack', - stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } } + stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } } } ], max_wave_time: 1500, @@ -190,7 +209,7 @@ ServerEvents.highPriorityData((event) => { rewards: [ { type: 'stack', - stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } } + stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } } } ], max_wave_time: 750, @@ -201,7 +220,7 @@ ServerEvents.highPriorityData((event) => { rewards: [ { type: 'stack', - stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } } + stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } } } ], max_wave_time: 1500, @@ -222,7 +241,7 @@ ServerEvents.highPriorityData((event) => { rewards: [ { type: 'stack', - stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } } + stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } } } ], max_wave_time: 1500, @@ -239,7 +258,7 @@ ServerEvents.highPriorityData((event) => { rewards: [ { type: 'stack', - stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } } + stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } } }, { type: 'apotheosis:affix', @@ -268,7 +287,7 @@ ServerEvents.highPriorityData((event) => { rewards: [ { type: 'stack', - stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } } + stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } } } ], max_wave_time: 800, @@ -292,7 +311,7 @@ ServerEvents.highPriorityData((event) => { rewards: [ { type: 'stack', - stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } } + stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } } } ], max_wave_time: 800, @@ -316,7 +335,7 @@ ServerEvents.highPriorityData((event) => { rewards: [ { type: 'stack', - stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } } + stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } } } ], max_wave_time: 800, @@ -334,7 +353,7 @@ ServerEvents.highPriorityData((event) => { rewards: [ { type: 'stack', - stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } } + stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } } } ], max_wave_time: 2400, @@ -350,7 +369,7 @@ ServerEvents.highPriorityData((event) => { rewards: [ { type: 'stack', - stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } } + stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } } }, { type: 'apotheosis:affix', @@ -378,7 +397,7 @@ ServerEvents.highPriorityData((event) => { rewards: [ { type: 'stack', - stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } } + stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } } } ], max_wave_time: 2400, @@ -396,7 +415,7 @@ ServerEvents.highPriorityData((event) => { rewards: [ { type: 'stack', - stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } } + stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } } } ], max_wave_time: 2400, @@ -417,7 +436,7 @@ ServerEvents.highPriorityData((event) => { rewards: [ { type: 'stack', - stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } } + stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } } } ], max_wave_time: 2400, @@ -438,7 +457,7 @@ ServerEvents.highPriorityData((event) => { rewards: [ { type: 'stack', - stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } } + stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } } } ], max_wave_time: 2400, @@ -454,7 +473,7 @@ ServerEvents.highPriorityData((event) => { rewards: [ { type: 'stack', - stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } } + stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } } }, { type: 'apotheosis:affix', @@ -479,7 +498,7 @@ ServerEvents.highPriorityData((event) => { rewards: [ { type: 'stack', - stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } } + stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } } } ], max_wave_time: 2400, @@ -497,7 +516,7 @@ ServerEvents.highPriorityData((event) => { rewards: [ { type: 'stack', - stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } } + stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } } } ], max_wave_time: 2400, @@ -518,7 +537,7 @@ ServerEvents.highPriorityData((event) => { rewards: [ { type: 'stack', - stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } } + stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } } } ], max_wave_time: 2400, @@ -542,7 +561,7 @@ ServerEvents.highPriorityData((event) => { rewards: [ { type: 'stack', - stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } } + stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } } } ], max_wave_time: 2400, diff --git a/kubejs/server_scripts/base/tags/biome/occultism/allows_shub_niggurath_transformation.js b/kubejs/server_scripts/base/tags/biome/occultism/allows_shub_niggurath_transformation.js new file mode 100644 index 000000000..9cb240c70 --- /dev/null +++ b/kubejs/server_scripts/base/tags/biome/occultism/allows_shub_niggurath_transformation.js @@ -0,0 +1,15 @@ +ServerEvents.tags('worldgen/biome', (event) => { + event.add('occultism:allows_shub_niggurath_transformation', [ + 'twilightforest:dense_forest', + 'twilightforest:dense_mushroom_forest', + 'twilightforest:firefly_forest', + 'twilightforest:forest', + 'twilightforest:mushroom_forest', + 'twilightforest:spooky_forest', + 'twilightforest:enchanted_forest', + 'twilightforest:dense_mushroom_forest', + 'twilightforest:dark_forest', + 'twilightforest:dark_forest_center', + 'twilightforest:snowy_forest' + ]); +}); diff --git a/kubejs/server_scripts/base/tags/blocks/ars_nouveau/whirlisprig.js b/kubejs/server_scripts/base/tags/blocks/ars_nouveau/whirlisprig.js index 4ecb48227..d1411c3ff 100644 --- a/kubejs/server_scripts/base/tags/blocks/ars_nouveau/whirlisprig.js +++ b/kubejs/server_scripts/base/tags/blocks/ars_nouveau/whirlisprig.js @@ -1,5 +1,9 @@ ServerEvents.tags('block', (event) => { - event.add('ars_nouveau:whirlisprig/greatly_likes', ['twilightforest:liveroot_block']); + event.add('ars_nouveau:whirlisprig/greatly_likes', [ + 'twilightforest:liveroot_block', + 'twilightforest:firefly', + 'twilightforest:cicada' + ]); event.add('ars_nouveau:whirlisprig/kinda_likes', ['minecraft:cactus']); }); diff --git a/kubejs/server_scripts/normal/recipes/enigmatica/remove.js b/kubejs/server_scripts/normal/recipes/enigmatica/remove.js index 895856486..fdf415dff 100644 --- a/kubejs/server_scripts/normal/recipes/enigmatica/remove.js +++ b/kubejs/server_scripts/normal/recipes/enigmatica/remove.js @@ -4,6 +4,7 @@ ServerEvents.recipes((event) => { } const recipes = [ + { id: /powah:crafting\/cable_(hardened|blazing|niotic|spirited|nitro)$/ }, // Emendatus Enigmatica Related Stuff for Normal Mode // Ore Processing Rework Related stuff diff --git a/kubejs/server_scripts/normal/recipes/powah/shaped.js b/kubejs/server_scripts/normal/recipes/powah/shaped.js index 32eb31d88..3ede53c46 100644 --- a/kubejs/server_scripts/normal/recipes/powah/shaped.js +++ b/kubejs/server_scripts/normal/recipes/powah/shaped.js @@ -82,7 +82,7 @@ ServerEvents.recipes((event) => { id: `powah:crafting/energy_cell_basic` }, { - output: Item.of('powah:capacitor_basic_large', 2), + output: '2x powah:capacitor_basic_large', pattern: [' AB', 'ACA', 'BA '], key: { A: '#forge:plates/invar', @@ -92,7 +92,7 @@ ServerEvents.recipes((event) => { id: `powah:crafting/capacitor_basic_large` }, { - output: Item.of('powah:energy_cable_basic', 12), + output: '12x powah:energy_cable_basic', pattern: ['AAA', 'BCB', 'AAA'], key: { A: 'powah:dielectric_rod_horizontal', @@ -152,6 +152,101 @@ ServerEvents.recipes((event) => { C: 'powah:dielectric_casing' }, id: `powah:crafting/reactor_basic` + }, + { + output: '4x powah:capacitor_hardened', + pattern: ['ABA', 'BCB', 'ABA'], + key: { + A: 'powah:dielectric_paste', + B: '#forge:ingots/energized_steel', + C: 'powah:capacitor_basic_large' + }, + id: `powah:crafting/capacitor_hardened` + }, + { + output: '4x powah:capacitor_blazing', + pattern: ['ABA', 'BCB', 'ABA'], + key: { + A: 'powah:dielectric_paste', + B: '#forge:gems/blazing', + C: 'powah:capacitor_basic_large' + }, + id: `powah:crafting/capacitor_blazing` + }, + { + output: '4x powah:capacitor_niotic', + pattern: ['ABA', 'BCB', 'ABA'], + key: { + A: 'powah:dielectric_paste', + B: '#forge:gems/niotic', + C: 'powah:capacitor_basic_large' + }, + id: `powah:crafting/capacitor_niotic` + }, + { + output: '4x powah:capacitor_spirited', + pattern: ['ABA', 'BCB', 'ABA'], + key: { + A: 'powah:dielectric_paste', + B: '#forge:gems/spirited', + C: 'powah:capacitor_basic_large' + }, + id: `powah:crafting/capacitor_spirited` + }, + { + output: '4x powah:capacitor_nitro', + pattern: ['ABA', 'BCB', 'ABA'], + key: { + A: 'powah:dielectric_paste', + B: '#forge:gems/nitro', + C: 'powah:capacitor_basic_large' + }, + id: `powah:crafting/capacitor_nitro` + }, + { + output: '8x powah:energy_cable_hardened', + pattern: ['AAA', 'ABA', 'AAA'], + key: { + A: 'powah:energy_cable_basic', + B: 'powah:capacitor_hardened' + }, + id: `${id_prefix}energy_cable_hardened` + }, + { + output: '8x powah:energy_cable_blazing', + pattern: ['AAA', 'ABA', 'AAA'], + key: { + A: 'powah:energy_cable_basic', + B: 'powah:capacitor_blazing' + }, + id: `${id_prefix}energy_cable_blazing` + }, + { + output: '8x powah:energy_cable_niotic', + pattern: ['AAA', 'ABA', 'AAA'], + key: { + A: 'powah:energy_cable_basic', + B: 'powah:capacitor_niotic' + }, + id: `${id_prefix}energy_cable_niotic` + }, + { + output: '8x powah:energy_cable_spirited', + pattern: ['AAA', 'ABA', 'AAA'], + key: { + A: 'powah:energy_cable_basic', + B: 'powah:capacitor_spirited' + }, + id: `${id_prefix}energy_cable_spirited` + }, + { + output: '8x powah:energy_cable_nitro', + pattern: ['AAA', 'ABA', 'AAA'], + key: { + A: 'powah:energy_cable_basic', + B: 'powah:capacitor_nitro' + }, + id: `${id_prefix}energy_cable_nitro` } ];