Fixes #170

EnigmaticaModpacks · Aug 18, 2020 · b77a584 · b77a584
1 parent aee0b78
commit b77a584
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 30 deletions.
diff --git a/kubejs/data/enigmatica/kubejs/base/recipes/remove.js b/kubejs/data/enigmatica/kubejs/base/recipes/remove.js
@@ -5,7 +5,9 @@ events.listen('recipes', function (event) {
 
     var outputRemovals = [
         'additionalbars:crossed_iron_bars',
-
+        'appliedenergistics2:sky_compass',
+        'appliedenergistics2:charged_staff',
+        'appliedenergistics2:quartz_fixture',
         //'akashictome:tome',
         'laserrelays:color_filter',
 

diff --git a/kubejs/data/enigmatica/kubejs/base/recipes/shaped.js b/kubejs/data/enigmatica/kubejs/base/recipes/shaped.js
@@ -59,6 +59,18 @@ events.listen('recipes', function (event) {
         }),
         shapedRecipe('laserrelays:color_filter', ['AAA'], {
             A: '#forge:glass_panes/white'
+        }),
+        shapedRecipe('appliedenergistics2:sky_compass', [' A ', 'ABA', ' A '], {
+            A: '#forge:ingots/iron',
+            B: '#forge:gems/charged_certus_quartz'
+        }),
+        shapedRecipe('appliedenergistics2:charged_staff', ['B  ', ' A ', '  A'], {
+            A: '#forge:ingots/iron',
+            B: '#forge:gems/charged_certus_quartz'
+        }),
+        shapedRecipe('appliedenergistics2:charged_staff', ['B', ' A ', 'A  '], {
+            A: '#forge:ingots/iron',
+            B: '#forge:gems/charged_certus_quartz'
         })
     ];
 

diff --git a/kubejs/data/enigmatica/kubejs/base/recipes/shapeless.js b/kubejs/data/enigmatica/kubejs/base/recipes/shapeless.js
@@ -49,6 +49,10 @@ events.listen('recipes', function (event) {
         shapelessRecipe(item.of('patchouli:guide_book', { 'patchouli:book': 'patchouli:modded_for_dummies' }), [
             'minecraft:book',
             '#forge:dyes/yellow'
+        ]),
+        shapelessRecipe('appliedenergistics2:quartz_fixture', [
+            '#forge:gems/charged_certus_quartz',
+            '#forge:ingots/iron'
         ])
         // shapelessRecipe(
         //     {

diff --git a/kubejs/data/enigmatica/kubejs/base/recipetypes/interactio/item_fluid_transform.js b/kubejs/data/enigmatica/kubejs/base/recipetypes/interactio/item_fluid_transform.js
@@ -1,27 +1,27 @@
-// events.listen('recipes', function (event) {
-//     event.recipes.interactio.item_fluid_transform({
-//         inputs: [
-//             {
-//                 tag: 'forge:dusts/redstone',
-//                 count: 1
-//             },
-//             {
-//                 tag: 'forge:gems/charged_certus_quartz',
-//                 count: 1
-//             },
-//             {
-//                 tag: 'forge:gems/quartz',
-//                 count: 1
-//             }
-//         ],
-//         fluid: {
-//             fluid: 'water'
-//         },
-//         output: {
-//             item: 'emendatusenigmatica:gem_fluix',
-//             count: 2
-//         },
+events.listen('recipes', function (event) {
+    event.recipes.interactio.item_fluid_transform({
+        inputs: [
+            {
+                tag: 'forge:dusts/redstone',
+                count: 1
+            },
+            {
+                tag: 'forge:gems/charged_certus_quartz',
+                count: 1
+            },
+            {
+                tag: 'forge:gems/quartz',
+                count: 1
+            }
+        ],
+        fluid: {
+            fluid: 'water'
+        },
+        output: {
+            item: 'emendatusenigmatica:gem_fluix',
+            count: 2
+        },
 
-//         consume_fluid: 0.0
-//     });
-// });
+        consume_fluid: 0.0
+    });
+});
diff --git a/kubejs/data/enigmatica/kubejs/base/tags/items/forge/gems.js b/kubejs/data/enigmatica/kubejs/base/tags/items/forge/gems.js
@@ -7,14 +7,20 @@ events.listen('item.tags', function (event) {
     // event.get('forge:gems').add('rftoolsbase:dimensionalshard');
     // event.get('forge:gems/dimensional').add('rftoolsbase:dimensionalshard');
 
-    event.get(gems).add('minecraft:ender_pearl');
     event.get(gems_ender).add('minecraft:ender_pearl');
-    event.get(gems_fluix).add('appliedenergistics2:fluix_crystal');
     event.get(gems_charged_certus_quartz).add('appliedenergistics2:charged_certus_quartz_crystal');
+    event.get(gems_fluix).add('appliedenergistics2:fluix_crystal').add('appliedenergistics2:purified_fluix_crystal');
+
+    event
+        .get(gems)
+        .add('minecraft:ender_pearl')
+        .add('appliedenergistics2:purified_fluix_crystal')
+        .add('appliedenergistics2:purified_certus_quartz_crystal');
     event
         .get(gems_certus)
         .add('appliedenergistics2:certus_quartz_crystal')
         .add('appliedenergistics2:charged_certus_quartz_crystal')
         .add('emendatusenigmatica:gem_certus_quartz')
-        .add('emendatusenigmatica:gem_charged_certus_quartz');
+        .add('emendatusenigmatica:gem_charged_certus_quartz')
+        .add('appliedenergistics2:purified_certus_quartz_crystal');
 });