From f907c9800977fa2b1097978be570bb696d048ae2 Mon Sep 17 00:00:00 2001
From: Dmitry <ondyshev.dmitry@gmail.com>
Date: Wed, 10 Jan 2024 13:46:13 +0700
Subject: [PATCH] return REI

---
 kubejs/assets/tfc/lang/en_us.json           |  4 ++++
 kubejs/assets/tfc/lang/ru_ru.json           |  4 ++++
 kubejs/client_scripts/main_client_script.js | 11 ++++++++---
 kubejs/client_scripts/mods/gtceu.js         |  2 --
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/kubejs/assets/tfc/lang/en_us.json b/kubejs/assets/tfc/lang/en_us.json
index 68c9b6bc3..a2ca88a21 100644
--- a/kubejs/assets/tfc/lang/en_us.json
+++ b/kubejs/assets/tfc/lang/en_us.json
@@ -1,4 +1,8 @@
 {
+  "metal.tfg.redstone": "Redstone",
+  "metal.tfg.red_alloy": "Red Alloy",
+  "metal.tfg.tin_alloy": "Tin Alloy",
+
   "block.gtceu.andesite_almandine_ore.prospected": "Almandine",
   "block.gtceu.andesite_aluminium_ore.prospected": "Aluminium",
   "block.gtceu.andesite_alunite_ore.prospected": "Alunite",
diff --git a/kubejs/assets/tfc/lang/ru_ru.json b/kubejs/assets/tfc/lang/ru_ru.json
index 6fe61e31a..d9f775da7 100644
--- a/kubejs/assets/tfc/lang/ru_ru.json
+++ b/kubejs/assets/tfc/lang/ru_ru.json
@@ -1,4 +1,8 @@
 {
+  "metal.tfg.redstone": "Красный камень",
+  "metal.tfg.red_alloy": "Красный сплав",
+  "metal.tfg.tin_alloy": "Оловянный сплав",
+
   "block.gtceu.andesite_almandine_ore.prospected": "Альмандин",
   "block.gtceu.andesite_aluminium_ore.prospected": "Алюминий",
   "block.gtceu.andesite_alunite_ore.prospected": "Алюнит",
diff --git a/kubejs/client_scripts/main_client_script.js b/kubejs/client_scripts/main_client_script.js
index 193a5854f..ac26de59f 100644
--- a/kubejs/client_scripts/main_client_script.js
+++ b/kubejs/client_scripts/main_client_script.js
@@ -1,6 +1,6 @@
 // priority: 1
 
-JEIEvents.hideItems(event => {
+REIEvents.hideItems(event => {
     hideMinecraftStuff(event)
     hideTFCStuff(event)
     hideFirmaLifeStuff(event)
@@ -15,13 +15,18 @@ JEIEvents.hideItems(event => {
     hideChiselAndBitsStuff(event)
 })
 
-JEIEvents.removeCategories(event => {
+REIEvents.groupEntries(event => {
+    groupGTCEUStuff(event)
+    groupTFCStuff(event)
+})
+
+REIEvents.removeCategories(event => {
     registerMinecraftCategories(event)
     registerGTCEUCategories(event)
     registerMoreRedCategories(event)
 })
 
-JEIEvents.hideFluids(event => {
+REIEvents.hideFluids(event => {
     hideTFCFluids(event)
     hideFirmaLifeFluids(event)
 
diff --git a/kubejs/client_scripts/mods/gtceu.js b/kubejs/client_scripts/mods/gtceu.js
index 91c582567..d4ef845fa 100644
--- a/kubejs/client_scripts/mods/gtceu.js
+++ b/kubejs/client_scripts/mods/gtceu.js
@@ -110,8 +110,6 @@ const groupGTCEUStuff = (event) => {
     event.groupItemsByTag('tfg:rei_groups/restrictive_pipes/normal', 'Normal Resctrictive Pipes', 'forge:restrictive_pipes/normal')
     event.groupItemsByTag('tfg:rei_groups/restrictive_pipes/large', 'Large Resctrictive Pipes', 'forge:restrictive_pipes/large')
     event.groupItemsByTag('tfg:rei_groups/restrictive_pipes/huge', 'Huge Resctrictive Pipes', 'forge:restrictive_pipes/huge')
-
-
     
     event.groupItems("tfg:rei_groups/boiler", "Boiler", [/gtceu:.*_boiler/]);
     event.groupItems("tfg:rei_groups/diode", "Diode", [/gtceu:(?!.*smd).*_diode/]);