Dungeon Score improvements (on another branch)

mod/src/main/kotlin/gg/skytils/skytilsmod/Skytils.kt

@@ -291,7 +291,6 @@ object Skytils : CoroutineScope, EventSubscriber {
             NamespacedCommands,
             DamageSplash,
             Funny,
-            ScoreCalculation,
         ).forEach(MinecraftForge.EVENT_BUS::register)
 
         arrayOf(
@@ -365,6 +364,7 @@ object Skytils : CoroutineScope, EventSubscriber {
             RandomStuff,
             RelicWaypoints,
             ScamCheck,
+            ScoreCalculation,
             SelectAllColorSolver,
             ServerPayloadInterceptor,
             ShootTheTargetSolver,

mod/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt

@@ -449,14 +449,18 @@ object Config : Vigilant(
     var showScoreCalculation = false
 
     @Property(
-        type = PropertyType.SWITCH, name = "Minimized Dungeon Score Estimate",
-        description = "Only shows the dungeon score.",
-        category = "Dungeons", subcategory = "Score Calculation",
-        i18nName = "skytils.config.dungeons.score_calculation.minimized_dungeon_score_estimate",
-        i18nCategory = "skytils.config.dungeons",
-        i18nSubcategory = "skytils.config.dungeons.score_calculation"
+        type = PropertyType.SWITCH, name = "Show Dungeon Status",
+        description = "Shows information about the current dungeon run that affects its score. Disabling this will minimize the dungeon score.",
+        category = "Dungeons", subcategory = "Score Calculation"
     )
-    var minimizedScoreCalculation = false
+    var showDungeonStatus = true
+
+    @Property(
+        type = PropertyType.SWITCH, name = "Dungeon Score Breakdown",
+        description = "Shows every score category as opposed to only total score.",
+        category = "Dungeons", subcategory = "Score Calculation"
+    )
+    var showScoreBreakdown = true
 
     @Property(
         type = PropertyType.SWITCH, name = "Score Calculation Party Assist",
@@ -4370,6 +4374,9 @@ object Config : Vigilant(
         addDependency("kuudraChestProfitIncludesEssence", "kuudraChestProfit")
         addDependency("kuudraChestProfitCountsKey", "kuudraChestProfit")
 
+        addDependency("showDungeonStatus", "showScoreCalculation")
+        addDependency("showScoreBreakdown", "showScoreCalculation")
+
         addDependency("message270Score", "sendMessageOn270Score")
         addDependency("messageTitle270Score", "createTitleOn270Score")
 

mod/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/DungeonChestProfit.kt

@@ -98,9 +98,8 @@ object DungeonChestProfit : EventSubscriber {
             GlStateManager.pushMatrix()
             GlStateManager.translate(
                 (-(event.gui as AccessorGuiContainer).guiLeft).toDouble(),
-                -(event.gui as AccessorGuiContainer).guiTop.toDouble(),
-                299.0
-            )
+                -(event.gui as AccessorGuiContainer).guiTop.toDouble() + DungeonChest.entries.count { it.items.isNotEmpty() } * ScreenRenderer.fontRenderer.FONT_HEIGHT,
+                299.0)
             drawChestProfit(chestType)
             GlStateManager.popMatrix()
         } else if (croesusChestRegex.matches(event.chestName)) {
@@ -181,7 +180,7 @@ object DungeonChestProfit : EventSubscriber {
         } else {
             val unformatted = name.stripControlCodes().replace("Shiny ", "")
             ItemFeatures.itemIdToNameLookup.entries.find {
-                it.value == unformatted && !it.value.contains("STARRED")
+                it.value == unformatted && !it.key.contains("STARRED")
             }?.key
         }
     }

mod/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/DungeonFeatures.kt

@@ -39,12 +39,12 @@ import gg.skytils.event.register
 import gg.skytils.skytilsmod.Skytils
 import gg.skytils.skytilsmod.Skytils.mc
 import gg.skytils.skytilsmod.Skytils.prefix
+import gg.skytils.skytilsmod._event.DungeonPuzzleResetEvent
 import gg.skytils.skytilsmod._event.MainThreadPacketReceiveEvent
 import gg.skytils.skytilsmod._event.PacketReceiveEvent
 import gg.skytils.skytilsmod._event.PacketSendEvent
 import gg.skytils.skytilsmod.core.GuiManager
 import gg.skytils.skytilsmod.core.structure.GuiElement
-import gg.skytils.skytilsmod.events.impl.skyblock.DungeonEvent
 import gg.skytils.skytilsmod.features.impl.dungeons.catlas.handlers.DungeonInfo
 import gg.skytils.skytilsmod.features.impl.handlers.MayorInfo
 import gg.skytils.skytilsmod.listeners.DungeonListener
@@ -104,7 +104,7 @@ object DungeonFeatures : EventSubscriber {
     private var lastLitUpTime = -1L
     private val lastBlockPos = BlockPos(7, 77, 34)
     private var startWithoutFullParty = false
-    private var blazes = 0
+    var blazes = 0
     var hasClearedText = false
     private var terracottaSpawns = hashMapOf<BlockPos, Long>()
     private val dungeonMobSpawns = setOf(
@@ -342,7 +342,7 @@ object DungeonFeatures : EventSubscriber {
         }
     }
 
-    fun onPuzzleReset(event: DungeonEvent.PuzzleEvent.Reset) {
+    fun onPuzzleReset(event: DungeonPuzzleResetEvent) {
         if (!Utils.inDungeons) return
         if (event.puzzle == "Higher Or Lower") {
             blazes = 0