diff --git a/kubejs/assets/tfg/models/block/beryllium_sandy_frame.json b/kubejs/assets/tfg/models/block/beryllium_sandy_frame.json new file mode 100644 index 000000000..a3d8a6450 --- /dev/null +++ b/kubejs/assets/tfg/models/block/beryllium_sandy_frame.json @@ -0,0 +1,7 @@ +{ + "parent": "tfg:block/fission_component", + "textures": { + "infill": "tfg:block/fission/beryllium_sandy", + "frame": "tfg:block/empty_fission_frame" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/copper_sandy_frame.json b/kubejs/assets/tfg/models/block/copper_sandy_frame.json new file mode 100644 index 000000000..4606ec4e4 --- /dev/null +++ b/kubejs/assets/tfg/models/block/copper_sandy_frame.json @@ -0,0 +1,7 @@ +{ + "parent": "tfg:block/fission_component", + "textures": { + "infill": "tfg:block/fission/copper_sandy", + "frame": "tfg:block/empty_fission_frame" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/fission/beryllium_sandy.json b/kubejs/assets/tfg/models/block/fission/beryllium_sandy.json new file mode 100644 index 000000000..2c30ff07e --- /dev/null +++ b/kubejs/assets/tfg/models/block/fission/beryllium_sandy.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/fission/beryllium_sandy" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/fission/copper_sandy.json b/kubejs/assets/tfg/models/block/fission/copper_sandy.json new file mode 100644 index 000000000..fbbb7ade8 --- /dev/null +++ b/kubejs/assets/tfg/models/block/fission/copper_sandy.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/fission/copper_sandy" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/fission/beryllium_sandy.png b/kubejs/assets/tfg/textures/block/fission/beryllium_sandy.png new file mode 100644 index 000000000..9f21e0adf Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fission/beryllium_sandy.png differ diff --git a/kubejs/assets/tfg/textures/block/fission/copper_sandy.png b/kubejs/assets/tfg/textures/block/fission/copper_sandy.png new file mode 100644 index 000000000..4cbd21545 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fission/copper_sandy.png differ diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index 27cc61e5f..d4e336e7a 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -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) => { diff --git a/kubejs/server_scripts/tfg/aquaponics/recipes.greenhouse.js b/kubejs/server_scripts/tfg/aquaponics/recipes.greenhouse.js index 23a86cb19..6e651e58b 100644 --- a/kubejs/server_scripts/tfg/aquaponics/recipes.greenhouse.js +++ b/kubejs/server_scripts/tfg/aquaponics/recipes.greenhouse.js @@ -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; diff --git a/kubejs/server_scripts/tfg/aquaponics/recipes.pisciculture.js b/kubejs/server_scripts/tfg/aquaponics/recipes.pisciculture.js index 667fb3953..e01d95179 100644 --- a/kubejs/server_scripts/tfg/aquaponics/recipes.pisciculture.js +++ b/kubejs/server_scripts/tfg/aquaponics/recipes.pisciculture.js @@ -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; diff --git a/kubejs/server_scripts/tfg/events.interactions.js b/kubejs/server_scripts/tfg/events.interactions.js index a561f24f2..d6259c238 100644 --- a/kubejs/server_scripts/tfg/events.interactions.js +++ b/kubejs/server_scripts/tfg/events.interactions.js @@ -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 diff --git a/kubejs/server_scripts/tfg/powergen/nuclear/recipes.components.js b/kubejs/server_scripts/tfg/powergen/nuclear/recipes.components.js index 5bee23fd5..bf81d06e7 100644 --- a/kubejs/server_scripts/tfg/powergen/nuclear/recipes.components.js +++ b/kubejs/server_scripts/tfg/powergen/nuclear/recipes.components.js @@ -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); } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js b/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js index 28e2af5be..558ffbdbc 100644 --- a/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js +++ b/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js @@ -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', [ diff --git a/kubejs/server_scripts/tfg/powergen/nuclear/tags.nuclear.js b/kubejs/server_scripts/tfg/powergen/nuclear/tags.nuclear.js index 7e851dcca..428ebfa79 100644 --- a/kubejs/server_scripts/tfg/powergen/nuclear/tags.nuclear.js +++ b/kubejs/server_scripts/tfg/powergen/nuclear/tags.nuclear.js @@ -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 diff --git a/kubejs/startup_scripts/tfg/nuclear/blocks.nuclear.js b/kubejs/startup_scripts/tfg/nuclear/blocks.nuclear.js index 5ea789413..a4a37bf36 100644 --- a/kubejs/startup_scripts/tfg/nuclear/blocks.nuclear.js +++ b/kubejs/startup_scripts/tfg/nuclear/blocks.nuclear.js @@ -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')