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

Add Large boilers and repair kit to dev (#3395)

Browse Source 
* boiler and repair kit (#3367)

* boiler and repair kit

* update pakku

* fix recipe id

* fixes

* fix duplicate on server

* add boiler stuffs

* Repair Kit and Boilers

* bug

* more fixes

* more fixes

* Small tweaks and increase cost Steel Pipe Casing

* We gucci (#3387)

* fix

* Add a way to craft repair kit

* add recipes for boiler

* hv dynamo hatch and new recipes

* add depreciated

* Add repair kit textures and modify recipes for LST

* add langfile

* missing langfile

* Add new quests

* fix repair kit texture

* add unfired repair kit

* fix typo

* fixes
This commit is contained in:
TomPlop
2026-03-13 16:32:00 -04:00
committed by GitHub
parent 411fbbd248
commit eff455714c
28 changed files with 3832 additions and 3293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@@ -8,6 +8,11 @@
- Phantom Silk now counts as dark cloth instead of light cloth for the sewing table (#3376) @Pyritie
- New textures for the blue steel diving equipment to match the blue steel armor (#3385) @Facundo46
- TFC jams can now also use honey instead of only sugars (#3362) @SakuraKitsurugi
- Recipe of Steel Pipe Casing and Magnalium Turbine Casing changed @TomPlop
- Added the new Large Steam Turbine that has a base production of 2048 Eu/t but can't accept higher Rotors that EV @TomPlop
- Added the Repair Kit so you can finally repair your Gregtech Tools @TomPlop
- Changed the HV Dynamo Hatch to be craftable before the Cleanroom @TomPlop
- Added a 16A HV Dynamo Hatch @TomPlop
### Bug fixes
- Fixed EMI bookmarked recipe tooltip when GT machine UI is open @Mqrius
- Fixed the "is supported/won't collapse" tooltips to work with the collapsible performance improvements in the previous update @Mqrius

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

@@ -397,7 +397,7 @@
subtitle: "{quests.gregtech_energy.lst.subtitle}"
tasks: [{
id: "2151B2C87E5AC2FD"
item: "gtceu:steam_large_turbine"
item: "tfg:large_steam_turbine"
type: "item"
}]
title: "{quests.gregtech_energy.lst.title}"
@@ -842,12 +842,12 @@
id: "1A0672F4FA88DF74"
subtitle: "{quests.gregtech_energy.hv_single_generator.subtitle}"
tasks: [{
id: "76DE486034E2F61D"
id: "0C7F36036C137495"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(gtceu:hv_steam_turbine)item(gtceu:hv_gas_turbine)item(gtceu:hv_combustion))"
"ftbfiltersystem:filter": "or(item(gtceu:hv_combustion)item(gtceu:hv_gas_turbine))"
}
}
title: "{quests.gregtech_energy.hv_single_generator.task}"

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

@@ -116,8 +116,8 @@
type: "item"
}]
title: "{quests.high_voltage.chem_bath.title}"
x: -2.5d
y: 0.5d
x: -1.5d
y: 1.5d
}
{
dependencies: ["52AD30F04DD5A812"]
@@ -202,7 +202,6 @@
{
dependencies: ["52AD30F04DD5A812"]
description: ["{quests.high_voltage.assembler.desc}"]
hide_dependency_lines: true
icon: "gtceu:hv_assembler"
id: "16B735F9C391D260"
tasks: [{
@@ -1922,7 +1921,7 @@
item: "tfg:copper_bonded_al2o3_pcb"
type: "item"
}]
x: -2.5d
x: -1.5d
y: 3.0d
}
{
@@ -1938,6 +1937,44 @@
x: 17.5d
y: -4.0d
}
{
dependencies: ["52AD30F04DD5A812"]
description: [
"{quests.high_voltage.large_steam_turbine.desc}"
""
"{ \"text\": \"▶▶▶▶▶▶▶\", \"underlined\": \"true\", \"clickEvent\": { \"action\": \"change_page\", \"value\": \"20DA81038C507C90\" } }"
]
icon: "tfg:large_steam_turbine"
id: "0278967C0472ECE6"
optional: true
subtitle: "{quests.high_voltage.large_steam_turbine.subtitle}"
tasks: [
{
id: "2B287AB098A64944"
item: "tfg:large_steam_turbine"
type: "item"
}
{
id: "0AA564036AD4CC59"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(gtceu:hv_energy_output_hatch)item(gtceu:hv_energy_output_hatch_4a)item(gtceu:hv_energy_output_hatch_16a))"
}
}
title: "{quests.high_voltage.large_steam_turbine.task}"
type: "item"
}
{
id: "6B7F5C0C7C47E362"
item: "gtceu:hv_rotor_holder"
type: "item"
}
]
x: -2.5d
y: -1.0d
}
]
subtitle: ["{quests.high_voltage.subtitle}"]
title: "{quests.high_voltage}"

20
config/ftbquests/quests/chapters/mv__medium_voltage.snbt
View File

@@ -2081,6 +2081,26 @@
x: -5.0d
y: 6.0d
}
{
dependencies: ["5DD01CBADFFF3571"]
description: [
"{quests.medium_voltage.large_steel_boiler.desc.1}"
"{@pagebreak}"
"{quests.medium_voltage.large_steel_boiler.desc.2}"
"{@pagebreak}"
"{quests.medium_voltage.large_steel_boiler.desc.3}"
]
id: "6DCF1E5EFFE24901"
shape: "heart"
subtitle: "{quests.medium_voltage.large_steel_boiler.subtitle}"
tasks: [{
id: "1041BC3BF3B54F2E"
item: "tfg:large_steel_boiler"
type: "item"
}]
x: 3.0d
y: 11.5d
}
]
subtitle: ["{quests.medium_voltage.subtitle}"]
title: "{quests.medium_voltage}"

21
config/ftbquests/quests/chapters/questssteam_age.snbt
View File

@@ -2029,6 +2029,27 @@
x: -15.5d
y: 13.5d
}
{
dependencies: ["2C35D4E01AEC02AA"]
description: [
"{quests.steam_age.large_bronze_boiler.desc.1}"
"{@pagebreak}"
"{quests.steam_age.large_bronze_boiler.desc.2}"
"{@pagebreak}"
"{quests.steam_age.large_bronze_boiler.desc.3}"
]
id: "1F7AAF65CC0A4ADF"
shape: "heart"
size: 1.5d
subtitle: "{quests.steam_age.large_bronze_boiler.subtitle}"
tasks: [{
id: "6D8BDDF41B0A5384"
item: "tfg:large_bronze_boiler"
type: "item"
}]
x: -9.0d
y: 16.0d
}
]
subtitle: ["{quests.steam_age.subtitle}"]
title: "{quests.steam_age}"

28
kubejs/assets/gtceu/blockstates/hv_energy_output_hatch_16a.json Normal file
View File

@@ -0,0 +1,28 @@
{
"variants": {
"facing=down": {
"model": "gtceu:block/machine/hv_energy_output_hatch_16a",
"x": 90
},
"facing=east": {
"model": "gtceu:block/machine/hv_energy_output_hatch_16a",
"y": 90
},
"facing=north": {
"model": "gtceu:block/machine/hv_energy_output_hatch_16a"
},
"facing=south": {
"model": "gtceu:block/machine/hv_energy_output_hatch_16a",
"y": 180
},
"facing=up": {
"gtceu:z": 180,
"model": "gtceu:block/machine/hv_energy_output_hatch_16a",
"x": 270
},
"facing=west": {
"model": "gtceu:block/machine/hv_energy_output_hatch_16a",
"y": 270
}
}
}

3
kubejs/assets/gtceu/lang/en_us.json
View File

@@ -405,6 +405,7 @@
"block.gtceu.hv_electromagnetic_separator": "§6Advanced Electromagnetic Separator II§r",
"block.gtceu.hv_energy_input_hatch": "§6HV Energy Hatch",
"block.gtceu.hv_energy_output_hatch": "§6HV Dynamo Hatch",
"block.gtceu.hv_energy_output_hatch_16a": "§6HV 16A Dynamo Hatch§r",
"block.gtceu.hv_energy_output_hatch_4a": "§6HV 4A Dynamo Hatch§r",
"block.gtceu.hv_extractor": "§6Advanced Extractor II§r",
"block.gtceu.hv_extruder": "§6Advanced Extruder II§r",
@@ -6141,6 +6142,8 @@
"tagprefix.tiny_dust": "Tiny Pile of %s Dust",
"tagprefix.tuff": "Tuff %s Ore",
"tagprefix.turbine_blade": "%s Turbine Blade",
"tagprefix.unfired_repair_kit": "Unfired %s Repair Kit",
"tagprefix.unfited_repair_kit": "Unfired %s Repair Kit",
"tagprefix.wire_cutter_head": "%s Wire Cutter Head",
"tagprefix.wire_gt_double": "2x %s Wire",
"tagprefix.wire_gt_hex": "16x %s Wire",

32
kubejs/assets/gtceu/models/block/machine/hv_energy_output_hatch_16a.json Normal file
View File

@@ -0,0 +1,32 @@
{
"parent": "minecraft:block/block",
"loader": "gtceu:machine",
"machine": "gtceu:hv_energy_output_hatch_16a",
"replaceable_textures": [
"bottom",
"top",
"side"
],
"variants": {
"is_formed=false": {
"model": {
"parent": "gtceu:block/machine/part/energy_output_hatch_16a",
"textures": {
"bottom": "gtceu:block/casings/voltage/hv/bottom",
"side": "gtceu:block/casings/voltage/hv/side",
"top": "gtceu:block/casings/voltage/hv/top"
}
}
},
"is_formed=true": {
"model": {
"parent": "gtceu:block/machine/part/energy_output_hatch_16a",
"textures": {
"bottom": "gtceu:block/casings/voltage/hv/bottom",
"side": "gtceu:block/casings/voltage/hv/side",
"top": "gtceu:block/casings/voltage/hv/top"
}
}
}
}
}

3
kubejs/assets/gtceu/models/item/hv_energy_output_hatch_16a.json Normal file
View File

@@ -0,0 +1,3 @@
{
"parent": "gtceu:block/machine/hv_energy_output_hatch_16a"
}

8
kubejs/assets/gtceu/models/item/material_sets/dull/repair_kit.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/dull/repair_kit_1",
"layer1": "gtceu:item/transparent",
"layer2": "gtceu:item/material_sets/dull/repair_kit_0"
}
}

8
kubejs/assets/gtceu/models/item/material_sets/dull/unfired_repair_kit.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/dull/unfired_repair_kit_1",
"layer1": "gtceu:item/transparent",
"layer2": "gtceu:item/material_sets/dull/unfired_repair_kit_0"
}
}

BIN
kubejs/assets/gtceu/textures/item/material_sets/dull/repair_kit_0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 233 B

BIN
kubejs/assets/gtceu/textures/item/material_sets/dull/repair_kit_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 286 B

BIN
kubejs/assets/gtceu/textures/item/material_sets/dull/unfired_repair_kit_0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 284 B

BIN
kubejs/assets/gtceu/textures/item/material_sets/dull/unfired_repair_kit_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 291 B

6495
kubejs/assets/tfg/lang/en_us.json
View File

File diff suppressed because it is too large Load Diff

2
kubejs/client_scripts/tooltips.js
View File

@@ -452,7 +452,7 @@ const registerTooltips = (event) => {
})
// Deprecated Items
event.addAdvanced(['vintageimprovements:lathe', 'ae2:fe_p2p_tunnel'], (item, advanced, text) => {
event.addAdvanced(['vintageimprovements:lathe', 'ae2:fe_p2p_tunnel', 'gtceu:steam_large_turbine', 'gtceu:bronze_large_boiler', 'gtceu:steel_large_boiler', 'gtceu:titanium_large_boiler', 'gtceu:tungstensteel_large_boiler'], (item, advanced, text) => {
text.add(1, Text.translate('tfg.tooltip.obsolete.depreciated'))
})

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

@@ -78,6 +78,9 @@ const registerGTCEUHeats = (event) => {
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadButcheryKnife, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadMiningHammer, material, tfcProperty, 2.875)
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadSpade, material, tfcProperty, 2.875)
makeItemHeatByTagPrefix(TFGTagPrefix.unfiredRepairKit, material, tfcProperty, 1.875)
makeItemHeatByTagPrefix(TFGTagPrefix.repairKit, material, tfcProperty, 1.875)
makeItemHeatByToolType(GTToolType.SWORD, material, tfcProperty, 1.429)
makeItemHeatByToolType(GTToolType.PICKAXE, material, tfcProperty, 1.429)

17
kubejs/server_scripts/gregtech/recipes.js
View File

@@ -413,4 +413,21 @@ const registerGTCEURecipes = (event) => {
.duration(20*2)
.EUt(GTValues.VA[GTValues.LV])
.circuit(1)
// Increase casing costs
event.replaceInput({ id: 'gtceu:shaped/casing_steel_pipe' }, '#forge:normal_fluid_pipes/steel', '#forge:huge_fluid_pipes/steel')
event.replaceInput({ id: 'gtceu:shaped/casing_steel_pipe' }, '#forge:plates/steel', '#forge:double_plates/steel')
// Modify HV Dynamo Hatch to be craftable before Cleanroom
event.replaceInput({ id: 'gtceu:assembler/dynamo_hatch_hv' }, 'gtceu:lpic_chip', 'gtceu:ulpic_chip')
global.modifyRecipe(event, "gtceu:assembler/dynamo_hatch_hv", {
newId: "gtceu:assembler/dynamo_hatch_hv",
duration: 20 * 10,
eut: GTValues.VA[GTValues.MV]
})
event.replaceInput({ id: 'gtceu:assembler/assembler/dynamo_hatch_hv' }, 'gtceu:lpic_chip', 'gtceu:ulpic_chip')
}

227
kubejs/server_scripts/tfg/equipment/recipes.repair_tools.js Normal file
View File

@@ -0,0 +1,227 @@
// Because it's impossible to delete a GTTools in a shapeless recipe without losing its NBT or even modifying the NBT of the tool by a certain amount we are using a different method.
// This function is used to create recipes for every TFG/GT Tools with their repair kit and the percentage of reperation each kits can do.
// Everytime you craft this recipe the event TFGRepairHelper in TFG Core is trigger and recreate the tool with all its NBT.
// The Bonus is that you can choose the amount of reparation for each type of tools. Also we need 4 functions because GT name for their tools is stupid.
function registerTFGRepairKitRecipes(event) {
const ELECTRIC_TOOLS = ['drill', 'buzzsaw', 'wrench', 'chainsaw', 'wire_cutter', 'screwdriver'];
const MANUAL_TOOLS = ['knife', 'hoe', 'scythe', 'hammer', 'file', 'sword', 'butchery_knife', 'crowbar'];
const ONLY_MANUAL_TOOLS = ['spade', 'pickaxe', 'shovel', 'axe', 'wrench', 'mortar', 'saw', 'screwdriver', 'wire_cutter', 'mining_hammer'];
const ONLY_COLORED_TOOLS = ['buzzsaw'];
function repairElectricTools(namespace, tierMaterial, repairKitMaterial, repairPercent) {
ELECTRIC_TOOLS.forEach(tool => {
let toolId = `${namespace}:${tierMaterial}_${repairKitMaterial}_${tool}`;
let repairKitId = `${namespace}:repair_kit_${repairKitMaterial}`;
if (!Item.of(toolId).isEmpty() && !Item.of(repairKitId).isEmpty()) {
event.recipes.tfc.no_remainder_shapeless_crafting(
event.shapeless(
toolId,
[
toolId,
Item.of(repairKitId, `{RepairPercent:${repairPercent}f}`)
]
)
);
}
});
}
function repairManualTools(namespace, material, repairPercent) {
MANUAL_TOOLS.forEach(tool => {
let toolId = `${namespace}:${material}_${tool}`;
let repairKitId = `${namespace}:repair_kit_${material}`;
if (!Item.of(toolId).isEmpty() && !Item.of(repairKitId).isEmpty()) {
event.recipes.tfc.no_remainder_shapeless_crafting(
event.shapeless(
toolId,
[
toolId,
Item.of(repairKitId, `{RepairPercent:${repairPercent}f}`)
]
)
);
}
});
}
function repairOnlyManualTools(namespace, material, repairPercent) {
ONLY_MANUAL_TOOLS.forEach(tool => {
let toolId = `${namespace}:${material}_${tool}`;
let repairKitId = `${namespace}:repair_kit_${material}`;
if (!Item.of(toolId).isEmpty() && !Item.of(repairKitId).isEmpty()) {
event.recipes.tfc.no_remainder_shapeless_crafting(
event.shapeless(
toolId,
[
toolId,
Item.of(repairKitId, `{RepairPercent:${repairPercent}f}`)
]
)
);
}
});
}
function repairColoredSteel(namespace, material, repairPercent) {
ONLY_COLORED_TOOLS.forEach(tool => {
let toolId = `${namespace}:${material}_${tool}`;
let repairKitId = `${namespace}:repair_kit_${material}`;
if (!Item.of(toolId).isEmpty() && !Item.of(repairKitId).isEmpty()) {
event.recipes.tfc.no_remainder_shapeless_crafting(
event.shapeless(
toolId,
[
toolId,
Item.of(repairKitId, `{RepairPercent:${repairPercent}f}`)
]
)
);
}
});
}
// 'namespace':'tier if electric'_material' Amount repaired in percentage
repairColoredSteel('gtceu', 'red_steel', 0.25);
repairColoredSteel('gtceu', 'blue_steel', 0.25);
repairElectricTools('tfg', 'hv', 'boron_carbide', 0.25);
repairElectricTools('tfg', 'mv', 'diamond_tipped_mo_50_re', 0.25);
repairElectricTools('gtceu', 'iv', 'hsse', 0.25);
repairElectricTools('gtceu', 'iv', 'naquadah_alloy', 0.25);
repairElectricTools('gtceu', 'iv', 'duranium', 0.25);
repairElectricTools('gtceu', 'ev', 'ostrum_iodide', 0.25);
repairElectricTools('gtceu', 'ev', 'tungsten_carbide', 0.25);
repairElectricTools('gtceu', 'hv', 'ultimet', 0.25);
repairElectricTools('gtceu', 'lv', 'blue_steel', 0.25);
repairElectricTools('gtceu', 'lv', 'red_steel', 0.25);
repairElectricTools('gtceu', 'mv', 'vanadium_steel', 0.25);
repairManualTools('tfg', 'boron_carbide', 0.25);
repairManualTools('tfg', 'diamond_tipped_mo_50_re', 0.25);
repairManualTools('gtceu', 'hsse', 0.25);
repairManualTools('gtceu', 'naquadah_alloy', 0.25);
repairManualTools('gtceu', 'duranium', 0.25);
repairManualTools('gtceu', 'ostrum_iodide', 0.25);
repairManualTools('gtceu', 'tungsten_carbide', 0.25);
repairManualTools('gtceu', 'ultimet', 0.25);
repairManualTools('gtceu', 'blue_steel', 0.25);
repairManualTools('gtceu', 'red_steel', 0.25);
repairManualTools('gtceu', 'vanadium_steel', 0.25);
repairOnlyManualTools('gtceu', 'black_bronze', 0.25);
repairOnlyManualTools('gtceu', 'black_steel', 0.25);
repairOnlyManualTools('gtceu', 'steel', 0.25);
repairOnlyManualTools('gtceu', 'wrought_iron', 0.25);
repairOnlyManualTools('gtceu', 'bronze', 0.25);
repairOnlyManualTools('gtceu', 'copper', 0.25);
repairOnlyManualTools('gtceu', 'bismuth_bronze', 0.25);
repairOnlyManualTools('gtceu', 'blue_steel', 0.25);
repairOnlyManualTools('gtceu', 'red_steel', 0.25);
repairManualTools('gtceu', 'black_bronze', 0.25);
repairManualTools('gtceu', 'black_steel', 0.25);
repairManualTools('gtceu', 'steel', 0.25);
repairManualTools('gtceu', 'wrought_iron', 0.25);
repairManualTools('gtceu', 'bronze', 0.25);
repairManualTools('gtceu', 'copper', 0.25);
repairManualTools('gtceu', 'bismuth_bronze', 0.25);
//#region Generate recipe for Repair Kit
/*
Okay maintenant j'ai besoin de faire la recette pour fabriquer les unfired repair kit
Je voudrais les faire à partir de
#tfg:stone_dusts
'minecraft:clay_ball'
'#forge:dusts/${material}'
dans une shapeless recipe avec 'gtceu:brick_wooden_form' qui ne serait pas consommer
*/
function materialUnfiredRepairKit(namespace, material) {
event.shapeless(
Item.of(`${namespace}:unfired_repair_kit_${material}`, 16), // arg 1: output
[
'gtceu:brick_wooden_form',
'#tfg:stone_dusts',
'minecraft:clay_ball',
`#forge:dusts/${material}`
]
)
}
materialUnfiredRepairKit('tfg', 'boron_carbide');
materialUnfiredRepairKit('tfg', 'diamond_tipped_mo_50_re');
materialUnfiredRepairKit('gtceu', 'hsse');
materialUnfiredRepairKit('gtceu', 'naquadah_alloy');
materialUnfiredRepairKit('gtceu', 'duranium');
materialUnfiredRepairKit('gtceu', 'ostrum_iodide');
materialUnfiredRepairKit('gtceu', 'tungsten_carbide');
materialUnfiredRepairKit('gtceu', 'ultimet');
materialUnfiredRepairKit('gtceu', 'blue_steel');
materialUnfiredRepairKit('gtceu', 'red_steel');
materialUnfiredRepairKit('gtceu', 'vanadium_steel');
materialUnfiredRepairKit('gtceu', 'black_bronze');
materialUnfiredRepairKit('gtceu', 'black_steel');
materialUnfiredRepairKit('gtceu', 'steel');
materialUnfiredRepairKit('gtceu', 'wrought_iron');
materialUnfiredRepairKit('gtceu', 'bronze');
materialUnfiredRepairKit('gtceu', 'copper');
materialUnfiredRepairKit('gtceu', 'bismuth_bronze');
function materialPrimalKit(namespace, repairKitMaterial) {
event.recipes.tfc.heating(`${namespace}:unfired_repair_kit_${repairKitMaterial}`, 1399)
.resultItem(`${namespace}:repair_kit_${repairKitMaterial}`)
.id(`tfg:heating/repair_kit_${namespace}_${repairKitMaterial}`)
}
/*
function materialPrimalKit(namespace, repairKitMaterial) {
event.recipes.tfc.anvil(
`16x ${namespace}:repair_kit_${repairKitMaterial}`,
`#forge:ingots/${repairKitMaterial}`,
['hit_last', 'hit_second_last', 'hit_third_last']
)
.id(`tfg:anvil/repair_kit_${repairKitMaterial}`);
}
*/
materialPrimalKit('gtceu', 'black_bronze');
materialPrimalKit('gtceu', 'black_steel');
materialPrimalKit('gtceu', 'steel');
materialPrimalKit('gtceu', 'wrought_iron');
materialPrimalKit('gtceu', 'bronze');
materialPrimalKit('gtceu', 'copper');
materialPrimalKit('gtceu', 'bismuth_bronze');
materialPrimalKit('gtceu', 'blue_steel');
materialPrimalKit('gtceu', 'red_steel');
function materialElectricKit(namespace, repairKitMaterial) {
event.smelting(
Item.of(`${namespace}:repair_kit_${repairKitMaterial}`),
`${namespace}:unfired_repair_kit_${repairKitMaterial}`
)
.id(`tfg:smelting/repair_kit_${namespace}_${repairKitMaterial}`)
}
materialElectricKit('tfg', 'boron_carbide');
materialElectricKit('tfg', 'diamond_tipped_mo_50_re');
materialElectricKit('gtceu', 'hsse');
materialElectricKit('gtceu', 'naquadah_alloy');
materialElectricKit('gtceu', 'duranium');
materialElectricKit('gtceu', 'ostrum_iodide');
materialElectricKit('gtceu', 'tungsten_carbide');
materialElectricKit('gtceu', 'ultimet');
materialElectricKit('gtceu', 'blue_steel');
materialElectricKit('gtceu', 'red_steel');
materialElectricKit('gtceu', 'vanadium_steel');
materialElectricKit('gtceu', 'black_bronze');
materialElectricKit('gtceu', 'black_steel');
materialElectricKit('gtceu', 'steel');
materialElectricKit('gtceu', 'wrought_iron');
materialElectricKit('gtceu', 'bronze');
materialElectricKit('gtceu', 'copper');
materialElectricKit('gtceu', 'bismuth_bronze');
};

42
kubejs/server_scripts/tfg/machines/recipes.multiblocks.js
View File

@@ -282,5 +282,47 @@ function registerTFGMultiblockRecipes(event) {
.duration(300)
.EUt(GTValues.VA[GTValues.EV])
.circuit(2)
// Large Bronze Boiler
event.recipes.gtceu.shaped('tfg:large_bronze_boiler', [
'ABA',
'BCB',
'ABA'
], {
A: '#forge:quadruple_wires/tin',
B: '#gtceu:circuits/ulv',
C: Item.of('gtceu:bronze_firebox_casing')
}).addMaterialInfo().id('tfg:shaped/large_bronze_boiler')
// Large Steel Boiler
event.recipes.gtceu.shaped('tfg:large_steel_boiler', [
'ABA',
'BCB',
'DBD'
], {
A: '#forge:single_cables/copper',
B: '#gtceu:circuits/mv',
C: Item.of('gtceu:steel_firebox_casing'),
D: '#gtceu:capacitors'
}).addMaterialInfo().id('tfg:shaped/large_steel_boiler')
// Large Steam Turbine
event.recipes.gtceu.shaped('tfg:large_steam_turbine', [
'ABE',
'BCB',
'DBD'
], {
A: Item.of('gtceu:red_steel_gear'),
B: '#gtceu:circuits/hv',
C: Item.of('gtceu:hv_machine_hull'),
D: Item.of('#forge:huge_fluid_pipes/stainless_steel'),
E: Item.of('gtceu:blue_steel_gear')
}).addMaterialInfo().id('tfg:shaped/large_steam_turbine')
event.replaceInput({ id: 'gtceu:shaped/casing_steel_turbine_casing'}, 'gtceu:magnalium_plate', 'gtceu:double_magnalium_plate')
event.replaceInput({ id: 'gtceu:assembler/casing_steel_turbine'}, 'gtceu:magnalium_plate', 'gtceu:double_magnalium_plate')
}

7
kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js
View File

@@ -882,6 +882,8 @@ function registerTFGNuclearRecipes(event) {
.outputFluids(Fluid.of('tfg:boron_enriched_coolant', 3600))
.blastFurnaceTemp(2000)
.addData("hb_energy", 30)
.duration(5*20)
.hideDuration(true);
/*
event.recipes.deafission.hb_export('tfg:boron_coolant_to_dense_steam')
.inputFluids(Fluid.of('gtceu:distilled_water', 7200))
@@ -895,13 +897,16 @@ function registerTFGNuclearRecipes(event) {
.outputFluids(Fluid.of('gtceu:dense_steam', 115200))
.blastFurnaceTemp(1000)
.addData("hb_energy", 40)
//.circuit(2)
.duration(5*20)
.hideDuration(true);
event.recipes.deafission.hb_import('tfg:dense_steam')
.inputFluids(Fluid.of('gtceu:dense_steam', 20))
.outputFluids(Fluid.of('minecraft:water', 20))
.blastFurnaceTemp(1000)
.addData("hb_energy", 20)
.duration(5*20)
.hideDuration(true);
//#endregion

63
kubejs/server_scripts/tfg/powergen/recipes.boiler.js
View File

@@ -108,6 +108,10 @@ function registerTFGBoilerRecipes(event) {
event.remove({ id: "gtceu:large_boiler/gtceu_oil" })
event.remove({ id: "gtceu:large_boiler/gtceu_oil_heavy" })
event.remove({ id: "gtceu:large_boiler/gtceu_fish_oil" })
event.remove({ id: "gtceu:large_boiler/gtceu_creosote" })
event.remove({ id: "gtceu:large_boiler/wood_gas" })
// This generates both a small boiler and large boiler recipe. Remove it above to avoid a duplicate
event.recipes.gtceu.steam_boiler('tfg:oil')
.inputFluids(Fluid.of('gtceu:oil', 200))
@@ -165,6 +169,65 @@ function registerTFGBoilerRecipes(event) {
.dimension('minecraft:overworld')
.dimension('minecraft:the_nether')
// Super Fuel Boiler
// Weird test
event.recipes.gtceu.super_boiler('tfg:syngas_fuel_binder')
.itemInputs(Item.of('gtceu:bio_chaff', 1))
.inputFluids(Fluid.of('tfg:syngas', 20000))
.duration(20*150)
.dimension('minecraft:overworld')
.dimension('minecraft:the_nether')
event.recipes.gtceu.super_boiler('tfg:syngas_fuel')
.itemInputs(Item.of('#minecraft:coals', 1))
.inputFluids(Fluid.of('tfg:syngas', 20000*4))
.duration(20*150)
.dimension('minecraft:overworld')
.dimension('minecraft:the_nether')
event.recipes.gtceu.super_boiler('tfg:light_fuel_binder')
.itemInputs(Item.of('gtceu:bio_chaff', 1))
.inputFluids(Fluid.of('gtceu:light_fuel', 20000))
.duration(20*150)
.dimension('minecraft:overworld')
.dimension('minecraft:the_nether')
event.recipes.gtceu.super_boiler('tfg:light_fuel')
.itemInputs(Item.of('minecraft:charcoal', 1))
.inputFluids(Fluid.of('gtceu:light_fuel', 20000*4))
.duration(20*150)
.dimension('minecraft:overworld')
.dimension('minecraft:the_nether')
event.recipes.gtceu.super_boiler('tfg:heavy_fuel_binder')
.itemInputs(Item.of('gtceu:bio_chaff', 1))
.inputFluids(Fluid.of('gtceu:heavy_fuel', 20000))
.duration(20*150)
.dimension('minecraft:overworld')
.dimension('minecraft:the_nether')
event.recipes.gtceu.super_boiler('tfg:heavy_fuel')
.itemInputs(Item.of('minecraft:charcoal', 1))
.inputFluids(Fluid.of('gtceu:heavy_fuel', 20000*4))
.duration(20*150)
.dimension('minecraft:overworld')
.dimension('minecraft:the_nether')
event.recipes.gtceu.super_boiler('tfg:naphtha_binder')
.itemInputs(Item.of('gtceu:bio_chaff', 1))
.inputFluids(Fluid.of('gtceu:naphtha', 20000))
.duration(20*150)
.dimension('minecraft:overworld')
.dimension('minecraft:the_nether')
event.recipes.gtceu.super_boiler('tfg:naphtha_fuel')
.itemInputs(Item.of('minecraft:charcoal', 1))
.inputFluids(Fluid.of('gtceu:naphtha', 20000*4))
.duration(20*150)
.dimension('minecraft:overworld')
.dimension('minecraft:the_nether')
// fish oil extraction
event.recipes.gtceu.extractor(`tfg:fish_oil`)
.itemInputs('#minecraft:fishes')

2
kubejs/server_scripts/tfg/recipes.js
View File

@@ -101,5 +101,7 @@ const registerTFGRecipes = (event) => {
registerTFGMVMaterialRecipes(event)
registerTFGGemSlurriesProcessing(event)
registerTFGRepairKitRecipes(event)
registerTFGMaterialRemovePipesRecipes(event)
}

1
kubejs/server_scripts/tfg/tags.js
View File

@@ -153,6 +153,7 @@ const registerTFGFluidTags = (event) => {
event.add('tfg:clean_water', 'tfc:spring_water')
event.add('tfg:water_boiler', 'minecraft:water')
event.add('tfg:water_boiler_t2', 'gtceu:distilled_water')
event.add('tfc:any_water', 'tfg:semiheavy_ammoniacal_water')
event.add('tfc:hydrating', 'tfg:semiheavy_ammoniacal_water')

4
kubejs/startup_scripts/greate/material_modification.js
View File

@@ -7,7 +7,9 @@ const registerGreateMaterialModification = (event) => {
// Add flags
$GreateMaterials.RoseQuartz.addFlags(
GTMaterialFlags.GENERATE_LENS
GTMaterialFlags.GENERATE_LENS,
GTMaterialFlags.HIGH_SIFTER_OUTPUT,
GTMaterialFlags.CRYSTALLIZABLE
);
// Material composition

2
kubejs/startup_scripts/tfg/materials/material_modification.ores.js
View File

@@ -10,7 +10,7 @@ function registerTFGOresMaterialModification(event) {
GTMaterials.Borax.setProperty(PropertyKey.ORE, new $ORE_PROPERTY());
let rose_quartz = $GreateMaterials.RoseQuartz;
rose_quartz.setProperty(PropertyKey.ORE, new $ORE_PROPERTY());
rose_quartz.setProperty(PropertyKey.ORE, new $ORE_PROPERTY(6, 1, true));
rose_quartz.getProperty(PropertyKey.ORE).setOreByProducts(rose_quartz, GTMaterials.Redstone, rose_quartz);
// Change byproducts so you can't get certus from normal quartzite

81
kubejs/startup_scripts/tfg/materials/material_modification.tools.js
View File

@@ -11,7 +11,8 @@ function registerTFGToolMaterialModification(event) {
GENERATE_DRILL_HEAD,
GENERATE_CHAINSAW_HEAD,
GENERATE_WRENCH_HEAD,
GENERATE_WIRE_CUTTER_HEAD
GENERATE_WIRE_CUTTER_HEAD,
GENERATE_REPAIR_KIT
} = TFGMaterialFlags;
const $GTToolType = Java.loadClass('com.gregtechceu.gtceu.api.item.tool.GTToolType')
@@ -203,9 +204,9 @@ function registerTFGToolMaterialModification(event) {
// Balance Tools
const DURABILITY_MULTIPLIER = 6;
const DURABILITY_MULTIPLIER = 5;
GTMaterials.Stone.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(1.2, 1.0, 8 * DURABILITY_MULTIPLIER, 1, [
GTMaterials.Stone.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(1.2, 1.0, 8 * 6, 1, [
GTToolType.AXE,
GTToolType.HARD_HAMMER,
GTToolType.HOE,
@@ -237,74 +238,74 @@ function registerTFGToolMaterialModification(event) {
// ULV
// Havest speed, attack damage, durability, harvest level, tool types
GTMaterials.Copper.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD);
GTMaterials.Copper.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_REPAIR_KIT);
GTMaterials.Copper.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(2.0, 3.5, 132 * DURABILITY_MULTIPLIER, 2, ULVTools).build());
GTMaterials.BismuthBronze.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD);
GTMaterials.BismuthBronze.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_REPAIR_KIT);
GTMaterials.BismuthBronze.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(2.7, 4.0, 195 * DURABILITY_MULTIPLIER, 2, ULVTools.concat(GTToolType.MORTAR)).build());
GTMaterials.BlackBronze.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD);
GTMaterials.BlackBronze.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_REPAIR_KIT);
GTMaterials.BlackBronze.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(3.1, 5.0, 188 * DURABILITY_MULTIPLIER, 2, ULVTools.concat(GTToolType.MORTAR)).build());
GTMaterials.Bronze.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD);
GTMaterials.Bronze.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_REPAIR_KIT);
GTMaterials.Bronze.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(3, 4, 212 * DURABILITY_MULTIPLIER, 2, ULVTools.concat(GTToolType.MORTAR)).build());
GTMaterials.WroughtIron.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD);
GTMaterials.WroughtIron.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_REPAIR_KIT);
GTMaterials.WroughtIron.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(4, 4, 384 * DURABILITY_MULTIPLIER, 2, ULVTools.concat(GTToolType.MORTAR)).build());
GTMaterials.Steel.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD);
GTMaterials.Steel.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_REPAIR_KIT);
GTMaterials.Steel.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(5, 5, 512 * DURABILITY_MULTIPLIER, 3, ULVTools.concat(GTToolType.MORTAR)).build());
GTMaterials.DamascusSteel.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(6, 6, 1024 * DURABILITY_MULTIPLIER, 3, ULVTools.concat(GTToolType.MORTAR)).build());
GTMaterials.BlackSteel.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD);
GTMaterials.BlackSteel.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_REPAIR_KIT);
GTMaterials.BlackSteel.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(6, 5.5, 612 * DURABILITY_MULTIPLIER, 3, ULVTools.concat(GTToolType.MORTAR)).build());
// LV
GTMaterials.BlueSteel.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_BUZZSAW_BLADE, GENERATE_DRILL_HEAD, GENERATE_CHAINSAW_HEAD);
GTMaterials.BlueSteel.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_BUZZSAW_BLADE, GENERATE_DRILL_HEAD, GENERATE_CHAINSAW_HEAD, GENERATE_REPAIR_KIT);
GTMaterials.BlueSteel.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(9, 5, 804 * DURABILITY_MULTIPLIER, 3, LVTools).build());
GTMaterials.RedSteel.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_BUZZSAW_BLADE, GENERATE_DRILL_HEAD, GENERATE_CHAINSAW_HEAD);
GTMaterials.RedSteel.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_BUZZSAW_BLADE, GENERATE_DRILL_HEAD, GENERATE_CHAINSAW_HEAD, GENERATE_REPAIR_KIT);
GTMaterials.RedSteel.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(6, 7.5, 1560 * DURABILITY_MULTIPLIER, 3, LVTools).build());
// MV
// Diamond Tipped Tools - 11 - 6 - 1024 - 3
GTMaterials.VanadiumSteel.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_BUZZSAW_BLADE, GENERATE_DRILL_HEAD, GENERATE_CHAINSAW_HEAD);
GTMaterials.VanadiumSteel.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_BUZZSAW_BLADE, GENERATE_DRILL_HEAD, GENERATE_CHAINSAW_HEAD, GENERATE_REPAIR_KIT);
GTMaterials.VanadiumSteel.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(5, 8, 2048 * DURABILITY_MULTIPLIER, 3, MVTools).build());
TFGHelpers.getMaterial('diamond_tipped_mo_50_re').addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_BUZZSAW_BLADE, GENERATE_DRILL_HEAD, GENERATE_CHAINSAW_HEAD)
TFGHelpers.getMaterial('diamond_tipped_mo_50_re').addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_BUZZSAW_BLADE, GENERATE_DRILL_HEAD, GENERATE_CHAINSAW_HEAD, GENERATE_REPAIR_KIT)
TFGHelpers.getMaterial('diamond_tipped_mo_50_re').setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(11, 6, 1024 * DURABILITY_MULTIPLIER, 3, MVTools).build());
// HV
GTMaterials.Ultimet.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_BUZZSAW_BLADE, GENERATE_DRILL_HEAD, GENERATE_CHAINSAW_HEAD);
GTMaterials.Ultimet.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_BUZZSAW_BLADE, GENERATE_DRILL_HEAD, GENERATE_CHAINSAW_HEAD, GENERATE_REPAIR_KIT);
GTMaterials.Ultimet.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(16, 9, 1678 * DURABILITY_MULTIPLIER, 4, HVTools).build());
TFGHelpers.getMaterial('boron_carbide').addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_BUZZSAW_BLADE, GENERATE_DRILL_HEAD, GENERATE_CHAINSAW_HEAD);
TFGHelpers.getMaterial('boron_carbide').addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_BUZZSAW_BLADE, GENERATE_DRILL_HEAD, GENERATE_CHAINSAW_HEAD, GENERATE_REPAIR_KIT);
TFGHelpers.getMaterial('boron_carbide').setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(5, 11, 3678 * DURABILITY_MULTIPLIER, 3, HVTools).build());
// EV
GTMaterials.TungstenCarbide.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_BUZZSAW_BLADE, GENERATE_DRILL_HEAD, GENERATE_CHAINSAW_HEAD);
GTMaterials.TungstenCarbide.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_BUZZSAW_BLADE, GENERATE_DRILL_HEAD, GENERATE_CHAINSAW_HEAD, GENERATE_REPAIR_KIT);
GTMaterials.TungstenCarbide.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(34, 12, 1024 * DURABILITY_MULTIPLIER, 4, EVTools).build());
TFGHelpers.getMaterial('ostrum_iodide').addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_BUZZSAW_BLADE, GENERATE_DRILL_HEAD, GENERATE_CHAINSAW_HEAD);
TFGHelpers.getMaterial('ostrum_iodide').addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_BUZZSAW_BLADE, GENERATE_DRILL_HEAD, GENERATE_CHAINSAW_HEAD, GENERATE_REPAIR_KIT);
TFGHelpers.getMaterial('ostrum_iodide').setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(20, 10, 3096 * DURABILITY_MULTIPLIER, 4, EVTools).build());
// IV
GTMaterials.HSSE.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_BUZZSAW_BLADE, GENERATE_DRILL_HEAD, GENERATE_CHAINSAW_HEAD);
GTMaterials.HSSE.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_BUZZSAW_BLADE, GENERATE_DRILL_HEAD, GENERATE_CHAINSAW_HEAD, GENERATE_REPAIR_KIT);
GTMaterials.HSSE.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(44, 13, 4012 * DURABILITY_MULTIPLIER, 3, IVTools).build());
// LuV
GTMaterials.Duranium.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_BUZZSAW_BLADE, GENERATE_DRILL_HEAD, GENERATE_CHAINSAW_HEAD);
GTMaterials.Duranium.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_BUZZSAW_BLADE, GENERATE_DRILL_HEAD, GENERATE_CHAINSAW_HEAD, GENERATE_REPAIR_KIT);
GTMaterials.Duranium.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(54, 14, 8192 * DURABILITY_MULTIPLIER, 5, IVTools).build());
GTMaterials.NaquadahAlloy.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_BUZZSAW_BLADE, GENERATE_DRILL_HEAD, GENERATE_CHAINSAW_HEAD);
GTMaterials.NaquadahAlloy.addFlags(GENERATE_SCREWDRIVER_HEAD, GENERATE_WRENCH_HEAD, GENERATE_WIRE_CUTTER_HEAD, GENERATE_BUZZSAW_BLADE, GENERATE_DRILL_HEAD, GENERATE_CHAINSAW_HEAD, GENERATE_REPAIR_KIT);
GTMaterials.NaquadahAlloy.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(64, 15, 8192 * DURABILITY_MULTIPLIER, 5, IVTools).build());
// UV
@@ -380,7 +381,7 @@ function registerTFGToolMaterialModification(event) {
TFGHelpers.getMaterial('silicon_carbide_silicon_carbide').setProperty(PropertyKey.ROTOR, new $ROTOR_PROPERTY(200, 50, 2, 238));
GTMaterials.get('rocket_alloy_t1').setProperty(PropertyKey.ROTOR, new $ROTOR_PROPERTY(170, 105, 3, 1215));
TFGHelpers.getMaterial('inconel_718').setProperty(PropertyKey.ROTOR, new $ROTOR_PROPERTY(130, 180, 4, 1536));
TFGHelpers.getMaterial('inconel_718').setProperty(PropertyKey.ROTOR, new $ROTOR_PROPERTY(220, 180, 4, 1536));
TFGHelpers.getMaterial('tungsten_bismuth_oxide_composite').setProperty(PropertyKey.ROTOR, new $ROTOR_PROPERTY(270, 80, 7, 465));
GTMaterials.get('rocket_alloy_t2').setProperty(PropertyKey.ROTOR, new $ROTOR_PROPERTY(210, 150, 5, 2484));
TFGHelpers.getMaterial('mo_si_b').setProperty(PropertyKey.ROTOR, new $ROTOR_PROPERTY(270, 180, 6, 1610));
@@ -427,23 +428,23 @@ function registerTFGToolMaterialModification(event) {
}
};
GTMaterials.Wood.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(340, 10, false, false, false, false));
GTMaterials.Copper.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(1696, 12, true, false, false, false));
GTMaterials.Bronze.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(1696, 40, true, false, false, false));
GTMaterials.TinAlloy.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(1572, 40, true, false, false, false));
GTMaterials.Gold.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(1671, 50, true, true, false, false));
GTMaterials.Potin.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(1546, 80, true, false, false, false));
GTMaterials.Steel.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(1855, 100, true, false, false, false));
GTMaterials.Polyethylene.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(370, 120, true, false, false, false));
GTMaterials.StainlessSteel.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(2428, 150, true, true, true, false));
GTMaterials.Aluminium.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(1166, 200, true, false, false, false));
GTMaterials.Polytetrafluoroethylene.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(600, 800, true, true, false, false));
GTMaterials.Titanium.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(3426, 1200, true, false, true, false));
GTMaterials.TungstenSteel.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(5137, 1800, true, false, true, false));
GTMaterials.Polybenzimidazole.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(1000, 2800, true, false, false, false));
GTMaterials.NiobiumTitanium.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(7300, 1400, true, true, false, false));
GTMaterials.Naquadah.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(3776, 1600, true, false, true, true));
GTMaterials.Iridium.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(3398, 2000, true, false, true, false));
GTMaterials.Duranium.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(9625, 4000, true, true, true, true));
GTMaterials.Wood.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(340, 10, false, false, false, false));
GTMaterials.Copper.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(1696, 12, true, false, false, false));
GTMaterials.Bronze.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(1696, 40, true, false, false, false));
GTMaterials.TinAlloy.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(1572, 40, true, false, false, false));
GTMaterials.Gold.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(1671, 50, true, true, false, false));
GTMaterials.Potin.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(1546, 80, true, false, false, false));
GTMaterials.Steel.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(1855, 100, true, false, false, false));
GTMaterials.Polyethylene.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(370, 120, true, false, false, false));
GTMaterials.StainlessSteel.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(2428, 150, true, true, true, false));
GTMaterials.Aluminium.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(1166, 200, true, false, false, false));
GTMaterials.Polytetrafluoroethylene.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(600, 800, true, true, false, false));
GTMaterials.Titanium.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(3426, 1200, true, false, true, false));
GTMaterials.TungstenSteel.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(5137, 1800, true, false, true, false));
GTMaterials.Polybenzimidazole.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(1000, 2800, true, false, false, false));
GTMaterials.NiobiumTitanium.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(7300, 1400, true, true, false, false));
GTMaterials.Naquadah.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(3776, 1600, true, false, true, true));
GTMaterials.Iridium.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(3398, 2000, true, false, true, false));
GTMaterials.Duranium.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(9625, 4000, true, true, true, true));
}