Skip to content

Commit 0c6b445

Browse files
[3.3.9] update taboolib
1 parent ef5e263 commit 0c6b445

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ subprojects {
5959
)
6060
}
6161
version {
62-
taboolib = "6.2.2"
62+
taboolib = "6.2.3"
6363
coroutines = null
6464
}
6565
}

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
group=me.arasple.mc.trmenu
2-
version=3.3.8
2+
version=3.3.9

plugin/src/main/kotlin/trplugins/menu/module/conf/Loader.kt

+2-4
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,8 @@ object Loader {
8787
if (result.state == SerialzeResult.State.IGNORE) {
8888
return@start result
8989
}
90-
if (result.succeed()) {
91-
if (TrMenu.SETTINGS.getBoolean("Loader.Listen-Files", true)) {
92-
listen(it)
93-
}
90+
if (result.succeed() && TrMenu.SETTINGS.getBoolean("Loader.Listen-Files", true)) {
91+
listen(it)
9492
} else errors.addAll(result.errors)
9593
result
9694
},

plugin/src/main/kotlin/trplugins/menu/module/internal/command/impl/CommandSounds.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ object CommandSounds : CommandExpression {
2727
override val command = subCommand {
2828
dynamic(optional = true) {
2929
suggestion<Player>(uncheck = true) { _, _ ->
30-
XSound.values().map { it.name }
30+
XSound.values.map { it.name() }
3131
}
3232

3333
execute<Player> { sender, _, argument ->
@@ -40,7 +40,7 @@ object CommandSounds : CommandExpression {
4040
}
4141

4242
private fun open(player: Player, page: Int, filter: String?) {
43-
val sounds = XSound.values().filter { filter == null || it.name.contains(filter, true) }.sorted().let {
43+
val sounds = XSound.values.filter { filter == null || it.name().contains(filter, true) }.sorted().let {
4444
it.subList(54 * page, it.size)
4545
}
4646

@@ -57,7 +57,7 @@ object CommandSounds : CommandExpression {
5757
receptacle.setElement(CTRL, ctrl)
5858

5959
slotMap.forEach { (slot, index) ->
60-
receptacle.setElement(DISPLAY(sounds[index].name), slot)
60+
receptacle.setElement(DISPLAY(sounds[index].name()), slot)
6161
}
6262

6363
receptacle.onOpen = { player, _ ->
@@ -88,7 +88,7 @@ object CommandSounds : CommandExpression {
8888
ReceptacleClickType.DROP -> sound.play(player, 1f, 0f)
8989
ReceptacleClickType.LEFT -> sound.play(player, 1f, 1f)
9090
ReceptacleClickType.RIGHT -> sound.play(player, 1f, 2f)
91-
ReceptacleClickType.MIDDLE -> player.sendLang("Menu-Internal-Sounds-Copy", sound.name)
91+
ReceptacleClickType.MIDDLE -> player.sendLang("Menu-Internal-Sounds-Copy", sound.name())
9292
else -> {
9393
}
9494
}

0 commit comments

Comments
 (0)