hi guys

martimavocado · Dec 13, 2024 · b552d71 · b552d71
1 parent bd58e6d
commit b552d71
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/src/main/java/at/hannibal2/skyhanni/events/render/gui/ReplaceItemEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/render/gui/ReplaceItemEvent.kt
@@ -9,11 +9,17 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable
 class ReplaceItemEvent(val inventory: IInventory, val originalItem: ItemStack, val slot: Int) : SkyHanniEvent() {
     var replacement: ItemStack? = null
         private set
+    var shouldRemove = false
+        private set
 
-    fun replace(replacement: ItemStack?) {
+    fun replace(replacement: ItemStack) {
         this.replacement = replacement
     }
 
+    fun remove() {
+        shouldRemove = true
+    }
+
     companion object {
         @JvmStatic
         fun postEvent(
@@ -25,6 +31,10 @@ class ReplaceItemEvent(val inventory: IInventory, val originalItem: ItemStack, v
             val originalItem = inventoryContents.getOrNull(slot) ?: return
             val event = ReplaceItemEvent(inventory, originalItem, slot)
             event.post()
+            if (event.shouldRemove) {
+                cir.returnValue = null
+                return
+            }
             event.replacement?.let { cir.returnValue = it }
         }
     }

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/plots/GardenPlotIcon.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/plots/GardenPlotIcon.kt
@@ -81,7 +81,7 @@ object GardenPlotIcon {
                     lastClickedSlotId = -1
                     return
                 }
-                event.replace(cachedStack[event.slot])
+                event.replace(cachedStack[event.slot] ?: return)
             }
         }
     }

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/CarnivalShopHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/CarnivalShopHelper.kt
@@ -100,12 +100,12 @@ object CarnivalShopHelper {
 
     private fun tryReplaceShopSpecificStack(event: ReplaceItemEvent) {
         if (currentProgress == null || event.isUnknownShop()) return
-        shopSpecificInfoItemStack.let { event.replace(it) }
+        event.replace(shopSpecificInfoItemStack ?: return)
     }
 
     private fun tryReplaceOverviewStack(event: ReplaceItemEvent) {
         if (!overviewInventoryNamesPattern.matches(event.inventory.name)) return
-        overviewInfoItemStack.let { event.replace(it) }
+        event.replace(overviewInfoItemStack ?: return)
     }
 
     @HandleEvent

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/EssenceShopHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/EssenceShopHelper.kt
@@ -113,7 +113,7 @@ object EssenceShopHelper {
     fun replaceItem(event: ReplaceItemEvent) {
         if (!isEnabled() || essenceShops.isEmpty() || currentProgress == null || event.slot != CUSTOM_STACK_LOCATION) return
         if (!essenceShopPattern.matches(event.inventory.name)) return
-        infoItemStack.let { event.replace(it) }
+        event.replace(infoItemStack ?: return)
     }
 
     @SubscribeEvent

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/UserLuckBreakdown.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/UserLuckBreakdown.kt
@@ -104,7 +104,7 @@ object UserLuckBreakdown {
             10 -> event.replace(skillsItem)
             11 -> event.replace(limboItem)
 
-            in validItemSlots -> event.replace(null)
+            in validItemSlots -> event.remove()
 
             in invalidItemSlots -> {
                 if (event.originalItem.item == limboID.getItemStack().item) return
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,7 +81,7 @@ object GardenPlotIcon { @@
                         lastClickedSlotId = -1
                         return
                     }
-                    event.replace(cachedStack[event.slot])
+                    event.replace(cachedStack[event.slot] ?: return)
                 }
             }
         }
@@ Expand Down @@