aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-03-28 17:10:58 +0200
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-03-28 17:10:58 +0200
commit7c618552f30fdb717219c348b9f24dcacc651442 (patch)
tree5803c1ce7a9209ad0f8c70e0eb05d4827c7bd09f /src
parente3344f636e48bb56e9dd028760b69134cce19c49 (diff)
downloadskyhanni-7c618552f30fdb717219c348b9f24dcacc651442.tar.gz
skyhanni-7c618552f30fdb717219c348b9f24dcacc651442.tar.bz2
skyhanni-7c618552f30fdb717219c348b9f24dcacc651442.zip
Disabled player rank hider feature for now. Reenable it in couple days again.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt27
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/EliteFarmingWeight.kt2
2 files changed, 14 insertions, 15 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt
index ba144e9db..b5927d31f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt
@@ -2,7 +2,6 @@ package at.hannibal2.skyhanni.features.chat.playerchat
import at.hannibal2.skyhanni.SkyHanniMod
import at.hannibal2.skyhanni.events.LorenzChatEvent
-import at.hannibal2.skyhanni.features.dungeon.DungeonMilestonesDisplay
import at.hannibal2.skyhanni.features.misc.MarkedPlayerManager
import net.minecraft.util.ChatComponentText
import net.minecraft.util.IChatComponent
@@ -69,19 +68,19 @@ class PlayerChatModifier {
}
}
- if (SkyHanniMod.feature.chat.playerRankHider) {
- for (pattern in patterns) {
- string = string.replace(pattern, "§b$1")
- }
- string = string.replace("§(?:7|a|b|6)((?:\\w+){2,16})'s", "§b$1's")
- string = string.replace("§(?:7|a|b|6)((?:\\w+){2,16}) (§.)", "§b$1 $2")
-
- // TODO remove workaround
- if (!DungeonMilestonesDisplay.isMilestoneMessage(input)) {
- //all players same color in chat
- string = string.replace("§r§7: ", "§r§f: ")
- }
- }
+// if (SkyHanniMod.feature.chat.playerRankHider) {
+// for (pattern in patterns) {
+// string = string.replace(pattern, "§b$1")
+// }
+// string = string.replace("§(?:7|a|b|6)((?:\\w+){2,16})'s", "§b$1's")
+// string = string.replace("§(?:7|a|b|6)((?:\\w+){2,16}) (§.)", "§b$1 $2")
+//
+// // TODO remove workaround
+// if (!DungeonMilestonesDisplay.isMilestoneMessage(input)) {
+// //all players same color in chat
+// string = string.replace("§r§7: ", "§r§f: ")
+// }
+// }
if (SkyHanniMod.feature.markedPlayers.highlightInChat) {
for (markedPlayer in MarkedPlayerManager.playerNamesToMark) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/EliteFarmingWeight.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/EliteFarmingWeight.kt
index 612bebfbc..904f74bbe 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/EliteFarmingWeight.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/EliteFarmingWeight.kt
@@ -270,7 +270,7 @@ class EliteFarmingWeight {
var totalWeight = 0.0
for (crop in CropType.values()) {
val weight = crop.getLocalCounter() / crop.getFactor()
- val roundedWeight = weight.let { if (round) it.round(2) else it }
+ val roundedWeight = weight.let { if (round) it.round(2) else it }
weightPerCrop[crop] = roundedWeight
totalWeight += roundedWeight
}