Skip to content

Commit 60a31f2

Browse files
committed
odin beta 17 compatibility and requirement added.
1 parent 730f0f1 commit 60a31f2

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ plugins {
1515

1616
//Constants:
1717

18-
val requiredOdin = project.findProperty("requiredOdin") as String
18+
val requiredOdin: String by project
19+
val odinRepository: String by project
1920
val baseGroup: String by project
2021
val mcVersion: String by project
2122
val version: String by project
@@ -31,7 +32,7 @@ blossom {
3132
}
3233

3334
tasks.register("downloadOdin") {
34-
val downloadUrl = "https://github.com/SubAt0m1c/Odin/releases/download/${requiredOdinVersion}/${requiredOdin}"
35+
val downloadUrl = "https://github.com/${odinRepository}/releases/download/${requiredOdinVersion}/${requiredOdin}"
3536
val targetFile = file("build/resources/Odin")
3637

3738
doLast {

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ baseGroup = com.github.subat0m1c.hatecheaters
44
mcVersion = 1.8.9
55
modid = hatecheaters
66
version = 0.1.5
7-
requiredOdin = Odin-1.2.5.beta16.jar
7+
requiredOdin = Odin-1.2.5.beta17.jar
8+
odinRepository = OdTheKing/Odin

src/main/kotlin/com/github/subat0m1c/hatecheaters/modules/BetterPartyFinder.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ object BetterPartyFinder : Module(
8484
}
8585

8686
onMessage(pfRegex, { enabled && statsDisplay && !autokicktoggle}) {
87-
val name = pfRegex.find(it)?.groupValues?.get(1)?.takeUnless { it == mc.session.username } ?: return@onMessage
87+
val name = it.groupValues[1].takeUnless { it == mc.session.username } ?: return@onMessage
8888

8989
launch {
9090
val profiles = getSkyblockProfile(name).getOrElse { return@launch modMessage(it.message) }
@@ -102,7 +102,7 @@ object BetterPartyFinder : Module(
102102

103103

104104
onMessage(pfRegex, { enabled && autokicktoggle}) {
105-
val name = pfRegex.find(it)?.groupValues?.get(1)?.takeUnless { it == mc.session.username } ?: return@onMessage
105+
val name = it.groupValues[1].takeUnless { it == mc.session.username } ?: return@onMessage
106106

107107
Logger.info("$name is being searched")
108108

@@ -176,9 +176,7 @@ object BetterPartyFinder : Module(
176176
}
177177

178178
onMessage(kickRegex, { kickCache && enabled }) { message ->
179-
kickRegex.find(message)?.groupValues?.get(1)
180-
?.takeUnless { name -> kickedList.contains(name) }
181-
?.let { name -> kickedList.add(name) }
179+
message.groupValues[1].takeUnless { name -> kickedList.contains(name) }?.let { name -> kickedList.add(name) }
182180
}
183181
}
184182

src/main/kotlin/com/github/subat0m1c/hatecheaters/utils/ChatUtils.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import me.odinmain.utils.skyblock.modMessage as odinModMessage
88
import me.odinmain.utils.render.getMCTextWidth
99
import me.odinmain.utils.runOnMCThread
1010
import me.odinmain.utils.skyblock.createClickStyle
11+
import me.odinmain.utils.toFixed
1112
import net.minecraft.event.ClickEvent
1213
import net.minecraft.event.HoverEvent
1314
import net.minecraft.util.ChatComponentText
@@ -139,7 +140,7 @@ object ChatUtils {
139140
}
140141

141142
inline val Double.truncate: String get() = when {
142-
this >= 1_000_000_000 -> "${String.format("%.2f", this / 1_000_000_000)}b" // this >= 1_000_000_000 -> "${(this / 1_000_000_000).toFixed()}b" use this after full update to beta17
143+
this >= 1_000_000_000 -> "${(this / 1_000_000_000).toFixed(2)}b"
143144
this >= 1_000_000 -> "${(this.toInt() / 1_000_000)}m"
144145
this >= 1_000 -> "${(this.toInt() / 1_000)}k"
145146
else -> "${this.toInt()}"

0 commit comments

Comments
 (0)