From 610ec8130312480a7c0e35710b32ff4523d8410e Mon Sep 17 00:00:00 2001
From: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com>
Date: Wed, 16 Apr 2025 14:38:40 -0700
Subject: [PATCH] Add compatibility with Modern Industrialization, Forestry,
 Nature Arise Closes #132

---
 changelog.md                                  |  1 +
 .../thedarkcolour/exdeorum/compat/ModIds.java |  3 +++
 .../exdeorum/compat/PreferredOres.java        | 20 +++++++++++--------
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/changelog.md b/changelog.md
index 4e1a2868..348eaf69 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,6 @@
 ## Ex Deorum 1.45
 - Allow changing drops for Random Armor Trim and Pottery Sherd, also add Tide to possible trims (#138)
+- Add compatibility with Modern Industrialization, Forestry, Nature Arise ()
 
 ## Ex Deorum 1.44
 - Fix Silkworms not applying to certain modded leaves like TFC
diff --git a/src/main/java/thedarkcolour/exdeorum/compat/ModIds.java b/src/main/java/thedarkcolour/exdeorum/compat/ModIds.java
index 5f730328..f51e61fe 100644
--- a/src/main/java/thedarkcolour/exdeorum/compat/ModIds.java
+++ b/src/main/java/thedarkcolour/exdeorum/compat/ModIds.java
@@ -50,4 +50,7 @@ public class ModIds {
     public static final String CYCLIC = "cyclic";
     public static final String SKYBLOCK_BUILDER = "skyblockbuilder";
     public static final String IMMERSIVE_ENGINEERING = "immersiveengineering";
+    public static final String NATURE_ARISE = "nature_arise";
+    public static final String MODERN_INDUSTRIALIZATION = "modern_industrialization";
+    public static final String FORESTRY = "forestry";
 }
diff --git a/src/main/java/thedarkcolour/exdeorum/compat/PreferredOres.java b/src/main/java/thedarkcolour/exdeorum/compat/PreferredOres.java
index 1287da78..e99a85f0 100644
--- a/src/main/java/thedarkcolour/exdeorum/compat/PreferredOres.java
+++ b/src/main/java/thedarkcolour/exdeorum/compat/PreferredOres.java
@@ -39,7 +39,7 @@ import java.util.Comparator;
 import java.util.Map;
 
 public class PreferredOres {
-    private static final Map<TagKey<Item>, Item> PREFERRED_ORE_ITEMS = new Object2ObjectOpenHashMap<>(11, Hash.DEFAULT_LOAD_FACTOR);
+    private static final Map<TagKey<Item>, Item> PREFERRED_ORE_ITEMS = new Object2ObjectOpenHashMap<>(15, Hash.DEFAULT_LOAD_FACTOR);
 
     static {
         putPreferredOre(EItemTags.ORES_ALUMINUM, EConfig.COMMON.preferredAluminumOre, getDefaultAluminumOre());
@@ -104,7 +104,11 @@ public class PreferredOres {
     }
 
     public static Item getDefaultAluminumOre() {
-        return defaultItem("aluminum_ore", ModIds.ALL_THE_ORES, ModIds.IMMERSIVE_ENGINEERING);
+        var item = defaultItem("aluminum_ore", ModIds.ALL_THE_ORES, ModIds.IMMERSIVE_ENGINEERING, ModIds.NATURE_ARISE);
+        if (item == Items.AIR && ModList.get().isLoaded(ModIds.MODERN_INDUSTRIALIZATION)) {
+            item = defaultItem("bauxite_ore", ModIds.MODERN_INDUSTRIALIZATION);
+        }
+        return item;
     }
 
     public static Item getDefaultCobaltOre() {
@@ -116,15 +120,15 @@ public class PreferredOres {
     }
 
     public static Item getDefaultLeadOre() {
-        return defaultItem("lead_ore", ModIds.ALL_THE_ORES, ModIds.GREG, ModIds.MEKANISM, ModIds.RAILCRAFT, ModIds.FACTORIUM, ModIds.NUCLEARCRAFT_NEOTERIC, ModIds.IMMERSIVE_ENGINEERING);
+        return defaultItem("lead_ore", ModIds.ALL_THE_ORES, ModIds.GREG, ModIds.MODERN_INDUSTRIALIZATION, ModIds.MEKANISM, ModIds.RAILCRAFT, ModIds.FACTORIUM, ModIds.NUCLEARCRAFT_NEOTERIC, ModIds.IMMERSIVE_ENGINEERING);
     }
 
     public static Item getDefaultPlatinumOre() {
-        return defaultItem("platinum_ore", ModIds.ALL_THE_ORES, ModIds.GREG, ModIds.FACTORIUM, ModIds.NUCLEARCRAFT_NEOTERIC);
+        return defaultItem("platinum_ore", ModIds.ALL_THE_ORES, ModIds.GREG, ModIds.MODERN_INDUSTRIALIZATION, ModIds.FACTORIUM, ModIds.NUCLEARCRAFT_NEOTERIC);
     }
 
     public static Item getDefaultNickelOre() {
-        var item = defaultItem("nickel_ore", ModIds.ALL_THE_ORES, ModIds.GREG, ModIds.THERMAL, ModIds.RAILCRAFT, ModIds.FACTORIUM, ModIds.IMMERSIVE_ENGINEERING);
+        var item = defaultItem("nickel_ore", ModIds.ALL_THE_ORES, ModIds.GREG, ModIds.MODERN_INDUSTRIALIZATION, ModIds.THERMAL, ModIds.RAILCRAFT, ModIds.FACTORIUM, ModIds.IMMERSIVE_ENGINEERING);
 
         if (item == Items.AIR && ModList.get().isLoaded(ModIds.IMMERSIVE_ENGINEERING)) {
             item = defaultItem("ore_nickel", ModIds.IMMERSIVE_ENGINEERING);
@@ -134,7 +138,7 @@ public class PreferredOres {
     }
 
     public static Item getDefaultUraniumOre() {
-        var item = defaultItem("uranium_ore", ModIds.ALL_THE_ORES, ModIds.MEKANISM, ModIds.BIGGER_REACTORS, ModIds.NUCLEARCRAFT_NEOTERIC, ModIds.IMMERSIVE_ENGINEERING);
+        var item = defaultItem("uranium_ore", ModIds.ALL_THE_ORES, ModIds.MODERN_INDUSTRIALIZATION, ModIds.MEKANISM, ModIds.BIGGER_REACTORS, ModIds.NUCLEARCRAFT_NEOTERIC, ModIds.IMMERSIVE_ENGINEERING);
 
         if (item == Items.AIR && ModList.get().isLoaded(ModIds.EXTREME_REACTORS)) {
             item = defaultItem("yellorite_ore", ModIds.EXTREME_REACTORS);
@@ -148,7 +152,7 @@ public class PreferredOres {
     }
 
     public static Item getDefaultTinOre() {
-        return defaultItem("tin_ore", ModIds.ALL_THE_ORES, ModIds.GREG, ModIds.THERMAL, ModIds.MEKANISM, ModIds.RAILCRAFT, ModIds.FACTORIUM, ModIds.NUCLEARCRAFT_NEOTERIC);
+        return defaultItem("tin_ore", ModIds.ALL_THE_ORES, ModIds.GREG, ModIds.MODERN_INDUSTRIALIZATION, ModIds.THERMAL, ModIds.MEKANISM, ModIds.FORESTRY, ModIds.RAILCRAFT, ModIds.FACTORIUM, ModIds.NUCLEARCRAFT_NEOTERIC);
     }
 
     public static Item getDefaultZincOre() {
@@ -156,7 +160,7 @@ public class PreferredOres {
     }
 
     public static Item getDefaultIridiumOre() {
-        return defaultItem("iridium_ore", ModIds.ALL_THE_ORES);
+        return defaultItem("iridium_ore", ModIds.ALL_THE_ORES, ModIds.MODERN_INDUSTRIALIZATION);
     }
 
     public static Item getDefaultThoriumOre() {