Replace if cascade with when

This commit is contained in:
gregf36665 2024-12-22 22:27:36 +00:00 committed by Syndromeramo
parent 0ade1f308c
commit 32293edd1a

View file

@ -52,9 +52,11 @@ class ShelfListener : InteractionListener {
) )
private val oakshelf_2_items = oakshelf_1_items.map { (name, itemId) -> private val oakshelf_2_items = oakshelf_1_items.map { (name, itemId) ->
if (name == "Cup") { "Porcelain cup" to Items.PORCELAIN_CUP_7732 } when (name) {
else if (name == "Teapot") { "Teapot" to Items.TEAPOT_7714 } "Cup" -> { "Porcelain cup" to Items.PORCELAIN_CUP_7732 }
else { name to itemId} "Teapot" -> { "Teapot" to Items.TEAPOT_7714 }
else -> { name to itemId}
}
} + listOf( "Pie dish" to Items.PIE_DISH_2313 ) } + listOf( "Pie dish" to Items.PIE_DISH_2313 )
private val teakshelf_1_items = oakshelf_2_items + listOf( private val teakshelf_1_items = oakshelf_2_items + listOf(
@ -62,9 +64,11 @@ class ShelfListener : InteractionListener {
) )
private val teakshelf_2_items = teakshelf_1_items.map { (name, itemId) -> private val teakshelf_2_items = teakshelf_1_items.map { (name, itemId) ->
if (name == "Porcelain cup") { "Porcelain cup" to Items.PORCELAIN_CUP_7735 } when (name) {
else if (name == "Teapot") { "Teapot" to Items.TEAPOT_7726 } "Porcelain cup" -> { "Porcelain cup" to Items.PORCELAIN_CUP_7735 }
else { name to itemId } "Teapot" -> { "Teapot" to Items.TEAPOT_7726 }
else -> { name to itemId }
}
} + listOf( "Chef's Hat" to Items.CHEFS_HAT_1949 ) } + listOf( "Chef's Hat" to Items.CHEFS_HAT_1949 )
val shelves = mapOf( val shelves = mapOf(