From 4e90df43baf4130fa291d83ea364ad0d2e277632 Mon Sep 17 00:00:00 2001
From: SpeeeDCraft <52341158+SpeeeDCraft@users.noreply.github.com>
Date: Fri, 27 Oct 2023 20:08:04 +0700
Subject: [PATCH] fix ore recipes again

---
 config/almostunified/unify.json            |  6 +++---
 kubejs/client_scripts/constants.js         |  7 +++++-
 kubejs/client_scripts/create/rei.js        | 10 +++++++++
 kubejs/server_scripts/mainServerScript.js  |  1 +
 kubejs/server_scripts/minecraft/recipes.js | 25 ++++++++++++++++++++++
 5 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 kubejs/client_scripts/create/rei.js
 create mode 100644 kubejs/server_scripts/minecraft/recipes.js

diff --git a/config/almostunified/unify.json b/config/almostunified/unify.json
index c32582528..83d294bcd 100644
--- a/config/almostunified/unify.json
+++ b/config/almostunified/unify.json
@@ -1,10 +1,10 @@
 {
   "modPriorities": [
     "gtceu",
-    "tfc",
     "minecraft",
     "kubejs", 
-    "create"
+    "create",
+    "tfc"
   ],
   "stoneStrata": [
     "stone",
@@ -95,5 +95,5 @@
     "tfc:landslide"
   ],
   "ignoredRecipes": [],
-  "itemsHidingJeiRei": true
+  "itemsHidingJeiRei": false
 }
\ No newline at end of file
diff --git a/kubejs/client_scripts/constants.js b/kubejs/client_scripts/constants.js
index 5f48b038d..5b4961271 100644
--- a/kubejs/client_scripts/constants.js
+++ b/kubejs/client_scripts/constants.js
@@ -18,7 +18,12 @@ global.itemsToHide = [
     "minecraft:diamond_ore",
     "minecraft:deepslate_diamond_ore",
     "minecraft:nether_gold_ore",
-    "minecraft:nether_quartz_ore"
+    "minecraft:nether_quartz_ore",
+    "minecraft:ancient_debris"
+]
+
+global.global.createItemsToHide = [
+    "create:deepslate_zinc_ore"
 ]
 
 global.stoneTypesToHide = [
diff --git a/kubejs/client_scripts/create/rei.js b/kubejs/client_scripts/create/rei.js
new file mode 100644
index 000000000..40d9c34de
--- /dev/null
+++ b/kubejs/client_scripts/create/rei.js
@@ -0,0 +1,10 @@
+// priority: 0
+
+const hideCreateStuff = (event) => {
+    // Hide unused GT ores
+    GTRegistries.MATERIALS.forEach(material => {
+        global.createItemsToHide.forEach(itemName => {
+            event.hide(itemName)
+        })
+    })
+}
\ No newline at end of file
diff --git a/kubejs/server_scripts/mainServerScript.js b/kubejs/server_scripts/mainServerScript.js
index 616ea0bef..ce986dd76 100644
--- a/kubejs/server_scripts/mainServerScript.js
+++ b/kubejs/server_scripts/mainServerScript.js
@@ -14,6 +14,7 @@ ServerEvents.tags('item', event => {
 
 ServerEvents.recipes(event => {
     registerGTrecipes(event)
+    registerMinecraftRecipes(event)
 })
 
 LootJS.modifiers((event) => {
diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js
new file mode 100644
index 000000000..860c38e06
--- /dev/null
+++ b/kubejs/server_scripts/minecraft/recipes.js
@@ -0,0 +1,25 @@
+// priority: 0
+
+const registerMinecraftRecipes = (event) => {
+
+    // Copper fix
+    event.remove({id: 'minecraft:copper_ingot_from_smelting_raw_copper'})
+    event.remove({id: 'minecraft:copper_ingot_from_blasting_raw_copper'})
+
+    event.smelting('2x #forge:ingots/copper', '1x #forge:raw_materials/copper').id('minecraft:copper_ingot_from_smelting_raw_copper').xp(0.7)
+    event.blasting('2x #forge:ingots/copper', '1x #forge:raw_materials/copper').id('minecraft:copper_ingot_from_blasting_raw_copper').xp(0.7)
+
+    // Iron fix
+    event.remove({id: `minecraft:iron_ingot_from_smelting_raw_iron`})
+    event.remove({id: `minecraft:iron_ingot_from_blasting_raw_iron`})
+
+    event.smelting('2x #forge:ingots/iron', '1x #forge:raw_materials/iron').id('minecraft:iron_ingot_from_smelting_raw_iron').xp(0.7)
+    event.blasting('2x #forge:ingots/iron', '1x #forge:raw_materials/iron').id('minecraft:iron_ingot_from_blasting_raw_iron').xp(0.7)
+
+    // Gold fix
+    event.remove({id: `minecraft:gold_ingot_from_smelting_raw_gold`})
+    event.remove({id: `minecraft:gold_ingot_from_blasting_raw_gold`})
+
+    event.smelting('2x #forge:ingots/gold', '1x #forge:raw_materials/gold').id('minecraft:gold_ingot_from_smelting_raw_gold').xp(0.7)
+    event.blasting('2x #forge:ingots/gold', '1x #forge:raw_materials/gold').id('minecraft:gold_ingot_from_blasting_raw_gold').xp(0.7)
+}
\ No newline at end of file