Skip to content

Commit f3a0aa5

Browse files
Avanatikerrfresh2
authored andcommitted
Making use of setting consumer
1 parent 864538a commit f3a0aa5

File tree

3 files changed

+17
-30
lines changed

3 files changed

+17
-30
lines changed

src/main/kotlin/com/lambda/client/module/modules/misc/MapDownloader.kt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@ internal object MapDownloader : Module(
3737
private val saveMapsFromEntity by setting("Save maps from entity", true)
3838
private val saveMapsFromInventory by setting("Save maps from inventory", true, description = "When rendering a new map it will save one image for every map update!")
3939
private val saveDelay by setting("Save delay", 0.2, 0.1..2.0, 0.1, unit = " s")
40-
private val openImageFolder = setting("Open Image Folder...", false)
40+
private val openImageFolder = setting("Open Image Folder...", false, consumer = { _, _ ->
41+
FolderUtils.openFolder(FolderUtils.mapImagesFolder)
42+
true
43+
})
4144
private val pendingHashes = mutableSetOf<String>()
4245
private var existingHashes = mutableSetOf<String>()
4346
private var pendingTasks = mutableSetOf<MapInfo>()
@@ -73,11 +76,6 @@ internal object MapDownloader : Module(
7376

7477
getMaps()
7578
}
76-
77-
openImageFolder.consumers.add { _, it ->
78-
if (it) FolderUtils.openFolder(FolderUtils.mapImagesFolder)
79-
false
80-
}
8179
}
8280

8381
private fun getExistingHashes(): MutableSet<String> {

src/main/kotlin/com/lambda/client/module/modules/player/PacketLogger.kt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@ object PacketLogger : Module(
4343
private val ignoreUnknown by setting("Ignore Unknown Packets", false, description = "Ignore packets that aren't explicitly handled.")
4444
private val ignoreChat by setting("Ignore Chat", true, description = "Ignore chat packets.")
4545
private val ignoreCancelled by setting("Ignore Cancelled", true, description = "Ignore cancelled packets.")
46-
private val openLogFolder = setting("Open Log Folder...", false)
46+
private val openLogFolder by setting("Open Log Folder...", false, consumer = { _, _ ->
47+
FolderUtils.openFolder(FolderUtils.packetLogFolder)
48+
true
49+
})
4750

4851
private val fileTimeFormatter = DateTimeFormatter.ofPattern("HH-mm-ss_SSS")
4952

@@ -135,11 +138,6 @@ object PacketLogger : Module(
135138

136139
sendPacket(it.packet)
137140
}
138-
139-
openLogFolder.consumers.add { _, it ->
140-
if (it) FolderUtils.openFolder(FolderUtils.logFolder)
141-
false
142-
}
143141
}
144142

145143
private fun receivePacket(packet: Packet<*>) {

src/main/kotlin/com/lambda/client/module/modules/render/NewChunks.kt

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,15 @@ object NewChunks : Module(
5050
private val saveOption by setting("Save Option", SaveOption.EXTRA_FOLDER, { saveNewChunks })
5151
private val saveInRegionFolder by setting("In Region", false, { saveNewChunks })
5252
private val alsoSaveNormalCoords by setting("Save Normal Coords", false, { saveNewChunks })
53-
private val closeFile = setting("Close file", false, { saveNewChunks })
54-
private val openNewChunksFolder = setting("Open NewChunks Folder...", false, { saveNewChunks })
53+
private val closeFile by setting("Close file", false, { saveNewChunks }, consumer = { _, _ ->
54+
logWriterClose()
55+
MessageSendHelper.sendChatMessage("$chatName Saved file to $path!")
56+
false
57+
})
58+
private val openNewChunksFolder by setting("Open NewChunks Folder...", false, { saveNewChunks }, consumer = { _, _ ->
59+
FolderUtils.openFolder(FolderUtils.newChunksFolder)
60+
false
61+
})
5562
private val yOffset by setting("Y Offset", 0, -256..256, 4, fineStep = 1, description = "Render offset in Y axis")
5663
private val color by setting("Color", ColorHolder(255, 64, 64, 200), description = "Highlighting color")
5764
private val thickness by setting("Thickness", 1.5f, 0.1f..4.0f, 0.1f, description = "Thickness of the highlighting square")
@@ -350,20 +357,4 @@ object NewChunks : Module(
350357
ip = mc.currentServerData?.serverIP
351358
}
352359
}
353-
354-
init {
355-
closeFile.valueListeners.add { _, _ ->
356-
if (closeFile.value) {
357-
logWriterClose()
358-
MessageSendHelper.sendChatMessage("$chatName Saved file!")
359-
MessageSendHelper.sendChatMessage("$path")
360-
closeFile.value = false
361-
}
362-
}
363-
364-
openNewChunksFolder.consumers.add { _, it ->
365-
if (it) FolderUtils.openFolder(FolderUtils.newChunksFolder)
366-
false
367-
}
368-
}
369360
}

0 commit comments

Comments
 (0)