diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md index c96b96193..69a163343 100644 --- a/changelogs/CHANGELOG.md +++ b/changelogs/CHANGELOG.md @@ -17,6 +17,9 @@ - [Expert] Add a recipe for the new chunkloader upgrade for PNC drones [\#966](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/966) - [Expert] Processing Metal Shards now has an extra step involving the creation and use of Lacunar Acid [\#968](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/968) - Add Aloe to the Market [\#972](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/972) +- Add many shrooms to the Market [\#975](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/975) +- Add methods of obtaining various BYG soils for planting [\#975](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/975) +- Sporelings in the End may now drop end shrooms [\#975](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/975) ### 🐛 Fixed Bugs @@ -30,6 +33,7 @@ - Remove conflicting chest recipe. Vanilla chest may be crafted by converting any other chest. [\#966](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/966) - [Normal] Correct Thermal's quests regarding Fluxducts [\#972](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/972) - Fixed missing Apotheosis bosses [\#972](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/972) +- Removed duplicate Cabbage seeds in the Market [\#975](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/975) ### Enigmatica 9 v1.21.0 diff --git a/kubejs/data/farmingforblockheads/farmingforblockheads_compat/mushrooms_for_emeralds.json b/kubejs/data/farmingforblockheads/farmingforblockheads_compat/mushrooms_for_emeralds.json new file mode 100644 index 000000000..9441245ed --- /dev/null +++ b/kubejs/data/farmingforblockheads/farmingforblockheads_compat/mushrooms_for_emeralds.json @@ -0,0 +1,29 @@ +{ + "modId": "farmingforblockheads", + "group": { + "name": "Generic Mushrooms", + "enabledByDefault": true, + "defaultPayment": { "item": "minecraft:emerald" }, + "defaultCategory": "farmingforblockheads:saplings" + }, + "customEntries": [ + { "output": "byg:purple_bulbis_oddity" }, + { "output": "byg:bulbis_oddity" }, + { "output": "byg:fungal_imparius" }, + { "output": "byg:imparius_mushroom" }, + { "output": "byg:sythian_fungus" }, + { "output": "byg:shulkren_fungus" }, + { "output": "byg:death_cap" }, + { "output": "byg:soul_shroom" }, + { "output": "byg:embur_wart" }, + { "output": "byg:green_mushroom" }, + { "output": "byg:weeping_milkcap" }, + { "output": "byg:wood_blewit" }, + { "output": "minecraft:brown_mushroom" }, + { "output": "minecraft:red_mushroom" }, + { "output": "minecraft:crimson_fungus" }, + { "output": "minecraft:warped_fungus" }, + { "output": "quark:glow_shroom" }, + { "output": "twilightforest:mushgloom" } + ] +} diff --git a/kubejs/data/farmingforblockheads/farmingforblockheads_compat/seeds_for_emerald.json b/kubejs/data/farmingforblockheads/farmingforblockheads_compat/seeds_for_emerald.json index e46400765..1a5a77888 100644 --- a/kubejs/data/farmingforblockheads/farmingforblockheads_compat/seeds_for_emerald.json +++ b/kubejs/data/farmingforblockheads/farmingforblockheads_compat/seeds_for_emerald.json @@ -11,7 +11,7 @@ { "output": "byg:crimson_berries" }, { "output": "byg:nightshade_berries" }, { "output": "byg:aloe_vera" }, - { "output": "farmersdelight:cabbage_seeds" }, + { "output": "byg:cattail_sprout" }, { "output": "farmersdelight:onion" }, { "output": "minecraft:sweet_berries" }, { "output": "sushigocrafting:sesame_seeds" }, diff --git a/kubejs/server_scripts/base/loot_tables/entities/cnb/sporeling.js b/kubejs/server_scripts/base/loot_tables/entities/cnb/sporeling.js index fdb11021d..1e6c7ffaa 100644 --- a/kubejs/server_scripts/base/loot_tables/entities/cnb/sporeling.js +++ b/kubejs/server_scripts/base/loot_tables/entities/cnb/sporeling.js @@ -14,6 +14,10 @@ ServerEvents.genericLootTables((event) => { condition: 'minecraft:inverted', term: { condition: 'minecraft:location_check', predicate: { dimension: 'minecraft:the_nether' } } }); + pool.addCondition({ + condition: 'minecraft:inverted', + term: { condition: 'minecraft:location_check', predicate: { dimension: 'minecraft:the_end' } } + }); pool.addCondition({ chance: 0.25, condition: 'minecraft:random_chance_with_looting', @@ -40,5 +44,24 @@ ServerEvents.genericLootTables((event) => { looting_multiplier: 0.01 }); }); + + table.addPool((pool) => { + pool.rolls = 1.0; + pool.addItem('byg:imparius_mushroom', 1, [1, 3]); + pool.addItem('byg:shulkren_fungus', 1, [1, 3]); + pool.addItem('byg:purple_bulbis_oddity', 1, [1, 3]); + pool.addItem('byg:bulbis_oddity', 1, [1, 3]); + pool.addItem('byg:fungal_imparius', 1, [1, 3]); + + pool.addCondition({ + condition: 'minecraft:location_check', + predicate: { dimension: 'minecraft:the_end' } + }); + pool.addCondition({ + chance: 0.25, + condition: 'minecraft:random_chance_with_looting', + looting_multiplier: 0.01 + }); + }); }); }); diff --git a/kubejs/server_scripts/base/recipes/byg/shaped.js b/kubejs/server_scripts/base/recipes/byg/shaped.js index 01fd0b930..bfd83f7c1 100644 --- a/kubejs/server_scripts/base/recipes/byg/shaped.js +++ b/kubejs/server_scripts/base/recipes/byg/shaped.js @@ -35,6 +35,24 @@ ServerEvents.recipes((event) => { B: '#forge:ingots/iron' }, id: 'byg:chain_plating' + }, + { + output: '4x byg:ether_soil', + pattern: ['AB', 'BA'], + key: { + A: 'byg:lush_dirt', + B: 'byg:ether_stone' + }, + id: `${id_prefix}ether_soil` + }, + { + output: '4x byg:end_sand', + pattern: ['AB', 'BA'], + key: { + A: 'occultism:crushed_end_stone', + B: '#forge:sand/colorless' + }, + id: `${id_prefix}end_sand` } ]; @@ -49,27 +67,46 @@ ServerEvents.recipes((event) => { }); }); - const stone_conversions = [ - 'byg:rocky_stone', - 'byg:dacite', - 'byg:travertine', - 'byg:soapstone', - 'byg:scoria_stone', - 'byg:red_rock' + const block_conversions = [ + { + blocks: [ + 'byg:rocky_stone', + 'byg:dacite', + 'byg:travertine', + 'byg:soapstone', + 'byg:scoria_stone', + 'byg:red_rock', + 'byg:ether_stone' + ] + }, + { + blocks: [ + 'byg:end_sand', + 'byg:bulbis_phycelium', + 'byg:ivis_phylium', + 'byg:imparius_phylium', + 'byg:shulkren_phylium' + ] + }, + { blocks: ['byg:ether_soil', 'byg:ether_phylium'] }, + { blocks: ['minecraft:dirt', 'byg:lush_dirt'] } ]; - stone_conversions.forEach((stone, index) => { - let input = stone; - let output = index + 1 >= stone_conversions.length ? stone_conversions[0] : stone_conversions[index + 1]; + block_conversions.forEach((block_conversion) => { + let blocks = block_conversion.blocks; + blocks.forEach((block, index) => { + let input = block; + let output = index + 1 >= blocks.length ? blocks[0] : blocks[index + 1]; - recipes.push({ - output: `8x ${output}`, - pattern: ['AAA', 'ABA', 'AAA'], - key: { - A: input, - B: '#forge:essences/manipulation' - }, - id: `${id_prefix}${input.replace(':', '_')}_from_${output.replace(':', '_')}` + recipes.push({ + output: `8x ${output}`, + pattern: ['AAA', 'ABA', 'AAA'], + key: { + A: input, + B: '#forge:essences/manipulation' + }, + id: `${id_prefix}${input.replace(':', '_')}_from_${output.replace(':', '_')}` + }); }); });