From 49a8ef908aa50438f8e6d818c20a3e765ea1290a Mon Sep 17 00:00:00 2001
From: LordMZTE <lord@mzte.de>
Date: Tue, 9 Aug 2022 17:24:51 +0200
Subject: [PATCH] fix: fix tags and recipes

---
 CHANGELOG.md                                  |  3 ++-
 .../kubejs/client_scripts/99-tooltips.js      |  5 ++++
 overrides/kubejs/server_scripts/30-tags.js    | 24 +++++++++++++++++++
 overrides/kubejs/server_scripts/40-recipes.js | 10 ++++++++
 4 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 overrides/kubejs/client_scripts/99-tooltips.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15c6df9..679848c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1 +1,2 @@
-- removed exploitable grinder recipes
+- fixed some tags and recipes
+- removed ae2 spatial anchor (broken on fabric)
diff --git a/overrides/kubejs/client_scripts/99-tooltips.js b/overrides/kubejs/client_scripts/99-tooltips.js
new file mode 100644
index 0000000..928f458
--- /dev/null
+++ b/overrides/kubejs/client_scripts/99-tooltips.js
@@ -0,0 +1,5 @@
+function itemTooltips(ev) {
+    ev.add("ae2:spatial_anchor", Text.of("Broken on Fabric!").red());
+}
+
+onEvent("item.tooltip", itemTooltips);
diff --git a/overrides/kubejs/server_scripts/30-tags.js b/overrides/kubejs/server_scripts/30-tags.js
index a7bf92d..b9a4a78 100644
--- a/overrides/kubejs/server_scripts/30-tags.js
+++ b/overrides/kubejs/server_scripts/30-tags.js
@@ -11,9 +11,26 @@ const waystones = [
     "waystones:blackstone_brick_waystone",
 ];
 
+const ores_with_missing_tags = {
+    iron: ["archon:cloud_iron"],
+    quartz: [
+        "byg:blue_nether_quartz_ore",
+        "byg:brimstone_nether_quartz_ore",
+    ],
+    lapis: ["betternether:nether_lapis_ore"],
+    redstone: ["betternether:nether_redstone_ore"],
+};
+
 function blockTags(ev) {
     // this allows players to activate other people's waystones
     ev.add("ftbchunks:interact_whitelist", waystones);
+
+    for (let [tag, ores] of Object.entries(ores_with_missing_tags)) {
+        for (ore of ores) {
+            ev.add(`c:${tag}_ores`, ore);
+            ev.add(`c:ores/${tag}`, ore);
+        }
+    }
 }
 
 function addNuggetTags(ev, material, item) {
@@ -25,6 +42,13 @@ function itemTags(ev) {
     // ConsistencyPlus actually doesn't know how tags work
     addNuggetTags(ev, "copper", "consistency_plus:copper_nugget");
     addNuggetTags(ev, "netherite", "consistency_plus:netherite_nugget");
+
+    for (let [tag, ores] of Object.entries(ores_with_missing_tags)) {
+        for (ore of ores) {
+            ev.add(`c:${tag}_ores`, ore);
+            ev.add(`c:ores/${tag}`, ore);
+        }
+    }
 }
 
 onEvent("tags.blocks", blockTags);
diff --git a/overrides/kubejs/server_scripts/40-recipes.js b/overrides/kubejs/server_scripts/40-recipes.js
index 6da967e..d40f4f9 100644
--- a/overrides/kubejs/server_scripts/40-recipes.js
+++ b/overrides/kubejs/server_scripts/40-recipes.js
@@ -68,6 +68,16 @@ function recipes(ev) {
         I: "dimdoors:infrangible_fiber",
         F: "dimdoors:frayed_filament",
     });
+
+    // broken on fabric
+    ev.remove({
+        output: "ae2:spatial_anchor",
+    });
+
+    // duplicate
+    ev.remove({
+        id: "techreborn:grinder/nether_lapis_ore",
+    });
 }
 
 onEvent("recipes", recipes);