Jika/TFG
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Pyritie
2025-08-01 23:15:28 +01:00
parent a94a02772f e700c45062
commit 1d326f820e
12 changed files with 3326 additions and 3091 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -18,7 +18,11 @@
- Added melting recipes for all the TFC metal dusts @Pyritie
- Added mortar and pestle recipes for soybean and olive paste (#1480) @Pyritie
- Added concrete to the list of valid blocks for GT facades (#1487) @TheAshenWolf
- Removed Advanced Peripherals' Overpowered End Automata for allowing cheap interdimensional travel
- Removed Advanced Peripherals' Chunk Controller for allowing too much offline chunkloading, slowing down large servers
- Added Invar as a TFC-compatible metal (#1496) @Pyritie
### Bug fixes
- Some bug fixes for the electric refrigerators @gustovafing
- Fixed not being able to craft fine wire in a coiling machine for materials that didn't also have normal wire @Pyritie
- Fixed cobalt brass and potin double plates not being obtainable until MV @Pyritie
- Fixed missing recipe for cooking fox meat @Pyritie

638
config/ftbquests/quests/chapters/gregtech_energy.snbt
View File

@@ -6,104 +6,6 @@
group: "31B01EAD21CA863A"
icon: "gtceu:max_battery"
id: "6540429F3CA4DA1B"
images: [
{
height: 1.0d
image: "tfg:item/universal/lv_universal_circuit"
rotation: 0.0d
width: 1.0d
x: -5.0d
y: -3.0d
}
{
height: 1.0d
image: "tfg:item/universal/luv_universal_circuit"
rotation: 0.0d
width: 1.0d
x: -9.5d
y: -3.0d
}
{
height: 1.0d
image: "tfg:item/universal/ev_universal_circuit"
rotation: 0.0d
width: 1.0d
x: -9.5d
y: 0.0d
}
{
height: 1.0d
image: "tfg:item/universal/hv_universal_circuit"
rotation: 0.0d
width: 1.0d
x: -9.5d
y: 3.5d
}
{
height: 1.0d
image: "tfg:item/universal/iv_universal_circuit"
rotation: 0.0d
width: 1.0d
x: -9.5d
y: -1.5d
}
{
height: 1.0d
image: "tfg:item/universal/mv_universal_circuit"
rotation: 0.0d
width: 1.0d
x: -5.0d
y: 3.0d
}
{
height: 1.0d
image: "ad_astra:textures/painting/moon.png"
rotation: 0.0d
width: 1.0d
x: -9.5d
y: 1.5d
}
{
height: 1.0d
image: "minecraft:item/clock_00"
rotation: 0.0d
width: 1.0d
x: 6.0d
y: -3.0d
}
{
height: 1.0d
image: "gtceu:item/material_sets/bright/ingot_hot_overlay"
rotation: 0.0d
width: 1.0d
x: 6.0d
y: -1.0d
}
{
height: 2.0d
image: "ags_modernmarkings:block/marking_wall_symbol_yellow_electric"
rotation: 0.0d
width: 2.0d
x: 0.0d
y: 7.0d
}
{
height: 1.0d
image: "gtceu:block/machines/parallel_hatch_mk4/overlay_front_emissive"
rotation: 0.0d
width: 1.0d
x: 6.0d
y: 3.0d
}
{
height: 1.0d
image: "ftbteams:textures/add.png"
rotation: 0.0d
width: 1.0d
x: 6.0d
y: 1.0d
}
]
order_index: 2
quest_links: [ ]
quests: [
@@ -111,6 +13,8 @@
description: ["{quests.gregtech_energy.start.desc}"]
icon: "gtceu:uhv_ultimate_battery"
id: "06B2E38F7DCF2678"
shape: "gear"
size: 1.0d
subtitle: "{quests.gregtech_energy.start.subtitle}"
tasks: [{
id: "07E1FA6A1BB796D4"
@@ -119,10 +23,10 @@
}]
title: "{quests.gregtech_energy.start.title}"
x: 0.0d
y: 0.0d
y: -8.5d
}
{
dependencies: ["06B2E38F7DCF2678"]
dependencies: ["4C620105AAC49381"]
description: ["{quests.gregtech_energy.moving.desc}"]
icon: "gtceu:luv_field_generator"
id: "60FF9249376DF9BD"
@@ -133,11 +37,11 @@
type: "checkmark"
}]
title: "{quests.gregtech_energy.moving.title}"
x: 0.0d
y: 3.0d
x: 6.0d
y: -7.0d
}
{
dependencies: ["06B2E38F7DCF2678"]
dependencies: ["4C620105AAC49381"]
description: ["{quests.gregtech_energy.storage.desc}"]
icon: "gtceu:uv_field_generator"
id: "08C160A0E7BBF39D"
@@ -148,8 +52,8 @@
type: "checkmark"
}]
title: "{quests.gregtech_energy.storage.title}"
x: 0.0d
y: -3.0d
x: 9.0d
y: -7.0d
}
{
dependencies: [
@@ -167,11 +71,11 @@
type: "checkmark"
}]
title: "{quests.gregtech_energy.produce_energy.title}"
x: -3.0d
y: 0.0d
x: -1.0d
y: -8.5d
}
{
dependencies: ["06B2E38F7DCF2678"]
dependencies: ["4C620105AAC49381"]
description: [
"{quests.gregtech_energy.spending_energy.desc.1}"
"{@pagebreak}"
@@ -191,7 +95,7 @@
}]
title: "{quests.gregtech_energy.spending_energy.title}"
x: 3.0d
y: 0.0d
y: -7.0d
}
{
dependencies: ["60FF9249376DF9BD"]
@@ -225,8 +129,8 @@
}
]
title: "{quests.gregtech_energy.moving_wire.title}"
x: 0.0d
y: 5.0d
x: 7.0d
y: -6.0d
}
{
dependencies: ["60FF9249376DF9BD"]
@@ -258,11 +162,14 @@
}
]
title: "{quests.gregtech_energy.moving_amp.title}"
x: 2.0d
y: 5.0d
x: 5.0d
y: -6.0d
}
{
dependencies: ["60FF9249376DF9BD"]
dependencies: [
"60FF9249376DF9BD"
"1DB543EFEEB67238"
]
description: ["{quests.gregtech_energy.transformer.desc}"]
icon: "gtceu:active_transformer"
id: "6ECAD339C91EF194"
@@ -292,8 +199,8 @@
}
]
title: "{quests.gregtech_energy.transformer.title}"
x: -2.0d
y: 5.0d
x: 6.0d
y: 3.0d
}
{
dependencies: ["08C160A0E7BBF39D"]
@@ -326,11 +233,14 @@
}
]
title: "{quests.gregtech_energy.battery_buffer.title}"
x: 0.0d
y: -5.0d
x: 10.0d
y: -6.0d
}
{
dependencies: ["08C160A0E7BBF39D"]
dependencies: [
"08C160A0E7BBF39D"
"7AF726555D721DFC"
]
description: [
"{quests.gregtech_energy.pss.desc.1}"
"{@pagebreak}"
@@ -357,8 +267,8 @@
}
]
title: "{quests.gregtech_energy.pss.title}"
x: 2.0d
y: -5.0d
x: 9.0d
y: -1.0d
}
{
dependencies: ["08C160A0E7BBF39D"]
@@ -382,11 +292,14 @@
type: "item"
}]
title: "{quests.gregtech_energy.tank.title}"
x: -2.0d
y: -5.0d
x: 8.0d
y: -6.0d
}
{
dependencies: ["6F80465F0759BECA"]
dependencies: [
"6F80465F0759BECA"
"4D0ADC66D2CF09B1"
]
description: ["{quests.gregtech_energy.batteries.desc}"]
id: "3B94CF569E4A2B26"
subtitle: "{quests.gregtech_energy.batteries.subtitle}"
@@ -403,34 +316,11 @@
type: "item"
}]
title: "{quests.gregtech_energy.batteries.title}"
x: 0.0d
y: -6.5d
x: 10.0d
y: -3.0d
}
{
dependencies: ["2CDB9778C7A30044"]
description: ["{quests.gregtech_energy.first_generator.desc}"]
id: "0116158FBDA9DF86"
subtitle: "{quests.gregtech_energy.first_generator.subtitle}"
tasks: [{
disable_toast: true
id: "0BCC01540FE7555C"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(gtceu:lv_combustion)item(gtceu:mv_combustion)item(gtceu:hv_combustion)item(gtceu:lv_steam_turbine)item(gtceu:mv_steam_turbine)item(gtceu:hv_steam_turbine)item(gtceu:lv_gas_turbine)item(gtceu:mv_gas_turbine)item(gtceu:hv_gas_turbine))"
}
}
optional_task: true
title: "{quests.gregtech_energy.first_generator.task}"
type: "item"
}]
title: "{quests.gregtech_energy.first_generator.title}"
x: -5.0d
y: 0.0d
}
{
dependencies: ["685CE664E91157C4"]
dependencies: ["4D0ADC66D2CF09B1"]
description: [
"{quests.gregtech_energy.lst.desc.1}"
"{@pagebreak}"
@@ -444,11 +334,11 @@
type: "item"
}]
title: "{quests.gregtech_energy.lst.title}"
x: -7.5d
y: 3.0d
x: -4.5d
y: -3.0d
}
{
dependencies: ["0116158FBDA9DF86"]
dependencies: ["05E2F203DA46A5E8"]
description: [
"{quests.gregtech_energy.lce.desc.1}"
"{@pagebreak}"
@@ -456,24 +346,17 @@
]
id: "4AC4D681124751EE"
subtitle: "{quests.gregtech_energy.lce.subtitle}"
tasks: [
{
id: "31BFE575D15F270A"
item: "gtceu:large_combustion_engine"
type: "item"
}
{
id: "4B062E5264D4CAC8"
item: "gtceu:extreme_combustion_engine"
type: "item"
}
]
tasks: [{
id: "4B062E5264D4CAC8"
item: "gtceu:extreme_combustion_engine"
type: "item"
}]
title: "{quests.gregtech_energy.lce.title}"
x: -7.0d
y: -1.5d
x: -4.5d
y: 1.0d
}
{
dependencies: ["0116158FBDA9DF86"]
dependencies: ["7AF726555D721DFC"]
description: [
"{quests.gregtech_energy.lgt.desc.1}"
"{@pagebreak}"
@@ -487,11 +370,11 @@
type: "item"
}]
title: "{quests.gregtech_energy.lgt.title}"
x: -7.0d
y: 0.0d
x: -3.0d
y: -1.0d
}
{
dependencies: ["0116158FBDA9DF86"]
dependencies: ["1DB543EFEEB67238"]
description: [
"{quests.gregtech_energy.lpt.desc.1}"
"{@pagebreak}"
@@ -505,8 +388,8 @@
type: "item"
}]
title: "{quests.gregtech_energy.lpt.title}"
x: -7.0d
y: -3.0d
x: -3.0d
y: 3.0d
}
{
dependencies: ["2E57B2B963717893"]
@@ -546,11 +429,14 @@
}
]
title: "{quests.gregtech_energy.blast_oc.title}"
x: 5.0d
y: -1.0d
x: 3.0d
y: -4.0d
}
{
dependencies: ["2E57B2B963717893"]
dependencies: [
"2E57B2B963717893"
"0AF286AA540A82E6"
]
description: [
"{quests.gregtech_energy.overclock.desc.1}"
"{@pagebreak}"
@@ -567,11 +453,14 @@
type: "checkmark"
}]
title: "{quests.gregtech_energy.overclock.title}"
x: 5.0d
y: -3.0d
x: 3.0d
y: -5.0d
}
{
dependencies: ["2E57B2B963717893"]
dependencies: [
"2E57B2B963717893"
"4D0ADC66D2CF09B1"
]
description: [
"{quests.gregtech_energy.subtick.desc.1}"
"{@pagebreak}"
@@ -585,11 +474,14 @@
type: "item"
}]
title: "{quests.gregtech_energy.subtick.title}"
x: 5.0d
y: 1.0d
x: 3.0d
y: -3.0d
}
{
dependencies: ["2E57B2B963717893"]
dependencies: [
"2E57B2B963717893"
"05E2F203DA46A5E8"
]
description: [
"{quests.gregtech_energy.parallel_hatch.desc.1}"
"{@pagebreak}"
@@ -610,11 +502,11 @@
type: "item"
}]
title: "{quests.gregtech_energy.parallel_hatch.title}"
x: 5.0d
y: 3.0d
x: 3.0d
y: 1.0d
}
{
dependencies: ["3467E14C8BB54214"]
dependencies: ["4D0ADC66D2CF09B1"]
description: [
"{quests.gregtech_energy.lgt_fuel.desc.1}"
"{@pagebreak}"
@@ -649,8 +541,8 @@
}
]
title: "{quests.gregtech_energy.lgt_fuel.title}"
x: -8.5d
y: 0.0d
x: -11.0d
y: -3.0d
}
{
dependencies: ["634EAFA86B3D57A1"]
@@ -682,11 +574,11 @@
}
]
title: "{quests.gregtech_energy.lpt_fuel.title}"
x: -8.5d
y: -3.0d
x: -9.0d
y: 3.0d
}
{
dependencies: ["20DA81038C507C90"]
dependencies: ["4C620105AAC49381"]
description: ["{quests.gregtech_energy.lst_fuel.desc}"]
icon: "gtceu:steam_bucket"
id: "7D5CA47D0E147922"
@@ -712,8 +604,8 @@
}
]
title: "{quests.gregtech_energy.lst_fuel.title}"
x: -8.5d
y: 3.0d
x: -9.0d
y: -7.0d
}
{
dependencies: ["4AC4D681124751EE"]
@@ -763,11 +655,11 @@
}
]
title: "{quests.gregtech_energy.lce_fuel.title}"
x: -8.5d
y: -1.5d
x: -10.0d
y: 1.0d
}
{
dependencies: ["0116158FBDA9DF86"]
dependencies: ["4C620105AAC49381"]
description: [
"{quests.gregtech_energy.lv_generator.desc.1}"
"{@pagebreak}"
@@ -779,39 +671,25 @@
]
id: "7F92FDAB9A04C58B"
subtitle: "{quests.gregtech_energy.lv_generator.subtitle}"
tasks: [
{
disable_toast: true
id: "4DF2BE3846DB01B9"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(gtceu:lv_steam_turbine)item(gtceu:lv_combustion))"
}
tasks: [{
disable_toast: true
id: "4DF2BE3846DB01B9"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(gtceu:lv_steam_turbine)item(gtceu:lv_combustion))"
}
title: "{quests.gregtech_energy.mv_generator.task}"
type: "item"
}
{
id: "6E2ED41B94F13051"
item: "gtceu:steam_bucket"
optional_task: true
type: "item"
}
{
id: "38180F22E14D0CDF"
item: "gtceu:bio_diesel_bucket"
optional_task: true
type: "item"
}
]
title: "{quests.gregtech_energy.mv_generator.task}"
type: "item"
}]
title: "{quests.gregtech_energy.lv_generator.title}"
x: -5.0d
y: -2.0d
x: -3.0d
y: -7.0d
}
{
dependencies: ["0116158FBDA9DF86"]
dependencies: ["0AF286AA540A82E6"]
description: ["{quests.gregtech_energy.mv_generator.desc}"]
id: "54562DEA1717A819"
subtitle: "{quests.gregtech_energy.mv_generator.subtitle}"
@@ -829,11 +707,11 @@
type: "item"
}]
title: "{quests.gregtech_energy.mv_generator.title}"
x: -5.0d
y: 2.0d
x: -3.0d
y: -5.0d
}
{
dependencies: ["0116158FBDA9DF86"]
dependencies: ["4D0ADC66D2CF09B1"]
description: ["{quests.gregtech_energy.solar_panel.desc}"]
id: "109C57B63EE95E35"
subtitle: "{quests.gregtech_energy.solar_panel.subtitle}"
@@ -843,13 +721,14 @@
item: "ad_astra:solar_panel"
type: "item"
}]
x: -7.0d
y: 1.5d
x: -6.0d
y: -3.0d
}
{
dependencies: [
"109C57B63EE95E35"
"5826EC76931359B8"
"7AF726555D721DFC"
]
dependency_requirement: "one_completed"
description: [
@@ -860,84 +739,18 @@
icon: "gtceu:large_solar_panel"
id: "0585527D1854628B"
subtitle: "{quests.gregtech_energy.large_solar.subtitle}"
tasks: [
{
disable_toast: true
id: "198E956830F835B2"
item: "gtceu:large_solar_panel"
type: "item"
}
{
id: "794BF3FC434ACB5B"
item: "gtceu:lv_input_bus"
type: "item"
}
{
id: "43C2823947C4AE47"
item: "gtceu:auto_maintenance_hatch"
type: "item"
}
{
id: "07B517D79E7CDAF0"
item: "gtceu:ev_energy_input_hatch"
type: "item"
}
{
count: 54L
id: "120C887A59B89D66"
item: "tfg:casings/machine_casing_iron_desh"
type: "item"
}
{
count: 24L
id: "166503BF54649F4A"
item: "tfg:casings/machine_casing_red_solar_panel"
type: "item"
}
{
id: "3E71E1F848336782"
item: "ad_astra:iron_plating"
type: "item"
}
{
count: 16L
id: "294567EB2BE47456"
item: { Count: 16, id: "gtceu:cleanroom_glass" }
type: "item"
}
{
count: 20L
id: "516481695EBA7FCD"
item: { Count: 20, id: "ad_astra:iron_plateblock" }
type: "item"
}
{
count: 3L
id: "1764824C0C01F914"
item: { Count: 3, id: "ad_astra:glowing_iron_pillar" }
type: "item"
}
]
title: "{quests.gregtech_energy.large_solar.title}"
x: -8.5d
y: 1.5d
}
{
dependencies: ["0116158FBDA9DF86"]
description: ["{quests.gregtech_energy.hv_choice.desc}"]
id: "685CE664E91157C4"
subtitle: "{quests.gregtech_energy.hv_choice.subtitle}"
tasks: [{
id: "5BAFEAE94802DBFF"
title: "{quests.gregtech_energy.hv_choice.task}"
type: "checkmark"
disable_toast: true
id: "198E956830F835B2"
item: "gtceu:large_solar_panel"
type: "item"
}]
title: "{quests.gregtech_energy.hv_choice.title}"
x: -6.5d
y: 3.5d
title: "{quests.gregtech_energy.large_solar.title}"
x: -6.0d
y: -1.0d
}
{
dependencies: ["685CE664E91157C4"]
dependencies: ["4D0ADC66D2CF09B1"]
description: ["{quests.gregtech_energy.hv_single_generator.desc}"]
id: "1A0672F4FA88DF74"
subtitle: "{quests.gregtech_energy.hv_single_generator.subtitle}"
@@ -954,8 +767,8 @@
type: "item"
}]
title: "{quests.gregtech_energy.hv_single_generator.title}"
x: -7.5d
y: 4.0d
x: -3.0d
y: -3.0d
}
{
dependencies: ["1A0672F4FA88DF74"]
@@ -988,8 +801,221 @@
}
]
title: "{quests.gregtech_energy.hv_fuel.title}"
x: -8.5d
y: 4.0d
x: -12.0d
y: -3.0d
}
{
description: ["{quests.ore_proc.lv_tier.desc}"]
disable_toast: true
icon: "tfg:lv_universal_circuit"
id: "4C620105AAC49381"
shape: "none"
size: 2.0d
tasks: [{
disable_toast: true
id: "2D012C52C576A887"
item: "gtceu:lv_machine_hull"
type: "item"
}]
title: "Low Voltage Tier"
x: 0.0d
y: -7.0d
}
{
description: ["{quests.ore_proc.lv_tier.desc}"]
disable_toast: true
icon: "tfg:mv_universal_circuit"
id: "0AF286AA540A82E6"
shape: "none"
size: 2.0d
tasks: [{
disable_toast: true
id: "4EBE57B96E37CE23"
item: "gtceu:mv_machine_hull"
type: "item"
}]
title: "Medium Voltage Tier"
x: 0.0d
y: -5.0d
}
{
description: ["{quests.ore_proc.lv_tier.desc}"]
disable_toast: true
icon: "tfg:hv_universal_circuit"
id: "4D0ADC66D2CF09B1"
shape: "none"
size: 2.0d
tasks: [{
disable_toast: true
id: "5EA11ADD82D6BED4"
item: "gtceu:hv_machine_hull"
type: "item"
}]
title: "High Voltage Tier"
x: 0.0d
y: -3.0d
}
{
description: ["{quests.ore_proc.lv_tier.desc}"]
disable_toast: true
icon: "tfg:ev_universal_circuit"
id: "7AF726555D721DFC"
shape: "none"
size: 2.0d
tasks: [{
disable_toast: true
id: "4228B9AA7EE9248F"
item: "gtceu:ev_machine_hull"
type: "item"
}]
title: "Extreme Voltage Tier"
x: 0.0d
y: -1.0d
}
{
description: ["{quests.ore_proc.lv_tier.desc}"]
disable_toast: true
icon: "tfg:iv_universal_circuit"
id: "05E2F203DA46A5E8"
shape: "none"
size: 2.0d
tasks: [{
disable_toast: true
id: "073653D00E581030"
item: "gtceu:iv_machine_hull"
type: "item"
}]
title: "Insane Voltage Tier"
x: 0.0d
y: 1.0d
}
{
description: ["{quests.ore_proc.lv_tier.desc}"]
disable_toast: true
icon: "tfg:luv_universal_circuit"
id: "1DB543EFEEB67238"
shape: "none"
size: 2.0d
tasks: [{
disable_toast: true
id: "2C1907215939619E"
item: "gtceu:luv_machine_hull"
type: "item"
}]
title: "Ludicrous Voltage Tier"
x: 0.0d
y: 3.0d
}
{
description: ["{quests.ore_proc.lv_tier.desc}"]
disable_toast: true
icon: "tfg:zpm_universal_circuit"
id: "39019EF278D09DF7"
shape: "none"
size: 2.0d
tasks: [{
disable_toast: true
id: "685F3DAA2D955502"
item: "gtceu:zpm_machine_hull"
type: "item"
}]
title: "Zero Point Module Tier"
x: 0.0d
y: 5.0d
}
{
description: ["{quests.ore_proc.lv_tier.desc}"]
disable_toast: true
icon: "tfg:uv_universal_circuit"
id: "7ECA77DFEE2F6F20"
shape: "none"
size: 2.0d
tasks: [{
disable_toast: true
id: "1DF572E729BB8B8A"
item: "gtceu:uv_machine_hull"
type: "item"
}]
title: "Ultimate Voltage Tier"
x: 0.0d
y: 7.0d
}
{
dependencies: ["0AF286AA540A82E6"]
id: "3630849A7B0818C8"
tasks: [{
id: "0CF9D6042C16265A"
item: "gtceu:benzene_bucket"
type: "item"
}]
x: -11.0d
y: -5.0d
}
{
dependencies: ["0AF286AA540A82E6"]
id: "79AA7691F398A8C7"
tasks: [{
id: "36219BC854303490"
item: "gtceu:diesel_bucket"
type: "item"
}]
x: -10.0d
y: -5.0d
}
{
dependencies: ["05E2F203DA46A5E8"]
id: "4512E5DE7A84F809"
tasks: [{
id: "4BAECE3F4EC86920"
item: "gtceu:fission_reactor"
type: "item"
}]
x: -3.0d
y: 1.0d
}
{
dependencies: ["4C620105AAC49381"]
id: "139C7DF629329753"
tasks: [{
id: "7BA9FDD1F45B53F6"
item: "gtceu:bio_diesel_bucket"
type: "item"
}]
x: -10.0d
y: -7.0d
}
{
dependencies: ["4D0ADC66D2CF09B1"]
id: "376BFF92714C5012"
tasks: [{
id: "22F9A3ED193CB252"
item: "gtceu:cetane_boosted_diesel_bucket"
type: "item"
}]
x: -10.0d
y: -3.0d
}
{
dependencies: ["7AF726555D721DFC"]
id: "7134DB013B34593E"
tasks: [{
id: "008341509483BB23"
item: "gtceu:high_octane_gasoline_bucket"
type: "item"
}]
x: -10.0d
y: -1.0d
}
{
dependencies: ["7AF726555D721DFC"]
id: "351AED1612D00EF8"
tasks: [{
id: "6A35D4E3C93A70FC"
item: "gtceu:large_combustion_engine"
type: "item"
}]
x: -4.5d
y: -1.0d
}
]
subtitle: ["{quests.gregtech_energy.subtitle}"]

9
config/ftbquests/quests/chapters/hv__high_voltage.snbt
View File

@@ -854,13 +854,20 @@
dependencies: ["52AD30F04DD5A812"]
dependency_requirement: "all_started"
description: ["{quests.high_voltage.hv_mixer.desc}"]
icon: "gtceu:hv_mixer"
id: "05ABC370D7153350"
shape: "octagon"
size: 1.5d
subtitle: "{quests.high_voltage.hv_mixer.subtitle}"
tasks: [{
id: "6D522B2EF097AA95"
item: "gtceu:hv_mixer"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(gtceu:hv_mixer)item(greate:stainless_steel_mechanical_mixer))"
}
}
type: "item"
}]
title: "{quests.high_voltage.hv_mixer.title}"

211
config/ftbquests/quests/chapters/space_survival.snbt
View File

@@ -171,7 +171,7 @@
type: "item"
}]
title: "{quests.space_survival.bedrock_mining.title}"
x: 0.5d
x: -1.0d
y: 1.0d
}
{
@@ -460,27 +460,24 @@
"5826EC76931359B8"
"3C92063DE5B9D5E9"
]
description: ["{quests.space_survival.railgun.desc}"]
icon: "tfg:interplanetary_item_launcher"
description: [
"{quests.space_survival.railgun.desc.1}"
"{@pagebreak}"
"{quests.space_survival.railgun.desc.2}"
]
icon: "tfg:electromagnetic_accelerator"
id: "1A9A5F55F1F0AC58"
shape: "gear"
size: 2.0d
subtitle: "{quests.space_survival.railgun.subtitle}"
tasks: [
{
id: "14EEFF310A3179A8"
item: "tfg:interplanetary_item_launcher"
type: "item"
}
{
id: "5F95946B3B0E38B9"
item: "tfg:interplanetary_item_reciever"
type: "item"
}
]
tasks: [{
id: "5009A382342496F7"
title: "{quests.space_survival.railgun.task}"
type: "checkmark"
}]
title: "{quests.space_survival.railgun.title}"
x: 2.0d
y: -0.5d
y: 1.0d
}
{
dependencies: ["72BD27FEEB34C7B0"]
@@ -522,6 +519,188 @@
x: -7.0d
y: -5.5d
}
{
dependencies: ["1A9A5F55F1F0AC58"]
description: [
"{quests.space_survival.raiinterplanetary_railgunlgun.desc.1}"
"{@pagebreak}"
"{quests.space_survival.raiinterplanetary_railgunlgun.desc.2}"
]
id: "783BB3FC5702DA8C"
subtitle: "{quests.space_survival.interplanetary_railgun.subtitle}"
tasks: [{
id: "71326452986A7C0F"
item: "tfg:interplanetary_item_launcher"
type: "item"
}]
title: "{quests.space_survival.interplanetary_railgun.title}"
x: 4.5d
y: -1.5d
}
{
dependencies: ["1A9A5F55F1F0AC58"]
description: [
"{quests.space_survival.monitor_railgun.desc.1}"
"{@pagebreak}"
"{quests.space_survival.monitor_railgun.desc.2}"
]
id: "498E559B9C37D2CA"
subtitle: "{quests.space_survival.monitor_railgun.subtitle}"
tasks: [{
id: "43304A46FD2DFB41"
item: "tfg:interplanetary_logistics_monitor"
type: "item"
}]
title: "{quests.space_survival.monitor_railgun.title}"
x: 4.5d
y: 1.0d
}
{
dependencies: ["1A9A5F55F1F0AC58"]
description: [
"{quests.space_survival.receiver_railgun.desc.1}"
"{@pagebreak}"
"{quests.space_survival.receiver_railgun.desc.2}"
]
id: "71AD0B9C1FB7CE03"
subtitle: "{quests.space_survival.receiver_railgun.subtitle}"
tasks: [{
id: "4A43C3AAFA69E286"
item: "tfg:interplanetary_item_receiver"
type: "item"
}]
title: "{quests.space_survival.receiver_railgun.title}"
x: 4.5d
y: 3.5d
}
{
dependencies: [
"783BB3FC5702DA8C"
"498E559B9C37D2CA"
]
description: [
"{quests.space_survival.input_bus_railgun.desc.1}"
"{@pagebreak}"
"{quests.space_survival.input_bus_railgun.desc.2}"
]
id: "4FF2809A81DD4122"
subtitle: "{quests.space_survival.input_bus_railgun.subtitle}"
tasks: [{
id: "1F97F1BAE1DF7ADC"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(tfg:ulv_railgun_item_loader_in)item(tfg:lv_railgun_item_loader_in)item(tfg:mv_railgun_item_loader_in)item(tfg:hv_railgun_item_loader_in)item(tfg:ev_railgun_item_loader_in)item(tfg:iv_railgun_item_loader_in)item(tfg:luv_railgun_item_loader_in)item(tfg:zpm_railgun_item_loader_in)item(tfg:uv_railgun_item_loader_in)item(tfg:uhv_railgun_item_loader_in))"
}
}
title: "{quests.space_survival.input_bus_railgun.task}"
type: "item"
}]
title: "{quests.space_survival.input_bus_railgun.title}"
x: 6.0d
y: -1.0d
}
{
dependencies: ["783BB3FC5702DA8C"]
description: [
"{quests.space_survival.ammo_railgun.desc.1}"
"{@pagebreak}"
"{quests.space_survival.ammo_railgun.desc.2}"
]
id: "3BEEB11C8621772D"
subtitle: "{quests.space_survival.ammo_railgun.subtitle}"
tasks: [
{
id: "5E7152C67A1E685D"
item: "tfg:railgun_ammo_loader"
type: "item"
}
{
id: "36471CA165196EC9"
item: "tfg:railgun_ammo_shell"
type: "item"
}
]
title: "{quests.space_survival.ammo_railgun.title}"
x: 6.0d
y: -2.0d
}
{
dependencies: ["498E559B9C37D2CA"]
description: ["{quests.space_survival.redstone_railgun.desc}"]
icon: "minecraft:redstone_torch"
id: "0538DCD4D4811574"
subtitle: "{quests.space_survival.redstone_railgun.subtitle}"
tasks: [{
id: "63FFA0CBDDD635B9"
title: "{quests.space_survival.redstone_railgun.task}"
type: "checkmark"
}]
title: "{quests.space_survival.redstone_railgun.title}"
x: 6.5d
y: 0.0d
}
{
dependencies: ["498E559B9C37D2CA"]
description: ["{quests.space_survival.robot_arm_railgun.desc}"]
icon: "gtceu:hv_robot_arm"
id: "7118634C06AE1141"
subtitle: "{quests.space_survival.robot_arm_railgun.subtitle}"
tasks: [{
id: "6C995E2B46963E1E"
title: "{quests.space_survival.robot_arm_railgun.task}"
type: "checkmark"
}]
title: "{quests.space_survival.robot_arm_railgun.title}"
x: 6.5d
y: 1.0d
}
{
dependencies: [
"498E559B9C37D2CA"
"71AD0B9C1FB7CE03"
]
description: [
"{quests.space_survival.output_bus_railgun.desc.1}"
"{@pagebreak}"
"{quests.space_survival.output_bus_railgun.desc.2}"
"{@pagebreak}"
"{quests.space_survival.output_bus_railgun.desc.3}"
]
id: "5FB814261B0993C5"
subtitle: "{quests.space_survival.output_bus_railgun.subtitle}"
tasks: [{
id: "72D587D69470709E"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(tfg:ulv_railgun_item_loader_out)item(tfg:lv_railgun_item_loader_out)item(tfg:mv_railgun_item_loader_out)item(tfg:hv_railgun_item_loader_out)item(tfg:ev_railgun_item_loader_out)item(tfg:iv_railgun_item_loader_out)item(tfg:luv_railgun_item_loader_out)item(tfg:zpm_railgun_item_loader_out)item(tfg:uv_railgun_item_loader_out)item(tfg:uhv_railgun_item_loader_out))"
}
}
title: "{quests.space_survival.output_bus_railgun.task}"
type: "item"
}]
title: "{quests.space_survival.output_bus_railgun.title}"
x: 6.0d
y: 3.0d
}
{
dependencies: ["498E559B9C37D2CA"]
description: ["{quests.space_survival.delay_railgun.desc}"]
icon: "create:cuckoo_clock"
id: "183AC1085D558086"
subtitle: "{quests.space_survival.delay_railgun.subtitle}"
tasks: [{
id: "119FD14202435E03"
title: "{quests.space_survival.delay_railgun.task}"
type: "checkmark"
}]
title: "{quests.space_survival.delay_railgun.title}"
x: 6.5d
y: 2.0d
}
]
subtitle: ["{quests.space_survival.subtitle}"]
title: "{quests.space_survival}"

5319
kubejs/assets/tfc/lang/en_us.json
View File

File diff suppressed because it is too large Load Diff

BIN
kubejs/assets/tfg/textures/block/metal/smooth/invar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 422 B

1
kubejs/server_scripts/gregtech/data.js
View File

@@ -115,6 +115,7 @@ const registerGTCEUMetals = (event) => {
event.metal('gtceu:red_alloy', 740, 0.01529, '#forge:ingots/red_alloy', '#forge:double_ingots/red_alloy', '#forge:plates/red_alloy', 2, 'tfg:red_alloy')
event.metal('gtceu:tin_alloy', 1250, 0.00829, '#forge:ingots/tin_alloy', '#forge:double_ingots/tin_alloy', '#forge:plates/tin_alloy', 3, 'tfg:tin_alloy')
event.metal('gtceu:lead', 330, 0.01729, '#forge:ingots/lead', '#forge:double_ingots/lead', '#forge:plates/lead', 2, 'tfg:lead')
event.metal('gtceu:invar', 1494, 0.00741, '#forge:ingots/invar', '#forge:double_ingots/invar', '#forge:plates/invar', 3, 'tfg:invar')
}

223
kubejs/server_scripts/tfc/recipes.materials.js
View File

@@ -9,6 +9,9 @@ function registerTFCMaterialsRecipes(event) {
if (tfcProperty === null) {
return;
}
// Add any other early game metals here with GT tools but no TFC ones
const onlyHasGTTools = material === GTMaterials.Invar;
let outputMaterial = (tfcProperty.getOutputMaterial() === null) ? material : tfcProperty.getOutputMaterial()
@@ -224,7 +227,7 @@ function registerTFCMaterialsRecipes(event) {
}
// Tools (From Double Plate)
if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL)) {
if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL) && !onlyHasGTTools) {
//#region Фурма
// Декрафт инструмента в жидкость
@@ -298,7 +301,7 @@ function registerTFCMaterialsRecipes(event) {
}
// Tools (From Plate)
if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL)) {
if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL) && !onlyHasGTTools) {
//#region Удочка
// Декрафт оголовья в жидкость
@@ -375,32 +378,32 @@ function registerTFCMaterialsRecipes(event) {
//#region Дубина
// Декрафт инструмента в жидкость
event.recipes.tfc.heating(`tfc:metal/mace/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 288))
.useDurability(true)
.id(`tfc:heating/metal/${material.getName()}_mace`)
if (!onlyHasGTTools) {
// Декрафт инструмента в жидкость
event.recipes.tfc.heating(`tfc:metal/mace/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 288))
.useDurability(true)
.id(`tfc:heating/metal/${material.getName()}_mace`)
// Металл + Форма -> Оголовье
if (material.hasFlag(TFGMaterialFlags.CAN_BE_UNMOLDED)) {
event.recipes.tfc.casting(`tfc:metal/mace_head/${material.getName()}`, 'tfc:ceramic/mace_head_mold', Fluid.of(outputMaterial.getFluid(), 288), 1)
.id(`tfc:casting/${material.getName()}_mace_head`)
// Металл + Форма -> Оголовье
if (material.hasFlag(TFGMaterialFlags.CAN_BE_UNMOLDED)) {
event.recipes.tfc.casting(`tfc:metal/mace_head/${material.getName()}`, 'tfc:ceramic/mace_head_mold', Fluid.of(outputMaterial.getFluid(), 288), 1)
.id(`tfc:casting/${material.getName()}_mace_head`)
event.recipes.create.filling(
Item.of('tfc:ceramic/mace_head_mold', getFillingNBT(outputMaterial, 288)),
[
Fluid.of(outputMaterial.getFluid(), 288),
Item.of('tfc:ceramic/mace_head_mold').strongNBT()
]
).id(`tfg:tfc/filling/${material.getName()}_mace_head`)
event.recipes.create.filling(
Item.of('tfc:ceramic/mace_head_mold', getFillingNBT(outputMaterial, 288)),
[
Fluid.of(outputMaterial.getFluid(), 288),
Item.of('tfc:ceramic/mace_head_mold').strongNBT()
]
).id(`tfg:tfc/filling/${material.getName()}_mace_head`)
}
// Декрафт оголовья в жидкость
event.recipes.tfc.heating(`tfc:metal/mace_head/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 288))
.id(`tfc:heating/metal/${material.getName()}_mace_head`)
}
// Декрафт оголовья в жидкость
event.recipes.tfc.heating(`tfc:metal/mace_head/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 288))
.id(`tfc:heating/metal/${material.getName()}_mace_head`)
//#endregion
//#region Мясницкий нож
@@ -690,14 +693,16 @@ function registerTFCMaterialsRecipes(event) {
//#endregion
// #region mattock
event.recipes.tfc.heating(`rnr:metal/mattock/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
.useDurability(true)
.id(`rnr:heating/metal/${material.getName()}_mattock`)
if (!onlyHasGTTools) {
event.recipes.tfc.heating(`rnr:metal/mattock/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
.useDurability(true)
.id(`rnr:heating/metal/${material.getName()}_mattock`)
event.recipes.tfc.heating(`rnr:metal/mattock_head/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
.id(`rnr:heating/metal/${material.getName()}_mattock_head`)
event.recipes.tfc.heating(`rnr:metal/mattock_head/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
.id(`rnr:heating/metal/${material.getName()}_mattock_head`)
}
//#endregion
// #region screwdriver
@@ -1101,20 +1106,21 @@ function registerTFCMaterialsRecipes(event) {
//#region shears
// Сварка оголовий
event.recipes.tfc.welding(`tfc:metal/shears/${material.getName()}`, knifeHeadItem, knifeHeadItem, tfcProperty.getTier())
.id(`tfc:welding/${material.getName()}_shears`)
if (!onlyHasGTTools) {
event.recipes.tfc.welding(`tfc:metal/shears/${material.getName()}`, knifeHeadItem, knifeHeadItem, tfcProperty.getTier())
.id(`tfc:welding/${material.getName()}_shears`)
event.recipes.greate.compacting(`tfc:metal/shears/${material.getName()}`, [knifeHeadItem, knifeHeadItem, 'tfc:powder/flux'])
.heated()
.recipeTier(tfcProperty.getTier() < 4 ? 0 : 1)
.id(`greate:compacting/${material.getName()}_shears`)
// Декрафт инструмента в жидкость
event.recipes.tfc.heating(`tfc:metal/shears/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 288))
.useDurability(true)
.id(`tfc:heating/metal/${material.getName()}_shears`)
event.recipes.greate.compacting(`tfc:metal/shears/${material.getName()}`, [knifeHeadItem, knifeHeadItem, 'tfc:powder/flux'])
.heated()
.recipeTier(tfcProperty.getTier() < 4 ? 0 : 1)
.id(`greate:compacting/${material.getName()}_shears`)
// Декрафт инструмента в жидкость
event.recipes.tfc.heating(`tfc:metal/shears/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 288))
.useDurability(true)
.id(`tfc:heating/metal/${material.getName()}_shears`)
}
//#endregion
}
@@ -1123,89 +1129,90 @@ function registerTFCMaterialsRecipes(event) {
//#region prospector pick
// Декрафт инструмента в жидкость
event.recipes.tfc.heating(`tfc:metal/propick/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
.useDurability(true)
.id(`tfc:heating/metal/${material.getName()}_propick`)
if (!onlyHasGTTools) {
// Декрафт инструмента в жидкость
event.recipes.tfc.heating(`tfc:metal/propick/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
.useDurability(true)
.id(`tfc:heating/metal/${material.getName()}_propick`)
// Декрафт оголовья в жидкость
event.recipes.tfc.heating(`tfc:metal/propick_head/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
.id(`tfc:heating/metal/${material.getName()}_propick_head`)
// Декрафт оголовья в жидкость
event.recipes.tfc.heating(`tfc:metal/propick_head/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
.id(`tfc:heating/metal/${material.getName()}_propick_head`)
// Металл + Форма -> Оголовье
if (material.hasFlag(TFGMaterialFlags.CAN_BE_UNMOLDED)) {
event.recipes.tfc.casting(`tfc:metal/propick_head/${material.getName()}`, 'tfc:ceramic/propick_head_mold', Fluid.of(outputMaterial.getFluid(), 144), 1)
.id(`tfc:casting/${material.getName()}_propick_head`)
// Металл + Форма -> Оголовье
if (material.hasFlag(TFGMaterialFlags.CAN_BE_UNMOLDED)) {
event.recipes.tfc.casting(`tfc:metal/propick_head/${material.getName()}`, 'tfc:ceramic/propick_head_mold', Fluid.of(outputMaterial.getFluid(), 144), 1)
.id(`tfc:casting/${material.getName()}_propick_head`)
event.recipes.create.filling(
Item.of('tfc:ceramic/propick_head_mold', getFillingNBT(outputMaterial, 144)),
[
Fluid.of(outputMaterial.getFluid(), 144),
Item.of('tfc:ceramic/propick_head_mold').strongNBT()
]
).id(`tfg:tfc/filling/${material.getName()}_propick_head_mold`)
event.recipes.create.filling(
Item.of('tfc:ceramic/propick_head_mold', getFillingNBT(outputMaterial, 144)),
[
Fluid.of(outputMaterial.getFluid(), 144),
Item.of('tfc:ceramic/propick_head_mold').strongNBT()
]
).id(`tfg:tfc/filling/${material.getName()}_propick_head_mold`)
}
}
//#endregion
//#region chisel
if (!onlyHasGTTools) {
// Декрафт инструмента в жидкость
event.recipes.tfc.heating(`tfc:metal/chisel/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
.useDurability(true)
.id(`tfc:heating/metal/${material.getName()}_chisel`)
// Декрафт инструмента в жидкость
event.recipes.tfc.heating(`tfc:metal/chisel/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
.useDurability(true)
.id(`tfc:heating/metal/${material.getName()}_chisel`)
// Декрафт оголовья в жидкость
event.recipes.tfc.heating(`tfc:metal/chisel_head/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
.id(`tfc:heating/metal/${material.getName()}_chisel_head`)
// Декрафт оголовья в жидкость
event.recipes.tfc.heating(`tfc:metal/chisel_head/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
.id(`tfc:heating/metal/${material.getName()}_chisel_head`)
// Металл + Форма -> Оголовье
if (material.hasFlag(TFGMaterialFlags.CAN_BE_UNMOLDED)) {
event.recipes.tfc.casting(`tfc:metal/chisel_head/${material.getName()}`, 'tfc:ceramic/chisel_head_mold', Fluid.of(outputMaterial.getFluid(), 144), 1)
.id(`tfc:casting/${material.getName()}_chisel_head`)
// Металл + Форма -> Оголовье
if (material.hasFlag(TFGMaterialFlags.CAN_BE_UNMOLDED)) {
event.recipes.tfc.casting(`tfc:metal/chisel_head/${material.getName()}`, 'tfc:ceramic/chisel_head_mold', Fluid.of(outputMaterial.getFluid(), 144), 1)
.id(`tfc:casting/${material.getName()}_chisel_head`)
event.recipes.create.filling(
Item.of('tfc:ceramic/chisel_head_mold', getFillingNBT(outputMaterial, 144)),
[
Fluid.of(outputMaterial.getFluid(), 144),
Item.of('tfc:ceramic/chisel_head_mold').strongNBT()
]
).id(`tfg:tfc/filling/${material.getName()}_chisel_head_mold`)
event.recipes.create.filling(
Item.of('tfc:ceramic/chisel_head_mold', getFillingNBT(outputMaterial, 144)),
[
Fluid.of(outputMaterial.getFluid(), 144),
Item.of('tfc:ceramic/chisel_head_mold').strongNBT()
]
).id(`tfg:tfc/filling/${material.getName()}_chisel_head_mold`)
}
}
//#endregion
//#region javelin
if (!onlyHasGTTools) {
// Декрафт инструмента в жидкость
event.recipes.tfc.heating(`tfc:metal/javelin/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
.useDurability(true)
.id(`tfc:heating/metal/${material.getName()}_javelin`)
// Декрафт инструмента в жидкость
event.recipes.tfc.heating(`tfc:metal/javelin/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
.useDurability(true)
.id(`tfc:heating/metal/${material.getName()}_javelin`)
// Декрафт оголовья в жидкость
event.recipes.tfc.heating(`tfc:metal/javelin_head/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
.id(`tfc:heating/metal/${material.getName()}_javelin_head`)
// Декрафт оголовья в жидкость
event.recipes.tfc.heating(`tfc:metal/javelin_head/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
.id(`tfc:heating/metal/${material.getName()}_javelin_head`)
// Металл + Форма -> Оголовье
if (material.hasFlag(TFGMaterialFlags.CAN_BE_UNMOLDED)) {
event.recipes.tfc.casting(`tfc:metal/javelin_head/${material.getName()}`, 'tfc:ceramic/javelin_head_mold', Fluid.of(outputMaterial.getFluid(), 144), 1)
.id(`tfc:casting/${material.getName()}_javelin_head`)
// Металл + Форма -> Оголовье
if (material.hasFlag(TFGMaterialFlags.CAN_BE_UNMOLDED)) {
event.recipes.tfc.casting(`tfc:metal/javelin_head/${material.getName()}`, 'tfc:ceramic/javelin_head_mold', Fluid.of(outputMaterial.getFluid(), 144), 1)
.id(`tfc:casting/${material.getName()}_javelin_head`)
event.recipes.create.filling(
Item.of('tfc:ceramic/javelin_head_mold', getFillingNBT(outputMaterial, 144)),
[
Fluid.of(outputMaterial.getFluid(), 144),
Item.of('tfc:ceramic/javelin_head_mold').strongNBT()
]
).id(`tfg:tfc/filling/${material.getName()}_javelin_head_mold`)
event.recipes.create.filling(
Item.of('tfc:ceramic/javelin_head_mold', getFillingNBT(outputMaterial, 144)),
[
Fluid.of(outputMaterial.getFluid(), 144),
Item.of('tfc:ceramic/javelin_head_mold').strongNBT()
]
).id(`tfg:tfc/filling/${material.getName()}_javelin_head_mold`)
}
}
//#endregion
}
}

5
kubejs/server_scripts/tfc/recipes.metals.js
View File

@@ -15,6 +15,11 @@ function registerTFCMetalsRecipes(event) {
TFC.alloyPart('tfc:cast_iron', 0.45, 0.55)
]).id('tfg:alloy/tin_alloy')
event.recipes.tfc.alloy('tfg:invar', [
TFC.alloyPart('tfc:nickel', 0.60, 0.70),
TFC.alloyPart('tfc:cast_iron', 0.30, 0.40)
]).id('tfg:alloy/invar')
//#endregion

3
kubejs/server_scripts/tfc/tags.js
View File

@@ -73,6 +73,8 @@ const registerTFCItemTags = (event) => {
event.add('tfc:pileable_sheets', '#forge:plates')
event.add('tfc:pileable_double_ingots', 'gtceu:tin_alloy_double_ingot')
event.add('tfc:pileable_double_ingots', 'gtceu:red_alloy_double_ingot')
event.add('tfc:pileable_double_ingots', 'gtceu:lead_double_ingot')
event.add('tfc:pileable_double_ingots', 'gtceu:invar_double_ingot')
// Рыба
event.add('minecraft:fishes', 'tfc:food/calamari')
@@ -487,6 +489,7 @@ const registerTFCFluidTags = (event) => {
event.add('tfc:usable_in_ingot_mold', 'gtceu:red_alloy')
event.add('tfc:usable_in_ingot_mold', 'gtceu:tin_alloy')
event.add('tfc:usable_in_ingot_mold', 'gtceu:lead')
event.add('tfc:usable_in_ingot_mold', 'gtceu:invar')
event.add('tfc:usable_in_bell_mold', 'gtceu:bronze')
event.add('tfc:usable_in_bell_mold', 'gtceu:gold')

2
kubejs/startup_scripts/gtceu/machines.js
View File

@@ -186,7 +186,7 @@ const registerGTCEuMachines = (event) => {
.where('C', Predicates.blockTag($Tags.block("tfc:bloomery_insulation")))
.where('F', Predicates.blocks(GTBlocks.FIREBOX_BRONZE.get())
.or(Predicates.abilities(PartAbility.STEAM).setExactLimit(1)))
.where('E', Predicates.abilities(PartAbility.STEAM_IMPORT_ITEMS).setExactLimit(1)
.where('E', Predicates.abilities(PartAbility.STEAM_IMPORT_ITEMS).setMaxGlobalLimited(2)
.or(Predicates.abilities(PartAbility.STEAM_EXPORT_ITEMS).setExactLimit(1))
.or(Predicates.blockTag($Tags.block("tfc:bloomery_insulation"))))
.where('#', Predicates.air())

2
kubejs/startup_scripts/gtceu/materials.js
View File

@@ -134,6 +134,7 @@ const registerGTCEuMaterialModification = (event) => {
GTMaterials.RedAlloy.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(570, 650, 740, 2));
GTMaterials.TinAlloy.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1000, 1100, 1250, 3));
GTMaterials.Lead.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(170, 250, 330, 2));
GTMaterials.Invar.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(896, 1195, 1494, 3));
GTMaterials.Gold.addFlags(GENERATE_BELL);
@@ -185,6 +186,7 @@ const registerGTCEuMaterialModification = (event) => {
GTMaterials.RedAlloy.addFlags(GENERATE_DOUBLE_INGOTS, GENERATE_SMALL_GEAR);
GTMaterials.TinAlloy.addFlags(GENERATE_DOUBLE_INGOTS);
GTMaterials.Lead.addFlags(GENERATE_DOUBLE_INGOTS);
GTMaterials.Invar.addFlags(GENERATE_DOUBLE_INGOTS, HAS_TFC_TOOL);
//
// /* Superconductors */
GTMaterials.ManganesePhosphide.addFlags(GENERATE_FINE_WIRE);