Merge branch 'main' into kt/chat

Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
PartlySaneStudios · Jul 24, 2024 · fce5a91 · fce5a91
2 parents 12a5609 + fa52c71
commit fce5a91
Show file tree

Hide file tree

Showing 14 changed files with 298 additions and 265 deletions.
diff --git a/src/main/java/me/partlysanestudios/partlysaneskies/features/mining/MiningEvents.java b/src/main/java/me/partlysanestudios/partlysaneskies/features/mining/MiningEvents.java
diff --git a/src/main/kotlin/me/partlysanestudios/partlysaneskies/PartlySaneSkies.kt b/src/main/kotlin/me/partlysanestudios/partlysaneskies/PartlySaneSkies.kt
@@ -83,11 +83,11 @@ import me.partlysanestudios.partlysaneskies.features.gui.hud.rngdropbanner.DropW
 import me.partlysanestudios.partlysaneskies.features.gui.hud.rngdropbanner.RareDropGUIManager
 import me.partlysanestudios.partlysaneskies.features.gui.mainmenu.PSSMainMenu
 import me.partlysanestudios.partlysaneskies.features.information.WikiArticleOpener
-import me.partlysanestudios.partlysaneskies.features.mining.MiningEvents
 import me.partlysanestudios.partlysaneskies.features.mining.PickaxeWarning
 import me.partlysanestudios.partlysaneskies.features.mining.crystalhollows.WormWarning
 import me.partlysanestudios.partlysaneskies.features.mining.crystalhollows.gemstonewaypoints.GemstoneData
 import me.partlysanestudios.partlysaneskies.features.mining.crystalhollows.gemstonewaypoints.GemstoneWaypointRender
+import me.partlysanestudios.partlysaneskies.features.mining.events.MiningEventNotifier
 import me.partlysanestudios.partlysaneskies.features.security.PrivacyMode
 import me.partlysanestudios.partlysaneskies.features.security.modschecker.ModChecker
 import me.partlysanestudios.partlysaneskies.features.skills.BestiaryLevelUpWebhook
@@ -236,7 +236,6 @@ class PartlySaneSkies {
         registerEvent(this)
         registerEvent(PartyManager())
         registerEvent(PartyFriendManager())
-        registerEvent(MiningEvents())
         registerEvent(MinionData())
         registerEvent(SkyblockDataManager)
         registerEvent(DropBannerDisplay)
@@ -279,6 +278,7 @@ class PartlySaneSkies {
         registerEvent(PSSMainMenu)
         registerEvent(WrongToolCropWarning.CropToolData)
         registerEvent(PetAlert)
+        registerEvent(MiningEventNotifier)
         registerEvent(SkillUpgradeWebhook)
         registerEvent(CropMilestoneWebhook)
         registerEvent(BestiaryMilestoneWebhook)

diff --git a/src/main/kotlin/me/partlysanestudios/partlysaneskies/config/OneConfigScreen.kt b/src/main/kotlin/me/partlysanestudios/partlysaneskies/config/OneConfigScreen.kt
@@ -1257,13 +1257,6 @@ object OneConfigScreen : Config(
 
 
     //Events
-    @Info(
-        type = InfoType.INFO,
-        text = "Some Events may not trigger, not all have been tested. If you find an event that doesn't trigger, please report it on our discord server.",
-        category = "Mining",
-        subcategory = "Events",
-        size = 2
-    )
     @Switch(name = "Main Toggle", description = "Toggles the events.", category = "Mining", subcategory = "Events")
     var miningEventsToggle = true
 
@@ -1365,14 +1358,6 @@ object OneConfigScreen : Config(
     )
     var miningEventBannerTime = 3.5f
 
-    @Color(
-        name = "Event Banner Color",
-        description = "The color of the event banner text.",
-        category = "Mining",
-        subcategory = "Events"
-    )
-    var miningEventBannerColor = OneColor(255, 255, 255)
-
     // ------------- Category: Farming ---------------------------------
     //    Hoes
     @Switch(

diff --git a/src/main/kotlin/me/partlysanestudios/partlysaneskies/data/skyblockdata/IslandType.kt b/src/main/kotlin/me/partlysanestudios/partlysaneskies/data/skyblockdata/IslandType.kt
@@ -22,17 +22,16 @@ enum class IslandType(val islandName: String) {
     DEEP_CAVERNS("Deep Caverns"),
     DWARVEN_MINES("Dwarven Mines"),
     CRYSTAL_HOLLOWS("Crystal Hollows"),
+    MINESHAFT("Mineshaft"),
     FARMING_ISLAND("The Farming Islands"),
-    WINTER_ISLAND("Jerry's Workshop"), // value by sh, unconfirmed
+    WINTER_ISLAND("Jerry's Workshop"),
     RIFT("The Rift"),
     CATACOMBS("Catacombs"),
     KUUDRA("Kuudra"),
 
     NONE("");
 
-    fun onIsland(): Boolean {
-        return this == IslandType.getCurrentIsland()
-    }
+    fun onIsland() = this == IslandType.getCurrentIsland()
 
     companion object {
         /**

diff --git a/src/main/kotlin/me/partlysanestudios/partlysaneskies/events/EventManager.kt b/src/main/kotlin/me/partlysanestudios/partlysaneskies/events/EventManager.kt
@@ -9,6 +9,7 @@ package me.partlysanestudios.partlysaneskies.events
 import me.partlysanestudios.partlysaneskies.events.minecraft.render.RenderWaypointEvent
 import me.partlysanestudios.partlysaneskies.events.skyblock.dungeons.DungeonEndEvent
 import me.partlysanestudios.partlysaneskies.events.skyblock.dungeons.DungeonStartEvent
+import me.partlysanestudios.partlysaneskies.events.skyblock.mining.MinesEvent
 import me.partlysanestudios.partlysaneskies.utils.SystemUtils.log
 import net.minecraftforge.client.event.ClientChatReceivedEvent
 import net.minecraftforge.client.event.RenderWorldLastEvent
@@ -33,7 +34,7 @@ object EventManager {
             if (functionParameters.size != 2) { // if there is not only 1 parameter (param 1 is always the instance parameter
                 log(
                     Level.WARN,
-                    "Unable to add ${function.name} due to incorrect number of function parameters (${functionParameters.size}"
+                    "Unable to add ${function.name} due to incorrect number of function parameters (${functionParameters.size}",
                 )
                 continue
             }
@@ -49,18 +50,16 @@ object EventManager {
 
     @SubscribeEvent
     fun onScreenRender(event: RenderWorldLastEvent) {
-        RenderWaypointEvent.onEventCall(
-            event.partialTicks,
-            registeredFunctions[RenderWaypointEvent::class] ?: ArrayList()
-        )
+        RenderWaypointEvent.onEventCall(event.partialTicks, registeredFunctions[RenderWaypointEvent::class] ?: ArrayList())
     }
 
     @SubscribeEvent
-    fun onChatRecievedEvent(event: ClientChatReceivedEvent) {
+    fun onChatReceivedEvent(event: ClientChatReceivedEvent) {
         val message = event.message.formattedText
-        DungeonStartEvent.onMessageRecieved(registeredFunctions[DungeonStartEvent::class] ?: ArrayList(), message)
-        DungeonEndEvent.onMessageRecieved(registeredFunctions[DungeonEndEvent::class] ?: ArrayList(), message)
+        DungeonStartEvent.onMessageReceived(registeredFunctions[DungeonStartEvent::class] ?: ArrayList(), message)
+        DungeonEndEvent.onMessageReceived(registeredFunctions[DungeonEndEvent::class] ?: ArrayList(), message)
+        MinesEvent.onMessageReceived(registeredFunctions[MinesEvent::class] ?: ArrayList(), message)
     }
 
     internal class EventFunction(val obj: Any, val function: KFunction<*>)
-}
+}
diff --git a/src/main/kotlin/me/partlysanestudios/partlysaneskies/events/data/LoadPublicDataEvent.kt b/src/main/kotlin/me/partlysanestudios/partlysaneskies/events/data/LoadPublicDataEvent.kt
@@ -20,8 +20,6 @@ class LoadPublicDataEvent {
                         function.function.call(function.obj, event)
                     } catch (e: Exception) {
                         e.printStackTrace()
-                    } finally {
-
                     }
                 }
             }.start()

diff --git a/...n/kotlin/me/partlysanestudios/partlysaneskies/events/skyblock/dungeons/DungeonEndEvent.kt b/...n/kotlin/me/partlysanestudios/partlysaneskies/events/skyblock/dungeons/DungeonEndEvent.kt
@@ -4,7 +4,7 @@ import me.partlysanestudios.partlysaneskies.events.EventManager
 
 class DungeonEndEvent {
     companion object {
-        internal fun onMessageRecieved(functionList: List<EventManager.EventFunction>, formattedMessage: String) {
+        internal fun onMessageReceived(functionList: List<EventManager.EventFunction>, formattedMessage: String) {
             if (formattedMessage.contains("§r§c☠ §r§eDefeated §r")) {
                 for (function in functionList) {
                     try {
@@ -16,4 +16,4 @@ class DungeonEndEvent {
             }
         }
     }
-}
+}
diff --git a/...kotlin/me/partlysanestudios/partlysaneskies/events/skyblock/dungeons/DungeonStartEvent.kt b/...kotlin/me/partlysanestudios/partlysaneskies/events/skyblock/dungeons/DungeonStartEvent.kt
@@ -12,7 +12,7 @@ import me.partlysanestudios.partlysaneskies.utils.StringUtils.removeColorCodes
 
 class DungeonStartEvent {
     companion object {
-        internal fun onMessageRecieved(functionList: List<EventManager.EventFunction>, formattedMessage: String) {
+        internal fun onMessageReceived(functionList: List<EventManager.EventFunction>, formattedMessage: String) {
             val message = formattedMessage.removeColorCodes()
             if (message.contains("Starting in 1 second.") && IslandType.CATACOMBS.onIsland()) {
                 for (function in functionList) {
@@ -25,4 +25,4 @@ class DungeonStartEvent {
             }
         }
     }
-}
+}