From ae2492eee7fee5f7ab72bb6e7cb5e8802bd4c278 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Mon, 3 Jul 2023 20:06:16 -0400 Subject: [PATCH 1/7] gold powder --- config/ftbquests/quests/chapters/chapter_one.snbt | 4 +++- .../ftbquests/quests/chapters/chapter_three.snbt | 1 + .../chapters/immersive_engineering_expert.snbt | 8 -------- .../chapters/industrial_foregoing_expert.snbt | 14 -------------- .../constants/jei_hidden_disabled.js | 1 + .../expert/recipes/hexerei/pestle_and_mortar.js | 12 ++++++++++++ .../recipes/naturesaura/patchouli_safe_remove.js | 3 ++- 7 files changed, 19 insertions(+), 24 deletions(-) diff --git a/config/ftbquests/quests/chapters/chapter_one.snbt b/config/ftbquests/quests/chapters/chapter_one.snbt index ea46677df..d2c64425b 100644 --- a/config/ftbquests/quests/chapters/chapter_one.snbt +++ b/config/ftbquests/quests/chapters/chapter_one.snbt @@ -158,7 +158,7 @@ { dependencies: ["69D302194D4262C6"] description: [ - "Right-Click the Gold Leaves on any Log to transform it into the Wooden Stands required for the Ritual of the Forest. " + "Sneak Right-Click the Gold Leaves on any Log to transform it into the Wooden Stands required for the Ritual of the Forest. " "" "Refer to the Book of Natural Aura for a visual representation of this structure and an explanation on its use. " ] @@ -1266,6 +1266,8 @@ "With a bit of effort, simpler materials may be harvested from ore, however. Craft a Pestle and Mortar to begin grinding them and a Blast Furnace to smelt it down into a useful form. " "" "The Pestle and Mortar is easily automated with just a hopper, no manual effort is required. " + "" + "To begin, simple metals such as Copper may be worked into an ingot by crushing, blasting, crushing, and blasting one final time. Better methods will become available later. " ] id: "438EA01F776992AD" rewards: [ diff --git a/config/ftbquests/quests/chapters/chapter_three.snbt b/config/ftbquests/quests/chapters/chapter_three.snbt index 47d25853d..818f0e2fe 100644 --- a/config/ftbquests/quests/chapters/chapter_three.snbt +++ b/config/ftbquests/quests/chapters/chapter_three.snbt @@ -454,6 +454,7 @@ { dependencies: ["606F79DAEB15E85B"] description: ["With greater knowledge of spatial dimensions, the Afrit is capable of carving out an even greater internal volume for use by the spirits running this apparatus, allowing them to perform mor complex tasks. "] + hide: true id: "7633AE65F02DCD1A" rewards: [{ command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/alchemists_delight" diff --git a/config/ftbquests/quests/chapters/immersive_engineering_expert.snbt b/config/ftbquests/quests/chapters/immersive_engineering_expert.snbt index 5039c939d..1c3139b6f 100644 --- a/config/ftbquests/quests/chapters/immersive_engineering_expert.snbt +++ b/config/ftbquests/quests/chapters/immersive_engineering_expert.snbt @@ -1246,14 +1246,6 @@ description: ["Bricks, Treated Wood, and Steel; these are what an Immersive Factory is built from, and the focus of early efforts in the mod. "] hide_dependency_lines: true id: "2BE93580D70ADF20" - rewards: [{ - command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/immersive_engineering/rare" - icon: "kubejs:rare_lootbox" - id: "7AFEEC7724D63B67" - player_command: false - title: "Rare Immersive Engineering Loot Box" - type: "command" - }] shape: "hexagon" tasks: [{ icon: "minecraft:raw_iron" diff --git a/config/ftbquests/quests/chapters/industrial_foregoing_expert.snbt b/config/ftbquests/quests/chapters/industrial_foregoing_expert.snbt index a8a07e51a..b4452b7ee 100644 --- a/config/ftbquests/quests/chapters/industrial_foregoing_expert.snbt +++ b/config/ftbquests/quests/chapters/industrial_foregoing_expert.snbt @@ -352,12 +352,6 @@ hide_dependency_lines: true icon: "minecraft:wheat" id: "10C9F0F84BF69D0A" - rewards: [{ - count: 8 - id: "3E0930B1DC35B819" - item: "minecraft:wheat_seeds" - type: "item" - }] shape: "hexagon" tasks: [{ icon: "minecraft:wheat_seeds" @@ -382,14 +376,6 @@ hide_dependency_lines: true icon: "industrialforegoing:meat_feeder" id: "3A4F484FD23B29BA" - rewards: [{ - command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/industrial_foregoing/rare" - icon: "kubejs:rare_lootbox" - id: "3858A904658B1C03" - player_command: false - title: "Rare Industrial Foregoing Loot Box" - type: "command" - }] shape: "hexagon" tasks: [{ icon: "minecraft:raw_copper" diff --git a/kubejs/client_scripts/constants/jei_hidden_disabled.js b/kubejs/client_scripts/constants/jei_hidden_disabled.js index cb9ff0cba..a3c727be8 100644 --- a/kubejs/client_scripts/constants/jei_hidden_disabled.js +++ b/kubejs/client_scripts/constants/jei_hidden_disabled.js @@ -685,6 +685,7 @@ jei.expert.recipes.hidden = [ 'naturesaura:depth_ingot_creation', 'naturesaura:projectile_generator', 'naturesaura:firework_generator', + 'naturesaura:gold_powder', 'ars_nouveau:imbuement_chamber', 'ars_nouveau:mycelial_sourcelink', 'ars_nouveau:vitalic_sourcelink', diff --git a/kubejs/server_scripts/expert/recipes/hexerei/pestle_and_mortar.js b/kubejs/server_scripts/expert/recipes/hexerei/pestle_and_mortar.js index bd201a956..230362445 100644 --- a/kubejs/server_scripts/expert/recipes/hexerei/pestle_and_mortar.js +++ b/kubejs/server_scripts/expert/recipes/hexerei/pestle_and_mortar.js @@ -95,6 +95,18 @@ ServerEvents.recipes((event) => { output: '2x hexerei:mindful_trance_blend', grindingTime: 2 * 20, id: `hexerei:mindful_trance_blend_from_pestle_and_mortar` + }, + { + inputs: [ + 'naturesaura:gold_leaf', + 'naturesaura:gold_leaf', + 'naturesaura:gold_leaf', + 'naturesaura:gold_leaf', + 'naturesaura:gold_leaf' + ], + output: '15x naturesaura:gold_powder', + grindingTime: 1 * 20, + id: `${id_prefix}gold_powder` } ]; diff --git a/kubejs/server_scripts/expert/recipes/naturesaura/patchouli_safe_remove.js b/kubejs/server_scripts/expert/recipes/naturesaura/patchouli_safe_remove.js index 892e05423..c9e744860 100644 --- a/kubejs/server_scripts/expert/recipes/naturesaura/patchouli_safe_remove.js +++ b/kubejs/server_scripts/expert/recipes/naturesaura/patchouli_safe_remove.js @@ -28,7 +28,8 @@ ServerEvents.recipes((event) => { { id: 'naturesaura:calling_spirit', output: 'naturesaura:calling_spirit' }, { id: 'naturesaura:depth_ingot_creation', output: 'naturesaura:depth_ingot' }, { id: 'naturesaura:projectile_generator', output: 'naturesaura:projectile_generator' }, - { id: 'naturesaura:firework_generator', output: 'naturesaura:firework_generator' } + { id: 'naturesaura:firework_generator', output: 'naturesaura:firework_generator' }, + { id: 'naturesaura:gold_powder', output: 'naturesaura:gold_powder' } ], altar: [ { id: 'naturesaura:altar/infused_stone', output: 'naturesaura:infused_stone' }, From dd70c643105c264f40879cbcbeb479ff67ea8ed2 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Tue, 4 Jul 2023 08:07:06 -0400 Subject: [PATCH 2/7] fix Some Assembly Required sawing recipes --- changelogs/CHANGELOG.md | 14 +++ .../base/recipes/create/cutting.js | 99 +++++++++++++++---- .../base/recipes/farmersdelight/cutting.js | 6 ++ .../expert/recipes/create/crushing.js | 27 +++++ .../expert/recipes/farmersdelight/cutting.js | 26 +++-- 5 files changed, 138 insertions(+), 34 deletions(-) create mode 100644 kubejs/server_scripts/expert/recipes/create/crushing.js diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md index 415a52b4d..dc06ab020 100644 --- a/changelogs/CHANGELOG.md +++ b/changelogs/CHANGELOG.md @@ -1,3 +1,17 @@ +### Enigmatica 9 v1.9.0 + +🚀 Forge-1.19.2-43.2.13 | [📜 Mod Updates](https://github.com/EnigmaticaModpacks/Enigmatica9/blob/master/changelogs/changelog_mods_1.8.0.md) | [📋 Modlist](https://github.com/EnigmaticaModpacks/Enigmatica9/blob/master/changelogs/modlist_1.8.0.md) + +### 🎁 New Mods Added + +### 🌟 Improvements + +### 🐛 Fixed Bugs + +- Fix Some Assembly Required sawing recipes [\#460](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/460) ([MuteTiefling](https://github.com/MuteTiefling)) + +--- + ### Enigmatica 9 v1.8.1 🚀 Forge-1.19.2-43.2.13 | [📜 Mod Updates](https://github.com/EnigmaticaModpacks/Enigmatica9/blob/master/changelogs/changelog_mods_1.8.1.md) | [📋 Modlist](https://github.com/EnigmaticaModpacks/Enigmatica9/blob/master/changelogs/modlist_1.8.1.md) diff --git a/kubejs/server_scripts/base/recipes/create/cutting.js b/kubejs/server_scripts/base/recipes/create/cutting.js index 549bfb644..54dd2901b 100644 --- a/kubejs/server_scripts/base/recipes/create/cutting.js +++ b/kubejs/server_scripts/base/recipes/create/cutting.js @@ -3,16 +3,82 @@ ServerEvents.recipes((event) => { const recipes = [ { - input: [Item.of('naturesaura:ancient_log')], - outputs: [Item.of('naturesaura:ancient_planks', 6)], + input: ['naturesaura:ancient_log'], + outputs: ['6x naturesaura:ancient_planks'], processingTime: 50, id: `${id_prefix}ancient_planks_from_ancient_log` }, { - input: [Item.of('naturesaura:ancient_bark')], - outputs: [Item.of('naturesaura:ancient_planks', 6)], + input: ['naturesaura:ancient_bark'], + outputs: ['6x naturesaura:ancient_planks'], processingTime: 50, id: `${id_prefix}ancient_planks_from_ancient_bark` + }, + { + input: ['minecraft:apple'], + outputs: ['2x some_assembly_required:apple_slices'], + processingTime: 30, + id: `${id_prefix}apple_slices` + }, + { + input: ['minecraft:bread'], + outputs: ['4x some_assembly_required:bread_slice'], + processingTime: 30, + id: `${id_prefix}bread_slice` + }, + { + input: ['some_assembly_required:burger_bun'], + outputs: ['some_assembly_required:burger_bun_bottom', 'some_assembly_required:burger_bun_top'], + processingTime: 30, + id: `${id_prefix}sliced_burger_bun` + }, + { + input: ['minecraft:beetroot'], + outputs: ['2x some_assembly_required:chopped_beetroot'], + processingTime: 30, + id: `${id_prefix}chopped_beetroot` + }, + { + input: ['minecraft:carrot'], + outputs: ['2x some_assembly_required:chopped_carrot'], + processingTime: 30, + id: `${id_prefix}chopped_carrot` + }, + { + input: ['minecraft:golden_carrot'], + outputs: ['2x some_assembly_required:chopped_golden_carrot'], + processingTime: 30, + id: `${id_prefix}chopped_golden_carrot` + }, + { + input: ['minecraft:enchanted_golden_apple'], + outputs: ['2x some_assembly_required:enchanted_golden_apple_slices'], + processingTime: 30, + id: `${id_prefix}enchanted_golden_apple_slices` + }, + { + input: ['minecraft:golden_apple'], + outputs: ['2x some_assembly_required:golden_apple_slices'], + processingTime: 30, + id: `${id_prefix}golden_apple_slices` + }, + { + input: ['#forge:crops/tomato'], + outputs: ['2x some_assembly_required:tomato_slices'], + processingTime: 30, + id: `${id_prefix}tomato_slices` + }, + { + input: ['minecraft:pumpkin'], + outputs: ['4x farmersdelight:pumpkin_slice'], + processingTime: 30, + id: `${id_prefix}pumpkin_slice` + }, + { + input: ['minecraft:melon'], + outputs: ['8x minecraft:melon_slice'], + processingTime: 30, + id: `${id_prefix}melon_slice` } ]; @@ -21,8 +87,8 @@ ServerEvents.recipes((event) => { let input = material.log.block, output = material.log.stripped; recipes.push({ - input: [Item.of(input)], - outputs: [Item.of(output)], + input: [input], + outputs: [output], processingTime: 50, id: `${id_prefix}${output.replace(':', '_')}_from_${input.replace(':', '_')}` }); @@ -31,8 +97,8 @@ ServerEvents.recipes((event) => { input = material.wood.block; output = material.wood.stripped; recipes.push({ - input: [Item.of(input)], - outputs: [Item.of(output)], + input: [input], + outputs: [output], processingTime: 50, id: `${id_prefix}${output.replace(':', '_')}_from_${input.replace(':', '_')}` }); @@ -41,16 +107,16 @@ ServerEvents.recipes((event) => { input = material.log.stripped; output = material.plank.block; recipes.push({ - input: [Item.of(input)], - outputs: [Item.of(output, 6)], + input: [input], + outputs: [`6x ${output}`], processingTime: 50, id: `${id_prefix}${output.replace(':', '_')}_from_${input.replace(':', '_')}` }); input = material.wood.stripped; recipes.push({ - input: [Item.of(input)], - outputs: [Item.of(output, 6)], + input: [input], + outputs: [`6x ${output}`], processingTime: 50, id: `${id_prefix}${output.replace(':', '_')}_from_${input.replace(':', '_')}` }); @@ -58,13 +124,8 @@ ServerEvents.recipes((event) => { recipes.forEach((recipe) => { recipe.type = 'create:cutting'; - - // ingredients: [{ item: 'minecraft:oak_log' }], - recipe.ingredients = recipe.input.map((input) => input.toJson()); - - // results: [{ count: 6, item: 'minecraft:oak_planks' }] - recipe.results = recipe.outputs.map((output) => output.toJson()); - + recipe.ingredients = recipe.input.map((input) => Ingredient.of(input).toJson()); + recipe.results = recipe.outputs.map((output) => Item.of(output).toJson()); event.custom(recipe).id(recipe.id); }); }); diff --git a/kubejs/server_scripts/base/recipes/farmersdelight/cutting.js b/kubejs/server_scripts/base/recipes/farmersdelight/cutting.js index 398712a3b..746d7e733 100644 --- a/kubejs/server_scripts/base/recipes/farmersdelight/cutting.js +++ b/kubejs/server_scripts/base/recipes/farmersdelight/cutting.js @@ -9,6 +9,12 @@ ServerEvents.recipes((event) => { action: 'pickaxe_dig' }, id: `${id_prefix}nautilus_shell` + }, + { + ingredients: [{ item: 'minecraft:melon' }], + result: [{ item: 'minecraft:melon_slice', count: 8 }], + tool: { tag: 'forge:tools/knives' }, + id: `farmersdelight:cutting/melon` } ]; diff --git a/kubejs/server_scripts/expert/recipes/create/crushing.js b/kubejs/server_scripts/expert/recipes/create/crushing.js new file mode 100644 index 000000000..6a91b0a34 --- /dev/null +++ b/kubejs/server_scripts/expert/recipes/create/crushing.js @@ -0,0 +1,27 @@ +ServerEvents.recipes((event) => { + if (global.isExpertMode == false) { + return; + } + const id_prefix = 'enigmatica:expert/create/crushing/'; + + let recipes = [ + { + outputs: [ + { item: 'twilightforest:knightmetal_ingot', count: 2 }, + { item: 'minecraft:leather', chance: 0.5 }, + { item: 'twilightforest:knightmetal_ingot', count: 1, chance: 0.6 }, + { item: 'minecraft:string', count: 2, chance: 0.25 } + ], + inputs: ['minecraft:iron_horse_armor'], + processingTime: 60, + id: `create:crushing/iron_horse_armor` + } + ]; + + recipes.forEach((recipe) => { + recipe.type = 'create:crushing'; + recipe.ingredients = recipe.inputs.map((input) => Ingredient.of(input).toJson()); + recipe.results = recipe.outputs; + event.custom(recipe).id(recipe.id); + }); +}); diff --git a/kubejs/server_scripts/expert/recipes/farmersdelight/cutting.js b/kubejs/server_scripts/expert/recipes/farmersdelight/cutting.js index 827c819ca..acfce518c 100644 --- a/kubejs/server_scripts/expert/recipes/farmersdelight/cutting.js +++ b/kubejs/server_scripts/expert/recipes/farmersdelight/cutting.js @@ -8,42 +8,38 @@ ServerEvents.recipes((event) => { { ingredients: [{ tag: 'forge:glyphs' }], result: [{ item: 'ars_nouveau:blank_parchment' }], - tool: { - tag: 'forge:tools/knives' - }, + tool: { tag: 'forge:tools/knives' }, id: `${id_prefix}recycle_glyphs_to_parchment` }, { ingredients: [{ item: 'hexerei:belladonna_flower' }], result: [{ item: 'hexerei:belladonna_flowers' }, { item: 'hexerei:belladonna_berries' }], - tool: { - tag: 'forge:tools/knives' - }, + tool: { tag: 'forge:tools/knives' }, id: `${id_prefix}process_belladonna_flower` }, { ingredients: [{ item: 'hexerei:yellow_dock_bush' }], result: [{ item: 'hexerei:yellow_dock_flowers' }, { item: 'hexerei:yellow_dock_leaves' }], - tool: { - tag: 'forge:tools/knives' - }, + tool: { tag: 'forge:tools/knives' }, id: `${id_prefix}process_yellow_dock_bush` }, { ingredients: [{ item: 'hexerei:mugwort_bush' }], result: [{ item: 'hexerei:mugwort_flowers' }, { item: 'hexerei:mugwort_leaves' }], - tool: { - tag: 'forge:tools/knives' - }, + tool: { tag: 'forge:tools/knives' }, id: `${id_prefix}process_mugwort_bush` }, { ingredients: [{ item: 'hexerei:mandrake_flower' }], result: [{ item: 'hexerei:mandrake_flowers' }, { item: 'hexerei:mandrake_root' }], - tool: { - tag: 'forge:tools/knives' - }, + tool: { tag: 'forge:tools/knives' }, id: `${id_prefix}process_mandrake_flower` + }, + { + ingredients: [{ item: 'minecraft:saddle' }], + result: [{ item: 'minecraft:leather' }, { item: 'twilightforest:knightmetal_ingot', chance: 0.1 }], + tool: { tag: 'forge:shears' }, + id: `farmersdelight:cutting/saddle` } ]; From f8ffd2e9b9b232395d3727342444ea916ba3479c Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Tue, 4 Jul 2023 08:22:55 -0400 Subject: [PATCH 3/7] more loot for completing spawner rifts --- .../base/recipes/gateways/gateways.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/base/recipes/gateways/gateways.js b/kubejs/server_scripts/base/recipes/gateways/gateways.js index 3002bc78f..09bfc86ec 100644 --- a/kubejs/server_scripts/base/recipes/gateways/gateways.js +++ b/kubejs/server_scripts/base/recipes/gateways/gateways.js @@ -12,6 +12,18 @@ ServerEvents.highPriorityData((event) => { { type: 'stack', stack: Item.of('kubejs:aura_leaf', '{aura_amount:20000.0d,aura_max:1500000.0d}') + }, + { + type: 'loot_table', + loot_table: 'enigmatica:apotheosis_gem_cache', + rolls: 5, + desc: 'Apotheosis Gems' + }, + { + type: 'loot_table', + loot_table: 'enigmatica:loot_boxes/miners_delight', + rolls: 1, + desc: `Miner's Delight Gems` } ], completion_xp: 250, @@ -61,8 +73,8 @@ ServerEvents.highPriorityData((event) => { { entity: 'minecraft:cave_spider' }, { entity: 'minecraft:cave_spider' }, { entity: 'minecraft:cave_spider' }, - { entity: 'minecraft:cave_spider' }, - { entity: 'minecraft:cave_spider' }, + { entity: 'twilightforest:slime_beetle' }, + { entity: 'twilightforest:slime_beetle' }, { entity: 'twilightforest:fire_beetle' }, { entity: 'twilightforest:fire_beetle' } ], From 358b9543183528867de32ed4e0dce1713141283e Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Tue, 4 Jul 2023 09:17:25 -0400 Subject: [PATCH 4/7] grow --- .../configswapper/expert/config/ars_nouveau/glyph_grow.toml | 4 ++-- .../loot_tables/chests/enigmatica/ars_nouveau_glyph_cache.js | 2 +- .../expert/loot_tables/entities/twilightforest/death_tome.js | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config/configswapper/expert/config/ars_nouveau/glyph_grow.toml b/config/configswapper/expert/config/ars_nouveau/glyph_grow.toml index db5ba3fd9..a3412ba84 100644 --- a/config/configswapper/expert/config/ars_nouveau/glyph_grow.toml +++ b/config/configswapper/expert/config/ars_nouveau/glyph_grow.toml @@ -5,7 +5,7 @@ enabled = true #Cost #Range: > -2147483648 - cost = 70 + cost = 10 #Is Starter Glyph? starter = false #The maximum number of times this glyph may appear in a single spell @@ -13,7 +13,7 @@ per_spell_limit = 2147483647 #The tier of the glyph #Range: 1 ~ 99 - glyph_tier = 2 + glyph_tier = 1 #Limits the number of times a given augment may be applied to a given effect #Example entry: "glyph_amplify=5" augment_limits = [] diff --git a/kubejs/server_scripts/expert/loot_tables/chests/enigmatica/ars_nouveau_glyph_cache.js b/kubejs/server_scripts/expert/loot_tables/chests/enigmatica/ars_nouveau_glyph_cache.js index da56a132c..0b2b40a90 100644 --- a/kubejs/server_scripts/expert/loot_tables/chests/enigmatica/ars_nouveau_glyph_cache.js +++ b/kubejs/server_scripts/expert/loot_tables/chests/enigmatica/ars_nouveau_glyph_cache.js @@ -16,6 +16,7 @@ ServerEvents.genericLootTables((event) => { pool.addItem('toomanyglyphs:glyph_filter_monster', 1, 1); pool.addItem('toomanyglyphs:glyph_filter_item', 1, 1); pool.addItem('toomanyglyphs:glyph_reverse_direction', 1, 1); + pool.addItem('ars_nouveau:glyph_grow', 1, 1); pool.addItem('ars_nouveau:glyph_dispel', 1, 1); pool.addItem('ars_nouveau:glyph_craft', 1, 1); pool.addItem('ars_nouveau:glyph_gust', 1, 1); @@ -78,7 +79,6 @@ ServerEvents.genericLootTables((event) => { pool.addItem('ars_nouveau:glyph_wind_shear', 1, 1); pool.addItem('ars_nouveau:glyph_slowfall', 1, 1); pool.addItem('ars_nouveau:glyph_cold_snap', 1, 1); - pool.addItem('ars_nouveau:glyph_grow', 1, 1); pool.addItem('ars_nouveau:glyph_firework', 1, 1); pool.addItem('ars_nouveau:glyph_animate_block', 1, 1); pool.addItem('ars_nouveau:glyph_heal', 1, 1); diff --git a/kubejs/server_scripts/expert/loot_tables/entities/twilightforest/death_tome.js b/kubejs/server_scripts/expert/loot_tables/entities/twilightforest/death_tome.js index e7b243d00..2b295be8a 100644 --- a/kubejs/server_scripts/expert/loot_tables/entities/twilightforest/death_tome.js +++ b/kubejs/server_scripts/expert/loot_tables/entities/twilightforest/death_tome.js @@ -29,6 +29,7 @@ ServerEvents.entityLootTables((event) => { pool.addItem('ars_nouveau:glyph_evaporate', 2); pool.addItem('ars_nouveau:glyph_fell', 2); pool.addItem('ars_nouveau:glyph_freeze', 2); + pool.addItem('ars_nouveau:glyph_grow', 2); pool.addItem('ars_nouveau:glyph_gust', 2); pool.addItem('ars_nouveau:glyph_harvest', 2); pool.addItem('ars_nouveau:glyph_ignite', 2); From 7d4497e3361d596b129d0f19ce9876fe79d0c1f4 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Tue, 4 Jul 2023 09:46:05 -0400 Subject: [PATCH 5/7] decrease spawn range for spirit spawners --- .../expert/recipes/spirit/soul_cage_tier.js | 8 +-- .../normal/recipes/spirit/soul_cage_tier.js | 58 +++++++++++++++++++ 2 files changed, 62 insertions(+), 4 deletions(-) create mode 100644 kubejs/server_scripts/normal/recipes/spirit/soul_cage_tier.js diff --git a/kubejs/server_scripts/expert/recipes/spirit/soul_cage_tier.js b/kubejs/server_scripts/expert/recipes/spirit/soul_cage_tier.js index 497c2e0ee..b5322697b 100644 --- a/kubejs/server_scripts/expert/recipes/spirit/soul_cage_tier.js +++ b/kubejs/server_scripts/expert/recipes/spirit/soul_cage_tier.js @@ -11,7 +11,7 @@ ServerEvents.recipes((event) => { minSpawnDelay: 300, maxSpawnDelay: 1000, spawnCount: 3, - spawnRange: 5, + spawnRange: 4, id: `spirit:tiers/tier_1` }, { @@ -20,7 +20,7 @@ ServerEvents.recipes((event) => { minSpawnDelay: 150, maxSpawnDelay: 600, spawnCount: 5, - spawnRange: 7, + spawnRange: 5, id: `spirit:tiers/tier_2` }, { @@ -29,7 +29,7 @@ ServerEvents.recipes((event) => { minSpawnDelay: 75, maxSpawnDelay: 400, spawnCount: 7, - spawnRange: 9, + spawnRange: 6, id: `spirit:tiers/tier_3` }, { @@ -38,7 +38,7 @@ ServerEvents.recipes((event) => { minSpawnDelay: 25, maxSpawnDelay: 300, spawnCount: 9, - spawnRange: 11, + spawnRange: 7, id: `spirit:tiers/tier_4` } ]; diff --git a/kubejs/server_scripts/normal/recipes/spirit/soul_cage_tier.js b/kubejs/server_scripts/normal/recipes/spirit/soul_cage_tier.js new file mode 100644 index 000000000..8801683c5 --- /dev/null +++ b/kubejs/server_scripts/normal/recipes/spirit/soul_cage_tier.js @@ -0,0 +1,58 @@ +ServerEvents.recipes((event) => { + if (global.isNormalMode == false) { + return; + } + + const id_prefix = 'enigmatica:normal/spirit/soul_cage_tier/'; + const recipes = [ + { + displayName: 'spirit.soul_cage.tier_1', + requiredSouls: 64, + minSpawnDelay: 300, + maxSpawnDelay: 1000, + spawnCount: 3, + spawnRange: 4, + id: `spirit:tiers/tier_1` + }, + { + displayName: 'spirit.soul_cage.tier_2', + requiredSouls: 128, + minSpawnDelay: 150, + maxSpawnDelay: 600, + spawnCount: 5, + spawnRange: 5, + id: `spirit:tiers/tier_2` + }, + { + displayName: 'spirit.soul_cage.tier_3', + requiredSouls: 256, + minSpawnDelay: 75, + maxSpawnDelay: 400, + spawnCount: 7, + spawnRange: 6, + id: `spirit:tiers/tier_3` + }, + { + displayName: 'spirit.soul_cage.tier_4', + requiredSouls: 512, + minSpawnDelay: 25, + maxSpawnDelay: 300, + spawnCount: 9, + spawnRange: 7, + id: `spirit:tiers/tier_4` + } + ]; + + recipes.forEach((recipe) => { + recipe.type = 'spirit:soul_cage_tier'; + + // All tiers can be controlled by redstone, ignore spawn conditions, and don't require a player nearby. + // Blacklist is covered by tags already. + recipe.nearbyRange = -1; + recipe.redstoneControlled = true; + recipe.ignoreSpawnConditions = true; + recipe.blacklist = []; + + event.custom(recipe).id(recipe.id); + }); +}); From d84d87075dfaad8eed57546d2fb6f37566831411 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Tue, 4 Jul 2023 09:47:13 -0400 Subject: [PATCH 6/7] Update CHANGELOG.md --- changelogs/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md index dc06ab020..b20b8bd11 100644 --- a/changelogs/CHANGELOG.md +++ b/changelogs/CHANGELOG.md @@ -9,6 +9,7 @@ ### 🐛 Fixed Bugs - Fix Some Assembly Required sawing recipes [\#460](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/460) ([MuteTiefling](https://github.com/MuteTiefling)) +- Reduce spawn range for Spirit spawners [\#460](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/460) ([MuteTiefling](https://github.com/MuteTiefling)) --- From a306ffa45afe661baa37ba56abba0e15ee05bee0 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Tue, 4 Jul 2023 10:05:10 -0400 Subject: [PATCH 7/7] quests --- .../quests/chapters/chapter_one.snbt | 16 +++---- .../quests/chapters/chapter_two.snbt | 44 +++++++++++++------ 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/config/ftbquests/quests/chapters/chapter_one.snbt b/config/ftbquests/quests/chapters/chapter_one.snbt index d2c64425b..75c4ea70a 100644 --- a/config/ftbquests/quests/chapters/chapter_one.snbt +++ b/config/ftbquests/quests/chapters/chapter_one.snbt @@ -269,14 +269,6 @@ ] id: "4830632A0E6E9651" rewards: [ - { - command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/alchemists_delight" - icon: "kubejs:alchemists_delight" - id: "552050622E3679AC" - player_command: false - title: "Alchemist's Delight" - type: "command" - } { command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/sorcerers_delight" icon: "kubejs:sorcerers_delight" @@ -285,6 +277,12 @@ title: "Sorcerer's Delight" type: "command" } + { + count: 3 + id: "643EF395119756CD" + item: "ars_nouveau:arcane_platform" + type: "item" + } ] tasks: [{ icon: "ars_nouveau:imbuement_chamber" @@ -1209,7 +1207,7 @@ description: [ "More finely crafted apparatus will need more delicately formed metals." "" - "These tough mechanical machines, the Mechanical Press and Rolling Mill are up to the task of properly pounding out plates or forming wires and rods, respectively. " + "These tough mechanical machines, the Mechanical Press and Rolling Mill, are up to the task of properly pounding out plates or forming wires and rods, respectively. " "" "=================================" "" diff --git a/config/ftbquests/quests/chapters/chapter_two.snbt b/config/ftbquests/quests/chapters/chapter_two.snbt index 9d61fe148..fbe6130c1 100644 --- a/config/ftbquests/quests/chapters/chapter_two.snbt +++ b/config/ftbquests/quests/chapters/chapter_two.snbt @@ -213,20 +213,37 @@ } { dependencies: ["00B21E64DEFACB40"] + description: ["Capable of imparting a number of enchantments on items, this Enchanting Apparatus will no doubt be of enormous value in the endeavors to come. "] + icon: "ars_nouveau:enchanting_apparatus" id: "31E4C2A162D7497C" - rewards: [{ - command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/alchemists_delight" - icon: "kubejs:alchemists_delight" - id: "4C9ACBB578AFC307" - player_command: false - title: "Alchemist's Delight" - type: "command" - }] - tasks: [{ - id: "2D56C518D77625DD" - item: "ars_nouveau:enchanting_apparatus" - type: "item" - }] + rewards: [ + { + command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/alchemists_delight" + icon: "kubejs:alchemists_delight" + id: "4C9ACBB578AFC307" + player_command: false + title: "Alchemist's Delight" + type: "command" + } + { + count: 3 + id: "3EA016A20F0AE7FA" + item: "ars_nouveau:arcane_platform" + type: "item" + } + ] + tasks: [ + { + id: "2D56C518D77625DD" + item: "ars_nouveau:enchanting_apparatus" + type: "item" + } + { + id: "0C24097F0058189C" + item: "ars_nouveau:arcane_core" + type: "item" + } + ] x: 2.5d y: -0.5d } @@ -828,6 +845,7 @@ } { dependencies: ["60324503ED7AC4C1"] + description: ["Known to the ancients as mountain copper, this unique alloy is of particular use in advanced enchanting as an amplifier. "] id: "00B21E64DEFACB40" rewards: [{ command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/scavengers_delight"