From 4cb398568f733483523337ec3da7f74493221ba4 Mon Sep 17 00:00:00 2001
From: Luna <lunaynx@gmail.com>
Date: Sun, 8 Dec 2024 03:08:15 +0100
Subject: [PATCH] Backend: Add mid-tier Umber (#3028)

---
 .../java/at/hannibal2/skyhanni/features/mining/OreBlock.kt | 7 +++++--
 .../java/at/hannibal2/skyhanni/features/mining/OreType.kt  | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

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 8fd37964c66c..8bd5a79298c0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
@@ -95,6 +95,7 @@ enum class OreBlock(
 
     // GLACIAL
     LOW_TIER_UMBER(::isLowTierUmber, { inGlacite }),
+    MID_TIER_UMBER(::isMidTierUmber, { inGlacite }),
     HIGH_TIER_UMBER(::isHighTierUmber, { inGlacite }),
 
     LOW_TIER_TUNGSTEN_TUNNELS(::isLowTierTungstenTunnels, { inTunnels }),
@@ -166,8 +167,10 @@ private fun isRedSand(state: IBlockState): Boolean =
     (state.block == Blocks.sand && state.getValue(BlockSand.VARIANT) == BlockSand.EnumType.RED_SAND)
 
 private fun isLowTierUmber(state: IBlockState): Boolean =
-    state.block == Blocks.hardened_clay ||
-        (state.block == Blocks.stained_hardened_clay && state.getValue(BlockColored.COLOR) == EnumDyeColor.BROWN)
+    state.block == Blocks.hardened_clay
+
+private fun isMidTierUmber(state: IBlockState): Boolean =
+    (state.block == Blocks.stained_hardened_clay && state.getValue(BlockColored.COLOR) == EnumDyeColor.BROWN)
 
 private fun isHighTierUmber(state: IBlockState): Boolean =
     (state.block == Blocks.double_stone_slab2 && state.getValue(BlockStoneSlabNew.VARIANT) == BlockStoneSlabNew.EnumType.RED_SANDSTONE)
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 1c4baa432001..67c7c8dca4d8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/OreType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/OreType.kt
@@ -173,7 +173,7 @@ enum class OreType(
     UMBER(
         "Umber",
         "UMBER",
-        OreBlock.LOW_TIER_UMBER, OreBlock.HIGH_TIER_UMBER,
+        OreBlock.LOW_TIER_UMBER, OreBlock.MID_TIER_UMBER, OreBlock.HIGH_TIER_UMBER,
     ),
     TUNGSTEN(
         "Tungsten",