From 96a4ae16d3b4dd2acc3e941d74858f5b9789b817 Mon Sep 17 00:00:00 2001
From: SpeeeDCraft <52341158+SpeeeDCraft@users.noreply.github.com>
Date: Fri, 27 Oct 2023 08:26:25 +0700
Subject: [PATCH] improve codestyle

---
 kubejs/client_scripts/constants.js        | 89 ++++++++++++++++++++++-
 kubejs/client_scripts/gregtech/rei.js     | 25 ++-----
 kubejs/client_scripts/mainClientScript.js | 12 +++
 kubejs/client_scripts/minecraft/rei.js    |  7 ++
 kubejs/client_scripts/tfc/rei.js          | 68 ++---------------
 kubejs/startup_scripts/constants.js       | 15 ----
 6 files changed, 119 insertions(+), 97 deletions(-)
 create mode 100644 kubejs/client_scripts/mainClientScript.js
 create mode 100644 kubejs/client_scripts/minecraft/rei.js

diff --git a/kubejs/client_scripts/constants.js b/kubejs/client_scripts/constants.js
index d8b1a2de0..5f48b038d 100644
--- a/kubejs/client_scripts/constants.js
+++ b/kubejs/client_scripts/constants.js
@@ -1 +1,88 @@
-// priority: 0
\ No newline at end of file
+// priority: 0
+
+global.itemsToHide = [
+    "minecraft:coal_ore",
+    "minecraft:deepslate_coal_ore",
+    "minecraft:iron_ore",
+    "minecraft:deepslate_iron_ore",
+    "minecraft:copper_ore",
+    "minecraft:deepslate_copper_ore",
+    "minecraft:gold_ore",
+    "minecraft:deepslate_gold_ore",
+    "minecraft:redstone_ore",
+    "minecraft:deepslate_redstone_ore",
+    "minecraft:emerald_ore",
+    "minecraft:deepslate_emerald_ore",
+    "minecraft:lapis_ore",
+    "minecraft:deepslate_lapis_ore",
+    "minecraft:diamond_ore",
+    "minecraft:deepslate_diamond_ore",
+    "minecraft:nether_gold_ore",
+    "minecraft:nether_quartz_ore"
+]
+
+global.stoneTypesToHide = [
+    "sand",
+    "red_sand",
+    "gravel",
+    "ore",
+    "deepslate",
+    "basalt",
+    "endstone",
+    "netherrack",
+    "andesite",
+    "diorite",
+    "granite",
+    "tuff"
+]
+
+global.tfcSimpleMaterials = [
+    "gypsum",
+    "cinnabar",
+    "cryolite",
+    "saltpeter",
+    "sylvite",
+    "borax",
+    "halite",
+    "amethyst",
+    "opal",
+    "pyrite",
+    "topaz",
+    "bituminous_coal",
+    "lignite",
+    "graphite",
+    "sulfur",
+    "diamond",
+    "emerald",
+    "lapis_lazuli",
+    "ruby",
+    "sapphire"
+]
+
+global.tfcOreTypes = [
+    "poor",
+    "normal",
+    "rich"
+]
+
+global.tfcOreMaterials = [
+    "bismuthinite",
+    "cassiterite",
+    "garnierite",
+    "hematite",
+    "limonite",
+    "magnetite",
+    "malachite",
+    "native_copper",
+    "native_gold",
+    "native_silver",
+    "sphalerite",
+    "tetrahedrite"
+]
+
+global.tfcDepositeMaterials = [
+    "cassiterite",
+    "native_copper",
+    "native_gold",
+    "native_silver"
+]
\ No newline at end of file
diff --git a/kubejs/client_scripts/gregtech/rei.js b/kubejs/client_scripts/gregtech/rei.js
index 3fa3f4276..d7a46f011 100644
--- a/kubejs/client_scripts/gregtech/rei.js
+++ b/kubejs/client_scripts/gregtech/rei.js
@@ -1,27 +1,14 @@
 // priority: 0
 
-const stoneTypesToHide = [
-    "sand",
-    "red_sand",
-    "gravel",
-    "ore",
-    "deepslate",
-    "basalt",
-    "endstone",
-    "netherrack",
-    "andesite",
-    "diorite",
-    "granite",
-    "tuff"
-]
-
-REIEvents.hide('item', event => {
-    
+const hideGTStuff = (event) => {
     // Hide unused GT ores
     GTRegistries.MATERIALS.forEach(material => {
         global.stoneTypesToHide.forEach(stoneTypeName => {
             event.hide(`#forge:ores/${stoneTypeName}/${material}`)
         })
     })
-    
-})
\ No newline at end of file
+}
+
+const groupGTStuff = (event) => {
+    event.groupItemsByTag('tfg:rei_groups/ores', 'All Ores', 'forge:ores')
+}
\ No newline at end of file
diff --git a/kubejs/client_scripts/mainClientScript.js b/kubejs/client_scripts/mainClientScript.js
new file mode 100644
index 000000000..19d7ff00c
--- /dev/null
+++ b/kubejs/client_scripts/mainClientScript.js
@@ -0,0 +1,12 @@
+// priority: 0
+
+REIEvents.hide('item', event => {
+    hideGTStuff(event)
+    hideTFCStuff(event)
+    hideMinecraftStuff(event)
+})
+
+
+REIEvents.groupEntries(event => {
+    groupGTStuff(event)
+})
diff --git a/kubejs/client_scripts/minecraft/rei.js b/kubejs/client_scripts/minecraft/rei.js
new file mode 100644
index 000000000..d74ca5732
--- /dev/null
+++ b/kubejs/client_scripts/minecraft/rei.js
@@ -0,0 +1,7 @@
+// priority: 0
+
+const hideMinecraftStuff = (event) => {
+    global.itemsToHide.forEach(itemToHide => {
+        event.hide(itemToHide)
+    })
+}
\ No newline at end of file
diff --git a/kubejs/client_scripts/tfc/rei.js b/kubejs/client_scripts/tfc/rei.js
index 619596fbf..62ff6cf6b 100644
--- a/kubejs/client_scripts/tfc/rei.js
+++ b/kubejs/client_scripts/tfc/rei.js
@@ -1,76 +1,20 @@
 // priority: 0
 
-const tfcSimpleMaterials = [
-    "gypsum",
-    "cinnabar",
-    "cryolite",
-    "saltpeter",
-    "sylvite",
-    "borax",
-    "halite",
-    "amethyst",
-    "opal",
-    "pyrite",
-    "topaz",
-    "bituminous_coal",
-    "lignite",
-    "graphite",
-    "sulfur",
-    "diamond",
-    "emerald",
-    "lapis_lazuli",
-    "ruby",
-    "sapphire"
-]
-
-const tfcOreTypes = [
-    "poor",
-    "normal",
-    "rich"
-]
-
-const tfcOreMaterials = [
-    "bismuthinite",
-    "cassiterite",
-    "garnierite",
-    "hematite",
-    "limonite",
-    "magnetite",
-    "malachite",
-    "native_copper",
-    "native_gold",
-    "native_silver",
-    "sphalerite",
-    "tetrahedrite"
-]
-
-const tfcDepositeMaterials = [
-    "cassiterite",
-    "native_copper",
-    "native_gold",
-    "native_silver"
-]
-
-REIEvents.hide('item', event => {
-    
+const hideTFCStuff = (event) => {
     // Hide unused TFC ores
     global.allTFCStoneTypeNames.forEach(stoneTypeName => {
-        tfcSimpleMaterials.forEach(material => {
+        global.tfcSimpleMaterials.forEach(material => {
             event.hide(`tfc:ore/${material}/${stoneTypeName}`)
         })
 
-        tfcOreTypes.forEach(oreTypeName => {
-            tfcOreMaterials.forEach(oreMaterialName => {
+        global.tfcOreTypes.forEach(oreTypeName => {
+            global.tfcOreMaterials.forEach(oreMaterialName => {
                 event.hide(`tfc:ore/${oreTypeName}_${oreMaterialName}/${stoneTypeName}`)
             })
         })
 
-        tfcDepositeMaterials.forEach(depositeMaterialName => {
+        global.tfcDepositeMaterials.forEach(depositeMaterialName => {
             event.hide(`tfc:deposit/${depositeMaterialName}/${stoneTypeName}`)
         })
     })
-    
-    
-    
-    
-})
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/kubejs/startup_scripts/constants.js b/kubejs/startup_scripts/constants.js
index 311c21606..7d23016c7 100644
--- a/kubejs/startup_scripts/constants.js
+++ b/kubejs/startup_scripts/constants.js
@@ -1,20 +1,5 @@
 // priority: 1000
 
-global.stoneTypesToHide = [
-    "sand",
-    "red_sand",
-    "gravel",
-    "ore",
-    "deepslate",
-    "basalt",
-    "endstone",
-    "netherrack",
-    "andesite",
-    "diorite",
-    "granite",
-    "tuff"
-]
-
 global.allTFCStoneTypeNames = [
     'gabbro', 
     'shale',