Partial Fix for EnigmaticaModpacks#677 . Waiting for mod updates now!

Kanzaji · Aug 30, 2023 · ceac3fe · ceac3fe
1 parent 4e9685d
commit ceac3fe
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 18 deletions.
diff --git a/config/almostunified/unify.json b/config/almostunified/unify.json
@@ -113,11 +113,15 @@
         "sugar_cane"
     ],
     "priorityOverrides": {
-        "forge:ores/iron": "emendatusenigmatica",
-        "forge:ores/emerald": "emendatusenigmatica",
         "forge:ores/copper": "emendatusenigmatica",
+        "forge:ores/iron": "emendatusenigmatica",
+        "forge:ores/gold": "emendatusenigmatica",
         "forge:ores/diamond": "emendatusenigmatica",
-        "forge:ores/gold": "emendatusenigmatica"
+        "forge:ores/emerald": "emendatusenigmatica",
+        "forge:ores/redstone": "emendatusenigmatica",
+        "forge:ores/lapis": "emendatusenigmatica",
+        "forge:ores/coal": "emendatusenigmatica",
+        "forge:ores/quartz": "emendatusenigmatica"
     },
     "tagOwnerships": {
         "forge:storage_blocks/sky": ["forge:storage_blocks/skies"],

diff --git a/config/emendatusenigmatica/material/copper.json b/config/emendatusenigmatica/material/copper.json
@@ -4,11 +4,8 @@
     "localizedName": "Copper",
     "disableDefaultOre": true,
     "processedTypes": [
-        "storage_block",
         "ore",
-        "raw",
         "crushed_ore",
-        "ingot",
         "nugget",
         "dust",
         "plate",

diff --git a/config/emendatusenigmatica/material/diamond.json b/config/emendatusenigmatica/material/diamond.json
@@ -5,7 +5,6 @@
     "disableDefaultOre": true,
     "processedTypes": [
       "ore",
-      "storage_block",
       "dust",
       "gear"
     ],

diff --git a/config/emendatusenigmatica/material/emerald.json b/config/emendatusenigmatica/material/emerald.json
@@ -5,7 +5,6 @@
     "disableDefaultOre": true,
     "processedTypes": [
       "ore",
-      "storage_block",
       "dust",
       "gear"
     ],

diff --git a/config/emendatusenigmatica/material/gold.json b/config/emendatusenigmatica/material/gold.json
@@ -4,12 +4,8 @@
     "localizedName": "Gold",
     "disableDefaultOre": true,
     "processedTypes": [
-        "storage_block",
         "ore",
-        "raw",
         "crushed_ore",
-        "ingot",
-        "nugget",
         "dust",
         "plate",
         "rod",

diff --git a/config/emendatusenigmatica/material/iron.json b/config/emendatusenigmatica/material/iron.json
@@ -4,12 +4,8 @@
     "localizedName": "Iron",
     "disableDefaultOre": true,
     "processedTypes": [
-        "storage_block",
         "ore",
-        "raw",
         "crushed_ore",
-        "ingot",
-        "nugget",
         "dust",
         "plate",
         "rod",

diff --git a/config/emendatusenigmatica/material/netherite.json b/config/emendatusenigmatica/material/netherite.json
@@ -3,8 +3,6 @@
     "source": "vanilla",
     "localizedName": "Netherite",
     "processedTypes": [
-        "storage_block",
-        "ingot",
         "nugget",
         "dust",
         "gear",

diff --git a/kubejs/client_scripts/base/emi_add_items.js b/kubejs/client_scripts/base/emi_add_items.js
@@ -23,6 +23,7 @@ ClientEvents.highPriorityAssets((event) => {
             { stack: 'item:immersiveengineering:silo' },
             { stack: 'item:immersiveengineering:squeezer' },
             { stack: 'item:immersiveengineering:tank' },
+            { stack: 'item:occultism:iesnium_ore' },
             { stack: 'item:emendatusenigmatica:bitumen_sandstone_ore' },
             { stack: 'item:minecraft:enchanted_book{StoredEnchantments:[{id:"ars_nouveau:reactive",lvl:1s}]}' },
             { stack: 'item:minecraft:enchanted_book{StoredEnchantments:[{id:"ars_nouveau:reactive",lvl:2s}]}' },
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ @@
         "disableDefaultOre": true,
         "processedTypes": [
           "ore",
-          "storage_block",
           "dust",
           "gear"
         ],
@@ Expand Down @@