illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

Browse source
This commit is contained in:
Pyritie 2026-02-02 17:44:30 +00:00
commit 8a46a01b7c
14 changed files with 132 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kubejs/server_scripts/tfg/aquaponics/recipes.greenhouse.js
View file

@ -76,7 +76,7 @@ function generateGreenHouseRecipe(event, dimension, input, output, chance_multip
const canFertilize = resolvedFertilizer !== null;
/** @type {GTValues.EUt} - Resolved EUt value. Defaults to LV */
const resolvedEUt = dimMods ? dimMods.eut : GTValues.VA[GTValues.LV];
const resolvedEUt = dimMods ? dimMods.eut : GTValues.VHA[GTValues.LV];
/** @type {number} - Resolved fluid chance multiplied by 100. Defaults to 1000. */
const resolvedChance = dimMods ? (dimMods.fluid_chance * 100) : 1000;

2
kubejs/server_scripts/tfg/aquaponics/recipes.pisciculture.js
View file

@ -58,7 +58,7 @@ const pisciculture_dimension_index = [
const resolvedFluidOut = dimMods?.fluid_out ?? 'tfg:nitrate_rich_water';
/** @type {GTValues.EUt} - Resolved EUt value. Defaults to LV EUt. */
const resolvedEUt = dimMods ? dimMods.eut : GTValues.VA[GTValues.LV];
const resolvedEUt = dimMods ? dimMods.eut : GTValues.VHA[GTValues.LV];
/** @type {number} - Resolved fluid chance multiplied by 100. Defaults to 1000. */
const resolvedChance = dimMods ? (dimMods.fluid_chance * 100) : 1000;

6
kubejs/server_scripts/tfg/events.interactions.js
View file

@ -248,6 +248,12 @@ BlockEvents.rightClicked(event => {
transformBlockWithItem(event, 'gtceu:incoloy_ma_956_frame', 'tfg:impure_moderate_core_frame', 'tfg:impure_graphite_moderator', true, 1, 'block.wool.place', 'minecraft:happy_villager', true);
transformBlockWithToolReturn(event, 'tfg:impure_moderate_core_frame', 'gtceu:incoloy_ma_956_frame', 'tfg:impure_graphite_moderator', 1, '#forge:tools/wire_cutters', true, 'minecraft:block.beehive.shear', 'minecraft:crit', true);
transformBlockWithItem(event, 'gtceu:incoloy_ma_956_frame', 'tfg:copper_sandy_frame', 'tfg:copper_sandy', true, 1, 'block.wool.place', 'minecraft:happy_villager', true);
transformBlockWithToolReturn(event, 'tfg:copper_sandy_frame', 'gtceu:incoloy_ma_956_frame', 'tfg:copper_sandy', 1, '#forge:tools/wire_cutters', true, 'minecraft:block.beehive.shear', 'minecraft:crit', true);
transformBlockWithItem(event, 'gtceu:incoloy_ma_956_frame', 'tfg:beryllium_sandy_frame', 'tfg:beryllium_sandy', true, 1, 'block.wool.place', 'minecraft:happy_villager', true);
transformBlockWithToolReturn(event, 'tfg:beryllium_sandy_frame', 'gtceu:incoloy_ma_956_frame', 'tfg:beryllium_sandy', 1, '#forge:tools/wire_cutters', true, 'minecraft:block.beehive.shear', 'minecraft:crit', true);
});
// Makes scythes, hoes, and knives take damage when cutting grass

4
kubejs/server_scripts/tfg/powergen/nuclear/recipes.components.js
View file

@ -36,8 +36,8 @@ function registerTFGNuclearComponentsRecipes(event) {
//component("HEAT", "minecraft:bedrock", 1000);
//componentThermal('THERMAL', '#forge:sand', 1000, 1);
componentThermal('THERMAL', 'tfg:impure_moderate_core_frame', 2000, 10);
componentThermal('THERMAL', 'tfg:moderate_core_frame', 4000, 10);
componentThermal('THERMAL', 'tfg:copper_sandy_frame', 1000, 10);
componentThermal('THERMAL', 'tfg:beryllium_sandy_frame', 2000, 10);
//componentThermal('THERMAL', 'minecraft:bedrock', 9001, 10);
}

22
kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js
View file

@ -727,6 +727,26 @@ function registerTFGNuclearRecipes(event) {
//#endregion
//#region Heat Battery Component
event.recipes.gtceu.mixer('tfg:copper_sandy')
.itemInputs('1x #forge:sand')
.inputFluids(Fluid.of('gtceu:copper', 15984))
//.inputFluids(Fluid.of('gtceu:silicon', 7992))
.itemOutputs(Item.of('tfg:copper_sandy', 1))
.EUt(GTValues.VA[GTValues.EV])
.duration(20*48)
event.recipes.gtceu.mixer('tfg:beryllium_sandy')
.itemInputs('1x #forge:sand')
.inputFluids(Fluid.of('gtceu:beryllium', 15984))
.inputFluids(Fluid.of('gtceu:silicon', 7992))
.itemOutputs(Item.of('tfg:beryllium_sandy', 1))
.EUt(GTValues.VA[GTValues.IV])
.duration(20*48)
//#endregion
//#region Power Gen
event.recipes.gtceu.nuclear_turbine('dense_steam')
@ -771,7 +791,7 @@ function registerTFGNuclearRecipes(event) {
.inputFluids(Fluid.of('tfg:thermally_conductive_fluid', 1000))
.itemOutputs('tfg:casings/heat_pipe_casing')
.circuit(6)
.EUt(GTValues.VA[GTValues.IV])
.EUt(GTValues.VA[GTValues.EV])
.duration(20*4)
event.shaped('tfg:cooling_tower', [

6
kubejs/server_scripts/tfg/powergen/nuclear/tags.nuclear.js
View file

@ -44,9 +44,9 @@ const registerTFGBlockTagsNuclear = (event) => {
let COMPONENTS_HB = 'deafission:components_hb';
event.add(COMPONENTS_HB, 'minecraft:sand');
event.add(COMPONENTS_HB, 'tfg:impure_moderate_core_frame');
event.add(COMPONENTS_HB, 'tfg:moderate_core_frame');
//event.add(COMPONENTS_HB, 'minecraft:sand');
event.add(COMPONENTS_HB, 'tfg:copper_sandy_frame');
event.add(COMPONENTS_HB, 'tfg:beryllium_sandy_frame');
//event.add(COMPONENTS_HB, 'minecraft:bedrock'); // For Creative usage only
//#endregion