diff --git a/kubejs/assets/tfg/models/block/casings/machine_casing_ostrum_carbon.json b/kubejs/assets/tfg/models/block/casings/machine_casing_ostrum_carbon.json new file mode 100644 index 000000000..51fb076f7 --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/machine_casing_ostrum_carbon.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/machine_casing_ostrum_carbon"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/concrete/polished_titanium_concrete.json b/kubejs/assets/tfg/models/block/concrete/polished_titanium_concrete.json new file mode 100644 index 000000000..1aa5fc507 --- /dev/null +++ b/kubejs/assets/tfg/models/block/concrete/polished_titanium_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/polished_titanium_concrete" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/concrete/titanium_concrete.json b/kubejs/assets/tfg/models/block/concrete/titanium_concrete.json new file mode 100644 index 000000000..8328c13fa --- /dev/null +++ b/kubejs/assets/tfg/models/block/concrete/titanium_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/titanium_concrete" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_ostrum_carbon.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_ostrum_carbon.png new file mode 100644 index 000000000..1538c493e Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_ostrum_carbon.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_ostrum_carbon.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/machine_casing_ostrum_carbon.png.mcmeta new file mode 100644 index 000000000..1d8dd341a --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/machine_casing_ostrum_carbon.png.mcmeta @@ -0,0 +1,5 @@ +{ + "ldlib": { + "connection": "tfg:block/casings/machine_casing_ostrum_carbon_ctm" + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_ostrum_carbon_ctm.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_ostrum_carbon_ctm.png new file mode 100644 index 000000000..20c32fcc3 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_ostrum_carbon_ctm.png differ diff --git a/kubejs/assets/tfg/textures/block/polished_titanium_concrete.png b/kubejs/assets/tfg/textures/block/polished_titanium_concrete.png new file mode 100644 index 000000000..185ff9e63 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/polished_titanium_concrete.png differ diff --git a/kubejs/assets/tfg/textures/block/titanium_concrete.png b/kubejs/assets/tfg/textures/block/titanium_concrete.png new file mode 100644 index 000000000..d2b2159cd Binary files /dev/null and b/kubejs/assets/tfg/textures/block/titanium_concrete.png differ diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index e4715ff95..234e74f7c 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1482,4 +1482,89 @@ const registerGTCEURecipes = (event) => { event.replaceInput({ id: 'gtceu:assembler/phenolic_board' }, '#tfg:wood_dusts', 'tfg:high_density_treated_fiberboard') + //#region New Tungsten Line + + event.remove({ id: 'gtceu:chemical_bath/tungstic_acid_from_scheelite' }) + event.remove({ id: 'gtceu:chemical_bath/tungstic_acid_from_tungstate' }) + event.remove({ id: 'gtceu:electrolyzer/tungstic_acid_electrolysis' }) + + // Transform Tungstate and Scheelite + + event.recipes.gtceu.large_chemical_reactor('tfg:scheelite_to_sodium_tungstate') + .itemInputs(Item.of('gtceu:scheelite_dust', 6)) + .itemInputs(Item.of('gtceu:soda_ash_dust', 6)) + .itemOutputs(Item.of('tfg:sodium_tungstate_dust', 6)) + .itemOutputs(Item.of('gtceu:calcite_dust', 6)) + .duration(20*12) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.large_chemical_reactor('tfg:tungstate_to_sodium_tungstate') + .itemInputs(Item.of('gtceu:tungstate_dust', 6)) + .itemInputs(Item.of('gtceu:soda_ash_dust', 6)) + .itemOutputs(Item.of('tfg:sodium_tungstate_dust', 6)) + .itemOutputs(Item.of('gtceu:lithium_dust', 2)) + .itemOutputs(Item.of('gtceu:carbon_dust', 1)) + .outputFluids(Fluid.of('gtceu:oxygen', 3000)) + .duration(20*12) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.chemical_bath('tfg:tungstate_to_tungsten_acid') + .inputFluids(Fluid.of('gtceu:hydrochloric_acid', 12000)) + .itemInputs(Item.of('tfg:sodium_tungstate_dust', 6)) + .itemOutputs(Item.of('gtceu:salt_dust', 48)) + .itemOutputs(Item.of('gtceu:tungstic_acid_dust', 6)) + .duration(20*24) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.chemical_bath('tfg:tungsten_acid_to_ammonium_tungstate') + .inputFluids(Fluid.of('gtceu:ammonia', 10000)) + .itemInputs(Item.of('gtceu:tungstic_acid_dust', 12)) + .itemOutputs(Item.of('tfg:ammonium_tungstate_dust', 1)) + .duration(20*16) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.evaporation_tower('tfg:ammonium_tungstate_to_apt_h') + .itemInputs(Item.of('tfg:ammonium_tungstate_dust', 1)) + .itemOutputs(Item.of('tfg:apt_gem', 1)) + .outputFluids(Fluid.of('gtceu:hydrogen', 500)) + .outputFluids(Fluid.of('gtceu:hydrogen', 500)) + .outputFluids(Fluid.of('gtceu:hydrogen', 500)) + .outputFluids(Fluid.of('gtceu:hydrogen', 500)) + .outputFluids(Fluid.of('gtceu:hydrogen', 500)) + .outputFluids(Fluid.of('gtceu:hydrogen', 500)) + .duration(20*120) + .EUt(GTValues.VHA[GTValues.HV]) + + event.recipes.gtceu.distillery('tfg:ammonium_tungstate_to_apt') + .itemInputs(Item.of('tfg:ammonium_tungstate_dust', 1)) + .itemOutputs(Item.of('tfg:apt_gem', 1)) + .outputFluids(Fluid.of('gtceu:hydrogen', 500)) + .duration(20*120) + .EUt(GTValues.VHA[GTValues.HV]) + + event.recipes.gtceu.pyrolyse_oven('tfg:apt') + .itemInputs(Item.of('tfg:apt_gem', 1)) + .itemOutputs(Item.of('tfg:tungsten_oxide_dust', 3)) + .outputFluids(Fluid.of('gtceu:ammonia', 10000)) + .duration(20*36) + .EUt(GTValues.VA[GTValues.EV]) + .circuit(1) + + event.recipes.gtceu.pyrolyse_oven('tfg:apt_nitrogen') + .itemInputs(Item.of('tfg:apt_gem', 1)) + .inputFluids(Fluid.of('gtceu:nitrogen', 1000)) + .itemOutputs(Item.of('tfg:tungsten_oxide_dust', 3)) + .outputFluids(Fluid.of('gtceu:ammonia', 10000)) + .duration(20*18) + .EUt(GTValues.VA[GTValues.EV]) + .circuit(2) + + event.recipes.gtceu.arc_furnace('tfg:tungsten_apt') + .itemInputs(Item.of('tfg:tungsten_oxide_dust', 1)) + .inputFluids(Fluid.of('gtceu:hydrogen', 1000)) + .itemOutputs(Item.of('gtceu:tungsten_dust', 1)) + .duration(20*2.8) + .EUt(GTValues.VA[GTValues.EV]) + + } diff --git a/kubejs/server_scripts/tacz/recipes.ammo.js b/kubejs/server_scripts/tacz/recipes.ammo.js index 43c977617..4d04f3fab 100644 --- a/kubejs/server_scripts/tacz/recipes.ammo.js +++ b/kubejs/server_scripts/tacz/recipes.ammo.js @@ -117,7 +117,7 @@ function registerTACZAmmoRecipes(event){ .EUt(GTValues.VA[GTValues.EV]) .duration(20) event.recipes.gtceu.assembler('tfg_tacz:hard_quartz_large') - .itemInputs('4x #forge:exquisite_gems/certus_quartz', '8x #forge:bolts/tungsten', '4x tfg:large_bullet_casing', + .itemInputs('4x #forge:exquisite_gems/certus_quartz', '4x #forge:rods/titanium', '4x tfg:large_bullet_casing', '2x tfg:nitrocellulose') .itemOutputs(Item.of('tacz:ammo', 4, '{AmmoId:"applied_armorer:hard_core_quartz_bullet"}')) diff --git a/kubejs/server_scripts/tacz/recipes.guns.js b/kubejs/server_scripts/tacz/recipes.guns.js index 1257fb74a..2ec61fc5b 100644 --- a/kubejs/server_scripts/tacz/recipes.guns.js +++ b/kubejs/server_scripts/tacz/recipes.guns.js @@ -122,7 +122,7 @@ function registerTACZGunRecipes(event){ //Region certus era event.recipes.gtceu.assembler('tfg_tacz:aa_pride') .itemInputs('gtceu:titanium_small_fluid_pipe', '4x #forge:ingots/titanium', '2x #forge:plates/stainless_steel', - '2x #forge:rods/long/titanium', '8x #forge:screws/tungsten', 'tfg:certus_mechanism') + '2x #forge:rods/long/titanium', '8x #forge:screws/hsla_steel', 'tfg:certus_mechanism') .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 1152)) .itemOutputs(Item.of('tacz:modern_kinetic_gun', '{GunCurrentAmmoCount:0,GunFireMode:"SEMI",GunId:"applied_armorer:niklas_pistol_semi_pride",HasBulletInBarrel:0b}')) @@ -132,7 +132,7 @@ function registerTACZGunRecipes(event){ event.recipes.gtceu.assembler('tfg_tacz:aa_right') .itemInputs('gtceu:titanium_small_fluid_pipe', '5x #forge:ingots/titanium', '3x #forge:plates/stainless_steel', - '#forge:rods/long/titanium', '10x #forge:screws/tungsten', 'tfg:certus_mechanism') + '#forge:rods/long/titanium', '10x #forge:screws/hsla_steel', 'tfg:certus_mechanism') .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 1152)) .itemOutputs(Item.of('tacz:modern_kinetic_gun', '{GunCurrentAmmoCount:0,GunFireMode:"SEMI",GunId:"applied_armorer:niklas_pistol_semi_right",HasBulletInBarrel:0b}')) @@ -142,7 +142,7 @@ function registerTACZGunRecipes(event){ event.recipes.gtceu.assembler('tfg_tacz:aa_win_win') .itemInputs('2x gtceu:titanium_small_fluid_pipe', '10x #forge:ingots/titanium', '6x #forge:plates/stainless_steel', - '2x #forge:rods/long/titanium', '16x #forge:screws/tungsten', 'tfg:certus_mechanism') + '2x #forge:rods/long/titanium', '16x #forge:screws/hsla_steel', 'tfg:certus_mechanism') .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 2304)) .itemOutputs(Item.of('tacz:modern_kinetic_gun', '{GunCurrentAmmoCount:0,GunFireMode:"SEMI",GunId:"applied_armorer:niklas_pistol_double_win_win",HasBulletInBarrel:1b}')) @@ -152,7 +152,7 @@ function registerTACZGunRecipes(event){ event.recipes.gtceu.assembler('tfg_tacz:aa_ar') .itemInputs('gtceu:titanium_small_fluid_pipe', '10x #forge:ingots/titanium', '5x #forge:plates/stainless_steel', - '2x #forge:rods/long/tungsten_carbide', '2x tfc:lens', '20x #forge:screws/tungsten', + '2x #forge:rods/long/hsla_steel', '2x tfc:lens', '20x #forge:screws/hsla_steel', 'tfg:certus_mechanism') .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 2880)) .itemOutputs(Item.of('tacz:modern_kinetic_gun', @@ -163,7 +163,7 @@ function registerTACZGunRecipes(event){ event.recipes.gtceu.assembler('tfg_tacz:aa_914') .itemInputs('gtceu:titanium_small_fluid_pipe', '10x #forge:ingots/titanium', '10x #forge:plates/stainless_steel', - '2x #forge:rods/long/tungsten_carbide', '2x tfc:lens', '20x #forge:screws/tungsten', + '2x #forge:rods/long/hsla_steel', '2x tfc:lens', '20x #forge:screws/hsla_steel', 'tfg:certus_mechanism') .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 1728)) .itemOutputs(Item.of('tacz:modern_kinetic_gun', @@ -174,8 +174,8 @@ function registerTACZGunRecipes(event){ event.recipes.gtceu.assembler('tfg_tacz:aa_k30') .itemInputs('2x gtceu:titanium_small_fluid_pipe', '8x #forge:ingots/titanium', '2x #forge:ingots/magnalium', - '8x #forge:plates/stainless_steel', '3x #forge:rods/long/tungsten_carbide', '2x tfc:lens', - '24x #forge:screws/tungsten', 'tfg:certus_mechanism') + '8x #forge:plates/stainless_steel', '3x #forge:rods/long/hsla_steel', '2x tfc:lens', + '24x #forge:screws/hsla_steel', 'tfg:certus_mechanism') .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 1728)) .itemOutputs(Item.of('tacz:modern_kinetic_gun', '{GunCurrentAmmoCount:0,GunFireMode:"SEMI",GunId:"applied_armorer:moritz_sniper_semi_k30",HasBulletInBarrel:0b}')) diff --git a/kubejs/server_scripts/tacz/recipes.misc.js b/kubejs/server_scripts/tacz/recipes.misc.js index 57f685168..90901ff94 100644 --- a/kubejs/server_scripts/tacz/recipes.misc.js +++ b/kubejs/server_scripts/tacz/recipes.misc.js @@ -9,7 +9,7 @@ function registerTACZMiscRecipes(event) { ' B ' ],{ A: '#forge:dyes/red', - B: '#forge:plates/steel', + B: '#forge:foils/steel', C: '#forge:rods/long/wood' }).id('tfg_tacz:target'); @@ -83,7 +83,7 @@ function registerTACZMiscRecipes(event) { .duration(80) event.recipes.gtceu.assembler('tfg:certus_mechanism') - .itemInputs('2x ae2:charged_certus_quartz_crystal', '2x #forge:gears/titanium', '2x #forge:springs/tungsten', + .itemInputs('2x ae2:charged_certus_quartz_crystal', '2x #forge:gears/titanium', '4x #forge:springs/hsla_steel', '16x #forge:screws/titanium', '2x #forge:rods/titanium', '6x #forge:rings/styrene_butadiene_rubber', '16x #forge:fine_wires/red_alloy') .inputFluids(Fluid.of('gtceu:soldering_alloy', 288)) diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index 8b7527f13..54ec33441 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -781,13 +781,13 @@ function registerTFGMiscellaneousRecipes(event) { .EUt(GTValues.VA[GTValues.LV]) //Rock-wool stuff - event.recipes.gtceu.mixer('aes_mix') + event.recipes.gtceu.mixer('tfg:aes_mix') .itemInputs('5x gtceu:silicon_dioxide_dust', '4x gtceu:quicklime_dust', 'gtceu:magnesia_dust') .itemOutputs('10x tfg:aes_mix_dust') .duration(160) .EUt(GTValues.VA[GTValues.EV]) - event.recipes.gtceu.electric_blast_furnace('molten_aes') + event.recipes.gtceu.electric_blast_furnace('tfg:molten_aes') .itemInputs('2x tfg:aes_mix_dust') .outputFluids(Fluid.of('tfg:molten_aes', 1000)) .chancedOutput('gtceu:ash_dust', 3000, 0) @@ -796,7 +796,7 @@ function registerTFGMiscellaneousRecipes(event) { .blastFurnaceTemp(3000) .EUt(GTValues.VA[GTValues.EV]) - event.recipes.gtceu.electric_blast_furnace('molten_aes_he') + event.recipes.gtceu.electric_blast_furnace('tfg:molten_aes_he') .itemInputs('2x tfg:aes_mix_dust') .inputFluids(Fluid.of('gtceu:helium', 200)) .outputFluids(Fluid.of('tfg:molten_aes', 1000)) @@ -805,20 +805,20 @@ function registerTFGMiscellaneousRecipes(event) { .blastFurnaceTemp(3000) .EUt(GTValues.VA[GTValues.EV]) - event.recipes.gtceu.centrifuge('aes_wool') + event.recipes.gtceu.centrifuge('tfg:aes_wool') .inputFluids(Fluid.of('tfg:molten_aes', 200)) .itemOutputs('tfg:aes_wool') .duration(30) .EUt(GTValues.VA[GTValues.EV]) - event.recipes.gtceu.forming_press('aes_compressed_wool') + event.recipes.gtceu.forming_press('tfg:aes_compressed_wool') .itemInputs('4x tfg:aes_wool') .notConsumable('gtceu:ingot_casting_mold') .itemOutputs('tfg:aes_compressed_wool') .duration(40) .EUt(GTValues.VA[GTValues.EV]) - event.recipes.gtceu.chemical_bath('aes_insulation_sheet') + event.recipes.gtceu.chemical_bath('tfg:aes_insulation_sheet') .itemInputs('tfg:aes_compressed_wool') .inputFluids(Fluid.of('gtceu:epoxy', 72)) .circuit(1) @@ -826,7 +826,7 @@ function registerTFGMiscellaneousRecipes(event) { .duration(80) .EUt(GTValues.VA[GTValues.EV]) - event.recipes.gtceu.chemical_bath('aes_insulation_roll') + event.recipes.gtceu.chemical_bath('tfg:aes_insulation_roll') .itemInputs('9x tfg:aes_compressed_wool') .inputFluids(Fluid.of('gtceu:epoxy', 648)) .itemOutputs('tfg:aes_insulation_roll') @@ -834,7 +834,7 @@ function registerTFGMiscellaneousRecipes(event) { .duration(400) .EUt(GTValues.VA[GTValues.EV]) - event.recipes.gtceu.assembler('aes_insulation_roll') + event.recipes.gtceu.assembler('tfg:aes_insulation_roll') .itemInputs('9x tfg:aes_insulation_sheet') .itemOutputs('tfg:aes_insulation_roll') .circuit(0) @@ -849,7 +849,7 @@ function registerTFGMiscellaneousRecipes(event) { A: 'tfg:aes_insulation_sheet', }).id('tfg:shaped/aes_insulation_roll') - event.recipes.gtceu.assembler('aes_insulation_sheet') + event.recipes.gtceu.assembler('tfg:aes_insulation_sheet') .itemInputs('9x tfg:aes_insulation_sheet') .itemOutputs('tfg:aes_insulation_roll') .circuit(0) @@ -860,7 +860,7 @@ function registerTFGMiscellaneousRecipes(event) { 'tfg:aes_insulation_roll' ]).id('tfg:shapeless/aes_insulation_sheet') - event.recipes.gtceu.electric_blast_furnace('smelt_aes_sheet') + event.recipes.gtceu.electric_blast_furnace('tfg:smelt_aes_sheet') .itemInputs('tfg:aes_insulation_sheet') .inputFluids(Fluid.of('gtceu:helium', 200)) .outputFluids(Fluid.of('tfg:molten_aes', 800)) @@ -869,7 +869,7 @@ function registerTFGMiscellaneousRecipes(event) { .duration(140) .blastFurnaceTemp(3000) .EUt(GTValues.VA[GTValues.EV]) - event.recipes.gtceu.electric_blast_furnace('smelt_aes_roll') + event.recipes.gtceu.electric_blast_furnace('tfg:smelt_aes_roll') .itemInputs('tfg:aes_insulation_roll') .inputFluids(Fluid.of('gtceu:helium', 1000)) .itemOutputs('2x gtceu:ash_dust') @@ -879,7 +879,7 @@ function registerTFGMiscellaneousRecipes(event) { .blastFurnaceTemp(3000) .EUt(GTValues.VA[GTValues.EV]) - event.recipes.gtceu.electric_blast_furnace('smelt_sniffer_wool') + event.recipes.gtceu.electric_blast_furnace('tfg:smelt_sniffer_wool') .itemInputs('tfg:sniffer_wool') .chancedOutput('gtceu:ash_dust', 7500, 0) .outputFluids(Fluid.of('tfg:molten_aes', 200)) @@ -887,7 +887,7 @@ function registerTFGMiscellaneousRecipes(event) { .duration(80) .blastFurnaceTemp(3400) .EUt(GTValues.VA[GTValues.EV]) - event.recipes.gtceu.electric_blast_furnace('smelt_wraptor_wool') + event.recipes.gtceu.electric_blast_furnace('tfg:smelt_wraptor_wool') .itemInputs('tfg:wraptor_wool') .chancedOutput('gtceu:ash_dust', 5000, 0) .outputFluids(Fluid.of('tfg:molten_aes', 100)) @@ -1077,7 +1077,7 @@ function registerTFGMiscellaneousRecipes(event) { .duration(80) .EUt(GTValues.VA[GTValues.IV]) event.recipes.gtceu.mixer('tfg:aes_polyurethane_electric_only') - .itemInputs('2x #tfg:mineral_rich_wool', '#forge:dusts/methylene_diphenyl_diisocyanate') + .itemInputs('2x #tfg:mineral_rich_wool', 'tfg:aes_compressed_wool', '#forge:dusts/methylene_diphenyl_diisocyanate') .inputFluids(Fluid.of('gtceu:diethylenetriamine', 250), Fluid.of('gtceu:acetone', 1000)) .itemOutputs('tfg:aes_polyurethane') .duration(80) @@ -1357,5 +1357,20 @@ function registerTFGMiscellaneousRecipes(event) { .itemOutputs('tfc:burlap_cloth') .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') + .inputFluids(Fluid.of('gtceu:concrete', 144*1.5)) + .itemOutputs('tfg:titanium_concrete') + .circuit(2) + .duration(20) + .EUt(GTValues.VH[GTValues.EV]) } diff --git a/kubejs/server_scripts/tfg/recipes.rocks.js b/kubejs/server_scripts/tfg/recipes.rocks.js index 8a14d5fa8..c666b5f27 100644 --- a/kubejs/server_scripts/tfg/recipes.rocks.js +++ b/kubejs/server_scripts/tfg/recipes.rocks.js @@ -219,6 +219,9 @@ function registerTFGRockRecipes(event) { { raw: 'ae2:sky_stone_brick', polished: 'ae2:sky_stone_small_brick' }, { raw: 'ae2:sky_stone_small_brick', polished: 'ae2:smooth_sky_stone_block' }, { raw: 'gtceu:certus_quartz_block', polished: 'ae2:cut_quartz_block' }, + + // Concrete + { raw: 'tfg:titanium_concrete', polished: 'tfg:polished_titanium_concrete' }, // Recon Stone { raw: 'minecraft:stone', polished: 'minecraft:smooth_stone' }, diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index b1b72d20e..20db7e48c 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -269,6 +269,8 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Ultimet.addFlags(GENERATE_ROTOR) + GTMaterials.HSLASteel.addFlags(GENERATE_BOLT_SCREW) + GTMaterials.Invar.addFlags(GENERATE_RING); GTMaterials.Magnalium.addFlags(GENERATE_RING); GTMaterials.TinAlloy.addFlags(GENERATE_RING); diff --git a/kubejs/startup_scripts/tfg/blocks.js b/kubejs/startup_scripts/tfg/blocks.js index 3786c3566..e4d2dda64 100644 --- a/kubejs/startup_scripts/tfg/blocks.js +++ b/kubejs/startup_scripts/tfg/blocks.js @@ -31,6 +31,21 @@ const registerTFGBlocks = (event) => { .particle('minecraft:campfire_cosy_smoke') .particleCount(2) .particleForced(false) + + event.create('tfg:exhaust_vent_particle', 'tfg:particle_emitter') + .textureAll('tfg:block/titanium_concrete') + .soundType('metal') + .hardness(5) + .resistance(6) + .tagBlock('minecraft:mineable/pickaxe') + .tagBlock('minecraft:mineable/wrench') + .mapColor('color_black') + .speedFactor(1.1) + .particleOffset(5, 1, 5) + .particleVelocity(0.0, 0.1, 0.0) + .particle('minecraft:campfire_signal_smoke') + .particleCount(50) + .particleForced(true) // #region Machine Casings @@ -118,6 +133,22 @@ const registerTFGBlocks = (event) => { .mapColor('color_light_gray') //#endregion + + event.create('tfg:titanium_concrete') + .translationKey('block.tfg.titanium_concrete') + .model('tfg:block/concrete/titanium_concrete') + .soundType('stone') + .mapColor('stone') + .tagBlock('minecraft:mineable/pickaxe') + + + event.create('tfg:polished_titanium_concrete') + .translationKey('block.tfg.polidhed_titanium_concrete') + .model('tfg:block/concrete/polished_titanium_concrete') + .soundType('stone') + .mapColor('stone') + .tagBlock('minecraft:mineable/pickaxe') + // #region Decorative vases global.MINECRAFT_DYE_NAMES.forEach(color => { diff --git a/kubejs/startup_scripts/tfg/constants.js b/kubejs/startup_scripts/tfg/constants.js index 84bda4e36..33d6337ca 100644 --- a/kubejs/startup_scripts/tfg/constants.js +++ b/kubejs/startup_scripts/tfg/constants.js @@ -113,7 +113,8 @@ global.TFG_MACHINE_CASINGS = [ 'machine_casing_blue_solar_panel', 'machine_casing_green_solar_panel', 'machine_casing_red_solar_panel', - 'machine_casing_mars' + 'machine_casing_mars', + 'machine_casing_ostrum_carbon' ]; /** diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index ca8675f9d..01d4cabcf 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -393,5 +393,34 @@ const registerTFGMaterials = (event) => { .color('0xa2cde0') .secondaryColor('0x7a5225') + //#region Tungsten Line + + event.create('tfg:sodium_tungstate') + .dust() + .flags(GTMaterialFlags.NO_UNIFICATION, GTMaterialFlags.DISABLE_DECOMPOSITION) + .iconSet(GTMaterialIconSet.BRIGHT) + .components('2x sodium','1x tungsten', '4x oxygen') + .color('0xdcf6f7') + + event.create('tfg:ammonium_tungstate') + .dust() + .flags(GTMaterialFlags.NO_UNIFICATION, GTMaterialFlags.DISABLE_DECOMPOSITION) + .iconSet(GTMaterialIconSet.DULL) + .formula('(NH4)10(H2W12O42)') + .color('0xfafafa') + + event.create('tfg:apt') + .gem() + .flags(GTMaterialFlags.NO_UNIFICATION, GTMaterialFlags.DISABLE_DECOMPOSITION) + .iconSet(GTMaterialIconSet.FLINT) + .color('0xaabdf0') + + event.create('tfg:tungsten_oxide') + .dust() + .flags(GTMaterialFlags.NO_UNIFICATION, GTMaterialFlags.DISABLE_DECOMPOSITION) + .iconSet(GTMaterialIconSet.FLINT) + .components('1x tungsten', '3x oxygen') + .color('0xf0c851') + }