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 <pyritie@gmail.com>

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
This commit is contained in:
GameStar 2025-07-23 04:58:27 -05:00 committed by GitHub
parent c57f1a6ce6
commit 96d24e7b14
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
27 changed files with 2873 additions and 2668 deletions

View file

@ -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

View file

@ -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

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

View file

@ -83,6 +83,7 @@
"material.gtceu.calorite": "Calorite",
"material.gtceu.etrium": "Etrium",
"material.gtceu.rocket_alloy_t1": "R-Aluminosteel Rocket Alloy",
"material.gtceu.rocket_alloy_t2": "ASM 4914 Titanium Rocket Alloy",
"material.gtceu.vitrified_asbestos": "Vitrified Asbestos",
"metaitem.dust.tooltip.purify": "Drop in Water to get Clean Dust",
"metaitem.crushed.tooltip.purify": "Drop in Water to get Purified Ore",

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "tfg:item/cryo_fluix_pearl"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "tfg:item/rocket_cone_t2"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "tfg:item/rocket_fin_t2"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 762 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 793 B

View file

@ -0,0 +1,5 @@
{
"values": [
"tfg:mars/martian_dunes"
]
}

View file

@ -96,6 +96,68 @@ const registerAdAstraRecipes = (event) => {
//#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

View file

@ -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 => {

View file

@ -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])

View file

@ -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' })

View file

@ -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) {

View file

@ -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'})
}

View file

@ -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')

View file

@ -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)
}

View file

@ -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

View file

@ -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?

View file

@ -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)
}

View file

@ -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)
}

View file

@ -75,4 +75,4 @@ TFCEvents.registerFoodTrait(event => {
Platform.mods.primitive_creatures.name = "Primitive Creatures";
Platform.mods.tfg.name = "TerraFirmaGreg";
Platform.mods.kubejs.name = "TerraFirmaGreg";
Platform.mods.kubejs.name = "TerraFirmaGreg";

View file

@ -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
}

View file

@ -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
}