From 1795af25fd3cef553eabaceddc859f482fc56423 Mon Sep 17 00:00:00 2001 From: fredboy Date: Tue, 1 Jul 2025 22:14:43 +0700 Subject: [PATCH] Fix ktlint --- .editorconfig | 2 + .github/workflows/ktlint.yml | 27 +++---- android/build.gradle.kts | 1 - .../cavedroid/AndroidPreferencesStore.kt | 4 +- build.gradle.kts | 6 ++ buildSrc/build.gradle.kts | 5 ++ buildSrc/src/main/kotlin/ApplicationInfo.kt | 2 +- buildSrc/src/main/kotlin/Dependencies.kt | 5 +- .../kotlin/DependencyHandlerExtentions.kt | 6 +- buildSrc/src/main/kotlin/Versions.kt | 2 +- core/common/build.gradle.kts | 1 - .../cavedroid/common/model/SpriteOrigin.kt | 10 +-- .../common/utils/CollectionsExtensions.kt | 4 +- core/data/assets/build.gradle.kts | 1 - .../internal/BlockAssetsRepositoryImpl.kt | 4 +- .../BlockDamageAssetsRepositoryImpl.kt | 4 +- .../internal/FontAssetsRepositoryImpl.kt | 4 +- .../internal/ItemsAssetsRepositoryImpl.kt | 4 +- .../internal/MobAssetsRepositoryImpl.kt | 8 +- .../TextureRegionsAssetsRepositoryImpl.kt | 4 +- .../internal/TouchButtonsRepositoryImpl.kt | 22 +++--- core/data/configuration/build.gradle.kts | 1 - core/data/items/build.gradle.kts | 1 - .../data/items/mapper/BlockMapper.kt | 74 +++++++++--------- .../cavedroid/data/items/mapper/ItemMapper.kt | 24 +++--- .../items/repository/ItemsRepositoryImpl.kt | 30 +++----- core/data/menu/build.gradle.kts | 1 - .../data/menu/mapper/MenuButtonMapper.kt | 46 +++++------ core/data/save/build.gradle.kts | 1 - .../cavedroid/data/save/mapper/ChestMapper.kt | 12 ++- .../save/mapper/ContainerControllerMapper.kt | 22 +++--- .../data/save/mapper/ControlModeMapper.kt | 16 ++-- .../data/save/mapper/DirectionMapper.kt | 16 ++-- .../data/save/mapper/DropControllerMapper.kt | 10 +-- .../cavedroid/data/save/mapper/DropMapper.kt | 26 +++---- .../data/save/mapper/FallingBlockMapper.kt | 38 +++++----- .../data/save/mapper/FurnaceMapper.kt | 22 +++--- .../data/save/mapper/InventoryItemMapper.kt | 12 ++- .../data/save/mapper/InventoryMapper.kt | 12 ++- .../data/save/mapper/MobControllerMapper.kt | 24 +++--- .../cavedroid/data/save/mapper/PigMapper.kt | 36 +++++---- .../data/save/mapper/PlayerMapper.kt | 66 ++++++++-------- .../save/repository/SaveDataRepositoryImpl.kt | 16 ++-- core/domain/assets/build.gradle.kts | 1 - .../domain/assets/GameAssetsHolder.kt | 44 +++-------- .../assets/repository/AssetsRepository.kt | 18 ++--- .../GetBlockDamageFrameCountUseCase.kt | 4 +- .../usecase/GetBlockDamageSpriteUseCase.kt | 4 +- .../assets/usecase/GetBlockTextureUseCase.kt | 4 +- .../domain/assets/usecase/GetFontUseCase.kt | 4 +- .../assets/usecase/GetItemTextureUseCase.kt | 4 +- .../assets/usecase/GetPigSpritesUseCase.kt | 4 +- .../assets/usecase/GetPlayerSpritesUseCase.kt | 4 +- .../assets/usecase/GetStringHeightUseCase.kt | 4 +- .../assets/usecase/GetStringWidthUseCase.kt | 4 +- .../usecase/GetTextureRegionByNameUseCase.kt | 4 +- .../assets/usecase/GetTouchButtonsUseCase.kt | 4 +- core/domain/configuration/build.gradle.kts | 1 - .../configuration/model/CameraContext.kt | 4 +- core/domain/items/build.gradle.kts | 1 - .../domain/items/model/block/Block.kt | 40 ++++------ .../domain/items/model/inventory/Inventory.kt | 4 +- .../items/model/inventory/InventoryItem.kt | 6 +- .../cavedroid/domain/items/model/item/Item.kt | 12 +-- .../items/usecase/GetBlockByKeyUseCase.kt | 4 +- .../items/usecase/GetBlocksByTypeUseCase.kt | 4 +- .../items/usecase/GetCraftingResultUseCase.kt | 4 +- .../items/usecase/GetFallbackBlockUseCase.kt | 4 +- .../items/usecase/GetFallbackItemUseCase.kt | 4 +- .../items/usecase/GetItemByIndexUseCase.kt | 4 +- .../items/usecase/GetItemByKeyUseCase.kt | 4 +- core/domain/menu/build.gradle.kts | 1 - core/domain/save/build.gradle.kts | 1 - .../domain/save/model/GameSaveData.kt | 8 +- core/domain/world/build.gradle.kts | 1 - core/entity/container/build.gradle.kts | 1 - .../container/model/ContainerCoordinates.kt | 4 +- .../entity/container/model/Furnace.kt | 9 +-- core/entity/drop/build.gradle.kts | 1 - .../cavedroid/entity/drop/model/Drop.kt | 14 ++-- core/entity/mob/build.gradle.kts | 1 - .../fredboy/cavedroid/entity/mob/model/Mob.kt | 22 ++---- .../fredboy/cavedroid/entity/mob/model/Pig.kt | 4 +- .../cavedroid/entity/mob/model/Player.kt | 4 +- .../controller/container/build.gradle.kts | 1 - .../container/ContainerController.kt | 3 +- core/game/controller/drop/build.gradle.kts | 1 - core/game/controller/mob/build.gradle.kts | 1 - .../mob/behavior/FallingBlockMobBehavior.kt | 7 +- .../controller/mob/behavior/PigMobBehavior.kt | 7 +- .../mob/behavior/PlayerMobBehavior.kt | 7 +- core/game/window/build.gradle.kts | 1 - .../inventory/AbstractInventoryWindow.kt | 6 +- .../inventory/CreativeInventoryWindow.kt | 6 +- core/game/world/build.gradle.kts | 1 - .../fredboy/cavedroid/game/world/GameWorld.kt | 31 +++----- .../world/generator/WorldGeneratorConfig.kt | 22 +++--- .../game/world/impl/WorldAdapterImpl.kt | 12 ++- core/ux/controls/build.gradle.kts | 1 - .../ux/controls/GameInputProcessor.kt | 20 ++--- .../cavedroid/ux/controls/input/InputUtils.kt | 10 +-- .../CloseGameWindowKeyboardInputHandler.kt | 7 +- .../keyboard/DropItemKeyboardInputHandler.kt | 9 +-- .../keyboard/FlyDownKeyboardInputHandler.kt | 8 +- .../keyboard/FlyUpKeyboardInputHandler.kt | 10 +-- .../keyboard/GoRightKeyboardInputHandler.kt | 6 +- .../keyboard/JumpKeyboardInputHandler.kt | 11 ++- ...eCursorControlsModeKeyboardInputHandler.kt | 19 +++-- .../OpenInventoryKeyboardInputHandler.kt | 7 +- .../keyboard/PauseGameKeyboardInputHandler.kt | 4 +- .../SelectHotbarSlotKeyboardInputHandler.kt | 6 +- .../keyboard/StopSwimKeyboardInputHandler.kt | 9 +-- .../keyboard/SwimUpKeyboardInputHandler.kt | 18 ++--- .../ToggleControlsModeKeyboardInputHandler.kt | 7 +- .../ToggleDebugInfoKeyboardInputHandler.kt | 4 +- .../ToggleGameModeKeyboardInputHandler.kt | 4 +- .../ToggleMinimapKeyboardInputHandler.kt | 4 +- .../TurnOnFlyModeKeyboardInputHandler.kt | 13 ++-- ...AbstractInventoryItemsMouseInputHandler.kt | 21 +++-- .../handler/mouse/AttackMouseInputHandler.kt | 8 +- .../mouse/CloseGameWindowMouseInputHandler.kt | 26 +++---- ...reativeInventoryScrollMouseInputHandler.kt | 37 +++++---- .../handler/mouse/CursorMouseInputHandler.kt | 13 ++-- .../handler/mouse/HotbarMouseInputHandler.kt | 32 ++++---- ...lectChestInventoryItemMouseInputHandler.kt | 14 ++-- ...tCraftingInventoryItemMouseInputHandler.kt | 14 ++-- ...tCreativeInventoryItemMouseInputHandler.kt | 17 +++-- ...ctFurnaceInventoryItemMouseInputHandler.kt | 6 +- ...tSurvivalInventoryItemMouseInputHandler.kt | 14 ++-- .../handler/mouse/UseItemMouseInputHandler.kt | 10 +-- .../handler/touch/JoystickInputHandler.kt | 19 +++-- .../input/mapper/MouseInputActionMapper.kt | 50 +++++------- core/ux/physics/build.gradle.kts | 1 - core/ux/rendering/build.gradle.kts | 1 - .../rendering/windows/ChestWindowRenderer.kt | 3 +- .../windows/CraftingWindowRenderer.kt | 3 +- .../windows/CreativeWindowRenderer.kt | 3 +- .../windows/FurnaceWindowRenderer.kt | 3 +- .../windows/SurvivalWindowRenderer.kt | 3 +- core/zygote/build.gradle.kts | 1 - .../cavedroid/zygote/CaveDroidApplication.kt | 3 +- .../cavedroid/zygote/game/GameScreen.kt | 42 +++++----- .../cavedroid/zygote/game/di/GameModule.kt | 76 +++++++++---------- .../zygote/menu/action/LoadGameAction.kt | 4 +- .../zygote/menu/input/MenuInputProcessor.kt | 32 ++------ .../bool/DynamicCameraMenuBooleanOption.kt | 4 +- .../bool/FullscreenMenuBooleanOption.kt | 4 +- desktop/build.gradle.kts | 1 - .../desktop/DesktopPreferencesStore.kt | 4 +- 149 files changed, 689 insertions(+), 969 deletions(-) diff --git a/.editorconfig b/.editorconfig index ec9a968..a05e399 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,6 +12,8 @@ ktlint_standard_string-template-indent = disabled ktlint_standard_comment-wrapping = disabled ktlint_standard_no-empty-first-line-in-class-body = disabled ktlint_standard_property-naming = disabled +ktlint_standard_backing-property-naming = disabled +ktlint_standard_function-expression-body = disabled [**/generated/**] generated_code = true diff --git a/.github/workflows/ktlint.yml b/.github/workflows/ktlint.yml index f0f7a8b..9256e00 100644 --- a/.github/workflows/ktlint.yml +++ b/.github/workflows/ktlint.yml @@ -15,21 +15,16 @@ on: - '**.kts' -jobs: - ktlint: - runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 + - name: set up JDK 17 + uses: actions/setup-java@v3 with: - fetch-depth: 1 - - run: | - curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.2.1/ktlint && chmod a+x ktlint && sudo mv ktlint /usr/local/bin/ - - name: run ktlint - run: | - ktlint --reporter=checkstyle,output=build/ktlint-report.xml - continue-on-error: true - - uses: yutailang0119/action-ktlint@v4 - with: - report-path: build/*.xml # Support glob patterns by https://www.npmjs.com/package/@actions/glob - ignore-warnings: true # Ignore Lint Warnings - continue-on-error: false # If annotations contain error of severity, action-ktlint exit 1. + java-version: '17' + distribution: 'temurin' + cache: gradle + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Check Ktlint with Gradle + run: ./gradlew ktlintCheck buildSrc:ktlintCheck diff --git a/android/build.gradle.kts b/android/build.gradle.kts index eb63e5c..827e0c2 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -6,7 +6,6 @@ private val natives by configurations.creating plugins { id("com.android.application") id("kotlin-android") - ktlintGradle } private val keystorePropertiesFile = rootProject.file("keystore.properties") diff --git a/android/src/main/kotlin/ru/deadsoftware/cavedroid/AndroidPreferencesStore.kt b/android/src/main/kotlin/ru/deadsoftware/cavedroid/AndroidPreferencesStore.kt index ed96040..11c661d 100644 --- a/android/src/main/kotlin/ru/deadsoftware/cavedroid/AndroidPreferencesStore.kt +++ b/android/src/main/kotlin/ru/deadsoftware/cavedroid/AndroidPreferencesStore.kt @@ -9,9 +9,7 @@ class AndroidPreferencesStore( private val sharedPreferences by lazy { context.getSharedPreferences(SHARED_PREFS_NAME, Context.MODE_PRIVATE) } - override fun getPreference(key: String): String? { - return sharedPreferences.getString(key, null) - } + override fun getPreference(key: String): String? = sharedPreferences.getString(key, null) override fun setPreference(key: String, value: String?) { with(sharedPreferences.edit()) { diff --git a/build.gradle.kts b/build.gradle.kts index 7225674..132973d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,6 +22,12 @@ buildscript { allprojects { version = ApplicationInfo.versionName + apply(plugin = "org.jlleitschuh.gradle.ktlint") + + ktlint { + version.set("1.6.0") + } + repositories { mavenLocal() mavenCentral() diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 876c922..6806cd1 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,7 +1,12 @@ plugins { `kotlin-dsl` + id("org.jlleitschuh.gradle.ktlint") version "12.3.0" } repositories { mavenCentral() } + +ktlint { + version.set("1.6.0") +} diff --git a/buildSrc/src/main/kotlin/ApplicationInfo.kt b/buildSrc/src/main/kotlin/ApplicationInfo.kt index 05676c4..022154b 100644 --- a/buildSrc/src/main/kotlin/ApplicationInfo.kt +++ b/buildSrc/src/main/kotlin/ApplicationInfo.kt @@ -8,4 +8,4 @@ object ApplicationInfo { const val packageName = "ru.deadsoftware.cavedroid" val sourceCompatibility = JavaVersion.VERSION_17 -} \ No newline at end of file +} diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index c688ed7..aa58d54 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -1,5 +1,3 @@ -import org.gradle.kotlin.dsl.version - object Dependencies { object LibGDX { @@ -45,5 +43,4 @@ object Dependencies { } const val androidGradlePlugin = "com.android.tools.build:gradle:${Versions.agp}" - -} \ No newline at end of file +} diff --git a/buildSrc/src/main/kotlin/DependencyHandlerExtentions.kt b/buildSrc/src/main/kotlin/DependencyHandlerExtentions.kt index 030f783..9a3c3bb 100644 --- a/buildSrc/src/main/kotlin/DependencyHandlerExtentions.kt +++ b/buildSrc/src/main/kotlin/DependencyHandlerExtentions.kt @@ -1,11 +1,9 @@ import org.gradle.api.artifacts.dsl.DependencyHandler import org.gradle.kotlin.dsl.project -private fun DependencyHandler.implementation(dependency: String) = - add("implementation", dependency) +private fun DependencyHandler.implementation(dependency: String) = add("implementation", dependency) -private fun DependencyHandler.ksp(dependency: String) = - add("ksp", dependency) +private fun DependencyHandler.ksp(dependency: String) = add("ksp", dependency) fun DependencyHandler.useModule(moduleName: String) { add("implementation", project(moduleName)) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index a5ae05b..191b185 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -67,4 +67,4 @@ object Versions { * [Source](https://github.com/JLLeitschuh/ktlint-gradle) */ const val ktlintGradle = "12.3.0" -} \ No newline at end of file +} diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts index 6b424c7..114a577 100644 --- a/core/common/build.gradle.kts +++ b/core/common/build.gradle.kts @@ -1,7 +1,6 @@ plugins { kotlin ksp - ktlintGradle } java.sourceCompatibility = ApplicationInfo.sourceCompatibility diff --git a/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/model/SpriteOrigin.kt b/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/model/SpriteOrigin.kt index e79f568..e393fd8 100644 --- a/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/model/SpriteOrigin.kt +++ b/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/model/SpriteOrigin.kt @@ -17,12 +17,10 @@ data class SpriteOrigin( assert(y in 0f..1f) } - fun getFlipped(flipX: Boolean, flipY: Boolean): SpriteOrigin { - return SpriteOrigin( - x = if (flipX) 1 - x else x, - y = if (flipY) 1 - y else y, - ) - } + fun getFlipped(flipX: Boolean, flipY: Boolean): SpriteOrigin = SpriteOrigin( + x = if (flipX) 1 - x else x, + y = if (flipY) 1 - y else y, + ) fun applyToSprite(sprite: Sprite) { sprite.setOrigin(sprite.width * x, sprite.height * y) diff --git a/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/utils/CollectionsExtensions.kt b/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/utils/CollectionsExtensions.kt index fef5fd1..2aceb25 100644 --- a/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/utils/CollectionsExtensions.kt +++ b/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/utils/CollectionsExtensions.kt @@ -13,6 +13,4 @@ fun MutableCollection.retrieveFirst(predicate: (T) -> Boolean): T? { return null } -fun MutableCollection.removeFirst(predicate: (T) -> Boolean): Boolean { - return retrieveFirst(predicate) != null -} +fun MutableCollection.removeFirst(predicate: (T) -> Boolean): Boolean = retrieveFirst(predicate) != null diff --git a/core/data/assets/build.gradle.kts b/core/data/assets/build.gradle.kts index 892762b..8ab6f7c 100644 --- a/core/data/assets/build.gradle.kts +++ b/core/data/assets/build.gradle.kts @@ -2,7 +2,6 @@ plugins { kotlin ksp kotlinxSerialization - ktlintGradle } java.sourceCompatibility = ApplicationInfo.sourceCompatibility diff --git a/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/BlockAssetsRepositoryImpl.kt b/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/BlockAssetsRepositoryImpl.kt index 87cd703..41ed4c5 100644 --- a/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/BlockAssetsRepositoryImpl.kt +++ b/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/BlockAssetsRepositoryImpl.kt @@ -10,9 +10,7 @@ internal class BlockAssetsRepositoryImpl @Inject constructor() : BlockAssetsRepo private val blockTexturesCache = HashMap() - override fun getBlockTexture(textureName: String): Texture { - return resolveTexture(textureName, BLOCKS_TEXTURES_PATH, blockTexturesCache) - } + override fun getBlockTexture(textureName: String): Texture = resolveTexture(textureName, BLOCKS_TEXTURES_PATH, blockTexturesCache) override fun initialize() { // no-op diff --git a/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/BlockDamageAssetsRepositoryImpl.kt b/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/BlockDamageAssetsRepositoryImpl.kt index 37f8d96..b30dc61 100644 --- a/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/BlockDamageAssetsRepositoryImpl.kt +++ b/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/BlockDamageAssetsRepositoryImpl.kt @@ -32,9 +32,7 @@ internal class BlockDamageAssetsRepositoryImpl @Inject constructor() : BlockDama } } - override fun getBlockDamageSprite(stage: Int): Sprite { - return requireNotNull(blockDamageSprites)[stage] - } + override fun getBlockDamageSprite(stage: Int): Sprite = requireNotNull(blockDamageSprites)[stage] override fun initialize() { loadBlockDamage() diff --git a/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/FontAssetsRepositoryImpl.kt b/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/FontAssetsRepositoryImpl.kt index 4b071cf..608a9cf 100644 --- a/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/FontAssetsRepositoryImpl.kt +++ b/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/FontAssetsRepositoryImpl.kt @@ -24,9 +24,7 @@ internal class FontAssetsRepositoryImpl @Inject constructor() : FontAssetsReposi return glyphLayout.height } - override fun getFont(): BitmapFont { - return requireNotNull(font) - } + override fun getFont(): BitmapFont = requireNotNull(font) override fun initialize() { font = BitmapFont(Gdx.files.internal(FONT_FILE_PATH), true) diff --git a/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/ItemsAssetsRepositoryImpl.kt b/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/ItemsAssetsRepositoryImpl.kt index b9c8d99..e23d09f 100644 --- a/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/ItemsAssetsRepositoryImpl.kt +++ b/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/ItemsAssetsRepositoryImpl.kt @@ -10,9 +10,7 @@ internal class ItemsAssetsRepositoryImpl @Inject constructor() : ItemsAssetsRepo private val itemTexturesCache = HashMap() - override fun getItemTexture(textureName: String): Texture { - return resolveTexture(textureName, ITEMS_TEXTURES_PATH, itemTexturesCache) - } + override fun getItemTexture(textureName: String): Texture = resolveTexture(textureName, ITEMS_TEXTURES_PATH, itemTexturesCache) override fun initialize() { // no-op diff --git a/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/MobAssetsRepositoryImpl.kt b/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/MobAssetsRepositoryImpl.kt index 3090a8b..0ddc78a 100644 --- a/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/MobAssetsRepositoryImpl.kt +++ b/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/MobAssetsRepositoryImpl.kt @@ -36,13 +36,9 @@ internal class MobAssetsRepositoryImpl @Inject constructor() : MobAssetsReposito ) } - override fun getPlayerSprites(): MobSprite.Player { - return requireNotNull(playerSprite) - } + override fun getPlayerSprites(): MobSprite.Player = requireNotNull(playerSprite) - override fun getPigSprites(): MobSprite.Pig { - return requireNotNull(pigSprite) - } + override fun getPigSprites(): MobSprite.Pig = requireNotNull(pigSprite) override fun initialize() { loadPlayerSprite() diff --git a/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/TextureRegionsAssetsRepositoryImpl.kt b/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/TextureRegionsAssetsRepositoryImpl.kt index a05cc82..ae66b9e 100644 --- a/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/TextureRegionsAssetsRepositoryImpl.kt +++ b/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/TextureRegionsAssetsRepositoryImpl.kt @@ -52,9 +52,7 @@ internal class TextureRegionsAssetsRepositoryImpl @Inject constructor() : Textur loadTextureRegions() } - override fun getTextureRegionByName(name: String): TextureRegion? { - return requireNotNull(textureRegions)[name] - } + override fun getTextureRegionByName(name: String): TextureRegion? = requireNotNull(textureRegions)[name] override fun dispose() { super.dispose() diff --git a/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/TouchButtonsRepositoryImpl.kt b/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/TouchButtonsRepositoryImpl.kt index dc4363c..d7e36c5 100644 --- a/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/TouchButtonsRepositoryImpl.kt +++ b/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/TouchButtonsRepositoryImpl.kt @@ -15,19 +15,15 @@ internal class TouchButtonsRepositoryImpl @Inject constructor() : TouchButtonsAs private val guiMap = HashMap() - override fun getTouchButtons(): Map { - return guiMap - } - - private fun getMouseKey(name: String): Int { - return when (name) { - "Left" -> Input.Buttons.LEFT - "Right" -> Input.Buttons.RIGHT - "Middle" -> Input.Buttons.MIDDLE - "Back" -> Input.Buttons.BACK - "Forward" -> Input.Buttons.FORWARD - else -> -1 - } + override fun getTouchButtons(): Map = guiMap + + private fun getMouseKey(name: String): Int = when (name) { + "Left" -> Input.Buttons.LEFT + "Right" -> Input.Buttons.RIGHT + "Middle" -> Input.Buttons.MIDDLE + "Back" -> Input.Buttons.BACK + "Forward" -> Input.Buttons.FORWARD + else -> -1 } private fun loadTouchButtons() { diff --git a/core/data/configuration/build.gradle.kts b/core/data/configuration/build.gradle.kts index 49f56ad..2092f36 100644 --- a/core/data/configuration/build.gradle.kts +++ b/core/data/configuration/build.gradle.kts @@ -1,7 +1,6 @@ plugins { kotlin ksp - ktlintGradle } java.sourceCompatibility = ApplicationInfo.sourceCompatibility diff --git a/core/data/items/build.gradle.kts b/core/data/items/build.gradle.kts index b1aeda5..dfd5c0f 100644 --- a/core/data/items/build.gradle.kts +++ b/core/data/items/build.gradle.kts @@ -2,7 +2,6 @@ plugins { kotlin ksp kotlinxSerialization - ktlintGradle } java.sourceCompatibility = ApplicationInfo.sourceCompatibility diff --git a/core/data/items/src/main/kotlin/ru/fredboy/cavedroid/data/items/mapper/BlockMapper.kt b/core/data/items/src/main/kotlin/ru/fredboy/cavedroid/data/items/mapper/BlockMapper.kt index ab791b0..14a583d 100644 --- a/core/data/items/src/main/kotlin/ru/fredboy/cavedroid/data/items/mapper/BlockMapper.kt +++ b/core/data/items/src/main/kotlin/ru/fredboy/cavedroid/data/items/mapper/BlockMapper.kt @@ -39,47 +39,43 @@ class BlockMapper @Inject constructor( } } - private fun mapCommonParams(key: String, dto: BlockDto): CommonBlockParams { - return CommonBlockParams( - key = key, - collisionMargins = BlockMargins( - left = dto.left, - top = dto.top, - right = dto.right, - bottom = dto.bottom, - ), - hitPoints = dto.hp, - dropInfo = mapBlockDropInfo(dto), - hasCollision = dto.collision, - isBackground = dto.background, - isTransparent = dto.transparent, - requiresBlock = dto.blockRequired, - animationInfo = mapBlockAnimationInfo(dto), - texture = getTexture(dto.texture), - spriteMargins = BlockMargins( - left = dto.spriteLeft, - top = dto.spriteTop, - right = dto.spriteRight, - bottom = dto.spriteBottom, - ), - toolLevel = dto.toolLevel, - toolType = mapToolType(dto), - damage = dto.damage, - tint = dto.tint, - isFallable = dto.fallable, - ) - } + private fun mapCommonParams(key: String, dto: BlockDto): CommonBlockParams = CommonBlockParams( + key = key, + collisionMargins = BlockMargins( + left = dto.left, + top = dto.top, + right = dto.right, + bottom = dto.bottom, + ), + hitPoints = dto.hp, + dropInfo = mapBlockDropInfo(dto), + hasCollision = dto.collision, + isBackground = dto.background, + isTransparent = dto.transparent, + requiresBlock = dto.blockRequired, + animationInfo = mapBlockAnimationInfo(dto), + texture = getTexture(dto.texture), + spriteMargins = BlockMargins( + left = dto.spriteLeft, + top = dto.spriteTop, + right = dto.spriteRight, + bottom = dto.spriteBottom, + ), + toolLevel = dto.toolLevel, + toolType = mapToolType(dto), + damage = dto.damage, + tint = dto.tint, + isFallable = dto.fallable, + ) - private fun mapToolType(dto: BlockDto): Class? { - return when (dto.toolType) { - "shovel" -> Item.Shovel::class.java - "sword" -> Item.Sword::class.java - "pickaxe" -> Item.Pickaxe::class.java - "axe" -> Item.Axe::class.java - "shears" -> Item.Shears::class.java + private fun mapToolType(dto: BlockDto): Class? = when (dto.toolType) { + "shovel" -> Item.Shovel::class.java + "sword" -> Item.Sword::class.java + "pickaxe" -> Item.Pickaxe::class.java + "axe" -> Item.Axe::class.java + "shears" -> Item.Shears::class.java - else -> null - } + else -> null } private fun mapBlockDropInfo(dto: BlockDto): BlockDropInfo? { diff --git a/core/data/items/src/main/kotlin/ru/fredboy/cavedroid/data/items/mapper/ItemMapper.kt b/core/data/items/src/main/kotlin/ru/fredboy/cavedroid/data/items/mapper/ItemMapper.kt index eb8ddc2..3affe70 100644 --- a/core/data/items/src/main/kotlin/ru/fredboy/cavedroid/data/items/mapper/ItemMapper.kt +++ b/core/data/items/src/main/kotlin/ru/fredboy/cavedroid/data/items/mapper/ItemMapper.kt @@ -97,19 +97,17 @@ class ItemMapper @Inject constructor( } } - private fun mapCommonParams(key: String, dto: ItemDto): CommonItemParams { - return CommonItemParams( - key = key, - name = dto.name, - inHandSpriteOrigin = SpriteOrigin( - x = dto.originX, - y = dto.origin_y, - ), - maxStack = dto.maxStack, - burningTimeMs = dto.burningTime, - smeltProductKey = dto.smeltProduct, - ) - } + private fun mapCommonParams(key: String, dto: ItemDto): CommonItemParams = CommonItemParams( + key = key, + name = dto.name, + inHandSpriteOrigin = SpriteOrigin( + x = dto.originX, + y = dto.origin_y, + ), + maxStack = dto.maxStack, + burningTimeMs = dto.burningTime, + smeltProductKey = dto.smeltProduct, + ) private fun loadSprite(dto: ItemDto): Sprite? { if (dto.type == "none" || dto.type == "block" || dto.texture == ItemsRepositoryImpl.FALLBACK_ITEM_KEY) { diff --git a/core/data/items/src/main/kotlin/ru/fredboy/cavedroid/data/items/repository/ItemsRepositoryImpl.kt b/core/data/items/src/main/kotlin/ru/fredboy/cavedroid/data/items/repository/ItemsRepositoryImpl.kt index ffdb531..c8cfdc4 100644 --- a/core/data/items/src/main/kotlin/ru/fredboy/cavedroid/data/items/repository/ItemsRepositoryImpl.kt +++ b/core/data/items/src/main/kotlin/ru/fredboy/cavedroid/data/items/repository/ItemsRepositoryImpl.kt @@ -120,29 +120,21 @@ internal class ItemsRepositoryImpl @Inject constructor( loadCraftingRecipes() } - override fun getItemByKey(key: String): Item { - return itemsMap.getOrFallback(key, fallbackItem) { - "No item with key '$key' found. Returning $FALLBACK_ITEM_KEY" - } + override fun getItemByKey(key: String): Item = itemsMap.getOrFallback(key, fallbackItem) { + "No item with key '$key' found. Returning $FALLBACK_ITEM_KEY" } - override fun getItemByIndex(index: Int): Item { - return if (index in itemsMap.values.indices) { - itemsMap.values.elementAt(index) - } else { - fallbackItem - } + override fun getItemByIndex(index: Int): Item = if (index in itemsMap.values.indices) { + itemsMap.values.elementAt(index) + } else { + fallbackItem } - override fun getBlockByKey(key: String): Block { - return blocksMap.getOrFallback(key, fallbackBlock) { - "No block with key '$key' found. Returning $FALLBACK_BLOCK_KEY" - } + override fun getBlockByKey(key: String): Block = blocksMap.getOrFallback(key, fallbackBlock) { + "No block with key '$key' found. Returning $FALLBACK_BLOCK_KEY" } - override fun getBlocksByType(type: Class): List { - return blocksMap.values.filterIsInstance(type) - } + override fun getBlocksByType(type: Class): List = blocksMap.values.filterIsInstance(type) override fun getCraftingResult(input: List): InventoryItem { val startIndex = input.indexOfFirst { !it.isNone() }.takeIf { it >= 0 } @@ -163,9 +155,7 @@ internal class ItemsRepositoryImpl @Inject constructor( return output?.toInventoryItem() ?: fallbackItem.toInventoryItem() } - override fun getAllItems(): Collection { - return itemsMap.values - } + override fun getAllItems(): Collection = itemsMap.values override fun dispose() { _initialized = false diff --git a/core/data/menu/build.gradle.kts b/core/data/menu/build.gradle.kts index 5925c90..73fdbcc 100644 --- a/core/data/menu/build.gradle.kts +++ b/core/data/menu/build.gradle.kts @@ -2,7 +2,6 @@ plugins { kotlin ksp kotlinxSerialization - ktlintGradle } java.sourceCompatibility = ApplicationInfo.sourceCompatibility diff --git a/core/data/menu/src/main/kotlin/ru/fredboy/cavedroid/data/menu/mapper/MenuButtonMapper.kt b/core/data/menu/src/main/kotlin/ru/fredboy/cavedroid/data/menu/mapper/MenuButtonMapper.kt index 5a7eb06..c5e2f6c 100644 --- a/core/data/menu/src/main/kotlin/ru/fredboy/cavedroid/data/menu/mapper/MenuButtonMapper.kt +++ b/core/data/menu/src/main/kotlin/ru/fredboy/cavedroid/data/menu/mapper/MenuButtonMapper.kt @@ -11,33 +11,29 @@ import javax.inject.Inject @MenuScope class MenuButtonMapper @Inject constructor() { - fun map(dto: MenuButtonDto): MenuButton { - return when (dto.type) { - "boolean_option" -> MenuButton.BooleanOption( - label = dto.label.toString(), - isVisible = mapVisibility(dto.visibility), - actionKey = dto.actionKey.orEmpty(), - optionKeys = dto.options.orEmpty(), - isEnabled = dto.enabled ?: true, - ) - - "default", null -> MenuButton.Simple( - label = dto.label.toString(), - isVisible = mapVisibility(dto.visibility), - actionKey = dto.actionKey.orEmpty(), - isEnabled = dto.enabled ?: true, - ) - - else -> - throw IllegalArgumentException("Unknown button type: ${dto.type}") - } + fun map(dto: MenuButtonDto): MenuButton = when (dto.type) { + "boolean_option" -> MenuButton.BooleanOption( + label = dto.label.toString(), + isVisible = mapVisibility(dto.visibility), + actionKey = dto.actionKey.orEmpty(), + optionKeys = dto.options.orEmpty(), + isEnabled = dto.enabled ?: true, + ) + + "default", null -> MenuButton.Simple( + label = dto.label.toString(), + isVisible = mapVisibility(dto.visibility), + actionKey = dto.actionKey.orEmpty(), + isEnabled = dto.enabled ?: true, + ) + + else -> + throw IllegalArgumentException("Unknown button type: ${dto.type}") } - fun setButtonEnabled(button: MenuButton, isEnabled: Boolean): MenuButton { - return when (button) { - is MenuButton.Simple -> button.copy(isEnabled = isEnabled) - is MenuButton.BooleanOption -> button.copy(isEnabled = isEnabled) - } + fun setButtonEnabled(button: MenuButton, isEnabled: Boolean): MenuButton = when (button) { + is MenuButton.Simple -> button.copy(isEnabled = isEnabled) + is MenuButton.BooleanOption -> button.copy(isEnabled = isEnabled) } private fun mapVisibility(dto: MenuButtonVisibilityDto?): Boolean { diff --git a/core/data/save/build.gradle.kts b/core/data/save/build.gradle.kts index 3fa936c..1153b84 100644 --- a/core/data/save/build.gradle.kts +++ b/core/data/save/build.gradle.kts @@ -2,7 +2,6 @@ plugins { kotlin ksp kotlinxSerialization - ktlintGradle } java.sourceCompatibility = ApplicationInfo.sourceCompatibility diff --git a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/ChestMapper.kt b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/ChestMapper.kt index 68187b5..072d599 100644 --- a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/ChestMapper.kt +++ b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/ChestMapper.kt @@ -12,13 +12,11 @@ class ChestMapper @Inject constructor( private val getFallbackItemUseCase: GetFallbackItemUseCase, ) { - fun mapSaveData(chest: Chest): SaveDataDto.ChestSaveDataDto { - return SaveDataDto.ChestSaveDataDto( - version = SAVE_DATA_VERSION, - size = chest.size, - items = chest.items.map(inventoryItemMapper::mapSaveData), - ) - } + fun mapSaveData(chest: Chest): SaveDataDto.ChestSaveDataDto = SaveDataDto.ChestSaveDataDto( + version = SAVE_DATA_VERSION, + size = chest.size, + items = chest.items.map(inventoryItemMapper::mapSaveData), + ) fun mapChest(saveDataDto: SaveDataDto.ChestSaveDataDto): Chest { saveDataDto.verifyVersion(SAVE_DATA_VERSION) diff --git a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/ContainerControllerMapper.kt b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/ContainerControllerMapper.kt index 91648c7..0323bd0 100644 --- a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/ContainerControllerMapper.kt +++ b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/ContainerControllerMapper.kt @@ -19,18 +19,16 @@ class ContainerControllerMapper @Inject constructor( private val getItemByKeyUseCase: GetItemByKeyUseCase, ) { - fun mapSaveData(containerController: ContainerController): SaveDataDto.ContainerControllerSaveDataDto { - return SaveDataDto.ContainerControllerSaveDataDto( - version = SAVE_DATA_VERSION, - containerMap = containerController.containerMap.mapNotNull { (key, container) -> - when (container) { - is Furnace -> furnaceMapper.mapSaveData(container) - is Chest -> chestMapper.mapSaveData(container) - else -> null - }?.let { value -> key.toString() to value } - }.toMap(), - ) - } + fun mapSaveData(containerController: ContainerController): SaveDataDto.ContainerControllerSaveDataDto = SaveDataDto.ContainerControllerSaveDataDto( + version = SAVE_DATA_VERSION, + containerMap = containerController.containerMap.mapNotNull { (key, container) -> + when (container) { + is Furnace -> furnaceMapper.mapSaveData(container) + is Chest -> chestMapper.mapSaveData(container) + else -> null + }?.let { value -> key.toString() to value } + }.toMap(), + ) fun mapContainerController( saveDataDto: SaveDataDto.ContainerControllerSaveDataDto, diff --git a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/ControlModeMapper.kt b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/ControlModeMapper.kt index 6875b1e..7c0e6dd 100644 --- a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/ControlModeMapper.kt +++ b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/ControlModeMapper.kt @@ -9,15 +9,13 @@ import javax.inject.Inject @Reusable class ControlModeMapper @Inject constructor() { - fun mapSaveData(direction: Player.ControlMode): SaveDataDto.ControlModeSaveDataDto { - return SaveDataDto.ControlModeSaveDataDto( - version = SAVE_DATA_VERSION, - value = when (direction) { - Player.ControlMode.WALK -> 0 - Player.ControlMode.CURSOR -> 1 - }, - ) - } + fun mapSaveData(direction: Player.ControlMode): SaveDataDto.ControlModeSaveDataDto = SaveDataDto.ControlModeSaveDataDto( + version = SAVE_DATA_VERSION, + value = when (direction) { + Player.ControlMode.WALK -> 0 + Player.ControlMode.CURSOR -> 1 + }, + ) fun mapControlMode(saveDataDto: SaveDataDto.ControlModeSaveDataDto): Player.ControlMode { saveDataDto.verifyVersion(SAVE_DATA_VERSION) diff --git a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/DirectionMapper.kt b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/DirectionMapper.kt index 684f513..aaee277 100644 --- a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/DirectionMapper.kt +++ b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/DirectionMapper.kt @@ -9,15 +9,13 @@ import javax.inject.Inject @Reusable class DirectionMapper @Inject constructor() { - fun mapSaveData(direction: Direction): SaveDataDto.DirectionSaveDataDto { - return SaveDataDto.DirectionSaveDataDto( - version = SAVE_DATA_VERSION, - value = when (direction) { - Direction.LEFT -> 0 - Direction.RIGHT -> 1 - }, - ) - } + fun mapSaveData(direction: Direction): SaveDataDto.DirectionSaveDataDto = SaveDataDto.DirectionSaveDataDto( + version = SAVE_DATA_VERSION, + value = when (direction) { + Direction.LEFT -> 0 + Direction.RIGHT -> 1 + }, + ) fun mapDirection(saveDataDto: SaveDataDto.DirectionSaveDataDto): Direction { saveDataDto.verifyVersion(SAVE_DATA_VERSION) diff --git a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/DropControllerMapper.kt b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/DropControllerMapper.kt index 48c3d01..159de62 100644 --- a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/DropControllerMapper.kt +++ b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/DropControllerMapper.kt @@ -13,12 +13,10 @@ class DropControllerMapper @Inject constructor( private val itemsRepository: ItemsRepository, ) { - fun mapSaveData(dropController: DropController): SaveDataDto.DropControllerSaveDataDto { - return SaveDataDto.DropControllerSaveDataDto( - version = SAVE_DATA_VERSION, - drops = dropController.getAllDrop().map(dropMapper::mapSaveData), - ) - } + fun mapSaveData(dropController: DropController): SaveDataDto.DropControllerSaveDataDto = SaveDataDto.DropControllerSaveDataDto( + version = SAVE_DATA_VERSION, + drops = dropController.getAllDrop().map(dropMapper::mapSaveData), + ) fun mapDropController( saveDataDto: SaveDataDto.DropControllerSaveDataDto, diff --git a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/DropMapper.kt b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/DropMapper.kt index 991067f..f950755 100644 --- a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/DropMapper.kt +++ b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/DropMapper.kt @@ -11,20 +11,18 @@ class DropMapper @Inject constructor( private val getItemByKeyUseCase: GetItemByKeyUseCase, ) { - fun mapSaveData(drop: Drop): SaveDataDto.DropSaveDataDto { - return SaveDataDto.DropSaveDataDto( - version = SAVE_DATA_VERSION, - x = drop.x, - y = drop.y, - width = drop.width, - height = drop.height, - velocityX = drop.velocity.x, - velocityY = drop.velocity.y, - itemKey = drop.item.params.key, - amount = drop.amount, - pickedUp = drop.isPickedUp, - ) - } + fun mapSaveData(drop: Drop): SaveDataDto.DropSaveDataDto = SaveDataDto.DropSaveDataDto( + version = SAVE_DATA_VERSION, + x = drop.x, + y = drop.y, + width = drop.width, + height = drop.height, + velocityX = drop.velocity.x, + velocityY = drop.velocity.y, + itemKey = drop.item.params.key, + amount = drop.amount, + pickedUp = drop.isPickedUp, + ) fun mapDrop(saveDataDto: SaveDataDto.DropSaveDataDto): Drop { saveDataDto.verifyVersion(SAVE_DATA_VERSION) diff --git a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/FallingBlockMapper.kt b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/FallingBlockMapper.kt index f619580..20441c5 100644 --- a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/FallingBlockMapper.kt +++ b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/FallingBlockMapper.kt @@ -13,26 +13,24 @@ class FallingBlockMapper @Inject constructor( private val getBlockByKeyUseCase: GetBlockByKeyUseCase, ) { - fun mapSaveData(fallingBlock: FallingBlock): SaveDataDto.FallingBlockSaveDataDto { - return SaveDataDto.FallingBlockSaveDataDto( - version = SAVE_DATA_VERSION, - x = fallingBlock.x, - y = fallingBlock.y, - width = fallingBlock.width, - height = fallingBlock.height, - velocityX = fallingBlock.velocity.x, - velocityY = fallingBlock.velocity.y, - animDelta = fallingBlock.animDelta, - anim = fallingBlock.anim, - direction = directionMapper.mapSaveData(fallingBlock.direction), - dead = fallingBlock.isDead, - canJump = fallingBlock.canJump, - flyMode = fallingBlock.isFlyMode, - maxHealth = fallingBlock.maxHealth, - health = fallingBlock.health, - blockKey = fallingBlock.block.params.key, - ) - } + fun mapSaveData(fallingBlock: FallingBlock): SaveDataDto.FallingBlockSaveDataDto = SaveDataDto.FallingBlockSaveDataDto( + version = SAVE_DATA_VERSION, + x = fallingBlock.x, + y = fallingBlock.y, + width = fallingBlock.width, + height = fallingBlock.height, + velocityX = fallingBlock.velocity.x, + velocityY = fallingBlock.velocity.y, + animDelta = fallingBlock.animDelta, + anim = fallingBlock.anim, + direction = directionMapper.mapSaveData(fallingBlock.direction), + dead = fallingBlock.isDead, + canJump = fallingBlock.canJump, + flyMode = fallingBlock.isFlyMode, + maxHealth = fallingBlock.maxHealth, + health = fallingBlock.health, + blockKey = fallingBlock.block.params.key, + ) fun mapFallingBlock(saveDataDto: SaveDataDto.FallingBlockSaveDataDto): FallingBlock { saveDataDto.verifyVersion(SAVE_DATA_VERSION) diff --git a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/FurnaceMapper.kt b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/FurnaceMapper.kt index 4b7f0e0..ad52058 100644 --- a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/FurnaceMapper.kt +++ b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/FurnaceMapper.kt @@ -14,18 +14,16 @@ class FurnaceMapper @Inject constructor( private val getItemByKey: GetItemByKeyUseCase, ) { - fun mapSaveData(furnace: Furnace): SaveDataDto.FurnaceSaveDataDto { - return SaveDataDto.FurnaceSaveDataDto( - version = SAVE_DATA_VERSION, - size = furnace.size, - currentFuelItemKey = furnace.currentFuelKey, - items = furnace.items.map(inventoryItemMapper::mapSaveData), - startBurnTimeMs = furnace.startBurnTimeMs, - startSmeltTimeMs = furnace.smeltStarTimeMs, - burnProgress = furnace.burnProgress, - smeltProgress = furnace.smeltProgress, - ) - } + fun mapSaveData(furnace: Furnace): SaveDataDto.FurnaceSaveDataDto = SaveDataDto.FurnaceSaveDataDto( + version = SAVE_DATA_VERSION, + size = furnace.size, + currentFuelItemKey = furnace.currentFuelKey, + items = furnace.items.map(inventoryItemMapper::mapSaveData), + startBurnTimeMs = furnace.startBurnTimeMs, + startSmeltTimeMs = furnace.smeltStarTimeMs, + burnProgress = furnace.burnProgress, + smeltProgress = furnace.smeltProgress, + ) fun mapFurnace(saveDataDto: SaveDataDto.FurnaceSaveDataDto): Furnace { saveDataDto.verifyVersion(SAVE_DATA_VERSION) diff --git a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/InventoryItemMapper.kt b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/InventoryItemMapper.kt index 9976077..a963663 100644 --- a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/InventoryItemMapper.kt +++ b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/InventoryItemMapper.kt @@ -11,13 +11,11 @@ class InventoryItemMapper @Inject constructor( private val getItemByKeyUseCase: GetItemByKeyUseCase, ) { - fun mapSaveData(inventoryItem: InventoryItem): SaveDataDto.InventoryItemSaveDataDto { - return SaveDataDto.InventoryItemSaveDataDto( - version = SAVE_DATA_VERSION, - itemKey = inventoryItem.item.params.key, - amount = inventoryItem.amount, - ) - } + fun mapSaveData(inventoryItem: InventoryItem): SaveDataDto.InventoryItemSaveDataDto = SaveDataDto.InventoryItemSaveDataDto( + version = SAVE_DATA_VERSION, + itemKey = inventoryItem.item.params.key, + amount = inventoryItem.amount, + ) fun mapInventoryItem(saveDataDto: SaveDataDto.InventoryItemSaveDataDto): InventoryItem { saveDataDto.verifyVersion(SAVE_DATA_VERSION) diff --git a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/InventoryMapper.kt b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/InventoryMapper.kt index 6f34019..7be7c51 100644 --- a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/InventoryMapper.kt +++ b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/InventoryMapper.kt @@ -12,13 +12,11 @@ class InventoryMapper @Inject constructor( private val getFallbackItem: GetFallbackItemUseCase, ) { - fun mapSaveData(inventory: Inventory): SaveDataDto.InventorySaveDataDto { - return SaveDataDto.InventorySaveDataDto( - version = SAVE_DATA_VERSION, - size = inventory.size, - items = inventory.items.map(inventoryItemMapper::mapSaveData), - ) - } + fun mapSaveData(inventory: Inventory): SaveDataDto.InventorySaveDataDto = SaveDataDto.InventorySaveDataDto( + version = SAVE_DATA_VERSION, + size = inventory.size, + items = inventory.items.map(inventoryItemMapper::mapSaveData), + ) fun mapInventory(saveDataDto: SaveDataDto.InventorySaveDataDto): Inventory { saveDataDto.verifyVersion(SAVE_DATA_VERSION) diff --git a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/MobControllerMapper.kt b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/MobControllerMapper.kt index f9fe23c..095610a 100644 --- a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/MobControllerMapper.kt +++ b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/MobControllerMapper.kt @@ -19,19 +19,17 @@ class MobControllerMapper @Inject constructor( private val getFallbackItemUseCase: GetFallbackItemUseCase, ) { - fun mapSaveData(mobController: MobController): SaveDataDto.MobControllerSaveDataDto { - return SaveDataDto.MobControllerSaveDataDto( - version = SAVE_DATA_VERSION, - mobs = mobController.mobs.mapNotNull { mob -> - when (mob) { - is Pig -> pigMapper.mapSaveData(mob) - is FallingBlock -> fallingBlockMapper.mapSaveData(mob) - else -> null - } - }, - player = playerMapper.mapSaveData(mobController.player), - ) - } + fun mapSaveData(mobController: MobController): SaveDataDto.MobControllerSaveDataDto = SaveDataDto.MobControllerSaveDataDto( + version = SAVE_DATA_VERSION, + mobs = mobController.mobs.mapNotNull { mob -> + when (mob) { + is Pig -> pigMapper.mapSaveData(mob) + is FallingBlock -> fallingBlockMapper.mapSaveData(mob) + else -> null + } + }, + player = playerMapper.mapSaveData(mobController.player), + ) fun mapMobController( saveDataDto: SaveDataDto.MobControllerSaveDataDto, diff --git a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/PigMapper.kt b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/PigMapper.kt index b51bb62..102e7a8 100644 --- a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/PigMapper.kt +++ b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/PigMapper.kt @@ -13,25 +13,23 @@ class PigMapper @Inject constructor( private val getPigSpriteUseCase: GetPigSpritesUseCase, ) { - fun mapSaveData(pig: Pig): SaveDataDto.PigSaveDataDto { - return SaveDataDto.PigSaveDataDto( - version = SAVE_DATA_VERSION, - x = pig.x, - y = pig.y, - width = pig.width, - height = pig.height, - velocityX = pig.velocity.x, - velocityY = pig.velocity.y, - animDelta = pig.animDelta, - anim = pig.anim, - direction = directionMapper.mapSaveData(pig.direction), - dead = pig.isDead, - canJump = pig.canJump, - flyMode = pig.isFlyMode, - maxHealth = pig.maxHealth, - health = pig.health, - ) - } + fun mapSaveData(pig: Pig): SaveDataDto.PigSaveDataDto = SaveDataDto.PigSaveDataDto( + version = SAVE_DATA_VERSION, + x = pig.x, + y = pig.y, + width = pig.width, + height = pig.height, + velocityX = pig.velocity.x, + velocityY = pig.velocity.y, + animDelta = pig.animDelta, + anim = pig.anim, + direction = directionMapper.mapSaveData(pig.direction), + dead = pig.isDead, + canJump = pig.canJump, + flyMode = pig.isFlyMode, + maxHealth = pig.maxHealth, + health = pig.health, + ) fun mapPig(saveDataDto: SaveDataDto.PigSaveDataDto): Pig { saveDataDto.verifyVersion(SAVE_DATA_VERSION) diff --git a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/PlayerMapper.kt b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/PlayerMapper.kt index 1dab7a8..b451b95 100644 --- a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/PlayerMapper.kt +++ b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/PlayerMapper.kt @@ -18,40 +18,38 @@ class PlayerMapper @Inject constructor( private val getFallbackItemUseCase: GetFallbackItemUseCase, ) { - fun mapSaveData(player: Player): SaveDataDto.PlayerSaveDataDto { - return SaveDataDto.PlayerSaveDataDto( - version = SAVE_DATA_VERSION, - x = player.x, - y = player.y, - width = player.width, - height = player.height, - velocityX = player.velocity.x, - velocityY = player.velocity.y, - animDelta = player.animDelta, - anim = player.anim, - direction = directionMapper.mapSaveData(player.direction), - dead = player.isDead, - canJump = player.canJump, - flyMode = player.isFlyMode, - maxHealth = player.maxHealth, - health = player.health, - hitting = player.isHitting, - hittingWithDamage = player.isHittingWithDamage, - hitAnim = player.hitAnim, - hitAnimDelta = player.hitAnimDelta, - inventory = inventoryMapper.mapSaveData(player.inventory), - gameMode = player.gameMode, - swim = player.swim, - headRotation = player.headRotation, - blockDamage = player.blockDamage, - cursorX = player.cursorX, - cursorY = player.cursorY, - spawnPointX = player.spawnPoint?.x ?: 0f, - spawnPointY = player.spawnPoint?.y ?: 0f, - controlMode = controlModeMapper.mapSaveData(player.controlMode), - activeSlot = player.activeSlot, - ) - } + fun mapSaveData(player: Player): SaveDataDto.PlayerSaveDataDto = SaveDataDto.PlayerSaveDataDto( + version = SAVE_DATA_VERSION, + x = player.x, + y = player.y, + width = player.width, + height = player.height, + velocityX = player.velocity.x, + velocityY = player.velocity.y, + animDelta = player.animDelta, + anim = player.anim, + direction = directionMapper.mapSaveData(player.direction), + dead = player.isDead, + canJump = player.canJump, + flyMode = player.isFlyMode, + maxHealth = player.maxHealth, + health = player.health, + hitting = player.isHitting, + hittingWithDamage = player.isHittingWithDamage, + hitAnim = player.hitAnim, + hitAnimDelta = player.hitAnimDelta, + inventory = inventoryMapper.mapSaveData(player.inventory), + gameMode = player.gameMode, + swim = player.swim, + headRotation = player.headRotation, + blockDamage = player.blockDamage, + cursorX = player.cursorX, + cursorY = player.cursorY, + spawnPointX = player.spawnPoint?.x ?: 0f, + spawnPointY = player.spawnPoint?.y ?: 0f, + controlMode = controlModeMapper.mapSaveData(player.controlMode), + activeSlot = player.activeSlot, + ) fun mapPlayer(saveDataDto: SaveDataDto.PlayerSaveDataDto): Player { saveDataDto.verifyVersion(SAVE_DATA_VERSION) 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 4cd33b7..37b01e8 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 @@ -34,17 +34,13 @@ internal class SaveDataRepositoryImpl @Inject constructor( private val mobControllerMapper: MobControllerMapper, ) : SaveDataRepository { - private fun Int.toByteArray(): ByteArray { - return ByteBuffer.allocate(Int.SIZE_BYTES) - .putInt(this) - .array() - } + private fun Int.toByteArray(): ByteArray = ByteBuffer.allocate(Int.SIZE_BYTES) + .putInt(this) + .array() - private fun Short.toByteArray(): ByteArray { - return ByteBuffer.allocate(Short.SIZE_BYTES) - .putShort(this) - .array() - } + private fun Short.toByteArray(): ByteArray = ByteBuffer.allocate(Short.SIZE_BYTES) + .putShort(this) + .array() private fun buildBlocksDictionary( foreMap: Array>, diff --git a/core/domain/assets/build.gradle.kts b/core/domain/assets/build.gradle.kts index df17486..9d3840d 100644 --- a/core/domain/assets/build.gradle.kts +++ b/core/domain/assets/build.gradle.kts @@ -1,7 +1,6 @@ plugins { kotlin ksp - ktlintGradle } java.sourceCompatibility = ApplicationInfo.sourceCompatibility diff --git a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/GameAssetsHolder.kt b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/GameAssetsHolder.kt index 9c50e6f..08a9618 100644 --- a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/GameAssetsHolder.kt +++ b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/GameAssetsHolder.kt @@ -46,47 +46,25 @@ class GameAssetsHolder @Inject constructor( repositories.forEach(AssetsRepository::dispose) } - fun getBlockTexture(textureName: String): Texture { - return blockAssetsRepository.getBlockTexture(textureName) - } + fun getBlockTexture(textureName: String): Texture = blockAssetsRepository.getBlockTexture(textureName) - fun getItemTexture(textureName: String): Texture { - return itemsAssetsRepository.getItemTexture(textureName) - } + fun getItemTexture(textureName: String): Texture = itemsAssetsRepository.getItemTexture(textureName) - fun getBlockDamageFrameCount(): Int { - return blockDamageAssetsRepository.damageStages - } + fun getBlockDamageFrameCount(): Int = blockDamageAssetsRepository.damageStages - fun getBlockDamageSprite(stage: Int): Sprite { - return blockDamageAssetsRepository.getBlockDamageSprite(stage) - } + fun getBlockDamageSprite(stage: Int): Sprite = blockDamageAssetsRepository.getBlockDamageSprite(stage) - fun getStringWidth(string: String): Float { - return fontAssetsRepository.getStringWidth(string) - } + fun getStringWidth(string: String): Float = fontAssetsRepository.getStringWidth(string) - fun getStringHeight(string: String): Float { - return fontAssetsRepository.getStringHeight(string) - } + fun getStringHeight(string: String): Float = fontAssetsRepository.getStringHeight(string) - fun getFont(): BitmapFont { - return fontAssetsRepository.getFont() - } + fun getFont(): BitmapFont = fontAssetsRepository.getFont() - fun getPlayerSprites(): MobSprite.Player { - return mobAssetsRepository.getPlayerSprites() - } + fun getPlayerSprites(): MobSprite.Player = mobAssetsRepository.getPlayerSprites() - fun getPigSprites(): MobSprite.Pig { - return mobAssetsRepository.getPigSprites() - } + fun getPigSprites(): MobSprite.Pig = mobAssetsRepository.getPigSprites() - fun getTouchButtons(): Map { - return touchButtonsAssetsRepository.getTouchButtons() - } + fun getTouchButtons(): Map = touchButtonsAssetsRepository.getTouchButtons() - fun getTextureRegionByName(name: String): TextureRegion? { - return textureRegionsAssetsRepository.getTextureRegionByName(name) - } + fun getTextureRegionByName(name: String): TextureRegion? = textureRegionsAssetsRepository.getTextureRegionByName(name) } diff --git a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/AssetsRepository.kt b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/AssetsRepository.kt index 520a165..671b4c2 100644 --- a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/AssetsRepository.kt +++ b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/AssetsRepository.kt @@ -11,10 +11,8 @@ abstract class AssetsRepository : Disposable { protected val loadedTextures = LinkedList() - protected fun loadTexture(path: String): Texture { - return Texture(Gdx.files.internal(path)).also { texture -> - loadedTextures.add(texture) - } + protected fun loadTexture(path: String): Texture = Texture(Gdx.files.internal(path)).also { texture -> + loadedTextures.add(texture) } protected fun flippedRegion( @@ -23,15 +21,11 @@ abstract class AssetsRepository : Disposable { y: Int, width: Int, height: Int, - ): TextureRegion { - return TextureRegion(texture, x, y + height, width, -height) - } + ): TextureRegion = TextureRegion(texture, x, y + height, width, -height) protected fun flippedSprite( texture: Texture, - ): Sprite { - return Sprite(texture).apply { flip(false, true) } - } + ): Sprite = Sprite(texture).apply { flip(false, true) } protected fun flippedSprite( texture: Texture, @@ -39,9 +33,7 @@ abstract class AssetsRepository : Disposable { y: Int, width: Int, height: Int, - ): Sprite { - return Sprite(flippedRegion(texture, x, y, width, height)) - } + ): Sprite = Sprite(flippedRegion(texture, x, y, width, height)) protected fun resolveTexture( textureName: String, diff --git a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetBlockDamageFrameCountUseCase.kt b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetBlockDamageFrameCountUseCase.kt index 6a69980..d2adb23 100644 --- a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetBlockDamageFrameCountUseCase.kt +++ b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetBlockDamageFrameCountUseCase.kt @@ -9,7 +9,5 @@ class GetBlockDamageFrameCountUseCase @Inject constructor( private val gameAssetsHolder: GameAssetsHolder, ) { - operator fun invoke(): Int { - return gameAssetsHolder.getBlockDamageFrameCount() - } + operator fun invoke(): Int = gameAssetsHolder.getBlockDamageFrameCount() } diff --git a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetBlockDamageSpriteUseCase.kt b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetBlockDamageSpriteUseCase.kt index 4883a55..e3be345 100644 --- a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetBlockDamageSpriteUseCase.kt +++ b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetBlockDamageSpriteUseCase.kt @@ -10,7 +10,5 @@ class GetBlockDamageSpriteUseCase @Inject constructor( private val gameAssetsHolder: GameAssetsHolder, ) { - operator fun get(stage: Int): Sprite { - return gameAssetsHolder.getBlockDamageSprite(stage) - } + operator fun get(stage: Int): Sprite = gameAssetsHolder.getBlockDamageSprite(stage) } diff --git a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetBlockTextureUseCase.kt b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetBlockTextureUseCase.kt index 59c8a53..a7760f9 100644 --- a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetBlockTextureUseCase.kt +++ b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetBlockTextureUseCase.kt @@ -10,7 +10,5 @@ class GetBlockTextureUseCase @Inject constructor( private val gameAssetsHolder: GameAssetsHolder, ) { - operator fun get(name: String): Texture { - return gameAssetsHolder.getBlockTexture(name) - } + operator fun get(name: String): Texture = gameAssetsHolder.getBlockTexture(name) } diff --git a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetFontUseCase.kt b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetFontUseCase.kt index be33e6b..177b196 100644 --- a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetFontUseCase.kt +++ b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetFontUseCase.kt @@ -10,7 +10,5 @@ class GetFontUseCase @Inject constructor( private val gameAssetsHolder: GameAssetsHolder, ) { - operator fun invoke(): BitmapFont { - return gameAssetsHolder.getFont() - } + operator fun invoke(): BitmapFont = gameAssetsHolder.getFont() } diff --git a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetItemTextureUseCase.kt b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetItemTextureUseCase.kt index aab1077..9043a36 100644 --- a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetItemTextureUseCase.kt +++ b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetItemTextureUseCase.kt @@ -10,7 +10,5 @@ class GetItemTextureUseCase @Inject constructor( private val gameAssetsHolder: GameAssetsHolder, ) { - operator fun get(name: String): Texture { - return gameAssetsHolder.getItemTexture(name) - } + operator fun get(name: String): Texture = gameAssetsHolder.getItemTexture(name) } diff --git a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetPigSpritesUseCase.kt b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetPigSpritesUseCase.kt index aea4525..025dac3 100644 --- a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetPigSpritesUseCase.kt +++ b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetPigSpritesUseCase.kt @@ -10,7 +10,5 @@ class GetPigSpritesUseCase @Inject constructor( private val gameAssetsHolder: GameAssetsHolder, ) { - operator fun invoke(): MobSprite.Pig { - return gameAssetsHolder.getPigSprites() - } + operator fun invoke(): MobSprite.Pig = gameAssetsHolder.getPigSprites() } diff --git a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetPlayerSpritesUseCase.kt b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetPlayerSpritesUseCase.kt index 42ea98c..acfcafd 100644 --- a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetPlayerSpritesUseCase.kt +++ b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetPlayerSpritesUseCase.kt @@ -10,7 +10,5 @@ class GetPlayerSpritesUseCase @Inject constructor( private val gameAssetsHolder: GameAssetsHolder, ) { - operator fun invoke(): MobSprite.Player { - return gameAssetsHolder.getPlayerSprites() - } + operator fun invoke(): MobSprite.Player = gameAssetsHolder.getPlayerSprites() } diff --git a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetStringHeightUseCase.kt b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetStringHeightUseCase.kt index 6f2cb5c..50031ee 100644 --- a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetStringHeightUseCase.kt +++ b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetStringHeightUseCase.kt @@ -9,7 +9,5 @@ class GetStringHeightUseCase @Inject constructor( private val gameAssetsHolder: GameAssetsHolder, ) { - operator fun invoke(string: String): Float { - return gameAssetsHolder.getStringHeight(string) - } + operator fun invoke(string: String): Float = gameAssetsHolder.getStringHeight(string) } diff --git a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetStringWidthUseCase.kt b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetStringWidthUseCase.kt index ebfa482..03ca640 100644 --- a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetStringWidthUseCase.kt +++ b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetStringWidthUseCase.kt @@ -9,7 +9,5 @@ class GetStringWidthUseCase @Inject constructor( private val gameAssetsHolder: GameAssetsHolder, ) { - operator fun invoke(string: String): Float { - return gameAssetsHolder.getStringWidth(string) - } + operator fun invoke(string: String): Float = gameAssetsHolder.getStringWidth(string) } diff --git a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetTextureRegionByNameUseCase.kt b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetTextureRegionByNameUseCase.kt index b0a2b35..2614ec0 100644 --- a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetTextureRegionByNameUseCase.kt +++ b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetTextureRegionByNameUseCase.kt @@ -10,7 +10,5 @@ class GetTextureRegionByNameUseCase @Inject constructor( private val gameAssetsHolder: GameAssetsHolder, ) { - operator fun get(name: String): TextureRegion? { - return gameAssetsHolder.getTextureRegionByName(name) - } + operator fun get(name: String): TextureRegion? = gameAssetsHolder.getTextureRegionByName(name) } diff --git a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetTouchButtonsUseCase.kt b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetTouchButtonsUseCase.kt index b74049c..ba7124d 100644 --- a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetTouchButtonsUseCase.kt +++ b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetTouchButtonsUseCase.kt @@ -10,7 +10,5 @@ class GetTouchButtonsUseCase @Inject constructor( private val gameAssetsHolder: GameAssetsHolder, ) { - operator fun invoke(): Map { - return gameAssetsHolder.getTouchButtons() - } + operator fun invoke(): Map = gameAssetsHolder.getTouchButtons() } diff --git a/core/domain/configuration/build.gradle.kts b/core/domain/configuration/build.gradle.kts index 8cdad92..86474f1 100644 --- a/core/domain/configuration/build.gradle.kts +++ b/core/domain/configuration/build.gradle.kts @@ -1,7 +1,6 @@ plugins { kotlin ksp - ktlintGradle } java.sourceCompatibility = ApplicationInfo.sourceCompatibility diff --git a/core/domain/configuration/src/main/kotlin/ru/fredboy/cavedroid/domain/configuration/model/CameraContext.kt b/core/domain/configuration/src/main/kotlin/ru/fredboy/cavedroid/domain/configuration/model/CameraContext.kt index fceaa9e..c907ba5 100644 --- a/core/domain/configuration/src/main/kotlin/ru/fredboy/cavedroid/domain/configuration/model/CameraContext.kt +++ b/core/domain/configuration/src/main/kotlin/ru/fredboy/cavedroid/domain/configuration/model/CameraContext.kt @@ -13,7 +13,5 @@ data class CameraContext( fun yOnViewport(y: Int) = viewport.height / Gdx.graphics.height * y.toFloat() - fun getViewportCoordinates(x: Int, y: Int): Pair { - return xOnViewport(x) to yOnViewport(y) - } + fun getViewportCoordinates(x: Int, y: Int): Pair = xOnViewport(x) to yOnViewport(y) } diff --git a/core/domain/items/build.gradle.kts b/core/domain/items/build.gradle.kts index df17486..9d3840d 100644 --- a/core/domain/items/build.gradle.kts +++ b/core/domain/items/build.gradle.kts @@ -1,7 +1,6 @@ plugins { kotlin ksp - ktlintGradle } java.sourceCompatibility = ApplicationInfo.sourceCompatibility diff --git a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/block/Block.kt b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/block/Block.kt index 12e918b..6432fb4 100644 --- a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/block/Block.kt +++ b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/block/Block.kt @@ -38,13 +38,9 @@ sealed class Block { } ?: 0 } - override fun hashCode(): Int { - return params.key.hashCode() - } + override fun hashCode(): Int = params.key.hashCode() - override fun equals(other: Any?): Boolean { - return params.key == (other as Item).params.key - } + override fun equals(other: Any?): Boolean = params.key == (other as Item).params.key fun initialize() { initAnimation() @@ -132,16 +128,14 @@ sealed class Block { return this is None } - fun getRectangle(x: Int, y: Int): Rectangle { - return Rectangle( - /* x = */ x * BLOCK_SIZE_PX + params.collisionMargins.left, - /* y = */ y * BLOCK_SIZE_PX + params.collisionMargins.top, - /* width = */ width, - /* height = */ height, - ) - } + fun getRectangle(x: Int, y: Int): Rectangle = Rectangle( + /* x = */ x * BLOCK_SIZE_PX + params.collisionMargins.left, + /* y = */ y * BLOCK_SIZE_PX + params.collisionMargins.top, + /* width = */ width, + /* height = */ height, + ) - sealed class Container() : Block() + sealed class Container : Block() data class None( override val params: CommonBlockParams, @@ -158,15 +152,13 @@ sealed class Block { override val sprite: Sprite get() = getSprite(false) - private fun getSprite(isActive: Boolean): Sprite { - return animation?.let { animation -> - if (isActive) { - animation[1] - } else { - animation[0] - } - } ?: sprite - } + private fun getSprite(isActive: Boolean): Sprite = animation?.let { animation -> + if (isActive) { + animation[1] + } else { + animation[0] + } + } ?: sprite fun draw(spriter: SpriteBatch, x: Float, y: Float, isActive: Boolean) { getSprite(isActive).apply { diff --git a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/inventory/Inventory.kt b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/inventory/Inventory.kt index 18b7e9b..28ea06f 100644 --- a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/inventory/Inventory.kt +++ b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/inventory/Inventory.kt @@ -34,9 +34,7 @@ class Inventory @JvmOverloads constructor( return -1 } - fun canPickItem(item: Item): Boolean { - return getAvailableSlotForItem(item) >= 0 - } + fun canPickItem(item: Item): Boolean = getAvailableSlotForItem(item) >= 0 fun addItem(item: Item) { _items.copyInto( diff --git a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/inventory/InventoryItem.kt b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/inventory/InventoryItem.kt index 6beae1e..80ed021 100644 --- a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/inventory/InventoryItem.kt +++ b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/inventory/InventoryItem.kt @@ -41,9 +41,7 @@ class InventoryItem( add(-count) } - fun canBeAdded(count: Int = 1): Boolean { - return amount + count <= item.params.maxStack - } + fun canBeAdded(count: Int = 1): Boolean = amount + count <= item.params.maxStack private fun drawAmountText( spriteBatch: SpriteBatch, @@ -129,7 +127,7 @@ class InventoryItem( companion object { @OptIn(ExperimentalContracts::class) fun InventoryItem?.isNoneOrNull(): Boolean { - contract { returns(false) implies(this@isNoneOrNull != null) } + contract { returns(false) implies (this@isNoneOrNull != null) } return this?.item == null || this.item.isNone() } } diff --git a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/item/Item.kt b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/item/Item.kt index 14492bd..aaf85b3 100644 --- a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/item/Item.kt +++ b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/item/Item.kt @@ -12,13 +12,9 @@ sealed class Item { abstract val params: CommonItemParams abstract val sprite: Sprite - override fun hashCode(): Int { - return params.key.hashCode() - } + override fun hashCode(): Int = params.key.hashCode() - override fun equals(other: Any?): Boolean { - return params.key == (other as Item).params.key - } + override fun equals(other: Any?): Boolean = params.key == (other as Item).params.key fun isNone(): Boolean { contract { returns(true) implies (this@Item is None) } @@ -56,9 +52,7 @@ sealed class Item { } @JvmOverloads - fun toInventoryItem(amount: Int = 1): InventoryItem { - return InventoryItem(this, amount) - } + fun toInventoryItem(amount: Int = 1): InventoryItem = InventoryItem(this, amount) data class Normal( override val params: CommonItemParams, diff --git a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetBlockByKeyUseCase.kt b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetBlockByKeyUseCase.kt index dd0b77c..e9fbeb5 100644 --- a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetBlockByKeyUseCase.kt +++ b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetBlockByKeyUseCase.kt @@ -10,7 +10,5 @@ class GetBlockByKeyUseCase @Inject constructor( private val itemsRepository: ItemsRepository, ) { - operator fun get(key: String): Block { - return itemsRepository.getBlockByKey(key) - } + operator fun get(key: String): Block = itemsRepository.getBlockByKey(key) } diff --git a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetBlocksByTypeUseCase.kt b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetBlocksByTypeUseCase.kt index fce8e7e..9b9b41c 100644 --- a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetBlocksByTypeUseCase.kt +++ b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetBlocksByTypeUseCase.kt @@ -10,7 +10,5 @@ class GetBlocksByTypeUseCase @Inject constructor( private val itemsRepository: ItemsRepository, ) { - operator fun get(type: Class): List { - return itemsRepository.getBlocksByType(type) - } + operator fun get(type: Class): List = itemsRepository.getBlocksByType(type) } diff --git a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetCraftingResultUseCase.kt b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetCraftingResultUseCase.kt index 478dcf3..d6a1e04 100644 --- a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetCraftingResultUseCase.kt +++ b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetCraftingResultUseCase.kt @@ -11,7 +11,5 @@ class GetCraftingResultUseCase @Inject constructor( private val itemsRepository: ItemsRepository, ) { - operator fun get(input: List): InventoryItem { - return itemsRepository.getCraftingResult(input) - } + operator fun get(input: List): InventoryItem = itemsRepository.getCraftingResult(input) } diff --git a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetFallbackBlockUseCase.kt b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetFallbackBlockUseCase.kt index df843a8..e2f5df6 100644 --- a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetFallbackBlockUseCase.kt +++ b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetFallbackBlockUseCase.kt @@ -10,7 +10,5 @@ class GetFallbackBlockUseCase @Inject constructor( private val itemsRepository: ItemsRepository, ) { - operator fun invoke(): Block.None { - return itemsRepository.fallbackBlock - } + operator fun invoke(): Block.None = itemsRepository.fallbackBlock } diff --git a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetFallbackItemUseCase.kt b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetFallbackItemUseCase.kt index 2260d7f..23f3535 100644 --- a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetFallbackItemUseCase.kt +++ b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetFallbackItemUseCase.kt @@ -10,7 +10,5 @@ class GetFallbackItemUseCase @Inject constructor( private val itemsRepository: ItemsRepository, ) { - operator fun invoke(): Item.None { - return itemsRepository.fallbackItem - } + operator fun invoke(): Item.None = itemsRepository.fallbackItem } diff --git a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetItemByIndexUseCase.kt b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetItemByIndexUseCase.kt index d47954f..0e9eea0 100644 --- a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetItemByIndexUseCase.kt +++ b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetItemByIndexUseCase.kt @@ -10,7 +10,5 @@ class GetItemByIndexUseCase @Inject constructor( private val itemsRepository: ItemsRepository, ) { - operator fun get(index: Int): Item { - return itemsRepository.getItemByIndex(index) - } + operator fun get(index: Int): Item = itemsRepository.getItemByIndex(index) } diff --git a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetItemByKeyUseCase.kt b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetItemByKeyUseCase.kt index b77a131..df8958a 100644 --- a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetItemByKeyUseCase.kt +++ b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetItemByKeyUseCase.kt @@ -10,7 +10,5 @@ class GetItemByKeyUseCase @Inject constructor( private val itemsRepository: ItemsRepository, ) { - operator fun get(key: String): Item { - return itemsRepository.getItemByKey(key) - } + operator fun get(key: String): Item = itemsRepository.getItemByKey(key) } diff --git a/core/domain/menu/build.gradle.kts b/core/domain/menu/build.gradle.kts index df17486..9d3840d 100644 --- a/core/domain/menu/build.gradle.kts +++ b/core/domain/menu/build.gradle.kts @@ -1,7 +1,6 @@ plugins { kotlin ksp - ktlintGradle } java.sourceCompatibility = ApplicationInfo.sourceCompatibility diff --git a/core/domain/save/build.gradle.kts b/core/domain/save/build.gradle.kts index 5860b88..8ebc8cb 100644 --- a/core/domain/save/build.gradle.kts +++ b/core/domain/save/build.gradle.kts @@ -1,7 +1,6 @@ plugins { kotlin ksp - ktlintGradle } java.sourceCompatibility = ApplicationInfo.sourceCompatibility diff --git a/core/domain/save/src/main/kotlin/ru/fredboy/cavedroid/domain/save/model/GameSaveData.kt b/core/domain/save/src/main/kotlin/ru/fredboy/cavedroid/domain/save/model/GameSaveData.kt index c5d772b..be0b262 100644 --- a/core/domain/save/src/main/kotlin/ru/fredboy/cavedroid/domain/save/model/GameSaveData.kt +++ b/core/domain/save/src/main/kotlin/ru/fredboy/cavedroid/domain/save/model/GameSaveData.kt @@ -28,9 +28,7 @@ class GameSaveData( return value } - fun isEmpty(): Boolean { - return mobController == null && - dropController == null && - containerController == null - } + fun isEmpty(): Boolean = mobController == null && + dropController == null && + containerController == null } diff --git a/core/domain/world/build.gradle.kts b/core/domain/world/build.gradle.kts index cba775c..ef847ce 100644 --- a/core/domain/world/build.gradle.kts +++ b/core/domain/world/build.gradle.kts @@ -1,7 +1,6 @@ plugins { kotlin ksp - ktlintGradle } java.sourceCompatibility = ApplicationInfo.sourceCompatibility diff --git a/core/entity/container/build.gradle.kts b/core/entity/container/build.gradle.kts index ac98934..1cc022f 100644 --- a/core/entity/container/build.gradle.kts +++ b/core/entity/container/build.gradle.kts @@ -1,7 +1,6 @@ plugins { kotlin ksp - ktlintGradle } java.sourceCompatibility = ApplicationInfo.sourceCompatibility diff --git a/core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/model/ContainerCoordinates.kt b/core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/model/ContainerCoordinates.kt index 58e192e..79460fe 100644 --- a/core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/model/ContainerCoordinates.kt +++ b/core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/model/ContainerCoordinates.kt @@ -5,9 +5,7 @@ data class ContainerCoordinates( val y: Int, val z: Int, ) { - override fun toString(): String { - return "($x;$y;$z)" - } + override fun toString(): String = "($x;$y;$z)" companion object { diff --git a/core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/model/Furnace.kt b/core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/model/Furnace.kt index 931832f..9e3a822 100644 --- a/core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/model/Furnace.kt +++ b/core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/model/Furnace.kt @@ -60,11 +60,10 @@ class Furnace( field = MathUtils.clamp(value, 0f, 1f) } - fun canSmelt(): Boolean { - return (result.isNoneOrNull() || (result.item.params.key == input.item.params.smeltProductKey)) && - !input.isNoneOrNull() && input.item.params.smeltProductKey != null && - (!fuel.isNoneOrNull() || burnProgress > 0f) - } + fun canSmelt(): Boolean = (result.isNoneOrNull() || (result.item.params.key == input.item.params.smeltProductKey)) && + !input.isNoneOrNull() && + input.item.params.smeltProductKey != null && + (!fuel.isNoneOrNull() || burnProgress > 0f) private fun startBurning() { requireNotNull(fuel.item.params.burningTimeMs) { "Cant start burning without fuel" } diff --git a/core/entity/drop/build.gradle.kts b/core/entity/drop/build.gradle.kts index ac98934..1cc022f 100644 --- a/core/entity/drop/build.gradle.kts +++ b/core/entity/drop/build.gradle.kts @@ -1,7 +1,6 @@ plugins { kotlin ksp - ktlintGradle } java.sourceCompatibility = ApplicationInfo.sourceCompatibility diff --git a/core/entity/drop/src/main/kotlin/ru/fredboy/cavedroid/entity/drop/model/Drop.kt b/core/entity/drop/src/main/kotlin/ru/fredboy/cavedroid/entity/drop/model/Drop.kt index 799443b..3075c06 100644 --- a/core/entity/drop/src/main/kotlin/ru/fredboy/cavedroid/entity/drop/model/Drop.kt +++ b/core/entity/drop/src/main/kotlin/ru/fredboy/cavedroid/entity/drop/model/Drop.kt @@ -29,14 +29,12 @@ class Drop( return Intersector.overlaps(magnetArea, rectangle) } - private fun getMagnetArea(): Rectangle { - return Rectangle( - /* x = */ x - MAGNET_DISTANCE, - /* y = */ y - MAGNET_DISTANCE, - /* width = */ width + MAGNET_DISTANCE * 2, - /* height = */ height + MAGNET_DISTANCE * 2, - ) - } + private fun getMagnetArea(): Rectangle = Rectangle( + /* x = */ x - MAGNET_DISTANCE, + /* y = */ y - MAGNET_DISTANCE, + /* width = */ width + MAGNET_DISTANCE * 2, + /* height = */ height + MAGNET_DISTANCE * 2, + ) companion object { private fun getInitialVelocity(): Vector2 = Vector2(MathUtils.random(-100f, 100f), -100f) diff --git a/core/entity/mob/build.gradle.kts b/core/entity/mob/build.gradle.kts index 80f1a59..fee0959 100644 --- a/core/entity/mob/build.gradle.kts +++ b/core/entity/mob/build.gradle.kts @@ -1,7 +1,6 @@ plugins { kotlin ksp - ktlintGradle } java.sourceCompatibility = ApplicationInfo.sourceCompatibility diff --git a/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/model/Mob.kt b/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/model/Mob.kt index 5ebf842..fda88e7 100644 --- a/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/model/Mob.kt +++ b/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/model/Mob.kt @@ -71,9 +71,7 @@ abstract class Mob( abstract val speed: Float - private fun isAnimationIncreasing(): Boolean { - return anim > 0 && animDelta > 0 || anim < 0 && animDelta < 0 - } + private fun isAnimationIncreasing(): Boolean = anim > 0 && animDelta > 0 || anim < 0 && animDelta < 0 private fun checkHealth() { health = MathUtils.clamp(health, 0, maxHealth) @@ -157,14 +155,12 @@ abstract class Mob( checkHealth() } - fun getHitBox(): Rectangle { - return Rectangle( - /* x = */ x - HIT_RANGE, - /* y = */ y + HIT_RANGE, - /* width = */ width + HIT_RANGE * 2f, - /* height = */ height + HIT_RANGE * 2f, - ) - } + fun getHitBox(): Rectangle = Rectangle( + /* x = */ x - HIT_RANGE, + /* y = */ y + HIT_RANGE, + /* width = */ width + HIT_RANGE * 2f, + /* height = */ height + HIT_RANGE * 2f, + ) fun update(mobWorldAdapter: MobWorldAdapter, delta: Float) { behavior.update(this, mobWorldAdapter, delta) @@ -172,9 +168,7 @@ abstract class Mob( open fun getDropItems( itemByKey: GetItemByKeyUseCase, - ): List { - return emptyList() - } + ): List = emptyList() abstract fun draw(spriteBatch: SpriteBatch, x: Float, y: Float, delta: Float) diff --git a/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/model/Pig.kt b/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/model/Pig.kt index 2d3b220..4a03b4d 100644 --- a/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/model/Pig.kt +++ b/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/model/Pig.kt @@ -37,9 +37,7 @@ class Pig( } } - override fun getDropItems(itemByKey: GetItemByKeyUseCase): List { - return listOf(itemByKey["porkchop_raw"].toInventoryItem()) - } + override fun getDropItems(itemByKey: GetItemByKeyUseCase): List = listOf(itemByKey["porkchop_raw"].toInventoryItem()) override fun draw( spriteBatch: SpriteBatch, diff --git a/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/model/Player.kt b/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/model/Player.kt index 116de0b..46b0355 100644 --- a/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/model/Player.kt +++ b/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/model/Player.kt @@ -80,9 +80,7 @@ class Player( } } - override fun getDropItems(itemByKey: GetItemByKeyUseCase): List { - return inventory.items - } + override fun getDropItems(itemByKey: GetItemByKeyUseCase): List = inventory.items override fun draw(spriteBatch: SpriteBatch, x: Float, y: Float, delta: Float) { updateAnimation(delta) diff --git a/core/game/controller/container/build.gradle.kts b/core/game/controller/container/build.gradle.kts index 9694ac1..43efa9b 100644 --- a/core/game/controller/container/build.gradle.kts +++ b/core/game/controller/container/build.gradle.kts @@ -1,7 +1,6 @@ plugins { kotlin ksp - ktlintGradle } java.sourceCompatibility = ApplicationInfo.sourceCompatibility diff --git a/core/game/controller/container/src/main/kotlin/ru/fredboy/cavedroid/game/controller/container/ContainerController.kt b/core/game/controller/container/src/main/kotlin/ru/fredboy/cavedroid/game/controller/container/ContainerController.kt index 17af546..d0a6a50 100644 --- a/core/game/controller/container/src/main/kotlin/ru/fredboy/cavedroid/game/controller/container/ContainerController.kt +++ b/core/game/controller/container/src/main/kotlin/ru/fredboy/cavedroid/game/controller/container/ContainerController.kt @@ -21,7 +21,8 @@ class ContainerController @Inject constructor( private val containerWorldAdapter: ContainerWorldAdapter, private val containerFactory: ContainerFactory, private val dropAdapter: DropAdapter, -) : OnBlockPlacedListener, OnBlockDestroyedListener { +) : OnBlockPlacedListener, + OnBlockDestroyedListener { val containerMap = mutableMapOf() diff --git a/core/game/controller/drop/build.gradle.kts b/core/game/controller/drop/build.gradle.kts index 62337d8..d58c8e5 100644 --- a/core/game/controller/drop/build.gradle.kts +++ b/core/game/controller/drop/build.gradle.kts @@ -1,7 +1,6 @@ plugins { kotlin ksp - ktlintGradle } java.sourceCompatibility = ApplicationInfo.sourceCompatibility diff --git a/core/game/controller/mob/build.gradle.kts b/core/game/controller/mob/build.gradle.kts index 97a40f8..ac2a092 100644 --- a/core/game/controller/mob/build.gradle.kts +++ b/core/game/controller/mob/build.gradle.kts @@ -1,7 +1,6 @@ plugins { kotlin ksp - ktlintGradle } java.sourceCompatibility = ApplicationInfo.sourceCompatibility diff --git a/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/behavior/FallingBlockMobBehavior.kt b/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/behavior/FallingBlockMobBehavior.kt index 55c9215..7c7e66a 100644 --- a/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/behavior/FallingBlockMobBehavior.kt +++ b/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/behavior/FallingBlockMobBehavior.kt @@ -3,9 +3,10 @@ package ru.fredboy.cavedroid.game.controller.mob.behavior import ru.fredboy.cavedroid.entity.mob.abstraction.MobWorldAdapter import ru.fredboy.cavedroid.entity.mob.model.FallingBlock -class FallingBlockMobBehavior : BaseMobBehavior( - mobType = FallingBlock::class, -) { +class FallingBlockMobBehavior : + BaseMobBehavior( + mobType = FallingBlock::class, + ) { override fun FallingBlock.updateMob(worldAdapter: MobWorldAdapter, delta: Float) { if (velocity.isZero) { diff --git a/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/behavior/PigMobBehavior.kt b/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/behavior/PigMobBehavior.kt index 3dc88e8..2a28dbf 100644 --- a/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/behavior/PigMobBehavior.kt +++ b/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/behavior/PigMobBehavior.kt @@ -4,9 +4,10 @@ import com.badlogic.gdx.math.MathUtils import ru.fredboy.cavedroid.entity.mob.abstraction.MobWorldAdapter import ru.fredboy.cavedroid.entity.mob.model.Pig -class PigMobBehavior : BaseMobBehavior( - mobType = Pig::class, -) { +class PigMobBehavior : + BaseMobBehavior( + mobType = Pig::class, + ) { override fun Pig.updateMob(worldAdapter: MobWorldAdapter, delta: Float) { if (MathUtils.randomBoolean(delta)) { diff --git a/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/behavior/PlayerMobBehavior.kt b/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/behavior/PlayerMobBehavior.kt index 5da92c3..4db0590 100644 --- a/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/behavior/PlayerMobBehavior.kt +++ b/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/behavior/PlayerMobBehavior.kt @@ -6,9 +6,10 @@ import ru.fredboy.cavedroid.domain.world.model.Layer import ru.fredboy.cavedroid.entity.mob.abstraction.MobWorldAdapter import ru.fredboy.cavedroid.entity.mob.model.Player -class PlayerMobBehavior : BaseMobBehavior( - mobType = Player::class, -) { +class PlayerMobBehavior : + BaseMobBehavior( + mobType = Player::class, + ) { private fun Block?.isHittable() = this != null && !isNone() && params.hitPoints >= 0 diff --git a/core/game/window/build.gradle.kts b/core/game/window/build.gradle.kts index aa0c659..d84f920 100644 --- a/core/game/window/build.gradle.kts +++ b/core/game/window/build.gradle.kts @@ -1,7 +1,6 @@ plugins { kotlin ksp - ktlintGradle } java.sourceCompatibility = ApplicationInfo.sourceCompatibility diff --git a/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/AbstractInventoryWindow.kt b/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/AbstractInventoryWindow.kt index 66348d8..633d4b7 100644 --- a/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/AbstractInventoryWindow.kt +++ b/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/AbstractInventoryWindow.kt @@ -22,7 +22,8 @@ abstract class AbstractInventoryWindow { ) { if (selectedItem != null && selectedItem?.item?.isNone() != true && - pointer >= 0 && selectItemPointer >= 0 && + pointer >= 0 && + selectItemPointer >= 0 && pointer != selectItemPointer ) { return @@ -31,7 +32,8 @@ abstract class AbstractInventoryWindow { val clickedItem = items[index] selectedItem?.let { selectedItem -> - if (!clickedItem.isNoneOrNull() && items[index].item == selectedItem.item && + if (!clickedItem.isNoneOrNull() && + items[index].item == selectedItem.item && items[index].amount + selectedItem.amount <= selectedItem.item.params.maxStack ) { items[index].amount += selectedItem.amount diff --git a/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/CreativeInventoryWindow.kt b/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/CreativeInventoryWindow.kt index 782df96..f07f036 100644 --- a/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/CreativeInventoryWindow.kt +++ b/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/CreativeInventoryWindow.kt @@ -5,13 +5,11 @@ import ru.fredboy.cavedroid.domain.items.repository.ItemsRepository import ru.fredboy.cavedroid.game.window.GameWindowType import ru.fredboy.cavedroid.game.window.GameWindowsConfigs -class CreativeInventoryWindow() : AbstractInventoryWindow() { +class CreativeInventoryWindow : AbstractInventoryWindow() { override val type = GameWindowType.CREATIVE_INVENTORY override var selectedItem: InventoryItem? = null - fun getMaxScroll(itemsRepository: ItemsRepository): Int { - return itemsRepository.getAllItems().size / GameWindowsConfigs.Creative.itemsInRow - } + fun getMaxScroll(itemsRepository: ItemsRepository): Int = itemsRepository.getAllItems().size / GameWindowsConfigs.Creative.itemsInRow } diff --git a/core/game/world/build.gradle.kts b/core/game/world/build.gradle.kts index 74cb1f2..317d76b 100644 --- a/core/game/world/build.gradle.kts +++ b/core/game/world/build.gradle.kts @@ -1,7 +1,6 @@ plugins { kotlin ksp - ktlintGradle } java.sourceCompatibility = ApplicationInfo.sourceCompatibility diff --git a/core/game/world/src/main/kotlin/ru/fredboy/cavedroid/game/world/GameWorld.kt b/core/game/world/src/main/kotlin/ru/fredboy/cavedroid/game/world/GameWorld.kt index 5a4a2b1..1f69ac2 100644 --- a/core/game/world/src/main/kotlin/ru/fredboy/cavedroid/game/world/GameWorld.kt +++ b/core/game/world/src/main/kotlin/ru/fredboy/cavedroid/game/world/GameWorld.kt @@ -124,22 +124,15 @@ class GameWorld @Inject constructor( notifyBlockPlaced(x, y, layer, value) } - private fun isSameSlab(slab1: Block, slab2: Block): Boolean { - return slab1 is Block.Slab && slab2 is Block.Slab && - (slab1.params.key == slab2.otherPartBlockKey || slab1.otherPartBlockKey == slab2.params.key) - } + private fun isSameSlab(slab1: Block, slab2: Block): Boolean = slab1 is Block.Slab && + slab2 is Block.Slab && + (slab1.params.key == slab2.otherPartBlockKey || slab1.otherPartBlockKey == slab2.params.key) - fun hasForeAt(x: Int, y: Int): Boolean { - return !getMap(x, y, Layer.FOREGROUND).isNone() - } + fun hasForeAt(x: Int, y: Int): Boolean = !getMap(x, y, Layer.FOREGROUND).isNone() - fun hasBackAt(x: Int, y: Int): Boolean { - return !getMap(x, y, Layer.BACKGROUND).isNone() - } + fun hasBackAt(x: Int, y: Int): Boolean = !getMap(x, y, Layer.BACKGROUND).isNone() - fun getForeMap(x: Int, y: Int): Block { - return getMap(x, y, Layer.FOREGROUND) - } + fun getForeMap(x: Int, y: Int): Block = getMap(x, y, Layer.FOREGROUND) fun setForeMap(x: Int, y: Int, block: Block, dropOld: Boolean = false) { setMap(x, y, Layer.FOREGROUND, block, dropOld) @@ -149,17 +142,13 @@ class GameWorld @Inject constructor( setForeMap(x, y, itemsRepository.fallbackBlock) } - fun getBackMap(x: Int, y: Int): Block { - return getMap(x, y, Layer.BACKGROUND) - } + fun getBackMap(x: Int, y: Int): Block = getMap(x, y, Layer.BACKGROUND) fun setBackMap(x: Int, y: Int, block: Block, dropOld: Boolean = false) { setMap(x, y, Layer.BACKGROUND, block, dropOld) } - fun canPlaceToForeground(x: Int, y: Int, value: Block): Boolean { - return !hasForeAt(x, y) || value.isNone() || !getForeMap(x, y).params.hasCollision - } + fun canPlaceToForeground(x: Int, y: Int, value: Block): Boolean = !hasForeAt(x, y) || value.isNone() || !getForeMap(x, y).params.hasCollision fun placeToForeground(x: Int, y: Int, value: Block, dropOld: Boolean = false): Boolean { val wasPlaced = if (canPlaceToForeground(x, y, value)) { @@ -176,7 +165,9 @@ class GameWorld @Inject constructor( } fun placeToBackground(x: Int, y: Int, value: Block, dropOld: Boolean = false): Boolean { - val wasPlaced = if (value.isNone() || getBackMap(x, y).isNone() && value.params.hasCollision && + val wasPlaced = if (value.isNone() || + getBackMap(x, y).isNone() && + value.params.hasCollision && (!value.params.isTransparent || value.params.key == "glass" || value.isChest() || value.isSlab()) ) { setBackMap(x, y, value, dropOld) diff --git a/core/game/world/src/main/kotlin/ru/fredboy/cavedroid/game/world/generator/WorldGeneratorConfig.kt b/core/game/world/src/main/kotlin/ru/fredboy/cavedroid/game/world/generator/WorldGeneratorConfig.kt index 616e945..f8c6643 100644 --- a/core/game/world/src/main/kotlin/ru/fredboy/cavedroid/game/world/generator/WorldGeneratorConfig.kt +++ b/core/game/world/src/main/kotlin/ru/fredboy/cavedroid/game/world/generator/WorldGeneratorConfig.kt @@ -15,17 +15,15 @@ data class WorldGeneratorConfig( companion object { - fun getDefault(): WorldGeneratorConfig { - return WorldGeneratorConfig( - width = 1024, - height = 256, - seed = TimeUtils.millis(), - maxSurfaceHeight = 208, - minSurfaceHeight = 128, - biomes = Biome.entries.toList(), - minBiomeSize = 64, - seaLevel = 192, - ) - } + fun getDefault(): WorldGeneratorConfig = WorldGeneratorConfig( + width = 1024, + height = 256, + seed = TimeUtils.millis(), + maxSurfaceHeight = 208, + minSurfaceHeight = 128, + biomes = Biome.entries.toList(), + minBiomeSize = 64, + seaLevel = 192, + ) } } diff --git a/core/game/world/src/main/kotlin/ru/fredboy/cavedroid/game/world/impl/WorldAdapterImpl.kt b/core/game/world/src/main/kotlin/ru/fredboy/cavedroid/game/world/impl/WorldAdapterImpl.kt index dd2505b..a24bf77 100644 --- a/core/game/world/src/main/kotlin/ru/fredboy/cavedroid/game/world/impl/WorldAdapterImpl.kt +++ b/core/game/world/src/main/kotlin/ru/fredboy/cavedroid/game/world/impl/WorldAdapterImpl.kt @@ -21,7 +21,9 @@ import kotlin.reflect.KClass internal class WorldAdapterImpl @Inject constructor( private val gameWorld: GameWorld, private val itemsRepository: ItemsRepository, -) : DropWorldAdapter, ContainerWorldAdapter, MobWorldAdapter { +) : DropWorldAdapter, + ContainerWorldAdapter, + MobWorldAdapter { override val height: Int get() = gameWorld.height @@ -37,13 +39,9 @@ internal class WorldAdapterImpl @Inject constructor( gameWorld.setBackMap(x, y, block) } - override fun getForegroundBlock(x: Int, y: Int): Block { - return gameWorld.getForeMap(x, y) - } + override fun getForegroundBlock(x: Int, y: Int): Block = gameWorld.getForeMap(x, y) - override fun getBackgroundBlock(x: Int, y: Int): Block { - return gameWorld.getBackMap(x, y) - } + override fun getBackgroundBlock(x: Int, y: Int): Block = gameWorld.getBackMap(x, y) override fun destroyForegroundBlock(x: Int, y: Int, shouldDrop: Boolean) { gameWorld.destroyForeMap(x, y, shouldDrop) diff --git a/core/ux/controls/build.gradle.kts b/core/ux/controls/build.gradle.kts index 7433a22..68aca5e 100644 --- a/core/ux/controls/build.gradle.kts +++ b/core/ux/controls/build.gradle.kts @@ -1,7 +1,6 @@ plugins { kotlin ksp - ktlintGradle } java.sourceCompatibility = ApplicationInfo.sourceCompatibility diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/GameInputProcessor.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/GameInputProcessor.kt index 44cb5d1..80715c6 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/GameInputProcessor.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/GameInputProcessor.kt @@ -62,17 +62,11 @@ class GameInputProcessor @Inject constructor( private var touchDownX = 0f private var touchDownY = 0f - override fun keyDown(keycode: Int): Boolean { - return handleKeyboardAction(keycode, true) - } + override fun keyDown(keycode: Int): Boolean = handleKeyboardAction(keycode, true) - override fun keyUp(keycode: Int): Boolean { - return handleKeyboardAction(keycode, false) - } + override fun keyUp(keycode: Int): Boolean = handleKeyboardAction(keycode, false) - override fun keyTyped(p0: Char): Boolean { - return false - } + override fun keyTyped(p0: Char): Boolean = false override fun touchDown(screenX: Int, screenY: Int, pointer: Int, button: Int): Boolean { val (touchX, touchY) = gameContextRepository.getCameraContext().getViewportCoordinates(screenX, screenY) @@ -138,9 +132,7 @@ class GameInputProcessor @Inject constructor( ) } - override fun touchCancelled(p0: Int, p1: Int, p2: Int, p3: Int): Boolean { - return false - } + override fun touchCancelled(p0: Int, p1: Int, p2: Int, p3: Int): Boolean = false override fun touchDragged(screenX: Int, screenY: Int, pointer: Int): Boolean { val (touchX, touchY) = gameContextRepository.getCameraContext().getViewportCoordinates(screenX, screenY) @@ -159,9 +151,7 @@ class GameInputProcessor @Inject constructor( return handleMouseAction(action) } - override fun mouseMoved(p0: Int, p1: Int): Boolean { - return false - } + override fun mouseMoved(p0: Int, p1: Int): Boolean = false override fun scrolled(amountX: Float, amountY: Float): Boolean { val action: MouseInputAction? = mouseInputActionMapper diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/InputUtils.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/InputUtils.kt index 57d74e2..4552af8 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/InputUtils.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/InputUtils.kt @@ -12,9 +12,7 @@ fun MouseInputAction.isInsideHotbar(getTextureRegionByNameUseCase: GetTextureReg this.screenX <= this.cameraViewport.width / 2 + hotbar.regionWidth / 2 } -fun isInsideWindow(action: MouseInputAction, windowTexture: TextureRegion): Boolean { - return action.screenY > action.cameraViewport.height / 2 - windowTexture.regionHeight / 2 && - action.screenY < action.cameraViewport.height / 2 + windowTexture.regionHeight / 2 && - action.screenX > action.cameraViewport.width / 2 - windowTexture.regionWidth / 2 && - action.screenX < action.cameraViewport.width / 2 + windowTexture.regionWidth / 2 -} +fun isInsideWindow(action: MouseInputAction, windowTexture: TextureRegion): Boolean = action.screenY > action.cameraViewport.height / 2 - windowTexture.regionHeight / 2 && + action.screenY < action.cameraViewport.height / 2 + windowTexture.regionHeight / 2 && + action.screenX > action.cameraViewport.width / 2 - windowTexture.regionWidth / 2 && + action.screenX < action.cameraViewport.width / 2 + windowTexture.regionWidth / 2 diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/CloseGameWindowKeyboardInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/CloseGameWindowKeyboardInputHandler.kt index 39666c1..fea5ebc 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/CloseGameWindowKeyboardInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/CloseGameWindowKeyboardInputHandler.kt @@ -19,10 +19,9 @@ class CloseGameWindowKeyboardInputHandler @Inject constructor( private val dropController: DropController, ) : IKeyboardInputHandler { - override fun checkConditions(action: KeyboardInputAction): Boolean { - return action.actionKey is KeyboardInputActionKey.OpenInventory && - !action.isKeyDown && gameWindowsManager.currentWindowType != GameWindowType.NONE - } + override fun checkConditions(action: KeyboardInputAction): Boolean = action.actionKey is KeyboardInputActionKey.OpenInventory && + !action.isKeyDown && + gameWindowsManager.currentWindowType != GameWindowType.NONE override fun handle(action: KeyboardInputAction) { val selectedItem = gameWindowsManager.currentWindow?.selectedItem diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/DropItemKeyboardInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/DropItemKeyboardInputHandler.kt index e3f51e4..438780a 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/DropItemKeyboardInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/DropItemKeyboardInputHandler.kt @@ -21,11 +21,10 @@ class DropItemKeyboardInputHandler @Inject constructor( private val dropController: DropController, ) : IKeyboardInputHandler { - override fun checkConditions(action: KeyboardInputAction): Boolean { - return action.actionKey is KeyboardInputActionKey.DropItem && - action.isKeyDown && gameWindowsManager.currentWindowType == GameWindowType.NONE && - !mobController.player.activeItem.item.isNone() - } + override fun checkConditions(action: KeyboardInputAction): Boolean = action.actionKey is KeyboardInputActionKey.DropItem && + action.isKeyDown && + gameWindowsManager.currentWindowType == GameWindowType.NONE && + !mobController.player.activeItem.item.isNone() private fun createDrop(item: Item, playerX: Float, playerY: Float, amount: Int) { dropController.addDrop( diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/FlyDownKeyboardInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/FlyDownKeyboardInputHandler.kt index a2e4acc..f68c6b9 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/FlyDownKeyboardInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/FlyDownKeyboardInputHandler.kt @@ -17,11 +17,9 @@ class FlyDownKeyboardInputHandler @Inject constructor( private val mobController: MobController, ) : IKeyboardInputHandler { - override fun checkConditions(action: KeyboardInputAction): Boolean { - return action.actionKey is KeyboardInputActionKey.Down && - mobController.player.isFlyMode && - (mobController.player.controlMode == Player.ControlMode.WALK || !applicationContextRepository.isTouch()) - } + override fun checkConditions(action: KeyboardInputAction): Boolean = action.actionKey is KeyboardInputActionKey.Down && + mobController.player.isFlyMode && + (mobController.player.controlMode == Player.ControlMode.WALK || !applicationContextRepository.isTouch()) override fun handle(action: KeyboardInputAction) { if (action.isKeyDown) { diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/FlyUpKeyboardInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/FlyUpKeyboardInputHandler.kt index c590170..2fc4677 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/FlyUpKeyboardInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/FlyUpKeyboardInputHandler.kt @@ -17,12 +17,10 @@ class FlyUpKeyboardInputHandler @Inject constructor( private val mobController: MobController, ) : IKeyboardInputHandler { - override fun checkConditions(action: KeyboardInputAction): Boolean { - return action.actionKey is KeyboardInputActionKey.Up && - !mobController.player.swim && - mobController.player.isFlyMode && - (mobController.player.controlMode == Player.ControlMode.WALK || !applicationContextRepository.isTouch()) - } + override fun checkConditions(action: KeyboardInputAction): Boolean = action.actionKey is KeyboardInputActionKey.Up && + !mobController.player.swim && + mobController.player.isFlyMode && + (mobController.player.controlMode == Player.ControlMode.WALK || !applicationContextRepository.isTouch()) override fun handle(action: KeyboardInputAction) { if (action.isKeyDown) { diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/GoRightKeyboardInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/GoRightKeyboardInputHandler.kt index c3a7a66..b36011a 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/GoRightKeyboardInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/GoRightKeyboardInputHandler.kt @@ -18,10 +18,8 @@ class GoRightKeyboardInputHandler @Inject constructor( private val mobController: MobController, ) : IKeyboardInputHandler { - override fun checkConditions(action: KeyboardInputAction): Boolean { - return action.actionKey is KeyboardInputActionKey.Right && - (mobController.player.controlMode == Player.ControlMode.WALK || !applicationContextRepository.isTouch()) - } + override fun checkConditions(action: KeyboardInputAction): Boolean = action.actionKey is KeyboardInputActionKey.Right && + (mobController.player.controlMode == Player.ControlMode.WALK || !applicationContextRepository.isTouch()) override fun handle(action: KeyboardInputAction) { if (action.isKeyDown) { diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/JumpKeyboardInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/JumpKeyboardInputHandler.kt index 58152e1..22dc03b 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/JumpKeyboardInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/JumpKeyboardInputHandler.kt @@ -17,12 +17,11 @@ class JumpKeyboardInputHandler @Inject constructor( private val mobController: MobController, ) : IKeyboardInputHandler { - override fun checkConditions(action: KeyboardInputAction): Boolean { - return action.actionKey is KeyboardInputActionKey.Up && - mobController.player.canJump && !mobController.player.isFlyMode && - action.isKeyDown && - (mobController.player.controlMode == Player.ControlMode.WALK || !applicationContextRepository.isTouch()) - } + override fun checkConditions(action: KeyboardInputAction): Boolean = action.actionKey is KeyboardInputActionKey.Up && + mobController.player.canJump && + !mobController.player.isFlyMode && + action.isKeyDown && + (mobController.player.controlMode == Player.ControlMode.WALK || !applicationContextRepository.isTouch()) override fun handle(action: KeyboardInputAction) { mobController.player.jump() diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/MoveCursorControlsModeKeyboardInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/MoveCursorControlsModeKeyboardInputHandler.kt index 75bc8ac..ea09181 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/MoveCursorControlsModeKeyboardInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/MoveCursorControlsModeKeyboardInputHandler.kt @@ -17,16 +17,15 @@ class MoveCursorControlsModeKeyboardInputHandler @Inject constructor( private val mobsController: MobController, ) : IKeyboardInputHandler { - override fun checkConditions(action: KeyboardInputAction): Boolean { - return applicationContextRepository.isTouch() && - mobsController.player.controlMode == Player.ControlMode.CURSOR && action.isKeyDown && - ( - action.actionKey is KeyboardInputActionKey.Left || - action.actionKey is KeyboardInputActionKey.Right || - action.actionKey is KeyboardInputActionKey.Up || - action.actionKey is KeyboardInputActionKey.Down - ) - } + override fun checkConditions(action: KeyboardInputAction): Boolean = applicationContextRepository.isTouch() && + mobsController.player.controlMode == Player.ControlMode.CURSOR && + action.isKeyDown && + ( + action.actionKey is KeyboardInputActionKey.Left || + action.actionKey is KeyboardInputActionKey.Right || + action.actionKey is KeyboardInputActionKey.Up || + action.actionKey is KeyboardInputActionKey.Down + ) override fun handle(action: KeyboardInputAction) { val player = mobsController.player diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/OpenInventoryKeyboardInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/OpenInventoryKeyboardInputHandler.kt index 6d27dc9..412fe1d 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/OpenInventoryKeyboardInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/OpenInventoryKeyboardInputHandler.kt @@ -17,10 +17,9 @@ class OpenInventoryKeyboardInputHandler @Inject constructor( private val gameWindowsManager: GameWindowsManager, ) : IKeyboardInputHandler { - override fun checkConditions(action: KeyboardInputAction): Boolean { - return action.actionKey is KeyboardInputActionKey.OpenInventory && - !action.isKeyDown && gameWindowsManager.currentWindowType == GameWindowType.NONE - } + override fun checkConditions(action: KeyboardInputAction): Boolean = action.actionKey is KeyboardInputActionKey.OpenInventory && + !action.isKeyDown && + gameWindowsManager.currentWindowType == GameWindowType.NONE override fun handle(action: KeyboardInputAction) { if (mobController.player.gameMode == 1) { diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/PauseGameKeyboardInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/PauseGameKeyboardInputHandler.kt index 418c32d..6d84228 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/PauseGameKeyboardInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/PauseGameKeyboardInputHandler.kt @@ -29,9 +29,7 @@ class PauseGameKeyboardInputHandler @Inject constructor( private val saveDataRepository: SaveDataRepository, ) : IKeyboardInputHandler { - override fun checkConditions(action: KeyboardInputAction): Boolean { - return action.actionKey is KeyboardInputActionKey.Pause && action.isKeyDown - } + override fun checkConditions(action: KeyboardInputAction): Boolean = action.actionKey is KeyboardInputActionKey.Pause && action.isKeyDown override fun handle(action: KeyboardInputAction) { if (gameWindowsManager.currentWindowType != GameWindowType.NONE) { diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/SelectHotbarSlotKeyboardInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/SelectHotbarSlotKeyboardInputHandler.kt index 1958282..63cc753 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/SelectHotbarSlotKeyboardInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/SelectHotbarSlotKeyboardInputHandler.kt @@ -14,10 +14,8 @@ class SelectHotbarSlotKeyboardInputHandler @Inject constructor( private val mobController: MobController, ) : IKeyboardInputHandler { - override fun checkConditions(action: KeyboardInputAction): Boolean { - return action.actionKey is KeyboardInputActionKey.SelectHotbarSlot && - action.isKeyDown - } + override fun checkConditions(action: KeyboardInputAction): Boolean = action.actionKey is KeyboardInputActionKey.SelectHotbarSlot && + action.isKeyDown override fun handle(action: KeyboardInputAction) { mobController.player.activeSlot = (action.actionKey as KeyboardInputActionKey.SelectHotbarSlot).slot diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/StopSwimKeyboardInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/StopSwimKeyboardInputHandler.kt index 32ae3e9..5c4e5c0 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/StopSwimKeyboardInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/StopSwimKeyboardInputHandler.kt @@ -17,11 +17,10 @@ class StopSwimKeyboardInputHandler @Inject constructor( private val mobController: MobController, ) : IKeyboardInputHandler { - override fun checkConditions(action: KeyboardInputAction): Boolean { - return action.actionKey is KeyboardInputActionKey.Up && !action.isKeyDown && - mobController.player.swim && - (mobController.player.controlMode == Player.ControlMode.WALK || !applicationContextRepository.isTouch()) - } + override fun checkConditions(action: KeyboardInputAction): Boolean = action.actionKey is KeyboardInputActionKey.Up && + !action.isKeyDown && + mobController.player.swim && + (mobController.player.controlMode == Player.ControlMode.WALK || !applicationContextRepository.isTouch()) override fun handle(action: KeyboardInputAction) { mobController.player.swim = false diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/SwimUpKeyboardInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/SwimUpKeyboardInputHandler.kt index ee70c71..1b544fa 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/SwimUpKeyboardInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/SwimUpKeyboardInputHandler.kt @@ -19,17 +19,15 @@ class SwimUpKeyboardInputHandler @Inject constructor( private val gameWorld: GameWorld, ) : IKeyboardInputHandler { - private fun checkSwim(): Boolean { - return gameWorld.getForeMap(mobController.player.mapX, mobController.player.lowerMapY).isFluid() - } + private fun checkSwim(): Boolean = gameWorld.getForeMap(mobController.player.mapX, mobController.player.lowerMapY).isFluid() - override fun checkConditions(action: KeyboardInputAction): Boolean { - return action.actionKey is KeyboardInputActionKey.Up && action.isKeyDown && - !mobController.player.swim && - !mobController.player.canJump && - checkSwim() && !mobController.player.isFlyMode && - (mobController.player.controlMode == Player.ControlMode.WALK || !applicationContextRepository.isTouch()) - } + override fun checkConditions(action: KeyboardInputAction): Boolean = action.actionKey is KeyboardInputActionKey.Up && + action.isKeyDown && + !mobController.player.swim && + !mobController.player.canJump && + checkSwim() && + !mobController.player.isFlyMode && + (mobController.player.controlMode == Player.ControlMode.WALK || !applicationContextRepository.isTouch()) override fun handle(action: KeyboardInputAction) { mobController.player.swim = true diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/ToggleControlsModeKeyboardInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/ToggleControlsModeKeyboardInputHandler.kt index eb80b61..3d1ce40 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/ToggleControlsModeKeyboardInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/ToggleControlsModeKeyboardInputHandler.kt @@ -17,10 +17,9 @@ class ToggleControlsModeKeyboardInputHandler @Inject constructor( private val mobController: MobController, ) : IKeyboardInputHandler { - override fun checkConditions(action: KeyboardInputAction): Boolean { - return action.actionKey is KeyboardInputActionKey.SwitchControlsMode && !action.isKeyDown && - applicationContextRepository.isTouch() - } + override fun checkConditions(action: KeyboardInputAction): Boolean = action.actionKey is KeyboardInputActionKey.SwitchControlsMode && + !action.isKeyDown && + applicationContextRepository.isTouch() override fun handle(action: KeyboardInputAction) { if (mobController.player.controlMode == Player.ControlMode.WALK) { diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/ToggleDebugInfoKeyboardInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/ToggleDebugInfoKeyboardInputHandler.kt index ad89b5d..5988629 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/ToggleDebugInfoKeyboardInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/ToggleDebugInfoKeyboardInputHandler.kt @@ -14,9 +14,7 @@ class ToggleDebugInfoKeyboardInputHandler @Inject constructor( private val gameContextRepository: GameContextRepository, ) : IKeyboardInputHandler { - override fun checkConditions(action: KeyboardInputAction): Boolean { - return action.actionKey is KeyboardInputActionKey.ShowDebug && action.isKeyDown - } + override fun checkConditions(action: KeyboardInputAction): Boolean = action.actionKey is KeyboardInputActionKey.ShowDebug && action.isKeyDown override fun handle(action: KeyboardInputAction) { gameContextRepository.setShowInfo(!gameContextRepository.shouldShowInfo()) diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/ToggleGameModeKeyboardInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/ToggleGameModeKeyboardInputHandler.kt index 99ac3e7..4a2f624 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/ToggleGameModeKeyboardInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/ToggleGameModeKeyboardInputHandler.kt @@ -14,9 +14,7 @@ class ToggleGameModeKeyboardInputHandler @Inject constructor( private val mobController: MobController, ) : IKeyboardInputHandler { - override fun checkConditions(action: KeyboardInputAction): Boolean { - return action.actionKey is KeyboardInputActionKey.SwitchGameMode && action.isKeyDown - } + override fun checkConditions(action: KeyboardInputAction): Boolean = action.actionKey is KeyboardInputActionKey.SwitchGameMode && action.isKeyDown override fun handle(action: KeyboardInputAction) { if (mobController.player.gameMode == 1) { diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/ToggleMinimapKeyboardInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/ToggleMinimapKeyboardInputHandler.kt index e914b2b..a7450a8 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/ToggleMinimapKeyboardInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/ToggleMinimapKeyboardInputHandler.kt @@ -14,9 +14,7 @@ class ToggleMinimapKeyboardInputHandler @Inject constructor( private val gameContextRepository: GameContextRepository, ) : IKeyboardInputHandler { - override fun checkConditions(action: KeyboardInputAction): Boolean { - return action.actionKey is KeyboardInputActionKey.ShowMap && action.isKeyDown - } + override fun checkConditions(action: KeyboardInputAction): Boolean = action.actionKey is KeyboardInputActionKey.ShowMap && action.isKeyDown override fun handle(action: KeyboardInputAction) { gameContextRepository.setShowMap(!gameContextRepository.shouldShowMap()) diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/TurnOnFlyModeKeyboardInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/TurnOnFlyModeKeyboardInputHandler.kt index e7dfaa7..4fa80ec 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/TurnOnFlyModeKeyboardInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/TurnOnFlyModeKeyboardInputHandler.kt @@ -17,12 +17,13 @@ class TurnOnFlyModeKeyboardInputHandler @Inject constructor( private val mobsController: MobController, ) : IKeyboardInputHandler { - override fun checkConditions(action: KeyboardInputAction): Boolean { - return mobsController.player.gameMode == 1 && action.actionKey is KeyboardInputActionKey.Up && - !mobsController.player.swim && - !mobsController.player.isFlyMode && !mobsController.player.canJump && action.isKeyDown && - (mobsController.player.controlMode == Player.ControlMode.WALK || !applicationContextRepository.isTouch()) - } + override fun checkConditions(action: KeyboardInputAction): Boolean = mobsController.player.gameMode == 1 && + action.actionKey is KeyboardInputActionKey.Up && + !mobsController.player.swim && + !mobsController.player.isFlyMode && + !mobsController.player.canJump && + action.isKeyDown && + (mobsController.player.controlMode == Player.ControlMode.WALK || !applicationContextRepository.isTouch()) override fun handle(action: KeyboardInputAction) { mobsController.player.isFlyMode = true diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/AbstractInventoryItemsMouseInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/AbstractInventoryItemsMouseInputHandler.kt index 923454a..9c5db6c 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/AbstractInventoryItemsMouseInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/AbstractInventoryItemsMouseInputHandler.kt @@ -21,16 +21,14 @@ abstract class AbstractInventoryItemsMouseInputHandler( protected abstract val windowTexture: TextureRegion - override fun checkConditions(action: MouseInputAction): Boolean { - return gameWindowsManager.currentWindowType == windowType && - isInsideWindow(action, windowTexture) && - ( - action.actionKey is MouseInputActionKey.Left || - action.actionKey is MouseInputActionKey.Right || - action.actionKey is MouseInputActionKey.Screen - ) && - (action.actionKey.touchUp || action.actionKey is MouseInputActionKey.Screen) - } + override fun checkConditions(action: MouseInputAction): Boolean = gameWindowsManager.currentWindowType == windowType && + isInsideWindow(action, windowTexture) && + ( + action.actionKey is MouseInputActionKey.Left || + action.actionKey is MouseInputActionKey.Right || + action.actionKey is MouseInputActionKey.Screen + ) && + (action.actionKey.touchUp || action.actionKey is MouseInputActionKey.Screen) protected fun updateCraftResult(window: AbstractInventoryWindowWithCraftGrid) { window.craftResult = itemsRepository.getCraftingResult(window.craftingItems.map(InventoryItem::item)) @@ -77,7 +75,8 @@ abstract class AbstractInventoryItemsMouseInputHandler( ) { val selectedItem = window.selectedItem - if (!selectedItem.isNoneOrNull() && ( + if (!selectedItem.isNoneOrNull() && + ( selectedItem.item != items[index].item || !selectedItem.canBeAdded(items[index].amount) ) diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/AttackMouseInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/AttackMouseInputHandler.kt index 7ca10c5..f12b4fc 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/AttackMouseInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/AttackMouseInputHandler.kt @@ -20,11 +20,9 @@ class AttackMouseInputHandler @Inject constructor( private val textureRegions: GetTextureRegionByNameUseCase, ) : IMouseInputHandler { - override fun checkConditions(action: MouseInputAction): Boolean { - return gameWindowsManager.currentWindowType == GameWindowType.NONE && - !action.isInsideHotbar(textureRegions) && - action.actionKey is MouseInputActionKey.Left - } + override fun checkConditions(action: MouseInputAction): Boolean = gameWindowsManager.currentWindowType == GameWindowType.NONE && + !action.isInsideHotbar(textureRegions) && + action.actionKey is MouseInputActionKey.Left override fun handle(action: MouseInputAction) { if (action.actionKey.touchUp) { diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/CloseGameWindowMouseInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/CloseGameWindowMouseInputHandler.kt index b01db7a..c5a80da 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/CloseGameWindowMouseInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/CloseGameWindowMouseInputHandler.kt @@ -29,22 +29,18 @@ class CloseGameWindowMouseInputHandler @Inject constructor( private val furnaceInventoryTexture get() = requireNotNull(textureRegions["furnace"]) private val chestInventoryTexture get() = requireNotNull(textureRegions["chest"]) - override fun checkConditions(action: MouseInputAction): Boolean { - return gameWindowsManager.currentWindowType != GameWindowType.NONE && - (action.actionKey is MouseInputActionKey.Left || action.actionKey is MouseInputActionKey.Screen) && - action.actionKey.touchUp && - !isInsideWindow(action, getCurrentWindowTexture()) - } + override fun checkConditions(action: MouseInputAction): Boolean = gameWindowsManager.currentWindowType != GameWindowType.NONE && + (action.actionKey is MouseInputActionKey.Left || action.actionKey is MouseInputActionKey.Screen) && + action.actionKey.touchUp && + !isInsideWindow(action, getCurrentWindowTexture()) - private fun getCurrentWindowTexture(): TextureRegion { - return when (val window = gameWindowsManager.currentWindowType) { - GameWindowType.CREATIVE_INVENTORY -> creativeInventoryTexture - GameWindowType.SURVIVAL_INVENTORY -> survivalInventoryTexture - GameWindowType.CRAFTING_TABLE -> craftingInventoryTexture - GameWindowType.FURNACE -> furnaceInventoryTexture - GameWindowType.CHEST -> chestInventoryTexture - else -> throw UnsupportedOperationException("Cant close window ${window.name}") - } + private fun getCurrentWindowTexture(): TextureRegion = when (val window = gameWindowsManager.currentWindowType) { + GameWindowType.CREATIVE_INVENTORY -> creativeInventoryTexture + GameWindowType.SURVIVAL_INVENTORY -> survivalInventoryTexture + GameWindowType.CRAFTING_TABLE -> craftingInventoryTexture + GameWindowType.FURNACE -> furnaceInventoryTexture + GameWindowType.CHEST -> chestInventoryTexture + else -> throw UnsupportedOperationException("Cant close window ${window.name}") } override fun handle(action: MouseInputAction) { diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/CreativeInventoryScrollMouseInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/CreativeInventoryScrollMouseInputHandler.kt index 07d3919..fd73e88 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/CreativeInventoryScrollMouseInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/CreativeInventoryScrollMouseInputHandler.kt @@ -29,29 +29,26 @@ class CreativeInventoryScrollMouseInputHandler @Inject constructor( private var dragStartY = 0f - override fun checkConditions(action: MouseInputAction): Boolean { - return gameWindowsManager.currentWindowType == GameWindowType.CREATIVE_INVENTORY && - (gameWindowsManager.isDragging || isInsideWindow(action, creativeInventoryTexture)) && - ( - checkStartDragConditions(action) || checkEndDragConditions(action) || - checkDragConditions(action) || action.actionKey is MouseInputActionKey.Scroll - ) - } + override fun checkConditions(action: MouseInputAction): Boolean = gameWindowsManager.currentWindowType == GameWindowType.CREATIVE_INVENTORY && + (gameWindowsManager.isDragging || isInsideWindow(action, creativeInventoryTexture)) && + ( + checkStartDragConditions(action) || + checkEndDragConditions(action) || + checkDragConditions(action) || + action.actionKey is MouseInputActionKey.Scroll + ) - private fun checkStartDragConditions(action: MouseInputAction): Boolean { - return (action.actionKey is MouseInputActionKey.Screen) && - !action.actionKey.touchUp && !gameWindowsManager.isDragging - } + private fun checkStartDragConditions(action: MouseInputAction): Boolean = (action.actionKey is MouseInputActionKey.Screen) && + !action.actionKey.touchUp && + !gameWindowsManager.isDragging - private fun checkEndDragConditions(action: MouseInputAction): Boolean { - return action.actionKey is MouseInputActionKey.Screen && - action.actionKey.touchUp && gameWindowsManager.isDragging - } + private fun checkEndDragConditions(action: MouseInputAction): Boolean = action.actionKey is MouseInputActionKey.Screen && + action.actionKey.touchUp && + gameWindowsManager.isDragging - private fun checkDragConditions(action: MouseInputAction): Boolean { - return applicationContextRepository.isTouch() && action.actionKey is MouseInputActionKey.Dragged && - abs(action.screenY - dragStartY) >= DRAG_SENSITIVITY - } + private fun checkDragConditions(action: MouseInputAction): Boolean = applicationContextRepository.isTouch() && + action.actionKey is MouseInputActionKey.Dragged && + abs(action.screenY - dragStartY) >= DRAG_SENSITIVITY private fun clampScrollAmount() { gameWindowsManager.creativeScrollAmount = diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/CursorMouseInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/CursorMouseInputHandler.kt index 6f3cd6a..5cd6a27 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/CursorMouseInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/CursorMouseInputHandler.kt @@ -41,8 +41,7 @@ class CursorMouseInputHandler @Inject constructor( private val Block.isAutoselectable get() = !isNone() && params.hasCollision - private fun GameWorld.isCurrentBlockAutoselectable() = - getForeMap(player.cursorX, player.cursorY).isAutoselectable + private fun GameWorld.isCurrentBlockAutoselectable() = getForeMap(player.cursorX, player.cursorY).isAutoselectable private fun setPlayerDirectionToCursor() { if (player.controlMode != Player.ControlMode.CURSOR) { @@ -116,8 +115,10 @@ class CursorMouseInputHandler @Inject constructor( ) / GameWindowsConfigs.Creative.itemsGridRowHeight - if (xOnGrid < 0 || xOnGrid >= GameWindowsConfigs.Creative.itemsInRow || - yOnGrid < 0 || yOnGrid >= GameWindowsConfigs.Creative.itemsInCol + if (xOnGrid < 0 || + xOnGrid >= GameWindowsConfigs.Creative.itemsInRow || + yOnGrid < 0 || + yOnGrid >= GameWindowsConfigs.Creative.itemsInCol ) { return null } @@ -131,9 +132,7 @@ class CursorMouseInputHandler @Inject constructor( return item.params.name } - override fun checkConditions(action: MouseInputAction): Boolean { - return action.actionKey is MouseInputActionKey.None - } + override fun checkConditions(action: MouseInputAction): Boolean = action.actionKey is MouseInputActionKey.None override fun handle(action: MouseInputAction) { val pastCursorX = player.cursorX diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/HotbarMouseInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/HotbarMouseInputHandler.kt index e471ef3..48d3d31 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/HotbarMouseInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/HotbarMouseInputHandler.kt @@ -31,15 +31,13 @@ class HotbarMouseInputHandler @Inject constructor( private var buttonHoldTask: Timer.Task? = null - override fun checkConditions(action: MouseInputAction): Boolean { - return buttonHoldTask?.isScheduled == true || - ( - (action.actionKey is MouseInputActionKey.Left || action.actionKey is MouseInputActionKey.Screen) && - action.isInsideHotbar(textureRegions) || - action.actionKey is MouseInputActionKey.Scroll - ) && - gameWindowsManager.currentWindowType == GameWindowType.NONE - } + override fun checkConditions(action: MouseInputAction): Boolean = buttonHoldTask?.isScheduled == true || + ( + (action.actionKey is MouseInputActionKey.Left || action.actionKey is MouseInputActionKey.Screen) && + action.isInsideHotbar(textureRegions) || + action.actionKey is MouseInputActionKey.Scroll + ) && + gameWindowsManager.currentWindowType == GameWindowType.NONE private fun cancelHold() { buttonHoldTask?.cancel() @@ -55,15 +53,13 @@ class HotbarMouseInputHandler @Inject constructor( ) } - private fun getActionSlot(action: MouseInputAction): Int { - return ( - ( - action.screenX - - (action.cameraViewport.width / 2 - hotbarTexture.regionWidth / 2) - ) / - HOTBAR_CELL_WIDTH - ).toInt() - } + private fun getActionSlot(action: MouseInputAction): Int = ( + ( + action.screenX - + (action.cameraViewport.width / 2 - hotbarTexture.regionWidth / 2) + ) / + HOTBAR_CELL_WIDTH + ).toInt() private fun handleHold(action: MouseInputAction) { // buttonHoldTask = null diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/SelectChestInventoryItemMouseInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/SelectChestInventoryItemMouseInputHandler.kt index 0b6e035..fef64d4 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/SelectChestInventoryItemMouseInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/SelectChestInventoryItemMouseInputHandler.kt @@ -59,11 +59,15 @@ class SelectChestInventoryItemMouseInputHandler @Inject constructor( val yOnContent = (yOnWindow - GameWindowsConfigs.Chest.contentsMarginTop) / GameWindowsConfigs.Chest.itemsGridRowHeight - val isInsideInventoryGrid = xOnGrid >= 0 && xOnGrid < GameWindowsConfigs.Chest.itemsInRow && - yOnGrid >= 0 && yOnGrid < GameWindowsConfigs.Chest.itemsInCol - - val isInsideContentGrid = xOnContent >= 0 && xOnContent < GameWindowsConfigs.Chest.contentsInRow && - yOnContent >= 0 && yOnContent < GameWindowsConfigs.Chest.contentsInCol + val isInsideInventoryGrid = xOnGrid >= 0 && + xOnGrid < GameWindowsConfigs.Chest.itemsInRow && + yOnGrid >= 0 && + yOnGrid < GameWindowsConfigs.Chest.itemsInCol + + val isInsideContentGrid = xOnContent >= 0 && + xOnContent < GameWindowsConfigs.Chest.contentsInRow && + yOnContent >= 0 && + yOnContent < GameWindowsConfigs.Chest.contentsInCol if (isInsideInventoryGrid) { handleInsideInventoryGrid(action, xOnGrid.toInt(), yOnGrid.toInt()) diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/SelectCraftingInventoryItemMouseInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/SelectCraftingInventoryItemMouseInputHandler.kt index 96818b3..0f0dba1 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/SelectCraftingInventoryItemMouseInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/SelectCraftingInventoryItemMouseInputHandler.kt @@ -69,11 +69,15 @@ class SelectCraftingInventoryItemMouseInputHandler @Inject constructor( val yOnCraft = (yOnWindow - GameWindowsConfigs.Crafting.craftOffsetY) / GameWindowsConfigs.Crafting.itemsGridRowHeight - val isInsideInventoryGrid = xOnGrid >= 0 && xOnGrid < GameWindowsConfigs.Crafting.itemsInRow && - yOnGrid >= 0 && yOnGrid < GameWindowsConfigs.Crafting.itemsInCol - - val isInsideCraftGrid = xOnCraft >= 0 && xOnCraft < GameWindowsConfigs.Crafting.craftGridSize && - yOnCraft >= 0 && yOnCraft < GameWindowsConfigs.Crafting.craftGridSize + val isInsideInventoryGrid = xOnGrid >= 0 && + xOnGrid < GameWindowsConfigs.Crafting.itemsInRow && + yOnGrid >= 0 && + yOnGrid < GameWindowsConfigs.Crafting.itemsInCol + + val isInsideCraftGrid = xOnCraft >= 0 && + xOnCraft < GameWindowsConfigs.Crafting.craftGridSize && + yOnCraft >= 0 && + yOnCraft < GameWindowsConfigs.Crafting.craftGridSize val isInsideCraftResult = xOnWindow > GameWindowsConfigs.Crafting.craftResultOffsetX && xOnWindow < GameWindowsConfigs.Crafting.craftResultOffsetX + GameWindowsConfigs.Crafting.itemsGridColWidth && diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/SelectCreativeInventoryItemMouseInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/SelectCreativeInventoryItemMouseInputHandler.kt index 13d0bb3..c35ffa0 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/SelectCreativeInventoryItemMouseInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/SelectCreativeInventoryItemMouseInputHandler.kt @@ -25,12 +25,11 @@ class SelectCreativeInventoryItemMouseInputHandler @Inject constructor( private val creativeInventoryTexture get() = requireNotNull(textureRegions["creative"]) - override fun checkConditions(action: MouseInputAction): Boolean { - return gameWindowsManager.currentWindowType == GameWindowType.CREATIVE_INVENTORY && - !gameWindowsManager.isDragging && - (action.actionKey is MouseInputActionKey.Left || action.actionKey is MouseInputActionKey.Screen) && - action.actionKey.touchUp && isInsideWindow(action, creativeInventoryTexture) - } + override fun checkConditions(action: MouseInputAction): Boolean = gameWindowsManager.currentWindowType == GameWindowType.CREATIVE_INVENTORY && + !gameWindowsManager.isDragging && + (action.actionKey is MouseInputActionKey.Left || action.actionKey is MouseInputActionKey.Screen) && + action.actionKey.touchUp && + isInsideWindow(action, creativeInventoryTexture) override fun handle(action: MouseInputAction) { val creativeTexture = creativeInventoryTexture @@ -49,8 +48,10 @@ class SelectCreativeInventoryItemMouseInputHandler @Inject constructor( ) / GameWindowsConfigs.Creative.itemsGridRowHeight - if (xOnGrid < 0 || xOnGrid >= GameWindowsConfigs.Creative.itemsInRow || - yOnGrid < 0 || yOnGrid >= GameWindowsConfigs.Creative.itemsInCol + if (xOnGrid < 0 || + xOnGrid >= GameWindowsConfigs.Creative.itemsInRow || + yOnGrid < 0 || + yOnGrid >= GameWindowsConfigs.Creative.itemsInCol ) { return } diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/SelectFurnaceInventoryItemMouseInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/SelectFurnaceInventoryItemMouseInputHandler.kt index e6dc04a..89d6adc 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/SelectFurnaceInventoryItemMouseInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/SelectFurnaceInventoryItemMouseInputHandler.kt @@ -86,8 +86,10 @@ class SelectFurnaceInventoryItemMouseInputHandler @Inject constructor( yOnWindow > GameWindowsConfigs.Furnace.smeltResultOffsetY && yOnWindow < GameWindowsConfigs.Furnace.smeltResultOffsetY + GameWindowsConfigs.Furnace.itemsGridRowHeight - val isInsideInventoryGrid = xOnGrid >= 0 && xOnGrid < GameWindowsConfigs.Furnace.itemsInRow && - yOnGrid >= 0 && yOnGrid < GameWindowsConfigs.Furnace.itemsInCol + val isInsideInventoryGrid = xOnGrid >= 0 && + xOnGrid < GameWindowsConfigs.Furnace.itemsInRow && + yOnGrid >= 0 && + yOnGrid < GameWindowsConfigs.Furnace.itemsInCol if (isInsideInventoryGrid) { handleInsideInventoryGrid(action, xOnGrid.toInt(), yOnGrid.toInt()) diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/SelectSurvivalInventoryItemMouseInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/SelectSurvivalInventoryItemMouseInputHandler.kt index 3811777..015b37a 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/SelectSurvivalInventoryItemMouseInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/SelectSurvivalInventoryItemMouseInputHandler.kt @@ -67,11 +67,15 @@ class SelectSurvivalInventoryItemMouseInputHandler @Inject constructor( val yOnCraft = (yOnWindow - GameWindowsConfigs.Survival.craftOffsetY) / GameWindowsConfigs.Survival.itemsGridRowHeight - val isInsideInventoryGrid = xOnGrid >= 0 && xOnGrid < GameWindowsConfigs.Survival.itemsInRow && - yOnGrid >= 0 && yOnGrid < GameWindowsConfigs.Survival.itemsInCol - - val isInsideCraftGrid = xOnCraft >= 0 && xOnCraft < GameWindowsConfigs.Survival.craftGridSize && - yOnCraft >= 0 && yOnCraft < GameWindowsConfigs.Survival.craftGridSize + val isInsideInventoryGrid = xOnGrid >= 0 && + xOnGrid < GameWindowsConfigs.Survival.itemsInRow && + yOnGrid >= 0 && + yOnGrid < GameWindowsConfigs.Survival.itemsInCol + + val isInsideCraftGrid = xOnCraft >= 0 && + xOnCraft < GameWindowsConfigs.Survival.craftGridSize && + yOnCraft >= 0 && + yOnCraft < GameWindowsConfigs.Survival.craftGridSize val isInsideCraftResult = xOnWindow > GameWindowsConfigs.Survival.craftResultOffsetX && xOnWindow < GameWindowsConfigs.Survival.craftResultOffsetX + GameWindowsConfigs.Survival.itemsGridColWidth && diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/UseItemMouseInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/UseItemMouseInputHandler.kt index 24a2225..e6b98be 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/UseItemMouseInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/UseItemMouseInputHandler.kt @@ -35,12 +35,10 @@ class UseItemMouseInputHandler @Inject constructor( private var buttonHoldTask: Timer.Task? = null - override fun checkConditions(action: MouseInputAction): Boolean { - return buttonHoldTask?.isScheduled == true || - !action.isInsideHotbar(textureRegions) && - gameWindowsManager.currentWindowType == GameWindowType.NONE && - action.actionKey is MouseInputActionKey.Right - } + override fun checkConditions(action: MouseInputAction): Boolean = buttonHoldTask?.isScheduled == true || + !action.isInsideHotbar(textureRegions) && + gameWindowsManager.currentWindowType == GameWindowType.NONE && + action.actionKey is MouseInputActionKey.Right private fun cancelHold() { buttonHoldTask?.cancel() diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/touch/JoystickInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/touch/JoystickInputHandler.kt index 8c2aa7e..26437c9 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/touch/JoystickInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/touch/JoystickInputHandler.kt @@ -36,7 +36,8 @@ class JoystickInputHandler @Inject constructor( if (!value) { resetVelocity() if (TimeUtils.timeSinceMillis(activateTimeMs) < 200L && - mobController.player.controlMode != Player.ControlMode.CURSOR && mobController.player.canJump + mobController.player.controlMode != Player.ControlMode.CURSOR && + mobController.player.canJump ) { mobController.player.jump() } @@ -54,13 +55,15 @@ class JoystickInputHandler @Inject constructor( } } - override fun checkConditions(action: MouseInputAction): Boolean { - return gameWindowsManager.currentWindowType == GameWindowType.NONE && - applicationContextRepository.isTouch() && action.actionKey is MouseInputActionKey.Touch && (action.actionKey.pointer == gameContextRepository.getJoystick().pointer || !active) && ( - (action.actionKey is MouseInputActionKey.Dragged) || - (action.screenX < action.cameraViewport.width / 2 && !action.actionKey.touchUp || active) - ) && !(action.actionKey is MouseInputActionKey.Screen && action.isInsideHotbar(textureRegions)) - } + override fun checkConditions(action: MouseInputAction): Boolean = gameWindowsManager.currentWindowType == GameWindowType.NONE && + applicationContextRepository.isTouch() && + action.actionKey is MouseInputActionKey.Touch && + (action.actionKey.pointer == gameContextRepository.getJoystick().pointer || !active) && + ( + (action.actionKey is MouseInputActionKey.Dragged) || + (action.screenX < action.cameraViewport.width / 2 && !action.actionKey.touchUp || active) + ) && + !(action.actionKey is MouseInputActionKey.Screen && action.isInsideHotbar(textureRegions)) private fun handleTouchDown(action: MouseInputAction) { val key = action.actionKey as MouseInputActionKey.Screen diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/mapper/MouseInputActionMapper.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/mapper/MouseInputActionMapper.kt index 058fc17..51b4c3f 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/mapper/MouseInputActionMapper.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/mapper/MouseInputActionMapper.kt @@ -37,14 +37,12 @@ class MouseInputActionMapper @Inject constructor( mouseY: Float, cameraViewport: Rectangle, pointer: Int, - ): MouseInputAction { - return MouseInputAction( - screenX = getScreenX(mouseX), - screenY = getScreenY(mouseY), - actionKey = MouseInputActionKey.Dragged(pointer), - cameraViewport = cameraViewport, - ) - } + ): MouseInputAction = MouseInputAction( + screenX = getScreenX(mouseX), + screenY = getScreenY(mouseY), + actionKey = MouseInputActionKey.Dragged(pointer), + cameraViewport = cameraViewport, + ) fun mapScrolled( mouseX: Float, @@ -52,30 +50,22 @@ class MouseInputActionMapper @Inject constructor( amountX: Float, amountY: Float, cameraViewport: Rectangle, - ): MouseInputAction { - return MouseInputAction( - screenX = getScreenX(mouseX), - screenY = getScreenY(mouseY), - actionKey = MouseInputActionKey.Scroll(amountX, amountY), - cameraViewport = cameraViewport, - ) - } + ): MouseInputAction = MouseInputAction( + screenX = getScreenX(mouseX), + screenY = getScreenY(mouseY), + actionKey = MouseInputActionKey.Scroll(amountX, amountY), + cameraViewport = cameraViewport, + ) - private fun mapActionKey(button: Int, touchUp: Boolean, pointer: Int): MouseInputActionKey? { - return when (button) { - Input.Buttons.LEFT -> MouseInputActionKey.Left(touchUp) - Input.Buttons.RIGHT -> MouseInputActionKey.Right(touchUp) - Input.Buttons.MIDDLE -> MouseInputActionKey.Middle(touchUp) - -1 -> MouseInputActionKey.Screen(touchUp, pointer) - else -> null - } + private fun mapActionKey(button: Int, touchUp: Boolean, pointer: Int): MouseInputActionKey? = when (button) { + Input.Buttons.LEFT -> MouseInputActionKey.Left(touchUp) + Input.Buttons.RIGHT -> MouseInputActionKey.Right(touchUp) + Input.Buttons.MIDDLE -> MouseInputActionKey.Middle(touchUp) + -1 -> MouseInputActionKey.Screen(touchUp, pointer) + else -> null } - private fun getScreenX(mouseX: Float): Float { - return mouseX * (applicationContextRepository.getWidth() / Gdx.graphics.width) - } + private fun getScreenX(mouseX: Float): Float = mouseX * (applicationContextRepository.getWidth() / Gdx.graphics.width) - private fun getScreenY(mouseY: Float): Float { - return mouseY * (applicationContextRepository.getHeight() / Gdx.graphics.height) - } + private fun getScreenY(mouseY: Float): Float = mouseY * (applicationContextRepository.getHeight() / Gdx.graphics.height) } diff --git a/core/ux/physics/build.gradle.kts b/core/ux/physics/build.gradle.kts index b07c659..a2da836 100644 --- a/core/ux/physics/build.gradle.kts +++ b/core/ux/physics/build.gradle.kts @@ -1,7 +1,6 @@ plugins { kotlin ksp - ktlintGradle } java.sourceCompatibility = ApplicationInfo.sourceCompatibility diff --git a/core/ux/rendering/build.gradle.kts b/core/ux/rendering/build.gradle.kts index d4c106e..870744f 100644 --- a/core/ux/rendering/build.gradle.kts +++ b/core/ux/rendering/build.gradle.kts @@ -1,7 +1,6 @@ plugins { kotlin ksp - ktlintGradle } java.sourceCompatibility = ApplicationInfo.sourceCompatibility diff --git a/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/ChestWindowRenderer.kt b/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/ChestWindowRenderer.kt index 61e5522..9e072da 100644 --- a/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/ChestWindowRenderer.kt +++ b/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/ChestWindowRenderer.kt @@ -25,7 +25,8 @@ class ChestWindowRenderer @Inject constructor( private val getStringWidth: GetStringWidthUseCase, private val getStringHeight: GetStringHeightUseCase, private val getFont: GetFontUseCase, -) : AbstractWindowRenderer(), IGameRenderer { +) : AbstractWindowRenderer(), + IGameRenderer { override val renderLayer get() = WindowsRenderer.Companion.RENDER_LAYER diff --git a/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/CraftingWindowRenderer.kt b/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/CraftingWindowRenderer.kt index 0ebe4c8..6e17369 100644 --- a/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/CraftingWindowRenderer.kt +++ b/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/CraftingWindowRenderer.kt @@ -25,7 +25,8 @@ class CraftingWindowRenderer @Inject constructor( private val getStringWidth: GetStringWidthUseCase, private val getStringHeight: GetStringHeightUseCase, private val getFont: GetFontUseCase, -) : AbstractWindowRenderer(), IGameRenderer { +) : AbstractWindowRenderer(), + IGameRenderer { override val renderLayer get() = WindowsRenderer.Companion.RENDER_LAYER diff --git a/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/CreativeWindowRenderer.kt b/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/CreativeWindowRenderer.kt index 1c93d4b..2333f6f 100644 --- a/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/CreativeWindowRenderer.kt +++ b/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/CreativeWindowRenderer.kt @@ -27,7 +27,8 @@ class CreativeWindowRenderer @Inject constructor( private val getStringWidth: GetStringWidthUseCase, private val getStringHeight: GetStringHeightUseCase, private val getFont: GetFontUseCase, -) : AbstractWindowRenderer(), IGameRenderer { +) : AbstractWindowRenderer(), + IGameRenderer { override val renderLayer get() = WindowsRenderer.Companion.RENDER_LAYER diff --git a/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/FurnaceWindowRenderer.kt b/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/FurnaceWindowRenderer.kt index 6b25db3..7280aa1 100644 --- a/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/FurnaceWindowRenderer.kt +++ b/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/FurnaceWindowRenderer.kt @@ -28,7 +28,8 @@ class FurnaceWindowRenderer @Inject constructor( private val getStringWidth: GetStringWidthUseCase, private val getStringHeight: GetStringHeightUseCase, private val getFont: GetFontUseCase, -) : AbstractWindowRenderer(), IGameRenderer { +) : AbstractWindowRenderer(), + IGameRenderer { override val renderLayer get() = WindowsRenderer.Companion.RENDER_LAYER diff --git a/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/SurvivalWindowRenderer.kt b/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/SurvivalWindowRenderer.kt index 53a4a91..1db8782 100644 --- a/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/SurvivalWindowRenderer.kt +++ b/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/SurvivalWindowRenderer.kt @@ -30,7 +30,8 @@ class SurvivalWindowRenderer @Inject constructor( private val getStringWidth: GetStringWidthUseCase, private val getStringHeight: GetStringHeightUseCase, private val getFont: GetFontUseCase, -) : AbstractWindowRenderer(), IGameRenderer { +) : AbstractWindowRenderer(), + IGameRenderer { override val renderLayer get() = WindowsRenderer.Companion.RENDER_LAYER diff --git a/core/zygote/build.gradle.kts b/core/zygote/build.gradle.kts index e478fe9..d315c7f 100644 --- a/core/zygote/build.gradle.kts +++ b/core/zygote/build.gradle.kts @@ -1,7 +1,6 @@ plugins { kotlin ksp - ktlintGradle } java.sourceCompatibility = ApplicationInfo.sourceCompatibility diff --git a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/CaveDroidApplication.kt b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/CaveDroidApplication.kt index 9f78599..f13e50b 100644 --- a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/CaveDroidApplication.kt +++ b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/CaveDroidApplication.kt @@ -16,7 +16,8 @@ class CaveDroidApplication( private val isTouchScreen: Boolean, private val isDebug: Boolean, private val preferencesStore: PreferencesStore, -) : Game(), ApplicationController { +) : Game(), + ApplicationController { lateinit var applicationComponent: ApplicationComponent private set diff --git a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/game/GameScreen.kt b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/game/GameScreen.kt index ff091ca..ccc72c8 100644 --- a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/game/GameScreen.kt +++ b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/game/GameScreen.kt @@ -22,29 +22,27 @@ class GameScreen @Inject constructor( private var gameComponent: GameComponent? = null - private fun getGameContext(isLoadGame: Boolean): GameContext { - return GameContext( - isLoadGame = isLoadGame, - showInfo = false, - showMap = false, - joystick = Joystick(Player.SPEED), - cameraContext = CameraContext( - viewport = Rectangle( - /* x = */ 0f, - /* y = */ 0f, - /* width = */ applicationContextRepository.getWidth(), - /* height = */ applicationContextRepository.getHeight(), - ), - camera = OrthographicCamera().apply { - setToOrtho( - /* yDown = */ true, - /* viewportWidth = */ applicationContextRepository.getWidth(), - /* viewportHeight = */ applicationContextRepository.getHeight(), - ) - }, + private fun getGameContext(isLoadGame: Boolean): GameContext = GameContext( + isLoadGame = isLoadGame, + showInfo = false, + showMap = false, + joystick = Joystick(Player.SPEED), + cameraContext = CameraContext( + viewport = Rectangle( + /* x = */ 0f, + /* y = */ 0f, + /* width = */ applicationContextRepository.getWidth(), + /* height = */ applicationContextRepository.getHeight(), ), - ) - } + camera = OrthographicCamera().apply { + setToOrtho( + /* yDown = */ true, + /* viewportWidth = */ applicationContextRepository.getWidth(), + /* viewportHeight = */ applicationContextRepository.getHeight(), + ) + }, + ), + ) private fun getGameComponent(isLoadGame: Boolean): GameComponent { val gameContext = getGameContext(isLoadGame) diff --git a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/game/di/GameModule.kt b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/game/di/GameModule.kt index 33b7374..ea9a561 100644 --- a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/game/di/GameModule.kt +++ b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/game/di/GameModule.kt @@ -31,18 +31,16 @@ object GameModule { saveDataRepository: SaveDataRepository, itemsRepository: ItemsRepository, dropWorldAdapter: DropWorldAdapter, - ): DropController { - return if (gameContextRepository.isLoadGame()) { - saveDataRepository.loadDropController( - gameDataFolder = applicationContextRepository.getGameDirectory(), - dropWorldAdapter = dropWorldAdapter, - ) - } else { - DropController( - itemsRepository = itemsRepository, - dropWorldAdapter = dropWorldAdapter, - ) - } + ): DropController = if (gameContextRepository.isLoadGame()) { + saveDataRepository.loadDropController( + gameDataFolder = applicationContextRepository.getGameDirectory(), + dropWorldAdapter = dropWorldAdapter, + ) + } else { + DropController( + itemsRepository = itemsRepository, + dropWorldAdapter = dropWorldAdapter, + ) } @Provides @@ -55,22 +53,20 @@ object GameModule { containerWorldAdapter: ContainerWorldAdapter, containerFactory: ContainerFactory, dropAdapter: DropAdapter, - ): ContainerController { - return if (gameContextRepository.isLoadGame()) { - saveDataRepository.loadContainerController( - gameDataFolder = applicationContextRepository.getGameDirectory(), - containerWorldAdapter = containerWorldAdapter, - containerFactory = containerFactory, - dropAdapter = dropAdapter, - ) - } else { - ContainerController( - getItemByKeyUseCase = getItemByKeyUseCase, - containerWorldAdapter = containerWorldAdapter, - containerFactory = containerFactory, - dropAdapter = dropAdapter, - ) - } + ): ContainerController = if (gameContextRepository.isLoadGame()) { + saveDataRepository.loadContainerController( + gameDataFolder = applicationContextRepository.getGameDirectory(), + containerWorldAdapter = containerWorldAdapter, + containerFactory = containerFactory, + dropAdapter = dropAdapter, + ) + } else { + ContainerController( + getItemByKeyUseCase = getItemByKeyUseCase, + containerWorldAdapter = containerWorldAdapter, + containerFactory = containerFactory, + dropAdapter = dropAdapter, + ) } @Provides @@ -82,19 +78,17 @@ object GameModule { mobAssetsRepository: MobAssetsRepository, getFallbackItemUseCase: GetFallbackItemUseCase, mobWorldAdapter: MobWorldAdapter, - ): MobController { - return if (gameContextRepository.isLoadGame()) { - saveDataRepository.loadMobController( - gameDataFolder = applicationContextRepository.getGameDirectory(), - mobWorldAdapter = mobWorldAdapter, - ) - } else { - MobController( - mobAssetsRepository = mobAssetsRepository, - getFallbackItemUseCase = getFallbackItemUseCase, - mobWorldAdapter = mobWorldAdapter, - ) - } + ): MobController = if (gameContextRepository.isLoadGame()) { + saveDataRepository.loadMobController( + gameDataFolder = applicationContextRepository.getGameDirectory(), + mobWorldAdapter = mobWorldAdapter, + ) + } else { + MobController( + mobAssetsRepository = mobAssetsRepository, + getFallbackItemUseCase = getFallbackItemUseCase, + mobWorldAdapter = mobWorldAdapter, + ) } @Provides diff --git a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/LoadGameAction.kt b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/LoadGameAction.kt index 38b727d..2105214 100644 --- a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/LoadGameAction.kt +++ b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/LoadGameAction.kt @@ -19,9 +19,7 @@ class LoadGameAction @Inject constructor( gameController.loadGame() } - override fun canPerform(): Boolean { - return saveDataRepository.exists(applicationContextRepository.getGameDirectory()) - } + override fun canPerform(): Boolean = saveDataRepository.exists(applicationContextRepository.getGameDirectory()) companion object { const val KEY = "load_game_action" diff --git a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/input/MenuInputProcessor.kt b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/input/MenuInputProcessor.kt index 12ba87f..b01dbe4 100644 --- a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/input/MenuInputProcessor.kt +++ b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/input/MenuInputProcessor.kt @@ -70,47 +70,31 @@ class MenuInputProcessor @Inject constructor( return true } - override fun keyDown(keycode: Int): Boolean { - return false - } + override fun keyDown(keycode: Int): Boolean = false - override fun keyUp(keycode: Int): Boolean { - return false - } + override fun keyUp(keycode: Int): Boolean = false - override fun keyTyped(character: Char): Boolean { - return false - } + override fun keyTyped(character: Char): Boolean = false override fun touchDown( screenX: Int, screenY: Int, pointer: Int, button: Int, - ): Boolean { - return false - } + ): Boolean = false override fun touchCancelled( screenX: Int, screenY: Int, pointer: Int, button: Int, - ): Boolean { - return false - } + ): Boolean = false - override fun touchDragged(screenX: Int, screenY: Int, pointer: Int): Boolean { - return false - } + override fun touchDragged(screenX: Int, screenY: Int, pointer: Int): Boolean = false - override fun mouseMoved(screenX: Int, screenY: Int): Boolean { - return false - } + override fun mouseMoved(screenX: Int, screenY: Int): Boolean = false - override fun scrolled(amountX: Float, amountY: Float): Boolean { - return false - } + override fun scrolled(amountX: Float, amountY: Float): Boolean = false companion object { private const val TAG = "MenuInputProcessor" diff --git a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/option/bool/DynamicCameraMenuBooleanOption.kt b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/option/bool/DynamicCameraMenuBooleanOption.kt index f135794..be63889 100644 --- a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/option/bool/DynamicCameraMenuBooleanOption.kt +++ b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/option/bool/DynamicCameraMenuBooleanOption.kt @@ -11,9 +11,7 @@ class DynamicCameraMenuBooleanOption @Inject constructor( private val applicationContextRepository: ApplicationContextRepository, ) : IMenuBooleanOption { - override fun getOption(): Boolean { - return applicationContextRepository.useDynamicCamera() - } + override fun getOption(): Boolean = applicationContextRepository.useDynamicCamera() override fun toggleOption() { applicationContextRepository.setUseDynamicCamera(!getOption()) diff --git a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/option/bool/FullscreenMenuBooleanOption.kt b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/option/bool/FullscreenMenuBooleanOption.kt index fed064a..6a984f7 100644 --- a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/option/bool/FullscreenMenuBooleanOption.kt +++ b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/option/bool/FullscreenMenuBooleanOption.kt @@ -11,9 +11,7 @@ class FullscreenMenuBooleanOption @Inject constructor( private val applicationContextRepository: ApplicationContextRepository, ) : IMenuBooleanOption { - override fun getOption(): Boolean { - return applicationContextRepository.isFullscreen() - } + override fun getOption(): Boolean = applicationContextRepository.isFullscreen() override fun toggleOption() { applicationContextRepository.setFullscreen(!getOption()) diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts index f19991f..32a59d1 100644 --- a/desktop/build.gradle.kts +++ b/desktop/build.gradle.kts @@ -1,6 +1,5 @@ plugins { kotlin - ktlintGradle } java.sourceCompatibility = ApplicationInfo.sourceCompatibility diff --git a/desktop/src/main/kotlin/ru/deadsoftware/cavedroid/desktop/DesktopPreferencesStore.kt b/desktop/src/main/kotlin/ru/deadsoftware/cavedroid/desktop/DesktopPreferencesStore.kt index bfa7534..e34b735 100644 --- a/desktop/src/main/kotlin/ru/deadsoftware/cavedroid/desktop/DesktopPreferencesStore.kt +++ b/desktop/src/main/kotlin/ru/deadsoftware/cavedroid/desktop/DesktopPreferencesStore.kt @@ -7,9 +7,7 @@ class DesktopPreferencesStore : PreferencesStore { private val prefs = Preferences.userNodeForPackage(DesktopPreferencesStore::class.java) - override fun getPreference(key: String): String? { - return prefs.get(key, null) - } + override fun getPreference(key: String): String? = prefs.get(key, null) override fun setPreference(key: String, value: String?) { prefs.put(key, value) -- 2.29.2