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

7
kubejs/assets/tfg/models/block/beryllium_sandy_frame.json Normal file
View file

@ -0,0 +1,7 @@
{
"parent": "tfg:block/fission_component",
"textures": {
"infill": "tfg:block/fission/beryllium_sandy",
"frame": "tfg:block/empty_fission_frame"
}
}

7
kubejs/assets/tfg/models/block/copper_sandy_frame.json Normal file
View file

@ -0,0 +1,7 @@
{
"parent": "tfg:block/fission_component",
"textures": {
"infill": "tfg:block/fission/copper_sandy",
"frame": "tfg:block/empty_fission_frame"
}
}

6
kubejs/assets/tfg/models/block/fission/beryllium_sandy.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "tfg:block/fission/beryllium_sandy"
}
}

6
kubejs/assets/tfg/models/block/fission/copper_sandy.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "tfg:block/fission/copper_sandy"
}
}

BIN
kubejs/assets/tfg/textures/block/fission/beryllium_sandy.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 433 B

BIN
kubejs/assets/tfg/textures/block/fission/copper_sandy.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 771 B

48
kubejs/client_scripts/tooltips.js
View file

@ -27,6 +27,9 @@ const registerTooltips = (event) => {
event.addAdvanced(['tfg:polycaprolactam_fabric'], (item, advanced, text) => {
text.add(1, Text.translate('tfg.tooltip.polycaprolactam'))
})
//#region Multiblock Controler Tooltip
event.addAdvanced(['tfg:electric_greenhouse'], (item, advanced, text) => {
text.add(1, Text.translate('tfg.tooltip.machine.electric_greenhouse_1'));
text.add(2, Text.translate('tfg.tooltip.machine.electric_greenhouse_2'));
@ -70,7 +73,8 @@ const registerTooltips = (event) => {
event.addAdvanced(['tfg:ostrum_linear_accelerator'], (item, advanced, text) => {
text.add(1, Text.translate('gtceu.tooltip.machine.ostrum_linear_accelerator_1'));
text.add(2, Text.translate('gtceu.tooltip.machine.ostrum_linear_accelerator_2'));
text.add(3, Text.translate('tfg.tooltip.machine.two_energy_hatches'));
text.add(3, Text.translate('gtceu.tooltip.machine.ostrum_linear_accelerator_3'));
text.add(4, Text.translate('tfg.tooltip.machine.two_energy_hatches'));
})
event.addAdvanced(['gtceu:heat_exchanger'], (item, advanced, text) => {
text.add(1, Text.translate('gtceu.tooltip.machine.heat_exchanger_1'));
@ -129,6 +133,31 @@ const registerTooltips = (event) => {
text.add(3, Text.translate('tfg.tooltip.machine.parallel'));
text.add(4, Text.translate('tfg.tooltip.machine.two_energy_hatches'));
})
event.addAdvanced(['tfg:smr_generator'], (item, advanced, text) => {
text.add(1, Text.translate('tfg.tooltip.machine.smt_1'));
text.add(2, Text.translate('tfg.tooltip.machine.smt_2'));
text.add(3, Text.translate('tfg.tooltip.machine.smt_3'));
})
event.addAdvanced(['deafission:fission_reactor_mk1'], (item, advanced, text) => {
text.add(1, Text.translate('tfg.tooltip.machine.fission_reactor_mk1_1'));
text.add(2, Text.translate('tfg.tooltip.machine.fission_reactor_mk1_2'));
})
event.addAdvanced(['deafission:fission_reactor_smr1'], (item, advanced, text) => {
text.add(1, Text.translate('tfg.tooltip.machine.small_fission_reactor_mk1_1'));
text.add(2, Text.translate('tfg.tooltip.machine.small_fission_reactor_mk1_2'));
})
event.addAdvanced(['tfg:nuclear_turbine'], (item, advanced, text) => {
text.add(1, Text.translate("tfg.tooltip.component.nuclear_turbine_1"));
text.add(2, Text.translate("tfg.tooltip.component.nuclear_turbine_2"));
})
event.addAdvanced(['tfg:heat_battery_mk1'], (item, advanced, text) => {
text.add(1, Text.translate('tfg.tooltip.machine.heat_battery_1'));
text.add(2, Text.translate('tfg.tooltip.machine.heat_battery_2'));
text.add(3, Text.translate('tfg.tooltip.machine.heat_battery_3'));
})
//#endregion
event.addAdvanced(['tfg:grow_light'], (item, advanced, text) => {
text.add(1, Text.translate('tfg.tooltip.grow_light_disapointment'));
})
@ -359,7 +388,7 @@ const registerTooltips = (event) => {
text.add(1, Text.translate("gtceu.universal.tooltip.item_storage_capacity", "9"))
})
//Nuclear Fission Tooltips
//#region Nuclear Fission Tooltips
event.addAdvanced(['minecraft:blue_ice'], (item, advanced, text) => {
text.add(1, Text.translate("tfg.tooltip.component.blue_ice"))
})
@ -384,11 +413,17 @@ const registerTooltips = (event) => {
event.addAdvanced(['tfg:terrafirmaguard_pa6'], (item, advanced, text) => {
text.add(1, Text.translate("tfg.tooltip.component.refrigerant_pellet"))
})
event.addAdvanced(['tfg:nuclear_turbine'], (item, advanced, text) => {
text.add(1, Text.translate("tfg.tooltip.component.nuclear_turbine_1"));
text.add(2, Text.translate("tfg.tooltip.component.nuclear_turbine_2"));
event.addAdvanced(['tfg:copper_sandy_frame'], (item, advanced, text) => {
text.add(1, Text.translate("tfg.tooltip.component.sandy_copper_frame"))
})
event.addAdvanced(['tfg:beryllium_sandy_frame'], (item, advanced, text) => {
text.add(1, Text.translate("tfg.tooltip.component.sandy_beryllium_frame"))
})
event.addAdvanced(['tfg:uv_smr_fluid_import_hatch'], (item, advanced, text) => {
text.add(1, Text.translate("tfg.tooltip.machine.smr_fluid_import_hatch"))
})
//#endregion
event.addAdvanced(['tfg:food/slice_of_cheese'], (item, advanced, text) => {
if (!event.isShift()) {
@ -399,6 +434,7 @@ const registerTooltips = (event) => {
};
});
//#endregion
// AE2
event.addAdvanced(['tfg:wireless_card'], (item, advanced, text) => {

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

32
kubejs/startup_scripts/tfg/nuclear/blocks.nuclear.js
View file

@ -2,7 +2,7 @@
function registerTFGNuclearBlocks(event) {
// Insulation
// Insulation Fission Reactor
event.create('tfg:glacian_wool_frame')
.soundType('copper')
.hardness(4)
@ -27,7 +27,7 @@ function registerTFGNuclearBlocks(event) {
.resistance(6)
.tagBlock('gtceu:mineable/pickaxe_or_wrench')
// Unfinished Insulation
// Unfinished Insulation Reactor
event.create('tfg:moderate_core')
.soundType('ancient_debris')
.hardness(7)
@ -42,6 +42,34 @@ function registerTFGNuclearBlocks(event) {
.tagBlock('gtceu:mineable/pickaxe_or_wrench')
.model('tfg:block/fission/impure_moderate_core')
// Heat Battery Components
event.create('tfg:copper_sandy')
.soundType('ancient_debris')
.hardness(7)
.resistance(8)
.tagBlock('gtceu:mineable/pickaxe_or_wrench')
.model('tfg:block/fission/copper_sandy')
event.create('tfg:beryllium_sandy')
.soundType('ancient_debris')
.hardness(7)
.resistance(8)
.tagBlock('gtceu:mineable/pickaxe_or_wrench')
.model('tfg:block/fission/beryllium_sandy')
event.create('tfg:copper_sandy_frame')
.soundType('copper')
.hardness(4)
.resistance(6)
.tagBlock('gtceu:mineable/pickaxe_or_wrench')
event.create('tfg:beryllium_sandy_frame')
.soundType('copper')
.hardness(5)
.resistance(6)
.tagBlock('gtceu:mineable/pickaxe_or_wrench')
// Nuclear cooling tower
event.create('tfg:titanium_exhaust_vent', 'tfg:active_particle_emitter')
.textureAll('tfg:block/titanium_exhaust_vent')