Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small fixes #196

Draft
wants to merge 6 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/actuallyadditions-common.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
33 changes: 33 additions & 0 deletions kubejs/server_scripts/recipes/actuallyadditions/liquid_fuel.js
Original file line number Diff line number Diff line change
@@ -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);
});
});
100 changes: 100 additions & 0 deletions kubejs/server_scripts/recipes/actuallyadditions/solid_fuel.js
Original file line number Diff line number Diff line change
@@ -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);
});
});
1 change: 1 addition & 0 deletions kubejs/server_scripts/recipes/ars_nouveau/crushing.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ServerEvents.generateData('before_mods', (event) => {
ingredient: {
item: 'minecraft:gold_nugget'
},
count: 3
count: 1
}
},
{
Expand Down
23 changes: 10 additions & 13 deletions kubejs/server_scripts/recipes/minecraft/compostable.js
Original file line number Diff line number Diff line change
@@ -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) => {
Expand All @@ -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);
});
5 changes: 5 additions & 0 deletions kubejs/server_scripts/tags/item/neoforge/slimeballs.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ServerEvents.tags('item', (event) => {
let additions = ['actuallyadditions:rice_slimeball'];

event.get('c:slimeballs').add(additions);
});