From 64b0f44d1d4e03fb74c6b775d566d390e17ee3bd Mon Sep 17 00:00:00 2001
From: aidie8 <aidenvanzuilen@gmail.com>
Date: Tue, 25 Feb 2025 11:42:28 +1300
Subject: [PATCH] Fixed Material gets missing TFG mod ID

---
 kubejs/startup_scripts/gtceu/materials.js     | 24 +++++++++----------
 kubejs/startup_scripts/main_startup_script.js | 11 +++++----
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js
index 1591baec52..2e611ccc15 100644
--- a/kubejs/startup_scripts/gtceu/materials.js
+++ b/kubejs/startup_scripts/gtceu/materials.js
@@ -10,19 +10,19 @@ const registerGTCEuMaterialModification = (event) => {
 
     const $TFG_PROPERTY_KEYS = Java.loadClass('su.terrafirmagreg.core.compat.gtceu.TFGPropertyKeys')
     const $TFC_PROPERTY = Java.loadClass('su.terrafirmagreg.core.compat.gtceu.properties.TFCProperty')
-
-    const PigIron = GTCEuAPI.materialManager.getMaterial('pig_iron')
-    const HighCarbonSteel = GTCEuAPI.materialManager.getMaterial('high_carbon_steel')
-    const HighCarbonBlackSteel = GTCEuAPI.materialManager.getMaterial('high_carbon_black_steel')
-    const HighCarbonRedSteel = GTCEuAPI.materialManager.getMaterial('high_carbon_red_steel')
-    const HighCarbonBlueSteel = GTCEuAPI.materialManager.getMaterial('high_carbon_blue_steel')
-    const WeakSteel = GTCEuAPI.materialManager.getMaterial('weak_steel')
-    const WeakBlueSteel = GTCEuAPI.materialManager.getMaterial('weak_blue_steel')
-    const WeakRedSteel = GTCEuAPI.materialManager.getMaterial('weak_red_steel')
-    const Unknown = GTCEuAPI.materialManager.getMaterial('unknown')
     
-    const Bismuthinite = GTCEuAPI.materialManager.getMaterial('bismuthinite')
-    const Limonite = GTCEuAPI.materialManager.getMaterial('limonite')
+    const PigIron = GTCEuAPI.materialManager.getMaterial('tfg:pig_iron')
+    const HighCarbonSteel = GTCEuAPI.materialManager.getMaterial('tfg:high_carbon_steel')
+    const HighCarbonBlackSteel = GTCEuAPI.materialManager.getMaterial('tfg:high_carbon_black_steel')
+    const HighCarbonRedSteel = GTCEuAPI.materialManager.getMaterial('tfg:high_carbon_red_steel')
+    const HighCarbonBlueSteel = GTCEuAPI.materialManager.getMaterial('tfg:high_carbon_blue_steel')
+    const WeakSteel = GTCEuAPI.materialManager.getMaterial('tfg:weak_steel')
+    const WeakBlueSteel = GTCEuAPI.materialManager.getMaterial('tfg:weak_blue_steel')
+    const WeakRedSteel = GTCEuAPI.materialManager.getMaterial('tfg:weak_red_steel')
+    const Unknown = GTCEuAPI.materialManager.getMaterial('tfg:unknown')
+    
+    const Bismuthinite = GTCEuAPI.materialManager.getMaterial('tfg:bismuthinite')
+    const Limonite = GTCEuAPI.materialManager.getMaterial('tfg:limonite')
 
     /* TFC Проперти для материалов */
     GTMaterials.Copper.setProperty($TFG_PROPERTY_KEYS.TFC_PROPERTY, new $TFC_PROPERTY(648, 864, 1080, 1));
diff --git a/kubejs/startup_scripts/main_startup_script.js b/kubejs/startup_scripts/main_startup_script.js
index 45c1699783..455ca4ec21 100644
--- a/kubejs/startup_scripts/main_startup_script.js
+++ b/kubejs/startup_scripts/main_startup_script.js
@@ -52,8 +52,9 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
 
 GTCEuStartupEvents.registry('gtceu:material', event => {
     registerAE2Materials(event)
-    registerGTCEuMaterials(event)
     registerTFCMaterials(event)
+    registerGTCEuMaterials(event)
+  
     registerTFGMaterials(event)
 })
 
@@ -83,7 +84,7 @@ GTCEuStartupEvents.registry('gtceu:material_icon_set', event => {
  * Событие регистрации типов иконок тэг префиксов.
 */
 GTCEuStartupEvents.registry('gtceu:material_icon_type', event => {
-    registerGTCEuMaterialIconTypes(event)
+    //registerGTCEuMaterialIconTypes(event)
 })
 
 
@@ -91,6 +92,6 @@ GTCEuStartupEvents.registry('gtceu:material_icon_type', event => {
 /**
  * Событие регистрации информации о составе предмета.
  */
-// TFGStartupEvents.materialInfo(event => {
-//     registerGTCEuMaterialInfo(event)
-// })
+ TFGStartupEvents.materialInfo(event => {
+     registerGTCEuMaterialInfo(event)
+ })