From 5930ee7a9509d8fb75640f26afcf2b456c355105 Mon Sep 17 00:00:00 2001 From: chemlzh Date: Sat, 27 Apr 2024 13:49:12 +0800 Subject: [PATCH 1/6] 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}`) From 5200434e6d295fb90a35934359b966ad3d930f54 Mon Sep 17 00:00:00 2001 From: EliAyase Date: Sat, 27 Apr 2024 14:45:09 +0800 Subject: [PATCH 2/6] Fix spared parts molten product inconsistency between GT and TFC Fix spared parts molten product inconsistency between GT and TFC. Now 1 bolt can get 18mB molten metal, 1 screw can get 16mB molten metal, and 1 ring can get 36mB molten metal, suited with GT. Signed-off-by: EliAyase --- kubejs/server_scripts/tfc/recipes.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 9d1058955..df0f5f6b2 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -502,7 +502,7 @@ const registerTFCRecipes = (event) => { // Болт -> Металл event.recipes.tfc.heating(boltItem, tfcProperty.getMeltTemp()) - .resultFluid(Fluid.of(outputMaterial.getFluid(), 36)) + .resultFluid(Fluid.of(outputMaterial.getFluid(), 18)) .id(`tfc:heating/metal/${material.getName()}_bolt`) // Стержень -> Болт @@ -518,7 +518,7 @@ const registerTFCRecipes = (event) => { // Винт -> Металл event.recipes.tfc.heating(screwItem, tfcProperty.getMeltTemp()) - .resultFluid(Fluid.of(outputMaterial.getFluid(), 72)) + .resultFluid(Fluid.of(outputMaterial.getFluid(), 16)) .id(`tfc:heating/metal/${material.getName()}_screw`) // Стержень -> Винт @@ -533,7 +533,7 @@ const registerTFCRecipes = (event) => { // Кольцо -> Металл event.recipes.tfc.heating(ringItem, tfcProperty.getMeltTemp()) - .resultFluid(Fluid.of(outputMaterial.getFluid(), 72)) + .resultFluid(Fluid.of(outputMaterial.getFluid(), 36)) .id(`tfc:heating/metal/${material.getName()}_ring`) // Стержень -> Кольцо From 9cf8777ac4236b0c652e6615aae813011670eea4 Mon Sep 17 00:00:00 2001 From: EliAyase Date: Sat, 27 Apr 2024 15:26:56 +0800 Subject: [PATCH 3/6] Update ev__extreme_voltage.snbt Change EV coil description Signed-off-by: EliAyase --- config/ftbquests/quests/chapters/ev__extreme_voltage.snbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt index 13191d9c8..8355ff65a 100644 --- a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt +++ b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt @@ -524,7 +524,7 @@ "30A6EDDF25A5E5F8" ] description: [ - "&aTungstensteel Coils&r raise the Heat Capacity to a scorching &d4,500K&r." + "&aRuthenium-tungsten-molybdenum (RTM) alloy Coils&r raise the Heat Capacity to a scorching &d4,500K&r." "" "This will be required in &1IV&r, but as always, you should still get this earlier for the &6Coil bonuses&r." ] @@ -538,7 +538,7 @@ item: "gtceu:rtm_alloy_coil_block" type: "item" }] - title: "Tungstensteel Coils" + title: "RTM alloy Coils" x: 9.0d y: 2.25d } From cbf074eeda409b5e375fce50c43e42cb01730e3d Mon Sep 17 00:00:00 2001 From: EliAyase Date: Sat, 27 Apr 2024 16:53:16 +0800 Subject: [PATCH 4/6] Update ev__extreme_voltage.snbt Signed-off-by: EliAyase --- config/ftbquests/quests/chapters/ev__extreme_voltage.snbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt index 8355ff65a..79d707d86 100644 --- a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt +++ b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt @@ -524,7 +524,7 @@ "30A6EDDF25A5E5F8" ] description: [ - "&aRuthenium-tungsten-molybdenum (RTM) alloy Coils&r raise the Heat Capacity to a scorching &d4,500K&r." + "&aRuthenium-tungsten-molybdenum (RTM) Alloy Coils&r raise the Heat Capacity to a scorching &d4,500K&r." "" "This will be required in &1IV&r, but as always, you should still get this earlier for the &6Coil bonuses&r." ] @@ -538,7 +538,7 @@ item: "gtceu:rtm_alloy_coil_block" type: "item" }] - title: "RTM alloy Coils" + title: "RTM Alloy Coils" x: 9.0d y: 2.25d } From d6fad9bac27320375905e889f0ee932e8551cadd Mon Sep 17 00:00:00 2001 From: EliAyase Date: Sat, 27 Apr 2024 19:34:55 +0800 Subject: [PATCH 5/6] Rollback for 0.7.3 update Delete "$" before ToolHelper. This rollback is paired with TFG-Core 0.7.3 Signed-off-by: EliAyase --- kubejs/server_scripts/tfc/tags.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 531c3d100..0d0ca8ac4 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -6,7 +6,8 @@ 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) + var tool = ToolHelper.get(value, material) if (!tool.isEmpty()) event.add(key, tool.getId()) event.add('tfc:usable_on_tool_rack', `#${key}`) @@ -444,4 +445,4 @@ const registerTFCPlacedFeatures = (event) => { event.add('tfc:in_biome/veins', 'tfg:vein/surface_sphalerite') event.add('tfc:in_biome/veins', 'tfg:vein/surface_tetrahedrite') event.add('tfc:in_biome/veins', 'tfg:geode') -} \ No newline at end of file +} From 86e819675de7764bfd790b0d740f0192461b5d2e Mon Sep 17 00:00:00 2001 From: Dmitry <52341158+Exzept1on@users.noreply.github.com> Date: Sat, 27 Apr 2024 19:07:18 +0700 Subject: [PATCH 6/6] Update tags.js Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com> --- kubejs/server_scripts/tfc/tags.js | 1 - 1 file changed, 1 deletion(-) diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 0d0ca8ac4..dcb692dbb 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -6,7 +6,6 @@ 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())