diff --git a/CHANGELOG.md b/CHANGELOG.md index a69f4c44..4af129db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,23 @@ -### Enigmatica 10 1.12.1 +### Enigmatica 10 1.13.0 + +#### ⭐ Improvements + +- Rice Slime Balls now count as slime balls for more recipes [\#196](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/196) +- Expanded fuel support for AA, allowing it to burn more coal like substances [\#196](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/196) +- Added more cross mod crushing compatibility [\#196](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/196) +- AA Lasers no longer lose power during transmission [\#196](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/196) +- Tiny TNT no longer breaks blocks, making it safer for crafting [\#196](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/196) +- Glow Berries are now a source for yellow dye [\#196](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/196) +- The Market has dropped their prices once again! Rejoice! [\#196](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/196) +- Ronaza's Contact no longer uses Sculk Catalyst on account of it eating the ritual. Nom. [\#202](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/202) +- Add missing blocks to Eldritch Miner [\#204](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/204) #### 🦟 Bugs Fixed - Fixed broken logistics quests and a missing icon in genetics quests [(\#195)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/195) - Unbound Marid no longer blacklisted from spawners [(\#195)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/195) +- Add missing Tin processing recipes [(\#196)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/196) +- Fix missing Lignite crushing recipes [(\#205)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/205) --- diff --git a/config/actuallyadditions-common.toml b/config/actuallyadditions-common.toml index 617b716c..b7a20ac1 100644 --- a/config/actuallyadditions-common.toml +++ b/config/actuallyadditions-common.toml @@ -56,7 +56,7 @@ #Range: > 1 minerLensEnergy = 60000 #If Energy Laser Relays should have energy loss. - laserRelayLoss = true + laserRelayLoss = false #The cooldown between two generation cycles of the Leaf Generator, in ticks #Range: > 1 leafGeneratorCooldown = 5 diff --git a/config/ae2-common.toml b/config/ae2-common.toml index fdb6b5cf..f3875fd0 100644 --- a/config/ae2-common.toml +++ b/config/ae2-common.toml @@ -3,7 +3,7 @@ #Enables the ability of the Matter Cannon to break blocks. matterCannonBlockDamage = true #Enables the ability of Tiny TNT to break blocks. - tinyTntBlockDamage = true + tinyTntBlockDamage = false #Changes the channel capacity that cables provide in AE2. #Allowed Values: INFINITE, DEFAULT, X2, X3, X4 channels = "DEFAULT" diff --git a/config/ftbquests/quests/chapters/0095002B3E34FD9A.snbt b/config/ftbquests/quests/chapters/0095002B3E34FD9A.snbt index 4cc7dde5..541801e0 100644 --- a/config/ftbquests/quests/chapters/0095002B3E34FD9A.snbt +++ b/config/ftbquests/quests/chapters/0095002B3E34FD9A.snbt @@ -902,5 +902,22 @@ x: 5.5d y: 4.0d } + { + dependencies: ["5BD04F0109CB6704"] + id: "586D65D7CC2B8FCF" + rewards: [{ + exclude_from_claim_all: true + id: "62443C7DB450BAB0" + table_id: 2884263910044023563L + type: "loot" + }] + tasks: [{ + id: "72396A76EEA759CF" + item: { components: { "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(occultism:books/books_of_binding)" }, count: 1, id: "ftbfiltersystem:smart_filter" } + type: "item" + }] + x: 2.5d + y: -2.0d + } ] } diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index 393d1a8a..cd2453ac 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -2906,6 +2906,17 @@ "There should be plenty of these inside the Maze to help you keep the buff up while you explore. " ] quest.5859B0217F1C837A.quest_desc: ["With an Aura Attraction Cart, Aura may be pulled from a centralized Generator and dispersed throughout an area to power machines that might be too far away to otherwise benefit from the Generator. "] + quest.586D65D7CC2B8FCF.quest_desc: [ + "As you get into the intricacies of spirit summoning, you may decide that you wish to automate some of these rituals. Since names on books are random, this can make things slightly incompatible with AE2." + "" + "By renaming the Dictionary of Spirits in an Anvil, all books bound with it will take on that name, resolving this small issue. So AE2 should have no issue with crafting bound books. " + "" + "&6⚠ Note: Job spirits summoned in this " + "&6 way will be owned by the AE2 " + "&6 system’s fake player, making them " + "&6 uncontrollable. This is best used " + "&6 for crafting items." + ] quest.59293885E5C9E8A3.quest_desc: [ "A simple machine used for crushing ores and other materials. " "" @@ -4296,6 +4307,7 @@ task.6F72D2074543BF23.title: "Bins" task.700A9968FA0DA65E.title: "Player Transmitters" task.70531464F6943384.title: "Pattern Terminals" + task.72396A76EEA759CF.title: "Books of Binding" task.73C57E2AF9A1F920.title: "Any Chipped Tool" task.73D7073169A23821.title: "WIP" task.741114ACD8AABEF6.title: "Demon's Dream" diff --git a/config/ftbquests/quests/reward_tables/2806F6BEA4A73B0B.snbt b/config/ftbquests/quests/reward_tables/2806F6BEA4A73B0B.snbt index 4d5fd79f..97b75bde 100644 --- a/config/ftbquests/quests/reward_tables/2806F6BEA4A73B0B.snbt +++ b/config/ftbquests/quests/reward_tables/2806F6BEA4A73B0B.snbt @@ -27,12 +27,28 @@ random_bonus: 4 } { - count: 8 + count: 4 item: { count: 1 id: "occultism:book_of_binding_empty" } - random_bonus: 8 + random_bonus: 4 + } + { + count: 2 + item: { + count: 1 + id: "occultism:spirit_attuned_gem" + } + random_bonus: 2 + } + { + count: 16 + item: { + count: 1 + id: "occultism:otherworld_log" + } + random_bonus: 32 } ] use_title: true diff --git a/kubejs/server_scripts/recipes/actuallyadditions/crushing.js b/kubejs/server_scripts/recipes/actuallyadditions/crushing.js index c3b40d78..ea4f00e5 100644 --- a/kubejs/server_scripts/recipes/actuallyadditions/crushing.js +++ b/kubejs/server_scripts/recipes/actuallyadditions/crushing.js @@ -22,6 +22,31 @@ ServerEvents.recipes((event) => { ingredient: { tag: `c:gems/fluix` }, result: [{ result: { id: 'ae2:fluix_dust', count: 1 } }], id: `${id_prefix}fluix_dust` + }, + { + ingredient: { tag: `c:gems/coal` }, + result: [{ result: { id: AlmostUnified.getTagTargetItem(`c:dusts/coal`).getId(), count: 1 } }], + id: `${id_prefix}coal_dust` + }, + { + ingredient: { tag: `c:gems/lignite_coal` }, + result: [{ result: { id: 'modern_industrialization:lignite_coal_dust', count: 1 } }], + id: `${id_prefix}lignite_coal_dust` + }, + { + ingredient: { item: 'minecraft:glow_berries' }, + result: [{ result: { id: 'minecraft:yellow_dye', count: 2 } }], + id: `${id_prefix}yellow_dye_from_glow_berries` + }, + { + ingredient: { item: 'minecraft:ender_pearl' }, + result: [{ result: { id: AlmostUnified.getTagTargetItem(`c:dusts/ender_pearl`).getId(), count: 1 } }], + id: `${id_prefix}ender_pearl_dust` + }, + { + ingredient: { item: 'ae2:sky_stone_block' }, + result: [{ result: { id: 'ae2:sky_dust', count: 1 } }], + id: `${id_prefix}sky_dust` } ]; @@ -35,6 +60,7 @@ ServerEvents.recipes((event) => { { primary: 'lead', secondary: 'silver' }, { primary: 'silver', secondary: 'lead' }, { primary: 'nickel', secondary: 'iron' }, + { primary: 'tin', secondary: 'iron' }, { primary: 'uranium', secondary: 'lead' } ]; materials.forEach((material) => { diff --git a/kubejs/server_scripts/recipes/actuallyadditions/liquid_fuel.js b/kubejs/server_scripts/recipes/actuallyadditions/liquid_fuel.js new file mode 100644 index 00000000..1b1596f6 --- /dev/null +++ b/kubejs/server_scripts/recipes/actuallyadditions/liquid_fuel.js @@ -0,0 +1,33 @@ +ServerEvents.recipes((event) => { + const id_prefix = 'enigmatica:actuallyadditions/liquid_fuel/'; + + const recipes = [ + { + fuel: 'justdirethings:refined_t2_fluid_source', + fe_per_mb: 450, + fe_per_tick: 100, + id: `${id_prefix}refined_t2_fluid_source` + }, + { + fuel: 'justdirethings:refined_t3_fluid_source', + fe_per_mb: 1300, + fe_per_tick: 130, + id: `${id_prefix}refined_t3_fluid_source` + }, + { + fuel: 'justdirethings:refined_t4_fluid_source', + fe_per_mb: 4000, + fe_per_tick: 160, + id: `${id_prefix}refined_t4_fluid_source` + } + ]; + + recipes.forEach((recipe) => { + recipe.type = 'actuallyadditions:liquid_fuel'; + let burn_amount = 50; + recipe.fuel = { id: recipe.fuel, amount: burn_amount }; + recipe.total_energy = recipe.fe_per_mb * burn_amount; + recipe.burn_time = recipe.total_energy / recipe.fe_per_tick; + event.custom(recipe).id(recipe.id); + }); +}); diff --git a/kubejs/server_scripts/recipes/actuallyadditions/shapeless.js b/kubejs/server_scripts/recipes/actuallyadditions/shapeless.js new file mode 100644 index 00000000..b4c2dec9 --- /dev/null +++ b/kubejs/server_scripts/recipes/actuallyadditions/shapeless.js @@ -0,0 +1,17 @@ +ServerEvents.recipes((event) => { + const id_prefix = 'enigmatica:actuallyadditions/shapeless/'; + + const recipes = [ + { + output: '4x actuallyadditions:black_quartz', + inputs: ['#c:storage_blocks/black_quartz'], + id: `${id_prefix}black_quartz` + } + ]; + + recipes.forEach((recipe) => { + let r = event.shapeless(recipe.output, recipe.inputs).id(recipe.id); + if (recipe.damage) r.damageIngredient(recipe.damage.item, recipe.damage.amount); + if (recipe.replace) r.replaceIngredient(recipe.replace.item, recipe.replace.replacement); + }); +}); diff --git a/kubejs/server_scripts/recipes/actuallyadditions/solid_fuel.js b/kubejs/server_scripts/recipes/actuallyadditions/solid_fuel.js new file mode 100644 index 00000000..a7bdda93 --- /dev/null +++ b/kubejs/server_scripts/recipes/actuallyadditions/solid_fuel.js @@ -0,0 +1,100 @@ +ServerEvents.recipes((event) => { + const id_prefix = 'enigmatica:actuallyadditions/solid_fuel/'; + + const recipes = [ + { + item: { tag: 'c:gems/lignite_coal' }, + fuel_quality: 8, + id: `${id_prefix}lignite_coal` + }, + { + item: { tag: 'c:storage_blocks/charcoal' }, + fuel_quality: 80, + id: `${id_prefix}charcoal_block` + }, + { + item: { tag: 'c:storage_blocks/lignite_coal' }, + fuel_quality: 80, + id: `${id_prefix}lignite_coal_block` + }, + { + item: { tag: 'c:dusts/charcoal' }, + fuel_quality: 8, + id: `${id_prefix}charcoal_dust` + }, + { + item: { tag: 'c:dusts/coal' }, + fuel_quality: 8, + id: `${id_prefix}coal_dust` + }, + { + item: { tag: 'c:dusts/lignite_coal' }, + fuel_quality: 8, + id: `${id_prefix}lignite_coal_dust` + }, + { + item: { tag: 'c:tiny_dusts/coal' }, + fuel_quality: 0.8, + id: `${id_prefix}coal_tiny_dust` + }, + { + item: { tag: 'c:tiny_dusts/lignite_coal' }, + fuel_quality: 0.8, + id: `${id_prefix}lignite_coal_tiny_dust` + }, + { + item: { item: 'evilcraft:blood_waxed_coal' }, + fuel_quality: 16, + id: `${id_prefix}blood_waxed_coal` + }, + { + item: { tag: 'c:gems/primal_coal' }, + fuel_quality: 24, + id: `${id_prefix}primal_coal` + }, + { + item: { tag: 'c:gems/blaze_ember' }, + fuel_quality: 72, + id: `${id_prefix}blaze_ember` + }, + { + item: { tag: 'c:gems/voidflame' }, + fuel_quality: 216, + id: `${id_prefix}voidflame` + }, + { + item: { tag: 'c:gems/eclipse_ember' }, + fuel_quality: 648, + id: `${id_prefix}eclipse_ember` + }, + { + item: { tag: 'c:storage_blocks/primal_coal' }, + fuel_quality: 240, + id: `${id_prefix}primal_coal_block` + }, + { + item: { tag: 'c:storage_blocks/blaze_ember' }, + fuel_quality: 720, + id: `${id_prefix}blaze_ember_block` + }, + { + item: { tag: 'c:storage_blocks/voidflame' }, + fuel_quality: 2160, + id: `${id_prefix}voidflame_block` + }, + { + item: { tag: 'c:storage_blocks/eclipse_ember' }, + fuel_quality: 6480, + id: `${id_prefix}eclipse_ember_block` + } + ]; + + recipes.forEach((recipe) => { + recipe.type = 'actuallyadditions:solid_fuel'; + if (recipe.fuel_quality) { + recipe.burn_time = recipe.fuel_quality * 200; + recipe.total_energy = recipe.fuel_quality * 4000; + } + event.custom(recipe).id(recipe.id); + }); +}); diff --git a/kubejs/server_scripts/recipes/ars_nouveau/crushing.js b/kubejs/server_scripts/recipes/ars_nouveau/crushing.js index d5a953bd..871cae3f 100644 --- a/kubejs/server_scripts/recipes/ars_nouveau/crushing.js +++ b/kubejs/server_scripts/recipes/ars_nouveau/crushing.js @@ -23,6 +23,61 @@ ServerEvents.recipes((event) => { } ], id: `${id_prefix}fluix_dust` + }, + { + input: { tag: `c:gems/coal` }, + output: [ + { + stack: { id: AlmostUnified.getTagTargetItem(`c:dusts/coal`).getId(), count: 1 }, + chance: 1.0, + maxRange: 1 + } + ], + id: `${id_prefix}coal_dust` + }, + { + input: { tag: `c:gems/lignite_coal` }, + output: [ + { + stack: { id: 'modern_industrialization:lignite_coal_dust', count: 1 }, + chance: 1.0, + maxRange: 1 + } + ], + id: `${id_prefix}lignite_coal_dust` + }, + { + input: { item: 'minecraft:glow_berries' }, + output: [ + { + stack: { id: 'minecraft:yellow_dye', count: 2 }, + chance: 1.0, + maxRange: 1 + } + ], + id: `${id_prefix}yellow_dye_from_glow_berries` + }, + { + input: { item: 'minecraft:ender_pearl' }, + output: [ + { + stack: { id: AlmostUnified.getTagTargetItem(`c:dusts/ender_pearl`).getId(), count: 1 }, + chance: 1.0, + maxRange: 1 + } + ], + id: `${id_prefix}ender_pearl_dust` + }, + { + input: { item: 'ae2:sky_stone_block' }, + output: [ + { + stack: { id: 'ae2:sky_dust', count: 1 }, + chance: 1.0, + maxRange: 1 + } + ], + id: `${id_prefix}sky_dust` } ]; @@ -36,6 +91,7 @@ ServerEvents.recipes((event) => { { primary: 'lead', secondary: 'silver' }, { primary: 'silver', secondary: 'lead' }, { primary: 'nickel', secondary: 'iron' }, + { primary: 'tin', secondary: 'iron' }, { primary: 'uranium', secondary: 'lead' } ]; materials.forEach((material) => { diff --git a/kubejs/server_scripts/recipes/cobblegengalore/blockgen.js b/kubejs/server_scripts/recipes/cobblegengalore/blockgen.js index 70432656..d965e08e 100644 --- a/kubejs/server_scripts/recipes/cobblegengalore/blockgen.js +++ b/kubejs/server_scripts/recipes/cobblegengalore/blockgen.js @@ -19,7 +19,7 @@ ServerEvents.recipes((event) => { { result: { id: 'minecraft:obsidian', count: 1 }, left: { id: 'minecraft:water', consume: false }, - right: { id: 'minecraft:lava', consume: true }, + right: { id: 'minecraft:lava', consume: false }, bottom: 'minecraft:obsidian', id: `${id_prefix}obsidian` }, @@ -36,7 +36,7 @@ ServerEvents.recipes((event) => { stoneworks[type].forEach((block) => { recipes.push({ result: { id: block, count: 1 }, - left: { id: 'minecraft:water', consume: block == 'stones' ? true : false }, + left: { id: 'minecraft:water', consume: block == false }, right: { id: 'minecraft:lava', consume: false }, bottom: block, id: `${id_prefix}${block.replace(':', '_')}` diff --git a/kubejs/server_scripts/recipes/enderio/sag_milling.js b/kubejs/server_scripts/recipes/enderio/sag_milling.js index 0204160f..de9db3db 100644 --- a/kubejs/server_scripts/recipes/enderio/sag_milling.js +++ b/kubejs/server_scripts/recipes/enderio/sag_milling.js @@ -107,6 +107,26 @@ ServerEvents.recipes((event) => { ], energy: 2400, id: `enderio:sag_milling/sand` + }, + { + input: { item: 'minecraft:glow_berries' }, + outputs: [ + { item: { id: 'minecraft:yellow_dye', count: 1 }, chance: 0.8 }, + { + item: { id: 'minecraft:yellow_dye', count: 1 }, + chance: 0.6 + }, + { + item: { id: 'minecraft:yellow_dye', count: 1 }, + chance: 0.3 + }, + { + item: { id: 'enderio:plant_matter_green', count: 1 }, + chance: 0.1 + } + ], + energy: 2400, + id: `${id_prefix}yellow_dye_from_glow_berries` } ]; diff --git a/kubejs/server_scripts/recipes/enigmatica/shapeless.js b/kubejs/server_scripts/recipes/enigmatica/shapeless.js index 5d01e1c8..4257f2ad 100644 --- a/kubejs/server_scripts/recipes/enigmatica/shapeless.js +++ b/kubejs/server_scripts/recipes/enigmatica/shapeless.js @@ -37,6 +37,11 @@ ServerEvents.recipes((event) => { inputs: ['productivetrees:fustic'], id: `${id_prefix}yellow_dye_from_fustic` }, + { + output: 'minecraft:yellow_dye', + inputs: ['minecraft:glow_berries'], + id: `${id_prefix}yellow_dye_from_glow_berries` + }, { output: 'minecraft:red_dye', inputs: ['productivetrees:dracaena_sap'], @@ -68,6 +73,11 @@ ServerEvents.recipes((event) => { output: '4x minecraft:quartz', inputs: ['#c:storage_blocks/quartz'], id: `${id_prefix}quartz` + }, + { + output: '4x minecraft:amethyst_shard', + inputs: ['#c:storage_blocks/amethyst'], + id: `${id_prefix}amethyst_shard` } ]; diff --git a/kubejs/server_scripts/recipes/farmersdelight/cutting.js b/kubejs/server_scripts/recipes/farmersdelight/cutting.js index 7193a80d..01ff0449 100644 --- a/kubejs/server_scripts/recipes/farmersdelight/cutting.js +++ b/kubejs/server_scripts/recipes/farmersdelight/cutting.js @@ -1,7 +1,14 @@ ServerEvents.recipes((event) => { const id_prefix = 'enigmatica:farmersdelight/cutting/'; - const recipes = []; + const recipes = [ + { + ingredients: [{ item: 'minecraft:glow_berries' }], + result: [{ item: { id: 'minecraft:yellow_dye', count: 2 } }], + tool: { tag: 'c:tools/knife' }, + id: `${id_prefix}yellow_dye_from_glow_berries` + } + ]; wood_registry.forEach((r) => { recipes.push( diff --git a/kubejs/server_scripts/recipes/farmingforblockheads/market_presets.js b/kubejs/server_scripts/recipes/farmingforblockheads/market_presets.js index ebbe30f4..487ec27d 100644 --- a/kubejs/server_scripts/recipes/farmingforblockheads/market_presets.js +++ b/kubejs/server_scripts/recipes/farmingforblockheads/market_presets.js @@ -17,7 +17,7 @@ ServerEvents.generateData('before_mods', (event) => { ingredient: { item: 'minecraft:gold_nugget' }, - count: 3 + count: 1 } }, { diff --git a/kubejs/server_scripts/recipes/mekanism/enriching.js b/kubejs/server_scripts/recipes/mekanism/enriching.js index d9868324..72b92833 100644 --- a/kubejs/server_scripts/recipes/mekanism/enriching.js +++ b/kubejs/server_scripts/recipes/mekanism/enriching.js @@ -16,6 +16,11 @@ ServerEvents.recipes((event) => { input: { count: 1, tag: 'c:ores/black_quartz' }, output: { count: 2, id: 'actuallyadditions:black_quartz' }, id: `${id_prefix}black_quartz` + }, + { + input: { count: 1, item: 'minecraft:glow_berries' }, + output: { count: 2, id: 'minecraft:yellow_dye' }, + id: `${id_prefix}yellow_dye_from_glow_berries` } ]; diff --git a/kubejs/server_scripts/recipes/minecraft/compostable.js b/kubejs/server_scripts/recipes/minecraft/compostable.js index 955fff0b..e31966d0 100644 --- a/kubejs/server_scripts/recipes/minecraft/compostable.js +++ b/kubejs/server_scripts/recipes/minecraft/compostable.js @@ -1,16 +1,13 @@ const compostables = [ - { - input: 'minecraft:egg', - chance: 0.35 - }, - { - input: '#c:foods/raw_meat', - chance: 0.65 - }, - { - input: '#c:foods/safe_raw_fish', - chance: 0.45 - } + { input: 'minecraft:egg', chance: 0.35 }, + { input: '#c:foods/raw_meat', chance: 0.65 }, + { input: '#c:foods/safe_raw_fish', chance: 0.45 }, + { input: 'actuallyadditions:rice_seeds', chance: 0.35 }, + { input: 'actuallyadditions:canola_seeds', chance: 0.35 }, + { input: 'actuallyadditions:flax_seeds', chance: 0.35 }, + { input: 'actuallyadditions:coffee_beans', chance: 0.35 }, + { input: 'actuallyadditions:rice', chance: 0.65 }, + { input: 'actuallyadditions:canola', chance: 0.65 } ]; ServerEvents.compostableRecipes((event) => { @@ -27,5 +24,5 @@ ServerEvents.generateData('before_mods', (event) => { data_map.values[compostable.input] = { chance: compostable.chance }; }); - event.json(`neoforge:data_maps/item/compostables.json`, data_map); + event.json(`neoforge:data_maps/item/compostables`, data_map); }); diff --git a/kubejs/server_scripts/recipes/modern_industrialization/macerator.js b/kubejs/server_scripts/recipes/modern_industrialization/macerator.js index 621fc6de..fc40e98e 100644 --- a/kubejs/server_scripts/recipes/modern_industrialization/macerator.js +++ b/kubejs/server_scripts/recipes/modern_industrialization/macerator.js @@ -15,6 +15,13 @@ ServerEvents.recipes((event) => { eu: 2, duration: 800, id: `${id_prefix}plutonium_dust` + }, + { + item_inputs: { item: 'minecraft:glow_berries', amount: 1 }, + item_outputs: { item: 'minecraft:yellow_dye', amount: 2 }, + eu: 2, + duration: 100, + id: `${id_prefix}yellow_dye_from_glow_berries` } ]; diff --git a/kubejs/server_scripts/recipes/naturesaura/altar.js b/kubejs/server_scripts/recipes/naturesaura/altar.js index f2fc71e0..991ceef3 100644 --- a/kubejs/server_scripts/recipes/naturesaura/altar.js +++ b/kubejs/server_scripts/recipes/naturesaura/altar.js @@ -9,6 +9,14 @@ ServerEvents.recipes((event) => { aura: 5000, time: 20, id: `${id_prefix}nautilus_shell` + }, + { + input: { item: 'minecraft:glow_berries' }, + output: { id: 'minecraft:glowstone_dust' }, + catalyst: { item: 'naturesaura:crushing_catalyst' }, + aura: 5000, + time: 20, + id: `${id_prefix}glowstone_dust` } ]; diff --git a/kubejs/server_scripts/recipes/naturesaura/shaped.js b/kubejs/server_scripts/recipes/naturesaura/shaped.js index f1cd66c1..8cf4da4a 100644 --- a/kubejs/server_scripts/recipes/naturesaura/shaped.js +++ b/kubejs/server_scripts/recipes/naturesaura/shaped.js @@ -1,5 +1,5 @@ ServerEvents.recipes((event) => { - const id_prefix = 'pneumaticcraft:handcrafted/shaped/'; + const id_prefix = 'pneumaticcraft:naturesaura/shaped/'; const recipes = [ { diff --git a/kubejs/server_scripts/recipes/occultism/crushing.js b/kubejs/server_scripts/recipes/occultism/crushing.js index c4e55113..1f9ff2fc 100644 --- a/kubejs/server_scripts/recipes/occultism/crushing.js +++ b/kubejs/server_scripts/recipes/occultism/crushing.js @@ -42,6 +42,16 @@ ServerEvents.recipes((event) => { }, id: `occultism:crushing/certus_quartz_dust_from_gem` }, + { + ingredient: { tag: 'c:gems/emerald' }, + ignore_crushing_multiplier: true, + result: { + type: 'occultism:item', + id: AlmostUnified.getTagTargetItem(`c:dusts/emerald`).getId(), + count: 1 + }, + id: `occultism:crushing/emerald_dust_from_gem` + }, { ingredient: { tag: 'c:ores/black_quartz' }, ignore_crushing_multiplier: false, @@ -61,6 +71,36 @@ ServerEvents.recipes((event) => { count: 1 }, id: `${id_prefix}glowstone_dust` + }, + { + ingredient: { tag: `c:gems/fluix` }, + ignore_crushing_multiplier: true, + result: { + type: 'occultism:item', + id: 'ae2:fluix_dust', + count: 1 + }, + id: `${id_prefix}fluix_dust` + }, + { + ingredient: { item: 'minecraft:ender_pearl' }, + ignore_crushing_multiplier: true, + result: { + type: 'occultism:item', + id: AlmostUnified.getTagTargetItem(`c:dusts/ender_pearl`).getId(), + count: 1 + }, + id: `${id_prefix}ender_pearl_dust` + }, + { + ingredient: { item: 'ae2:sky_stone_block' }, + ignore_crushing_multiplier: true, + result: { + type: 'occultism:item', + id: 'ae2:sky_dust', + count: 1 + }, + id: `${id_prefix}sky_dust` } ]; diff --git a/kubejs/server_scripts/recipes/occultism/miner.js b/kubejs/server_scripts/recipes/occultism/miner.js index 07279747..50e5da97 100644 --- a/kubejs/server_scripts/recipes/occultism/miner.js +++ b/kubejs/server_scripts/recipes/occultism/miner.js @@ -2,6 +2,7 @@ ServerEvents.recipes((event) => { const id_prefix = 'enigmatica:occultism/miner/'; const recipes = [ + // Ore Miners { ingredient: { tag: 'occultism:miners/ores' }, result: { @@ -21,6 +22,132 @@ ServerEvents.recipes((event) => { weight: 560 }, id: `${id_prefix}black_quartz` + }, + { + ingredient: { tag: 'occultism:miners/ores' }, + result: { + type: 'occultism:weighted_tag', + tag: 'c:ores/fluorite', + count: 1, + weight: 560 + }, + id: `${id_prefix}fluorite` + }, + + // Eldritch Miner + { + ingredient: { tag: 'occultism:miners/eldritch' }, + result: { + type: 'occultism:weighted_tag', + tag: 'c:storage_blocks/quartz', + count: 3, + weight: 90 + }, + id: 'occultism:miner/eldritch/quartz' + }, + { + ingredient: { tag: 'occultism:miners/eldritch' }, + result: { + type: 'occultism:weighted_tag', + tag: 'minecraft:glowstone', + count: 3, + weight: 90 + }, + id: 'occultism:miner/eldritch/glowstone_dust' + }, + { + ingredient: { tag: 'occultism:miners/eldritch' }, + result: { + type: 'occultism:weighted_tag', + tag: 'c:storage_blocks/amethyst', + count: 3, + weight: 90 + }, + id: 'occultism:miner/eldritch/amethyst' + }, + { + ingredient: { tag: 'occultism:miners/eldritch' }, + result: { + type: 'occultism:weighted_tag', + tag: 'c:storage_blocks/fluorite', + count: 1, + weight: 90 + }, + id: `${id_prefix}fluorite_block` + }, + { + ingredient: { tag: 'occultism:miners/eldritch' }, + result: { + type: 'occultism:weighted_tag', + tag: 'c:storage_blocks/dark', + count: 1, + weight: 90 + }, + id: `${id_prefix}dark_block` + }, + { + ingredient: { tag: 'occultism:miners/eldritch' }, + result: { + type: 'occultism:weighted_tag', + tag: 'c:dusts/dark_gem', + count: 9, + weight: 90 + }, + id: `${id_prefix}dark_gem_dust` + }, + { + ingredient: { tag: 'occultism:miners/eldritch' }, + result: { + type: 'occultism:weighted_item', + stack: { id: 'minecraft:clay', count: 3 }, + weight: 90 + }, + id: `${id_prefix}clay` + }, + { + ingredient: { tag: 'occultism:miners/eldritch' }, + result: { + type: 'occultism:weighted_item', + stack: { id: 'minecraft:gilded_blackstone', count: 3 }, + weight: 90 + }, + id: `${id_prefix}gilded_blackstone` + }, + { + ingredient: { tag: 'occultism:miners/eldritch' }, + result: { + type: 'occultism:weighted_item', + stack: { id: 'minecraft:magma_block', count: 3 }, + weight: 90 + }, + id: `${id_prefix}magma_block` + }, + { + ingredient: { tag: 'occultism:miners/eldritch' }, + result: { + type: 'occultism:weighted_item', + stack: { id: 'minecraft:crying_obsidian', count: 3 }, + weight: 90 + }, + id: `${id_prefix}crying_obsidian` + }, + { + ingredient: { tag: 'occultism:miners/eldritch' }, + result: { + type: 'occultism:weighted_item', + stack: { id: 'minecraft:obsidian', count: 3 }, + weight: 90 + }, + id: `${id_prefix}obsidian` + }, + { + ingredient: { tag: 'occultism:miners/eldritch' }, + result: { + type: 'occultism:weighted_item', + stack: { id: 'minecraft:gravel', count: 3 }, + weight: 90 + }, + id: `${id_prefix}gravel` } ]; diff --git a/kubejs/server_scripts/recipes/occultism/pentacles.js b/kubejs/server_scripts/recipes/occultism/pentacles.js index de56fa44..a713118e 100644 --- a/kubejs/server_scripts/recipes/occultism/pentacles.js +++ b/kubejs/server_scripts/recipes/occultism/pentacles.js @@ -634,23 +634,23 @@ ServerEvents.generateData('after_mods', (event) => { ], [ '___A__C_____C__A___', - '____A__C_5_C__A____', - '____A_5_CCC_5_A____', + '____A__C_6_C__A____', + '____A_6_CCC_6_A____', 'A__NNA__APA__ANN__A', - '_AAN5NAAPWPAAN5NAA_', + '_AAN6NAAPWPAAN6NAA_', '___ANWN_EPE_NWNA___', - 'C_5_AN_EMMME_NA_5_C', + 'C_6_AN_EMMME_NA_6_C', '_C__A_EM___ME_A__C_', '__CAPEM_____MEPAC__', - '_5CPWPM__0__MPWPC5_', + '_6CPWPM__0__MPWPC6_', '__CAPEM_____MEPAC__', '_C__A_EM___ME_A__C_', - 'C_5_AN_EMMME_NA_5_C', + 'C_6_AN_EMMME_NA_6_C', '___ANWN_EPE_NWNA___', - '_AAN5NAAPWPAAN5NAA_', + '_AAN6NAAPWPAAN6NAA_', 'A__NNA__APA__ANN__A', - '____A_5_CCC_5_A____', - '____A__C_5_C__A____', + '____A_6_CCC_6_A____', + '____A__C_6_C__A____', '___A__C_____C__A___' ] ] diff --git a/kubejs/server_scripts/recipes/occultism/ritual.js b/kubejs/server_scripts/recipes/occultism/ritual.js index 00af5d68..01862438 100644 --- a/kubejs/server_scripts/recipes/occultism/ritual.js +++ b/kubejs/server_scripts/recipes/occultism/ritual.js @@ -26,8 +26,8 @@ ServerEvents.recipes((event) => { recipe.id = recipe_id; } else if (recipe_id.includes('ritual/possess_warden')) { recipe.entity_to_sacrifice = { - display_name: 'ritual.occultism.sacrifice.bats', - tag: 'c:bats' + display_name: 'ritual.occultism.sacrifice.cows', + tag: 'c:cows' }; recipe.ingredients = [ { item: 'minecraft:sculk' }, @@ -35,6 +35,8 @@ ServerEvents.recipes((event) => { { item: 'minecraft:sculk' }, { item: 'minecraft:sculk' }, { item: 'minecraft:sculk' }, + { item: 'minecraft:sculk' }, + { item: 'minecraft:sculk' }, { item: 'minecraft:sculk' } ]; recipe.id = recipe_id; diff --git a/kubejs/server_scripts/recipes/occultism/shaped.js b/kubejs/server_scripts/recipes/occultism/shaped.js new file mode 100644 index 00000000..ae724a2b --- /dev/null +++ b/kubejs/server_scripts/recipes/occultism/shaped.js @@ -0,0 +1,19 @@ +ServerEvents.recipes((event) => { + const id_prefix = 'pneumaticcraft:occultism/shaped/'; + + const recipes = [ + { + output: 'occultism:magic_lamp_empty', + pattern: [' A ', 'ABA', ' AA'], + key: { + A: '#c:ingots/silver', + B: '#c:ingots/iesnium' + }, + id: `occultism:crafting/magic_lamp_empty` + } + ]; + + recipes.forEach((recipe) => { + event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id); + }); +}); diff --git a/kubejs/server_scripts/tags/block/neoforge/storage_blocks.js b/kubejs/server_scripts/tags/block/neoforge/storage_blocks.js index 1de6fff2..c20bbdb0 100644 --- a/kubejs/server_scripts/tags/block/neoforge/storage_blocks.js +++ b/kubejs/server_scripts/tags/block/neoforge/storage_blocks.js @@ -24,7 +24,11 @@ ServerEvents.tags('block', (event) => { infused_iron: ['naturesaura:infused_iron_block'], tainted_gold: ['naturesaura:tainted_gold_block'], sky: ['naturesaura:sky_ingot_block'], - depth: ['naturesaura:depth_ingot_block'] + depth: ['naturesaura:depth_ingot_block'], + + dark: ['evilcraft:dark_block'], + + black_quartz: ['actuallyadditions:black_quartz_block'] }; Object.keys(additions).forEach((tag) => { diff --git a/kubejs/server_scripts/tags/entity_type/enigmatica/mob_spawner_blacklist.js b/kubejs/server_scripts/tags/entity_type/enigmatica/mob_spawner_blacklist.js index 8bef74bb..4deecac4 100644 --- a/kubejs/server_scripts/tags/entity_type/enigmatica/mob_spawner_blacklist.js +++ b/kubejs/server_scripts/tags/entity_type/enigmatica/mob_spawner_blacklist.js @@ -22,6 +22,7 @@ ServerEvents.tags('entity_type', (event) => { 'occultism:afrit_wild', 'occultism:otherworld_bird', 'occultism:marid_unbound', + 'occultism:mercy_goat', 'evilcraft:netherfish', 'evilcraft:poisonous_libelle', 'evilcraft:werewolf' diff --git a/kubejs/server_scripts/tags/item/minecraft/glowstone.js b/kubejs/server_scripts/tags/item/minecraft/glowstone.js new file mode 100644 index 00000000..5a53ad3b --- /dev/null +++ b/kubejs/server_scripts/tags/item/minecraft/glowstone.js @@ -0,0 +1,5 @@ +ServerEvents.tags('item', (event) => { + let additions = ['minecraft:glowstone']; + + event.get('minecraft:glowstone').add(additions); +}); diff --git a/kubejs/server_scripts/tags/item/neoforge/slimeballs.js b/kubejs/server_scripts/tags/item/neoforge/slimeballs.js new file mode 100644 index 00000000..ec9fd900 --- /dev/null +++ b/kubejs/server_scripts/tags/item/neoforge/slimeballs.js @@ -0,0 +1,5 @@ +ServerEvents.tags('item', (event) => { + let additions = ['actuallyadditions:rice_slimeball']; + + event.get('c:slimeballs').add(additions); +}); diff --git a/kubejs/server_scripts/tags/item/neoforge/storage_blocks.js b/kubejs/server_scripts/tags/item/neoforge/storage_blocks.js index d077c82a..d318cac0 100644 --- a/kubejs/server_scripts/tags/item/neoforge/storage_blocks.js +++ b/kubejs/server_scripts/tags/item/neoforge/storage_blocks.js @@ -24,7 +24,11 @@ ServerEvents.tags('item', (event) => { infused_iron: ['naturesaura:infused_iron_block'], tainted_gold: ['naturesaura:tainted_gold_block'], sky: ['naturesaura:sky_ingot_block'], - depth: ['naturesaura:depth_ingot_block'] + depth: ['naturesaura:depth_ingot_block'], + + dark: ['evilcraft:dark_block'], + + black_quartz: ['actuallyadditions:black_quartz_block'] }; Object.keys(additions).forEach((tag) => { diff --git a/kubejs/startup_scripts/better_stacks.js b/kubejs/startup_scripts/better_stacks.js index 142ef890..14645cb3 100644 --- a/kubejs/startup_scripts/better_stacks.js +++ b/kubejs/startup_scripts/better_stacks.js @@ -7,7 +7,8 @@ ItemEvents.modification((event) => { 'minecraft:egg', 'powah:charged_snowball', 'the_bumblezone:pollen_puff', - 'occultism:book_of_binding_empty', + /occultism:book_of_binding_(empty|foliot|djinni|afrit|marid)/, + /enderio:.*_capacitor/, //signs /(minecraft|supplementaries|occultism|deeperdarker):\w+_sign/