From ea396d4047c34b995d7faf18209105b74843d719 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 1 Nov 2023 10:51:30 +0100
Subject: code cleanup

---
 .../skyhanni/features/bingo/BingoNextStepHelper.kt | 57 ++++++++++++----------
 1 file changed, 31 insertions(+), 26 deletions(-)

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

diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt
index a09a611b9..fd077824b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt
@@ -315,6 +315,33 @@ class BingoNextStepHelper {
         IslandType.DEEP_CAVERNS.getStep() requires IslandType.GOLD_MINES.getStep()
         IslandType.DEEP_CAVERNS.getStep() requires SkillLevelStep("Mining", 5)
 
+        rhys()
+        IslandType.DWARVEN_MINES.getStep() requires SkillLevelStep(
+            "Mining",
+            12
+        ).also { it requires IslandType.THE_FARMING_ISLANDS.getStep() }
+
+        IslandType.CRYSTAL_HOLLOWS.getStep() requires IslandType.DWARVEN_MINES.getStep()
+
+        // TODO add SkyBlock level requirement
+//        IslandType.GARDEN.getStep() requires SkyBlockLevelStep(6)
+        IslandType.GARDEN.getStep() requires IslandType.HUB.getStep()
+
+        val farmingContest = ChatMessageStep("Farming Contest")
+        farmingContest requires SkillLevelStep("Farming", 10)
+        itemPreconditions["Jacob's Ticket"] = farmingContest
+
+        IslandType.DWARVEN_MINES.getStep().makeFinalStep()
+        ChatMessageStep("Get Ender Armor").makeFinalStep() requires IslandType.THE_END.getStep()
+        IslandType.THE_END.getStep() requires SkillLevelStep(
+            "Combat",
+            12
+        ).also { it requires IslandType.DEEP_CAVERNS.getStep() }
+//        enchantedCharcoal(7)
+//        compactor(7)
+    }
+
+    private fun rhys() {
         val redstoneForRhys = PartialProgressItemsStep(
             rhysTaskName,
             "Redstone",
@@ -339,32 +366,10 @@ class BingoNextStepHelper {
         )
         coalForRhys requires IslandType.DEEP_CAVERNS.getStep()
 
-        IslandType.DWARVEN_MINES.getStep() requires redstoneForRhys
-        IslandType.DWARVEN_MINES.getStep() requires lapisForRhys
-        IslandType.DWARVEN_MINES.getStep() requires coalForRhys
-        IslandType.DWARVEN_MINES.getStep() requires SkillLevelStep(
-            "Mining",
-            12
-        ).also { it requires IslandType.THE_FARMING_ISLANDS.getStep() }
-
-        IslandType.CRYSTAL_HOLLOWS.getStep() requires IslandType.DWARVEN_MINES.getStep()
-
-        // TODO add SkyBlock level requirement
-//        IslandType.GARDEN.getStep() requires SkyBlockLevelStep(6)
-        IslandType.GARDEN.getStep() requires IslandType.HUB.getStep()
-
-        val farmingContest = ChatMessageStep("Farming Contest")
-        farmingContest requires SkillLevelStep("Farming", 10)
-        itemPreconditions["Jacob's Ticket"] = farmingContest
-
-        IslandType.DWARVEN_MINES.getStep().makeFinalStep()
-        ChatMessageStep("Get Ender Armor").makeFinalStep() requires IslandType.THE_END.getStep()
-        IslandType.THE_END.getStep() requires SkillLevelStep(
-            "Combat",
-            12
-        ).also { it requires IslandType.DEEP_CAVERNS.getStep() }
-//        enchantedCharcoal(7)
-//        compactor(7)
+        val mines = IslandType.DWARVEN_MINES.getStep()
+        mines requires redstoneForRhys
+        mines requires lapisForRhys
+        mines requires coalForRhys
     }
 
     private fun compactor(amount: Long) {
-- 
cgit