using default parameters

hannibal002 · Sep 28, 2024 · 8a67b06 · 8a67b06
1 parent 4ce974d
commit 8a67b06
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/at/hannibal2/skyhanni/events/hoppity/EggFoundEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/hoppity/EggFoundEvent.kt
@@ -5,6 +5,6 @@ import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggType
 
 class EggFoundEvent(
     val type: HoppityEggType,
-    val slotIndex: Int?,
-    val note: String?,
+    val slotIndex: Int? = null,
+    val note: String? = null,
 ) : SkyHanniEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt
@@ -105,13 +105,13 @@ object HoppityAPI {
                 ChocolateFactoryStrayTracker.handleStrayClicked(it)
                 when (groupOrNull("name") ?: return@matchMatcher) {
                     "Fish the Rabbit" -> {
-                        EggFoundEvent(STRAY, it.slotNumber, null).post()
+                        EggFoundEvent(STRAY, it.slotNumber).post()
                         lastName = "§9Fish the Rabbit"
                         lastMeal = STRAY
                         attemptFireRabbitFound()
                     }
                     "El Dorado" -> {
-                        EggFoundEvent(STRAY, it.slotNumber, null).post()
+                        EggFoundEvent(STRAY, it.slotNumber).post()
                         lastName = "§6El Dorado"
                         lastMeal = STRAY
                         attemptFireRabbitFound()
@@ -132,20 +132,20 @@ object HoppityAPI {
         val nameText = (if (clickedStack.hasDisplayName()) clickedStack.displayName else clickedStack.itemName)
 
         sideDishNamePattern.matchMatcher(nameText) {
-            EggFoundEvent(SIDE_DISH, index, null).post()
+            EggFoundEvent(SIDE_DISH, index).post()
             lastMeal = SIDE_DISH
             attemptFireRabbitFound()
         }
         milestoneNamePattern.matchMatcher(nameText) {
             clickedStack.getLore().let {
                 if (!it.any { line -> line == "§eClick to claim!" }) return
                 allTimeLorePattern.firstMatcher(it) {
-                    EggFoundEvent(CHOCOLATE_FACTORY_MILESTONE, index, null).post()
+                    EggFoundEvent(CHOCOLATE_FACTORY_MILESTONE, index).post()
                     lastMeal = CHOCOLATE_FACTORY_MILESTONE
                     attemptFireRabbitFound()
                 }
                 shopLorePattern.firstMatcher(it) {
-                    EggFoundEvent(CHOCOLATE_SHOP_MILESTONE, index, null).post()
+                    EggFoundEvent(CHOCOLATE_SHOP_MILESTONE, index).post()
                     lastMeal = CHOCOLATE_SHOP_MILESTONE
                     attemptFireRabbitFound()
                 }
@@ -160,14 +160,14 @@ object HoppityAPI {
         eggFoundPattern.matchMatcher(event.message) {
             resetRabbitData()
             lastMeal = getEggType(event)
-            lastMeal?.let { EggFoundEvent(it, null, groupOrNull("note")).post() }
+            lastMeal?.let { EggFoundEvent(it, note = groupOrNull("note")).post() }
             attemptFireRabbitFound()
         }
 
         HoppityEggsManager.eggBoughtPattern.matchMatcher(event.message) {
             if (group("rabbitname").equals(lastName)) {
                 lastMeal = HoppityEggType.BOUGHT
-                EggFoundEvent(HoppityEggType.BOUGHT, null, null).post()
+                EggFoundEvent(HoppityEggType.BOUGHT).post()
                 attemptFireRabbitFound()
             }
         }