close sign screen when printing signs

Author: beanbag44

src/main/kotlin/com/lambda/interaction/managers/interacting/InteractManager.kt

@@ -21,6 +21,7 @@ import com.lambda.context.Automated
 import com.lambda.context.AutomatedSafeContext
 import com.lambda.context.SafeContext
 import com.lambda.event.events.ConnectionEvent
+import com.lambda.event.events.GuiEvent
 import com.lambda.event.events.MovementEvent
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
@@ -41,13 +42,18 @@ import com.lambda.interaction.managers.interacting.InteractedBlockHandler.pendin
 import com.lambda.interaction.managers.interacting.InteractedBlockHandler.setPendingConfigs
 import com.lambda.interaction.managers.interacting.InteractedBlockHandler.startPending
 import com.lambda.interaction.managers.inventory.InventoryRequest.Companion.inventoryRequest
+import com.lambda.module.modules.world.AutoSign.signWriteDelay
+import com.lambda.threading.runConcurrent
 import com.lambda.threading.runSafeAutomated
+import com.lambda.threading.runSafeGameScheduled
 import com.lambda.util.BlockUtils.blockState
 import com.lambda.util.item.ItemUtils.blockItem
 import com.lambda.util.player.MovementUtils.sneaking
 import com.lambda.util.player.gamemode
 import com.lambda.util.player.isItemOnCooldown
 import com.lambda.util.player.swingHand
+import kotlinx.coroutines.delay
+import net.minecraft.block.AbstractSignBlock
 import net.minecraft.block.BlockState
 import net.minecraft.block.pattern.CachedBlockPosition
 import net.minecraft.client.network.ClientPlayerEntity
@@ -56,6 +62,7 @@ import net.minecraft.item.ItemPlacementContext
 import net.minecraft.item.ItemStack
 import net.minecraft.item.ItemUsageContext
 import net.minecraft.network.packet.c2s.play.PlayerInteractBlockC2SPacket
+import net.minecraft.network.packet.c2s.play.UpdateSignC2SPacket
 import net.minecraft.sound.SoundCategory
 import net.minecraft.util.ActionResult
 import net.minecraft.util.ActionResult.PassToDefaultBlockAction
@@ -81,6 +88,8 @@ object InteractManager : Manager<InteractRequest>(
 	override val blockedPositions
 		get() = pendingActions.map { it.context.blockPos }
 
+	private var cancellingSignScreens = 0
+
 	override fun load(): String {
 		super.load()
 
@@ -104,6 +113,13 @@ object InteractManager : Manager<InteractRequest>(
 		    interactCooldown = 0
 	    }
 
+		listen<GuiEvent.SignEditorOpen> { event ->
+			if (cancellingSignScreens > 0) {
+				event.cancel()
+				cancellingSignScreens--
+			}
+		}
+
 		return "Loaded Place Manager"
 	}
 
@@ -193,6 +209,18 @@ object InteractManager : Manager<InteractRequest>(
 						mc.gameRenderer.firstPersonRenderer.resetEquipProgress(Hand.MAIN_HAND)
 					}
 				}
+				val expectedState = ctx.expectedState
+				if (ctx.preProcessingInfo.placing && expectedState.block is AbstractSignBlock) {
+					cancellingSignScreens++
+					runConcurrent {
+						delay(signWriteDelay)
+						runSafeGameScheduled {
+							connection.sendPacket(
+								UpdateSignC2SPacket(ctx.blockPos, true, "", "", "", "")
+							)
+						}
+					}
+				}
 			}
 			val interactDelay = ctx.interactConfig.interactDelay
 			interactCooldown = if (interactDelay == 0) 0 else interactDelay + 1

src/main/kotlin/com/lambda/module/modules/world/AutoSign.kt

@@ -50,14 +50,14 @@ object AutoSign : Module(
 	""".trimMargin(),
 	tag = ModuleTag.WORLD
 ) {
-	var autoWrite by setting("Auto Write", true)
-	var line1 by setting("Line 1", "Welcome to Lambda!") { autoWrite }
-	var line2 by setting("Line 2", "Enjoy your stay.") { autoWrite }
-	var line3 by setting("Line 3", "Have fun!") { autoWrite }
-	var line4 by setting("Line 4", "Lambda <dd>/<M>/<yy>") { autoWrite }
-	var writeOnFront by setting("Write Front", true, description = "Write on front side of the sign") { autoWrite }
+	private var autoWrite by setting("Auto Write", true)
+	private var line1 by setting("Line 1", "Welcome to Lambda!") { autoWrite }
+	private var line2 by setting("Line 2", "Enjoy your stay.") { autoWrite }
+	private var line3 by setting("Line 3", "Have fun!") { autoWrite }
+	private var line4 by setting("Line 4", "Lambda <dd>/<M>/<yy>") { autoWrite }
+	private var writeOnFront by setting("Write Front", true, description = "Write on front side of the sign") { autoWrite }
 
-	var autoClose by setting("Auto Close", true)
+	private var autoClose by setting("Auto Close", true)
 	var signWriteDelay by setting("Sign Write Delay", 400L, 100L..1000L, 50L, description = "Delay in milliseconds before sending the sign text to the server") { autoClose }
 
 	init {
@@ -68,7 +68,7 @@ object AutoSign : Module(
 				val calendar = Calendar.getInstance()
 				val month = calendar.get(Calendar.MONTH) + 1 // Months are 0-based in Calendar
 
-				for (i in 0 until 4) {
+				(0 until 4).forEach { i ->
 					val formattedLine = formatLines[i]
 						.replace("<dd>", String.format($$"%1$td", Date()))
 						.replace("<d>", String.format($$"%1$te", Date()))
@@ -88,20 +88,23 @@ object AutoSign : Module(
 
 			var editor: AbstractSignEditScreen = if (event.sign is HangingSignBlockEntity) HangingSignEditScreen(event.sign, event.front, mc.shouldFilterText())
 			else SignEditScreen(event.sign, event.front, mc.shouldFilterText())
-			for (i in 0 until 4) editor.messages[i] = lines[i]
+			(0 until 4).forEach { i -> editor.messages[i] = lines[i] }
 			if (autoClose) {
 				val pos = event.sign.pos
 				val messages = editor.messages.copyOf()
 				runConcurrent {
 					delay(signWriteDelay)
 					runSafeGameScheduled {
-						if (writeOnFront) connection.sendPacket(UpdateSignC2SPacket(pos, true, messages[0], messages[1], messages[2], messages[3]))
-						else connection.sendPacket(UpdateSignC2SPacket(pos, false, messages[0], messages[1], messages[2], messages[3]))
+						connection.sendPacket(
+							UpdateSignC2SPacket(
+								pos,
+								writeOnFront,
+								messages[0], messages[1], messages[2], messages[3]
+							)
+						)
 					}
 				}
-			} else {
-				mc.setScreen(editor)
-			}
+			} else mc.setScreen(editor)
 			event.cancel()
 		}
 	}