From ad34a8f1da0c6e41697d720d2807db4e20c925bc Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 12 Jan 2024 10:23:05 +0700 Subject: [PATCH] use our kjs plugin --- kubejs/server_scripts/gregtech/recipes.js | 2 +- kubejs/server_scripts/main_server_script.js | 4 --- kubejs/server_scripts/tfc/data.js | 34 ++++++++++----------- 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index c9ecc644a..d63285373 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1267,7 +1267,7 @@ const registerGTCEURecipes = (event) => { //#region Рецепты инструментов - if (material.hasFlag($TFGMaterialFlags.HAS_TFC_TOOL)) { + if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL)) { global.GTCEU_ANVIL_TOOL_TYPES.forEach(toolType => { let toolStack = $ToolHelper.get(toolType, material) diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 0debc2328..f6fdca0cb 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -3,10 +3,6 @@ const $MaterialFlags = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags') 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 8a20ed36c..4d770474b 100644 --- a/kubejs/server_scripts/tfc/data.js +++ b/kubejs/server_scripts/tfc/data.js @@ -55,8 +55,8 @@ const registerTFCHeats = (event) => { } GTRegistries.MATERIALS.forEach(material => { - let tfcProperty = material.getProperty($TFGPropertyKeys.TFC_PROPERTY) - + let tfcProperty = material.getProperty(TFGPropertyKey.TFC_PROPERTY) + if (tfcProperty != null) { makeItemHeatByTagPrefix(TagPrefix.dustTiny, material, tfcProperty, 0.357) makeItemHeatByTagPrefix(TagPrefix.dustSmall, material, tfcProperty, 0.714) @@ -67,22 +67,22 @@ const registerTFCHeats = (event) => { 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) + makeItemHeatByTagPrefix(TFGTagPrefix.richRawOre, material, tfcProperty, 1.429) + makeItemHeatByTagPrefix(TFGTagPrefix.poorRawOre, material, tfcProperty, 1.429) - 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) + 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) } })