Backend: Add mid-tier Umber (#3028)

hannibal002 · Dec 8, 2024 · 4cb3985 · 4cb3985
1 parent 2e19069
commit 4cb3985
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 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
@@ -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
@@ -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",