From 4204d05ae643c7bcd3891fa4afcb399db6c874ec Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Fri, 23 Aug 2024 11:00:37 +0200
Subject: Fix: New Alpha Ores (#2388)

Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../hannibal2/skyhanni/features/mining/OreBlock.kt | 30 +++++++++++++++-------
 .../hannibal2/skyhanni/features/mining/OreType.kt  | 14 +++++-----
 2 files changed, 28 insertions(+), 16 deletions(-)

(limited to 'src/main/java/at/hannibal2')

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
index 5b9c19556..7f5582036 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
@@ -25,7 +25,7 @@ enum class OreBlock(
     // MITHRIL
     LOW_TIER_MITHRIL(
         checkBlock = ::isLowTierMithril,
-        checkArea = { inGlacite },
+        checkArea = { inDwarvenMines || inCrystalHollows || inGlacite },
     ),
     MID_TIER_MITHRIL(
         checkBlock = { it.block == Blocks.prismarine },
@@ -133,21 +133,33 @@ enum class OreBlock(
     ),
 
     // DWARVEN BLOCKS
-    DWARVEN_REDSTONE(
-        checkBlock = { it.block == Blocks.redstone_block },
-        checkArea = { inCrystalHollows },
+    PURE_COAL(
+        checkBlock = { it.block == Blocks.coal_block },
+        checkArea = { inDwarvenMines || inCrystalHollows },
+    ),
+    PURE_IRON(
+        checkBlock = { it.block == Blocks.iron_block },
+        checkArea = { inDwarvenMines || inCrystalHollows },
     ),
-    DWARVEN_GOLD(
+    PURE_GOLD(
         checkBlock = { it.block == Blocks.gold_block },
         checkArea = { inDwarvenMines || inCrystalHollows },
     ),
-    DWARVEN_EMERALD(
+    PURE_LAPIS(
+        checkBlock = { it.block == Blocks.lapis_block },
+        checkArea = { inDwarvenMines || inCrystalHollows },
+    ),
+    PURE_REDSTONE(
+        checkBlock = { it.block == Blocks.redstone_block },
+        checkArea = { inDwarvenMines || inCrystalHollows },
+    ),
+    PURE_EMERALD(
         checkBlock = { it.block == Blocks.emerald_block },
-        checkArea = { inCrystalHollows },
+        checkArea = { inDwarvenMines || inCrystalHollows },
     ),
-    DWARVEN_DIAMOND(
+    PURE_DIAMOND(
         checkBlock = { it.block == Blocks.diamond_block },
-        checkArea = { inCrystalHollows },
+        checkArea = { inDwarvenMines || inCrystalHollows },
     ),
 
     // GEMSTONES
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/OreType.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/OreType.kt
index 6bff0262e..1c286097e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/OreType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/OreType.kt
@@ -30,37 +30,37 @@ enum class OreType(
     COAL(
         "Coal",
         "COAL",
-        listOf(OreBlock.COAL_ORE),
+        listOf(OreBlock.COAL_ORE, OreBlock.PURE_COAL),
     ),
     IRON(
         "Iron",
         "IRON_INGOT",
-        listOf(OreBlock.IRON_ORE),
+        listOf(OreBlock.IRON_ORE, OreBlock.PURE_IRON),
     ),
     GOLD(
         "Gold",
         "GOLD_INGOT",
-        listOf(OreBlock.GOLD_ORE, OreBlock.DWARVEN_GOLD),
+        listOf(OreBlock.GOLD_ORE, OreBlock.PURE_GOLD),
     ),
     LAPIS(
         "Lapis Lazuli",
         "INK_SACK-4",
-        listOf(OreBlock.LAPIS_ORE),
+        listOf(OreBlock.LAPIS_ORE, OreBlock.PURE_LAPIS),
     ),
     REDSTONE(
         "Redstone",
         "REDSTONE",
-        listOf(OreBlock.REDSTONE_ORE, OreBlock.DWARVEN_REDSTONE),
+        listOf(OreBlock.REDSTONE_ORE, OreBlock.PURE_REDSTONE),
     ),
     EMERALD(
         "Emerald",
         "EMERALD",
-        listOf(OreBlock.EMERALD_ORE, OreBlock.DWARVEN_EMERALD),
+        listOf(OreBlock.EMERALD_ORE, OreBlock.PURE_EMERALD),
     ),
     DIAMOND(
         "Diamond",
         "DIAMOND",
-        listOf(OreBlock.DIAMOND_ORE, OreBlock.DWARVEN_DIAMOND),
+        listOf(OreBlock.DIAMOND_ORE, OreBlock.PURE_DIAMOND),
     ),
     NETHERRACK(
         "Netherrack",
-- 
cgit