Synchronized creative stack creation

Author: Avanatiker

common/src/main/kotlin/com/lambda/interaction/material/container/containers/CreativeContainer.kt

@@ -21,6 +21,8 @@ import com.lambda.Lambda.mc
 import com.lambda.context.SafeContext
 import com.lambda.interaction.material.StackSelection
 import com.lambda.interaction.material.container.MaterialContainer
+import com.lambda.interaction.material.transfer.TransactionExecutor
+import com.lambda.interaction.material.transfer.TransactionExecutor.Companion
 import com.lambda.task.Task
 import com.lambda.util.item.ItemStackUtils.equal
 import com.lambda.util.text.buildText
@@ -47,13 +49,15 @@ data object CreativeContainer : MaterialContainer(Rank.CREATIVE) {
                 throw NotInCreativeModeException()
             }
 
-            player.currentScreenHandler?.slots?.let { slots ->
-                selection.filterSlots(slots).forEach {
-                    interaction.clickCreativeStack(ItemStack.EMPTY, it.id)
+            TransactionExecutor.transfer {
+                player.currentScreenHandler?.slots?.let { slots ->
+                    selection.filterSlots(slots).forEach {
+                        clickCreativeStack(ItemStack.EMPTY, it.id)
+                    }
                 }
-            }
-
-            success()
+            }.finally {
+                success()
+            }.execute(this@CreativeDeposit)
         }
     }
 
@@ -71,11 +75,11 @@ data object CreativeContainer : MaterialContainer(Rank.CREATIVE) {
                     throw NotInCreativeModeException()
                 }
 
-                interaction.clickCreativeStack(
-                    optimalStack,
-                    36 + player.inventory.selectedSlot
-                )
-                success()
+                TransactionExecutor.transfer {
+                    clickCreativeStack(optimalStack, 36 + player.inventory.selectedSlot)
+                }.finally {
+                    success()
+                }.execute(this@CreativeWithdrawal)
                 return
             }
 

common/src/main/kotlin/com/lambda/interaction/material/transfer/TransactionExecutor.kt

@@ -22,6 +22,7 @@ import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.interaction.material.transfer.transaction.*
 import com.lambda.task.Task
+import net.minecraft.item.ItemStack
 import net.minecraft.screen.slot.SlotActionType
 
 class TransactionExecutor @Ta5kBuilder constructor(
@@ -132,6 +133,11 @@ class TransactionExecutor @Ta5kBuilder constructor(
         pickup(targetSlotId, 0)
     }
 
+    @InvTransfer
+    fun clickCreativeStack(stack: ItemStack, slotId: Int) {
+        transactions.add(ClickCreativeStackTransaction(stack, slotId))
+    }
+
     companion object {
         @InvTransfer
         fun transfer(block: TransactionExecutor.() -> Unit) =

common/src/main/kotlin/com/lambda/interaction/material/transfer/transaction/ClickCreativeStackTransaction.kt

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2024 Lambda
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lambda.interaction.material.transfer.transaction
+
+import com.lambda.event.events.InventoryEvent
+import com.lambda.event.events.TickEvent
+import com.lambda.event.listener.SafeListener.Companion.listen
+import com.lambda.interaction.material.transfer.InventoryTransaction
+import com.lambda.util.player.SlotUtils.clickSlot
+import net.minecraft.item.ItemStack
+import net.minecraft.screen.slot.SlotActionType
+
+class ClickCreativeStackTransaction @Ta5kBuilder constructor(
+    private val stack: ItemStack,
+    private val slotId: Int,
+) : InventoryTransaction() {
+    override val name: String get() = "Creating stack $stack at #$slotId"
+    private var confirming = false
+
+    init {
+    	listen<TickEvent.Pre> {
+            if (confirming) return@listen
+
+            interaction.clickCreativeStack(stack, slotId)
+            confirming = true
+        }
+
+        listen<InventoryEvent.SlotUpdate> {
+            if (it.slot != slotId) return@listen
+            finish()
+        }
+    }
+}