diff --git a/kubejs/assets/tfg/blockstates/cooling_tower.json b/kubejs/assets/tfg/blockstates/cooling_tower.json new file mode 100644 index 000000000..dd1239578 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/cooling_tower.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/cooling_tower", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/cooling_tower" + }, + "facing=south": { + "model": "tfg:block/machines/cooling_tower", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/cooling_tower", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index ebf3b004b..f9b8b1c36 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -555,6 +555,7 @@ "block.tfg.casings.bioculture_rotor_primary": "Primary Bioculture Rotor", "block.tfg.casings.bioculture_rotor_secondary": "Secondary Bioculture Rotor", "block.tfg.casings.machine_casing_ostrum_carbon": "Ostrum Machine Casing", + "block.tfg.casings.heat_pipe_casing": "Heat Pipe Casing", "block.tfg.glacian_wool_frame": "Framed Glacian Wool", "block.tfg.aes_insulation_frame": "Framed AES Insulation", "block.tfg.sand.fluorapatite.blue": "Blue Fluorapatite Sand", @@ -635,6 +636,7 @@ "block.tfg.titanium_concrete_bricks_square": "Square Titanium-Rebar Concrete Bricks", "block.tfg.nuclear_turbine": "Nuclear Steam Turbine", "block.tfg.evaporation_tower": "Evaporation Tower", + "block.tfg.cooling_tower": "Nuclear Cooling Tower", "block.tfg.growth_monitor": "Growth Monitor", "block.tfg.sample_rack": "Sample Rack", "block.tfg.casings.machine_casing_sterilizing_pipes": "Sterilizing Pipes", @@ -1024,6 +1026,7 @@ "material.tfg.cooked_mycelienzane": "1,3-Mycelienzane", "material.tfg.iodomethane": "Iodomethane", "material.tfg.trideuteroiodomethane": "Trideuteroiodomethane", + "material.tfg.thermally_conductive_fluid": "Thermally Conductive Fluid", "ore_vein.tfg.deep_sheldonite": "Cooperite & Bornite", "ore_vein.tfg.deep_garnet_amethyst": "Amethyst & Garnet", "ore_vein.tfg.deep_garnet_opal": "Opal & Garnet", diff --git a/kubejs/assets/tfg/models/block/machines/cooling_tower.json b/kubejs/assets/tfg/models/block/machines/cooling_tower.json new file mode 100644 index 000000000..b910175a4 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/cooling_tower.json @@ -0,0 +1,90 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:cooling_tower", + "texture_overrides": { + "all": "tfg:block/casings/machine_casing_ostrum_carbon" + }, + "variants": { + "is_formed=false,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_ostrum_carbon", + "overlay_front": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_ostrum_carbon", + "overlay_front": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_paused", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_paused_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_ostrum_carbon", + "overlay_front": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_active_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_ostrum_carbon", + "overlay_front": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_ostrum_carbon", + "overlay_front": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_ostrum_carbon", + "overlay_front": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_paused", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_paused_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_ostrum_carbon", + "overlay_front": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_ostrum_carbon", + "overlay_front": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/cooling_tower.json b/kubejs/assets/tfg/models/item/cooling_tower.json new file mode 100644 index 000000000..87f1fd1ad --- /dev/null +++ b/kubejs/assets/tfg/models/item/cooling_tower.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/cooling_tower" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/casings/heat_pipe_casing.png b/kubejs/assets/tfg/textures/block/casings/heat_pipe_casing.png index 1538c493e..193d41b54 100644 Binary files a/kubejs/assets/tfg/textures/block/casings/heat_pipe_casing.png and b/kubejs/assets/tfg/textures/block/casings/heat_pipe_casing.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/heat_pipe_casing_ctm.png b/kubejs/assets/tfg/textures/block/casings/heat_pipe_casing_ctm.png index 57b10e1ba..b5ea8b3d6 100644 Binary files a/kubejs/assets/tfg/textures/block/casings/heat_pipe_casing_ctm.png and b/kubejs/assets/tfg/textures/block/casings/heat_pipe_casing_ctm.png differ diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index a0a650681..b97a068ba 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -1402,15 +1402,10 @@ function registerTFGMiscellaneousRecipes(event) { .duration(100) .EUt(4) - event.recipes.gtceu.assembler('tfg:ostrum_carbon_casing') - .itemInputs('2x #forge:plates/ostrum', '2x #forge:plates/titanium_carbide', '#forge:frames/black_steel') - .itemOutputs('2x tfg:casings/machine_casing_ostrum_carbon') - .circuit(6) - .duration(20 * (2.5)) - .EUt(GTValues.VH[GTValues.LV]) + event.recipes.gtceu.assembler('tfg:titanium_concrete') - .itemInputs('2x #forge:rods/titanium', '4x #forge:dusts/kaolinite') + .itemInputs('2x #forge:rods/titanium', '#forge:dusts/kaolinite') .inputFluids(Fluid.of('gtceu:concrete', 144 * 1.5)) .itemOutputs('tfg:titanium_concrete') .circuit(2) diff --git a/kubejs/server_scripts/tfg/recipes.nuclear.js b/kubejs/server_scripts/tfg/recipes.nuclear.js index 810bb345d..dec2f01bd 100644 --- a/kubejs/server_scripts/tfg/recipes.nuclear.js +++ b/kubejs/server_scripts/tfg/recipes.nuclear.js @@ -434,6 +434,43 @@ function registerTFGNuclearRecipes(event) { .duration(20*1.5) //#endregion + + //#region Cooling Tower + event.recipes.gtceu.assembler('tfg:ostrum_carbon_casing') + .itemInputs('2x #forge:plates/ostrum', '2x #forge:plates/titanium_carbide', '#forge:dense_plates/hsla_steel', '#forge:frames/black_steel') + .itemOutputs('2x tfg:casings/machine_casing_ostrum_carbon') + .circuit(6) + .duration(20 * (2.5)) + .EUt(GTValues.VH[GTValues.LV]) + + event.recipes.gtceu.mixer('tfg:thermally_conductive_fluid') + .itemInputs('7x #forge:dusts/gallium', '2x #forge:dusts/tin', '#forge:dusts/zinc') + .outputFluids(Fluid.of('tfg:thermally_conductive_fluid', 1000)) + .circuit(2) + .EUt(GTValues.VA[GTValues.EV]) + .duration(20*20) + + event.recipes.gtceu.assembler('tfg:heat_pipe_casing') + .itemInputs('4x gtceu:copper_large_fluid_pipe', '4x gtceu:copper_normal_fluid_pipe', '4x #forge:plates/hsla_steel') + .inputFluids(Fluid.of('tfg:thermally_conductive_fluid', 1000)) + .itemOutputs('tfg:casings/heat_pipe_casing') + .circuit(6) + .EUt(GTValues.VA[GTValues.IV] * 2) + .duration(20*4) + + event.shaped('tfg:cooling_tower', [ + 'ABA', + 'CDC', + 'EBE' + ], { + A: 'gtceu:ostrum_normal_fluid_pipe', + B: 'gtceu:platinum_single_cable', + C: '#gtceu:circuits/iv', + D: 'gtceu:iv_machine_hull', + E: 'gtceu:iv_fluid_regulator' + }).id('tfg:shaped/cooling_tower') + + //#endregion //#region FLiBe Line - SCRAP FROM MARS TO VENUS diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index 76958809f..acc8d4070 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -274,7 +274,7 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Ultimet.addFlags(GENERATE_ROTOR) - GTMaterials.HSLASteel.addFlags(GENERATE_BOLT_SCREW) + GTMaterials.HSLASteel.addFlags(GENERATE_BOLT_SCREW, GENERATE_DENSE) GTMaterials.Invar.addFlags(GENERATE_RING); GTMaterials.Magnalium.addFlags(GENERATE_RING); diff --git a/kubejs/startup_scripts/tfg/blocks.js b/kubejs/startup_scripts/tfg/blocks.js index 0d5bbc9de..de1a9db78 100644 --- a/kubejs/startup_scripts/tfg/blocks.js +++ b/kubejs/startup_scripts/tfg/blocks.js @@ -17,13 +17,14 @@ const registerTFGBlocks = (event) => { .tagBlock('minecraft:mineable/wrench') .mapColor('color_black') .speedFactor(1.1) - .activeOffset(5, 1, 5) - .activeVelocity(0.0, 0.1, 0.0) - //.activeParticle('tfc:smoke_0') - .activeCount(50) - .activeForced(true) + .activeOffset(3.5, 2, 3.5) + .activeVelocity(0.0, 0.0, 0.0) + .activeParticle('tfg:cooling_steam') + .activeBase(0.0, 12.5, 0.0) + .activeCount(8) + .activeForced(false) .hasTicker(true) - + // #region Machine Casings global.TFG_MACHINE_CASINGS.forEach(type => { diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index 89357c886..aad39269c 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -512,4 +512,11 @@ const registerTFGMaterials = (event) => { .color(0xDD9DED) // #endregion + + // #region conductor + event.create('tfg:thermally_conductive_fluid') + .liquid() + .flags(GTMaterialFlags.DECOMPOSITION_BY_ELECTROLYZING) + .components('7x gallium', '2x tin', '1x zinc') + .color('0x34cfeb') }