From 676e69c09a5f2d54fcb793035f202c0ee9bb8fa3 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Wed, 30 Oct 2024 15:46:05 -0400 Subject: [PATCH 1/6] solid fuel recipes --- .../recipes/actuallyadditions/solid_fuel.js | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 kubejs/server_scripts/recipes/actuallyadditions/solid_fuel.js 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 0000000..7c55252 --- /dev/null +++ b/kubejs/server_scripts/recipes/actuallyadditions/solid_fuel.js @@ -0,0 +1,53 @@ +ServerEvents.recipes((event) => { + const id_prefix = 'enigmatica:actuallyadditions/solid_fuel/'; + + const recipes = [ + { + item: { tag: 'c:gems/lignite_coal' }, + burn_time: 1600, + total_energy: 32000, + id: `${id_prefix}lignite_coal` + }, + { + item: { item: 'c:storage_blocks/lignite_coal' }, + burn_time: 16000, + total_energy: 320000, + id: `${id_prefix}lignite_coal_block` + }, + { + item: { tag: 'c:dusts/charcoal' }, + burn_time: 1600, + total_energy: 32000, + id: `${id_prefix}charcoal_dust` + }, + { + item: { tag: 'c:dusts/coal' }, + burn_time: 1600, + total_energy: 32000, + id: `${id_prefix}coal_dust` + }, + { + item: { tag: 'c:dusts/lignite_coal' }, + burn_time: 1600, + total_energy: 32000, + id: `${id_prefix}lignite_coal_dust` + }, + { + item: { tag: 'c:tiny_dusts/coal' }, + burn_time: 1600, + total_energy: 32000, + id: `${id_prefix}coal_tiny_dust` + }, + { + item: { tag: 'c:tiny_dusts/lignite_coal' }, + burn_time: 1600, + total_energy: 32000, + id: `${id_prefix}lignite_coal_tiny_dust` + } + ]; + + recipes.forEach((recipe) => { + recipe.type = 'actuallyadditions:solid_fuel'; + event.custom(recipe).id(recipe.id); + }); +}); From 09a2ac752e1d5259a9bb31c2fef069aa669f538a Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Wed, 30 Oct 2024 17:16:40 -0400 Subject: [PATCH 2/6] add missing tin recipes, add fuel support to AA --- .../recipes/actuallyadditions/crushing.js | 1 + .../recipes/actuallyadditions/liquid_fuel.js | 33 ++++++++ .../recipes/actuallyadditions/solid_fuel.js | 77 +++++++++++++++---- .../recipes/ars_nouveau/crushing.js | 1 + 4 files changed, 97 insertions(+), 15 deletions(-) create mode 100644 kubejs/server_scripts/recipes/actuallyadditions/liquid_fuel.js diff --git a/kubejs/server_scripts/recipes/actuallyadditions/crushing.js b/kubejs/server_scripts/recipes/actuallyadditions/crushing.js index c3b40d7..8ffe746 100644 --- a/kubejs/server_scripts/recipes/actuallyadditions/crushing.js +++ b/kubejs/server_scripts/recipes/actuallyadditions/crushing.js @@ -35,6 +35,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 0000000..1b1596f --- /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/solid_fuel.js b/kubejs/server_scripts/recipes/actuallyadditions/solid_fuel.js index 7c55252..a7bdda9 100644 --- a/kubejs/server_scripts/recipes/actuallyadditions/solid_fuel.js +++ b/kubejs/server_scripts/recipes/actuallyadditions/solid_fuel.js @@ -4,50 +4,97 @@ ServerEvents.recipes((event) => { const recipes = [ { item: { tag: 'c:gems/lignite_coal' }, - burn_time: 1600, - total_energy: 32000, + fuel_quality: 8, id: `${id_prefix}lignite_coal` }, { - item: { item: 'c:storage_blocks/lignite_coal' }, - burn_time: 16000, - total_energy: 320000, + 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' }, - burn_time: 1600, - total_energy: 32000, + fuel_quality: 8, id: `${id_prefix}charcoal_dust` }, { item: { tag: 'c:dusts/coal' }, - burn_time: 1600, - total_energy: 32000, + fuel_quality: 8, id: `${id_prefix}coal_dust` }, { item: { tag: 'c:dusts/lignite_coal' }, - burn_time: 1600, - total_energy: 32000, + fuel_quality: 8, id: `${id_prefix}lignite_coal_dust` }, { item: { tag: 'c:tiny_dusts/coal' }, - burn_time: 1600, - total_energy: 32000, + fuel_quality: 0.8, id: `${id_prefix}coal_tiny_dust` }, { item: { tag: 'c:tiny_dusts/lignite_coal' }, - burn_time: 1600, - total_energy: 32000, + 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 d5a953b..f6cec1d 100644 --- a/kubejs/server_scripts/recipes/ars_nouveau/crushing.js +++ b/kubejs/server_scripts/recipes/ars_nouveau/crushing.js @@ -36,6 +36,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) => { From dd5f4887a0f7ed5b1ef8cdf0a5493f76f3a83b28 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Thu, 31 Oct 2024 12:51:46 -0400 Subject: [PATCH 3/6] Create slimeballs.js --- kubejs/server_scripts/tags/item/neoforge/slimeballs.js | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 kubejs/server_scripts/tags/item/neoforge/slimeballs.js 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 0000000..ec9fd90 --- /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); +}); From e3caf7a43ac83b02d9812978818c0c96443e6d2e Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Thu, 31 Oct 2024 20:59:21 -0400 Subject: [PATCH 4/6] Update compostable.js --- .../recipes/minecraft/compostable.js | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/kubejs/server_scripts/recipes/minecraft/compostable.js b/kubejs/server_scripts/recipes/minecraft/compostable.js index 955fff0..e31966d 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); }); From d2fdd8ef100168c21129380f7390c559a153e2ec Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Thu, 31 Oct 2024 23:05:41 -0400 Subject: [PATCH 5/6] Update actuallyadditions-common.toml --- config/actuallyadditions-common.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/actuallyadditions-common.toml b/config/actuallyadditions-common.toml index 617b716..b7a20ac 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 From 8cb06759fe3d646d79789090e52009ceb172cc13 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Fri, 1 Nov 2024 16:34:01 -0400 Subject: [PATCH 6/6] cheaper market --- .../recipes/farmingforblockheads/market_presets.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/server_scripts/recipes/farmingforblockheads/market_presets.js b/kubejs/server_scripts/recipes/farmingforblockheads/market_presets.js index ebbe30f..487ec27 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 } }, {