legacy-migration.patch

diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index d6d04931..b1ca2c64 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -60,7 +60,7 @@ android {
 
     defaultConfig {
         applicationId = ApplicationInfo.packageName
-        minSdk = 24
+        minSdk = 16
         targetSdk = 36
 
         versionCode = ApplicationInfo.versionCode
@@ -81,6 +81,7 @@ android {
 
         create("store") {
             dimension = "distribution"
+            minSdk = 24
 
             val bannerAdUnitId = yandexProperties?.get("bannerAdUnitId")?.toString()?.let { "\"$it\"" } ?: "null"
             val interstitialAdUnitId =
diff --git a/android/proguard-rules.pro b/android/proguard-rules.pro
index 6879d376..cca24897 100644
--- a/android/proguard-rules.pro
+++ b/android/proguard-rules.pro
@@ -19,6 +19,8 @@
 #   public *;
 #}
 
+-dontwarn com.badlogic.gdx.jnigen.**
+
 -verbose
 
 -keep class com.badlogic.gdx.** { *; }
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 28735010..ed2165b0 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -2,7 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-sdk tools:overrideLibrary="co.touchlab.kermit,co.touchlab.kermit.core" />
+
     <application
+            android:name="androidx.multidex.MultiDexApplication"
             android:allowBackup="true"
             android:icon="@drawable/ic_launcher"
             android:label="@string/app_name"
diff --git a/android/src/main/kotlin/ru/fredboy/cavedroid/AndroidLauncher.kt b/android/src/main/kotlin/ru/fredboy/cavedroid/AndroidLauncher.kt
index 774bf062..a4ef6c57 100644
--- a/android/src/main/kotlin/ru/fredboy/cavedroid/AndroidLauncher.kt
+++ b/android/src/main/kotlin/ru/fredboy/cavedroid/AndroidLauncher.kt
@@ -26,17 +26,21 @@ import java.util.concurrent.atomic.AtomicBoolean
 class AndroidLauncher : AndroidApplication() {
 
     private lateinit var performanceMonitor: AndroidPerformanceMonitor
-    private val displayListener = object : DisplayManager.DisplayListener {
-        override fun onDisplayAdded(displayId: Int) {}
-        override fun onDisplayRemoved(displayId: Int) {}
-        override fun onDisplayChanged(displayId: Int) {
-            updateRefreshRate()
+    private val displayListener = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+        object : DisplayManager.DisplayListener {
+            override fun onDisplayAdded(displayId: Int) {}
+            override fun onDisplayRemoved(displayId: Int) {}
+            override fun onDisplayChanged(displayId: Int) {
+                updateRefreshRate()
+            }
         }
+    } else {
+        null
     }
 
     private fun updateRefreshRate() {
         if (!::performanceMonitor.isInitialized) return
-        val hz = windowManager.defaultDisplay.mode.refreshRate.toDouble()
+        val hz = windowManager.defaultDisplay.refreshRate.toDouble()
         Gdx.app?.postRunnable { performanceMonitor.setRefreshRate(hz) }
     }
 
@@ -72,7 +76,9 @@ class AndroidLauncher : AndroidApplication() {
             }
         }
 
-        (getSystemService(DISPLAY_SERVICE) as DisplayManager).registerDisplayListener(displayListener, null)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            (getSystemService(DISPLAY_SERVICE) as DisplayManager).registerDisplayListener(displayListener, null)
+        }
         val softKeyboardObserver = AndroidSoftKeyboardObserver(this)
 
         initialize(
@@ -140,7 +146,9 @@ class AndroidLauncher : AndroidApplication() {
     override fun onDestroy() {
         super.onDestroy()
         adController.destroy()
-        (getSystemService(DISPLAY_SERVICE) as DisplayManager).unregisterDisplayListener(displayListener)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            (getSystemService(DISPLAY_SERVICE) as DisplayManager).unregisterDisplayListener(displayListener)
+        }
     }
 
     private companion object {
diff --git a/android/src/main/kotlin/ru/fredboy/cavedroid/AndroidSaveTransferController.kt b/android/src/main/kotlin/ru/fredboy/cavedroid/AndroidSaveTransferController.kt
index 5f8b97a6..22ed3fc4 100644
--- a/android/src/main/kotlin/ru/fredboy/cavedroid/AndroidSaveTransferController.kt
+++ b/android/src/main/kotlin/ru/fredboy/cavedroid/AndroidSaveTransferController.kt
@@ -2,13 +2,14 @@ package ru.fredboy.cavedroid
 
 import android.app.Activity
 import android.content.Intent
+import android.os.Build
 import ru.fredboy.cavedroid.common.api.SaveTransferController
 
 class AndroidSaveTransferController(
     private val activity: Activity,
 ) : SaveTransferController {
 
-    override val isSupported: Boolean = true
+    override val isSupported: Boolean = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT
 
     private var pendingExportBytes: ByteArray? = null
     private var pendingExportCallback: ((Boolean) -> Unit)? = null
@@ -19,6 +20,10 @@ class AndroidSaveTransferController(
         zipBytes: ByteArray,
         onResult: (success: Boolean) -> Unit,
     ) {
+        if (!isSupported) {
+            onResult(false)
+            return
+        }
         pendingExportBytes = zipBytes
         pendingExportCallback = onResult
 
@@ -31,6 +36,10 @@ class AndroidSaveTransferController(
     }
 
     override fun importSave(onResult: (zipBytes: ByteArray?) -> Unit) {
+        if (!isSupported) {
+            onResult(null)
+            return
+        }
         pendingImportCallback = onResult
 
         val intent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
diff --git a/android/src/main/kotlin/ru/fredboy/cavedroid/performance/AndroidPerformanceMonitor.kt b/android/src/main/kotlin/ru/fredboy/cavedroid/performance/AndroidPerformanceMonitor.kt
index 1d86b8d1..782693a9 100644
--- a/android/src/main/kotlin/ru/fredboy/cavedroid/performance/AndroidPerformanceMonitor.kt
+++ b/android/src/main/kotlin/ru/fredboy/cavedroid/performance/AndroidPerformanceMonitor.kt
@@ -1,6 +1,7 @@
 package ru.fredboy.cavedroid.performance
 
 import android.content.Context
+import android.os.Build
 import android.os.Debug
 import co.touchlab.kermit.Logger
 import ru.fredboy.cavedroid.BuildConfig
@@ -75,7 +76,9 @@ class AndroidPerformanceMonitor private constructor(
                 isDaemon = true
                 priority = Thread.MIN_PRIORITY
             }
-        }.apply { removeOnCancelPolicy = true }
+        }.apply {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) removeOnCancelPolicy = true
+        }
         private val operations = ArrayBlockingQueue<() -> Unit>(128)
         private val drainScheduled = AtomicBoolean()
         private val closing = AtomicBoolean()
@@ -189,12 +192,14 @@ class AndroidPerformanceMonitor private constructor(
                 monitor.sample(PerformanceGauge.HEAP_MAX, runtime.maxMemory(), epoch, generation)
                 monitor.sample(PerformanceGauge.HEAP_HEADROOM, runtime.maxMemory() - used, epoch, generation)
                 monitor.sample(PerformanceGauge.NATIVE_HEAP, Debug.getNativeHeapAllocatedSize(), epoch, generation)
-                monitor.sampleGc(
-                    Debug.getRuntimeStat("art.gc.gc-count")?.toLongOrNull(),
-                    Debug.getRuntimeStat("art.gc.gc-time")?.toLongOrNull(),
-                    epoch,
-                    generation,
-                )
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    monitor.sampleGc(
+                        Debug.getRuntimeStat("art.gc.gc-count")?.toLongOrNull(),
+                        Debug.getRuntimeStat("art.gc.gc-time")?.toLongOrNull(),
+                        epoch,
+                        generation,
+                    )
+                }
             }
             if (now - lastPss >= 30_000_000_000L) {
                 lastPss = now
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 76c5fdef..54454d0e 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -10,7 +10,7 @@ object Versions {
      *
      * [Source](https://github.com/libgdx/libgdx)
      */
-    const val gdx = "1.13.1"
+    const val gdx = "1.9.10"
 
     /**
      * Dagger version
@@ -66,7 +66,7 @@ object Versions {
      *
      * [Source](https://github.com/libktx/ktx)
      */
-    const val libKtx = "1.13.1-rc1"
+    const val libKtx = "1.9.10-b6"
 
     /**
      * Kotlin coroutines
diff --git a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/repository/SaveDataRepositoryImpl.kt b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/repository/SaveDataRepositoryImpl.kt
index c0a11417..853f4534 100644
--- a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/repository/SaveDataRepositoryImpl.kt
+++ b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/repository/SaveDataRepositoryImpl.kt
@@ -3,8 +3,8 @@ package ru.fredboy.cavedroid.data.save.repository
 import com.badlogic.gdx.Files
 import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.files.FileHandle
-import com.badlogic.gdx.graphics.Pixmap
 import com.badlogic.gdx.graphics.PixmapIO
+import com.badlogic.gdx.utils.ScreenUtils
 import com.badlogic.gdx.utils.TimeUtils
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.decodeFromByteArray
@@ -592,7 +592,7 @@ internal class SaveDataRepositoryImpl @Inject constructor(
                 return
             }
 
-            val pixmap = Pixmap.createFromFrameBuffer(
+            val pixmap = ScreenUtils.getFrameBufferPixmap(
                 halfWidth - screenshotHalfSize,
                 halfHeight - screenshotHalfSize,
                 screenshotHalfSize shl 1,
diff --git a/core/gameplay/controls/src/main/kotlin/ru/fredboy/cavedroid/gameplay/controls/GameInputProcessor.kt b/core/gameplay/controls/src/main/kotlin/ru/fredboy/cavedroid/gameplay/controls/GameInputProcessor.kt
index 94f2bb39..1a14296e 100644
--- a/core/gameplay/controls/src/main/kotlin/ru/fredboy/cavedroid/gameplay/controls/GameInputProcessor.kt
+++ b/core/gameplay/controls/src/main/kotlin/ru/fredboy/cavedroid/gameplay/controls/GameInputProcessor.kt
@@ -126,8 +126,6 @@ class GameInputProcessor @Inject constructor(
         )
     }
 
-    override fun touchCancelled(p0: Int, p1: Int, p2: Int, p3: Int): Boolean = false
-
     override fun touchDragged(screenX: Int, screenY: Int, pointer: Int): Boolean {
         val joystick = gameContextRepository.getJoystick()
         if (applicationContextRepository.isTouch() && joystick.active && joystick.pointer == pointer) {
@@ -171,13 +169,13 @@ class GameInputProcessor @Inject constructor(
 
     override fun mouseMoved(p0: Int, p1: Int): Boolean = false
 
-    override fun scrolled(amountX: Float, amountY: Float): Boolean {
+    override fun scrolled(amount: Int): Boolean {
         val action: MouseInputAction? = mouseInputActionMapper
             .mapScrolled(
                 mouseX = Gdx.input.x.toFloat(),
                 mouseY = Gdx.input.y.toFloat(),
-                amountX = amountX,
-                amountY = amountY,
+                amountX = 0f,
+                amountY = amount.toFloat(),
             )
         return handleMouseAction(action)
     }
diff --git a/core/gameplay/controls/src/main/kotlin/ru/fredboy/cavedroid/gameplay/controls/input/handler/mouse/MouseCursorInputHandler.kt b/core/gameplay/controls/src/main/kotlin/ru/fredboy/cavedroid/gameplay/controls/input/handler/mouse/MouseCursorInputHandler.kt
index e932077c..fd62b055 100644
--- a/core/gameplay/controls/src/main/kotlin/ru/fredboy/cavedroid/gameplay/controls/input/handler/mouse/MouseCursorInputHandler.kt
+++ b/core/gameplay/controls/src/main/kotlin/ru/fredboy/cavedroid/gameplay/controls/input/handler/mouse/MouseCursorInputHandler.kt
@@ -18,6 +18,7 @@ import ru.fredboy.cavedroid.gameplay.controls.input.action.MouseInputAction
 import ru.fredboy.cavedroid.gameplay.controls.input.action.keys.MouseInputActionKey
 import ru.fredboy.cavedroid.gameplay.controls.input.annotation.BindMouseInputHandler
 import javax.inject.Inject
+import kotlin.math.atan
 
 @GameScope
 @BindMouseInputHandler
@@ -38,7 +39,7 @@ class MouseCursorInputHandler @Inject constructor(
     private fun getPlayerHeadRotation(mouseWorldX: Float, mouseWorldY: Float): Float {
         val h = mouseWorldX - player.position.x
         val v = mouseWorldY - (player.position.y - player.height / 2f + player.width / 2f)
-        val rotation = MathUtils.atan(v / h) * MathUtils.radDeg
+        val rotation = atan(v / h) * MathUtils.radDeg
         return MathUtils.clamp(rotation, -45f, 45f)
     }
 
diff --git a/core/gameplay/controls/src/main/kotlin/ru/fredboy/cavedroid/gameplay/controls/input/handler/mouse/UseItemMouseInputHandler.kt b/core/gameplay/controls/src/main/kotlin/ru/fredboy/cavedroid/gameplay/controls/input/handler/mouse/UseItemMouseInputHandler.kt
index 5e9aa5ff..e33739e2 100644
--- a/core/gameplay/controls/src/main/kotlin/ru/fredboy/cavedroid/gameplay/controls/input/handler/mouse/UseItemMouseInputHandler.kt
+++ b/core/gameplay/controls/src/main/kotlin/ru/fredboy/cavedroid/gameplay/controls/input/handler/mouse/UseItemMouseInputHandler.kt
@@ -207,7 +207,7 @@ class UseItemMouseInputHandler @Inject constructor(
             x = mobController.player.position.x + mobController.player.direction.basis,
             y = mobController.player.position.y - mobController.player.height / 3f,
             velocity = Vector2.X.cpy()
-                .setAngleDeg(mobController.player.headRotation + 180f * (1 - mobController.player.direction.index))
+                .setAngle(mobController.player.headRotation + 180f * (1 - mobController.player.direction.index))
                 .scl(300f * ((mobController.player.bowState.toFloat() + 1f) / 3f)),
         )
         mobController.player.isPullingBow = false
diff --git a/core/gameplay/controls/src/main/kotlin/ru/fredboy/cavedroid/gameplay/controls/input/handler/touch/TouchCursorInputHandler.kt b/core/gameplay/controls/src/main/kotlin/ru/fredboy/cavedroid/gameplay/controls/input/handler/touch/TouchCursorInputHandler.kt
index 5761501d..3b90eaae 100644
--- a/core/gameplay/controls/src/main/kotlin/ru/fredboy/cavedroid/gameplay/controls/input/handler/touch/TouchCursorInputHandler.kt
+++ b/core/gameplay/controls/src/main/kotlin/ru/fredboy/cavedroid/gameplay/controls/input/handler/touch/TouchCursorInputHandler.kt
@@ -39,6 +39,7 @@ import ru.fredboy.cavedroid.gameplay.controls.input.annotation.BindMouseInputHan
 import ru.fredboy.cavedroid.gameplay.controls.input.isInsideHotbar
 import ru.fredboy.cavedroid.gameplay.controls.usecase.UseFoodInteractor
 import javax.inject.Inject
+import kotlin.math.atan
 
 @GameScope
 @BindMouseInputHandler
@@ -160,7 +161,7 @@ class TouchCursorInputHandler @Inject constructor(
             x = mobController.player.position.x + mobController.player.direction.basis,
             y = mobController.player.position.y - mobController.player.height / 3f,
             velocity = Vector2.X.cpy()
-                .setAngleDeg(mobController.player.headRotation + 180f * (1 - mobController.player.direction.index))
+                .setAngle(mobController.player.headRotation + 180f * (1 - mobController.player.direction.index))
                 .scl(300f * ((mobController.player.bowState.toFloat() + 1f) / 3f)),
         )
         mobController.player.isPullingBow = false
@@ -339,7 +340,7 @@ class TouchCursorInputHandler @Inject constructor(
     private fun getPlayerHeadRotation(mouseWorldX: Float, mouseWorldY: Float): Float {
         val h = mouseWorldX - player.position.x
         val v = mouseWorldY - (player.position.y - player.height / 2f + player.width / 2f)
-        val rotation = MathUtils.atan(v / h) * MathUtils.radDeg
+        val rotation = atan(v / h) * MathUtils.radDeg
         return MathUtils.clamp(rotation, -45f, 45f)
     }
 
diff --git a/core/gameplay/rendering/src/main/kotlin/ru/fredboy/cavedroid/gameplay/rendering/renderer/hud/CrosshairRenderer.kt b/core/gameplay/rendering/src/main/kotlin/ru/fredboy/cavedroid/gameplay/rendering/renderer/hud/CrosshairRenderer.kt
index f9128b44..acb439e6 100644
--- a/core/gameplay/rendering/src/main/kotlin/ru/fredboy/cavedroid/gameplay/rendering/renderer/hud/CrosshairRenderer.kt
+++ b/core/gameplay/rendering/src/main/kotlin/ru/fredboy/cavedroid/gameplay/rendering/renderer/hud/CrosshairRenderer.kt
@@ -2,10 +2,10 @@ package ru.fredboy.cavedroid.gameplay.rendering.renderer.hud
 
 import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.graphics.Color
-import com.badlogic.gdx.graphics.Pixmap
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer
 import com.badlogic.gdx.math.Rectangle
+import com.badlogic.gdx.utils.ScreenUtils
 import ru.fredboy.cavedroid.common.di.GameScope
 import ru.fredboy.cavedroid.common.utils.drawSprite
 import ru.fredboy.cavedroid.common.utils.invertColor
@@ -30,7 +30,7 @@ class CrosshairRenderer @Inject constructor(
         get() = RENDER_LAYER
 
     private fun getTintColor(x: Float, y: Float, viewport: Rectangle): Color {
-        val pixmap = Pixmap.createFromFrameBuffer(
+        val pixmap = ScreenUtils.getFrameBufferPixmap(
             /* x = */ (x * (Gdx.graphics.width / viewport.width)).toInt(),
             /* y = */ Gdx.graphics.height - (y * (Gdx.graphics.height / viewport.height)).toInt(),
             /* w = */ 1,
diff --git a/core/gameplay/rendering/src/main/kotlin/ru/fredboy/cavedroid/gameplay/rendering/renderer/world/ProjectilesRenderer.kt b/core/gameplay/rendering/src/main/kotlin/ru/fredboy/cavedroid/gameplay/rendering/renderer/world/ProjectilesRenderer.kt
index 376d7ec5..e59fe749 100644
--- a/core/gameplay/rendering/src/main/kotlin/ru/fredboy/cavedroid/gameplay/rendering/renderer/world/ProjectilesRenderer.kt
+++ b/core/gameplay/rendering/src/main/kotlin/ru/fredboy/cavedroid/gameplay/rendering/renderer/world/ProjectilesRenderer.kt
@@ -48,7 +48,7 @@ class ProjectilesRenderer @Inject constructor(
                     y = projectileRect.y,
                     width = projectileRect.width,
                     height = projectileRect.height,
-                    rotation = projectile.velocity.get().angleDeg() + rotationOffset,
+                    rotation = projectile.velocity.get().angle() + rotationOffset,
                     origin = SpriteOrigin.CENTER,
                 )
             }
diff --git a/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/about/AboutMenuView.kt b/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/about/AboutMenuView.kt
index 6fcdf3fc..7f794f06 100644
--- a/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/about/AboutMenuView.kt
+++ b/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/about/AboutMenuView.kt
@@ -47,7 +47,7 @@ fun Stage.aboutMenuView(viewModel: AboutMenuViewModel) = viewModel.also {
                     Copyright © 2018-2026 Fedor Ivanov <fredboy@protonmail.com>
                 """.trimIndent(),
             ) {
-                wrap = true
+                setWrap(true)
                 setAlignment(Align.center)
             }.cell(
                 expand = true,
diff --git a/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/attribution/AttributionMenuView.kt b/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/attribution/AttributionMenuView.kt
index de7d4cf9..7c1c530b 100644
--- a/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/attribution/AttributionMenuView.kt
+++ b/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/attribution/AttributionMenuView.kt
@@ -29,7 +29,7 @@ suspend fun Stage.attributionMenuView(viewModel: AttributionMenuViewModel) = vie
 
                 scrollPane {
                     label(attributions) {
-                        wrap = true
+                        setWrap(true)
                     }
                 }.cell(
                     expand = true,
diff --git a/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/disclaimer/AdsDisclaimerView.kt b/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/disclaimer/AdsDisclaimerView.kt
index 1f7a9e2f..aa716644 100644
--- a/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/disclaimer/AdsDisclaimerView.kt
+++ b/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/disclaimer/AdsDisclaimerView.kt
@@ -37,7 +37,7 @@ fun Stage.adsDisclaimerView(viewModel: AdsDisclaimerViewModel) = viewModel.also
             row()
 
             scrollPane {
-                label(viewModel.getLocalizedString("adsDisclaimerBody")) { wrap = true }
+                label(viewModel.getLocalizedString("adsDisclaimerBody")) { setWrap(true) }
             }.cell(
                 expand = true,
                 fill = true,
diff --git a/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/editworld/EditWorldMenuView.kt b/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/editworld/EditWorldMenuView.kt
index 1892f129..d1e38388 100644
--- a/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/editworld/EditWorldMenuView.kt
+++ b/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/editworld/EditWorldMenuView.kt
@@ -6,6 +6,7 @@ import com.badlogic.gdx.scenes.scene2d.InputEvent
 import com.badlogic.gdx.scenes.scene2d.InputListener
 import com.badlogic.gdx.scenes.scene2d.Stage
 import com.badlogic.gdx.scenes.scene2d.Touchable
+import com.badlogic.gdx.scenes.scene2d.ui.Image
 import com.badlogic.gdx.scenes.scene2d.ui.TextField
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener
 import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable
@@ -16,7 +17,6 @@ import ktx.scene2d.KTableWidget
 import ktx.scene2d.Scene2DSkin
 import ktx.scene2d.Scene2dDsl
 import ktx.scene2d.actors
-import ktx.scene2d.image
 import ktx.scene2d.imageButton
 import ktx.scene2d.label
 import ktx.scene2d.table
@@ -75,9 +75,10 @@ private fun Stage.showInfo(viewModel: EditWorldMenuViewModel, state: EditWorldMe
                 isDisabled = true
 
                 details.screenshot?.let { screenshot ->
-                    image(screenshot) {
+                    val thumbnail = Image(screenshot).apply {
                         touchable = Touchable.disabled
-                    }.cell(width = 80f, height = 80f)
+                    }
+                    add(thumbnail).width(80f).height(80f)
                 }
             }.cell(width = 100f, height = 100f, align = Align.left)
 
diff --git a/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/notice/NoticeMenuView.kt b/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/notice/NoticeMenuView.kt
index 591b1f5b..824c49bf 100644
--- a/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/notice/NoticeMenuView.kt
+++ b/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/notice/NoticeMenuView.kt
@@ -28,7 +28,7 @@ suspend fun Stage.noticeMenuView(viewModel: NoticeMenuViewModel) = viewModel.als
                 pad(8f)
 
                 scrollPane {
-                    label(state.notices) { wrap = true }
+                    label(state.notices) { setWrap(true) }
                 }.cell(
                     expand = true,
                     fill = true,
diff --git a/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/singleplayer/SinglePlayerMenuView.kt b/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/singleplayer/SinglePlayerMenuView.kt
index 20bb4c52..7924661e 100644
--- a/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/singleplayer/SinglePlayerMenuView.kt
+++ b/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/singleplayer/SinglePlayerMenuView.kt
@@ -2,6 +2,7 @@ package ru.fredboy.cavedroid.gdx.menu.v2.view.singleplayer
 
 import com.badlogic.gdx.scenes.scene2d.Stage
 import com.badlogic.gdx.scenes.scene2d.Touchable
+import com.badlogic.gdx.scenes.scene2d.ui.Image
 import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable
 import com.badlogic.gdx.scenes.scene2d.utils.TiledDrawable
 import com.badlogic.gdx.utils.Align
@@ -9,7 +10,6 @@ import ktx.scene2d.KTableWidget
 import ktx.scene2d.KWidget
 import ktx.scene2d.Scene2dDsl
 import ktx.scene2d.actors
-import ktx.scene2d.image
 import ktx.scene2d.imageButton
 import ktx.scene2d.label
 import ktx.scene2d.scrollPane
@@ -268,12 +268,10 @@ private fun <S> KWidget<S>.saveItem(
         isDisabled = true
 
         saveInfo.screenshot?.let { screenshot ->
-            image(screenshot) {
+            val thumbnail = Image(screenshot).apply {
                 touchable = Touchable.disabled
-            }.cell(
-                width = 80f,
-                height = 80f,
-            )
+            }
+            add(thumbnail).width(80f).height(80f)
         }
     }.cell(
         width = 100f,
diff --git a/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/stats/StatsMenuView.kt b/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/stats/StatsMenuView.kt
index 6a628dea..a14f467f 100644
--- a/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/stats/StatsMenuView.kt
+++ b/core/gdx/src/main/kotlin/ru/fredboy/cavedroid/gdx/menu/v2/view/stats/StatsMenuView.kt
@@ -28,7 +28,7 @@ suspend fun Stage.statsMenuView(viewModel: StatsMenuViewModel) = viewModel.also
                 pad(8f)
 
                 scrollPane {
-                    label(buildContent(viewModel, state)) { wrap = true }
+                    label(buildContent(viewModel, state)) { setWrap(true) }
                 }.cell(
                     expand = true,
                     fill = true,