fix merge (i hate detekt)

Thunderblade73 · Dec 8, 2024 · e2150d4 · e2150d4
1 parent f79b99e
commit e2150d4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/BlockStrengthGuide.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/BlockStrengthGuide.kt
@@ -80,6 +80,7 @@ object BlockStrengthGuide {
             { ItemStack(Blocks.clay) },
             setOf(
                 OreBlock.LOW_TIER_UMBER,
+                OreBlock.MID_TIER_UMBER,
                 OreBlock.HIGH_TIER_UMBER,
                 OreBlock.LOW_TIER_TUNGSTEN_MINESHAFT,
                 OreBlock.LOW_TIER_TUNGSTEN_MINESHAFT,

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
@@ -85,7 +85,11 @@ enum class OreBlock(
     // DWARVEN BLOCKS
     PURE_COAL(Blocks.coal_block, { inDwarvenMines || inCrystalHollows }, OreCategory.ORE),
     PURE_IRON(Blocks.iron_block, { inDwarvenMines || inCrystalHollows }, OreCategory.ORE, hasInitSound = false),
-    PURE_GOLD(Blocks.gold_block, { inDwarvenMines || inCrystalHollows || inMineshaft }, OreCategory.ORE, hasInitSound = false),
+    PURE_GOLD(
+        Blocks.gold_block,
+        { inDwarvenMines || inCrystalHollows || inMineshaft },
+        OreCategory.ORE, hasInitSound = false,
+    ),
     PURE_LAPIS(Blocks.lapis_block, { inDwarvenMines || inCrystalHollows }, OreCategory.ORE),
     PURE_REDSTONE(Blocks.redstone_block, { inDwarvenMines || inCrystalHollows }, OreCategory.ORE, hasInitSound = false),
     PURE_EMERALD(Blocks.emerald_block, { inDwarvenMines || inCrystalHollows }, OreCategory.ORE, hasInitSound = false),
@@ -107,7 +111,7 @@ enum class OreBlock(
 
     // GLACIAL
     LOW_TIER_UMBER(::isLowTierUmber, { inGlacite }, OreCategory.DWARVEN_METAL),
-    MID_TIER_UMBER(::isMidTierUmber, { inGlacite }),
+    MID_TIER_UMBER(::isMidTierUmber, { inGlacite }, OreCategory.DWARVEN_METAL),
     HIGH_TIER_UMBER(::isHighTierUmber, { inGlacite }, OreCategory.DWARVEN_METAL),
 
     LOW_TIER_TUNGSTEN_TUNNELS(::isLowTierTungstenTunnels, { inTunnels }, OreCategory.DWARVEN_METAL),