From 361e0afc60df7d34b2af2b8effcab0c29982e362 Mon Sep 17 00:00:00 2001 From: gamerpaddy Date: Tue, 8 Mar 2022 10:59:35 +0100 Subject: [PATCH 1/5] Update StashLogger.kt log only found and selected items instead of all. --- .../com/lambda/client/module/modules/misc/StashLogger.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/com/lambda/client/module/modules/misc/StashLogger.kt b/src/main/kotlin/com/lambda/client/module/modules/misc/StashLogger.kt index 56fa4ed60..26685939a 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/misc/StashLogger.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/misc/StashLogger.kt @@ -166,7 +166,13 @@ object StashLogger : Module( } override fun toString(): String { - return "($chests chests, $shulkers shulkers, $droppers droppers, $dispensers dispensers, $hoppers hoppers)" + var str = ""; + if ((chests > 0) && logChests){ str = str + "$chests chests " } + if ((shulkers > 0) && logShulkers){ str = str + "$shulkers shulkers " } + if ((droppers > 0) && logDroppers){ str = str + "$droppers droppers " } + if ((dispensers > 0) && logDispensers){ str = str + "$dispensers dispensers " } + if ((hoppers > 0) && logHoppers){ str = str + "$hoppers hoppers "} + return str; } } } From 10752690d3393f4664259052d5f8c03809887bc7 Mon Sep 17 00:00:00 2001 From: Constructor Date: Tue, 8 Mar 2022 20:00:41 +0100 Subject: [PATCH 2/5] This is kotlin not java --- .../client/module/modules/misc/StashLogger.kt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/com/lambda/client/module/modules/misc/StashLogger.kt b/src/main/kotlin/com/lambda/client/module/modules/misc/StashLogger.kt index 26685939a..2e2bbe107 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/misc/StashLogger.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/misc/StashLogger.kt @@ -88,7 +88,7 @@ object StashLogger : Module( MessageSendHelper.sendChatMessage("$chatName $positionString $string") } - found = found || true + found = true } if (found) { @@ -166,13 +166,13 @@ object StashLogger : Module( } override fun toString(): String { - var str = ""; - if ((chests > 0) && logChests){ str = str + "$chests chests " } - if ((shulkers > 0) && logShulkers){ str = str + "$shulkers shulkers " } - if ((droppers > 0) && logDroppers){ str = str + "$droppers droppers " } - if ((dispensers > 0) && logDispensers){ str = str + "$dispensers dispensers " } - if ((hoppers > 0) && logHoppers){ str = str + "$hoppers hoppers "} - return str; + val statList = mutableListOf() + if (chests > 0 && logChests) statList.add("$chests chests") + if (shulkers > 0 && logShulkers) statList.add("$shulkers shulkers") + if (droppers > 0 && logDroppers) statList.add("$droppers droppers") + if (dispensers > 0 && logDispensers) statList.add("$dispensers dispensers") + if (hoppers > 0 && logHoppers) statList.add("$hoppers hoppers") + return statList.joinToString() } } } From 58b5c374d24aaa19c228954f69ae35deadca3607 Mon Sep 17 00:00:00 2001 From: Constructor Date: Tue, 8 Mar 2022 22:09:17 +0100 Subject: [PATCH 3/5] Change wrong whitespaces --- .../lambda/client/module/modules/misc/StashLogger.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/com/lambda/client/module/modules/misc/StashLogger.kt b/src/main/kotlin/com/lambda/client/module/modules/misc/StashLogger.kt index 2e2bbe107..046fcf9b7 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/misc/StashLogger.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/misc/StashLogger.kt @@ -167,12 +167,12 @@ object StashLogger : Module( override fun toString(): String { val statList = mutableListOf() - if (chests > 0 && logChests) statList.add("$chests chests") - if (shulkers > 0 && logShulkers) statList.add("$shulkers shulkers") - if (droppers > 0 && logDroppers) statList.add("$droppers droppers") - if (dispensers > 0 && logDispensers) statList.add("$dispensers dispensers") - if (hoppers > 0 && logHoppers) statList.add("$hoppers hoppers") - return statList.joinToString() + if (chests > 0 && logChests) statList.add("$chests chests") + if (shulkers > 0 && logShulkers) statList.add("$shulkers shulkers") + if (droppers > 0 && logDroppers) statList.add("$droppers droppers") + if (dispensers > 0 && logDispensers) statList.add("$dispensers dispensers") + if (hoppers > 0 && logHoppers) statList.add("$hoppers hoppers") + return statList.joinToString() } } } From 38c79494c6751ff905d5abc343942030f51a8351 Mon Sep 17 00:00:00 2001 From: Constructor Date: Tue, 8 Mar 2022 22:10:03 +0100 Subject: [PATCH 4/5] More wrong whitespaces --- .../lambda/client/module/modules/misc/StashLogger.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/com/lambda/client/module/modules/misc/StashLogger.kt b/src/main/kotlin/com/lambda/client/module/modules/misc/StashLogger.kt index 046fcf9b7..e22bc1062 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/misc/StashLogger.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/misc/StashLogger.kt @@ -167,12 +167,12 @@ object StashLogger : Module( override fun toString(): String { val statList = mutableListOf() - if (chests > 0 && logChests) statList.add("$chests chests") - if (shulkers > 0 && logShulkers) statList.add("$shulkers shulkers") - if (droppers > 0 && logDroppers) statList.add("$droppers droppers") - if (dispensers > 0 && logDispensers) statList.add("$dispensers dispensers") - if (hoppers > 0 && logHoppers) statList.add("$hoppers hoppers") - return statList.joinToString() + if (chests > 0 && logChests) statList.add("$chests chests") + if (shulkers > 0 && logShulkers) statList.add("$shulkers shulkers") + if (droppers > 0 && logDroppers) statList.add("$droppers droppers") + if (dispensers > 0 && logDispensers) statList.add("$dispensers dispensers") + if (hoppers > 0 && logHoppers) statList.add("$hoppers hoppers") + return statList.joinToString() } } } From 80d0564defc1e38c47960f954970803fcd15a8ab Mon Sep 17 00:00:00 2001 From: Constructor Date: Wed, 6 Apr 2022 04:10:57 +0200 Subject: [PATCH 5/5] Beautify --- .../lambda/client/module/modules/misc/StashLogger.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/com/lambda/client/module/modules/misc/StashLogger.kt b/src/main/kotlin/com/lambda/client/module/modules/misc/StashLogger.kt index e22bc1062..56ecb8ff6 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/misc/StashLogger.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/misc/StashLogger.kt @@ -85,7 +85,7 @@ object StashLogger : Module( if (logToChat) { val positionString = center.asString() - MessageSendHelper.sendChatMessage("$chatName $positionString $string") + MessageSendHelper.sendChatMessage("$chatName Found $string at ($positionString) ") } found = true @@ -167,11 +167,11 @@ object StashLogger : Module( override fun toString(): String { val statList = mutableListOf() - if (chests > 0 && logChests) statList.add("$chests chests") - if (shulkers > 0 && logShulkers) statList.add("$shulkers shulkers") - if (droppers > 0 && logDroppers) statList.add("$droppers droppers") - if (dispensers > 0 && logDispensers) statList.add("$dispensers dispensers") - if (hoppers > 0 && logHoppers) statList.add("$hoppers hoppers") + if (chests > 0 && logChests) statList.add("$chests chest${if (chests == 1) "" else "s"}") + if (shulkers > 0 && logShulkers) statList.add("$shulkers shulker${if (shulkers == 1) "" else "s"}") + if (droppers > 0 && logDroppers) statList.add("$droppers dropper${if (droppers == 1) "" else "s"}") + if (dispensers > 0 && logDispensers) statList.add("$dispensers dispenser${if (dispensers == 1) "" else "s"}") + if (hoppers > 0 && logHoppers) statList.add("$hoppers hopper${if (hoppers == 1) "" else "s"}") return statList.joinToString() } }