From 60f2a3d556dac2046dbf284621805988ff3301e4 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Fri, 18 Oct 2024 12:10:05 -0400 Subject: [PATCH 01/16] new steel --- .../recipes/enderio/alloy_smelting.js | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 kubejs/server_scripts/recipes/enderio/alloy_smelting.js diff --git a/kubejs/server_scripts/recipes/enderio/alloy_smelting.js b/kubejs/server_scripts/recipes/enderio/alloy_smelting.js new file mode 100644 index 00000000..5e8e336e --- /dev/null +++ b/kubejs/server_scripts/recipes/enderio/alloy_smelting.js @@ -0,0 +1,41 @@ +ServerEvents.recipes((event) => { + const id_prefix = 'enigmatica:enderio/alloy_smelting/'; + + const recipes = [ + { + inputs: [ + { tag: 'c:ingots/iron', count: 1 }, + { item: 'minecraft:coal', count: 2 } + ], + output: { id: AlmostUnified.getTagTargetItem('c:ingots/steel').getId(), count: 1 }, + energy: 6400, + experience: 0.3, + id: `${id_prefix}steel_ingot_from_coal` + }, + { + inputs: [ + { tag: 'c:ingots/iron', count: 1 }, + { tag: 'c:dusts/coal', count: 1 } + ], + output: { id: AlmostUnified.getTagTargetItem('c:ingots/steel').getId(), count: 1 }, + energy: 6400, + experience: 0.3, + id: `${id_prefix}steel_ingot_from_coal_dust` + }, + { + inputs: [ + { tag: 'c:ingots/steel', count: 1 }, + { tag: 'c:obsidians', count: 1 } + ], + output: { id: 'enderio:dark_steel_ingot', count: 1 }, + energy: 6400, + experience: 0.3, + id: `${id_prefix}darksteel_ingot_from_steel` + } + ]; + + recipes.forEach((recipe) => { + recipe.type = 'enderio:alloy_smelting'; + event.custom(recipe).id(recipe.id); + }); +}); From 41581828fefa44cb6e031b7ad4ff66665637b78a Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Fri, 18 Oct 2024 12:13:52 -0400 Subject: [PATCH 02/16] Update CHANGELOG.md --- CHANGELOG.md | 74 ++++++++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 34 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ebc39ca2..66026cac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,45 +1,53 @@ +### Enigmatica 10 1.12.0 + +#### ⭐ Improvements + +- EnderIO can now make Steel [\#110](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/110) + +--- + ### Enigmatica 10 1.11.0 NeoForge-1.21.1-21.1.64 | [Mod Updates](https://github.com/EnigmaticaModpacks/Enigmatica10/blob/master/changelogs/changelog_mods_1.11.0.md) | [Modlist](https://github.com/EnigmaticaModpacks/Enigmatica10/blob/master/changelogs/modlist_1.11.0.md) -**Disclaimer:** If you're in the "Multiverse" dimension, leave before updating, the mod has been removed. +**Disclaimer:** If you're in the "Multiverse" dimension, leave before updating, the mod has been removed. #### ✔️ Added Mods -* [Almanac Lib](https://www.curseforge.com/minecraft/mc-mods/almanac-lib) (by [frikinjay](https://www.curseforge.com/members/frikinjay/projects)) -* [Ars Ocultas](https://www.curseforge.com/minecraft/mc-mods/ars-ocultas) (by [mystchonky](https://www.curseforge.com/members/mystchonky/projects)) -* [Connected Glass](https://www.curseforge.com/minecraft/mc-mods/connected-glass) (by [SuperMartijn642](https://www.curseforge.com/members/SuperMartijn642/projects)) -* [Crash Utilities](https://www.curseforge.com/minecraft/mc-mods/crash-utilities) (by [Darkere](https://www.curseforge.com/members/Darkere/projects)) -* [Ender IO](https://www.curseforge.com/minecraft/mc-mods/ender-io) (by [crazypants_mc_the_second](https://www.curseforge.com/members/crazypants_mc_the_second/projects)) -* [FTB Essentials (Forge & Fabric)](https://www.curseforge.com/minecraft/mc-mods/ftb-essentials) (by [FTB](https://www.curseforge.com/members/FTB/projects)) -* [Fusion (Connected Textures)](https://www.curseforge.com/minecraft/mc-mods/fusion-connected-textures) (by [SuperMartijn642](https://www.curseforge.com/members/SuperMartijn642/projects)) -* [I'm Fast](https://www.curseforge.com/minecraft/mc-mods/im-fast) (by [Bielhiss](https://www.curseforge.com/members/Bielhiss/projects)) -* [Industrial Foregoing](https://www.curseforge.com/minecraft/mc-mods/industrial-foregoing) (by [Buuz135](https://www.curseforge.com/members/Buuz135/projects)) -* [Iris Shaders](https://www.curseforge.com/minecraft/mc-mods/irisshaders) (by [coderbot](https://www.curseforge.com/members/coderbot/projects)) -* [ME Requester](https://www.curseforge.com/minecraft/mc-mods/merequester) (by [Relentless](https://www.curseforge.com/members/Relentless/projects)) -* [Nature's Aura](https://www.curseforge.com/minecraft/mc-mods/natures-aura) (by [Ellpeck](https://www.curseforge.com/members/Ellpeck/projects)) -* [Nullscape](https://www.curseforge.com/minecraft/mc-mods/nullscape) (by [Starmute](https://www.curseforge.com/members/Starmute/projects)) -* [Patchouli](https://www.curseforge.com/minecraft/mc-mods/patchouli) (by [Vazkii](https://www.curseforge.com/members/Vazkii/projects)) -* [Simple Magnets](https://www.curseforge.com/minecraft/mc-mods/simple-magnets) (by [SuperMartijn642](https://www.curseforge.com/members/SuperMartijn642/projects)) -* [Sodium](https://www.curseforge.com/minecraft/mc-mods/sodium) (by [JellySquid](https://www.curseforge.com/members/JellySquid/projects)) -* [Tool Belt](https://www.curseforge.com/minecraft/mc-mods/tool-belt) (by [gigaherz](https://www.curseforge.com/members/gigaherz/projects)) -* [Utilitarian](https://www.curseforge.com/minecraft/mc-mods/utilitarian) (by [LobsterJonn](https://www.curseforge.com/members/LobsterJonn/projects)) -* [YUNG's API (NeoForge)](https://www.curseforge.com/minecraft/mc-mods/yungs-api-neoforge) (by [YUNGNICKYOUNG](https://www.curseforge.com/members/YUNGNICKYOUNG/projects)) -* [YUNG's Better Desert Temples (NeoForge)](https://www.curseforge.com/minecraft/mc-mods/yungs-better-desert-temples-neoforge) (by [YUNGNICKYOUNG](https://www.curseforge.com/members/YUNGNICKYOUNG/projects)) -* [YUNG's Better End Island (NeoForge)](https://www.curseforge.com/minecraft/mc-mods/yungs-better-end-island-neoforge) (by [YUNGNICKYOUNG](https://www.curseforge.com/members/YUNGNICKYOUNG/projects)) -* [YUNG's Better Jungle Temples (NeoForge)](https://www.curseforge.com/minecraft/mc-mods/yungs-better-jungle-temples-neoforge) (by [YUNGNICKYOUNG](https://www.curseforge.com/members/YUNGNICKYOUNG/projects)) -* [YUNG's Better Nether Fortresses (NeoForge)](https://www.curseforge.com/minecraft/mc-mods/yungs-better-nether-fortresses-neoforge) (by [YUNGNICKYOUNG](https://www.curseforge.com/members/YUNGNICKYOUNG/projects)) -* [YUNG's Better Ocean Monuments (NeoForge)](https://www.curseforge.com/minecraft/mc-mods/yungs-better-ocean-monuments-neoforge) (by [YUNGNICKYOUNG](https://www.curseforge.com/members/YUNGNICKYOUNG/projects)) -* [YUNG's Better Strongholds (NeoForge)](https://www.curseforge.com/minecraft/mc-mods/yungs-better-strongholds-neoforge) (by [YUNGNICKYOUNG](https://www.curseforge.com/members/YUNGNICKYOUNG/projects)) -* [YUNG's Better Witch Huts (NeoForge)](https://www.curseforge.com/minecraft/mc-mods/yungs-better-witch-huts-neoforge) (by [YUNGNICKYOUNG](https://www.curseforge.com/members/YUNGNICKYOUNG/projects)) -* [YUNG's Bridges (NeoForge)](https://www.curseforge.com/minecraft/mc-mods/yungs-bridges-neoforge) (by [YUNGNICKYOUNG](https://www.curseforge.com/members/YUNGNICKYOUNG/projects)) +- [Almanac Lib](https://www.curseforge.com/minecraft/mc-mods/almanac-lib) (by [frikinjay](https://www.curseforge.com/members/frikinjay/projects)) +- [Ars Ocultas](https://www.curseforge.com/minecraft/mc-mods/ars-ocultas) (by [mystchonky](https://www.curseforge.com/members/mystchonky/projects)) +- [Connected Glass](https://www.curseforge.com/minecraft/mc-mods/connected-glass) (by [SuperMartijn642](https://www.curseforge.com/members/SuperMartijn642/projects)) +- [Crash Utilities](https://www.curseforge.com/minecraft/mc-mods/crash-utilities) (by [Darkere](https://www.curseforge.com/members/Darkere/projects)) +- [Ender IO](https://www.curseforge.com/minecraft/mc-mods/ender-io) (by [crazypants_mc_the_second](https://www.curseforge.com/members/crazypants_mc_the_second/projects)) +- [FTB Essentials (Forge & Fabric)](https://www.curseforge.com/minecraft/mc-mods/ftb-essentials) (by [FTB](https://www.curseforge.com/members/FTB/projects)) +- [Fusion (Connected Textures)](https://www.curseforge.com/minecraft/mc-mods/fusion-connected-textures) (by [SuperMartijn642](https://www.curseforge.com/members/SuperMartijn642/projects)) +- [I'm Fast](https://www.curseforge.com/minecraft/mc-mods/im-fast) (by [Bielhiss](https://www.curseforge.com/members/Bielhiss/projects)) +- [Industrial Foregoing](https://www.curseforge.com/minecraft/mc-mods/industrial-foregoing) (by [Buuz135](https://www.curseforge.com/members/Buuz135/projects)) +- [Iris Shaders](https://www.curseforge.com/minecraft/mc-mods/irisshaders) (by [coderbot](https://www.curseforge.com/members/coderbot/projects)) +- [ME Requester](https://www.curseforge.com/minecraft/mc-mods/merequester) (by [Relentless](https://www.curseforge.com/members/Relentless/projects)) +- [Nature's Aura](https://www.curseforge.com/minecraft/mc-mods/natures-aura) (by [Ellpeck](https://www.curseforge.com/members/Ellpeck/projects)) +- [Nullscape](https://www.curseforge.com/minecraft/mc-mods/nullscape) (by [Starmute](https://www.curseforge.com/members/Starmute/projects)) +- [Patchouli](https://www.curseforge.com/minecraft/mc-mods/patchouli) (by [Vazkii](https://www.curseforge.com/members/Vazkii/projects)) +- [Simple Magnets](https://www.curseforge.com/minecraft/mc-mods/simple-magnets) (by [SuperMartijn642](https://www.curseforge.com/members/SuperMartijn642/projects)) +- [Sodium](https://www.curseforge.com/minecraft/mc-mods/sodium) (by [JellySquid](https://www.curseforge.com/members/JellySquid/projects)) +- [Tool Belt](https://www.curseforge.com/minecraft/mc-mods/tool-belt) (by [gigaherz](https://www.curseforge.com/members/gigaherz/projects)) +- [Utilitarian](https://www.curseforge.com/minecraft/mc-mods/utilitarian) (by [LobsterJonn](https://www.curseforge.com/members/LobsterJonn/projects)) +- [YUNG's API (NeoForge)](https://www.curseforge.com/minecraft/mc-mods/yungs-api-neoforge) (by [YUNGNICKYOUNG](https://www.curseforge.com/members/YUNGNICKYOUNG/projects)) +- [YUNG's Better Desert Temples (NeoForge)](https://www.curseforge.com/minecraft/mc-mods/yungs-better-desert-temples-neoforge) (by [YUNGNICKYOUNG](https://www.curseforge.com/members/YUNGNICKYOUNG/projects)) +- [YUNG's Better End Island (NeoForge)](https://www.curseforge.com/minecraft/mc-mods/yungs-better-end-island-neoforge) (by [YUNGNICKYOUNG](https://www.curseforge.com/members/YUNGNICKYOUNG/projects)) +- [YUNG's Better Jungle Temples (NeoForge)](https://www.curseforge.com/minecraft/mc-mods/yungs-better-jungle-temples-neoforge) (by [YUNGNICKYOUNG](https://www.curseforge.com/members/YUNGNICKYOUNG/projects)) +- [YUNG's Better Nether Fortresses (NeoForge)](https://www.curseforge.com/minecraft/mc-mods/yungs-better-nether-fortresses-neoforge) (by [YUNGNICKYOUNG](https://www.curseforge.com/members/YUNGNICKYOUNG/projects)) +- [YUNG's Better Ocean Monuments (NeoForge)](https://www.curseforge.com/minecraft/mc-mods/yungs-better-ocean-monuments-neoforge) (by [YUNGNICKYOUNG](https://www.curseforge.com/members/YUNGNICKYOUNG/projects)) +- [YUNG's Better Strongholds (NeoForge)](https://www.curseforge.com/minecraft/mc-mods/yungs-better-strongholds-neoforge) (by [YUNGNICKYOUNG](https://www.curseforge.com/members/YUNGNICKYOUNG/projects)) +- [YUNG's Better Witch Huts (NeoForge)](https://www.curseforge.com/minecraft/mc-mods/yungs-better-witch-huts-neoforge) (by [YUNGNICKYOUNG](https://www.curseforge.com/members/YUNGNICKYOUNG/projects)) +- [YUNG's Bridges (NeoForge)](https://www.curseforge.com/minecraft/mc-mods/yungs-bridges-neoforge) (by [YUNGNICKYOUNG](https://www.curseforge.com/members/YUNGNICKYOUNG/projects)) #### ❌ Removed Mods -* [Ding (Forge)](https://www.curseforge.com/minecraft/mc-mods/ding) (by [iChun](https://www.curseforge.com/members/iChun/projects)) -* [Embeddium](https://www.curseforge.com/minecraft/mc-mods/embeddium) (by [FiniteReality](https://www.curseforge.com/members/FiniteReality/projects)) -* [iChunUtil](https://www.curseforge.com/minecraft/mc-mods/ichunutil) (by [iChun](https://www.curseforge.com/members/iChun/projects)) -* [Multiverse](https://www.curseforge.com/minecraft/mc-mods/multiverse) (by [davidqf555](https://www.curseforge.com/members/davidqf555/projects)) +- [Ding (Forge)](https://www.curseforge.com/minecraft/mc-mods/ding) (by [iChun](https://www.curseforge.com/members/iChun/projects)) +- [Embeddium](https://www.curseforge.com/minecraft/mc-mods/embeddium) (by [FiniteReality](https://www.curseforge.com/members/FiniteReality/projects)) +- [iChunUtil](https://www.curseforge.com/minecraft/mc-mods/ichunutil) (by [iChun](https://www.curseforge.com/members/iChun/projects)) +- [Multiverse](https://www.curseforge.com/minecraft/mc-mods/multiverse) (by [davidqf555](https://www.curseforge.com/members/davidqf555/projects)) #### ⭐ Improvements @@ -61,7 +69,6 @@ NeoForge-1.21.1-21.1.64 | [Mod Updates](https://github.com/EnigmaticaModpacks/En - Leads and Sticky Pistons now accept pink slime [\#133](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/133) - Ender IO and IF quests (Work in Progress) [\#143](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/143) - #### 🦟 Bugs Fixed - Restore missing nucleosynthesizing recipes [\#110](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/110) @@ -77,7 +84,6 @@ NeoForge-1.21.1-21.1.64 | [Mod Updates](https://github.com/EnigmaticaModpacks/En - Unable to progress in Mekanism quest line. [(\#146)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/146) - Opening LaserIO Data Filter crashes player to server screen [(\#129)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/129) - Overlays are not consistant [(\#44)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/44) - --- From c4471f5919988ab21198f29364e3173d45db8109 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Fri, 18 Oct 2024 12:25:12 -0400 Subject: [PATCH 03/16] alloy --- CHANGELOG.md | 2 +- .../recipes/enderio/alloy_smelting.js | 50 +++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66026cac..68630a93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ #### ⭐ Improvements -- EnderIO can now make Steel [\#110](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/110) +- EnderIO can now make Steel and alloys from other mods [\#174](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/174) --- diff --git a/kubejs/server_scripts/recipes/enderio/alloy_smelting.js b/kubejs/server_scripts/recipes/enderio/alloy_smelting.js index 5e8e336e..97fb1171 100644 --- a/kubejs/server_scripts/recipes/enderio/alloy_smelting.js +++ b/kubejs/server_scripts/recipes/enderio/alloy_smelting.js @@ -31,6 +31,56 @@ ServerEvents.recipes((event) => { energy: 6400, experience: 0.3, id: `${id_prefix}darksteel_ingot_from_steel` + }, + { + inputs: [ + { tag: 'c:ingots/tin', count: 1 }, + { tag: 'c:ingots/copper', count: 3 } + ], + output: { id: AlmostUnified.getTagTargetItem('c:ingots/bronze').getId(), count: 4 }, + energy: 6400, + experience: 0.3, + id: `${id_prefix}bronze_ingot` + }, + { + inputs: [ + { tag: 'c:ingots/gold', count: 1 }, + { tag: 'c:ingots/silver', count: 1 } + ], + output: { id: AlmostUnified.getTagTargetItem('c:ingots/electrum').getId(), count: 2 }, + energy: 6400, + experience: 0.3, + id: `${id_prefix}electrum_ingot` + }, + { + inputs: [ + { tag: 'c:ingots/iron', count: 2 }, + { tag: 'c:ingots/nickel', count: 1 } + ], + output: { id: AlmostUnified.getTagTargetItem('c:ingots/invar').getId(), count: 3 }, + energy: 6400, + experience: 0.3, + id: `${id_prefix}invar_ingot` + }, + { + inputs: [ + { tag: 'c:ingots/copper', count: 1 }, + { tag: 'c:ingots/nickel', count: 1 } + ], + output: { id: 'modern_industrialization:cupronickel_ingot', count: 2 }, + energy: 6400, + experience: 0.3, + id: `${id_prefix}cupronickel_ingot` + }, + { + inputs: [ + { tag: 'c:ingots/lead', count: 1 }, + { tag: 'c:ingots/antimony', count: 1 } + ], + output: { id: 'modern_industrialization:battery_alloy_ingot', count: 2 }, + energy: 6400, + experience: 0.3, + id: `${id_prefix}battery_alloy_ingot` } ]; From e668516436f4ff3ac15dc5900cc05d122e3d4c63 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Fri, 18 Oct 2024 13:24:18 -0400 Subject: [PATCH 04/16] alloys and tags, alloys and tags --- .../recipes/enderio/alloy_smelting.js | 91 +++++++++++++++++++ .../tags/block/neoforge/storage_blocks.js | 7 +- .../tags/item/neoforge/ingots.js | 7 +- .../tags/item/neoforge/storage_blocks.js | 7 +- 4 files changed, 109 insertions(+), 3 deletions(-) diff --git a/kubejs/server_scripts/recipes/enderio/alloy_smelting.js b/kubejs/server_scripts/recipes/enderio/alloy_smelting.js index 97fb1171..2ba8bcd9 100644 --- a/kubejs/server_scripts/recipes/enderio/alloy_smelting.js +++ b/kubejs/server_scripts/recipes/enderio/alloy_smelting.js @@ -81,6 +81,97 @@ ServerEvents.recipes((event) => { energy: 6400, experience: 0.3, id: `${id_prefix}battery_alloy_ingot` + }, + { + inputs: [ + { tag: 'c:ingots/sky', count: 2 }, + { item: 'minecraft:netherite_scrap', count: 1 }, + { tag: 'c:ingots/tainted_gold', count: 2 } + ], + output: { id: 'naturesaura:depth_ingot', count: 2 }, + energy: 6400, + experience: 0.3, + id: `${id_prefix}depth_ingot` + }, + { + inputs: [ + { tag: 'c:dusts/redstone', count: 1 }, + { tag: 'c:ingots/copper', count: 1 } + ], + output: { id: 'mekanism:alloy_infused', count: 1 }, + energy: 6400, + experience: 0.3, + id: `${id_prefix}alloy_infused` + }, + { + inputs: [ + { tag: 'mekanism:enriched/redstone', count: 1 }, + { tag: 'c:ingots/copper', count: 8 } + ], + output: { id: 'mekanism:alloy_infused', count: 8 }, + energy: 6400, + experience: 0.3, + id: `${id_prefix}alloy_infused_from_enriched` + }, + { + inputs: [ + { tag: 'c:dusts/diamond', count: 2 }, + { tag: 'c:alloys/advanced', count: 1 } + ], + output: { id: 'mekanism:alloy_reinforced', count: 1 }, + energy: 6400, + experience: 0.3, + id: `${id_prefix}alloy_reinforced` + }, + { + inputs: [ + { tag: 'mekanism:enriched/diamond', count: 1 }, + { tag: 'c:alloys/advanced', count: 4 } + ], + output: { id: 'mekanism:alloy_reinforced', count: 4 }, + energy: 6400, + experience: 0.3, + id: `${id_prefix}alloy_reinforced_from_enriched` + }, + { + inputs: [ + { tag: 'c:dusts/refined_obsidian', count: 4 }, + { tag: 'c:alloys/elite', count: 1 } + ], + output: { id: 'mekanism:alloy_atomic', count: 1 }, + energy: 6400, + experience: 0.3, + id: `${id_prefix}alloy_atomic` + }, + { + inputs: [ + { tag: 'mekanism:enriched/obsidian', count: 1 }, + { tag: 'c:alloys/elite', count: 2 } + ], + output: { id: 'mekanism:alloy_atomic', count: 2 }, + energy: 6400, + experience: 0.3, + id: `${id_prefix}alloy_atomic_from_enriched` + }, + { + inputs: [ + { tag: 'c:dusts/diamond', count: 1 }, + { tag: 'c:dusts/obsidian', count: 1 } + ], + output: { id: 'mekanism:dust_refined_obsidian', count: 1 }, + energy: 6400, + experience: 0.3, + id: `${id_prefix}dust_refined_obsidian` + }, + { + inputs: [ + { tag: 'mekanism:enriched/diamond', count: 1 }, + { tag: 'c:dusts/obsidian', count: 8 } + ], + output: { id: 'mekanism:dust_refined_obsidian', count: 8 }, + energy: 6400, + experience: 0.3, + id: `${id_prefix}dust_refined_obsidian_from_enriched` } ]; diff --git a/kubejs/server_scripts/tags/block/neoforge/storage_blocks.js b/kubejs/server_scripts/tags/block/neoforge/storage_blocks.js index 42625c8c..1de6fff2 100644 --- a/kubejs/server_scripts/tags/block/neoforge/storage_blocks.js +++ b/kubejs/server_scripts/tags/block/neoforge/storage_blocks.js @@ -19,7 +19,12 @@ ServerEvents.tags('block', (event) => { nitro: ['powah:nitro_crystal_block'], uranium: ['bigreactors:yellorium_block'], - raw_uranium: ['bigreactors:raw_yellorium_block'] + raw_uranium: ['bigreactors:raw_yellorium_block'], + + infused_iron: ['naturesaura:infused_iron_block'], + tainted_gold: ['naturesaura:tainted_gold_block'], + sky: ['naturesaura:sky_ingot_block'], + depth: ['naturesaura:depth_ingot_block'] }; Object.keys(additions).forEach((tag) => { diff --git a/kubejs/server_scripts/tags/item/neoforge/ingots.js b/kubejs/server_scripts/tags/item/neoforge/ingots.js index f79c616f..2b80fa00 100644 --- a/kubejs/server_scripts/tags/item/neoforge/ingots.js +++ b/kubejs/server_scripts/tags/item/neoforge/ingots.js @@ -5,7 +5,12 @@ ServerEvents.tags('item', (event) => { eclipsealloy: ['justdirethings:eclipsealloy_ingot'], uraninite: ['powah:uraninite'], - energized_steel: ['powah:steel_energized'] + energized_steel: ['powah:steel_energized'], + + infused_iron: ['naturesaura:infused_iron'], + tainted_gold: ['naturesaura:tainted_gold'], + sky: ['naturesaura:sky_ingot'], + depth: ['naturesaura:depth_ingot'] }; Object.keys(additions).forEach((tag) => { diff --git a/kubejs/server_scripts/tags/item/neoforge/storage_blocks.js b/kubejs/server_scripts/tags/item/neoforge/storage_blocks.js index e687743d..d077c82a 100644 --- a/kubejs/server_scripts/tags/item/neoforge/storage_blocks.js +++ b/kubejs/server_scripts/tags/item/neoforge/storage_blocks.js @@ -19,7 +19,12 @@ ServerEvents.tags('item', (event) => { nitro: ['powah:nitro_crystal_block'], uranium: ['bigreactors:yellorium_block'], - raw_uranium: ['bigreactors:raw_yellorium_block'] + raw_uranium: ['bigreactors:raw_yellorium_block'], + + infused_iron: ['naturesaura:infused_iron_block'], + tainted_gold: ['naturesaura:tainted_gold_block'], + sky: ['naturesaura:sky_ingot_block'], + depth: ['naturesaura:depth_ingot_block'] }; Object.keys(additions).forEach((tag) => { From 2f695de744dc4a090499f10faf6acb8aa16f5c77 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Fri, 18 Oct 2024 15:50:28 -0400 Subject: [PATCH 05/16] netherite processing --- .../server_scripts/recipes/enderio/alloy_smelting.js | 10 ++++++++++ kubejs/server_scripts/recipes/enderio/sag_milling.js | 9 +++++++++ 2 files changed, 19 insertions(+) diff --git a/kubejs/server_scripts/recipes/enderio/alloy_smelting.js b/kubejs/server_scripts/recipes/enderio/alloy_smelting.js index 2ba8bcd9..5f8d5b56 100644 --- a/kubejs/server_scripts/recipes/enderio/alloy_smelting.js +++ b/kubejs/server_scripts/recipes/enderio/alloy_smelting.js @@ -172,6 +172,16 @@ ServerEvents.recipes((event) => { energy: 6400, experience: 0.3, id: `${id_prefix}dust_refined_obsidian_from_enriched` + }, + { + inputs: [ + { tag: 'c:ingots/gold', count: 2 }, + { item: 'minecraft:netherite_scrap', count: 2 } + ], + output: { id: 'minecraft:netherite_ingot', count: 1 }, + energy: 6400, + experience: 0.3, + id: `${id_prefix}netherite_ingot` } ]; diff --git a/kubejs/server_scripts/recipes/enderio/sag_milling.js b/kubejs/server_scripts/recipes/enderio/sag_milling.js index b481bb7c..3bf977b1 100644 --- a/kubejs/server_scripts/recipes/enderio/sag_milling.js +++ b/kubejs/server_scripts/recipes/enderio/sag_milling.js @@ -79,6 +79,15 @@ ServerEvents.recipes((event) => { outputs: [{ item: { tag: 'c:dusts/wood', count: 3 } }], energy: 2400, id: `${id_prefix}sawdust_from_planks` + }, + { + input: { tag: 'c:ores/netherite_scrap' }, + outputs: [ + { item: { id: 'minecraft:netherite_scrap', count: 1 } }, + { item: { id: 'minecraft:netherite_scrap', count: 1 }, chance: 0.75 } + ], + energy: 2400, + id: `${id_prefix}netherite_scrap` } ]; From 4a612a94679b3c83363202b97d2cc4ec83b0bb81 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Fri, 18 Oct 2024 20:21:54 -0400 Subject: [PATCH 06/16] fix archwood, start blockgen compat --- .../server_scripts/constants/wood_registry.js | 7 +++ .../recipes/cobblegengalore/blockgen.js | 44 +++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 kubejs/server_scripts/recipes/cobblegengalore/blockgen.js diff --git a/kubejs/server_scripts/constants/wood_registry.js b/kubejs/server_scripts/constants/wood_registry.js index b73d8edc..33dde228 100644 --- a/kubejs/server_scripts/constants/wood_registry.js +++ b/kubejs/server_scripts/constants/wood_registry.js @@ -190,6 +190,13 @@ Object.keys(wood_types).forEach((mod) => { wood: `${mod}:${type}_wood`, stripped_wood: `${mod}:${type}_stripped_wood` }); + } else if (mod == 'ars_elemental') { + wood_registry.push({ + log: `${mod}:${type}_log`, + stripped_log: `${mod}:stripped_${type}_log`, + wood: `${mod}:${type}`, + stripped_wood: `${mod}:stripped_${type}` + }); } else { wood_registry.push({ log: `${mod}:${type}_log`, diff --git a/kubejs/server_scripts/recipes/cobblegengalore/blockgen.js b/kubejs/server_scripts/recipes/cobblegengalore/blockgen.js new file mode 100644 index 00000000..3bdb23d1 --- /dev/null +++ b/kubejs/server_scripts/recipes/cobblegengalore/blockgen.js @@ -0,0 +1,44 @@ +ServerEvents.recipes((event) => { + const id_prefix = 'enigmatica:cobblegengalore/blockgen/'; + + const recipes = []; + + const stoneworks = { + stones: [ + 'minecraft:granite', + 'minecraft:diorite', + 'minecraft:andesite', + 'minecraft:deepslate', + 'minecraft:sandstone', + 'minecraft:tuff', + + 'deeperdarker:sculk_stone', + 'deeperdarker:gloomslate', + + 'arts_and_crafts:soapstone' + ], + cobblestones: [ + 'minecraft:cobbled_deepslate', + 'deeperdarker:cobbled_sculk_stone', + 'deeperdarker:cobbled_gloomslate' + ] + }; + + Object.keys(stoneworks).forEach((type) => { + stoneworks[type].forEach((block) => { + recipes.push({ + result: { id: block, count: 1 }, + left: { Name: 'minecraft:water' }, + consumeLeft: true, + right: { Name: 'minecraft:lava' }, + modifier: { Name: block }, + id: `${id_prefix}${block.replace(':', '_')}` + }); + }); + }); + + recipes.forEach((recipe) => { + recipe.type = 'cobblegengalore:blockgen'; + event.custom(recipe).id(recipe.id); + }); +}); From 6019cd5292a5c753637c1b095e699c7d01e0d92f Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Fri, 18 Oct 2024 20:31:25 -0400 Subject: [PATCH 07/16] Update emi_hidden_disabled.json --- kubejs/config/emi_hidden_disabled.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/config/emi_hidden_disabled.json b/kubejs/config/emi_hidden_disabled.json index d8f38331..205c22bc 100644 --- a/kubejs/config/emi_hidden_disabled.json +++ b/kubejs/config/emi_hidden_disabled.json @@ -1,7 +1,7 @@ { "items": { "hidden": [], - "disabled": ["/mffs.*steel/"], + "disabled": ["/mffs.*steel/", "utilitarian:soul_snad", "utilitarian:drit", "utilitarian:grrass"], "added": [] }, "fluids": { From 211fdb4334a0e9d469581c83b46a764c88c426c3 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Sat, 19 Oct 2024 22:33:21 -0400 Subject: [PATCH 08/16] cobblegen --- CHANGELOG.md | 2 +- kubejs/server_scripts/constants/stoneworks.js | 25 ++++++ .../recipes/cobblegengalore/blockgen.js | 64 ++++++++------ .../recipes/cobblegengalore/shaped.js | 88 +++++++++++++++++++ .../recipes/enigmatica/remove.js | 3 +- .../recipes/enigmatica/replace_input.js | 5 ++ 6 files changed, 159 insertions(+), 28 deletions(-) create mode 100644 kubejs/server_scripts/constants/stoneworks.js create mode 100644 kubejs/server_scripts/recipes/cobblegengalore/shaped.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 68630a93..ab7243f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### Enigmatica 10 1.12.0 +### Enigmatica 10 1.11.1 #### ⭐ Improvements diff --git a/kubejs/server_scripts/constants/stoneworks.js b/kubejs/server_scripts/constants/stoneworks.js new file mode 100644 index 00000000..3375b5f1 --- /dev/null +++ b/kubejs/server_scripts/constants/stoneworks.js @@ -0,0 +1,25 @@ +//priority: 1001 +const stoneworks = { + stones: [ + 'minecraft:stone', + 'minecraft:granite', + 'minecraft:diorite', + 'minecraft:andesite', + 'minecraft:deepslate', + 'minecraft:sandstone', + 'minecraft:red_sandstone', + 'minecraft:tuff', + 'minecraft:blackstone', + + 'deeperdarker:sculk_stone', + 'deeperdarker:gloomslate', + + 'arts_and_crafts:soapstone' + ], + cobblestones: [ + 'minecraft:cobblestone', + 'minecraft:cobbled_deepslate', + 'deeperdarker:cobbled_sculk_stone', + 'deeperdarker:cobbled_gloomslate' + ] +}; diff --git a/kubejs/server_scripts/recipes/cobblegengalore/blockgen.js b/kubejs/server_scripts/recipes/cobblegengalore/blockgen.js index 3bdb23d1..70432656 100644 --- a/kubejs/server_scripts/recipes/cobblegengalore/blockgen.js +++ b/kubejs/server_scripts/recipes/cobblegengalore/blockgen.js @@ -1,37 +1,44 @@ ServerEvents.recipes((event) => { const id_prefix = 'enigmatica:cobblegengalore/blockgen/'; - const recipes = []; - - const stoneworks = { - stones: [ - 'minecraft:granite', - 'minecraft:diorite', - 'minecraft:andesite', - 'minecraft:deepslate', - 'minecraft:sandstone', - 'minecraft:tuff', - - 'deeperdarker:sculk_stone', - 'deeperdarker:gloomslate', - - 'arts_and_crafts:soapstone' - ], - cobblestones: [ - 'minecraft:cobbled_deepslate', - 'deeperdarker:cobbled_sculk_stone', - 'deeperdarker:cobbled_gloomslate' - ] - }; + const recipes = [ + { + result: { id: 'ae2:sky_stone_block', count: 1 }, + left: { id: 'ars_nouveau:sky_block', consume: false }, + right: { id: 'ars_nouveau:sky_block', consume: false }, + bottom: 'ars_nouveau:sky_block', + id: `${id_prefix}sky_stone_block` + }, + { + result: { id: 'minecraft:ice', count: 1 }, + left: { id: 'minecraft:water', consume: false }, + right: { id: 'minecraft:water', consume: false }, + bottom: 'minecraft:blue_ice', + id: `${id_prefix}ice` + }, + { + result: { id: 'minecraft:obsidian', count: 1 }, + left: { id: 'minecraft:water', consume: false }, + right: { id: 'minecraft:lava', consume: true }, + bottom: 'minecraft:obsidian', + id: `${id_prefix}obsidian` + }, + { + result: { id: 'minecraft:basalt', count: 1 }, + left: { id: 'minecraft:blue_ice', consume: false }, + right: { id: 'minecraft:lava', consume: false }, + bottom: 'minecraft:soul_soil', + id: `${id_prefix}basalt` + } + ]; Object.keys(stoneworks).forEach((type) => { stoneworks[type].forEach((block) => { recipes.push({ result: { id: block, count: 1 }, - left: { Name: 'minecraft:water' }, - consumeLeft: true, - right: { Name: 'minecraft:lava' }, - modifier: { Name: block }, + left: { id: 'minecraft:water', consume: block == 'stones' ? true : false }, + right: { id: 'minecraft:lava', consume: false }, + bottom: block, id: `${id_prefix}${block.replace(':', '_')}` }); }); @@ -39,6 +46,11 @@ ServerEvents.recipes((event) => { recipes.forEach((recipe) => { recipe.type = 'cobblegengalore:blockgen'; + recipe.consumeLeft = recipe.left.consume; + recipe.left.Name = recipe.left.id; + recipe.consumeRight = recipe.right.consume; + recipe.right.Name = recipe.right.id; + recipe.modifier = { Name: recipe.bottom }; event.custom(recipe).id(recipe.id); }); }); diff --git a/kubejs/server_scripts/recipes/cobblegengalore/shaped.js b/kubejs/server_scripts/recipes/cobblegengalore/shaped.js new file mode 100644 index 00000000..4a6c8fc8 --- /dev/null +++ b/kubejs/server_scripts/recipes/cobblegengalore/shaped.js @@ -0,0 +1,88 @@ +ServerEvents.recipes((event) => { + const id_prefix = 'enigmatica:cobblegengalore/shaped/'; + + const recipes = [ + { + output: 'cobblegengalore:block_gen_stone', + pattern: ['ABA', 'DCD', 'AEA'], + key: { + A: 'minecraft:polished_andesite', + B: 'minecraft:hopper', + C: 'minecraft:wooden_pickaxe', + D: 'minecraft:glass', + E: 'minecraft:observer' + }, + id: `${id_prefix}block_gen_stone` + }, + { + output: 'cobblegengalore:block_gen_copper', + pattern: ['ABA', 'DCD', 'ABA'], + key: { + A: '#c:ingots/copper', + B: '#c:gems/lapis', + C: 'minecraft:stone_pickaxe', + D: 'cobblegengalore:block_gen_stone' + }, + id: `${id_prefix}block_gen_copper` + }, + { + output: 'cobblegengalore:block_gen_iron', + pattern: ['ABA', 'DCD', 'ABA'], + key: { + A: '#c:ingots/iron', + B: 'minecraft:tinted_glass', + C: 'minecraft:iron_pickaxe', + D: 'cobblegengalore:block_gen_copper' + }, + id: `${id_prefix}block_gen_iron` + }, + { + output: 'cobblegengalore:block_gen_gold', + pattern: ['ABA', 'DCD', 'ABA'], + key: { + A: '#c:ingots/gold', + B: 'minecraft:gilded_blackstone', + C: 'minecraft:golden_pickaxe', + D: 'cobblegengalore:block_gen_iron' + }, + id: `${id_prefix}block_gen_gold` + }, + { + output: 'cobblegengalore:block_gen_emerald', + pattern: ['ABA', 'DCD', 'ABA'], + key: { + A: '#c:gems/emerald', + B: 'minecraft:chorus_flower', + C: 'ae2:fluix_pickaxe', + D: 'cobblegengalore:block_gen_gold' + }, + id: `${id_prefix}block_gen_emerald` + }, + { + output: 'cobblegengalore:block_gen_diamond', + pattern: ['ABA', 'DCD', 'ABA'], + key: { + A: '#c:gems/diamond', + B: 'minecraft:echo_shard', + C: 'minecraft:diamond_pickaxe', + D: 'cobblegengalore:block_gen_emerald' + }, + id: `${id_prefix}block_gen_diamond` + }, + { + output: 'cobblegengalore:block_gen_netherite', + pattern: ['ABA', 'DCD', 'ABA'], + key: { + A: '#c:ingots/netherite', + B: 'minecraft:nether_star', + C: 'minecraft:netherite_pickaxe', + D: 'cobblegengalore:block_gen_diamond' + }, + id: `${id_prefix}block_gen_netherite` + } + ]; + + 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 fadc1587..26faa63c 100644 --- a/kubejs/server_scripts/recipes/enigmatica/remove.js +++ b/kubejs/server_scripts/recipes/enigmatica/remove.js @@ -13,7 +13,8 @@ ServerEvents.recipes((event) => { { type: 'evilcraft:special/minecraft_dead_bush' }, { id: `enderio:sag_milling/blaze_powder` }, { id: `mekanism:sulfur_dye` }, - { id: /powah:crafting\/cable_(basic|hardened|blazing|niotic|spirited|nitro)$/ } + { id: /powah:crafting\/cable_(basic|hardened|blazing|niotic|spirited|nitro)$/ }, + { mod: 'cobblegengalore' } ]; recipes.forEach((recipe) => { diff --git a/kubejs/server_scripts/recipes/enigmatica/replace_input.js b/kubejs/server_scripts/recipes/enigmatica/replace_input.js index dcf0348d..625dc3a9 100644 --- a/kubejs/server_scripts/recipes/enigmatica/replace_input.js +++ b/kubejs/server_scripts/recipes/enigmatica/replace_input.js @@ -47,6 +47,11 @@ ServerEvents.recipes((event) => { filter: [{ output: 'minecraft:sticky_piston' }, { output: 'minecraft:lead' }], to_replace: 'minecraft:slime_ball', replace_with: '#c:slimeballs' + }, + { + filter: [{ output: 'minecraft:observer' }], + to_replace: 'minecraft:quartz', + replace_with: Ingredient.of(['minecraft:quartz', 'ae2:certus_quartz_crystal']) } ]; From c8f4100863c88e60f801952fb9807d8610db2315 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Sat, 19 Oct 2024 22:35:21 -0400 Subject: [PATCH 09/16] Update CHANGELOG.md --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1fa5893..ab7243f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,6 @@ NeoForge-1.21.1-21.1.64 | [Mod Updates](https://github.com/EnigmaticaModpacks/En #### ✔️ Added Mods - - [Almanac Lib](https://www.curseforge.com/minecraft/mc-mods/almanac-lib) (by [frikinjay](https://www.curseforge.com/members/frikinjay/projects)) - [Ars Ocultas](https://www.curseforge.com/minecraft/mc-mods/ars-ocultas) (by [mystchonky](https://www.curseforge.com/members/mystchonky/projects)) - [Connected Glass](https://www.curseforge.com/minecraft/mc-mods/connected-glass) (by [SuperMartijn642](https://www.curseforge.com/members/SuperMartijn642/projects)) @@ -43,7 +42,6 @@ NeoForge-1.21.1-21.1.64 | [Mod Updates](https://github.com/EnigmaticaModpacks/En - [YUNG's Better Witch Huts (NeoForge)](https://www.curseforge.com/minecraft/mc-mods/yungs-better-witch-huts-neoforge) (by [YUNGNICKYOUNG](https://www.curseforge.com/members/YUNGNICKYOUNG/projects)) - [YUNG's Bridges (NeoForge)](https://www.curseforge.com/minecraft/mc-mods/yungs-bridges-neoforge) (by [YUNGNICKYOUNG](https://www.curseforge.com/members/YUNGNICKYOUNG/projects)) - #### ❌ Removed Mods - [Ding (Forge)](https://www.curseforge.com/minecraft/mc-mods/ding) (by [iChun](https://www.curseforge.com/members/iChun/projects)) From c7ea1ef5f057e298786dca7ab5a2de80c263113d Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Sat, 19 Oct 2024 22:35:41 -0400 Subject: [PATCH 10/16] Create cobblegengalore-common.toml --- config/cobblegengalore-common.toml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 config/cobblegengalore-common.toml diff --git a/config/cobblegengalore-common.toml b/config/cobblegengalore-common.toml new file mode 100644 index 00000000..69c38a28 --- /dev/null +++ b/config/cobblegengalore-common.toml @@ -0,0 +1,3 @@ +#Number of ticks between production cycles +#Range: > 0 +tickRate = 20 From 5f2dbfb3b3bb4318d9e0533fc7203a6e3e3c4fb9 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Sat, 19 Oct 2024 23:15:02 -0400 Subject: [PATCH 11/16] ores and silicon --- CHANGELOG.md | 1 + .../recipes/actuallyadditions/mining_lens.js | 35 +++++++++++++++++++ .../recipes/industrialforegoing/crusher.js | 16 +++++++++ 3 files changed, 52 insertions(+) create mode 100644 kubejs/server_scripts/recipes/actuallyadditions/mining_lens.js create mode 100644 kubejs/server_scripts/recipes/industrialforegoing/crusher.js diff --git a/CHANGELOG.md b/CHANGELOG.md index ab7243f5..139e4f1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ #### ⭐ Improvements - EnderIO can now make Steel and alloys from other mods [\#174](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/174) +- Add silicon to the Stonework Factory [\#174](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/174) --- diff --git a/kubejs/server_scripts/recipes/actuallyadditions/mining_lens.js b/kubejs/server_scripts/recipes/actuallyadditions/mining_lens.js new file mode 100644 index 00000000..0cba2269 --- /dev/null +++ b/kubejs/server_scripts/recipes/actuallyadditions/mining_lens.js @@ -0,0 +1,35 @@ +ServerEvents.recipes((event) => { + const id_prefix = 'enigmatica:actuallyadditions/mining_lens/'; + + const recipes = [ + { + ingredient: { tag: 'c:stones' }, + result: { id: 'occultism:silver_ore', count: 1 }, + weight: 500, + id: `${id_prefix}silver_ore` + }, + { + ingredient: { item: 'minecraft:deepslate' }, + result: { id: 'occultism:silver_ore_deepslate', count: 1 }, + weight: 500, + id: `${id_prefix}silver_ore_deepslate` + }, + { + ingredient: { tag: 'c:stones' }, + result: { id: 'evilcraft:dark_ore', count: 1 }, + weight: 200, + id: `${id_prefix}dark_ore` + }, + { + ingredient: { item: 'minecraft:deepslate' }, + result: { id: 'evilcraft:dark_ore_deepslate', count: 1 }, + weight: 200, + id: `${id_prefix}dark_ore_deepslate` + } + ]; + + recipes.forEach((recipe) => { + recipe.type = 'actuallyadditions:mining_lens'; + event.custom(recipe).id(recipe.id); + }); +}); diff --git a/kubejs/server_scripts/recipes/industrialforegoing/crusher.js b/kubejs/server_scripts/recipes/industrialforegoing/crusher.js new file mode 100644 index 00000000..3fe14ac0 --- /dev/null +++ b/kubejs/server_scripts/recipes/industrialforegoing/crusher.js @@ -0,0 +1,16 @@ +ServerEvents.recipes((event) => { + const id_prefix = 'enigmatica:industrialforegoing/crusher/'; + + const recipes = [ + { + input: { tag: 'c:sands' }, + output: { item: 'ae2:silicon' }, + id: `${id_prefix}silicon` + } + ]; + + recipes.forEach((recipe) => { + recipe.type = 'industrialforegoing:crusher'; + event.custom(recipe).id(recipe.id); + }); +}); From 3dcb6c57e0c395c1888fb6ddccdadd5f5cade9c7 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Sat, 19 Oct 2024 23:46:22 -0400 Subject: [PATCH 12/16] fuels, ores --- CHANGELOG.md | 3 +++ .../recipes/farmingforblockheads/market.js | 20 +++++++++++++----- .../industrialforegoing/laser_drill_ore.js | 21 +++++++++++++++++++ .../modern_industrialization/fluid_fuels.js | 5 ++++- .../recipes/pneumaticcraft/fuel_quality.js | 12 +++++++++++ .../tags/fluids/neoforge/fuels.js | 4 ++++ 6 files changed, 59 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 139e4f1b..839c4ae8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ - EnderIO can now make Steel and alloys from other mods [\#174](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/174) - Add silicon to the Stonework Factory [\#174](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/174) +- Actually Additions seeds added to market [\#174](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/174) +- Ore generators updated to add new/missing ores [\#174](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/174) +- Fuels updated [\#174](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/174) --- diff --git a/kubejs/server_scripts/recipes/farmingforblockheads/market.js b/kubejs/server_scripts/recipes/farmingforblockheads/market.js index 5136c8f5..e259ba78 100644 --- a/kubejs/server_scripts/recipes/farmingforblockheads/market.js +++ b/kubejs/server_scripts/recipes/farmingforblockheads/market.js @@ -12,11 +12,6 @@ ServerEvents.recipes((event) => { result: { count: 1, item: 'occultism:datura_seeds' }, id: `${id_prefix}datura_seeds` }, - { - category: 'farmingforblockheads:seeds', - result: { count: 1, item: 'jags:grass_seed' }, - id: `${id_prefix}grass_seed` - }, { category: 'farmingforblockheads:seeds', result: { count: 1, item: 'chococraft:gysahl_green_seeds' }, @@ -117,6 +112,21 @@ ServerEvents.recipes((event) => { preset: 'enigmatica:source_gem', result: { count: 1, item: 'ars_elemental:flashpine_pod' }, id: `${id_prefix}flashpine_pod` + }, + { + category: 'farmingforblockheads:seeds', + result: { count: 1, item: 'actuallyadditions:rice_seeds' }, + id: `${id_prefix}rice_seeds` + }, + { + category: 'farmingforblockheads:seeds', + result: { count: 1, item: 'actuallyadditions:canola_seeds' }, + id: `${id_prefix}canola_seeds` + }, + { + category: 'farmingforblockheads:seeds', + result: { count: 1, item: 'actuallyadditions:flax_seeds' }, + id: `${id_prefix}flax_seeds` } ]; diff --git a/kubejs/server_scripts/recipes/industrialforegoing/laser_drill_ore.js b/kubejs/server_scripts/recipes/industrialforegoing/laser_drill_ore.js index 84e965e7..7c95c736 100644 --- a/kubejs/server_scripts/recipes/industrialforegoing/laser_drill_ore.js +++ b/kubejs/server_scripts/recipes/industrialforegoing/laser_drill_ore.js @@ -190,6 +190,27 @@ ServerEvents.recipes((event) => { } ], id: `${id_prefix}antimony` + }, + { + catalyst: { item: 'industrialforegoing:black_laser_lens' }, + output: { tag: 'c:raw_materials/black_quartz' }, + rarity: [ + { + dimension_filter: { blacklist: ['minecraft:the_end'], whitelist: [] }, + biome_filter: { blacklist: [], whitelist: [] }, + depth_max: 7, + depth_min: 117, + weight: 12 + }, + { + dimension_filter: { blacklist: ['minecraft:the_end'], whitelist: [] }, + biome_filter: { blacklist: [], whitelist: [] }, + depth_max: 255, + depth_min: 0, + weight: 1 + } + ], + id: `${id_prefix}black_quartz` } ]; diff --git a/kubejs/server_scripts/recipes/modern_industrialization/fluid_fuels.js b/kubejs/server_scripts/recipes/modern_industrialization/fluid_fuels.js index bbd1fda8..20e29d1e 100644 --- a/kubejs/server_scripts/recipes/modern_industrialization/fluid_fuels.js +++ b/kubejs/server_scripts/recipes/modern_industrialization/fluid_fuels.js @@ -28,7 +28,10 @@ ServerEvents.generateData('before_mods', (event) => { 'pneumaticcraft:kerosene': { eu_per_mb: 440 }, 'pneumaticcraft:biodiesel': { eu_per_mb: 400 }, 'pneumaticcraft:diesel': { eu_per_mb: 400 }, - 'pneumaticcraft:oil': { eu_per_mb: 16 } + 'pneumaticcraft:oil': { eu_per_mb: 16 }, + + 'actuallyadditions:refined_canola_oil': { eu_per_mb: 192 }, + 'actuallyadditions:canola_oil': { eu_per_mb: 80 } } }; diff --git a/kubejs/server_scripts/recipes/pneumaticcraft/fuel_quality.js b/kubejs/server_scripts/recipes/pneumaticcraft/fuel_quality.js index cebb9e6e..856f4bc4 100644 --- a/kubejs/server_scripts/recipes/pneumaticcraft/fuel_quality.js +++ b/kubejs/server_scripts/recipes/pneumaticcraft/fuel_quality.js @@ -19,6 +19,18 @@ ServerEvents.recipes((event) => { air_per_mb: 1125, burn_rate: 0.8, id: `${id_prefix}blaze_ember` + }, + { + fluid: { tag: 'c:fuels/canola_oil' }, + air_per_mb: 200, + burn_rate: 0.25, + id: `${id_prefix}canola_oil` + }, + { + fluid: { tag: 'c:fuels/refined_canola_oil' }, + air_per_mb: 1000, + burn_rate: 0.8, + id: `${id_prefix}refined_canola_oil` } ]; diff --git a/kubejs/server_scripts/tags/fluids/neoforge/fuels.js b/kubejs/server_scripts/tags/fluids/neoforge/fuels.js index 5b311d21..1464dde6 100644 --- a/kubejs/server_scripts/tags/fluids/neoforge/fuels.js +++ b/kubejs/server_scripts/tags/fluids/neoforge/fuels.js @@ -10,4 +10,8 @@ ServerEvents.tags('fluid', (event) => { event.get('c:fuels/rocket_fuel').add(['enderio:fluid_rocket_fuel_still']); event.get('c:fuels/fire_water').add(['enderio:fluid_fire_water_still']); event.get('c:fuels/dew_of_the_void').add(['enderio:fluid_dew_of_the_void_still']); + event.get('c:fuels/canola_oil').add(['actuallyadditions:canola_oil']); + event.get('c:fuels/refined_canola_oil').add(['actuallyadditions:refined_canola_oil']); + event.get('c:fuels/crystallized_oil').add(['actuallyadditions:crystallized_oil']); + event.get('c:fuels/empowered_oil').add(['actuallyadditions:empowered_oil']); }); From 1235a4c9f7dd80dad72ba957d5ee07b83216f300 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Sat, 19 Oct 2024 23:55:31 -0400 Subject: [PATCH 13/16] placeholder quests --- .../quests/chapters/0095002B3E34FD9A.snbt | 2 +- .../quests/chapters/25ADADD36B4FDE05.snbt | 2 +- .../quests/chapters/27C4C213A1A05E6E.snbt | 2 +- .../quests/chapters/2F5B4621D5F0381A.snbt | 2 +- .../quests/chapters/3676C6A060A63447.snbt | 2 +- .../quests/chapters/4D1E38918B64CD4E.snbt | 2 +- .../quests/chapters/777EE0C4949DFE12.snbt | 2 +- .../quests/chapters/7F17CDF8564DCC49.snbt | 2 +- .../quests/chapters/actually_additions.snbt | 35 ++++++++++++++++ .../ftbquests/quests/chapters/ender_io.snbt | 2 +- .../quests/chapters/industrial_foregoing.snbt | 2 +- .../quests/chapters/natures_aura.snbt | 41 +++++++++++++++++++ .../quests/chapters/pneumaticcraft.snbt | 2 +- config/ftbquests/quests/lang/en_us.snbt | 14 +++++++ 14 files changed, 101 insertions(+), 11 deletions(-) create mode 100644 config/ftbquests/quests/chapters/actually_additions.snbt create mode 100644 config/ftbquests/quests/chapters/natures_aura.snbt diff --git a/config/ftbquests/quests/chapters/0095002B3E34FD9A.snbt b/config/ftbquests/quests/chapters/0095002B3E34FD9A.snbt index 58e45b6c..6d4ddad9 100644 --- a/config/ftbquests/quests/chapters/0095002B3E34FD9A.snbt +++ b/config/ftbquests/quests/chapters/0095002B3E34FD9A.snbt @@ -11,7 +11,7 @@ id: "occultism:dictionary_of_spirits" } id: "0095002B3E34FD9A" - order_index: 5 + order_index: 6 quest_links: [ ] quests: [ { diff --git a/config/ftbquests/quests/chapters/25ADADD36B4FDE05.snbt b/config/ftbquests/quests/chapters/25ADADD36B4FDE05.snbt index c8a71e39..96639796 100644 --- a/config/ftbquests/quests/chapters/25ADADD36B4FDE05.snbt +++ b/config/ftbquests/quests/chapters/25ADADD36B4FDE05.snbt @@ -7,7 +7,7 @@ id: "justdirethings:machinesettingscopier" } id: "4C53D082D6306BF8" - order_index: 4 + order_index: 5 quest_links: [ ] quests: [ { diff --git a/config/ftbquests/quests/chapters/27C4C213A1A05E6E.snbt b/config/ftbquests/quests/chapters/27C4C213A1A05E6E.snbt index 077f03f5..aea0f2b3 100644 --- a/config/ftbquests/quests/chapters/27C4C213A1A05E6E.snbt +++ b/config/ftbquests/quests/chapters/27C4C213A1A05E6E.snbt @@ -8,7 +8,7 @@ id: "mffs:remote_controller" } id: "27C4C213A1A05E6E" - order_index: 7 + order_index: 8 quest_links: [ ] quests: [ { diff --git a/config/ftbquests/quests/chapters/2F5B4621D5F0381A.snbt b/config/ftbquests/quests/chapters/2F5B4621D5F0381A.snbt index 414849ae..d0e91de3 100644 --- a/config/ftbquests/quests/chapters/2F5B4621D5F0381A.snbt +++ b/config/ftbquests/quests/chapters/2F5B4621D5F0381A.snbt @@ -8,7 +8,7 @@ id: "modern_industrialization:guidebook" } id: "2F5B4621D5F0381A" - order_index: 6 + order_index: 7 quest_links: [ ] quests: [ { diff --git a/config/ftbquests/quests/chapters/3676C6A060A63447.snbt b/config/ftbquests/quests/chapters/3676C6A060A63447.snbt index 82d31f7b..f7ce0296 100644 --- a/config/ftbquests/quests/chapters/3676C6A060A63447.snbt +++ b/config/ftbquests/quests/chapters/3676C6A060A63447.snbt @@ -11,7 +11,7 @@ id: "modonomicon:modonomicon" } id: "3676C6A060A63447" - order_index: 6 + order_index: 7 quest_links: [ ] quests: [ { diff --git a/config/ftbquests/quests/chapters/4D1E38918B64CD4E.snbt b/config/ftbquests/quests/chapters/4D1E38918B64CD4E.snbt index 2cb10cd7..59e0238d 100644 --- a/config/ftbquests/quests/chapters/4D1E38918B64CD4E.snbt +++ b/config/ftbquests/quests/chapters/4D1E38918B64CD4E.snbt @@ -8,7 +8,7 @@ id: "mekanism:dictionary" } id: "4D1E38918B64CD4E" - order_index: 5 + order_index: 6 quest_links: [ ] quests: [ { diff --git a/config/ftbquests/quests/chapters/777EE0C4949DFE12.snbt b/config/ftbquests/quests/chapters/777EE0C4949DFE12.snbt index 4fd775c2..67a73c96 100644 --- a/config/ftbquests/quests/chapters/777EE0C4949DFE12.snbt +++ b/config/ftbquests/quests/chapters/777EE0C4949DFE12.snbt @@ -8,7 +8,7 @@ id: "ae2:guide" } id: "777EE0C4949DFE12" - order_index: 0 + order_index: 1 quest_links: [ ] quests: [ { diff --git a/config/ftbquests/quests/chapters/7F17CDF8564DCC49.snbt b/config/ftbquests/quests/chapters/7F17CDF8564DCC49.snbt index ecaa4658..2e30ecf3 100644 --- a/config/ftbquests/quests/chapters/7F17CDF8564DCC49.snbt +++ b/config/ftbquests/quests/chapters/7F17CDF8564DCC49.snbt @@ -11,7 +11,7 @@ id: "patchouli:guide_book" } id: "7F17CDF8564DCC49" - order_index: 2 + order_index: 3 quest_links: [ ] quests: [ { diff --git a/config/ftbquests/quests/chapters/actually_additions.snbt b/config/ftbquests/quests/chapters/actually_additions.snbt new file mode 100644 index 00000000..169f2281 --- /dev/null +++ b/config/ftbquests/quests/chapters/actually_additions.snbt @@ -0,0 +1,35 @@ +{ + default_hide_dependency_lines: false + default_quest_shape: "" + filename: "actually_additions" + group: "264B8D62983BEFB4" + icon: { + id: "actuallyadditions:booklet" + } + id: "24DC8C08564BB550" + order_index: 0 + quest_links: [ ] + quests: [{ + icon: { + components: { + "ftbquests:icon": "actuallyadditions:block/atomic_reconstructor_front" + } + id: "ftbquests:custom_icon" + } + id: "25770E9DCA5B4B1F" + rewards: [{ + id: "7E871DADD8015F27" + item: { + count: 1 + id: "actuallyadditions:booklet" + } + type: "item" + }] + tasks: [{ + id: "0CA6600AF5E72556" + type: "checkmark" + }] + x: 2.0d + y: -1.5d + }] +} diff --git a/config/ftbquests/quests/chapters/ender_io.snbt b/config/ftbquests/quests/chapters/ender_io.snbt index 2fbfd7d7..b7c13dea 100644 --- a/config/ftbquests/quests/chapters/ender_io.snbt +++ b/config/ftbquests/quests/chapters/ender_io.snbt @@ -7,7 +7,7 @@ id: "enderio:ender_resonator" } id: "1514913DA64A98EB" - order_index: 1 + order_index: 2 quest_links: [ ] quests: [ { diff --git a/config/ftbquests/quests/chapters/industrial_foregoing.snbt b/config/ftbquests/quests/chapters/industrial_foregoing.snbt index 5c2b67c6..26746565 100644 --- a/config/ftbquests/quests/chapters/industrial_foregoing.snbt +++ b/config/ftbquests/quests/chapters/industrial_foregoing.snbt @@ -10,7 +10,7 @@ id: "patchouli:guide_book" } id: "13D3BD9B8A839B2E" - order_index: 3 + order_index: 4 quest_links: [ ] quests: [ { diff --git a/config/ftbquests/quests/chapters/natures_aura.snbt b/config/ftbquests/quests/chapters/natures_aura.snbt new file mode 100644 index 00000000..4edd24e1 --- /dev/null +++ b/config/ftbquests/quests/chapters/natures_aura.snbt @@ -0,0 +1,41 @@ +{ + default_hide_dependency_lines: false + default_quest_shape: "" + filename: "natures_aura" + group: "440488E780593120" + icon: { + components: { + "patchouli:book": "naturesaura:book" + } + id: "patchouli:guide_book" + } + id: "70FCD34EEFA2F001" + order_index: 5 + quest_links: [ ] + quests: [{ + icon: { + components: { + "ftbquests:icon": "naturesaura:textures/gui/patchouli/categories/intro.png" + } + id: "ftbquests:custom_icon" + } + id: "4421EB35235888DF" + rewards: [{ + id: "0A6DCBF3D132FC21" + item: { + components: { + "patchouli:book": "naturesaura:book" + } + count: 1 + id: "patchouli:guide_book" + } + type: "item" + }] + tasks: [{ + id: "50DC2A7C3CE873AD" + type: "checkmark" + }] + x: 0.5d + y: 0.0d + }] +} diff --git a/config/ftbquests/quests/chapters/pneumaticcraft.snbt b/config/ftbquests/quests/chapters/pneumaticcraft.snbt index f31c69fb..fce988e2 100644 --- a/config/ftbquests/quests/chapters/pneumaticcraft.snbt +++ b/config/ftbquests/quests/chapters/pneumaticcraft.snbt @@ -10,7 +10,7 @@ id: "patchouli:guide_book" } id: "5957A1DE2E537AC3" - order_index: 8 + order_index: 9 quest_links: [ ] quests: [ { diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index 93424e7f..a7724594 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -6,6 +6,7 @@ chapter.1514913DA64A98EB.title: "Ender IO" chapter.1A29B498BD263BEF.title: "Redstone" chapter.1B26EF5BA11434F8.title: "ChocoCraft" + chapter.24DC8C08564BB550.title: "Actually Additions" chapter.25ADADD36B4FDE05.title: "Just Dire Things" chapter.27C4C213A1A05E6E.title: "Modular Force Fields" chapter.2F5B4621D5F0381A.title: "Modern Industrialization" @@ -19,6 +20,7 @@ chapter.603B06098A07350C.title: "EvilCraft" chapter.60F666DD0AC6F03F.title: "Multiverse" chapter.6DB48898896BFFC9.title: "Bumblezone" + chapter.70FCD34EEFA2F001.title: "Nature's Aura" chapter.777EE0C4949DFE12.title: "Applied Energistics" chapter.7CFAC3316D718D25.title: "ChocoCraft" chapter.7F17CDF8564DCC49.title: "Genetics: Resequenced" @@ -1010,6 +1012,11 @@ "&a🛈 Tip: The Drill will never dry up with a" "&a Water Bucket in your inventory!" ] + quest.25770E9DCA5B4B1F.quest_desc: [ + "Welcome to Actually Additions! " + "" + "Have a free book! This section is under construction!" + ] quest.25D327DB56E51DA5.quest_desc: [ "The pinnacle of energy production, the Fusion Reactor uses Deuterium and Tritium to produce an absurd amount of power. Some of this is accessible directly from the Reactor itself, but far more can be harnessed by using the Reactor to produce steam for Turbines." "&n &r" @@ -1946,6 +1953,11 @@ "Use this to encase a mob spawner to kill anything that spawns, or simply make a floor that damages anything standing on it. " ] quest.441562EC913D1043.title: "Mob Farming" + quest.4421EB35235888DF.quest_desc: [ + "Welcome to Nature's Aura! " + "" + "Have a free book! This section is under construction!" + ] quest.4457D6BB7AE28073.quest_desc: [ "The mod doesn’t offer any form of power conduit, but it does offer the next best thing: wireless energy." "" @@ -3724,6 +3736,7 @@ task.0767C8200D0389A6.title: "Essences" task.07D8961C49D02845.title: "Archwood Saplings" task.0C66972E31440AAF.title: "Ender Cells" + task.0CA6600AF5E72556.title: "Actually Additions" task.0CB92589AF70B557.title: "Any &3Handcrafted&r Item" task.0DAE4E6D7B7DC9FB.title: "Summon: Foliot Crusher" task.0DE0A9A5505F1850.title: "Discovering Enigmatica" @@ -3784,6 +3797,7 @@ task.4D3445BCDA8E459B.title: "BumbleZone" task.4D45C5166D0700F8.title: "Item Pipes" task.4D5563ABAA54713A.title: "Beacon Equipment" + task.50DC2A7C3CE873AD.title: "Nature's Aura" task.51472C5BD0C05E09.title: "Kill a Mob" task.51A4E7C2E42561D2.title: "Advanced Compressors" task.52CE5D30CDF0A6FF.title: "Prismatic Tools" From 34da37527e81693f404d5e5fdebc75afa3966a8f Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Sun, 20 Oct 2024 11:48:10 -0400 Subject: [PATCH 14/16] oil drilling --- CHANGELOG.md | 1 + .../industrialforegoing/laser_drill_fluid.js | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 839c4ae8..f57ca4f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Actually Additions seeds added to market [\#174](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/174) - Ore generators updated to add new/missing ores [\#174](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/174) - Fuels updated [\#174](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/174) +- Industrial Foregoing can now drill for oil [\#174](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/174) --- diff --git a/kubejs/server_scripts/recipes/industrialforegoing/laser_drill_fluid.js b/kubejs/server_scripts/recipes/industrialforegoing/laser_drill_fluid.js index 827c0be0..12ffe8aa 100644 --- a/kubejs/server_scripts/recipes/industrialforegoing/laser_drill_fluid.js +++ b/kubejs/server_scripts/recipes/industrialforegoing/laser_drill_fluid.js @@ -16,11 +16,31 @@ ServerEvents.recipes((event) => { } ], id: `${id_prefix}blood` + }, + { + catalyst: { item: 'industrialforegoing:black_laser_lens' }, + output: { amount: 100, id: 'modern_industrialization:crude_oil' }, + rarity: [ + { + dimension_filter: { blacklist: [], whitelist: ['minecraft:overworld'] }, + biome_filter: { + blacklist: [], + whitelist: ['c:is_deep_ocean', 'c:is_desert'] + }, + depth_max: 256, + depth_min: -64, + weight: 8 + } + ], + id: `${id_prefix}crude_oil` } ]; recipes.forEach((recipe) => { recipe.type = 'industrialforegoing:laser_drill_fluid'; + if (!recipe.entity) { + recipe.entity = 'minecraft:empty'; + } event.custom(recipe).id(recipe.id); }); }); From b3509f4191195ccbaebea1cabd1bbd12b67f1033 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Sun, 20 Oct 2024 12:11:37 -0400 Subject: [PATCH 15/16] aura plants --- CHANGELOG.md | 1 + .../recipes/naturesaura/shaped.js | 55 +++++++++++++++++++ .../recipes/pneumaticcraft/thermo_plant.js | 9 +++ 3 files changed, 65 insertions(+) create mode 100644 kubejs/server_scripts/recipes/naturesaura/shaped.js diff --git a/CHANGELOG.md b/CHANGELOG.md index f57ca4f0..77617cd2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Ore generators updated to add new/missing ores [\#174](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/174) - Fuels updated [\#174](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/174) - Industrial Foregoing can now drill for oil [\#174](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/174) +- Aura Plants may be crafted for decoration [\#174](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/174) --- diff --git a/kubejs/server_scripts/recipes/naturesaura/shaped.js b/kubejs/server_scripts/recipes/naturesaura/shaped.js new file mode 100644 index 00000000..f1cd66c1 --- /dev/null +++ b/kubejs/server_scripts/recipes/naturesaura/shaped.js @@ -0,0 +1,55 @@ +ServerEvents.recipes((event) => { + const id_prefix = 'pneumaticcraft:handcrafted/shaped/'; + + const recipes = [ + { + output: '8x naturesaura:crimson_aura_mushroom', + pattern: ['AAA', 'ABA', 'AAA'], + key: { + A: 'minecraft:crimson_fungus', + B: 'naturesaura:gold_powder' + }, + id: `${id_prefix}crimson_aura_mushroom` + }, + { + output: '8x naturesaura:warped_aura_mushroom', + pattern: ['AAA', 'ABA', 'AAA'], + key: { + A: 'minecraft:warped_fungus', + B: 'naturesaura:gold_powder' + }, + id: `${id_prefix}warped_aura_mushroom` + }, + { + output: '8x naturesaura:aura_bloom', + pattern: ['AAA', 'ABA', 'AAA'], + key: { + A: 'minecraft:oxeye_daisy', + B: 'naturesaura:gold_powder' + }, + id: `${id_prefix}aura_bloom` + }, + { + output: '8x naturesaura:aura_cactus', + pattern: ['AAA', 'ABA', 'AAA'], + key: { + A: 'minecraft:cactus', + B: 'naturesaura:gold_powder' + }, + id: `${id_prefix}aura_cactus` + }, + { + output: '8x naturesaura:aura_mushroom', + pattern: ['AAA', 'ABA', 'AAA'], + key: { + A: 'minecraft:red_mushroom', + B: 'naturesaura:gold_powder' + }, + id: `${id_prefix}aura_mushroom` + } + ]; + + recipes.forEach((recipe) => { + event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id); + }); +}); diff --git a/kubejs/server_scripts/recipes/pneumaticcraft/thermo_plant.js b/kubejs/server_scripts/recipes/pneumaticcraft/thermo_plant.js index af8caf76..8f3a5ac4 100644 --- a/kubejs/server_scripts/recipes/pneumaticcraft/thermo_plant.js +++ b/kubejs/server_scripts/recipes/pneumaticcraft/thermo_plant.js @@ -13,6 +13,15 @@ ServerEvents.recipes((event) => { outputs: { fluid_output: { id: 'modern_industrialization:lubricant', amount: 1000 } }, temperature: { min: 373 }, id: `pneumaticcraft:thermo_plant/lubricant_from_biodiesel` + }, + { + inputs: { + fluid: { fluid: 'minecraft:water', amount: 1000 }, + item: { item: 'naturesaura:aura_mushroom' } + }, + outputs: { fluid_output: { id: 'pneumaticcraft:yeast_culture', amount: 1000 } }, + speed: 0.1, + temperature: { max: 333, min: 303 } } ]; From 3ffd5a3b994da8694efaa6958465e9512a12c951 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Sun, 20 Oct 2024 12:12:40 -0400 Subject: [PATCH 16/16] Update waystones-common.toml --- config/waystones-common.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/waystones-common.toml b/config/waystones-common.toml index 4f6a4719..2dec4688 100644 --- a/config/waystones-common.toml +++ b/config/waystones-common.toml @@ -74,7 +74,7 @@ [compatibility] #If enabled, JourneyMap waypoints will be created for each activated waystone. - journeyMap = true + journeyMap = false #If enabled, JourneyMap waypoints will only be created if the mod 'JourneyMap Integration' is not installed preferJourneyMapIntegrationMod = true #If enabled, Waystones will add markers for waystones and sharestones to BlueMap.