Skip to content

Commit ce8fc5e

Browse files
committed
fix: config gui crashing with sh 4.20.0
1 parent dd3dd1d commit ce8fc5e

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
modName = Nautilus
22
modid = nautilus
3-
modVersion = 0.0.15
3+
modVersion = 0.0.16
44
baseGroup = com.github.itsempa.nautilus
55

66
loom.platform=forge

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
skyhanni = "4.19.0"
2+
skyhanni = "4.20.0"
33
libautoupdate = "1.3.1"
44
headlessLwjgl = "1.7.2"
55
jbAnnotations = "24.1.0"

src/main/kotlin/com/github/itsempa/nautilus/config/Features.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.deps.moulconfig.Config
44
import at.hannibal2.skyhanni.deps.moulconfig.Social
55
import at.hannibal2.skyhanni.deps.moulconfig.annotations.Category
66
import at.hannibal2.skyhanni.deps.moulconfig.common.MyResourceLocation
7+
import at.hannibal2.skyhanni.deps.moulconfig.common.text.StructuredText
78
import com.github.itsempa.nautilus.Nautilus
89
import com.github.itsempa.nautilus.config.chat.ChatConfig
910
import com.github.itsempa.nautilus.config.core.ConfigManager
@@ -22,14 +23,14 @@ class Features : Config() {
2223

2324
override fun shouldAutoFocusSearchbar(): Boolean = false
2425

25-
override fun getTitle(): String = "${Nautilus.MOD_NAME} ${Nautilus.VERSION} by §cEmpa"
26+
override fun getTitle(): StructuredText = StructuredText.of("${Nautilus.MOD_NAME} ${Nautilus.VERSION} by §cEmpa")
2627

2728
override fun saveNow() = ConfigManager.save()
2829

2930
override fun getSocials(): List<Social> {
3031
return listOf(
31-
Social.forLink("Discord", discord, Nautilus.DISCORD_INVITE),
32-
Social.forLink("GitHub", github, Nautilus.GITHUB),
32+
Social.forLink(StructuredText.of("Discord"), discord, Nautilus.DISCORD_INVITE),
33+
Social.forLink(StructuredText.of("GitHub"), github, Nautilus.GITHUB),
3334
)
3435
}
3536

src/main/kotlin/com/github/itsempa/nautilus/features/misc/update/NautilusGuiOptionEditorUpdateCheck.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.github.itsempa.nautilus.features.misc.update
22

33
import at.hannibal2.skyhanni.config.core.elements.GuiElementButton
44
import at.hannibal2.skyhanni.deps.moulconfig.common.RenderContext
5+
import at.hannibal2.skyhanni.deps.moulconfig.common.text.StructuredText
56
import at.hannibal2.skyhanni.deps.moulconfig.gui.GuiOptionEditor
67
import at.hannibal2.skyhanni.deps.moulconfig.gui.KeyboardEvent
78
import at.hannibal2.skyhanni.deps.moulconfig.gui.MouseEvent
@@ -35,7 +36,7 @@ class NautilusGuiOptionEditorUpdateCheck(option: ProcessedOption) : GuiOptionEdi
3536
if (updateState == UpdateState.DOWNLOADED) {
3637
val updateText = "§aThe update will be installed after your next restart."
3738
context.drawStringCenteredScaledMaxWidth(
38-
updateText,
39+
StructuredText.of(updateText),
3940
fr,
4041
adjustedWidth / 2F,
4142
40f,
@@ -53,8 +54,8 @@ class NautilusGuiOptionEditorUpdateCheck(option: ProcessedOption) : GuiOptionEdi
5354

5455
val prefix = if (updateState == UpdateState.NONE) "§a" else "§c"
5556
context.drawStringCenteredScaledMaxWidth(
56-
"$prefix$currentVersion" +
57-
if (nextVersion != null && !sameVersion) "➜ §a$nextVersion" else "",
57+
StructuredText.of("$prefix$currentVersion" +
58+
if (nextVersion != null && !sameVersion) "➜ §a$nextVersion" else ""),
5859
fr,
5960
widthRemaining / 4F,
6061
10F,

0 commit comments

Comments
 (0)