From 96d24e7b1431faf329fae310dd6c4fff6b137699 Mon Sep 17 00:00:00 2001 From: GameStar <56610486+BlueBoat29@users.noreply.github.com> Date: Wed, 23 Jul 2025 04:58:27 -0500 Subject: [PATCH] Feature/tier2 rocket bugfixes (#1422) * stuff for rocket * worm * Assets * bugfix #1420 * bugfix for #1421 * rocket recipes * color adjust fluix material * startup rocket stuff * everything disabling the stuff until ev * Delete options.txt Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Update main_startup_script.js Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Delete kubejs/startup_scripts/tfg/elements.js Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Update CHANGELOG.md Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * shhhhh Signed-off-by: Pyritie --------- Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> Signed-off-by: Pyritie Co-authored-by: Pyritie --- CHANGELOG.md | 2 + config/sandwormmod-common.toml | 31 + .../textures/entity/rocket/tier_2_rocket.png | Bin 0 -> 48853 bytes kubejs/assets/gtceu/lang/en_us.json | 1 + kubejs/assets/tfc/lang/en_us.json | 5318 ++++++++--------- .../tfg/models/item/cryo_fluix_pearl.json | 6 + .../tfg/models/item/rocket_cone_t2.json | 6 + .../assets/tfg/models/item/rocket_fin_t2.json | 6 + .../tfg/textures/item/cryo_fluix_pearl.png | Bin 0 -> 4601 bytes .../tfg/textures/item/rocket_cone_t2.png | Bin 0 -> 762 bytes .../tfg/textures/item/rocket_fin_t2.png | Bin 0 -> 793 bytes .../worldgen/biome/can_spawn_sandworms.json | 5 + kubejs/server_scripts/ad_astra/recipes.js | 62 + kubejs/server_scripts/ad_astra/tags.js | 8 +- kubejs/server_scripts/greate/recipes.js | 2 +- .../server_scripts/greate/recipes.removes.js | 1 + .../gregtech/recipes.removes.js | 2 + kubejs/server_scripts/tfc/recipes.removes.js | 4 + .../tfg/recipes.miscellaneous.js | 36 + kubejs/server_scripts/tfg/recipes.space.js | 9 + kubejs/startup_scripts/ad_astra/constants.js | 2 + kubejs/startup_scripts/ad_astra/materials.js | 4 +- kubejs/startup_scripts/ae2/materials.js | 4 +- kubejs/startup_scripts/gtceu/materials.js | 4 +- kubejs/startup_scripts/main_startup_script.js | 2 +- kubejs/startup_scripts/tfg/items.js | 12 + kubejs/startup_scripts/tfg/materials.js | 14 +- 27 files changed, 2873 insertions(+), 2668 deletions(-) create mode 100644 config/sandwormmod-common.toml create mode 100644 kubejs/assets/ad_astra/textures/entity/rocket/tier_2_rocket.png create mode 100644 kubejs/assets/tfg/models/item/cryo_fluix_pearl.json create mode 100644 kubejs/assets/tfg/models/item/rocket_cone_t2.json create mode 100644 kubejs/assets/tfg/models/item/rocket_fin_t2.json create mode 100644 kubejs/assets/tfg/textures/item/cryo_fluix_pearl.png create mode 100644 kubejs/assets/tfg/textures/item/rocket_cone_t2.png create mode 100644 kubejs/assets/tfg/textures/item/rocket_fin_t2.png create mode 100644 kubejs/data/sandworm_mod/tags/worldgen/biome/can_spawn_sandworms.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ca3fd18d..71658dfd6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ - Fixed new extruder molds missing a tag to work with the curving press (#1412) @Forsuin - Fixed contraptions no longer understanding TFC chests @Pyritie - Fixed ice never melting in the overworld (#1408) @Pyritie +- Removed most empty tag recipes (#1420) @BlueBoat29 +- Fixed Styrene Butadiene Belt recipe (#1421) @BlueBoat29 ## [0.10.2] - 20-07-2025 ### Changes diff --git a/config/sandwormmod-common.toml b/config/sandwormmod-common.toml new file mode 100644 index 000000000..e0772e97d --- /dev/null +++ b/config/sandwormmod-common.toml @@ -0,0 +1,31 @@ + +["Desert Behemoths: Sandworms! Config"] + #Value at which sandworm will spawn. Higher values mean the worm will take longer to spawn. Default 4000. + #Range: 1000 ~ 100000 + "Max Wormsign" = 4000 + #Seconds after leaving a worm's range until another one can spawn. Default 120. + #Range: 10 ~ 216000 + "Respawn Duration" = 120 + #Time til despawn in seconds when not targeting a survival player. Default 3 minutes. + #Range: 30 ~ 216000 + "Despawn Duration" = 180 + #Number of explosions the worm's head can handle before dropping a tooth and running away. Default 3 + #Range: 1 ~ 100 + Health = 3 + #Value the damage dealt by the worm is scaled by. Default 1.0. + #Range: 0.01 ~ 100.0 + "Damage Multiplier" = 1.0 + #Multiplier for damage dealt by the head of the worm compared to a body segment. Default 2.0 (head deals double damage). + #Range: 0.01 ~ 100.0 + "Head Multiplier" = 2.0 + #By default, the sandworm can spawn in any biome golden rabbits spawn in. This option enables or disables that. + #To add additional biomes the sandworm can spawn in, create a datapack that edits the sandworm_mod:can_spawn_sandworms biome tag. + #Specifically, create can_spawn_sandworms.json in data->sandworm_mod->tags->worldgen->biome. + #Bellow is an example json file that allows sandworms to spawn in jungles: + #{ + # "values": [ + # "minecraft:jungle" + # ] + #} + "Default Spawning" = false + diff --git a/kubejs/assets/ad_astra/textures/entity/rocket/tier_2_rocket.png b/kubejs/assets/ad_astra/textures/entity/rocket/tier_2_rocket.png new file mode 100644 index 0000000000000000000000000000000000000000..1919cb63bbce1ea3a9217d4a8ada8ba89a68c996 GIT binary patch literal 48853 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 literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/rocket_cone_t2.png b/kubejs/assets/tfg/textures/item/rocket_cone_t2.png new file mode 100644 index 0000000000000000000000000000000000000000..a440dafc72f65a85e89953b6eea687aae7049539 GIT binary patch literal 762 zcmVEX>4Tx04R}tkv&MmKpe$iQ>7vmg?12i$WWc^q9Proibb$c+6t{Ym|Xe=O&XFE z7e~Rh;NZt%)xpJCR|i)?5c~jf7n~Gbq{ROvg%&X$9QWhhy~o`6^Clb#w-LQx^h-Wt~ zo%23%n3W}k_?&pspbHW|a$R=$jdRIifoFz|YeSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{007cSL_t(I%bk!h4uU`wL?0^{w6L);p`fII3uwHXSD>}@ z4j#ZW*jZ9&Y-}uG<3iSI4GR8kMB?|Rx_iq$R zO8-EX>4Tx04R}tkv&MmKpe$iQ>7vmg?12i$WWc^q9Proibb$c+6t{Ym|Xe=O&XFE z7e~Rh;NZt%)xpJCR|i)?5c~jf7n~Gbq{ROvg%&X$9QWhhy~o`6^Clb#w-LQx^h-Wt~ zo%23%n3W}k_?&pspbHW|a$R=$jdRIifoFz|YeSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{008kxL_t(I%e9kDPQx$|Mjvh+C8i+;RFIlQ50KpdByfOA zbkSCb{vZ;`1haA!=f~Z^EbV!3zL9MB&noiL7I|qyJvSjZOELgX)rr^b%V@8-2Ajr^ zB^gsmL#0E;+nB`Q(_iI{>D8GDoV=N$klQmh}>))N$YX;q}W$^CLk z0G{riTZsVptS^Jfm8t38^^<)6Gyu%qg=vh}sFeml&LnasTW}GlUhljgwK6qYX^vk< z?|h|Kt)yE6frGanZ~cd3o#g)Z!56rF0 { //#endregion + //region tier 2 rocket DISABLED UNTIL EV + + event.remove({ mod: 'gtceu', input: 'gtceu:hot_rocket_alloy_t2_ingot' }) + /* + event.recipes.gtceu.mixer('tfg:rocket_alloy_t2') + .itemInputs('19x #forge:dusts/titanium', '3x #forge:small_dusts/chromium', '3x #forge:small_dusts/tin', '3x #forge:small_dusts/aluminium') + .inputFluids(Fluid.of('gtceu:vanadium', 540)) + .itemOutputs('25x #forge:dusts/rocket_alloy_t2') + .duration(580) + .circuit(5) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.vacuum_freezer('tfg:vacuum_freezer/cool_rocket_alloy_t2_alloy') + .itemInputs('#forge:hot_ingots/rocket_alloy_t2') + .inputFluids(Fluid.of('gtceu:distilled_water', 500), Fluid.of('tfg:cryogenized_fluix', 288)) + .itemOutputs('#forge:ingots/rocket_alloy_t2') + .duration(120) + .EUt(GTValues.VA[GTValues.HV]) + + event.recipes.gtceu.assembler('tfg:rocket_fin_t2') + .itemInputs('#forge:plates/rocket_alloy_t2', '#forge:double_plates/titanium') + .itemOutputs('tfg:rocket_fin_t2') + .duration(180) + .circuit(3) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.assembler('tfg:rocket_cone_t2') + .itemInputs('gtceu:ev_emitter', '#forge:dense_plates/rocket_alloy_t2', '#forge:double_plates/titanium', '#forge:double_plates/desh') + .itemOutputs('tfg:rocket_cone_t2') + .duration(1440) + .circuit(3) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.assembler('tfg:rocket_desh_engine') + .itemInputs( + '4x #forge:double_plates/titanium', + '4x #gtceu:circuits/ev', + 'gtceu:ev_electric_pump', + '3x gtceu:advanced_power_thruster', + '4x #forge:rods/magnetic_neodymium', + '#forge:rotors/titanium') + .inputFluids(Fluid.of('gtceu:desh', 144 * 12)) + .itemOutputs('ad_astra:desh_engine') + .duration(800) + .circuit(3) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.assembler('ad_astra:tier_2_rocket') + .itemInputs( + '12x #forge:dense_plates/rocket_alloy_t2', + '4x tfg:rocket_fin_t2', + '1x ad_astra:desh_engine', + '1x tfg:rocket_cone_t2', + '12x #forge:insulation_t2/roll' + ) + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144 * 2 * 16)) + .itemOutputs('ad_astra:tier_2_rocket') + .duration(1440) + .circuit(3) + .EUt(GTValues.VA[GTValues.EV]) + +*/ //#endregion diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index dde911e5e..a0854a03c 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -56,9 +56,13 @@ const registerAdAstraItemTags = (event) => { event.add('forge:insulation_t1', 'gtceu:vitrified_asbestos_dust') //Insulation Tier 2 - event.add('forge:insulation_t2', 'tfg:aes_insulation_sheet') - event.add('forge:insulation_t2', 'tfg:aes_insulation_roll') + event.add('forge:insulation_t2/sheet', 'tfg:aes_insulation_sheet') + event.add('forge:insulation_t2/roll', 'tfg:aes_insulation_roll') + //Rocket Engines + event.add('ad_astra:rocket_engine', 'ad_astra:steel_engine') + event.add('ad_astra:rocket_engine', 'ad_astra:desh_engine') + // Deco blocks const DECO_BLOCKS = [ 'iron', 'steel', 'desh', 'calorite', 'ostrum' ]; DECO_BLOCKS.forEach(block => { diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index 474f99956..b77afdcb5 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -514,7 +514,7 @@ function registerGreateRecipes(event) { event.recipes.gtceu.assembler('polyethylene_belt_connector') .itemInputs('#forge:plates/styrene_butadiene_rubber') - .itemOutputs('greate:rubber_polyethylene_belt_connectorbelt_connector') + .itemOutputs('greate:polyethylene_belt_connector') .circuit(11) .duration(50) .EUt(GTValues.VA[GTValues.LV]) diff --git a/kubejs/server_scripts/greate/recipes.removes.js b/kubejs/server_scripts/greate/recipes.removes.js index 7e20e7b76..8885b73ab 100644 --- a/kubejs/server_scripts/greate/recipes.removes.js +++ b/kubejs/server_scripts/greate/recipes.removes.js @@ -23,6 +23,7 @@ function removeGreateRecipes(event) { event.remove({ id: 'greate:shapeless/large_titanium_cogwheel_from_little' }) event.remove({ id: 'greate:shaped/andesite_alloy_shaft' }) + event.remove({ id: 'greate:milling/integration/gtceu/macerator/macerate_marble'}) // Until we got a fix from Greate for recipes in a cleanroom event.remove({ id: 'greate:shaped/stainless_steel_mechanical_saw' }) diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index 8062ab27b..8d6ed0cb2 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -718,6 +718,8 @@ function removeGTCEURecipes(event) { event.remove({ id: `gtceu:shaped/${material}_pressure_plate` }) event.remove({ id: `gtceu:assembler/${material}_pressure_plate` }) }) + + event.remove({ output: 'gtceu:damascus_steel_crowbar'}) } function removeMaceratorRecipe(event, id) { diff --git a/kubejs/server_scripts/tfc/recipes.removes.js b/kubejs/server_scripts/tfc/recipes.removes.js index cfb2dc44b..481150181 100644 --- a/kubejs/server_scripts/tfc/recipes.removes.js +++ b/kubejs/server_scripts/tfc/recipes.removes.js @@ -153,4 +153,8 @@ function removeTFCRecipes(event) { event.remove({ id: 'tfc:crafting/gunpowder_graphite' }) event.remove({ id: 'tfc:crafting/gunpowder' }) + + event.remove({ output: 'tfc:rustic_windmill_blade'}) + event.remove({ output: 'tfc:lattice_windmill_blade'}) + event.remove({ id: 'tfchotornot:heating/insulating_items'}) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index e4b815079..0f642d4e6 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -739,6 +739,42 @@ function registerTFGMiscellaneousRecipes(event) { .duration(100) .EUt(30) + //Cryo Pearl replacements + event.shaped('gtceu:ev_emitter', [ + 'ABC', + 'BDB', + 'CBA' + ], { + A: '#forge:single_cables/aluminium', + B: '#forge:rods/platinum', + C: '#gtceu:circuits/ev', + D: 'tfg:cryo_fluix_pearl' + }).id('gtceu:shaped/emitter_ev') + + event.recipes.gtceu.assembler('emitter_ev') + .itemInputs('tfg:cryo_fluix_pearl', '4x #forge:rods/platinum', '2x #gtceu:circuits/ev', '2x #forge:single_cables/aluminium') + .itemOutputs('gtceu:ev_emitter') + .circuit(1) + .duration(100) + .EUt(30) + + event.shaped('gtceu:ev_sensor', [ + 'A B', + 'AC ', + 'DAA' + ], { + A: '#forge:plates/titanium', + B: 'tfg:cryo_fluix_pearl', + C: '#forge:rods/platinum', + D: '#gtceu:circuits/ev', + }).id('gtceu:shaped/sensor_ev') + + event.recipes.gtceu.assembler('sensor_ev') + .itemInputs('tfg:cryo_fluix_pearl', '#forge:rods/platinum', '#gtceu:circuits/ev', '4x #forge:plates/titanium') + .itemOutputs('gtceu:ev_sensor') + .duration(100) + .EUt(30) + // Temporary event.recipes.gtceu.chemical_bath('quantum_eye') .itemInputs('tfg:vitrified_pearl') diff --git a/kubejs/server_scripts/tfg/recipes.space.js b/kubejs/server_scripts/tfg/recipes.space.js index 3f9a081b7..d7bf846f3 100644 --- a/kubejs/server_scripts/tfg/recipes.space.js +++ b/kubejs/server_scripts/tfg/recipes.space.js @@ -246,4 +246,13 @@ function registerTFGSpaceRecipes(event) { .circuit(2) .duration(100) .EUt(GTValues.VA[GTValues.HV]) + + //Cryo Fluix Pearl + event.recipes.gtceu.autoclave('tfg:cryo_fluix_pearl') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 576)) + .itemInputs('tfg:vitrified_pearl') + .itemOutputs('tfg:cryo_fluix_pearl') + .duration(300) + .EUt(GTValues.VA[GTValues.EV]) + .cleanroom(CleanroomType.CLEANROOM) } \ No newline at end of file diff --git a/kubejs/startup_scripts/ad_astra/constants.js b/kubejs/startup_scripts/ad_astra/constants.js index 893030bf1..1bd914bec 100644 --- a/kubejs/startup_scripts/ad_astra/constants.js +++ b/kubejs/startup_scripts/ad_astra/constants.js @@ -72,6 +72,8 @@ global.AD_ASTRA_DISABLED_ITEMS = 'ad_astra:tier_2_rocket', 'ad_astra:desh_engine', + 'tfg:rocket_fin_t2', + 'tfg:rocket_cone_t2', // Disabled until IV planets diff --git a/kubejs/startup_scripts/ad_astra/materials.js b/kubejs/startup_scripts/ad_astra/materials.js index b435f885b..46bdbcbce 100644 --- a/kubejs/startup_scripts/ad_astra/materials.js +++ b/kubejs/startup_scripts/ad_astra/materials.js @@ -23,6 +23,7 @@ const registerAdAstraMaterials = (event) => { .ore() .addOreByproducts('olivine', 'rutile', 'rutile') .ingot() + .liquid() .blastTemp(2000, 'low', GTValues.VA[GTValues.MV]) .flags( GTMaterialFlags.FORCE_GENERATE_BLOCK, @@ -30,7 +31,8 @@ const registerAdAstraMaterials = (event) => { GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_DENSE, GTMaterialFlags.GENERATE_GEAR, - GTMaterialFlags.GENERATE_FRAME + GTMaterialFlags.GENERATE_FRAME, + GTMaterialFlags.DISABLE_ALLOY_BLAST ) // mars? diff --git a/kubejs/startup_scripts/ae2/materials.js b/kubejs/startup_scripts/ae2/materials.js index d10b03694..b154b53ea 100644 --- a/kubejs/startup_scripts/ae2/materials.js +++ b/kubejs/startup_scripts/ae2/materials.js @@ -12,6 +12,6 @@ const registerAE2Materials = (event) => { GTMaterialFlags.DISABLE_DECOMPOSITION ) .components('1x nether_quartz', '1x certus_quartz', '1x ruby') - .color(0x6D5BB6) - .secondaryColor(0x1E1932) + .color(0x8f5ccb) + .secondaryColor(0x252f5a) } \ No newline at end of file diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index 2cbe2bc82..d7a23d192 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -14,6 +14,7 @@ const registerGTCEuMaterialModification = (event) => { const $FLUID_PIPE_PROPERTY = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.properties.FluidPipeProperties') const $HAZARD_PROPERTY = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.properties.HazardProperty') + const $MATERIAL_FLAGS = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags') const $FluidStorageKeys = Java.loadClass('com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys') @@ -350,7 +351,8 @@ const registerGTCEuMaterialModification = (event) => { rose_quartz.setProperty(PropertyKey.ORE, new $ORE_PROPERTY()); rose_quartz.getProperty(PropertyKey.ORE).setOreByProducts(rose_quartz, GTMaterials.Redstone, rose_quartz); rose_quartz.setMaterialIconSet(GTMaterialIconSet.getByName('nether_quartz')) - + GTCEuAPI.materialManager.getMaterial('tfg:kaolinite').setFormula("Al2Si2O5(OH)4", true) GTCEuAPI.materialManager.getMaterial('tfg:vitrified_pearl').setFormula("(Al2Si2O5(OH)4)(BeK4N5)", true) + } diff --git a/kubejs/startup_scripts/main_startup_script.js b/kubejs/startup_scripts/main_startup_script.js index a49d3d6bc..13b791aeb 100644 --- a/kubejs/startup_scripts/main_startup_script.js +++ b/kubejs/startup_scripts/main_startup_script.js @@ -75,4 +75,4 @@ TFCEvents.registerFoodTrait(event => { Platform.mods.primitive_creatures.name = "Primitive Creatures"; Platform.mods.tfg.name = "TerraFirmaGreg"; -Platform.mods.kubejs.name = "TerraFirmaGreg"; \ No newline at end of file +Platform.mods.kubejs.name = "TerraFirmaGreg"; diff --git a/kubejs/startup_scripts/tfg/items.js b/kubejs/startup_scripts/tfg/items.js index eb8575def..dabe7cfda 100644 --- a/kubejs/startup_scripts/tfg/items.js +++ b/kubejs/startup_scripts/tfg/items.js @@ -12,6 +12,8 @@ const registerTFGItems = (event) => { event.create('tfg:unfinished_basic_electronic_circuit', 'create:sequenced_assembly') event.create('tfg:unfinished_inscriber_accumulation_press') event.create('tfg:vitrified_pearl') + event.create('tfg:cryo_fluix_pearl') + .translationKey('tfg:cryo_fluix_pearl') // #endregion // #region Space @@ -344,4 +346,14 @@ const registerTFGItems = (event) => { event.create('tfg:aes_insulation_roll') .translationKey('tfg:aes_insulation_roll') //endregion + + //Tier 2 Rocket Parts + event.create('tfg:rocket_fin_t2') + .translationKey('tfg:rocket_fin_t2') + event.create('tfg:rocket_cone_t2') + .translationKey('tfg:rocket_cone_t2') + //endregion } + + + diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index 5c8c92e3a..19d5cb83b 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -2,6 +2,8 @@ "use strict"; const registerTFGMaterials = (event) => { + + event.create('hardwood') .dust() .flags(GTMaterialFlags.FLAMMABLE) @@ -49,8 +51,16 @@ const registerTFGMaterials = (event) => { .color(0x333e47) .iconSet('metallic') .flags(GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_DENSE, GTMaterialFlags.GENERATE_GEAR) - .blastTemp(1760, 'low', 120, 1200) + .blastTemp(1760, 'low', 256, 1200) + event.create('rocket_alloy_t2') + .ingot() + .components('76x titanium', '15x vanadium', '3x aluminium', '3x chromium', '3x tin') + .color(0x3c253d) + .iconSet('metallic') + .flags(GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_DENSE, GTMaterialFlags.GENERATE_GEAR) + .blastTemp(4500, 'mid', 1024, 1200) + event.create('vitrified_asbestos') .dust() .fluid() @@ -137,6 +147,7 @@ const registerTFGMaterials = (event) => { .gas() .components('8x helium_3', '11x oxygen', '11x hydrogen') .color(0xEDFFB3) + //end region //Region Rockwool @@ -154,4 +165,5 @@ const registerTFGMaterials = (event) => { .color(0xe65609) .secondaryColor(0xe65609) //end region + }