Improvement: renamed deep caverns parkour (#1443)

4 files changed, 26 insertions, 20 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index dc3b8b2b0..6b55fd37b 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -263,7 +263,7 @@ import at.hannibal2.skyhanni.features.inventory.tiarelay.TiaRelayWaypoints
 import at.hannibal2.skyhanni.features.itemabilities.ChickenHeadTimer
 import at.hannibal2.skyhanni.features.itemabilities.FireVeilWandParticles
 import at.hannibal2.skyhanni.features.itemabilities.abilitycooldown.ItemAbilityCooldown
-import at.hannibal2.skyhanni.features.mining.DeepCavernsParkour
+import at.hannibal2.skyhanni.features.mining.DeepCavernsGuide
 import at.hannibal2.skyhanni.features.mining.HighlightMiningCommissionMobs
 import at.hannibal2.skyhanni.features.mining.KingTalismanHelper
 import at.hannibal2.skyhanni.features.mining.MiningNotifications
@@ -499,7 +499,7 @@ class SkyHanniMod {
         loadModule(AdvancedPlayerList)
         loadModule(ItemAddManager())
         loadModule(BingoCardReader())
-        loadModule(DeepCavernsParkour())
+        loadModule(DeepCavernsGuide())
         loadModule(GardenBestCropTime())
         loadModule(ActionBarData)
         loadModule(TrackerManager)
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/mining/DeepCavernsParkourConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/mining/DeepCavernsGuideConfig.java
index 9d8d1be01..9245aa32e 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/mining/DeepCavernsParkourConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/mining/DeepCavernsGuideConfig.java
@@ -8,10 +8,10 @@ import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 import io.github.notenoughupdates.moulconfig.observer.Property;
 
-public class DeepCavernsParkourConfig {
+public class DeepCavernsGuideConfig {
 
     @Expose
-    @ConfigOption(name = "Enabled", desc = "Shows a parkour to the bottom of Deep Caverns and to Rhys.")
+    @ConfigOption(name = "Enabled", desc = "Shows a guide to the bottom of the Deep Caverns and to Rhys.")
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean enabled = true;
@@ -27,12 +27,12 @@ public class DeepCavernsParkourConfig {
     public Property<Boolean> rainbowColor = Property.of(true);
 
     @Expose
-    @ConfigOption(name = "Monochrome Color", desc = "Set a boring monochrome color for the parkour platforms.")
+    @ConfigOption(name = "Monochrome Color", desc = "Set a boring monochrome color for the guide waypoints.")
     @ConfigEditorColour
     public Property<String> monochromeColor = Property.of("0:60:0:0:255");
 
-    @Expose
-    @ConfigOption(name = "Highlight all Lines", desc = "Show all lines in gray. Useful for debugging.")
-    @ConfigEditorBoolean
-    public boolean highlightAllLines = false;
+//     @Expose
+//     @ConfigOption(name = "Highlight all Lines", desc = "Show all lines in gray. Useful for debugging.")
+//     @ConfigEditorBoolean
+//     public boolean highlightAllLines = false;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java
index 2393df0f7..a4f7f299e 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java
@@ -24,9 +24,9 @@ public class MiningConfig {
     public KingTalismanConfig kingTalisman = new KingTalismanConfig();
 
     @Expose
-    @ConfigOption(name = "Deep Caverns Parkour", desc = "")
+    @ConfigOption(name = "Deep Caverns Guide", desc = "")
     @Accordion
-    public DeepCavernsParkourConfig deepCavernsParkour = new DeepCavernsParkourConfig();
+    public DeepCavernsGuideConfig deepCavernsGuide = new DeepCavernsGuideConfig();
 
     @Expose
     @ConfigOption(name = "Area Walls", desc = "")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/DeepCavernsParkour.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/DeepCavernsGuide.kt
index 5fc57e010..f0b72c539 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/DeepCavernsParkour.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/DeepCavernsGuide.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.mining
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.data.jsonobjects.repo.ParkourJson
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
@@ -24,9 +25,9 @@ import net.minecraft.client.player.inventory.ContainerLocalMenu
 import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
-class DeepCavernsParkour {
+class DeepCavernsGuide {
 
-    private val config get() = SkyHanniMod.feature.mining.deepCavernsParkour
+    private val config get() = SkyHanniMod.feature.mining.deepCavernsGuide
 
     private var parkourHelper: ParkourHelper? = null
     private var show = false
@@ -36,12 +37,12 @@ class DeepCavernsParkour {
         val neuItem = "MAP".asInternalName().getItemStack()
         Utils.createItemStack(
             neuItem.item,
-            "§bDeep Caverns Parkour",
+            "§bDeep Caverns Guide",
             "§8(From SkyHanni)",
             "",
             "§7Manually enable the ",
-            "§7Parkour to the bottom",
-            "§7of Deep Caverns."
+            "§7guide to the bottom",
+            "§7of the Deep Caverns."
         )
     }
 
@@ -94,7 +95,7 @@ class DeepCavernsParkour {
             if (it.displayName != "§aObsidian Sanctuary") {
                 if (!show) {
                     start()
-                    ChatUtils.chat("Automatically enabling Deep Caverns Parkour, helping you find the way to the bottom of Deep Caverns and the path to Rhys.")
+                    ChatUtils.chat("Automatically enabling Deep Caverns Guide, helping you find the way to the bottom of the Deep Caverns and the path to Rhys.")
                 }
             }
         }
@@ -120,16 +121,16 @@ class DeepCavernsParkour {
     @SubscribeEvent
     fun replaceItem(event: ReplaceItemEvent) {
         if (show) return
-        if (event.inventory is ContainerLocalMenu && showStartIcon && event.slotNumber == 40) {
+        if (event.inventory is ContainerLocalMenu && showStartIcon && event.slotNumber == 49) {
             event.replaceWith(startIcon)
         }
     }
 
     @SubscribeEvent(priority = EventPriority.HIGH)
     fun onSlotClick(event: GuiContainerEvent.SlotClickEvent) {
-        if (showStartIcon && event.slotId == 40) {
+        if (showStartIcon && event.slotId == 49) {
             event.isCanceled = true
-            ChatUtils.chat("Manually enabled Deep Caverns Parkour.")
+            ChatUtils.chat("Manually enabled Deep Caverns Guide.")
             start()
         }
     }
@@ -143,4 +144,9 @@ class DeepCavernsParkour {
     }
 
     fun isEnabled() = IslandType.DEEP_CAVERNS.isInIsland() && config.enabled
+
+    @SubscribeEvent
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
+        event.move(38, "mining.deepCavernsParkour", "mining.deepCavernsGuide")
+    }
 }