Occultism Crushing Fix

CHANGELOG.md

@@ -3,6 +3,7 @@
 #### 🦟 Bugs Fixed
 
 -   Fixed issue with quest reward Scraper not accepting enchants [\#41](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/41)
+-   Fix issue with Occultism crushing [\#47](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/47)
 
 ---
 

kubejs/server_scripts/constants/mod_priorities.js

@@ -0,0 +1,4 @@
+//priority: 1001
+
+// priority of which mod output should come from, if applicable
+const mod_priorities = ['minecraft', 'mekanism', 'modern_industrialization', 'occultism'];

kubejs/server_scripts/functions.js

@@ -0,0 +1,21 @@
+//priority: 1005
+
+function getPreferredItemInTag(tag) {
+    return (
+        Ingredient.of(tag)
+            .stacks.toArray()
+            .sort(({ mod: a }, { mod: b }) => compareIndices(a, b, tag))[0] || Item.of(air)
+    );
+}
+
+function compareIndices(a, b, tag) {
+    if (a == b) return 0; // iff a == b, they'll be found at the same position in modPriorities
+
+    for (let mod of mod_priorities) {
+        if (mod == a) return -1; // if a comes before b, then idx(a) < idx(b), so -1
+        if (mod == b) return 1; // if a comes after b, then idx(a) > idx(b), so 1
+    }
+
+    console.error('[' + a + ', ' + b + '] were both unaccounted for in mod unification' + (tag ? ' for ' + tag : '!'));
+    return 0;
+}

kubejs/server_scripts/recipes/occultism/crushing.js

@@ -6,25 +6,52 @@ ServerEvents.recipes((event) => {
             ingredient: { item: 'justdirethings:coal_t2' },
             ignore_crushing_multiplier: true,
             result: {
-                type: 'occultism:tag',
-                tag: 'c:dusts/blaze',
+                type: 'occultism:item',
+                id: 'minecraft:blaze_powder',
                 count: 6
             },
             id: `${id_prefix}blaze_powder_from_coal_t2`
         },
         {
             ingredient: { tag: 'c:rods/blaze' },
             ignore_crushing_multiplier: true,
-
             result: {
-                type: 'occultism:tag',
-                tag: 'c:dusts/blaze',
+                type: 'occultism:item',
+                id: 'minecraft:blaze_powder',
                 count: 4
             },
             id: `occultism:crushing/blaze_powder_from_rod`
+        },
+        {
+            ingredient: { tag: 'c:ores/uraninite' },
+            ignore_crushing_multiplier: false,
+            result: {
+                type: 'occultism:item',
+                id: 'powah:uraninite_raw',
+                count: 4
+            },
+            id: `${id_prefix}uraninite_raw`
         }
     ];
 
+    event.forEachRecipe({ type: 'occultism:crushing' }, (r) => {
+        let recipe = JSON.parse(r.json);
+        let recipe_id = r.getId();
+
+        if (recipe.result.type == 'occultism:tag') {
+            // console.log(`Found a tagged output: ${recipe.result.tag}`);
+            // console.log(`Preferred output: ${getPreferredItemInTag(`#${recipe.result.tag}`).getId()}`);
+
+            recipe.result.type = 'occultism:item';
+            recipe.result.id = getPreferredItemInTag(`#${recipe.result.tag}`).getId();
+            recipe.id = recipe_id;
+
+            delete recipe.result.tag;
+
+            recipes.push(recipe);
+        }
+    });
+
     recipes.forEach((recipe) => {
         recipe.type = 'occultism:crushing';
         event.custom(recipe).id(recipe.id);