From 86826375338c8b9a0fa99702fe9d2f3e552e56a5 Mon Sep 17 00:00:00 2001 From: Citali Date: Thu, 11 Feb 2021 08:33:28 +0100 Subject: [PATCH] v0.9-1.16.5-36.0.14 --- Changelog.md | 6 +++--- config/astralsorcery-common.toml | 2 +- .../kubejs/recipes/minecraft/blasting.js | 6 ++++++ .../kubejs/recipes/minecraft/shapeless.js | 9 +++++++++ .../kubejs/recipes/minecraft/smelting.js | 6 ++++++ .../fellies/kubejs/recipes/remove.js | 3 +++ .../fellies/kubejs/recipes/replace.js | 18 ++++++++++++++++++ 7 files changed, 46 insertions(+), 4 deletions(-) diff --git a/Changelog.md b/Changelog.md index fee9034..b234093 100644 --- a/Changelog.md +++ b/Changelog.md @@ -10,6 +10,6 @@ ### Kubejs -- Change vanilla ore drops -- Change create lapis press recipe -- Add new graphite block and recipe to create diamond with create +- Add new recipe for oldstone to stone +- Add temp recipe for aquamarine +- Change recipe for silicon for EE silicon only diff --git a/config/astralsorcery-common.toml b/config/astralsorcery-common.toml index db53c11..0800cfe 100644 --- a/config/astralsorcery-common.toml +++ b/config/astralsorcery-common.toml @@ -53,7 +53,7 @@ #Set this to true to let this feature generate in any world. (Does NOT work for structures!) everyWorld = false #Set this to false to disable this worldgen feature. - enabled = false + enabled = true [worldgen.desert_shrine] #Sets the categories to generate this feature in. Available categories: none,taiga,extreme_hills,jungle,mesa,plains,savanna,icy,the_end,beach,forest,ocean,desert,river,swamp,mushroom,nether diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/blasting.js b/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/blasting.js index add3e36..b09c2bb 100644 --- a/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/blasting.js +++ b/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/blasting.js @@ -1,4 +1,10 @@ // priority: 99 events.listen('recipes', e => { + // Astral Sorcery + e.blasting('#forge:gems/aquamarine', '#forge:ores/dimensional') + + // AE2 + e.blasting('#forge:gems/certus_quartz', '#forge:ores/certus_quartz') + e.blasting('#forge:gems/charged_certus_quartz', '#forge:ores/charged_certus_quartz') }); \ No newline at end of file diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/shapeless.js b/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/shapeless.js index 83df8a5..7e9413f 100644 --- a/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/shapeless.js +++ b/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/shapeless.js @@ -9,12 +9,21 @@ events.listen('recipes', e => { e.shapeless('additional_lights:soul_fire_for_fire_pit_s', ['#fellies:minicoal', '#fellies:minicoal','#fellies:minicoal', '#forge:soul_sand']); e.shapeless('additional_lights:soul_fire_for_fire_pit_l', ['#fellies:minicoal', '#fellies:minicoal','#fellies:minicoal','#fellies:minicoal', '#forge:soul_sand']); + // AE2 + e.shapeless('emendatusenigmatica:silicon_gem', ['appliedenergistics2:silicon']); + + // Extcaves + e.shapeless('minecraft:stone', ['extcaves:oldstone']); + // Minecraft e.shapeless('minecraft:sticky_piston', ['minecraft:piston', '#forge:slimeballs']); e.shapeless('minecraft:flint', ['#forge:gravel', '#forge:gravel', '#forge:gravel']); e.shapeless('minecraft:chest', ['#forge:chests/wooden']); e.shapeless('minecraft:wheat_seeds', ['minecraft:wheat']); + // Refined Storage + e.shapeless('emendatusenigmatica:silicon_gem', ['refinedstorage:silicon']); + // RF Tools e.shapeless('rftoolsbase:dimensionalshard', ['emendatusenigmatica:dimensional_gem']); }); \ No newline at end of file diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/smelting.js b/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/smelting.js index add3e36..5ae4311 100644 --- a/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/smelting.js +++ b/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/smelting.js @@ -1,4 +1,10 @@ // priority: 99 events.listen('recipes', e => { + // Astral Sorcery + e.smelting('#forge:gems/aquamarine', '#forge:ores/dimensional') + + // AE2 + e.smelting('#forge:gems/certus_quartz', '#forge:ores/certus_quartz') + e.smelting('#forge:gems/charged_certus_quartz', '#forge:ores/charged_certus_quartz') }); \ No newline at end of file diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/remove.js b/kubejs/server_scripts/fellies/kubejs/recipes/remove.js index f9ccf98..d36b211 100644 --- a/kubejs/server_scripts/fellies/kubejs/recipes/remove.js +++ b/kubejs/server_scripts/fellies/kubejs/recipes/remove.js @@ -79,4 +79,7 @@ events.listen('recipes', e => { idsToRemove.forEach(remove => { e.remove({id: remove}) }) + + // Dustrial Decor + e.remove({input: 'dustrial_decor:rusty_iron_ingot'}) }) \ No newline at end of file diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/replace.js b/kubejs/server_scripts/fellies/kubejs/recipes/replace.js index ab70235..d2cef31 100644 --- a/kubejs/server_scripts/fellies/kubejs/recipes/replace.js +++ b/kubejs/server_scripts/fellies/kubejs/recipes/replace.js @@ -1,9 +1,27 @@ // priority: 98 events.listen('recipes', e => { + // ---- Inputs --- // + // AE2 + e.replaceInput({}, 'appliedenergistics2:certus_quartz_crystal', 'emendatusenigmatica:certus_quartz_gem') + e.replaceInput({}, 'appliedenergistics2:charged_certus_quartz_crystal', 'emendatusenigmatica:charged_certus_quartz_gem') + e.replaceInput({}, 'appliedenergistics2:silicon', 'emendatusenigmatica:silicon_gem') + // Create e.replaceInput({id: 'create:pressing/lapis_block'}, 'minecraft:lapis_block', '#forge:gems/lapis'); // Mana and Artifice e.replaceInput({}, 'mana-and-artifice:vinteum_ore', '#forge:ores/arcane'); + + // Refined Storage + e.replaceInput({}, 'refinedstorage:silicon', 'emendatusenigmatica:silicon_gem') + + // ---- Outputs --- // + // AE2 + e.replaceOutput({}, 'appliedenergistics2:certus_quartz_crystal', 'emendatusenigmatica:certus_quartz_gem') + e.replaceOutput({}, 'appliedenergistics2:charged_certus_quartz_crystal', 'emendatusenigmatica:charged_certus_quartz_gem') + e.replaceOutput({}, 'appliedenergistics2:silicon', 'emendatusenigmatica:silicon_gem') + + // Refined Storage + e.replaceInput({}, 'refinedstorage:silicon', 'emendatusenigmatica:silicon_gem') }); \ No newline at end of file