From 5930ee7a9509d8fb75640f26afcf2b456c355105 Mon Sep 17 00:00:00 2001 From: chemlzh Date: Sat, 27 Apr 2024 13:49:12 +0800 Subject: [PATCH] Fix GT tools with duplicates in TFC cannot set on the tool racks Fix GT tools with duplicates in TFC cannot set on the tool racks. Since original program will throw ReferenceError. Tested on TFG 0.7.2 with TFC & GTM manually updated to newest version. However, tools appear only in GTM still cannot put on the tool racks. Need further investigation. --- kubejs/server_scripts/gregtech/constants.js | 2 +- kubejs/server_scripts/tfc/tags.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/gregtech/constants.js b/kubejs/server_scripts/gregtech/constants.js index 5e5793147..6c3465ca2 100644 --- a/kubejs/server_scripts/gregtech/constants.js +++ b/kubejs/server_scripts/gregtech/constants.js @@ -30,7 +30,7 @@ global.GTCEU_TOOLTYPES_WHICH_HAS_TFC_DUPS = { "tfc:axes" : GTToolType.AXE, "tfc:shovels" : GTToolType.SHOVEL, "tfc:hoes" : GTToolType.HOE, - "tfc:hammers" : GTToolType.MINING_HAMMER, + "tfc:hammers" : GTToolType.HARD_HAMMER, "tfc:knives" : GTToolType.KNIFE, "tfc:saws" : GTToolType.SAW, "tfc:scythes" : GTToolType.SCYTHE diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index f567f1542..531c3d100 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -6,7 +6,7 @@ const registerTFCItemTags = (event) => { GTMaterialRegistry.getRegisteredMaterials().forEach(material => { if (material.hasProperty(PropertyKey.TOOL)) { for (let [key, value] of Object.entries(global.GTCEU_TOOLTYPES_WHICH_HAS_TFC_DUPS)) { - var tool = ToolHelper.get(value, material) + var tool = $ToolHelper.get(value, material) if (!tool.isEmpty()) event.add(key, tool.getId()) event.add('tfc:usable_on_tool_rack', `#${key}`)