From 8c93c24eccf584127de7612f179992f063f8da9d Mon Sep 17 00:00:00 2001
From: mina <143211829+ursamina@users.noreply.github.com>
Date: Mon, 22 Jan 2024 18:14:09 +0000
Subject: [PATCH] phase out magnets

magnets? how do they work
---
 kubejs/client_scripts/tooltips.js               | 14 ++++++++++++++
 kubejs/server_scripts/open_blocks/magnets.js    | 17 +++++------------
 .../sophisticated_backpacks/upgrades.js         |  4 ++--
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js
index 28a2cca..98e0d2f 100644
--- a/kubejs/client_scripts/tooltips.js
+++ b/kubejs/client_scripts/tooltips.js
@@ -13,4 +13,18 @@ ItemEvents.tooltip((event) => {
     ],
     Text.red("Disabled in this modpack!").bold(true)
   );
+
+  event.add(
+    ["simplemagnets:basicmagnet", "simplemagnets:advancedmagnet"],
+    Text.red(
+      "Will be removed in a future release! Place in crafting grid to recycle."
+    ).bold(true)
+  );
+
+  event.add(
+    "ae2:controller",
+    Text.gray(
+      "Channels are §cdisabled§7."
+    )
+  );
 });
diff --git a/kubejs/server_scripts/open_blocks/magnets.js b/kubejs/server_scripts/open_blocks/magnets.js
index 7344759..f84ffc3 100644
--- a/kubejs/server_scripts/open_blocks/magnets.js
+++ b/kubejs/server_scripts/open_blocks/magnets.js
@@ -1,18 +1,11 @@
 ServerEvents.recipes((event) => {
   // Worst magnet
   event.remove({ id: "simplemagnets:basicmagnet" });
-  event.shaped("simplemagnets:basicmagnet", ["R R", "RwR", "BPB"], {
-    R: "#forge:rods/magnetic_steel",
-    w: "#forge:tools/wrenches",
-    B: "#forge:bolts/tin",
-    P: "#forge:plates/steel",
-  });
+  event.shapeless("gtceu:lv_item_magnet", "simplemagnets:basicmagnet");
   // King magnet
   event.remove({ output: "simplemagnets:advancedmagnet" });
-  event.shaped("simplemagnets:advancedmagnet", ["R R", "RwR", "BPB"], {
-    R: "#forge:rods/magnetic_samarium",
-    w: "#forge:tools/wrenches",
-    B: "#forge:bolts/gold",
-    P: "#forge:plates/stainless_steel",
-  });
+  event.shapeless("gtceu:hv_item_magnet", "simplemagnets:advancedmagnet");
+
+  event.remove({id: "simplemagnets:basic_demagnetization_coil"})
+  event.remove({id: "simplemagnets:advanced_demagnetization_coil"})
 });
diff --git a/kubejs/server_scripts/sophisticated_backpacks/upgrades.js b/kubejs/server_scripts/sophisticated_backpacks/upgrades.js
index 526f416..6fc837c 100644
--- a/kubejs/server_scripts/sophisticated_backpacks/upgrades.js
+++ b/kubejs/server_scripts/sophisticated_backpacks/upgrades.js
@@ -60,7 +60,7 @@ ServerEvents.recipes((event) => {
     .assembler("magnet_upgrade")
     .itemInputs(
       "sophisticatedbackpacks:upgrade_base",
-      "simplemagnets:basicmagnet"
+      'gtceu:lv_item_magnet'
     )
     .itemOutputs("sophisticatedbackpacks:magnet_upgrade")
     .duration(50)
@@ -73,7 +73,7 @@ ServerEvents.recipes((event) => {
     .assembler("advanced_magnet_upgrade")
     .itemInputs(
       "sophisticatedbackpacks:magnet_upgrade",
-      "simplemagnets:advancedmagnet"
+      'gtceu:hv_item_magnet'
     )
     .itemOutputs("sophisticatedbackpacks:advanced_magnet_upgrade")
     .duration(50)