Merge pull request #865 from MuteTiefling/SimpleMagnets

Simple Magnets Integration
EnigmaticaModpacks · Feb 9, 2024 · 05dfd1c · 05dfd1c
2 parents 27c01ec + dff7d28
commit 05dfd1c
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 1 deletion.
diff --git a/kubejs/client_scripts/base/tooltips.js b/kubejs/client_scripts/base/tooltips.js
@@ -197,7 +197,11 @@ ItemEvents.tooltip((event) => {
             text: [Text.of(`Arcane Apparatus: Detects Aura Levels`).green()]
         },
         {
-            items: ['naturesaura:pickup_stopper'],
+            items: [
+                'naturesaura:pickup_stopper',
+                'simplemagnets:basic_demagnetization_coil',
+                'simplemagnets:advanced_demagnetization_coil'
+            ],
             text: [Text.of(`Arcane Apparatus: Anti-Magnet`).green()]
         },
         {

diff --git a/kubejs/client_scripts/constants/jei_hidden_disabled.js b/kubejs/client_scripts/constants/jei_hidden_disabled.js
@@ -626,6 +626,9 @@ jei.expert.items.disabled = [
     'rftoolsbase:information_screen',
     'rftoolsbase:crafting_card',
 
+    'simplemagnets:basicmagnet',
+    'simplemagnets:advancedmagnet',
+
     'sophisticatedbackpacks:advanced_feeding_upgrade',
     'sophisticatedbackpacks:feeding_upgrade',
     'sophisticatedbackpacks:advanced_pump_upgrade',

diff --git a/kubejs/server_scripts/expert/recipes/enigmatica/remove.js b/kubejs/server_scripts/expert/recipes/enigmatica/remove.js
@@ -484,6 +484,9 @@ ServerEvents.recipes((event) => {
         { id: 'sophisticatedstorage:basic_to_diamond_tier_upgrade' },
         { id: 'sophisticatedstorage:basic_to_gold_tier_upgrade' },
 
+        { id: 'simplemagnets:basicmagnet' },
+        { id: 'simplemagnets:advancedmagnet' },
+
         { id: 'simplytools:diamond_hammer_head' },
         { id: 'simplytools:diamond_hammer' },
         { id: 'simplytools:diamond_excavator_head' },

diff --git a/kubejs/server_scripts/expert/recipes/simplemagnets/shaped.js b/kubejs/server_scripts/expert/recipes/simplemagnets/shaped.js
@@ -0,0 +1,32 @@
+ServerEvents.recipes((event) => {
+    if (global.isExpertMode == false) {
+        return;
+    }
+    const id_prefix = 'enigmatica:base/simplemagnets/shaped/';
+    const recipes = [
+        {
+            output: 'simplemagnets:basic_demagnetization_coil',
+            pattern: [' A ', ' B ', 'ACA'],
+            key: {
+                A: 'occultism:otherstone',
+                B: 'immersiveengineering:coil_lv',
+                C: 'minecraft:observer'
+            },
+            id: 'simplemagnets:basic_demagnetization_coil'
+        },
+        {
+            output: 'simplemagnets:advanced_demagnetization_coil',
+            pattern: [' A ', ' B ', 'ACA'],
+            key: {
+                A: 'occultism:otherstone',
+                B: 'immersiveengineering:coil_mv',
+                C: 'create:content_observer'
+            },
+            id: 'simplemagnets:advanced_demagnetization_coil'
+        }
+    ];
+
+    recipes.forEach((recipe) => {
+        event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id);
+    });
+});