From b3b466f50974a3c54a35e451ae5f839565e9c3a9 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 12 Jan 2024 10:08:32 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=82=D0=BA=D0=B0=D0=B7=D0=BE=D1=83?= =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B9=D1=87=D0=B8=D0=B2=D0=B0=D1=8F=20=D1=81?= =?UTF-8?q?=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kubejs/server_scripts/main_server_script.js | 5 +- kubejs/server_scripts/tfc/data.js | 81 +++++++++------------ 2 files changed, 38 insertions(+), 48 deletions(-) diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index cd002aee0..0debc2328 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -1,9 +1,12 @@ // priority: 1 const $MaterialFlags = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags') -const $TFGMaterialFlags = Java.loadClass('su.terrafirmagreg.core.compat.gtceu.TFGMaterialFlags') const $ToolHelper = Java.loadClass('com.gregtechceu.gtceu.api.item.tool.ToolHelper') +const $TFGMaterialFlags = Java.loadClass('su.terrafirmagreg.core.compat.gtceu.TFGMaterialFlags') +const $TFGPropertyKeys = Java.loadClass('su.terrafirmagreg.core.compat.gtceu.TFGPropertyKeys') +const $TFGTagPrefix = Java.loadClass('su.terrafirmagreg.core.compat.gtceu.TFGTagPrefixes') + /** * Событие регистрации предмет-тэгов. */ diff --git a/kubejs/server_scripts/tfc/data.js b/kubejs/server_scripts/tfc/data.js index b6fa59dd2..8a20ed36c 100644 --- a/kubejs/server_scripts/tfc/data.js +++ b/kubejs/server_scripts/tfc/data.js @@ -48,56 +48,43 @@ const registerTFCMetals = (event) => { } const registerTFCHeats = (event) => { - /* - Object.entries(global.METAL_TO_SPECS).forEach(keyValuePair => { - let metal = keyValuePair[0] - let metalSpecs = keyValuePair[1] + + function makeItemHeatByTagPrefix(tagPrefix, material, tfcProperty, heatCapacity) { + let item = ChemicalHelper.get(tagPrefix, material, 1) + if (!item.isEmpty()) event.itemHeat(item, heatCapacity, tfcProperty.getForgingTemp(), tfcProperty.getWeldingTemp()) + } - if (metalSpecs.props.includes('dusts')) { - event.itemHeat(`gtceu:${metal}_tiny_dust`, 0.357, metalSpecs.forging_temp, metalSpecs.welding_temp) - event.itemHeat(`gtceu:${metal}_small_dust`, 0.714, metalSpecs.forging_temp, metalSpecs.welding_temp) - event.itemHeat(`gtceu:${metal}_dust`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) + GTRegistries.MATERIALS.forEach(material => { + let tfcProperty = material.getProperty($TFGPropertyKeys.TFC_PROPERTY) - event.itemHeat(`gtceu:${metal}_rod`, 0.567, metalSpecs.forging_temp, metalSpecs.welding_temp) - event.itemHeat(`gtceu:${metal}_bolt`, 0.245, metalSpecs.forging_temp, metalSpecs.welding_temp) - event.itemHeat(`gtceu:${metal}_screw`, 0.567, metalSpecs.forging_temp, metalSpecs.welding_temp) - } + if (tfcProperty != null) { + makeItemHeatByTagPrefix(TagPrefix.dustTiny, material, tfcProperty, 0.357) + makeItemHeatByTagPrefix(TagPrefix.dustSmall, material, tfcProperty, 0.714) + makeItemHeatByTagPrefix(TagPrefix.dust, material, tfcProperty, 1.429) + makeItemHeatByTagPrefix(TagPrefix.rod, material, tfcProperty, 0.567) + makeItemHeatByTagPrefix(TagPrefix.bolt, material, tfcProperty, 0.245) + makeItemHeatByTagPrefix(TagPrefix.screw, material, tfcProperty, 0.567) + makeItemHeatByTagPrefix(TagPrefix.nugget, material, tfcProperty, 0.124) + + makeItemHeatByTagPrefix(TagPrefix.rawOre, material, tfcProperty, 1.429) + makeItemHeatByTagPrefix($TFGTagPrefix.richRawOre, material, tfcProperty, 1.429) + makeItemHeatByTagPrefix($TFGTagPrefix.poorRawOre, material, tfcProperty, 1.429) - if (metalSpecs.props.includes('nugget')) { - event.itemHeat(`gtceu:${metal}_nugget`, 0.124, metalSpecs.forging_temp, metalSpecs.welding_temp) - } - - if (metalSpecs.props.includes('ore_chunks')) { - event.itemHeat(`#forge:rich_raw_materials/${metal}`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) - event.itemHeat(`#forge:raw_materials/${metal}`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) - event.itemHeat(`#forge:poor_raw_materials/${metal}`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) - } - - if (metalSpecs.props.includes('tool')) { - event.itemHeat(`gtceu:${metal}_sword`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) - event.itemHeat(`gtceu:${metal}_sword_head`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) - event.itemHeat(`gtceu:${metal}_shovel`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) - event.itemHeat(`gtceu:${metal}_shovel_head`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) - event.itemHeat(`gtceu:${metal}_scythe`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) - event.itemHeat(`gtceu:${metal}_scythe_head`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) - event.itemHeat(`gtceu:${metal}_pickaxe`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) - event.itemHeat(`gtceu:${metal}_pickaxe_head`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) - event.itemHeat(`gtceu:${metal}_saw`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) - event.itemHeat(`gtceu:${metal}_saw_head`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) - event.itemHeat(`gtceu:${metal}_knife`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) - event.itemHeat(`gtceu:${metal}_knife_head`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) - event.itemHeat(`gtceu:${metal}_hoe`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) - event.itemHeat(`gtceu:${metal}_hoe_head`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) - event.itemHeat(`gtceu:${metal}_hammer`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) - event.itemHeat(`gtceu:${metal}_hammer_head`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) - event.itemHeat(`gtceu:${metal}_axe`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) - event.itemHeat(`gtceu:${metal}_axe_head`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) - event.itemHeat(`gtceu:${metal}_file`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) - event.itemHeat(`gtceu:${metal}_file_head`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) - event.itemHeat(`gtceu:${metal}_butchery_knife`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) - event.itemHeat(`gtceu:${metal}_knife_butchery_head`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) - } - })*/ + makeItemHeatByTagPrefix($TFGTagPrefix.toolHeadSword, material, tfcProperty, 2.875) + makeItemHeatByTagPrefix($TFGTagPrefix.toolHeadShovel, material, tfcProperty, 1.429) + makeItemHeatByTagPrefix($TFGTagPrefix.toolHeadScythe, material, tfcProperty, 1.429) + makeItemHeatByTagPrefix($TFGTagPrefix.toolHeadPickaxe, material, tfcProperty, 1.429) + makeItemHeatByTagPrefix($TFGTagPrefix.toolHeadSaw, material, tfcProperty, 1.429) + makeItemHeatByTagPrefix($TFGTagPrefix.toolHeadKnife, material, tfcProperty, 1.429) + makeItemHeatByTagPrefix($TFGTagPrefix.toolHeadHoe, material, tfcProperty, 1.429) + makeItemHeatByTagPrefix($TFGTagPrefix.toolHeadHammer, material, tfcProperty, 1.429) + makeItemHeatByTagPrefix($TFGTagPrefix.toolHeadAxe, material, tfcProperty, 1.429) + makeItemHeatByTagPrefix($TFGTagPrefix.toolHeadFile, material, tfcProperty, 1.429) + makeItemHeatByTagPrefix($TFGTagPrefix.toolHeadButcheryKnife, material, tfcProperty, 2.875) + makeItemHeatByTagPrefix($TFGTagPrefix.toolHeadMiningHammer, material, tfcProperty, 2.875) + makeItemHeatByTagPrefix($TFGTagPrefix.toolHeadSpade, material, tfcProperty, 2.875) + } + }) // Ведро из синей стали event.itemHeat('tfc:metal/bucket/blue_steel', 1.429, 924, 1232)