From: fredboy Date: Tue, 1 Jul 2025 14:39:27 +0000 (+0700) Subject: Format with ktlint X-Git-Tag: alpha0.9.3~7 X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=e410f19744e55a5cf45b5a5ff22aa2dd71695b77;p=cavedroid.git Format with ktlint --- diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..ec9a968 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,19 @@ +root = true + +[*] +charset = utf-8 +insert_final_newline = true +trim_trailing_whitespace = true + +[*.{kt,kts}] +ktlint_code_style=intellij_idea +ktlint_standard_multiline-expression-wrapping = disabled +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 + +[**/generated/**] +generated_code = true +ij_formatter_enabled = false +ktlint = disabled diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 34932be..eb63e5c 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -18,7 +18,6 @@ private val keystoreProperties = if (keystorePropertiesFile.exists()) { null } - android { namespace = ApplicationInfo.packageName compileSdk = 34 @@ -32,7 +31,6 @@ android { named("debug") { res.srcDir("src/debug/res") } - } compileOptions { @@ -131,4 +129,4 @@ dependencies { natives(Dependencies.LibGDX.Android.Natives.x86_64) configurations["implementation"].exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8") -} \ No newline at end of file +} diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 9328a4e..4428532 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -6,12 +6,10 @@ android:allowBackup="true" android:icon="@drawable/ic_launcher" android:label="@string/app_name" - android:theme="@style/GdxTheme" tools:ignore="GoogleAppIndexingWarning" - android:fullBackupContent="@xml/backup_descriptor"> + android:theme="@style/GdxTheme" tools:ignore="GoogleAppIndexingWarning"> diff --git a/android/src/main/kotlin/ru/deadsoftware/cavedroid/AndroidLauncher.kt b/android/src/main/kotlin/ru/deadsoftware/cavedroid/AndroidLauncher.kt index 129379a..7bf5d85 100644 --- a/android/src/main/kotlin/ru/deadsoftware/cavedroid/AndroidLauncher.kt +++ b/android/src/main/kotlin/ru/deadsoftware/cavedroid/AndroidLauncher.kt @@ -11,7 +11,7 @@ class AndroidLauncher : AndroidApplication() { super.onCreate(savedInstanceState) val gameDataDirectoryPath = packageManager.getPackageInfo(packageName, 0) - .applicationInfo.dataDir; + .applicationInfo.dataDir val config = AndroidApplicationConfiguration() config.useImmersiveMode = true @@ -21,9 +21,9 @@ class AndroidLauncher : AndroidApplication() { gameDataDirectoryPath = gameDataDirectoryPath, isTouchScreen = true, isDebug = BuildConfig.DEBUG, - preferencesStore = AndroidPreferencesStore(applicationContext) + preferencesStore = AndroidPreferencesStore(applicationContext), ), - /* config = */ config + /* config = */ config, ) } @@ -31,5 +31,4 @@ class AndroidLauncher : AndroidApplication() { override fun onBackPressed() { // ignore } - -} \ No newline at end of file +} diff --git a/android/src/main/kotlin/ru/deadsoftware/cavedroid/AndroidPreferencesStore.kt b/android/src/main/kotlin/ru/deadsoftware/cavedroid/AndroidPreferencesStore.kt index d334cfe..ed96040 100644 --- a/android/src/main/kotlin/ru/deadsoftware/cavedroid/AndroidPreferencesStore.kt +++ b/android/src/main/kotlin/ru/deadsoftware/cavedroid/AndroidPreferencesStore.kt @@ -4,7 +4,7 @@ import android.content.Context import ru.fredboy.cavedroid.common.api.PreferencesStore class AndroidPreferencesStore( - private val context: Context + private val context: Context, ) : PreferencesStore { private val sharedPreferences by lazy { context.getSharedPreferences(SHARED_PREFS_NAME, Context.MODE_PRIVATE) } @@ -23,4 +23,4 @@ class AndroidPreferencesStore( private companion object { private const val SHARED_PREFS_NAME = "cavedroid_prefs" } -} \ No newline at end of file +} diff --git a/android/src/main/res/drawable-anydpi-v26/ic_launcher.xml b/android/src/main/res/drawable-anydpi-v26/ic_launcher.xml index 6b78462..9c60f35 100644 --- a/android/src/main/res/drawable-anydpi-v26/ic_launcher.xml +++ b/android/src/main/res/drawable-anydpi-v26/ic_launcher.xml @@ -2,4 +2,5 @@ + diff --git a/build.gradle.kts b/build.gradle.kts index 203acec..7225674 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,3 +1,7 @@ +plugins { + ktlintGradle +} + buildscript { repositories { mavenLocal() @@ -27,4 +31,4 @@ allprojects { maven { url = uri("https://jitpack.io") } maven { url = uri("https://mvn.fredboy.ru/releases/") } } -} \ No newline at end of file +} diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 609f671..c688ed7 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -44,10 +44,6 @@ object Dependencies { const val ksp = "ru.fredboy:automultibind-ksp:${Versions.automultibind}" } - object KtLint { - const val ktlintGradlePlugin = "org.jlleitschuh.gradle:ktlint:${Versions.ktlintGradle}" - } - const val androidGradlePlugin = "com.android.tools.build:gradle:${Versions.agp}" } \ No newline at end of file diff --git a/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/CaveDroidConstants.kt b/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/CaveDroidConstants.kt index 180b694..2083a66 100644 --- a/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/CaveDroidConstants.kt +++ b/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/CaveDroidConstants.kt @@ -3,5 +3,4 @@ package ru.fredboy.cavedroid.common object CaveDroidConstants { const val VERSION = "alpha 0.9.2" - -} \ No newline at end of file +} diff --git a/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/api/ApplicationController.kt b/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/api/ApplicationController.kt index 36b1f07..52e7337 100644 --- a/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/api/ApplicationController.kt +++ b/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/api/ApplicationController.kt @@ -11,5 +11,4 @@ interface ApplicationController { fun loadGame() fun exitGame() - -} \ No newline at end of file +} diff --git a/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/api/PreferencesStore.kt b/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/api/PreferencesStore.kt index 9b48604..38921fc 100644 --- a/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/api/PreferencesStore.kt +++ b/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/api/PreferencesStore.kt @@ -5,5 +5,4 @@ interface PreferencesStore { fun getPreference(key: String): String? fun setPreference(key: String, value: String?) - -} \ No newline at end of file +} diff --git a/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/automultibind/MultibindingConfig.kt b/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/automultibind/MultibindingConfig.kt index 06f5d79..562b680 100644 --- a/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/automultibind/MultibindingConfig.kt +++ b/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/automultibind/MultibindingConfig.kt @@ -2,4 +2,4 @@ package ru.fredboy.cavedroid.common.automultibind data object MultibindingConfig { const val GENERATED_MODULES_PACKAGE = "ru.deadsoftware.cavedroid.generated.module" -} \ No newline at end of file +} diff --git a/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/base/MainConfiguration.kt b/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/base/MainConfiguration.kt index 7192bcf..858c2c9 100644 --- a/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/base/MainConfiguration.kt +++ b/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/base/MainConfiguration.kt @@ -1,4 +1,3 @@ package ru.fredboy.cavedroid.common.base -interface MainConfiguration { -} \ No newline at end of file +interface MainConfiguration diff --git a/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/model/Joystick.kt b/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/model/Joystick.kt index 89272d6..3f88963 100644 --- a/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/model/Joystick.kt +++ b/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/model/Joystick.kt @@ -44,7 +44,7 @@ class Joystick( } return Vector2( stickVector.x * value, - stickVector.y * value + stickVector.y * value, ) } @@ -69,5 +69,4 @@ class Joystick( const val SIZE = RADIUS * 2 const val STICK_SIZE = 32f } - -} \ No newline at end of file +} 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 14a799a..e79f568 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 @@ -27,5 +27,4 @@ data class SpriteOrigin( 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 8d8f8f4..fef5fd1 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 @@ -15,4 +15,4 @@ fun MutableCollection.retrieveFirst(predicate: (T) -> Boolean): T? { fun MutableCollection.removeFirst(predicate: (T) -> Boolean): Boolean { return retrieveFirst(predicate) != null -} \ No newline at end of file +} diff --git a/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/utils/RenderingUtils.kt b/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/utils/RenderingUtils.kt index 01822bc..3631fc5 100644 --- a/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/utils/RenderingUtils.kt +++ b/core/common/src/main/kotlin/ru/fredboy/cavedroid/common/utils/RenderingUtils.kt @@ -10,12 +10,11 @@ import com.badlogic.gdx.math.Rectangle private fun Rectangle.shifted(shift: Float) = Rectangle(x + shift, y, width, height) -private fun Rectangle.getLazyShifts(worldWidthPx: Float) - = Triple( - first = lazy { shifted(0f) }, - second = lazy { shifted(-worldWidthPx) }, - third = lazy { shifted(worldWidthPx) } - ) +private fun Rectangle.getLazyShifts(worldWidthPx: Float) = Triple( + first = lazy { shifted(0f) }, + second = lazy { shifted(-worldWidthPx) }, + third = lazy { shifted(worldWidthPx) }, +) fun Rectangle.cycledInsideWorld( viewport: Rectangle, @@ -53,7 +52,7 @@ fun SpriteBatch.drawString( str: String, x: Float, y: Float, - color: Color = Color.WHITE + color: Color = Color.WHITE, ): GlyphLayout { font.color = color return font.draw(this, str, x, y) @@ -85,7 +84,7 @@ fun SpriteBatch.withScissors( y: Float, width: Float, height: Float, - block: () -> Unit + block: () -> Unit, ) { val scaleX = Gdx.graphics.width / viewportWidth val scaleY = Gdx.graphics.height / viewportHeight @@ -96,7 +95,7 @@ fun SpriteBatch.withScissors( /* x = */ (x * scaleX).toInt(), /* y = */ ((viewportHeight - y - height) * scaleY).toInt(), /* width = */ (width * scaleX).toInt(), - /* height = */ (height * scaleY).toInt() + /* height = */ (height * scaleY).toInt(), ) block.invoke() flush() diff --git a/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/di/DataAssetsModule.kt b/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/di/DataAssetsModule.kt index 73dc017..de7564c 100644 --- a/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/di/DataAssetsModule.kt +++ b/core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/di/DataAssetsModule.kt @@ -2,49 +2,56 @@ package ru.fredboy.cavedroid.data.assets.di import dagger.Binds import dagger.Module -import ru.fredboy.cavedroid.data.assets.internal.* +import ru.fredboy.cavedroid.data.assets.internal.BlockAssetsRepositoryImpl import ru.fredboy.cavedroid.data.assets.internal.BlockDamageAssetsRepositoryImpl import ru.fredboy.cavedroid.data.assets.internal.FontAssetsRepositoryImpl +import ru.fredboy.cavedroid.data.assets.internal.ItemsAssetsRepositoryImpl import ru.fredboy.cavedroid.data.assets.internal.MobAssetsRepositoryImpl import ru.fredboy.cavedroid.data.assets.internal.TextureRegionsAssetsRepositoryImpl -import ru.fredboy.cavedroid.domain.assets.repository.* +import ru.fredboy.cavedroid.data.assets.internal.TouchButtonsRepositoryImpl +import ru.fredboy.cavedroid.domain.assets.repository.BlockAssetsRepository +import ru.fredboy.cavedroid.domain.assets.repository.BlockDamageAssetsRepository +import ru.fredboy.cavedroid.domain.assets.repository.FontAssetsRepository +import ru.fredboy.cavedroid.domain.assets.repository.ItemsAssetsRepository +import ru.fredboy.cavedroid.domain.assets.repository.MobAssetsRepository +import ru.fredboy.cavedroid.domain.assets.repository.TextureRegionsAssetsRepository +import ru.fredboy.cavedroid.domain.assets.repository.TouchButtonsAssetsRepository @Module abstract class DataAssetsModule { @Binds internal abstract fun bindBlockDamageAssetsRepository( - impl: BlockDamageAssetsRepositoryImpl + impl: BlockDamageAssetsRepositoryImpl, ): BlockDamageAssetsRepository @Binds internal abstract fun bindMobAssetsRepository( - impl: MobAssetsRepositoryImpl + impl: MobAssetsRepositoryImpl, ): MobAssetsRepository @Binds internal abstract fun bindTextureRegionsAssetsRepository( - impl: TextureRegionsAssetsRepositoryImpl + impl: TextureRegionsAssetsRepositoryImpl, ): TextureRegionsAssetsRepository @Binds internal abstract fun bindFontAssetsRepository( - impl: FontAssetsRepositoryImpl + impl: FontAssetsRepositoryImpl, ): FontAssetsRepository @Binds internal abstract fun bindBlockAssetsRepository( - impl: BlockAssetsRepositoryImpl + impl: BlockAssetsRepositoryImpl, ): BlockAssetsRepository @Binds internal abstract fun bindItemsAssetsRepository( - impl: ItemsAssetsRepositoryImpl + impl: ItemsAssetsRepositoryImpl, ): ItemsAssetsRepository @Binds internal abstract fun bindTouchButtonsAssetsRepository( - impl: TouchButtonsRepositoryImpl + impl: TouchButtonsRepositoryImpl, ): TouchButtonsAssetsRepository - -} \ No newline at end of file +} 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 4bf0cab..87cd703 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 @@ -26,5 +26,4 @@ internal class BlockAssetsRepositoryImpl @Inject constructor() : BlockAssetsRepo companion object { private const val BLOCKS_TEXTURES_PATH = "textures/textures/blocks" } - -} \ No newline at end of file +} 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 f073ad3..37f8d96 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 @@ -1,10 +1,10 @@ package ru.fredboy.cavedroid.data.assets.internal import com.badlogic.gdx.graphics.g2d.Sprite -import ru.fredboy.cavedroid.domain.assets.repository.BlockDamageAssetsRepository import ru.fredboy.cavedroid.common.utils.BLOCK_SIZE_PX import ru.fredboy.cavedroid.common.utils.bl import ru.fredboy.cavedroid.common.utils.px +import ru.fredboy.cavedroid.domain.assets.repository.BlockDamageAssetsRepository import javax.inject.Inject import javax.inject.Singleton @@ -27,7 +27,7 @@ internal class BlockDamageAssetsRepositoryImpl @Inject constructor() : BlockDama x = index.px.toInt(), y = 0, width = blockSize, - height = blockSize + height = blockSize, ) } } @@ -48,5 +48,4 @@ internal class BlockDamageAssetsRepositoryImpl @Inject constructor() : BlockDama companion object { private const val BLOCK_DAMAGE_SHEET_PATH = "textures/break.png" } - -} \ No newline at end of file +} 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 c5e2eb3..4b071cf 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 @@ -45,4 +45,4 @@ internal class FontAssetsRepositoryImpl @Inject constructor() : FontAssetsReposi private const val FONT_FILE_PATH = "font.fnt" private const val FONT_SCALE = .375f } -} \ No newline at end of file +} 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 0a44ff6..b9c8d99 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 @@ -26,5 +26,4 @@ internal class ItemsAssetsRepositoryImpl @Inject constructor() : ItemsAssetsRepo companion object { private const val ITEMS_TEXTURES_PATH = "textures/textures/items" } - -} \ No newline at end of file +} 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 7947cbd..3090a8b 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 @@ -6,7 +6,7 @@ import javax.inject.Inject import javax.inject.Singleton @Singleton -internal class MobAssetsRepositoryImpl @Inject constructor(): MobAssetsRepository() { +internal class MobAssetsRepositoryImpl @Inject constructor() : MobAssetsRepository() { private var playerSprite: MobSprite.Player? = null @@ -59,5 +59,4 @@ internal class MobAssetsRepositoryImpl @Inject constructor(): MobAssetsRepositor private const val PLAYER_SPRITES_PATH = "textures/mobs/char" private const val PIG_SPRITES_PATH = "textures/mobs/pig" } - -} \ No newline at end of file +} 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 f479816..a05cc82 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 @@ -30,7 +30,7 @@ internal class TextureRegionsAssetsRepositoryImpl @Inject constructor() : Textur x = 0, y = 0, width = texture.width, - height = texture.height + height = texture.height, ) } else { fileData.forEach { (regionName, regionData) -> @@ -39,7 +39,7 @@ internal class TextureRegionsAssetsRepositoryImpl @Inject constructor() : Textur x = regionData.x, y = regionData.y, width = regionData.width ?: texture.width, - height = regionData.height ?: texture.height + height = regionData.height ?: texture.height, ) } } @@ -66,5 +66,4 @@ internal class TextureRegionsAssetsRepositoryImpl @Inject constructor() : Textur private const val JSON_TEXTURE_REGIONS = "json/texture_regions.json" } - } 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 14f6c2a..dc4363c 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 @@ -57,4 +57,4 @@ internal class TouchButtonsRepositoryImpl @Inject constructor() : TouchButtonsAs private const val JSON_TOUCH_BUTTONS = "json/touch_buttons.json" } -} \ No newline at end of file +} diff --git a/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/di/ApplicationContextModule.kt b/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/di/ApplicationContextModule.kt index aed8055..8d83e3d 100644 --- a/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/di/ApplicationContextModule.kt +++ b/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/di/ApplicationContextModule.kt @@ -10,4 +10,4 @@ abstract class ApplicationContextModule { @Binds internal abstract fun bindApplicationContextRepository(impl: ApplicationContextRepositoryImpl): ApplicationContextRepository -} \ No newline at end of file +} diff --git a/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/di/GameContextModule.kt b/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/di/GameContextModule.kt index 5a2a512..05606ca 100644 --- a/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/di/GameContextModule.kt +++ b/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/di/GameContextModule.kt @@ -10,4 +10,4 @@ abstract class GameContextModule { @Binds internal abstract fun bindGameContextRepository(impl: GameContextRepositoryImpl): GameContextRepository -} \ No newline at end of file +} diff --git a/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/model/GameContext.kt b/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/model/GameContext.kt index 888c2c9..2edef45 100644 --- a/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/model/GameContext.kt +++ b/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/model/GameContext.kt @@ -8,5 +8,5 @@ class GameContext( internal var showInfo: Boolean, internal var showMap: Boolean, internal var joystick: Joystick, - internal var cameraContext: CameraContext + internal var cameraContext: CameraContext, ) diff --git a/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/repository/ApplicationContextRepositoryImpl.kt b/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/repository/ApplicationContextRepositoryImpl.kt index 1d98372..83f87d3 100644 --- a/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/repository/ApplicationContextRepositoryImpl.kt +++ b/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/repository/ApplicationContextRepositoryImpl.kt @@ -1,6 +1,5 @@ package ru.fredboy.cavedroid.data.configuration.repository -import com.badlogic.gdx.Application import com.badlogic.gdx.Gdx import ru.fredboy.cavedroid.data.configuration.store.ApplicationContextStore import ru.fredboy.cavedroid.domain.configuration.repository.ApplicationContextRepository @@ -36,7 +35,7 @@ class ApplicationContextRepositoryImpl @Inject constructor( } if (fullscreen) { - Gdx.graphics.setFullscreenMode(Gdx.graphics.displayMode); + Gdx.graphics.setFullscreenMode(Gdx.graphics.displayMode) } else { Gdx.graphics.setWindowedMode(960, 540) setWidth(Gdx.graphics.width.toFloat() / 2) @@ -60,4 +59,4 @@ class ApplicationContextRepositoryImpl @Inject constructor( override fun setHeight(height: Float) { applicationContextStore.height = height } -} \ No newline at end of file +} diff --git a/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/repository/GameContextRepositoryImpl.kt b/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/repository/GameContextRepositoryImpl.kt index 5d59cbf..bf2f949 100644 --- a/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/repository/GameContextRepositoryImpl.kt +++ b/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/repository/GameContextRepositoryImpl.kt @@ -9,7 +9,7 @@ import javax.inject.Inject @GameScope class GameContextRepositoryImpl @Inject constructor( - private val gameContextStore: GameContextStore + private val gameContextStore: GameContextStore, ) : GameContextRepository { override fun isLoadGame(): Boolean = gameContextStore.isLoadGame diff --git a/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/store/ApplicationContextStore.kt b/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/store/ApplicationContextStore.kt index 7c56fde..218dc6c 100644 --- a/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/store/ApplicationContextStore.kt +++ b/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/store/ApplicationContextStore.kt @@ -46,9 +46,8 @@ class ApplicationContextStore @Inject constructor( get() = synchronized(lock) { applicationContext.height } set(value) = synchronized(lock) { applicationContext.height = value } - private companion object { private const val KEY_FULLSCREEN_PREF = "fullscreen" private const val KEY_DYNAMIC_CAMERA_PREF = "dyncam" } -} \ No newline at end of file +} diff --git a/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/store/GameContextStore.kt b/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/store/GameContextStore.kt index adaedde..21d7638 100644 --- a/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/store/GameContextStore.kt +++ b/core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/store/GameContextStore.kt @@ -2,13 +2,13 @@ package ru.fredboy.cavedroid.data.configuration.store import ru.fredboy.cavedroid.common.di.GameScope import ru.fredboy.cavedroid.common.model.Joystick -import ru.fredboy.cavedroid.domain.configuration.model.CameraContext import ru.fredboy.cavedroid.data.configuration.model.GameContext +import ru.fredboy.cavedroid.domain.configuration.model.CameraContext import javax.inject.Inject @GameScope class GameContextStore @Inject constructor( - private val gameContext: GameContext + private val gameContext: GameContext, ) { private val lock = Any() diff --git a/core/data/items/src/main/kotlin/ru/fredboy/cavedroid/data/items/di/DataItemsModule.kt b/core/data/items/src/main/kotlin/ru/fredboy/cavedroid/data/items/di/DataItemsModule.kt index 7289613..2af776a 100644 --- a/core/data/items/src/main/kotlin/ru/fredboy/cavedroid/data/items/di/DataItemsModule.kt +++ b/core/data/items/src/main/kotlin/ru/fredboy/cavedroid/data/items/di/DataItemsModule.kt @@ -10,5 +10,4 @@ abstract class DataItemsModule { @Binds internal abstract fun bindItemsRepository(impl: ItemsRepositoryImpl): ItemsRepository - } 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 27012eb..ab791b0 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 @@ -4,8 +4,18 @@ import com.badlogic.gdx.graphics.Texture import ru.fredboy.cavedroid.data.items.model.BlockDto import ru.fredboy.cavedroid.data.items.repository.ItemsRepositoryImpl import ru.fredboy.cavedroid.domain.assets.usecase.GetBlockTextureUseCase -import ru.fredboy.cavedroid.domain.items.model.block.* -import ru.fredboy.cavedroid.domain.items.model.block.Block.* +import ru.fredboy.cavedroid.domain.items.model.block.Block +import ru.fredboy.cavedroid.domain.items.model.block.Block.Chest +import ru.fredboy.cavedroid.domain.items.model.block.Block.Furnace +import ru.fredboy.cavedroid.domain.items.model.block.Block.Lava +import ru.fredboy.cavedroid.domain.items.model.block.Block.None +import ru.fredboy.cavedroid.domain.items.model.block.Block.Normal +import ru.fredboy.cavedroid.domain.items.model.block.Block.Slab +import ru.fredboy.cavedroid.domain.items.model.block.Block.Water +import ru.fredboy.cavedroid.domain.items.model.block.BlockAnimationInfo +import ru.fredboy.cavedroid.domain.items.model.block.BlockDropInfo +import ru.fredboy.cavedroid.domain.items.model.block.BlockMargins +import ru.fredboy.cavedroid.domain.items.model.block.CommonBlockParams import ru.fredboy.cavedroid.domain.items.model.item.Item import javax.inject.Inject import javax.inject.Singleton @@ -36,7 +46,7 @@ class BlockMapper @Inject constructor( left = dto.left, top = dto.top, right = dto.right, - bottom = dto.bottom + bottom = dto.bottom, ), hitPoints = dto.hp, dropInfo = mapBlockDropInfo(dto), @@ -61,7 +71,7 @@ class BlockMapper @Inject constructor( } private fun mapToolType(dto: BlockDto): Class? { - return when(dto.toolType) { + return when (dto.toolType) { "shovel" -> Item.Shovel::class.java "sword" -> Item.Sword::class.java "pickaxe" -> Item.Pickaxe::class.java @@ -103,5 +113,4 @@ class BlockMapper @Inject constructor( return getBlockTexture[textureName] } - -} \ No newline at end of file +} 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 c1849de..eb8ddc2 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 @@ -9,7 +9,6 @@ import ru.fredboy.cavedroid.domain.assets.usecase.GetItemTextureUseCase import ru.fredboy.cavedroid.domain.items.model.block.Block import ru.fredboy.cavedroid.domain.items.model.item.CommonItemParams import ru.fredboy.cavedroid.domain.items.model.item.Item -import ru.fredboy.cavedroid.domain.items.model.item.Item.* import javax.inject.Inject import javax.inject.Singleton @@ -22,76 +21,76 @@ class ItemMapper @Inject constructor( val params = mapCommonParams(key, dto) return when (dto.type) { - "normal" -> Normal( + "normal" -> Item.Normal( params = params, - sprite = requireNotNull(loadSprite(dto)) + sprite = requireNotNull(loadSprite(dto)), ) - "usable" -> Usable( + "usable" -> Item.Usable( params = params, sprite = requireNotNull(loadSprite(dto)), - useActionKey = requireNotNull(dto.actionKey) + useActionKey = requireNotNull(dto.actionKey), ) - "shovel" -> Shovel( + "shovel" -> Item.Shovel( params = params, sprite = requireNotNull(loadSprite(dto)), mobDamageMultiplier = dto.mobDamageMultiplier, blockDamageMultiplier = dto.blockDamageMultiplier, - level = requireNotNull(dto.toolLevel) + level = requireNotNull(dto.toolLevel), ) - "sword" -> Sword( + "sword" -> Item.Sword( params = params, sprite = requireNotNull(loadSprite(dto)), mobDamageMultiplier = dto.mobDamageMultiplier, blockDamageMultiplier = dto.blockDamageMultiplier, - level = requireNotNull(dto.toolLevel) + level = requireNotNull(dto.toolLevel), ) - "pickaxe" -> Pickaxe( + "pickaxe" -> Item.Pickaxe( params = params, sprite = requireNotNull(loadSprite(dto)), mobDamageMultiplier = dto.mobDamageMultiplier, blockDamageMultiplier = dto.blockDamageMultiplier, - level = requireNotNull(dto.toolLevel) + level = requireNotNull(dto.toolLevel), ) - "axe" -> Axe( + "axe" -> Item.Axe( params = params, sprite = requireNotNull(loadSprite(dto)), mobDamageMultiplier = dto.mobDamageMultiplier, blockDamageMultiplier = dto.blockDamageMultiplier, - level = requireNotNull(dto.toolLevel) + level = requireNotNull(dto.toolLevel), ) - "shears" -> Shears( + "shears" -> Item.Shears( params = params, sprite = requireNotNull(loadSprite(dto)), mobDamageMultiplier = dto.mobDamageMultiplier, blockDamageMultiplier = dto.blockDamageMultiplier, - level = requireNotNull(dto.toolLevel) + level = requireNotNull(dto.toolLevel), ) - "block" -> Block( + "block" -> Item.Block( params = params, - block = requireNotNull(block) + block = requireNotNull(block), ) - "slab" -> Slab( + "slab" -> Item.Slab( params = params, topPartBlock = requireNotNull(slabTopBlock), - bottomPartBlock = requireNotNull(slabBottomBlock) + bottomPartBlock = requireNotNull(slabBottomBlock), ) - "food" -> Food( + "food" -> Item.Food( params = params, sprite = requireNotNull(loadSprite(dto)), - heal = requireNotNull(dto.heal) + heal = requireNotNull(dto.heal), ) - "none" -> None( - params = params + "none" -> Item.None( + params = params, ) else -> throw IllegalArgumentException("Unknown item type ${dto.type}") @@ -126,5 +125,4 @@ class ItemMapper @Inject constructor( } } } - -} \ No newline at end of file +} diff --git a/core/data/items/src/main/kotlin/ru/fredboy/cavedroid/data/items/model/GameItemsDto.kt b/core/data/items/src/main/kotlin/ru/fredboy/cavedroid/data/items/model/GameItemsDto.kt index 450c716..5dab153 100644 --- a/core/data/items/src/main/kotlin/ru/fredboy/cavedroid/data/items/model/GameItemsDto.kt +++ b/core/data/items/src/main/kotlin/ru/fredboy/cavedroid/data/items/model/GameItemsDto.kt @@ -7,4 +7,4 @@ import kotlinx.serialization.Serializable data class GameItemsDto( @SerialName("blocks") val blocks: Map, @SerialName("items") val items: Map, -) \ No newline at end of file +) 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 3560265..ffdb531 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 @@ -63,7 +63,7 @@ internal class ItemsRepositoryImpl @Inject constructor( dto = dto, block = blocksMap[key], slabTopBlock = blocksMap[dto.topSlabBlock] as? Block.Slab, - slabBottomBlock = blocksMap[dto.bottomSlabBlock] as? Block.Slab + slabBottomBlock = blocksMap[dto.bottomSlabBlock] as? Block.Slab, ) } catch (e: Exception) { Gdx.app.error(TAG, "Failed to map item $key. Reason: ${e.message}") @@ -86,7 +86,7 @@ internal class ItemsRepositoryImpl @Inject constructor( jsonMap.forEach { (key, value) -> craftingRecipes += CraftingRecipe( input = value.input.map(::Regex), - output = CraftingResult(getItemByKey(key), value.count) + output = CraftingResult(getItemByKey(key), value.count), ) } } @@ -183,5 +183,4 @@ internal class ItemsRepositoryImpl @Inject constructor( const val FALLBACK_BLOCK_KEY = "none" const val FALLBACK_ITEM_KEY = "none" } - -} \ No newline at end of file +} diff --git a/core/data/menu/src/main/kotlin/ru/fredboy/cavedroid/data/menu/di/DataMenuModule.kt b/core/data/menu/src/main/kotlin/ru/fredboy/cavedroid/data/menu/di/DataMenuModule.kt index 621edeb..29e3e29 100644 --- a/core/data/menu/src/main/kotlin/ru/fredboy/cavedroid/data/menu/di/DataMenuModule.kt +++ b/core/data/menu/src/main/kotlin/ru/fredboy/cavedroid/data/menu/di/DataMenuModule.kt @@ -10,5 +10,4 @@ abstract class DataMenuModule { @Binds internal abstract fun bindMenuButtonsRepository(impl: MenuButtonRepositoryImpl): MenuButtonRepository - } 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 9bafcc9..5a7eb06 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 @@ -7,7 +7,6 @@ import ru.fredboy.cavedroid.data.menu.model.MenuButtonDto import ru.fredboy.cavedroid.data.menu.model.MenuButtonVisibilityDto import ru.fredboy.cavedroid.domain.menu.model.MenuButton import javax.inject.Inject -import javax.inject.Singleton @MenuScope class MenuButtonMapper @Inject constructor() { @@ -49,4 +48,4 @@ class MenuButtonMapper @Inject constructor() { else -> dto.desktop } } -} \ No newline at end of file +} diff --git a/core/data/menu/src/main/kotlin/ru/fredboy/cavedroid/data/menu/repository/MenuButtonRepositoryImpl.kt b/core/data/menu/src/main/kotlin/ru/fredboy/cavedroid/data/menu/repository/MenuButtonRepositoryImpl.kt index 81b8a98..2b3d94b 100644 --- a/core/data/menu/src/main/kotlin/ru/fredboy/cavedroid/data/menu/repository/MenuButtonRepositoryImpl.kt +++ b/core/data/menu/src/main/kotlin/ru/fredboy/cavedroid/data/menu/repository/MenuButtonRepositoryImpl.kt @@ -84,5 +84,4 @@ class MenuButtonRepositoryImpl @Inject constructor( private val JsonFormat = Json { ignoreUnknownKeys = true } } - -} \ No newline at end of file +} diff --git a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/di/DataSaveModule.kt b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/di/DataSaveModule.kt index cc68d6f..e725055 100644 --- a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/di/DataSaveModule.kt +++ b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/di/DataSaveModule.kt @@ -10,5 +10,4 @@ abstract class DataSaveModule { @Binds internal abstract fun bindSaveDataRepository(impl: SaveDataRepositoryImpl): SaveDataRepository - } 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 ee22ec8..68187b5 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 @@ -16,7 +16,7 @@ class ChestMapper @Inject constructor( return SaveDataDto.ChestSaveDataDto( version = SAVE_DATA_VERSION, size = chest.size, - items = chest.items.map(inventoryItemMapper::mapSaveData) + items = chest.items.map(inventoryItemMapper::mapSaveData), ) } @@ -25,11 +25,11 @@ class ChestMapper @Inject constructor( return Chest( fallbackItem = getFallbackItemUseCase(), - initialItems = saveDataDto.items.map(inventoryItemMapper::mapInventoryItem) + initialItems = saveDataDto.items.map(inventoryItemMapper::mapInventoryItem), ) } companion object { private const val SAVE_DATA_VERSION = 3 } -} \ No newline at end of file +} 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 b9dd15c..91648c7 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 @@ -28,7 +28,7 @@ class ContainerControllerMapper @Inject constructor( is Chest -> chestMapper.mapSaveData(container) else -> null }?.let { value -> key.toString() to value } - }.toMap() + }.toMap(), ) } @@ -44,7 +44,7 @@ class ContainerControllerMapper @Inject constructor( getItemByKeyUseCase = getItemByKeyUseCase, containerWorldAdapter = containerWorldAdapter, containerFactory = containerFactory, - dropAdapter = dropAdapter + dropAdapter = dropAdapter, ).apply { saveDataDto.containerMap.forEach { (key, value) -> val container = when (value) { @@ -63,4 +63,4 @@ class ContainerControllerMapper @Inject constructor( companion object { private const val SAVE_DATA_VERSION = 3 } -} \ No newline at end of file +} 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 e8607dc..6875b1e 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 @@ -15,7 +15,7 @@ class ControlModeMapper @Inject constructor() { value = when (direction) { Player.ControlMode.WALK -> 0 Player.ControlMode.CURSOR -> 1 - } + }, ) } @@ -36,4 +36,4 @@ class ControlModeMapper @Inject constructor() { private const val TAG = "ControlModeMapper" private const val SAVE_DATA_VERSION = 3 } -} \ No newline at end of file +} 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 8a0cc5d..684f513 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 @@ -15,7 +15,7 @@ class DirectionMapper @Inject constructor() { value = when (direction) { Direction.LEFT -> 0 Direction.RIGHT -> 1 - } + }, ) } @@ -36,4 +36,4 @@ class DirectionMapper @Inject constructor() { private const val TAG = "DirectionMapper" private const val SAVE_DATA_VERSION = 3 } -} \ No newline at end of file +} 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 e6a5125..48c3d01 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 @@ -10,13 +10,13 @@ import javax.inject.Inject @Reusable class DropControllerMapper @Inject constructor( private val dropMapper: DropMapper, - private val itemsRepository: ItemsRepository + private val itemsRepository: ItemsRepository, ) { fun mapSaveData(dropController: DropController): SaveDataDto.DropControllerSaveDataDto { return SaveDataDto.DropControllerSaveDataDto( version = SAVE_DATA_VERSION, - drops = dropController.getAllDrop().map(dropMapper::mapSaveData) + drops = dropController.getAllDrop().map(dropMapper::mapSaveData), ) } @@ -36,5 +36,4 @@ class DropControllerMapper @Inject constructor( companion object { private const val SAVE_DATA_VERSION = 3 } - -} \ No newline at end of file +} 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 df90da2..991067f 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 @@ -22,7 +22,7 @@ class DropMapper @Inject constructor( velocityY = drop.velocity.y, itemKey = drop.item.params.key, amount = drop.amount, - pickedUp = drop.isPickedUp + pickedUp = drop.isPickedUp, ) } @@ -33,7 +33,7 @@ class DropMapper @Inject constructor( x = saveDataDto.x, y = saveDataDto.y, item = getItemByKeyUseCase[saveDataDto.itemKey], - amount = saveDataDto.amount + amount = saveDataDto.amount, ).apply { width = saveDataDto.width height = saveDataDto.height @@ -46,5 +46,4 @@ class DropMapper @Inject constructor( companion object { private const val SAVE_DATA_VERSION = 3 } - -} \ No newline at end of file +} 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 21c43e6..f619580 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 @@ -20,7 +20,7 @@ class FallingBlockMapper @Inject constructor( y = fallingBlock.y, width = fallingBlock.width, height = fallingBlock.height, - velocityX = fallingBlock.velocity.x, + velocityX = fallingBlock.velocity.x, velocityY = fallingBlock.velocity.y, animDelta = fallingBlock.animDelta, anim = fallingBlock.anim, @@ -59,4 +59,4 @@ class FallingBlockMapper @Inject constructor( companion object { private const val SAVE_DATA_VERSION = 3 } -} \ No newline at end of file +} 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 f5c2b82..4b7f0e0 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 @@ -45,4 +45,4 @@ class FurnaceMapper @Inject constructor( companion object { private const val SAVE_DATA_VERSION = 3 } -} \ No newline at end of file +} 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 3fa2ac0..9976077 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 @@ -15,7 +15,7 @@ class InventoryItemMapper @Inject constructor( return SaveDataDto.InventoryItemSaveDataDto( version = SAVE_DATA_VERSION, itemKey = inventoryItem.item.params.key, - amount = inventoryItem.amount + amount = inventoryItem.amount, ) } @@ -31,4 +31,4 @@ class InventoryItemMapper @Inject constructor( companion object { private const val SAVE_DATA_VERSION = 3 } -} \ No newline at end of file +} 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 a90b032..6f34019 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 @@ -16,7 +16,7 @@ class InventoryMapper @Inject constructor( return SaveDataDto.InventorySaveDataDto( version = SAVE_DATA_VERSION, size = inventory.size, - items = inventory.items.map(inventoryItemMapper::mapSaveData) + items = inventory.items.map(inventoryItemMapper::mapSaveData), ) } @@ -26,11 +26,11 @@ class InventoryMapper @Inject constructor( return Inventory( size = saveDataDto.size, fallbackItem = getFallbackItem(), - initialItems = saveDataDto.items.map(inventoryItemMapper::mapInventoryItem) + initialItems = saveDataDto.items.map(inventoryItemMapper::mapInventoryItem), ) } companion object { private const val SAVE_DATA_VERSION = 3 } -} \ No newline at end of file +} 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 4f838f3..f9fe23c 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 @@ -29,7 +29,7 @@ class MobControllerMapper @Inject constructor( else -> null } }, - player = playerMapper.mapSaveData(mobController.player) + player = playerMapper.mapSaveData(mobController.player), ) } @@ -44,13 +44,15 @@ class MobControllerMapper @Inject constructor( getFallbackItemUseCase = getFallbackItemUseCase, mobWorldAdapter = mobWorldAdapter, ).apply { - (mobs as MutableList).addAll(saveDataDto.mobs.mapNotNull { mob -> - when (mob) { - is SaveDataDto.PigSaveDataDto -> pigMapper.mapPig(mob) - is SaveDataDto.FallingBlockSaveDataDto -> fallingBlockMapper.mapFallingBlock(mob) - else -> null - } - }) + (mobs as MutableList).addAll( + saveDataDto.mobs.mapNotNull { mob -> + when (mob) { + is SaveDataDto.PigSaveDataDto -> pigMapper.mapPig(mob) + is SaveDataDto.FallingBlockSaveDataDto -> fallingBlockMapper.mapFallingBlock(mob) + else -> null + } + }, + ) player = playerMapper.mapPlayer(saveDataDto.player) } @@ -59,4 +61,4 @@ class MobControllerMapper @Inject constructor( companion object { private const val SAVE_DATA_VERSION = 3 } -} \ No newline at end of file +} 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 415262c..b51bb62 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 @@ -10,7 +10,7 @@ import javax.inject.Inject @Reusable class PigMapper @Inject constructor( private val directionMapper: DirectionMapper, - private val getPigSpriteUseCase: GetPigSpritesUseCase + private val getPigSpriteUseCase: GetPigSpritesUseCase, ) { fun mapSaveData(pig: Pig): SaveDataDto.PigSaveDataDto { @@ -20,7 +20,7 @@ class PigMapper @Inject constructor( y = pig.y, width = pig.width, height = pig.height, - velocityX = pig.velocity.x, + velocityX = pig.velocity.x, velocityY = pig.velocity.y, animDelta = pig.animDelta, anim = pig.anim, @@ -29,7 +29,7 @@ class PigMapper @Inject constructor( canJump = pig.canJump, flyMode = pig.isFlyMode, maxHealth = pig.maxHealth, - health = pig.health + health = pig.health, ) } @@ -58,4 +58,4 @@ class PigMapper @Inject constructor( companion object { private const val SAVE_DATA_VERSION = 3 } -} \ No newline at end of file +} 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 95ff279..1dab7a8 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 @@ -25,7 +25,7 @@ class PlayerMapper @Inject constructor( y = player.y, width = player.width, height = player.height, - velocityX = player.velocity.x, + velocityX = player.velocity.x, velocityY = player.velocity.y, animDelta = player.animDelta, anim = player.anim, @@ -61,7 +61,7 @@ class PlayerMapper @Inject constructor( getFallbackItem = getFallbackItemUseCase, x = saveDataDto.x, y = saveDataDto.y, - behavior = PlayerMobBehavior() + behavior = PlayerMobBehavior(), ).apply { width = saveDataDto.width height = saveDataDto.height @@ -93,4 +93,4 @@ class PlayerMapper @Inject constructor( companion object { private const val SAVE_DATA_VERSION = 3 } -} \ No newline at end of file +} diff --git a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/model/SaveDataDto.kt b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/model/SaveDataDto.kt index dcd2026..6305b50 100644 --- a/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/model/SaveDataDto.kt +++ b/core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/model/SaveDataDto.kt @@ -84,7 +84,7 @@ sealed class SaveDataDto { data class ChestSaveDataDto( override val version: Int, override val size: Int, - override val items: List + override val items: List, ) : ContainerSaveDataDto() @Serializable @@ -104,13 +104,13 @@ sealed class SaveDataDto { override val velocityY: Float, val itemKey: String, val amount: Int, - val pickedUp: Boolean + val pickedUp: Boolean, ) : RectangleObjectSaveDataDto() @Serializable data class DropControllerSaveDataDto( override val version: Int, - val drops: List + val drops: List, ) : SaveDataDto() @Serializable @@ -192,5 +192,4 @@ sealed class SaveDataDto { val mobs: List<@Contextual MobSaveDataDto>, val player: PlayerSaveDataDto, ) : SaveDataDto() - -} \ No newline at end of file +} 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 426af58..4cd33b7 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 @@ -48,7 +48,7 @@ internal class SaveDataRepositoryImpl @Inject constructor( private fun buildBlocksDictionary( foreMap: Array>, - backMap: Array> + backMap: Array>, ): Map { val maps = sequenceOf(foreMap.asSequence(), backMap.asSequence()) @@ -68,7 +68,6 @@ internal class SaveDataRepositoryImpl @Inject constructor( file.writeBytes(result, false) } - private fun compressMap(map: Array>, dict: Map): ByteArray { if (dict.size > 0xff) { throw IllegalArgumentException("Cannot save this map as bytes") @@ -147,9 +146,8 @@ internal class SaveDataRepositoryImpl @Inject constructor( } } - private fun internalLoadMap( - savesPath: String + savesPath: String, ): Pair>, Array>> { val dict = Gdx.files.absolute("$savesPath$DICT_FILE").readString().split("\n") @@ -192,7 +190,7 @@ internal class SaveDataRepositoryImpl @Inject constructor( dropController: DropController, mobController: MobController, containerController: ContainerController, - gameWorld: GameWorld + gameWorld: GameWorld, ) { val savesPath = "$gameDataFolder$SAVES_DIR" @@ -224,20 +222,20 @@ internal class SaveDataRepositoryImpl @Inject constructor( gameDataFolder: String, containerWorldAdapter: ContainerWorldAdapter, containerFactory: ContainerFactory, - dropAdapter: DropAdapter + dropAdapter: DropAdapter, ): ContainerController { val savesPath = "$gameDataFolder$SAVES_DIR" val containersFile = Gdx.files.absolute("$savesPath$CONTAINERS_FILE") val containersBytes = containersFile.readBytes() return ProtoBuf.decodeFromByteArray( - containersBytes + containersBytes, ).let { saveData -> containerControllerMapper.mapContainerController( saveDataDto = saveData, containerWorldAdapter = containerWorldAdapter, containerFactory = containerFactory, - dropAdapter = dropAdapter + dropAdapter = dropAdapter, ) } } @@ -251,7 +249,7 @@ internal class SaveDataRepositoryImpl @Inject constructor( .let { saveData -> dropControllerMapper.mapDropController( saveDataDto = saveData, - dropWorldAdapter = dropWorldAdapter + dropWorldAdapter = dropWorldAdapter, ) } } @@ -265,7 +263,7 @@ internal class SaveDataRepositoryImpl @Inject constructor( .let { saveData -> mobControllerMapper.mapMobController( saveDataDto = saveData, - mobWorldAdapter = mobWorldAdapter + mobWorldAdapter = mobWorldAdapter, ) } } @@ -274,11 +272,11 @@ internal class SaveDataRepositoryImpl @Inject constructor( val savesPath = "$gameDataFolder$SAVES_DIR" return Gdx.files.absolute("$savesPath$DROP_FILE").exists() && - Gdx.files.absolute("$savesPath$MOBS_FILE").exists() && - Gdx.files.absolute("$savesPath$CONTAINERS_FILE").exists() && - Gdx.files.absolute("$savesPath$DICT_FILE").exists() && - Gdx.files.absolute("$savesPath$FOREMAP_FILE").exists() && - Gdx.files.absolute("$savesPath$BACKMAP_FILE").exists() + Gdx.files.absolute("$savesPath$MOBS_FILE").exists() && + Gdx.files.absolute("$savesPath$CONTAINERS_FILE").exists() && + Gdx.files.absolute("$savesPath$DICT_FILE").exists() && + Gdx.files.absolute("$savesPath$FOREMAP_FILE").exists() && + Gdx.files.absolute("$savesPath$BACKMAP_FILE").exists() } companion object { @@ -292,4 +290,4 @@ internal class SaveDataRepositoryImpl @Inject constructor( private const val FOREMAP_FILE = "/foremap.dat.gz" private const val BACKMAP_FILE = "/backmap.dat.gz" } -} \ No newline at end of file +} 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 0149137..9c50e6f 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 @@ -7,7 +7,14 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion import dagger.Reusable import ru.fredboy.cavedroid.domain.assets.model.MobSprite import ru.fredboy.cavedroid.domain.assets.model.TouchButton -import ru.fredboy.cavedroid.domain.assets.repository.* +import ru.fredboy.cavedroid.domain.assets.repository.AssetsRepository +import ru.fredboy.cavedroid.domain.assets.repository.BlockAssetsRepository +import ru.fredboy.cavedroid.domain.assets.repository.BlockDamageAssetsRepository +import ru.fredboy.cavedroid.domain.assets.repository.FontAssetsRepository +import ru.fredboy.cavedroid.domain.assets.repository.ItemsAssetsRepository +import ru.fredboy.cavedroid.domain.assets.repository.MobAssetsRepository +import ru.fredboy.cavedroid.domain.assets.repository.TextureRegionsAssetsRepository +import ru.fredboy.cavedroid.domain.assets.repository.TouchButtonsAssetsRepository import javax.inject.Inject @Reusable @@ -18,7 +25,7 @@ class GameAssetsHolder @Inject constructor( private val itemsAssetsRepository: ItemsAssetsRepository, private val mobAssetsRepository: MobAssetsRepository, private val textureRegionsAssetsRepository: TextureRegionsAssetsRepository, - private val touchButtonsAssetsRepository: TouchButtonsAssetsRepository + private val touchButtonsAssetsRepository: TouchButtonsAssetsRepository, ) { private val repositories = sequenceOf( @@ -28,7 +35,7 @@ class GameAssetsHolder @Inject constructor( itemsAssetsRepository, mobAssetsRepository, textureRegionsAssetsRepository, - touchButtonsAssetsRepository + touchButtonsAssetsRepository, ) fun initializeRepository() { @@ -82,5 +89,4 @@ class GameAssetsHolder @Inject constructor( fun getTextureRegionByName(name: String): TextureRegion? { return textureRegionsAssetsRepository.getTextureRegionByName(name) } - } diff --git a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/model/MobSprite.kt b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/model/MobSprite.kt index 120b90a..8805db4 100644 --- a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/model/MobSprite.kt +++ b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/model/MobSprite.kt @@ -19,7 +19,7 @@ sealed interface MobSprite { data class Pig( val headAndBody: Sprite, - val leg: Sprite + val leg: Sprite, ) : MobSprite { fun getLeftLegRelativeX(directionIndex: Int) = 9 - directionIndex * 9 @@ -27,7 +27,5 @@ sealed interface MobSprite { fun getRightLegRelativeX(directionIndex: Int) = 21 - (9 * directionIndex) fun getLegsRelativeY() = 12 - } - -} \ No newline at end of file +} diff --git a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/model/TouchButton.kt b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/model/TouchButton.kt index a934314..5b1d1eb 100644 --- a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/model/TouchButton.kt +++ b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/model/TouchButton.kt @@ -5,5 +5,5 @@ import com.badlogic.gdx.math.Rectangle data class TouchButton( val rectangle: Rectangle, val code: Int, - val isMouse: Boolean + val isMouse: Boolean, ) 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 b797aed..520a165 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 @@ -22,13 +22,13 @@ abstract class AssetsRepository : Disposable { x: Int, y: Int, width: Int, - height: Int + height: Int, ): TextureRegion { return TextureRegion(texture, x, y + height, width, -height) } protected fun flippedSprite( - texture: Texture + texture: Texture, ): Sprite { return Sprite(texture).apply { flip(false, true) } } @@ -38,7 +38,7 @@ abstract class AssetsRepository : Disposable { x: Int, y: Int, width: Int, - height: Int + height: Int, ): Sprite { return Sprite(flippedRegion(texture, x, y, width, height)) } @@ -46,7 +46,7 @@ abstract class AssetsRepository : Disposable { protected fun resolveTexture( textureName: String, lookupPath: String, - cache: MutableMap + cache: MutableMap, ): Texture { val cached = cache[textureName] @@ -66,5 +66,4 @@ abstract class AssetsRepository : Disposable { } abstract fun initialize() - } diff --git a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/BlockAssetsRepository.kt b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/BlockAssetsRepository.kt index 035dd4f..153a05a 100644 --- a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/BlockAssetsRepository.kt +++ b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/BlockAssetsRepository.kt @@ -5,5 +5,4 @@ import com.badlogic.gdx.graphics.Texture abstract class BlockAssetsRepository : AssetsRepository() { abstract fun getBlockTexture(textureName: String): Texture - -} \ No newline at end of file +} diff --git a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/BlockDamageAssetsRepository.kt b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/BlockDamageAssetsRepository.kt index dfae46b..82c6669 100644 --- a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/BlockDamageAssetsRepository.kt +++ b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/BlockDamageAssetsRepository.kt @@ -7,5 +7,4 @@ abstract class BlockDamageAssetsRepository : AssetsRepository() { abstract val damageStages: Int abstract fun getBlockDamageSprite(stage: Int): Sprite - } diff --git a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/FontAssetsRepository.kt b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/FontAssetsRepository.kt index 939a260..0b70687 100644 --- a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/FontAssetsRepository.kt +++ b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/FontAssetsRepository.kt @@ -9,4 +9,4 @@ abstract class FontAssetsRepository : AssetsRepository() { abstract fun getStringHeight(string: String): Float abstract fun getFont(): BitmapFont -} \ No newline at end of file +} diff --git a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/ItemsAssetsRepository.kt b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/ItemsAssetsRepository.kt index 66720f0..5a98779 100644 --- a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/ItemsAssetsRepository.kt +++ b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/ItemsAssetsRepository.kt @@ -5,5 +5,4 @@ import com.badlogic.gdx.graphics.Texture abstract class ItemsAssetsRepository : AssetsRepository() { abstract fun getItemTexture(textureName: String): Texture - } diff --git a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/MobAssetsRepository.kt b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/MobAssetsRepository.kt index 85c5ca8..ecc8d52 100644 --- a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/MobAssetsRepository.kt +++ b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/MobAssetsRepository.kt @@ -7,5 +7,4 @@ abstract class MobAssetsRepository : AssetsRepository() { abstract fun getPlayerSprites(): MobSprite.Player abstract fun getPigSprites(): MobSprite.Pig - -} \ No newline at end of file +} diff --git a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/TextureRegionsAssetsRepository.kt b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/TextureRegionsAssetsRepository.kt index c84d0ba..a26c8fa 100644 --- a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/TextureRegionsAssetsRepository.kt +++ b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/TextureRegionsAssetsRepository.kt @@ -5,5 +5,4 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion abstract class TextureRegionsAssetsRepository : AssetsRepository() { abstract fun getTextureRegionByName(name: String): TextureRegion? - } diff --git a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/TouchButtonsAssetsRepository.kt b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/TouchButtonsAssetsRepository.kt index 07c486b..ebf6373 100644 --- a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/TouchButtonsAssetsRepository.kt +++ b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/TouchButtonsAssetsRepository.kt @@ -5,5 +5,4 @@ import ru.fredboy.cavedroid.domain.assets.model.TouchButton abstract class TouchButtonsAssetsRepository : AssetsRepository() { abstract fun getTouchButtons(): Map - -} \ No newline at end of file +} diff --git a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/DisposeAssetsUseCase.kt b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/DisposeAssetsUseCase.kt index 58e152c..e4fd256 100644 --- a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/DisposeAssetsUseCase.kt +++ b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/DisposeAssetsUseCase.kt @@ -6,11 +6,10 @@ import javax.inject.Inject @Reusable class DisposeAssetsUseCase @Inject constructor( - private val gameAssetsHolder: GameAssetsHolder + private val gameAssetsHolder: GameAssetsHolder, ) { operator fun invoke() { gameAssetsHolder.dispose() } - -} \ No newline at end of file +} 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 089c863..6a69980 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 @@ -12,5 +12,4 @@ class GetBlockDamageFrameCountUseCase @Inject constructor( operator fun invoke(): Int { return 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 5fb52e5..4883a55 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 @@ -13,5 +13,4 @@ class GetBlockDamageSpriteUseCase @Inject constructor( operator fun get(stage: Int): Sprite { return 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 d2c07bd..59c8a53 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 @@ -7,11 +7,10 @@ import javax.inject.Inject @Reusable class GetBlockTextureUseCase @Inject constructor( - private val gameAssetsHolder: GameAssetsHolder + private val gameAssetsHolder: GameAssetsHolder, ) { operator fun get(name: String): Texture { return gameAssetsHolder.getBlockTexture(name) } - -} \ No newline at end of file +} 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 032de5e..be33e6b 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 @@ -13,5 +13,4 @@ class GetFontUseCase @Inject constructor( operator fun invoke(): BitmapFont { return 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 84bfa2c..aab1077 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 @@ -7,11 +7,10 @@ import javax.inject.Inject @Reusable class GetItemTextureUseCase @Inject constructor( - private val gameAssetsHolder: GameAssetsHolder + private val gameAssetsHolder: GameAssetsHolder, ) { operator fun get(name: String): Texture { return gameAssetsHolder.getItemTexture(name) } - -} \ No newline at end of file +} 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 e38c6a8..aea4525 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 @@ -13,5 +13,4 @@ class GetPigSpritesUseCase @Inject constructor( operator fun invoke(): MobSprite.Pig { return 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 183ee48..42ea98c 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 @@ -13,5 +13,4 @@ class GetPlayerSpritesUseCase @Inject constructor( operator fun invoke(): MobSprite.Player { return 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 0c203e2..6f2cb5c 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 @@ -12,5 +12,4 @@ class GetStringHeightUseCase @Inject constructor( operator fun invoke(string: String): Float { return gameAssetsHolder.getStringHeight(string) } - -} \ No newline at end of file +} 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 901617f..ebfa482 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 @@ -12,5 +12,4 @@ class GetStringWidthUseCase @Inject constructor( operator fun invoke(string: String): Float { return gameAssetsHolder.getStringWidth(string) } - -} \ No newline at end of file +} 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 ac7f8f7..b0a2b35 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 @@ -13,5 +13,4 @@ class GetTextureRegionByNameUseCase @Inject constructor( operator fun get(name: String): TextureRegion? { return 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 c9e4ed0..b74049c 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 @@ -13,5 +13,4 @@ class GetTouchButtonsUseCase @Inject constructor( operator fun invoke(): Map { return gameAssetsHolder.getTouchButtons() } - } diff --git a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/InitializeAssetsUseCase.kt b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/InitializeAssetsUseCase.kt index 94fc9a6..659e769 100644 --- a/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/InitializeAssetsUseCase.kt +++ b/core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/InitializeAssetsUseCase.kt @@ -12,5 +12,4 @@ class InitializeAssetsUseCase @Inject constructor( operator fun invoke() { gameAssetsHolder.initializeRepository() } - -} \ No newline at end of file +} 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 7a8603e..fceaa9e 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 @@ -16,4 +16,4 @@ data class CameraContext( fun getViewportCoordinates(x: Int, y: Int): Pair { return xOnViewport(x) to yOnViewport(y) } -} \ No newline at end of file +} diff --git a/core/domain/configuration/src/main/kotlin/ru/fredboy/cavedroid/domain/configuration/repository/ApplicationContextRepository.kt b/core/domain/configuration/src/main/kotlin/ru/fredboy/cavedroid/domain/configuration/repository/ApplicationContextRepository.kt index 115f9a8..47bd2b4 100644 --- a/core/domain/configuration/src/main/kotlin/ru/fredboy/cavedroid/domain/configuration/repository/ApplicationContextRepository.kt +++ b/core/domain/configuration/src/main/kotlin/ru/fredboy/cavedroid/domain/configuration/repository/ApplicationContextRepository.kt @@ -10,7 +10,6 @@ interface ApplicationContextRepository { fun useDynamicCamera(): Boolean - fun getGameDirectory(): String fun getWidth(): Float @@ -28,5 +27,4 @@ interface ApplicationContextRepository { fun setWidth(width: Float) fun setHeight(height: Float) - -} \ No newline at end of file +} diff --git a/core/domain/configuration/src/main/kotlin/ru/fredboy/cavedroid/domain/configuration/repository/GameContextRepository.kt b/core/domain/configuration/src/main/kotlin/ru/fredboy/cavedroid/domain/configuration/repository/GameContextRepository.kt index 5022ac1..5277a86 100644 --- a/core/domain/configuration/src/main/kotlin/ru/fredboy/cavedroid/domain/configuration/repository/GameContextRepository.kt +++ b/core/domain/configuration/src/main/kotlin/ru/fredboy/cavedroid/domain/configuration/repository/GameContextRepository.kt @@ -22,5 +22,4 @@ interface GameContextRepository { fun setJoystick(joystick: Joystick) fun setCameraContext(cameraContext: CameraContext) - } 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 43c63d9..12e918b 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 @@ -86,12 +86,12 @@ sealed class Block { /* x = */ x + params.spriteMargins.left, /* y = */ y + params.spriteMargins.top, /* width = */ spriteWidth, - /* height = */ spriteHeight + /* height = */ spriteHeight, ) draw(spriter) } } - + fun isFluid(): Boolean { contract { returns(true) implies (this@Block is Fluid) } return this is Fluid @@ -137,14 +137,14 @@ sealed class Block { /* x = */ x * BLOCK_SIZE_PX + params.collisionMargins.left, /* y = */ y * BLOCK_SIZE_PX + params.collisionMargins.top, /* width = */ width, - /* height = */ height + /* height = */ height, ) } sealed class Container() : Block() data class None( - override val params: CommonBlockParams + override val params: CommonBlockParams, ) : Block() data class Normal( @@ -153,7 +153,7 @@ sealed class Block { data class Furnace( override val params: CommonBlockParams, - ): Container() { + ) : Container() { override val sprite: Sprite get() = getSprite(false) @@ -174,28 +174,27 @@ sealed class Block { /* x = */ x + params.spriteMargins.left, /* y = */ y + params.spriteMargins.top, /* width = */ spriteWidth, - /* height = */ spriteHeight + /* height = */ spriteHeight, ) draw(spriter) } } - } data class Chest( - override val params: CommonBlockParams - ): Container() + override val params: CommonBlockParams, + ) : Container() data class Slab( override val params: CommonBlockParams, val fullBlockKey: String, val otherPartBlockKey: String, - ): Block() + ) : Block() - sealed class Fluid: Block() { + sealed class Fluid : Block() { abstract val state: Int } - + data class Water( override val params: CommonBlockParams, override val state: Int, @@ -209,4 +208,4 @@ sealed class Block { companion object { private const val ANIMATION_FRAME_DURATION_MS = 100L } -} \ No newline at end of file +} diff --git a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/block/BlockAnimationInfo.kt b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/block/BlockAnimationInfo.kt index 11e8a71..098bf97 100644 --- a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/block/BlockAnimationInfo.kt +++ b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/block/BlockAnimationInfo.kt @@ -1,5 +1,5 @@ package ru.fredboy.cavedroid.domain.items.model.block data class BlockAnimationInfo( - val framesCount: Int + val framesCount: Int, ) diff --git a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/block/BlockMargins.kt b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/block/BlockMargins.kt index 6f44750..6fd2d24 100644 --- a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/block/BlockMargins.kt +++ b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/block/BlockMargins.kt @@ -4,12 +4,11 @@ data class BlockMargins( val left: Int, val top: Int, val right: Int, - val bottom: Int + val bottom: Int, ) { init { assert(left + right < 16) assert(top + bottom < 16) } - } diff --git a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/craft/CraftingRecipe.kt b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/craft/CraftingRecipe.kt index 5b24bb5..838345f 100644 --- a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/craft/CraftingRecipe.kt +++ b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/craft/CraftingRecipe.kt @@ -2,5 +2,5 @@ package ru.fredboy.cavedroid.domain.items.model.craft data class CraftingRecipe( val input: List, - val output: CraftingResult + val output: CraftingResult, ) 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 aaf4fdc..18b7e9b 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 @@ -5,7 +5,7 @@ import ru.fredboy.cavedroid.domain.items.model.item.Item class Inventory @JvmOverloads constructor( val size: Int, private val fallbackItem: Item.None, - initialItems: List? = null + initialItems: List? = null, ) { private val _items: Array = Array(size) { index -> @@ -43,7 +43,7 @@ class Inventory @JvmOverloads constructor( destination = _items, destinationOffset = 1, startIndex = 0, - endIndex = size - 1 + endIndex = size - 1, ) _items[0] = item.toInventoryItem(item.params.maxStack) @@ -90,4 +90,4 @@ class Inventory @JvmOverloads constructor( companion object { private const val SAVE_DATA_VERSION = 1 } -} \ No newline at end of file +} 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 9d5295c..6beae1e 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 @@ -50,7 +50,7 @@ class InventoryItem( font: BitmapFont, text: String, x: Float, - y: Float + y: Float, ) { spriteBatch.drawString(font, text, x + 1, y + 1, Color.BLACK) spriteBatch.drawString(font, text, x, y, Color.WHITE) @@ -76,7 +76,7 @@ class InventoryItem( font = font, text = amountString, x = x + 10f - getStringWidth(amountString) + 1f, - y = y + 10f - getStringHeight(amountString) + 1f + y = y + 10f - getStringHeight(amountString) + 1f, ) } @@ -110,7 +110,7 @@ class InventoryItem( /* x = */ x, /* y = */ y + 1.px - 2, /* width = */ 1.px * (amount.toFloat() / item.params.maxStack.toFloat()), - /* height = */ 2f + /* height = */ 2f, ) shapeRenderer.end() spriteBatch.begin() @@ -121,7 +121,7 @@ class InventoryItem( font = font, text = amountString, x = x + 1.px - getStringWidth(amountString), - y = y + 1.px - getStringHeight(amountString) + y = y + 1.px - getStringHeight(amountString), ) } } @@ -133,5 +133,4 @@ class InventoryItem( 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 c912558..14492bd 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 @@ -62,7 +62,7 @@ sealed class Item { data class Normal( override val params: CommonItemParams, - override val sprite: Sprite + override val sprite: Sprite, ) : Item() sealed class Tool : Item() { @@ -78,7 +78,7 @@ sealed class Item { data class None( override val params: CommonItemParams, - ): Item() { + ) : Item() { override val sprite: Sprite get() = throw IllegalAccessException("Trying to get sprite of None") } @@ -86,18 +86,18 @@ sealed class Item { data class Usable( override val params: CommonItemParams, override val sprite: Sprite, - val useActionKey: String + val useActionKey: String, ) : Item() data class Block( override val params: CommonItemParams, - override val block: DomainBlockModel + override val block: DomainBlockModel, ) : Placeable() data class Slab( override val params: CommonItemParams, val topPartBlock: DomainBlockModel.Slab, - val bottomPartBlock: DomainBlockModel.Slab + val bottomPartBlock: DomainBlockModel.Slab, ) : Placeable() { override val block get() = bottomPartBlock } @@ -147,5 +147,4 @@ sealed class Item { override val sprite: Sprite, val heal: Int, ) : Item() - -} \ No newline at end of file +} diff --git a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/repository/ItemsRepository.kt b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/repository/ItemsRepository.kt index ebbe910..76ea648 100644 --- a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/repository/ItemsRepository.kt +++ b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/repository/ItemsRepository.kt @@ -24,5 +24,4 @@ interface ItemsRepository : Disposable { fun getCraftingResult(input: List): InventoryItem fun getAllItems(): Collection - } diff --git a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/DisposeItemsRepositoryUseCase.kt b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/DisposeItemsRepositoryUseCase.kt index 2043452..fd6e1dd 100644 --- a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/DisposeItemsRepositoryUseCase.kt +++ b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/DisposeItemsRepositoryUseCase.kt @@ -12,5 +12,4 @@ class DisposeItemsRepositoryUseCase @Inject constructor( operator fun invoke() { itemsRepository.dispose() } - -} \ No newline at end of file +} 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 3c81e2c..dd0b77c 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 @@ -13,5 +13,4 @@ class GetBlockByKeyUseCase @Inject constructor( operator fun get(key: String): Block { return 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 4d74119..fce8e7e 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 @@ -13,5 +13,4 @@ class GetBlocksByTypeUseCase @Inject constructor( operator fun get(type: Class): List { return 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 712045d..478dcf3 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 @@ -14,5 +14,4 @@ class GetCraftingResultUseCase @Inject constructor( operator fun get(input: List): InventoryItem { return 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 8fdd460..df843a8 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 @@ -13,5 +13,4 @@ class GetFallbackBlockUseCase @Inject constructor( operator fun invoke(): Block.None { return itemsRepository.fallbackBlock } - -} \ No newline at end of file +} 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 7b09362..2260d7f 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 @@ -7,11 +7,10 @@ import javax.inject.Inject @Reusable class GetFallbackItemUseCase @Inject constructor( - private val itemsRepository: ItemsRepository + private val itemsRepository: ItemsRepository, ) { operator fun invoke(): Item.None { return itemsRepository.fallbackItem } - -} \ No newline at end of file +} 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 28dafd5..d47954f 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 @@ -13,5 +13,4 @@ class GetItemByIndexUseCase @Inject constructor( operator fun get(index: Int): Item { return 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 2371b0b..b77a131 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 @@ -13,5 +13,4 @@ class GetItemByKeyUseCase @Inject constructor( operator fun get(key: String): Item { return itemsRepository.getItemByKey(key) } - -} \ No newline at end of file +} diff --git a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/InitializeItemsRepositoryUseCase.kt b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/InitializeItemsRepositoryUseCase.kt index fe4f84f..55c2813 100644 --- a/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/InitializeItemsRepositoryUseCase.kt +++ b/core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/InitializeItemsRepositoryUseCase.kt @@ -12,5 +12,4 @@ class InitializeItemsRepositoryUseCase @Inject constructor( operator fun invoke() { itemsRepository.initialize() } - } diff --git a/core/domain/menu/src/main/kotlin/ru/fredboy/cavedroid/domain/menu/model/MenuButton.kt b/core/domain/menu/src/main/kotlin/ru/fredboy/cavedroid/domain/menu/model/MenuButton.kt index 63b4ec2..95a4abb 100644 --- a/core/domain/menu/src/main/kotlin/ru/fredboy/cavedroid/domain/menu/model/MenuButton.kt +++ b/core/domain/menu/src/main/kotlin/ru/fredboy/cavedroid/domain/menu/model/MenuButton.kt @@ -7,7 +7,6 @@ sealed class MenuButton { abstract val actionKey: String abstract val isEnabled: Boolean - data class Simple( override val label: String, override val isVisible: Boolean, diff --git a/core/domain/menu/src/main/kotlin/ru/fredboy/cavedroid/domain/menu/repository/MenuButtonRepository.kt b/core/domain/menu/src/main/kotlin/ru/fredboy/cavedroid/domain/menu/repository/MenuButtonRepository.kt index 775643b..38d7e36 100644 --- a/core/domain/menu/src/main/kotlin/ru/fredboy/cavedroid/domain/menu/repository/MenuButtonRepository.kt +++ b/core/domain/menu/src/main/kotlin/ru/fredboy/cavedroid/domain/menu/repository/MenuButtonRepository.kt @@ -14,5 +14,4 @@ interface MenuButtonRepository : Disposable { fun getCurrentMenuButtons(): Map? fun setButtonEnabled(menuKey: String, buttonKey: String, enabled: Boolean) - -} \ No newline at end of file +} diff --git a/core/domain/save/src/main/kotlin/ru/fredboy/cavedroid/domain/save/model/GameMapSaveData.kt b/core/domain/save/src/main/kotlin/ru/fredboy/cavedroid/domain/save/model/GameMapSaveData.kt index 8da2201..3364559 100644 --- a/core/domain/save/src/main/kotlin/ru/fredboy/cavedroid/domain/save/model/GameMapSaveData.kt +++ b/core/domain/save/src/main/kotlin/ru/fredboy/cavedroid/domain/save/model/GameMapSaveData.kt @@ -4,7 +4,7 @@ import ru.fredboy.cavedroid.domain.items.model.block.Block class GameMapSaveData( private var foreMap: Array>?, - private var backMap: Array>? + private var backMap: Array>?, ) { fun retrieveForeMap(): Array> { val value = requireNotNull(foreMap) 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 43ddc75..c5d772b 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 @@ -30,7 +30,7 @@ class GameSaveData( fun isEmpty(): Boolean { return mobController == null && - dropController == null && - containerController == null + dropController == null && + containerController == null } -} \ No newline at end of file +} diff --git a/core/domain/save/src/main/kotlin/ru/fredboy/cavedroid/domain/save/repository/SaveDataRepository.kt b/core/domain/save/src/main/kotlin/ru/fredboy/cavedroid/domain/save/repository/SaveDataRepository.kt index be0dffa..9c0e371 100644 --- a/core/domain/save/src/main/kotlin/ru/fredboy/cavedroid/domain/save/repository/SaveDataRepository.kt +++ b/core/domain/save/src/main/kotlin/ru/fredboy/cavedroid/domain/save/repository/SaveDataRepository.kt @@ -18,11 +18,11 @@ interface SaveDataRepository { dropController: DropController, mobController: MobController, containerController: ContainerController, - gameWorld: GameWorld + gameWorld: GameWorld, ) fun loadMap( - gameDataFolder: String + gameDataFolder: String, ): GameMapSaveData fun loadContainerController( @@ -43,5 +43,4 @@ interface SaveDataRepository { ): MobController fun exists(gameDataFolder: String): Boolean - -} \ No newline at end of file +} diff --git a/core/domain/world/src/main/kotlin/ru/fredboy/cavedroid/domain/world/listener/OnBlockDestroyedListener.kt b/core/domain/world/src/main/kotlin/ru/fredboy/cavedroid/domain/world/listener/OnBlockDestroyedListener.kt index d790ce0..df35a6c 100644 --- a/core/domain/world/src/main/kotlin/ru/fredboy/cavedroid/domain/world/listener/OnBlockDestroyedListener.kt +++ b/core/domain/world/src/main/kotlin/ru/fredboy/cavedroid/domain/world/listener/OnBlockDestroyedListener.kt @@ -6,5 +6,4 @@ import ru.fredboy.cavedroid.domain.world.model.Layer fun interface OnBlockDestroyedListener { fun onBlockDestroyed(block: Block, x: Int, y: Int, layer: Layer, withDrop: Boolean) - -} \ No newline at end of file +} diff --git a/core/domain/world/src/main/kotlin/ru/fredboy/cavedroid/domain/world/listener/OnBlockPlacedListener.kt b/core/domain/world/src/main/kotlin/ru/fredboy/cavedroid/domain/world/listener/OnBlockPlacedListener.kt index b88bd0b..79e970f 100644 --- a/core/domain/world/src/main/kotlin/ru/fredboy/cavedroid/domain/world/listener/OnBlockPlacedListener.kt +++ b/core/domain/world/src/main/kotlin/ru/fredboy/cavedroid/domain/world/listener/OnBlockPlacedListener.kt @@ -6,5 +6,4 @@ import ru.fredboy.cavedroid.domain.world.model.Layer fun interface OnBlockPlacedListener { fun onBlockPlaced(block: Block, x: Int, y: Int, layer: Layer) - -} \ No newline at end of file +} diff --git a/core/domain/world/src/main/kotlin/ru/fredboy/cavedroid/domain/world/model/Layer.kt b/core/domain/world/src/main/kotlin/ru/fredboy/cavedroid/domain/world/model/Layer.kt index b9738a3..cf6f841 100644 --- a/core/domain/world/src/main/kotlin/ru/fredboy/cavedroid/domain/world/model/Layer.kt +++ b/core/domain/world/src/main/kotlin/ru/fredboy/cavedroid/domain/world/model/Layer.kt @@ -2,5 +2,5 @@ package ru.fredboy.cavedroid.domain.world.model enum class Layer(val z: Int) { FOREGROUND(0), - BACKGROUND(1) + BACKGROUND(1), } diff --git a/core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/abstraction/ContainerFactory.kt b/core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/abstraction/ContainerFactory.kt index 995f2b6..44ddf4c 100644 --- a/core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/abstraction/ContainerFactory.kt +++ b/core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/abstraction/ContainerFactory.kt @@ -5,4 +5,4 @@ import ru.fredboy.cavedroid.entity.container.model.Container interface ContainerFactory { fun createContainer(type: Block.Container): Container -} \ No newline at end of file +} diff --git a/core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/abstraction/ContainerWorldAdapter.kt b/core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/abstraction/ContainerWorldAdapter.kt index 09b2bbd..a954d26 100644 --- a/core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/abstraction/ContainerWorldAdapter.kt +++ b/core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/abstraction/ContainerWorldAdapter.kt @@ -10,7 +10,7 @@ interface ContainerWorldAdapter { fun checkContainerAtCoordinates( coordinates: ContainerCoordinates, - requiredType: KClass + requiredType: KClass, ): Boolean fun addOnBlockDestroyedListener(listener: OnBlockDestroyedListener) @@ -20,5 +20,4 @@ interface ContainerWorldAdapter { fun removeOnBlockDestroyedListener(listener: OnBlockDestroyedListener) fun removeOnBlockPlacedListener(listener: OnBlockPlacedListener) - -} \ No newline at end of file +} diff --git a/core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/model/Chest.kt b/core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/model/Chest.kt index e07e59c..22a1c90 100644 --- a/core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/model/Chest.kt +++ b/core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/model/Chest.kt @@ -11,7 +11,7 @@ class Chest( ) : Container( size = SIZE, fallbackItem = fallbackItem, - initialItems = initialItems + initialItems = initialItems, ) { override val type get() = Block.Chest::class diff --git a/core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/model/Container.kt b/core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/model/Container.kt index 8aa330f..9e5e549 100644 --- a/core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/model/Container.kt +++ b/core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/model/Container.kt @@ -10,7 +10,7 @@ import kotlin.reflect.KClass abstract class Container( val size: Int, protected val fallbackItem: Item.None, - initialItems: List? = null + initialItems: List? = null, ) { val inventory = Inventory(size, fallbackItem, initialItems) @@ -20,5 +20,4 @@ abstract class Container( abstract val type: KClass abstract fun update(itemByKey: GetItemByKeyUseCase) - -} \ No newline at end of file +} 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 93e4048..58e192e 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 @@ -23,4 +23,4 @@ data class ContainerCoordinates( ) } } -} \ No newline at end of file +} 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 80af694..931832f 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 @@ -11,7 +11,7 @@ import ru.fredboy.cavedroid.domain.items.usecase.GetItemByKeyUseCase class Furnace( fallbackItem: Item.None, - initialItems: List? = null + initialItems: List? = null, ) : Container( size = SIZE, fallbackItem = fallbackItem, @@ -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) + !input.isNoneOrNull() && input.item.params.smeltProductKey != null && + (!fuel.isNoneOrNull() || burnProgress > 0f) } private fun startBurning() { @@ -93,7 +92,6 @@ class Furnace( burnProgress += 0.01f startBurnTimeMs = TimeUtils.millis() } - } if (currentFuel?.isNone() == false && burnProgress >= 1f) { @@ -147,5 +145,4 @@ class Furnace( const val SMELTING_TIME_MS = 10000L } - -} \ No newline at end of file +} diff --git a/core/entity/drop/src/main/kotlin/ru/fredboy/cavedroid/entity/drop/abstraction/DropAdapter.kt b/core/entity/drop/src/main/kotlin/ru/fredboy/cavedroid/entity/drop/abstraction/DropAdapter.kt index 2840378..1c443d8 100644 --- a/core/entity/drop/src/main/kotlin/ru/fredboy/cavedroid/entity/drop/abstraction/DropAdapter.kt +++ b/core/entity/drop/src/main/kotlin/ru/fredboy/cavedroid/entity/drop/abstraction/DropAdapter.kt @@ -8,5 +8,4 @@ interface DropAdapter { fun dropInventory(x: Float, y: Float, inventory: Inventory) fun dropItems(x: Float, y: Float, items: List) - -} \ No newline at end of file +} diff --git a/core/entity/drop/src/main/kotlin/ru/fredboy/cavedroid/entity/drop/abstraction/DropWorldAdapter.kt b/core/entity/drop/src/main/kotlin/ru/fredboy/cavedroid/entity/drop/abstraction/DropWorldAdapter.kt index 693b14e..d8cc303 100644 --- a/core/entity/drop/src/main/kotlin/ru/fredboy/cavedroid/entity/drop/abstraction/DropWorldAdapter.kt +++ b/core/entity/drop/src/main/kotlin/ru/fredboy/cavedroid/entity/drop/abstraction/DropWorldAdapter.kt @@ -12,5 +12,4 @@ interface DropWorldAdapter { fun removeOnBlockDestroyedListener(listener: OnBlockDestroyedListener) fun removeOnBlockPlacedListener(listener: OnBlockPlacedListener) - -} \ No newline at end of file +} 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 2cc1b96..799443b 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 @@ -38,7 +38,6 @@ class Drop( ) } - companion object { private fun getInitialVelocity(): Vector2 = Vector2(MathUtils.random(-100f, 100f), -100f) @@ -47,5 +46,4 @@ class Drop( const val MAGNET_VELOCITY = 256f const val DROP_SIZE = BLOCK_SIZE_PX / 2 } - -} \ No newline at end of file +} diff --git a/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/abstraction/MobBehavior.kt b/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/abstraction/MobBehavior.kt index 400e442..fde74da 100644 --- a/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/abstraction/MobBehavior.kt +++ b/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/abstraction/MobBehavior.kt @@ -5,5 +5,4 @@ import ru.fredboy.cavedroid.entity.mob.model.Mob interface MobBehavior { fun update(mob: Mob, worldAdapter: MobWorldAdapter, delta: Float) - -} \ No newline at end of file +} diff --git a/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/abstraction/MobWorldAdapter.kt b/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/abstraction/MobWorldAdapter.kt index 33bbbbd..e774e25 100644 --- a/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/abstraction/MobWorldAdapter.kt +++ b/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/abstraction/MobWorldAdapter.kt @@ -22,5 +22,4 @@ interface MobWorldAdapter { fun destroyBackgroundBlock(x: Int, y: Int, shouldDrop: Boolean) fun findSpawnPoint(): Vector2 - -} \ No newline at end of file +} diff --git a/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/abstraction/PlayerAdapter.kt b/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/abstraction/PlayerAdapter.kt index f1e9b82..ec8dcb3 100644 --- a/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/abstraction/PlayerAdapter.kt +++ b/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/abstraction/PlayerAdapter.kt @@ -6,4 +6,4 @@ interface PlayerAdapter { val width: Float val height: Float -} \ No newline at end of file +} diff --git a/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/model/Direction.kt b/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/model/Direction.kt index c822d97..ed8204f 100644 --- a/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/model/Direction.kt +++ b/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/model/Direction.kt @@ -7,7 +7,8 @@ enum class Direction( val basis: Int, ) { LEFT(0, -1), - RIGHT(1, 1); + RIGHT(1, 1), + ; companion object { fun random() = if (MathUtils.randomBoolean()) LEFT else RIGHT diff --git a/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/model/FallingBlock.kt b/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/model/FallingBlock.kt index 17dfc53..d35c95d 100644 --- a/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/model/FallingBlock.kt +++ b/core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/model/FallingBlock.kt @@ -10,7 +10,7 @@ class FallingBlock( x: Float, y: Float, behavior: MobBehavior, -) : Mob(x, y, 1.px, 1.px, Direction.RIGHT, Int.MAX_VALUE , behavior) { +) : Mob(x, y, 1.px, 1.px, Direction.RIGHT, Int.MAX_VALUE, behavior) { init { velocity.y = 1f @@ -26,9 +26,8 @@ class FallingBlock( spriteBatch: SpriteBatch, x: Float, y: Float, - delta: Float + delta: Float, ) { block.draw(spriteBatch, x, y) } - -} \ No newline at end of file +} 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 3426911..5ebf842 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 @@ -34,7 +34,7 @@ abstract class Mob( val middleMapY get() = (y + height / 2).bl val lowerMapY get() = (y + height).bl - var animDelta = ANIMATION_SPEED; + var animDelta = ANIMATION_SPEED var anim = 0f var isDead = false @@ -162,7 +162,7 @@ abstract class Mob( /* x = */ x - HIT_RANGE, /* y = */ y + HIT_RANGE, /* width = */ width + HIT_RANGE * 2f, - /* height = */ height + HIT_RANGE * 2f + /* height = */ height + HIT_RANGE * 2f, ) } @@ -171,7 +171,7 @@ abstract class Mob( } open fun getDropItems( - itemByKey: GetItemByKeyUseCase + itemByKey: GetItemByKeyUseCase, ): List { return emptyList() } @@ -196,10 +196,9 @@ abstract class Mob( protected const val ANIMATION_RANGE = 60f - private const val HIT_RANGE = 8f; + private const val HIT_RANGE = 8f private const val DAMAGE_TINT_TIMEOUT_S = 0.5f private val DAMAGE_TINT_COLOR = Color((0xff8080 shl 8) or 0xFF) - } -} \ No newline at end of file +} 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 53593ca..2d3b220 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 @@ -17,7 +17,7 @@ class Pig( ) : Mob(x, y, WIDTH, HEIGHT, Direction.random(), MAX_HEALTH, behavior) { override val speed get() = SPEED - + override fun changeDir() { switchDir() velocity = Vector2(direction.basis * speed, 0f) @@ -45,7 +45,7 @@ class Pig( spriteBatch: SpriteBatch, x: Float, y: Float, - delta: Float + delta: Float, ) { updateAnimation(delta) @@ -65,12 +65,12 @@ class Pig( spriteBatch.drawSprite(sprite.leg, leftLegX, legY, anim, tint = tintColor) spriteBatch.drawSprite(sprite.leg, rightLegX, legY, anim, tint = tintColor) } - + companion object { private const val WIDTH = 25f private const val HEIGHT = 18f - private const val SPEED = 48f + private const val SPEED = 48f private const val JUMP_VELOCITY = -133.332f private const val MAX_HEALTH = 10 } -} \ No newline at end of file +} 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 eb37e56..116de0b 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 @@ -51,7 +51,7 @@ class Player( var activeSlot get() = _activeSlot set(value) { - if (value in 0 ..< HOTBAR_SIZE) { + if (value in 0..() @@ -98,4 +98,4 @@ class ContainerController @Inject constructor( companion object { private const val TAG = "ContainerControllerImpl" } -} \ No newline at end of file +} diff --git a/core/game/controller/container/src/main/kotlin/ru/fredboy/cavedroid/game/controller/container/di/ControllerContainerModule.kt b/core/game/controller/container/src/main/kotlin/ru/fredboy/cavedroid/game/controller/container/di/ControllerContainerModule.kt index c7cf8b1..3080fad 100644 --- a/core/game/controller/container/src/main/kotlin/ru/fredboy/cavedroid/game/controller/container/di/ControllerContainerModule.kt +++ b/core/game/controller/container/src/main/kotlin/ru/fredboy/cavedroid/game/controller/container/di/ControllerContainerModule.kt @@ -10,5 +10,4 @@ abstract class ControllerContainerModule { @Binds internal abstract fun bindContainerFactory(impl: ContainerFactoryImpl): ContainerFactory - -} \ No newline at end of file +} diff --git a/core/game/controller/container/src/main/kotlin/ru/fredboy/cavedroid/game/controller/container/impl/ContainerFactoryImpl.kt b/core/game/controller/container/src/main/kotlin/ru/fredboy/cavedroid/game/controller/container/impl/ContainerFactoryImpl.kt index e957dd0..cced707 100644 --- a/core/game/controller/container/src/main/kotlin/ru/fredboy/cavedroid/game/controller/container/impl/ContainerFactoryImpl.kt +++ b/core/game/controller/container/src/main/kotlin/ru/fredboy/cavedroid/game/controller/container/impl/ContainerFactoryImpl.kt @@ -12,7 +12,7 @@ import javax.inject.Inject @GameScope internal class ContainerFactoryImpl @Inject constructor( private val getFallbackItemUseCase: GetFallbackItemUseCase, -): ContainerFactory { +) : ContainerFactory { override fun createContainer(type: Block.Container): Container { return when (type) { @@ -32,5 +32,4 @@ internal class ContainerFactoryImpl @Inject constructor( fallbackItem = getFallbackItemUseCase(), ) } - -} \ No newline at end of file +} diff --git a/core/game/controller/drop/src/main/kotlin/ru/fredboy/cavedroid/game/controller/drop/DropController.kt b/core/game/controller/drop/src/main/kotlin/ru/fredboy/cavedroid/game/controller/drop/DropController.kt index 8275613..a694f52 100644 --- a/core/game/controller/drop/src/main/kotlin/ru/fredboy/cavedroid/game/controller/drop/DropController.kt +++ b/core/game/controller/drop/src/main/kotlin/ru/fredboy/cavedroid/game/controller/drop/DropController.kt @@ -24,7 +24,7 @@ class DropController @Inject constructor( constructor( itemsRepository: ItemsRepository, dropWorldAdapter: DropWorldAdapter, - initialDrop: Collection + initialDrop: Collection, ) : this(itemsRepository, dropWorldAdapter) { drops.addAll(initialDrop.filterNot { drop -> drop.item.isNone() }) } @@ -64,7 +64,7 @@ class DropController @Inject constructor( val iterator = drops.iterator() while (iterator.hasNext()) { - val drop = iterator.next(); + val drop = iterator.next() if (drop.isPickedUp) { iterator.remove() } @@ -87,8 +87,7 @@ class DropController @Inject constructor( x = x.blockCenterPx() - Drop.DROP_SIZE / 2, y = y.blockCenterPx() - Drop.DROP_SIZE / 2, item = item, - count = dropInfo.count + count = dropInfo.count, ) } - -} \ No newline at end of file +} diff --git a/core/game/controller/drop/src/main/kotlin/ru/fredboy/cavedroid/game/controller/drop/di/ControllerDropModule.kt b/core/game/controller/drop/src/main/kotlin/ru/fredboy/cavedroid/game/controller/drop/di/ControllerDropModule.kt index 2e07d38..3511325 100644 --- a/core/game/controller/drop/src/main/kotlin/ru/fredboy/cavedroid/game/controller/drop/di/ControllerDropModule.kt +++ b/core/game/controller/drop/src/main/kotlin/ru/fredboy/cavedroid/game/controller/drop/di/ControllerDropModule.kt @@ -10,5 +10,4 @@ abstract class ControllerDropModule { @Binds internal abstract fun bindDropAdapter(impl: DropAdapterImpl): DropAdapter - -} \ No newline at end of file +} diff --git a/core/game/controller/drop/src/main/kotlin/ru/fredboy/cavedroid/game/controller/drop/impl/DropAdapterImpl.kt b/core/game/controller/drop/src/main/kotlin/ru/fredboy/cavedroid/game/controller/drop/impl/DropAdapterImpl.kt index a75639b..beb790f 100644 --- a/core/game/controller/drop/src/main/kotlin/ru/fredboy/cavedroid/game/controller/drop/impl/DropAdapterImpl.kt +++ b/core/game/controller/drop/src/main/kotlin/ru/fredboy/cavedroid/game/controller/drop/impl/DropAdapterImpl.kt @@ -20,5 +20,4 @@ internal class DropAdapterImpl @Inject constructor( override fun dropItems(x: Float, y: Float, items: List) { items.forEach { item -> dropController.addDrop(x, y, item) } } - -} \ No newline at end of file +} diff --git a/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/MobController.kt b/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/MobController.kt index 88d9201..9ba2636 100644 --- a/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/MobController.kt +++ b/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/MobController.kt @@ -27,7 +27,7 @@ class MobController @Inject constructor( getFallbackItem = getFallbackItemUseCase, x = 0f, y = 0f, - behavior = PlayerMobBehavior() + behavior = PlayerMobBehavior(), ) init { @@ -73,4 +73,4 @@ class MobController @Inject constructor( companion object { private const val SURVIVAL_CURSOR_RANGE = 4 } -} \ No newline at end of file +} diff --git a/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/behavior/BaseMobBehavior.kt b/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/behavior/BaseMobBehavior.kt index 1f1f15b..d1e3013 100644 --- a/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/behavior/BaseMobBehavior.kt +++ b/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/behavior/BaseMobBehavior.kt @@ -1,8 +1,8 @@ package ru.fredboy.cavedroid.game.controller.mob.behavior -import ru.fredboy.cavedroid.entity.mob.model.Mob import ru.fredboy.cavedroid.entity.mob.abstraction.MobBehavior import ru.fredboy.cavedroid.entity.mob.abstraction.MobWorldAdapter +import ru.fredboy.cavedroid.entity.mob.model.Mob import kotlin.reflect.KClass abstract class BaseMobBehavior( @@ -17,7 +17,7 @@ abstract class BaseMobBehavior( } } else { throw IllegalArgumentException( - "Trying to update mob of type ${mob::class.simpleName} with behavior of ${mobType.simpleName}" + "Trying to update mob of type ${mob::class.simpleName} with behavior of ${mobType.simpleName}", ) } } @@ -27,4 +27,4 @@ abstract class BaseMobBehavior( companion object { private const val TAG = "BaseMobBehavior" } -} \ No newline at end of file +} 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 bf20234..55c9215 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 @@ -13,5 +13,4 @@ class FallingBlockMobBehavior : BaseMobBehavior( kill() } } - -} \ No newline at end of file +} 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 5eef936..3dc88e8 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 @@ -1,8 +1,8 @@ package ru.fredboy.cavedroid.game.controller.mob.behavior import com.badlogic.gdx.math.MathUtils -import ru.fredboy.cavedroid.entity.mob.model.Pig import ru.fredboy.cavedroid.entity.mob.abstraction.MobWorldAdapter +import ru.fredboy.cavedroid.entity.mob.model.Pig class PigMobBehavior : BaseMobBehavior( mobType = Pig::class, @@ -17,5 +17,4 @@ class PigMobBehavior : BaseMobBehavior( } } } - -} \ No newline at end of file +} 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 f36fd95..5da92c3 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 @@ -3,8 +3,8 @@ package ru.fredboy.cavedroid.game.controller.mob.behavior import ru.fredboy.cavedroid.domain.items.model.block.Block import ru.fredboy.cavedroid.domain.items.model.item.Item import ru.fredboy.cavedroid.domain.world.model.Layer -import ru.fredboy.cavedroid.entity.mob.model.Player import ru.fredboy.cavedroid.entity.mob.abstraction.MobWorldAdapter +import ru.fredboy.cavedroid.entity.mob.model.Player class PlayerMobBehavior : BaseMobBehavior( mobType = Player::class, @@ -80,7 +80,8 @@ class PlayerMobBehavior : BaseMobBehavior( var blockDamageMultiplier = 1f (activeItem.item as? Item.Tool)?.let { currentTool -> if (currentTool.javaClass == targetBlock.params.toolType && - currentTool.level >= targetBlock.params.toolLevel) { + currentTool.level >= targetBlock.params.toolLevel + ) { blockDamageMultiplier = 2f * currentTool.level } blockDamageMultiplier *= currentTool.blockDamageMultiplier @@ -90,4 +91,4 @@ class PlayerMobBehavior : BaseMobBehavior( blockDamage += 60f * delta * blockDamageMultiplier } } -} \ No newline at end of file +} diff --git a/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/di/MobControllerModule.kt b/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/di/MobControllerModule.kt index c966a26..9f02bff 100644 --- a/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/di/MobControllerModule.kt +++ b/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/di/MobControllerModule.kt @@ -10,4 +10,4 @@ abstract class MobControllerModule { @Binds internal abstract fun bindPlayerAdapter(impl: PlayerAdapterImpl): PlayerAdapter -} \ No newline at end of file +} diff --git a/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/factory/FallingBlockFactory.kt b/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/factory/FallingBlockFactory.kt index f65bcc6..2a642be 100644 --- a/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/factory/FallingBlockFactory.kt +++ b/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/factory/FallingBlockFactory.kt @@ -25,5 +25,4 @@ class FallingBlockFactory @Inject constructor( return fallingBlock } - -} \ No newline at end of file +} diff --git a/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/factory/PigFactory.kt b/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/factory/PigFactory.kt index 9ecabef..18ad1a3 100644 --- a/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/factory/PigFactory.kt +++ b/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/factory/PigFactory.kt @@ -25,5 +25,4 @@ class PigFactory @Inject constructor( return pig } - -} \ No newline at end of file +} diff --git a/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/impl/PlayerAdapterImpl.kt b/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/impl/PlayerAdapterImpl.kt index c89e641..f1e2652 100644 --- a/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/impl/PlayerAdapterImpl.kt +++ b/core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/impl/PlayerAdapterImpl.kt @@ -23,4 +23,4 @@ class PlayerAdapterImpl @Inject constructor( override val height: Float get() = player.height -} \ No newline at end of file +} diff --git a/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/GameWindowType.kt b/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/GameWindowType.kt index f6649ca..efa694c 100644 --- a/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/GameWindowType.kt +++ b/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/GameWindowType.kt @@ -6,5 +6,5 @@ enum class GameWindowType { SURVIVAL_INVENTORY, CHEST, CRAFTING_TABLE, - FURNACE -} \ No newline at end of file + FURNACE, +} diff --git a/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/GameWindowsConfigs.kt b/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/GameWindowsConfigs.kt index f3e83da..36b1550 100644 --- a/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/GameWindowsConfigs.kt +++ b/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/GameWindowsConfigs.kt @@ -121,4 +121,4 @@ object GameWindowsConfigs { const val contentsInRow = 9 const val contentsInCol = 3 } -} \ No newline at end of file +} diff --git a/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/GameWindowsManager.kt b/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/GameWindowsManager.kt index 0264cf8..5809b5e 100644 --- a/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/GameWindowsManager.kt +++ b/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/GameWindowsManager.kt @@ -58,5 +58,4 @@ class GameWindowsManager @Inject constructor( currentWindow = null tooltipManager.showMouseTooltip("") } - -} \ No newline at end of file +} diff --git a/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/TooltipManager.kt b/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/TooltipManager.kt index 0fa3344..7a6ed54 100644 --- a/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/TooltipManager.kt +++ b/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/TooltipManager.kt @@ -34,5 +34,4 @@ class TooltipManager @Inject constructor() { companion object { private const val TOOLTIP_TIME_S = 2f } - -} \ No newline at end of file +} 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 0aa8b47..66348d8 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 @@ -18,7 +18,7 @@ abstract class AbstractInventoryWindow { items: MutableList, itemsRepository: ItemsRepository, index: Int, - pointer: Int = -1 + pointer: Int = -1, ) { if (selectedItem != null && selectedItem?.item?.isNone() != true && @@ -63,12 +63,13 @@ abstract class AbstractInventoryWindow { if (selectedItem == null || (!clickedItem.isNoneOrNull() && selectedItem.item != clickedItem.item) || - !clickedItem.canBeAdded()) { + !clickedItem.canBeAdded() + ) { return } val newItem = selectedItem.item.toInventoryItem( - (clickedItem.takeIf { !it.item.isNone() }?.amount ?: 0) + 1 + (clickedItem.takeIf { !it.item.isNone() }?.amount ?: 0) + 1, ) items[index] = newItem selectedItem.amount-- @@ -77,5 +78,4 @@ abstract class AbstractInventoryWindow { this@AbstractInventoryWindow.selectedItem = null } } - -} \ No newline at end of file +} diff --git a/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/AbstractInventoryWindowWithCraftGrid.kt b/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/AbstractInventoryWindowWithCraftGrid.kt index 39509e4..1e0fbe9 100644 --- a/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/AbstractInventoryWindowWithCraftGrid.kt +++ b/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/AbstractInventoryWindowWithCraftGrid.kt @@ -20,5 +20,4 @@ abstract class AbstractInventoryWindowWithCraftGrid( set(value) { craftResultList[0] = value } - -} \ No newline at end of file +} diff --git a/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/ChestInventoryWindow.kt b/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/ChestInventoryWindow.kt index cf41d05..9de51be 100644 --- a/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/ChestInventoryWindow.kt +++ b/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/ChestInventoryWindow.kt @@ -9,5 +9,4 @@ class ChestInventoryWindow(val chest: Chest) : AbstractInventoryWindow() { override val type = GameWindowType.CHEST override var selectedItem: InventoryItem? = null - -} \ No newline at end of file +} diff --git a/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/CraftingInventoryWindow.kt b/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/CraftingInventoryWindow.kt index 300a564..8a17019 100644 --- a/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/CraftingInventoryWindow.kt +++ b/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/CraftingInventoryWindow.kt @@ -5,10 +5,10 @@ import ru.fredboy.cavedroid.domain.items.repository.ItemsRepository import ru.fredboy.cavedroid.game.window.GameWindowType class CraftingInventoryWindow( - itemsRepository: ItemsRepository + itemsRepository: ItemsRepository, ) : AbstractInventoryWindowWithCraftGrid(itemsRepository) { override val type = GameWindowType.CRAFTING_TABLE override var selectedItem: InventoryItem? = null -} \ No newline at end of file +} 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 782f4b9..782df96 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 @@ -14,4 +14,4 @@ class CreativeInventoryWindow() : AbstractInventoryWindow() { fun getMaxScroll(itemsRepository: ItemsRepository): Int { return itemsRepository.getAllItems().size / GameWindowsConfigs.Creative.itemsInRow } -} \ No newline at end of file +} diff --git a/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/FurnaceInventoryWindow.kt b/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/FurnaceInventoryWindow.kt index 981199e..e3bcef8 100644 --- a/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/FurnaceInventoryWindow.kt +++ b/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/FurnaceInventoryWindow.kt @@ -11,5 +11,4 @@ class FurnaceInventoryWindow( override val type = GameWindowType.FURNACE override var selectedItem: InventoryItem? = null - -} \ No newline at end of file +} diff --git a/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/SurvivalInventoryWindow.kt b/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/SurvivalInventoryWindow.kt index eb8f537..959e127 100644 --- a/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/SurvivalInventoryWindow.kt +++ b/core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/SurvivalInventoryWindow.kt @@ -5,10 +5,10 @@ import ru.fredboy.cavedroid.domain.items.repository.ItemsRepository import ru.fredboy.cavedroid.game.window.GameWindowType class SurvivalInventoryWindow( - itemsRepository: ItemsRepository + itemsRepository: ItemsRepository, ) : AbstractInventoryWindowWithCraftGrid(itemsRepository) { override val type = GameWindowType.SURVIVAL_INVENTORY override var selectedItem: InventoryItem? = null -} \ No newline at end of file +} 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 4e8e0ca..5a4a2b1 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 @@ -60,7 +60,6 @@ class GameWorld @Inject constructor( onBlockDestroyedListeners.removeFirst { it.get() == listener } } - private fun transformX(x: Int): Int { var transformed = x % width if (transformed < 0) { @@ -72,13 +71,13 @@ class GameWorld @Inject constructor( private fun getMap(x: Int, y: Int, layer: Layer): Block { val fallback = itemsRepository.fallbackBlock - if (y !in 0 ..< height) { + if (y !in 0.. diamond - res in 25 ..< 50 && h < 32 -> gold - res in 50 ..< 250 && h < 64 -> iron - res in 250 ..< 450 && h < 128 -> coal - res in 450 ..< (450 + (25 - (abs(h - 16) * (25 / 16)))) -> lapis + res in 25..<50 && h < 32 -> gold + res in 50..<250 && h < 64 -> iron + res in 250..<450 && h < 128 -> coal + res in 450..<(450 + (25 - (abs(h - 16) * (25 / 16)))) -> lapis else -> null } @@ -328,5 +329,4 @@ class GameWorldGenerator( return Pair(foreMap, backMap) } - } 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 a228cb6..616e945 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 @@ -27,7 +27,5 @@ data class WorldGeneratorConfig( 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 8736dba..dd2505b 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 @@ -11,8 +11,8 @@ import ru.fredboy.cavedroid.domain.world.model.Layer import ru.fredboy.cavedroid.entity.container.abstraction.ContainerWorldAdapter import ru.fredboy.cavedroid.entity.container.model.ContainerCoordinates import ru.fredboy.cavedroid.entity.drop.abstraction.DropWorldAdapter -import ru.fredboy.cavedroid.entity.mob.model.Player import ru.fredboy.cavedroid.entity.mob.abstraction.MobWorldAdapter +import ru.fredboy.cavedroid.entity.mob.model.Player import ru.fredboy.cavedroid.game.world.GameWorld import javax.inject.Inject import kotlin.reflect.KClass @@ -59,7 +59,7 @@ internal class WorldAdapterImpl @Inject constructor( while (y++ in 0..gameWorld.generatorConfig.seaLevel) { if (y == gameWorld.generatorConfig.seaLevel) { - while (x++ in 0 ..< width) { + while (x++ in 0.. + requiredType: KClass, ): Boolean { val block = when (coordinates.z) { Layer.FOREGROUND.z -> gameWorld.getForeMap(coordinates.x, coordinates.y) @@ -105,4 +105,4 @@ internal class WorldAdapterImpl @Inject constructor( override fun removeOnBlockPlacedListener(listener: OnBlockPlacedListener) { gameWorld.removeBlockPlacedListener(listener) } -} \ No newline at end of file +} 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 028d630..44cb5d1 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 @@ -42,10 +42,10 @@ class GameInputProcessor @Inject constructor( /* x = */ applicationContextRepository.getWidth() / 2, /* y = */ 0f, /* width = */ applicationContextRepository.getWidth() / 2, - /* height = */ applicationContextRepository.getHeight() / 2 + /* height = */ applicationContextRepository.getHeight() / 2, ), Input.Buttons.LEFT, - true + true, ) private val mouseRightTouchButton = TouchButton( @@ -53,16 +53,15 @@ class GameInputProcessor @Inject constructor( /* x = */ applicationContextRepository.getWidth() / 2, /* y = */ applicationContextRepository.getHeight() / 2, /* width = */ applicationContextRepository.getWidth() / 2, - /* height = */ applicationContextRepository.getHeight() / 2 + /* height = */ applicationContextRepository.getHeight() / 2, ), Input.Buttons.RIGHT, - true + true, ) private var touchDownX = 0f private var touchDownY = 0f - override fun keyDown(keycode: Int): Boolean { return handleKeyboardAction(keycode, true) } @@ -72,7 +71,7 @@ class GameInputProcessor @Inject constructor( } override fun keyTyped(p0: Char): Boolean { - return false; + return false } override fun touchDown(screenX: Int, screenY: Int, pointer: Int, button: Int): Boolean { @@ -123,7 +122,7 @@ class GameInputProcessor @Inject constructor( mouseY = screenY, button = touchedKey.code, touchUp = true, - pointer = pointer + pointer = pointer, ) } else { keyUp(touchedKey.code) @@ -176,7 +175,6 @@ class GameInputProcessor @Inject constructor( return handleMouseAction(action) } - @Suppress("unused") fun update(delta: Float) { handleMousePosition() @@ -296,4 +294,4 @@ class GameInputProcessor @Inject constructor( private val nullButton = TouchButton(Rectangle(), -1, true) } -} \ No newline at end of file +} diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/PlaceBlockActionUtils.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/PlaceBlockActionUtils.kt index d8cda29..7351be5 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/PlaceBlockActionUtils.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/PlaceBlockActionUtils.kt @@ -1,10 +1,10 @@ package ru.fredboy.cavedroid.ux.controls.action import com.badlogic.gdx.Gdx +import ru.fredboy.cavedroid.domain.items.model.item.Item import ru.fredboy.cavedroid.ux.controls.action.placeblock.IPlaceBlockAction import ru.fredboy.cavedroid.ux.controls.action.placeblock.PlaceBlockItemToBackgroundAction import ru.fredboy.cavedroid.ux.controls.action.placeblock.PlaceBlockItemToForegroundAction -import ru.fredboy.cavedroid.domain.items.model.item.Item private const val TAG = "PlaceBlockActionUtils" diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/annotation/BindPlaceBlockAction.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/annotation/BindPlaceBlockAction.kt index df40318..12de70d 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/annotation/BindPlaceBlockAction.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/annotation/BindPlaceBlockAction.kt @@ -7,6 +7,6 @@ import ru.fredboy.cavedroid.ux.controls.action.placeblock.IPlaceBlockAction @BindsIntoMapStringKey( interfaceClass = IPlaceBlockAction::class, modulePackage = MultibindingConfig.GENERATED_MODULES_PACKAGE, - moduleName = "PlaceBlockActionsModule" + moduleName = "PlaceBlockActionsModule", ) annotation class BindPlaceBlockAction(val stringKey: String) diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/annotation/BindUseBlockAction.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/annotation/BindUseBlockAction.kt index 98be714..a0adf2e 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/annotation/BindUseBlockAction.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/annotation/BindUseBlockAction.kt @@ -7,6 +7,6 @@ import ru.fredboy.cavedroid.ux.controls.action.useblock.IUseBlockAction @BindsIntoMapStringKey( interfaceClass = IUseBlockAction::class, modulePackage = MultibindingConfig.GENERATED_MODULES_PACKAGE, - moduleName = "UseBlockActionsModule" + moduleName = "UseBlockActionsModule", ) annotation class BindUseBlockAction(val stringKey: String) diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/annotation/BindUseItemAction.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/annotation/BindUseItemAction.kt index da6bb6d..a82236b 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/annotation/BindUseItemAction.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/annotation/BindUseItemAction.kt @@ -7,6 +7,6 @@ import ru.fredboy.cavedroid.ux.controls.action.useitem.IUseItemAction @BindsIntoMapStringKey( interfaceClass = IUseItemAction::class, modulePackage = MultibindingConfig.GENERATED_MODULES_PACKAGE, - moduleName = "UseItemActionsModule" + moduleName = "UseItemActionsModule", ) annotation class BindUseItemAction(val stringKey: String) diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/placeblock/IPlaceBlockAction.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/placeblock/IPlaceBlockAction.kt index 047ef6e..3d1c4b9 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/placeblock/IPlaceBlockAction.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/placeblock/IPlaceBlockAction.kt @@ -5,5 +5,4 @@ import ru.fredboy.cavedroid.domain.items.model.item.Item interface IPlaceBlockAction { fun place(placeable: Item.Placeable, x: Int, y: Int) - } diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/placeblock/PlaceBlockItemToForegroundAction.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/placeblock/PlaceBlockItemToForegroundAction.kt index 0b1d1db..89441b0 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/placeblock/PlaceBlockItemToForegroundAction.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/placeblock/PlaceBlockItemToForegroundAction.kt @@ -28,5 +28,4 @@ class PlaceBlockItemToForegroundAction @Inject constructor( companion object { const val ACTION_KEY = "place_foreground_block" } - } diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/placeblock/PlaceSlabAction.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/placeblock/PlaceSlabAction.kt index 82c7d84..907b757 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/placeblock/PlaceSlabAction.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/placeblock/PlaceSlabAction.kt @@ -21,10 +21,13 @@ class PlaceSlabAction @Inject constructor( return } - val slabPart = if ((gameWorld.hasForeAt(x, y - 1) - || gameWorld.getForeMap(x - 1, y) == placeable.topPartBlock - || gameWorld.getForeMap(x + 1, y) == placeable.topPartBlock) - && !gameWorld.hasForeAt(x, y + 1)) { + val slabPart = if (( + gameWorld.hasForeAt(x, y - 1) || + gameWorld.getForeMap(x - 1, y) == placeable.topPartBlock || + gameWorld.getForeMap(x + 1, y) == placeable.topPartBlock + ) && + !gameWorld.hasForeAt(x, y + 1) + ) { placeable.topPartBlock } else { placeable.bottomPartBlock @@ -39,4 +42,4 @@ class PlaceSlabAction @Inject constructor( private const val TAG = "PlaceSlabAction" const val ACTION_KEY = "place_slab" } -} \ No newline at end of file +} diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useblock/IUseBlockAction.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useblock/IUseBlockAction.kt index 5ffe163..04b79d5 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useblock/IUseBlockAction.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useblock/IUseBlockAction.kt @@ -5,5 +5,4 @@ import ru.fredboy.cavedroid.domain.items.model.block.Block interface IUseBlockAction { fun perform(block: Block, x: Int, y: Int) - -} \ No newline at end of file +} diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useblock/UseChestAction.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useblock/UseChestAction.kt index 306aead..dae9fb4 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useblock/UseChestAction.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useblock/UseChestAction.kt @@ -19,7 +19,7 @@ class UseChestAction @Inject constructor( override fun perform(block: Block, x: Int, y: Int) { // TODO: transform x val chest = (containerController.getContainer(x, y, Layer.FOREGROUND.z) as? Chest) - ?: (containerController.getContainer(x, y, Layer.BACKGROUND.z) as? Chest) + ?: (containerController.getContainer(x, y, Layer.BACKGROUND.z) as? Chest) ?: return gameWindowsManager.openChest(chest) } @@ -27,4 +27,4 @@ class UseChestAction @Inject constructor( companion object { const val KEY = "chest" } -} \ No newline at end of file +} diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useblock/UseCraftingTableAction.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useblock/UseCraftingTableAction.kt index c03310b..562f55d 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useblock/UseCraftingTableAction.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useblock/UseCraftingTableAction.kt @@ -9,7 +9,7 @@ import javax.inject.Inject @GameScope @BindUseBlockAction(stringKey = UseCraftingTableAction.KEY) class UseCraftingTableAction @Inject constructor( - private val gameWindowsManager: GameWindowsManager + private val gameWindowsManager: GameWindowsManager, ) : IUseBlockAction { override fun perform(block: Block, x: Int, y: Int) { @@ -19,4 +19,4 @@ class UseCraftingTableAction @Inject constructor( companion object { const val KEY = "crafting_table" } -} \ No newline at end of file +} diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useblock/UseFurnaceAction.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useblock/UseFurnaceAction.kt index 392a8ff..aae58d8 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useblock/UseFurnaceAction.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useblock/UseFurnaceAction.kt @@ -18,8 +18,10 @@ class UseFurnaceAction @Inject constructor( override fun perform(block: Block, x: Int, y: Int) { // TODO: transform x - val furnace = (containerController.getContainer(x, y, Layer.FOREGROUND.z) - ?: containerController.getContainer(x, y, Layer.FOREGROUND.z)) as? Furnace + val furnace = ( + containerController.getContainer(x, y, Layer.FOREGROUND.z) + ?: containerController.getContainer(x, y, Layer.FOREGROUND.z) + ) as? Furnace furnace ?: return gameWindowsManager.openFurnace(furnace) @@ -28,4 +30,4 @@ class UseFurnaceAction @Inject constructor( companion object { const val KEY = "furnace" } -} \ No newline at end of file +} diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useitem/IUseItemAction.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useitem/IUseItemAction.kt index fb7af2f..08b9073 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useitem/IUseItemAction.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useitem/IUseItemAction.kt @@ -5,5 +5,4 @@ import ru.fredboy.cavedroid.domain.items.model.item.Item interface IUseItemAction { fun perform(item: Item.Usable, x: Int, y: Int) - -} \ No newline at end of file +} diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useitem/UseBedAction.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useitem/UseBedAction.kt index 73f6476..c45ae53 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useitem/UseBedAction.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useitem/UseBedAction.kt @@ -13,7 +13,7 @@ import javax.inject.Inject class UseBedAction @Inject constructor( private val gameWorld: GameWorld, private val mobController: MobController, - private val getBlockByKeyUseCase: GetBlockByKeyUseCase + private val getBlockByKeyUseCase: GetBlockByKeyUseCase, ) : IUseItemAction { override fun perform(item: Item.Usable, x: Int, y: Int) { diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useitem/UseWaterBucketAction.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useitem/UseWaterBucketAction.kt index 2964111..c02f5e1 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useitem/UseWaterBucketAction.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useitem/UseWaterBucketAction.kt @@ -28,5 +28,4 @@ class UseWaterBucketAction @Inject constructor( companion object { const val ACTION_KEY = "use_water_bucket" } - } diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/IGameInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/IGameInputHandler.kt index 2555f60..5cccba3 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/IGameInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/IGameInputHandler.kt @@ -21,5 +21,4 @@ interface IGameInputHandler { * This will not be called if [checkConditions] returned false */ fun handle(action: A) - -} \ No newline at end of file +} 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 fa319e5..57d74e2 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 @@ -8,13 +8,13 @@ fun MouseInputAction.isInsideHotbar(getTextureRegionByNameUseCase: GetTextureReg val hotbar = requireNotNull(getTextureRegionByNameUseCase["hotbar"]) return this.screenY <= hotbar.regionHeight && - this.screenX >= this.cameraViewport.width / 2 - hotbar.regionWidth / 2 && - this.screenX <= this.cameraViewport.width / 2 + hotbar.regionWidth / 2 + this.screenX >= this.cameraViewport.width / 2 - hotbar.regionWidth / 2 && + 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 + 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/action/IGameInputAction.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/action/IGameInputAction.kt index 3238829..41b9f22 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/action/IGameInputAction.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/action/IGameInputAction.kt @@ -1,3 +1,3 @@ package ru.fredboy.cavedroid.ux.controls.input.action -interface IGameInputAction \ No newline at end of file +interface IGameInputAction diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/action/KeyboardInputAction.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/action/KeyboardInputAction.kt index aedfb4b..bc6dac5 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/action/KeyboardInputAction.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/action/KeyboardInputAction.kt @@ -5,4 +5,4 @@ import ru.fredboy.cavedroid.ux.controls.input.action.keys.KeyboardInputActionKey data class KeyboardInputAction( val actionKey: KeyboardInputActionKey, val isKeyDown: Boolean, -) : IGameInputAction \ No newline at end of file +) : IGameInputAction diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/action/MouseInputAction.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/action/MouseInputAction.kt index 99e1550..620f029 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/action/MouseInputAction.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/action/MouseInputAction.kt @@ -7,5 +7,5 @@ data class MouseInputAction( val screenX: Float, val screenY: Float, val actionKey: MouseInputActionKey, - val cameraViewport: Rectangle -) : IGameInputAction \ No newline at end of file + val cameraViewport: Rectangle, +) : IGameInputAction diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/action/keys/KeyboardInputActionKey.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/action/keys/KeyboardInputActionKey.kt index 87cb9a3..bbbd3b9 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/action/keys/KeyboardInputActionKey.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/action/keys/KeyboardInputActionKey.kt @@ -23,6 +23,6 @@ sealed interface KeyboardInputActionKey { data object ShowMap : KeyboardInputActionKey data class SelectHotbarSlot( - val slot: Int + val slot: Int, ) : KeyboardInputActionKey -} \ No newline at end of file +} diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/action/keys/MouseInputActionKey.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/action/keys/MouseInputActionKey.kt index 33ed221..a7ffd01 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/action/keys/MouseInputActionKey.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/action/keys/MouseInputActionKey.kt @@ -14,22 +14,22 @@ sealed interface MouseInputActionKey { } data class Dragged( - override val pointer: Int + override val pointer: Int, ) : Touch { override val touchUp: Boolean get() = throw IllegalAccessException("not applicable for mouse dragged action") } data class Left( - override val touchUp: Boolean + override val touchUp: Boolean, ) : MouseInputActionKey data class Right( - override val touchUp: Boolean + override val touchUp: Boolean, ) : MouseInputActionKey data class Middle( - override val touchUp: Boolean + override val touchUp: Boolean, ) : MouseInputActionKey data class Screen( @@ -39,10 +39,9 @@ sealed interface MouseInputActionKey { data class Scroll( val amountX: Float, - val amountY: Float + val amountY: Float, ) : MouseInputActionKey { override val touchUp: Boolean get() = throw IllegalAccessException("not applicable for mouse scroll action") } - -} \ No newline at end of file +} diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/annotation/BindKeyboardInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/annotation/BindKeyboardInputHandler.kt index a97348c..30bc23c 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/annotation/BindKeyboardInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/annotation/BindKeyboardInputHandler.kt @@ -7,6 +7,6 @@ import ru.fredboy.cavedroid.ux.controls.input.IKeyboardInputHandler @BindsIntoSet( interfaceClass = IKeyboardInputHandler::class, modulePackage = MultibindingConfig.GENERATED_MODULES_PACKAGE, - moduleName = "KeyboardInputHandlersModule" + moduleName = "KeyboardInputHandlersModule", ) -annotation class BindKeyboardInputHandler \ No newline at end of file +annotation class BindKeyboardInputHandler diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/annotation/BindMouseInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/annotation/BindMouseInputHandler.kt index c247981..bfd5d88 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/annotation/BindMouseInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/annotation/BindMouseInputHandler.kt @@ -7,6 +7,6 @@ import ru.fredboy.cavedroid.ux.controls.input.IMouseInputHandler @BindsIntoSet( interfaceClass = IMouseInputHandler::class, modulePackage = MultibindingConfig.GENERATED_MODULES_PACKAGE, - moduleName = "MouseInputHandlersModule" + moduleName = "MouseInputHandlersModule", ) -annotation class BindMouseInputHandler \ No newline at end of file +annotation class BindMouseInputHandler 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 b42e75c..39666c1 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 @@ -21,21 +21,21 @@ class CloseGameWindowKeyboardInputHandler @Inject constructor( override fun checkConditions(action: KeyboardInputAction): Boolean { return action.actionKey is KeyboardInputActionKey.OpenInventory && - !action.isKeyDown && gameWindowsManager.currentWindowType != GameWindowType.NONE + !action.isKeyDown && gameWindowsManager.currentWindowType != GameWindowType.NONE } override fun handle(action: KeyboardInputAction) { val selectedItem = gameWindowsManager.currentWindow?.selectedItem if (selectedItem != null) { - for (i in 1 .. selectedItem.amount) { + for (i in 1..selectedItem.amount) { dropController.addDrop( /* x = */ mobController.player.x + (32f * mobController.player.direction.basis), /* y = */ mobController.player.y, - /* item = */ selectedItem + /* item = */ selectedItem, ) } gameWindowsManager.currentWindow?.selectedItem = null } gameWindowsManager.closeWindow() } -} \ No newline at end of file +} 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 60a9ff8..e3f51e4 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 @@ -23,8 +23,8 @@ class DropItemKeyboardInputHandler @Inject constructor( override fun checkConditions(action: KeyboardInputAction): Boolean { return action.actionKey is KeyboardInputActionKey.DropItem && - action.isKeyDown && gameWindowsManager.currentWindowType == GameWindowType.NONE && - !mobController.player.activeItem.item.isNone() + action.isKeyDown && gameWindowsManager.currentWindowType == GameWindowType.NONE && + !mobController.player.activeItem.item.isNone() } private fun createDrop(item: Item, playerX: Float, playerY: Float, amount: Int) { @@ -32,14 +32,14 @@ class DropItemKeyboardInputHandler @Inject constructor( /* x = */ playerX + ((DROP_DISTANCE - Drop.DROP_SIZE / 2) * mobController.player.direction.basis), /* y = */ playerY, /* item = */ item, - /* count = */ amount + /* count = */ amount, ) } override fun handle(action: KeyboardInputAction) { val player = mobController.player val currentItem = player.activeItem - val dropAmount = if (currentItem.item.isTool()) currentItem.amount else 1 + val dropAmount = if (currentItem.item.isTool()) currentItem.amount else 1 createDrop(currentItem.item, player.x, player.y, dropAmount) player.decreaseCurrentItemCount(dropAmount) @@ -48,4 +48,4 @@ class DropItemKeyboardInputHandler @Inject constructor( companion object { const val DROP_DISTANCE = 20f } -} \ No newline at end of file +} 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 4140e4e..a2e4acc 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 @@ -2,7 +2,6 @@ package ru.fredboy.cavedroid.ux.controls.input.handler.keyboard import ru.fredboy.cavedroid.common.di.GameScope import ru.fredboy.cavedroid.domain.configuration.repository.ApplicationContextRepository -import ru.fredboy.cavedroid.domain.configuration.repository.GameContextRepository import ru.fredboy.cavedroid.entity.mob.model.Player import ru.fredboy.cavedroid.game.controller.mob.MobController import ru.fredboy.cavedroid.ux.controls.input.IKeyboardInputHandler @@ -20,8 +19,8 @@ class FlyDownKeyboardInputHandler @Inject constructor( override fun checkConditions(action: KeyboardInputAction): Boolean { return action.actionKey is KeyboardInputActionKey.Down && - mobController.player.isFlyMode && - (mobController.player.controlMode == Player.ControlMode.WALK || !applicationContextRepository.isTouch()) + mobController.player.isFlyMode && + (mobController.player.controlMode == Player.ControlMode.WALK || !applicationContextRepository.isTouch()) } override fun handle(action: KeyboardInputAction) { @@ -31,5 +30,4 @@ class FlyDownKeyboardInputHandler @Inject constructor( mobController.player.velocity.y = 0f } } - -} \ No newline at end of file +} 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 267aa64..c590170 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 @@ -2,7 +2,6 @@ package ru.fredboy.cavedroid.ux.controls.input.handler.keyboard import ru.fredboy.cavedroid.common.di.GameScope import ru.fredboy.cavedroid.domain.configuration.repository.ApplicationContextRepository -import ru.fredboy.cavedroid.domain.configuration.repository.GameContextRepository import ru.fredboy.cavedroid.entity.mob.model.Player import ru.fredboy.cavedroid.game.controller.mob.MobController import ru.fredboy.cavedroid.ux.controls.input.IKeyboardInputHandler @@ -20,9 +19,9 @@ class FlyUpKeyboardInputHandler @Inject constructor( 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()) + !mobController.player.swim && + mobController.player.isFlyMode && + (mobController.player.controlMode == Player.ControlMode.WALK || !applicationContextRepository.isTouch()) } override fun handle(action: KeyboardInputAction) { @@ -32,5 +31,4 @@ class FlyUpKeyboardInputHandler @Inject constructor( mobController.player.velocity.y = 0f } } - -} \ No newline at end of file +} diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/GoLeftKeyboardInputHandler.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/GoLeftKeyboardInputHandler.kt index 7093770..4db1e24 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/GoLeftKeyboardInputHandler.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/GoLeftKeyboardInputHandler.kt @@ -2,7 +2,6 @@ package ru.fredboy.cavedroid.ux.controls.input.handler.keyboard import ru.fredboy.cavedroid.common.di.GameScope import ru.fredboy.cavedroid.domain.configuration.repository.ApplicationContextRepository -import ru.fredboy.cavedroid.domain.configuration.repository.GameContextRepository import ru.fredboy.cavedroid.entity.mob.model.Direction import ru.fredboy.cavedroid.entity.mob.model.Player import ru.fredboy.cavedroid.game.controller.mob.MobController @@ -22,8 +21,8 @@ class GoLeftKeyboardInputHandler @Inject constructor( override fun checkConditions(action: KeyboardInputAction): Boolean { val isTouch = applicationContextRepository.isTouch() return action.actionKey is KeyboardInputActionKey.Left && - (mobController.player.controlMode == Player.ControlMode.WALK || !isTouch) && - (mobController.player.controlMode == Player.ControlMode.WALK || !isTouch) + (mobController.player.controlMode == Player.ControlMode.WALK || !isTouch) && + (mobController.player.controlMode == Player.ControlMode.WALK || !isTouch) } override fun handle(action: KeyboardInputAction) { @@ -34,4 +33,4 @@ class GoLeftKeyboardInputHandler @Inject constructor( mobController.player.velocity.x = 0f } } -} \ No newline at end of file +} 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 dbb165d..c3a7a66 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 @@ -2,7 +2,6 @@ package ru.fredboy.cavedroid.ux.controls.input.handler.keyboard import ru.fredboy.cavedroid.common.di.GameScope import ru.fredboy.cavedroid.domain.configuration.repository.ApplicationContextRepository -import ru.fredboy.cavedroid.domain.configuration.repository.GameContextRepository import ru.fredboy.cavedroid.entity.mob.model.Direction import ru.fredboy.cavedroid.entity.mob.model.Player import ru.fredboy.cavedroid.game.controller.mob.MobController @@ -16,12 +15,12 @@ import javax.inject.Inject @BindKeyboardInputHandler class GoRightKeyboardInputHandler @Inject constructor( private val applicationContextRepository: ApplicationContextRepository, - private val mobController: MobController + 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()) + (mobController.player.controlMode == Player.ControlMode.WALK || !applicationContextRepository.isTouch()) } override fun handle(action: KeyboardInputAction) { @@ -32,4 +31,4 @@ class GoRightKeyboardInputHandler @Inject constructor( mobController.player.velocity.x = 0f } } -} \ No newline at end of file +} 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 fbd729d..58152e1 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 @@ -2,7 +2,6 @@ package ru.fredboy.cavedroid.ux.controls.input.handler.keyboard import ru.fredboy.cavedroid.common.di.GameScope import ru.fredboy.cavedroid.domain.configuration.repository.ApplicationContextRepository -import ru.fredboy.cavedroid.domain.configuration.repository.GameContextRepository import ru.fredboy.cavedroid.entity.mob.model.Player import ru.fredboy.cavedroid.game.controller.mob.MobController import ru.fredboy.cavedroid.ux.controls.input.IKeyboardInputHandler @@ -20,13 +19,12 @@ class JumpKeyboardInputHandler @Inject constructor( 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()) + mobController.player.canJump && !mobController.player.isFlyMode && + action.isKeyDown && + (mobController.player.controlMode == Player.ControlMode.WALK || !applicationContextRepository.isTouch()) } override fun handle(action: KeyboardInputAction) { mobController.player.jump() } - -} \ No newline at end of file +} 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 2c74f55..75bc8ac 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 @@ -2,7 +2,6 @@ package ru.fredboy.cavedroid.ux.controls.input.handler.keyboard import ru.fredboy.cavedroid.common.di.GameScope import ru.fredboy.cavedroid.domain.configuration.repository.ApplicationContextRepository -import ru.fredboy.cavedroid.domain.configuration.repository.GameContextRepository import ru.fredboy.cavedroid.entity.mob.model.Player import ru.fredboy.cavedroid.game.controller.mob.MobController import ru.fredboy.cavedroid.ux.controls.input.IKeyboardInputHandler @@ -20,11 +19,13 @@ class MoveCursorControlsModeKeyboardInputHandler @Inject constructor( 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) + 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) { @@ -40,4 +41,4 @@ class MoveCursorControlsModeKeyboardInputHandler @Inject constructor( mobsController.checkPlayerCursorBounds() } -} \ No newline at end of file +} 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 505a279..6d27dc9 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 @@ -19,7 +19,7 @@ class OpenInventoryKeyboardInputHandler @Inject constructor( override fun checkConditions(action: KeyboardInputAction): Boolean { return action.actionKey is KeyboardInputActionKey.OpenInventory && - !action.isKeyDown && gameWindowsManager.currentWindowType == GameWindowType.NONE + !action.isKeyDown && gameWindowsManager.currentWindowType == GameWindowType.NONE } override fun handle(action: KeyboardInputAction) { @@ -29,4 +29,4 @@ class OpenInventoryKeyboardInputHandler @Inject constructor( gameWindowsManager.openSurvivalInventory() } } -} \ No newline at end of file +} 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 25f598c..418c32d 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 @@ -3,7 +3,6 @@ package ru.fredboy.cavedroid.ux.controls.input.handler.keyboard import ru.fredboy.cavedroid.common.api.ApplicationController import ru.fredboy.cavedroid.common.di.GameScope import ru.fredboy.cavedroid.domain.configuration.repository.ApplicationContextRepository -import ru.fredboy.cavedroid.domain.configuration.repository.GameContextRepository import ru.fredboy.cavedroid.domain.save.repository.SaveDataRepository import ru.fredboy.cavedroid.game.controller.container.ContainerController import ru.fredboy.cavedroid.game.controller.drop.DropController @@ -50,4 +49,4 @@ class PauseGameKeyboardInputHandler @Inject constructor( gameController.quitGame() } -} \ No newline at end of file +} 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 d4e5660..1958282 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 @@ -16,11 +16,10 @@ class SelectHotbarSlotKeyboardInputHandler @Inject constructor( override fun checkConditions(action: KeyboardInputAction): Boolean { return action.actionKey is KeyboardInputActionKey.SelectHotbarSlot && - action.isKeyDown + action.isKeyDown } override fun handle(action: KeyboardInputAction) { mobController.player.activeSlot = (action.actionKey as KeyboardInputActionKey.SelectHotbarSlot).slot } - -} \ No newline at end of file +} 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 8564309..32ae3e9 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 @@ -2,7 +2,6 @@ package ru.fredboy.cavedroid.ux.controls.input.handler.keyboard import ru.fredboy.cavedroid.common.di.GameScope import ru.fredboy.cavedroid.domain.configuration.repository.ApplicationContextRepository -import ru.fredboy.cavedroid.domain.configuration.repository.GameContextRepository import ru.fredboy.cavedroid.entity.mob.model.Player import ru.fredboy.cavedroid.game.controller.mob.MobController import ru.fredboy.cavedroid.ux.controls.input.IKeyboardInputHandler @@ -20,12 +19,11 @@ class StopSwimKeyboardInputHandler @Inject constructor( 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()) + mobController.player.swim && + (mobController.player.controlMode == Player.ControlMode.WALK || !applicationContextRepository.isTouch()) } override fun handle(action: KeyboardInputAction) { mobController.player.swim = false } - -} \ No newline at end of file +} 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 5a5b67a..ee70c71 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 @@ -2,7 +2,6 @@ package ru.fredboy.cavedroid.ux.controls.input.handler.keyboard import ru.fredboy.cavedroid.common.di.GameScope import ru.fredboy.cavedroid.domain.configuration.repository.ApplicationContextRepository -import ru.fredboy.cavedroid.domain.configuration.repository.GameContextRepository import ru.fredboy.cavedroid.entity.mob.model.Player import ru.fredboy.cavedroid.game.controller.mob.MobController import ru.fredboy.cavedroid.game.world.GameWorld @@ -26,14 +25,13 @@ class SwimUpKeyboardInputHandler @Inject constructor( 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()) + !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 } - -} \ No newline at end of file +} 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 e39c71f..eb80b61 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 @@ -2,7 +2,6 @@ package ru.fredboy.cavedroid.ux.controls.input.handler.keyboard import ru.fredboy.cavedroid.common.di.GameScope import ru.fredboy.cavedroid.domain.configuration.repository.ApplicationContextRepository -import ru.fredboy.cavedroid.domain.configuration.repository.GameContextRepository import ru.fredboy.cavedroid.entity.mob.model.Player import ru.fredboy.cavedroid.game.controller.mob.MobController import ru.fredboy.cavedroid.ux.controls.input.IKeyboardInputHandler @@ -19,8 +18,8 @@ class ToggleControlsModeKeyboardInputHandler @Inject constructor( ) : IKeyboardInputHandler { override fun checkConditions(action: KeyboardInputAction): Boolean { - return action.actionKey is KeyboardInputActionKey.SwitchControlsMode && !action.isKeyDown - && applicationContextRepository.isTouch() + return action.actionKey is KeyboardInputActionKey.SwitchControlsMode && !action.isKeyDown && + applicationContextRepository.isTouch() } override fun handle(action: KeyboardInputAction) { @@ -30,5 +29,4 @@ class ToggleControlsModeKeyboardInputHandler @Inject constructor( mobController.player.controlMode = Player.ControlMode.WALK } } - -} \ No newline at end of file +} 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 14b6aa4..ad89b5d 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 @@ -21,4 +21,4 @@ class ToggleDebugInfoKeyboardInputHandler @Inject constructor( override fun handle(action: KeyboardInputAction) { gameContextRepository.setShowInfo(!gameContextRepository.shouldShowInfo()) } -} \ No newline at end of file +} 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 0ff13db..99ac3e7 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 @@ -11,10 +11,9 @@ import javax.inject.Inject @GameScope @BindKeyboardInputHandler class ToggleGameModeKeyboardInputHandler @Inject constructor( - private val mobController: MobController + private val mobController: MobController, ) : IKeyboardInputHandler { - override fun checkConditions(action: KeyboardInputAction): Boolean { return action.actionKey is KeyboardInputActionKey.SwitchGameMode && action.isKeyDown } @@ -26,6 +25,4 @@ class ToggleGameModeKeyboardInputHandler @Inject constructor( mobController.player.gameMode = 1 } } - - -} \ No newline at end of file +} 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 792bfeb..e914b2b 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 @@ -21,4 +21,4 @@ class ToggleMinimapKeyboardInputHandler @Inject constructor( override fun handle(action: KeyboardInputAction) { gameContextRepository.setShowMap(!gameContextRepository.shouldShowMap()) } -} \ No newline at end of file +} 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 3f69b77..e7dfaa7 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 @@ -2,7 +2,6 @@ package ru.fredboy.cavedroid.ux.controls.input.handler.keyboard import ru.fredboy.cavedroid.common.di.GameScope import ru.fredboy.cavedroid.domain.configuration.repository.ApplicationContextRepository -import ru.fredboy.cavedroid.domain.configuration.repository.GameContextRepository import ru.fredboy.cavedroid.entity.mob.model.Player import ru.fredboy.cavedroid.game.controller.mob.MobController import ru.fredboy.cavedroid.ux.controls.input.IKeyboardInputHandler @@ -20,14 +19,13 @@ class TurnOnFlyModeKeyboardInputHandler @Inject constructor( 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()) + !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 mobsController.player.velocity.y = 0f } - -} \ No newline at end of file +} 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 16e371c..923454a 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 @@ -23,11 +23,13 @@ abstract class AbstractInventoryItemsMouseInputHandler( 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) + 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) { @@ -48,7 +50,7 @@ abstract class AbstractInventoryItemsMouseInputHandler( action: MouseInputAction, items: MutableList, window: AbstractInventoryWindow, - index: Int + index: Int, ) { if (action.actionKey is MouseInputActionKey.Screen) { if (!action.actionKey.touchUp) { @@ -71,12 +73,15 @@ abstract class AbstractInventoryItemsMouseInputHandler( action: MouseInputAction, items: MutableList, window: AbstractInventoryWindow, - index: Int + index: Int, ) { val selectedItem = window.selectedItem - if (!selectedItem.isNoneOrNull() && (selectedItem.item != items[index].item || - !selectedItem.canBeAdded(items[index].amount))) { + if (!selectedItem.isNoneOrNull() && ( + selectedItem.item != items[index].item || + !selectedItem.canBeAdded(items[index].amount) + ) + ) { return } @@ -96,7 +101,5 @@ abstract class AbstractInventoryItemsMouseInputHandler( if (window is AbstractInventoryWindowWithCraftGrid) { reduceCraftItems(window) } - } - -} \ No newline at end of file +} 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 835d4be..7ca10c5 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 @@ -22,9 +22,8 @@ class AttackMouseInputHandler @Inject constructor( override fun checkConditions(action: MouseInputAction): Boolean { return gameWindowsManager.currentWindowType == GameWindowType.NONE && - !action.isInsideHotbar(textureRegions) && - action.actionKey is MouseInputActionKey.Left - + !action.isInsideHotbar(textureRegions) && + action.actionKey is MouseInputActionKey.Left } override fun handle(action: MouseInputAction) { @@ -34,4 +33,4 @@ class AttackMouseInputHandler @Inject constructor( mobController.player.startHitting() } } -} \ No newline at end of file +} 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 073a8ee..b01db7a 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 @@ -31,9 +31,9 @@ class CloseGameWindowMouseInputHandler @Inject constructor( 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()) + (action.actionKey is MouseInputActionKey.Left || action.actionKey is MouseInputActionKey.Screen) && + action.actionKey.touchUp && + !isInsideWindow(action, getCurrentWindowTexture()) } private fun getCurrentWindowTexture(): TextureRegion { @@ -50,15 +50,14 @@ class CloseGameWindowMouseInputHandler @Inject constructor( override fun handle(action: MouseInputAction) { val selectedItem = gameWindowsManager.currentWindow?.selectedItem if (selectedItem != null) { - dropController.addDrop( - /* x = */ mobController.player.x + (32f * mobController.player.direction.basis), - /* y = */ mobController.player.y, - /* item = */ selectedItem.item, - /* count = */ selectedItem.amount, - ) + dropController.addDrop( + /* x = */ mobController.player.x + (32f * mobController.player.direction.basis), + /* y = */ mobController.player.y, + /* item = */ selectedItem.item, + /* count = */ selectedItem.amount, + ) gameWindowsManager.currentWindow?.selectedItem = null } gameWindowsManager.closeWindow() } - } 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 ef0ec2e..07d3919 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 @@ -4,7 +4,6 @@ import com.badlogic.gdx.math.MathUtils import ru.fredboy.cavedroid.common.di.GameScope import ru.fredboy.cavedroid.domain.assets.usecase.GetTextureRegionByNameUseCase import ru.fredboy.cavedroid.domain.configuration.repository.ApplicationContextRepository -import ru.fredboy.cavedroid.domain.configuration.repository.GameContextRepository import ru.fredboy.cavedroid.domain.items.repository.ItemsRepository import ru.fredboy.cavedroid.game.window.GameWindowType import ru.fredboy.cavedroid.game.window.GameWindowsManager @@ -32,25 +31,26 @@ class CreativeInventoryScrollMouseInputHandler @Inject constructor( 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) - + (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 + !action.actionKey.touchUp && !gameWindowsManager.isDragging } private fun checkEndDragConditions(action: MouseInputAction): Boolean { return action.actionKey is MouseInputActionKey.Screen && - action.actionKey.touchUp && gameWindowsManager.isDragging + 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 + abs(action.screenY - dragStartY) >= DRAG_SENSITIVITY } private fun clampScrollAmount() { @@ -58,7 +58,7 @@ class CreativeInventoryScrollMouseInputHandler @Inject constructor( MathUtils.clamp( /* value = */ gameWindowsManager.creativeScrollAmount, /* min = */ 0, - /* max = */ (gameWindowsManager.currentWindow as CreativeInventoryWindow).getMaxScroll(itemsRepository) + /* max = */ (gameWindowsManager.currentWindow as CreativeInventoryWindow).getMaxScroll(itemsRepository), ) } @@ -94,4 +94,4 @@ class CreativeInventoryScrollMouseInputHandler @Inject constructor( companion object { private const val DRAG_SENSITIVITY = 16f } -} \ No newline at end of file +} 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 a8f5d1e..6f3cd6a 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 @@ -2,11 +2,10 @@ package ru.fredboy.cavedroid.ux.controls.input.handler.mouse import com.badlogic.gdx.math.MathUtils import ru.fredboy.cavedroid.common.di.GameScope -import ru.fredboy.cavedroid.domain.assets.usecase.GetTextureRegionByNameUseCase import ru.fredboy.cavedroid.common.utils.bl import ru.fredboy.cavedroid.common.utils.px +import ru.fredboy.cavedroid.domain.assets.usecase.GetTextureRegionByNameUseCase import ru.fredboy.cavedroid.domain.configuration.repository.ApplicationContextRepository -import ru.fredboy.cavedroid.domain.configuration.repository.GameContextRepository import ru.fredboy.cavedroid.domain.items.model.block.Block import ru.fredboy.cavedroid.domain.items.usecase.GetItemByIndexUseCase import ru.fredboy.cavedroid.entity.mob.model.Direction @@ -102,20 +101,31 @@ class CursorMouseInputHandler @Inject constructor( private fun getCreativeTooltip(action: MouseInputAction): String? { val creativeTexture = creativeInventoryTexture - val xOnGrid = (action.screenX - (action.cameraViewport.width / 2 - creativeTexture.regionWidth / 2 + - GameWindowsConfigs.Creative.itemsGridMarginLeft)) / - GameWindowsConfigs.Creative.itemsGridColWidth - val yOnGrid = (action.screenY - (action.cameraViewport.height / 2 - creativeTexture.regionHeight / 2 + - GameWindowsConfigs.Creative.itemsGridMarginTop)) / - GameWindowsConfigs.Creative.itemsGridRowHeight + val xOnGrid = ( + action.screenX - ( + action.cameraViewport.width / 2 - creativeTexture.regionWidth / 2 + + GameWindowsConfigs.Creative.itemsGridMarginLeft + ) + ) / + GameWindowsConfigs.Creative.itemsGridColWidth + val yOnGrid = ( + action.screenY - ( + action.cameraViewport.height / 2 - creativeTexture.regionHeight / 2 + + GameWindowsConfigs.Creative.itemsGridMarginTop + ) + ) / + GameWindowsConfigs.Creative.itemsGridRowHeight if (xOnGrid < 0 || xOnGrid >= GameWindowsConfigs.Creative.itemsInRow || - yOnGrid < 0 || yOnGrid >= GameWindowsConfigs.Creative.itemsInCol) { + yOnGrid < 0 || yOnGrid >= GameWindowsConfigs.Creative.itemsInCol + ) { return null } - val itemIndex = (gameWindowsManager.creativeScrollAmount * GameWindowsConfigs.Creative.itemsInRow + - (xOnGrid.toInt() + yOnGrid.toInt() * GameWindowsConfigs.Creative.itemsInRow)) + val itemIndex = ( + gameWindowsManager.creativeScrollAmount * GameWindowsConfigs.Creative.itemsInRow + + (xOnGrid.toInt() + yOnGrid.toInt() * GameWindowsConfigs.Creative.itemsInRow) + ) val item = getItemByIndexUseCase[itemIndex] return item.params.name @@ -148,5 +158,4 @@ class CursorMouseInputHandler @Inject constructor( tooltipManager.showMouseTooltip(getCreativeTooltip(action).orEmpty()) } } - -} \ No newline at end of file +} 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 81ef0ce..e471ef3 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 @@ -33,10 +33,12 @@ class HotbarMouseInputHandler @Inject constructor( 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 + ( + (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() { @@ -49,14 +51,18 @@ class HotbarMouseInputHandler @Inject constructor( /* x = */ playerX + ((DROP_DISTANCE - Drop.DROP_SIZE / 2) * mobController.player.direction.basis), /* y = */ playerY, /* item = */ item, - /* count = */ amount + /* count = */ amount, ) } private fun getActionSlot(action: MouseInputAction): Int { - return ((action.screenX - - (action.cameraViewport.width / 2 - hotbarTexture.regionWidth / 2)) - / HOTBAR_CELL_WIDTH).toInt() + return ( + ( + action.screenX - + (action.cameraViewport.width / 2 - hotbarTexture.regionWidth / 2) + ) / + HOTBAR_CELL_WIDTH + ).toInt() } private fun handleHold(action: MouseInputAction) { @@ -125,5 +131,4 @@ class HotbarMouseInputHandler @Inject constructor( private const val TOUCH_HOLD_TIME_SEC = 0.5f private const val HOTBAR_CELL_WIDTH = 20 } - -} \ No newline at end of file +} 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 6d99e2d..0b6e035 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 @@ -50,21 +50,20 @@ class SelectChestInventoryItemMouseInputHandler @Inject constructor( val yOnWindow = action.screenY - (action.cameraViewport.height / 2 - texture.regionHeight / 2) val xOnGrid = (xOnWindow - GameWindowsConfigs.Chest.itemsGridMarginLeft) / - GameWindowsConfigs.Chest.itemsGridColWidth + GameWindowsConfigs.Chest.itemsGridColWidth val yOnGrid = (yOnWindow - GameWindowsConfigs.Chest.itemsGridMarginTop) / - GameWindowsConfigs.Chest.itemsGridRowHeight + GameWindowsConfigs.Chest.itemsGridRowHeight val xOnContent = (xOnWindow - GameWindowsConfigs.Chest.contentsMarginLeft) / - GameWindowsConfigs.Chest.itemsGridColWidth + GameWindowsConfigs.Chest.itemsGridColWidth val yOnContent = (yOnWindow - GameWindowsConfigs.Chest.contentsMarginTop) / - GameWindowsConfigs.Chest.itemsGridRowHeight + GameWindowsConfigs.Chest.itemsGridRowHeight val isInsideInventoryGrid = xOnGrid >= 0 && xOnGrid < GameWindowsConfigs.Chest.itemsInRow && - yOnGrid >= 0 && yOnGrid < GameWindowsConfigs.Chest.itemsInCol + yOnGrid >= 0 && yOnGrid < GameWindowsConfigs.Chest.itemsInCol val isInsideContentGrid = xOnContent >= 0 && xOnContent < GameWindowsConfigs.Chest.contentsInRow && - yOnContent >= 0 && yOnContent < GameWindowsConfigs.Chest.contentsInCol - + yOnContent >= 0 && yOnContent < GameWindowsConfigs.Chest.contentsInCol if (isInsideInventoryGrid) { handleInsideInventoryGrid(action, xOnGrid.toInt(), yOnGrid.toInt()) @@ -72,4 +71,4 @@ class SelectChestInventoryItemMouseInputHandler @Inject constructor( handleInsideContentGrid(action, xOnContent.toInt(), yOnContent.toInt()) } } -} \ No newline at end of file +} 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 0e6d2f8..96818b3 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 @@ -60,25 +60,25 @@ class SelectCraftingInventoryItemMouseInputHandler @Inject constructor( val yOnWindow = action.screenY - (action.cameraViewport.height / 2 - texture.regionHeight / 2) val xOnGrid = (xOnWindow - GameWindowsConfigs.Crafting.itemsGridMarginLeft) / - GameWindowsConfigs.Crafting.itemsGridColWidth + GameWindowsConfigs.Crafting.itemsGridColWidth val yOnGrid = (yOnWindow - GameWindowsConfigs.Crafting.itemsGridMarginTop) / - GameWindowsConfigs.Crafting.itemsGridRowHeight + GameWindowsConfigs.Crafting.itemsGridRowHeight val xOnCraft = (xOnWindow - GameWindowsConfigs.Crafting.craftOffsetX) / - GameWindowsConfigs.Crafting.itemsGridColWidth + GameWindowsConfigs.Crafting.itemsGridColWidth val yOnCraft = (yOnWindow - GameWindowsConfigs.Crafting.craftOffsetY) / - GameWindowsConfigs.Crafting.itemsGridRowHeight + GameWindowsConfigs.Crafting.itemsGridRowHeight val isInsideInventoryGrid = xOnGrid >= 0 && xOnGrid < GameWindowsConfigs.Crafting.itemsInRow && - yOnGrid >= 0 && yOnGrid < GameWindowsConfigs.Crafting.itemsInCol + yOnGrid >= 0 && yOnGrid < GameWindowsConfigs.Crafting.itemsInCol val isInsideCraftGrid = xOnCraft >= 0 && xOnCraft < GameWindowsConfigs.Crafting.craftGridSize && - yOnCraft >= 0 && yOnCraft < GameWindowsConfigs.Crafting.craftGridSize + yOnCraft >= 0 && yOnCraft < GameWindowsConfigs.Crafting.craftGridSize val isInsideCraftResult = xOnWindow > GameWindowsConfigs.Crafting.craftResultOffsetX && - xOnWindow < GameWindowsConfigs.Crafting.craftResultOffsetX + GameWindowsConfigs.Crafting.itemsGridColWidth && - yOnWindow > GameWindowsConfigs.Crafting.craftResultOffsetY && - yOnWindow < GameWindowsConfigs.Crafting.craftResultOffsetY + GameWindowsConfigs.Crafting.itemsGridRowHeight + xOnWindow < GameWindowsConfigs.Crafting.craftResultOffsetX + GameWindowsConfigs.Crafting.itemsGridColWidth && + yOnWindow > GameWindowsConfigs.Crafting.craftResultOffsetY && + yOnWindow < GameWindowsConfigs.Crafting.craftResultOffsetY + GameWindowsConfigs.Crafting.itemsGridRowHeight if (isInsideInventoryGrid) { handleInsideInventoryGrid(action, xOnGrid.toInt(), yOnGrid.toInt()) @@ -87,6 +87,5 @@ class SelectCraftingInventoryItemMouseInputHandler @Inject constructor( } else if (isInsideCraftResult) { handleInsideCraftResult(action) } - } -} \ No newline at end of file +} 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 2236f3e..13d0bb3 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 @@ -27,29 +27,39 @@ class SelectCreativeInventoryItemMouseInputHandler @Inject constructor( 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) + !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 - val xOnGrid = (action.screenX - (action.cameraViewport.width / 2 - creativeTexture.regionWidth / 2 + - GameWindowsConfigs.Creative.itemsGridMarginLeft)) / - GameWindowsConfigs.Creative.itemsGridColWidth - val yOnGrid = (action.screenY - (action.cameraViewport.height / 2 - creativeTexture.regionHeight / 2 + - GameWindowsConfigs.Creative.itemsGridMarginTop)) / - GameWindowsConfigs.Creative.itemsGridRowHeight + val xOnGrid = ( + action.screenX - ( + action.cameraViewport.width / 2 - creativeTexture.regionWidth / 2 + + GameWindowsConfigs.Creative.itemsGridMarginLeft + ) + ) / + GameWindowsConfigs.Creative.itemsGridColWidth + val yOnGrid = ( + action.screenY - ( + action.cameraViewport.height / 2 - creativeTexture.regionHeight / 2 + + GameWindowsConfigs.Creative.itemsGridMarginTop + ) + ) / + GameWindowsConfigs.Creative.itemsGridRowHeight if (xOnGrid < 0 || xOnGrid >= GameWindowsConfigs.Creative.itemsInRow || - yOnGrid < 0 || yOnGrid >= GameWindowsConfigs.Creative.itemsInCol) { + yOnGrid < 0 || yOnGrid >= GameWindowsConfigs.Creative.itemsInCol + ) { return } - val itemIndex = (gameWindowsManager.creativeScrollAmount * GameWindowsConfigs.Creative.itemsInRow + - (xOnGrid.toInt() + yOnGrid.toInt() * GameWindowsConfigs.Creative.itemsInRow)) + val itemIndex = ( + gameWindowsManager.creativeScrollAmount * GameWindowsConfigs.Creative.itemsInRow + + (xOnGrid.toInt() + yOnGrid.toInt() * GameWindowsConfigs.Creative.itemsInRow) + ) val item = getItemByIndexUseCase[itemIndex] mobController.player.inventory.addItem(item) } - -} \ No newline at end of file +} 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 00efbf7..e6dc04a 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 @@ -20,7 +20,7 @@ class SelectFurnaceInventoryItemMouseInputHandler @Inject constructor( private val gameWindowsManager: GameWindowsManager, private val mobController: MobController, private val textureRegions: GetTextureRegionByNameUseCase, - itemsRepository: ItemsRepository + itemsRepository: ItemsRepository, ) : AbstractInventoryItemsMouseInputHandler(itemsRepository, gameWindowsManager, GameWindowType.FURNACE) { override val windowTexture get() = requireNotNull(textureRegions["furnace"]) @@ -67,27 +67,27 @@ class SelectFurnaceInventoryItemMouseInputHandler @Inject constructor( val yOnWindow = action.screenY - (action.cameraViewport.height / 2 - texture.regionHeight / 2) val xOnGrid = (xOnWindow - GameWindowsConfigs.Furnace.itemsGridMarginLeft) / - GameWindowsConfigs.Furnace.itemsGridColWidth + GameWindowsConfigs.Furnace.itemsGridColWidth val yOnGrid = (yOnWindow - GameWindowsConfigs.Furnace.itemsGridMarginTop) / - GameWindowsConfigs.Furnace.itemsGridRowHeight + GameWindowsConfigs.Furnace.itemsGridRowHeight val isInsideInput = xOnWindow > GameWindowsConfigs.Furnace.smeltInputMarginLeft && - xOnWindow < GameWindowsConfigs.Furnace.smeltInputMarginLeft + GameWindowsConfigs.Furnace.itemsGridColWidth && - yOnWindow > GameWindowsConfigs.Furnace.smeltInputMarginTop && - yOnWindow < GameWindowsConfigs.Furnace.smeltInputMarginTop + GameWindowsConfigs.Furnace.itemsGridRowHeight + xOnWindow < GameWindowsConfigs.Furnace.smeltInputMarginLeft + GameWindowsConfigs.Furnace.itemsGridColWidth && + yOnWindow > GameWindowsConfigs.Furnace.smeltInputMarginTop && + yOnWindow < GameWindowsConfigs.Furnace.smeltInputMarginTop + GameWindowsConfigs.Furnace.itemsGridRowHeight val isInsideFuel = xOnWindow > GameWindowsConfigs.Furnace.smeltFuelMarginLeft && - xOnWindow < GameWindowsConfigs.Furnace.smeltFuelMarginLeft + GameWindowsConfigs.Furnace.itemsGridColWidth && - yOnWindow > GameWindowsConfigs.Furnace.smeltFuelMarginTop && - yOnWindow < GameWindowsConfigs.Furnace.smeltFuelMarginTop + GameWindowsConfigs.Furnace.itemsGridRowHeight + xOnWindow < GameWindowsConfigs.Furnace.smeltFuelMarginLeft + GameWindowsConfigs.Furnace.itemsGridColWidth && + yOnWindow > GameWindowsConfigs.Furnace.smeltFuelMarginTop && + yOnWindow < GameWindowsConfigs.Furnace.smeltFuelMarginTop + GameWindowsConfigs.Furnace.itemsGridRowHeight val isInsideResult = xOnWindow > GameWindowsConfigs.Furnace.smeltResultOffsetX && - xOnWindow < GameWindowsConfigs.Furnace.smeltResultOffsetX + GameWindowsConfigs.Furnace.itemsGridColWidth && - yOnWindow > GameWindowsConfigs.Furnace.smeltResultOffsetY && - yOnWindow < GameWindowsConfigs.Furnace.smeltResultOffsetY + GameWindowsConfigs.Furnace.itemsGridRowHeight + xOnWindow < GameWindowsConfigs.Furnace.smeltResultOffsetX + GameWindowsConfigs.Furnace.itemsGridColWidth && + 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 + yOnGrid >= 0 && yOnGrid < GameWindowsConfigs.Furnace.itemsInCol if (isInsideInventoryGrid) { handleInsideInventoryGrid(action, xOnGrid.toInt(), yOnGrid.toInt()) @@ -98,6 +98,5 @@ class SelectFurnaceInventoryItemMouseInputHandler @Inject constructor( } else if (isInsideResult) { handleInsideResult(action) } - } -} \ No newline at end of file +} 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 d227ae3..3811777 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 @@ -58,25 +58,25 @@ class SelectSurvivalInventoryItemMouseInputHandler @Inject constructor( val yOnWindow = action.screenY - (action.cameraViewport.height / 2 - windowTexture.regionHeight / 2) val xOnGrid = (xOnWindow - GameWindowsConfigs.Survival.itemsGridMarginLeft) / - GameWindowsConfigs.Survival.itemsGridColWidth + GameWindowsConfigs.Survival.itemsGridColWidth val yOnGrid = (yOnWindow - GameWindowsConfigs.Survival.itemsGridMarginTop) / - GameWindowsConfigs.Survival.itemsGridRowHeight + GameWindowsConfigs.Survival.itemsGridRowHeight val xOnCraft = (xOnWindow - GameWindowsConfigs.Survival.craftOffsetX) / - GameWindowsConfigs.Survival.itemsGridColWidth + GameWindowsConfigs.Survival.itemsGridColWidth val yOnCraft = (yOnWindow - GameWindowsConfigs.Survival.craftOffsetY) / - GameWindowsConfigs.Survival.itemsGridRowHeight + GameWindowsConfigs.Survival.itemsGridRowHeight val isInsideInventoryGrid = xOnGrid >= 0 && xOnGrid < GameWindowsConfigs.Survival.itemsInRow && - yOnGrid >= 0 && yOnGrid < GameWindowsConfigs.Survival.itemsInCol + yOnGrid >= 0 && yOnGrid < GameWindowsConfigs.Survival.itemsInCol val isInsideCraftGrid = xOnCraft >= 0 && xOnCraft < GameWindowsConfigs.Survival.craftGridSize && - yOnCraft >= 0 && yOnCraft < GameWindowsConfigs.Survival.craftGridSize + yOnCraft >= 0 && yOnCraft < GameWindowsConfigs.Survival.craftGridSize val isInsideCraftResult = xOnWindow > GameWindowsConfigs.Survival.craftResultOffsetX && - xOnWindow < GameWindowsConfigs.Survival.craftResultOffsetX + GameWindowsConfigs.Survival.itemsGridColWidth && - yOnWindow > GameWindowsConfigs.Survival.craftResultOffsetY && - yOnWindow < GameWindowsConfigs.Survival.craftResultOffsetY + GameWindowsConfigs.Survival.itemsGridRowHeight + xOnWindow < GameWindowsConfigs.Survival.craftResultOffsetX + GameWindowsConfigs.Survival.itemsGridColWidth && + yOnWindow > GameWindowsConfigs.Survival.craftResultOffsetY && + yOnWindow < GameWindowsConfigs.Survival.craftResultOffsetY + GameWindowsConfigs.Survival.itemsGridRowHeight if (isInsideInventoryGrid) { handleInsideInventoryGrid(action, xOnGrid.toInt(), yOnGrid.toInt()) @@ -85,6 +85,5 @@ class SelectSurvivalInventoryItemMouseInputHandler @Inject constructor( } else if (isInsideCraftResult) { handleInsideCraftResult(action) } - } -} \ No newline at end of file +} 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 35aef0b..24a2225 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 @@ -37,9 +37,9 @@ class UseItemMouseInputHandler @Inject constructor( override fun checkConditions(action: MouseInputAction): Boolean { return buttonHoldTask?.isScheduled == true || - !action.isInsideHotbar(textureRegions) && - gameWindowsManager.currentWindowType == GameWindowType.NONE && - action.actionKey is MouseInputActionKey.Right + !action.isInsideHotbar(textureRegions) && + gameWindowsManager.currentWindowType == GameWindowType.NONE && + action.actionKey is MouseInputActionKey.Right } private fun cancelHold() { @@ -59,7 +59,7 @@ class UseItemMouseInputHandler @Inject constructor( placeBlockActionMap.placeToBackgroundAction( item = item, x = player.cursorX, - y = player.cursorY + y = player.cursorY, ) } } @@ -70,7 +70,6 @@ class UseItemMouseInputHandler @Inject constructor( override fun run() { handleHold() } - } Timer.schedule(buttonHoldTask, TOUCH_HOLD_TIME_SEC) } @@ -85,7 +84,7 @@ class UseItemMouseInputHandler @Inject constructor( useBlockActionMap[block.params.key]?.perform( block = block, x = mobController.player.cursorX, - y = mobController.player.cursorY + y = mobController.player.cursorY, ) } @@ -101,11 +100,11 @@ class UseItemMouseInputHandler @Inject constructor( placeBlockActionMap.placeToForegroundAction( item = item, x = player.cursorX, - y = player.cursorY + y = player.cursorY, ) } else if (item is Item.Usable) { useItemActionMap[item.useActionKey]?.perform(item, player.cursorX, player.cursorY) - ?: Gdx.app.error(TAG, "use item action ${item.useActionKey} not found"); + ?: Gdx.app.error(TAG, "use item action ${item.useActionKey} not found") } else if (item is Item.Food && player.health < player.maxHealth) { player.heal(item.heal) player.decreaseCurrentItemCount() @@ -133,4 +132,4 @@ class UseItemMouseInputHandler @Inject constructor( private const val TAG = "UseItemMouseInputActionHandler" private const val TOUCH_HOLD_TIME_SEC = 0.5f } -} \ No newline at end of file +} 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 fe22fdc..8c2aa7e 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() } } else { @@ -55,9 +56,10 @@ 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)) - + 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) { @@ -112,7 +114,7 @@ class JoystickInputHandler @Inject constructor( val joyVector = joystick.getVelocityVector() if (mobController.player.isFlyMode) { - joyVector.scl(2f); + joyVector.scl(2f) } mobController.player.velocity.x = joyVector.x @@ -140,5 +142,4 @@ class JoystickInputHandler @Inject constructor( } } } - -} \ No newline at end of file +} diff --git a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/mapper/KeyboardInputActionMapper.kt b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/mapper/KeyboardInputActionMapper.kt index 9fbbfdc..e03cfb1 100644 --- a/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/mapper/KeyboardInputActionMapper.kt +++ b/core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/mapper/KeyboardInputActionMapper.kt @@ -42,5 +42,4 @@ class KeyboardInputActionMapper @Inject constructor() { return actionKey?.let { KeyboardInputAction(it, isKeyDown) } } - -} \ No newline at end of file +} 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 df3ef8d..058fc17 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 @@ -5,7 +5,6 @@ import com.badlogic.gdx.Input import com.badlogic.gdx.math.Rectangle import ru.fredboy.cavedroid.common.di.GameScope import ru.fredboy.cavedroid.domain.configuration.repository.ApplicationContextRepository -import ru.fredboy.cavedroid.domain.configuration.repository.GameContextRepository import ru.fredboy.cavedroid.ux.controls.input.action.MouseInputAction import ru.fredboy.cavedroid.ux.controls.input.action.keys.MouseInputActionKey import javax.inject.Inject @@ -79,5 +78,4 @@ class MouseInputActionMapper @Inject constructor( private fun getScreenY(mouseY: Float): Float { return mouseY * (applicationContextRepository.getHeight() / Gdx.graphics.height) } - -} \ No newline at end of file +} diff --git a/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/annotation/BindUpdateBlockAction.kt b/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/annotation/BindUpdateBlockAction.kt index ce32499..9ee7ba0 100644 --- a/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/annotation/BindUpdateBlockAction.kt +++ b/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/annotation/BindUpdateBlockAction.kt @@ -7,6 +7,6 @@ import ru.fredboy.cavedroid.ux.physics.action.updateblock.IUpdateBlockAction @BindsIntoMapStringKey( interfaceClass = IUpdateBlockAction::class, modulePackage = MultibindingConfig.GENERATED_MODULES_PACKAGE, - moduleName = "UpdateBlockActionsModule" + moduleName = "UpdateBlockActionsModule", ) -annotation class BindUpdateBlockAction(val stringKey: String) \ No newline at end of file +annotation class BindUpdateBlockAction(val stringKey: String) diff --git a/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/IUpdateBlockAction.kt b/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/IUpdateBlockAction.kt index d4a51c6..39e7e35 100644 --- a/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/IUpdateBlockAction.kt +++ b/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/IUpdateBlockAction.kt @@ -3,5 +3,4 @@ package ru.fredboy.cavedroid.ux.physics.action.updateblock interface IUpdateBlockAction { fun update(x: Int, y: Int) - -} \ No newline at end of file +} diff --git a/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/UpdateBedLeftAction.kt b/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/UpdateBedLeftAction.kt index 3a8e02a..2934bc3 100644 --- a/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/UpdateBedLeftAction.kt +++ b/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/UpdateBedLeftAction.kt @@ -23,4 +23,4 @@ class UpdateBedLeftAction @Inject constructor( companion object { const val BLOCK_KEY = "bed_l" } -} \ No newline at end of file +} diff --git a/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/UpdateBedRightAction.kt b/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/UpdateBedRightAction.kt index 71be580..5d5ce1f 100644 --- a/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/UpdateBedRightAction.kt +++ b/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/UpdateBedRightAction.kt @@ -23,4 +23,4 @@ class UpdateBedRightAction @Inject constructor( companion object { const val BLOCK_KEY = "bed_r" } -} \ No newline at end of file +} diff --git a/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/UpdateGrassAction.kt b/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/UpdateGrassAction.kt index 3a8ddf9..40b047c 100644 --- a/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/UpdateGrassAction.kt +++ b/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/UpdateGrassAction.kt @@ -27,4 +27,4 @@ class UpdateGrassAction @Inject constructor( companion object { const val BLOCK_KEY = "grass" } -} \ No newline at end of file +} diff --git a/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/UpdateRequiresBlockAction.kt b/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/UpdateRequiresBlockAction.kt index 1daa644..5d5483a 100644 --- a/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/UpdateRequiresBlockAction.kt +++ b/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/UpdateRequiresBlockAction.kt @@ -29,4 +29,4 @@ class UpdateRequiresBlockAction @Inject constructor( companion object { const val ACTION_KEY = "requires_block" } -} \ No newline at end of file +} diff --git a/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/UpdateSnowedGrassAction.kt b/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/UpdateSnowedGrassAction.kt index 7b9d532..13960c4 100644 --- a/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/UpdateSnowedGrassAction.kt +++ b/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/UpdateSnowedGrassAction.kt @@ -26,4 +26,4 @@ class UpdateSnowedGrassAction @Inject constructor( companion object { const val BLOCK_KEY = "grass_snowed" } -} \ No newline at end of file +} diff --git a/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/task/GameWorldBlocksLogicControllerTask.kt b/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/task/GameWorldBlocksLogicControllerTask.kt index 6d74578..fdf765b 100644 --- a/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/task/GameWorldBlocksLogicControllerTask.kt +++ b/core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/task/GameWorldBlocksLogicControllerTask.kt @@ -43,7 +43,7 @@ class GameWorldBlocksLogicControllerTask @Inject constructor( val startX = getChunkStart() for (y in gameWorld.height downTo 0) { - for (x in startX ..< startX + CHUNK_WIDTH) { + for (x in startX.., List>() @@ -67,8 +67,8 @@ class GameWorldFluidsLogicControllerTask @Inject constructor( val onRight = gameWorld.getForeMap(x + 1, y) return !onTop.isFluid() && - (onLeft !is Block.Fluid || onLeft.state >= current.state) && - (onRight !is Block.Fluid || onRight.state >= current.state) + (onLeft !is Block.Fluid || onLeft.state >= current.state) && + (onRight !is Block.Fluid || onRight.state >= current.state) } private fun drainFluid(x: Int, y: Int): Boolean { @@ -91,8 +91,8 @@ class GameWorldFluidsLogicControllerTask @Inject constructor( private fun fluidCanFlowThere(fluid: Block.Fluid, targetBlock: Block): Boolean { return targetBlock.isNone() || - (!targetBlock.params.hasCollision && !targetBlock.isFluid()) || - (fluid::class == targetBlock::class && fluid.state < (targetBlock as Block.Fluid).state) + (!targetBlock.params.hasCollision && !targetBlock.isFluid()) || + (fluid::class == targetBlock::class && fluid.state < (targetBlock as Block.Fluid).state) } private fun flowFluidTo(currentFluid: Block.Fluid, x: Int, y: Int, nextStateFluid: Block.Fluid) { @@ -120,14 +120,14 @@ class GameWorldFluidsLogicControllerTask @Inject constructor( val fluid = gameWorld.getForeMap(x, y) as Block.Fluid val stateList = fluidStatesMap[fluid::class] ?: return - if (fluid.state < stateList.lastIndex && gameWorld.getForeMap(x, y + 1).params.hasCollision) { - val nextState = getNextStateBlock(fluid) ?: return + if (fluid.state < stateList.lastIndex && gameWorld.getForeMap(x, y + 1).params.hasCollision) { + val nextState = getNextStateBlock(fluid) ?: return - flowFluidTo(fluid, x - 1, y, nextState) - flowFluidTo(fluid, x + 1, y, nextState) - } else { - flowFluidTo(fluid, x, y + 1, stateList[1]) - } + flowFluidTo(fluid, x - 1, y, nextState) + flowFluidTo(fluid, x + 1, y, nextState) + } else { + flowFluidTo(fluid, x, y + 1, stateList[1]) + } } fun updateFluids(x: Int, y: Int) { @@ -147,7 +147,7 @@ class GameWorldFluidsLogicControllerTask @Inject constructor( val midScreen = mobController.player.x.bl for (y in gameWorld.height - 1 downTo 0) { - for (x in 0 ..< min(gameWorld.width / 2, 32)) { + for (x in 0.. if (item.item.isNone()) { @@ -91,7 +87,7 @@ class HudRenderer @Inject constructor( shapeRenderer = shapeRenderer, font = getFont(), x = hotbarX + HotbarConfig.horizontalMargin + - index * (HotbarConfig.itemSeparatorWidth + HotbarConfig.itemSlotSpace), + index * (HotbarConfig.itemSeparatorWidth + HotbarConfig.itemSlotSpace), y = HotbarConfig.verticalMargin, getStringWidth = getStringWidth::invoke, getStringHeight = getStringHeight::invoke, @@ -102,9 +98,9 @@ class HudRenderer @Inject constructor( private fun drawHotbarSelector(spriteBatch: SpriteBatch, hotbarX: Float) { spriteBatch.draw( /* region = */ hotbarSelectorTexture, - /* x = */ hotbarX - HotbarSelectorConfig.horizontalPadding - + mobController.player.activeSlot * (HotbarConfig.itemSeparatorWidth + HotbarConfig.itemSlotSpace), - /* y = */ -HotbarSelectorConfig.verticalPadding + /* x = */ hotbarX - HotbarSelectorConfig.horizontalPadding + + mobController.player.activeSlot * (HotbarConfig.itemSeparatorWidth + HotbarConfig.itemSlotSpace), + /* y = */ -HotbarSelectorConfig.verticalPadding, ) } @@ -123,7 +119,7 @@ class HudRenderer @Inject constructor( font = getFont(), str = tooltip, x = viewport.width / 2 - getStringWidth(tooltip) / 2, - y = hotbarTexture.regionHeight.toFloat() + y = hotbarTexture.regionHeight.toFloat(), ) } } @@ -156,4 +152,4 @@ class HudRenderer @Inject constructor( const val verticalPadding = 1f } } -} \ No newline at end of file +} diff --git a/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/IGameRenderer.kt b/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/IGameRenderer.kt index 44ff693..1ea8210 100644 --- a/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/IGameRenderer.kt +++ b/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/IGameRenderer.kt @@ -15,6 +15,6 @@ interface IGameRenderer { spriteBatch: SpriteBatch, shapeRenderer: ShapeRenderer, viewport: Rectangle, - delta: Float + delta: Float, ) -} \ No newline at end of file +} diff --git a/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/MobsRenderer.kt b/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/MobsRenderer.kt index cc700ef..bc38011 100644 --- a/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/MobsRenderer.kt +++ b/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/MobsRenderer.kt @@ -22,9 +22,9 @@ class MobsRenderer @Inject constructor( override val renderLayer get() = RENDER_LAYER private fun drawMob(spriteBatch: SpriteBatch, viewport: Rectangle, mob: Mob, delta: Float) { - mob.cycledInsideWorld(viewport, gameWorld.width.px)?.let { mobRect -> - mob.draw(spriteBatch, mobRect.x - viewport.x, mobRect.y - viewport.y, delta) - } + mob.cycledInsideWorld(viewport, gameWorld.width.px)?.let { mobRect -> + mob.draw(spriteBatch, mobRect.x - viewport.x, mobRect.y - viewport.y, delta) + } } override fun draw(spriteBatch: SpriteBatch, shapeRenderer: ShapeRenderer, viewport: Rectangle, delta: Float) { @@ -33,7 +33,7 @@ class MobsRenderer @Inject constructor( /* spriteBatch = */ spriteBatch, /* x = */ player.x - viewport.x - player.width / 2, /* y = */ player.y - viewport.y, - /* delta = */ delta + /* delta = */ delta, ) mobController.mobs.forEach { mob -> @@ -44,4 +44,4 @@ class MobsRenderer @Inject constructor( companion object { private const val RENDER_LAYER = 100100 } -} \ No newline at end of file +} diff --git a/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/TouchControlsRenderer.kt b/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/TouchControlsRenderer.kt index 09c6420..00f02db 100644 --- a/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/TouchControlsRenderer.kt +++ b/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/TouchControlsRenderer.kt @@ -45,7 +45,7 @@ class TouchControlsRenderer @Inject constructor( x = joystick.centerX - Joystick.RADIUS, y = joystick.centerY - Joystick.RADIUS, width = Joystick.SIZE, - height = Joystick.SIZE + height = Joystick.SIZE, ) spriteBatch.drawSprite( @@ -53,7 +53,7 @@ class TouchControlsRenderer @Inject constructor( x = joystick.activeX - Joystick.STICK_SIZE / 2, y = joystick.activeY - Joystick.STICK_SIZE / 2, width = Joystick.STICK_SIZE, - height = Joystick.STICK_SIZE + height = Joystick.STICK_SIZE, ) } @@ -87,7 +87,7 @@ class TouchControlsRenderer @Inject constructor( /* x = */ touchKey.x, /* y = */ touchKey.y, /* width = */ touchKey.width, - /* height = */ touchKey.height + /* height = */ touchKey.height, ) } @@ -105,5 +105,4 @@ class TouchControlsRenderer @Inject constructor( private const val SHADE_KEY = "shade" } - -} \ No newline at end of file +} diff --git a/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/WindowsRenderer.kt b/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/WindowsRenderer.kt index e3f8112..b06c334 100644 --- a/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/WindowsRenderer.kt +++ b/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/WindowsRenderer.kt @@ -45,4 +45,4 @@ class WindowsRenderer @Inject constructor( const val RENDER_LAYER = 100600 } -} \ No newline at end of file +} diff --git a/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/annotation/BindRenderer.kt b/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/annotation/BindRenderer.kt index b7a7068..9d868e5 100644 --- a/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/annotation/BindRenderer.kt +++ b/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/annotation/BindRenderer.kt @@ -7,6 +7,6 @@ import ru.fredboy.cavedroid.ux.rendering.IGameRenderer @BindsIntoSet( interfaceClass = IGameRenderer::class, modulePackage = MultibindingConfig.GENERATED_MODULES_PACKAGE, - moduleName = "RenderModule" + moduleName = "RenderModule", ) -annotation class BindRenderer \ No newline at end of file +annotation class BindRenderer diff --git a/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/AbstractWindowRenderer.kt b/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/AbstractWindowRenderer.kt index e9f44a3..ce94926 100644 --- a/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/AbstractWindowRenderer.kt +++ b/core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/AbstractWindowRenderer.kt @@ -52,7 +52,7 @@ abstract class AbstractWindowRenderer { x = itemX, y = itemY, getStringWidth = getStringWidth::invoke, - getStringHeight = getStringHeight::invoke + getStringHeight = getStringHeight::invoke, ) ?: item?.let { spriteBatch.drawSprite(it.sprite, itemX, itemY) } } } @@ -60,5 +60,4 @@ abstract class AbstractWindowRenderer { companion object { protected const val _TAG = "AbstractWindowRenderer" } - -} \ No newline at end of file +} 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 2b227ab..61e5522 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 @@ -4,8 +4,6 @@ import com.badlogic.gdx.Gdx import com.badlogic.gdx.graphics.g2d.SpriteBatch import com.badlogic.gdx.graphics.glutils.ShapeRenderer import com.badlogic.gdx.math.Rectangle -import ru.fredboy.cavedroid.ux.rendering.IGameRenderer -import ru.fredboy.cavedroid.ux.rendering.WindowsRenderer import ru.fredboy.cavedroid.common.di.GameScope import ru.fredboy.cavedroid.domain.assets.usecase.GetFontUseCase import ru.fredboy.cavedroid.domain.assets.usecase.GetStringHeightUseCase @@ -15,6 +13,8 @@ import ru.fredboy.cavedroid.game.controller.mob.MobController import ru.fredboy.cavedroid.game.window.GameWindowsConfigs import ru.fredboy.cavedroid.game.window.GameWindowsManager import ru.fredboy.cavedroid.game.window.inventory.ChestInventoryWindow +import ru.fredboy.cavedroid.ux.rendering.IGameRenderer +import ru.fredboy.cavedroid.ux.rendering.WindowsRenderer import javax.inject.Inject @GameScope @@ -30,8 +30,7 @@ class ChestWindowRenderer @Inject constructor( override val renderLayer get() = WindowsRenderer.Companion.RENDER_LAYER private val chestWindowTexture get() = requireNotNull(textureRegions[CHEST_WINDOW_KEY]) - - + override fun draw(spriteBatch: SpriteBatch, shapeRenderer: ShapeRenderer, viewport: Rectangle, delta: Float) { val windowTexture = chestWindowTexture val window = gameWindowsManager.currentWindow as ChestInventoryWindow @@ -52,9 +51,9 @@ class ChestWindowRenderer @Inject constructor( cellWidth = GameWindowsConfigs.Chest.itemsGridColWidth, cellHeight = GameWindowsConfigs.Chest.itemsGridRowHeight, getStringWidth = getStringWidth, - getStringHeight = getStringHeight + getStringHeight = getStringHeight, ) - + drawItemsGrid( spriteBatch = spriteBatch, shapeRenderer = shapeRenderer, @@ -69,7 +68,7 @@ class ChestWindowRenderer @Inject constructor( cellWidth = GameWindowsConfigs.Chest.itemsGridColWidth, cellHeight = GameWindowsConfigs.Chest.itemsGridRowHeight, getStringWidth = getStringWidth, - getStringHeight = getStringHeight + getStringHeight = getStringHeight, ) drawItemsGrid( @@ -85,7 +84,7 @@ class ChestWindowRenderer @Inject constructor( cellWidth = GameWindowsConfigs.Chest.itemsGridColWidth, cellHeight = GameWindowsConfigs.Chest.itemsGridRowHeight, getStringWidth = getStringWidth, - getStringHeight = getStringHeight + getStringHeight = getStringHeight, ) window.selectedItem?.drawSelected( @@ -101,4 +100,4 @@ class ChestWindowRenderer @Inject constructor( companion object { private const val CHEST_WINDOW_KEY = "chest" } -} \ No newline at end of file +} 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 8250c3d..0ebe4c8 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 @@ -4,8 +4,6 @@ import com.badlogic.gdx.Gdx import com.badlogic.gdx.graphics.g2d.SpriteBatch import com.badlogic.gdx.graphics.glutils.ShapeRenderer import com.badlogic.gdx.math.Rectangle -import ru.fredboy.cavedroid.ux.rendering.IGameRenderer -import ru.fredboy.cavedroid.ux.rendering.WindowsRenderer import ru.fredboy.cavedroid.common.di.GameScope import ru.fredboy.cavedroid.domain.assets.usecase.GetFontUseCase import ru.fredboy.cavedroid.domain.assets.usecase.GetStringHeightUseCase @@ -15,6 +13,8 @@ import ru.fredboy.cavedroid.game.controller.mob.MobController import ru.fredboy.cavedroid.game.window.GameWindowsConfigs import ru.fredboy.cavedroid.game.window.GameWindowsManager import ru.fredboy.cavedroid.game.window.inventory.CraftingInventoryWindow +import ru.fredboy.cavedroid.ux.rendering.IGameRenderer +import ru.fredboy.cavedroid.ux.rendering.WindowsRenderer import javax.inject.Inject @GameScope @@ -54,7 +54,7 @@ class CraftingWindowRenderer @Inject constructor( cellWidth = GameWindowsConfigs.Crafting.itemsGridColWidth, cellHeight = GameWindowsConfigs.Crafting.itemsGridRowHeight, getStringWidth = getStringWidth, - getStringHeight = getStringHeight + getStringHeight = getStringHeight, ) drawItemsGrid( @@ -70,7 +70,7 @@ class CraftingWindowRenderer @Inject constructor( cellWidth = GameWindowsConfigs.Crafting.itemsGridColWidth, cellHeight = GameWindowsConfigs.Crafting.itemsGridRowHeight, getStringWidth = getStringWidth, - getStringHeight = getStringHeight + getStringHeight = getStringHeight, ) drawItemsGrid( @@ -84,7 +84,7 @@ class CraftingWindowRenderer @Inject constructor( cellWidth = GameWindowsConfigs.Crafting.itemsGridColWidth, cellHeight = GameWindowsConfigs.Crafting.itemsGridRowHeight, getStringWidth = getStringWidth, - getStringHeight = getStringHeight + getStringHeight = getStringHeight, ) window.craftResult.draw( @@ -110,4 +110,4 @@ class CraftingWindowRenderer @Inject constructor( companion object { private const val CRAFTING_WINDOW_KEY = "crafting_table" } -} \ No newline at end of file +} 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 6669717..1c93d4b 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 @@ -3,8 +3,6 @@ package ru.fredboy.cavedroid.ux.rendering.windows import com.badlogic.gdx.graphics.g2d.SpriteBatch import com.badlogic.gdx.graphics.glutils.ShapeRenderer import com.badlogic.gdx.math.Rectangle -import ru.fredboy.cavedroid.ux.rendering.IGameRenderer -import ru.fredboy.cavedroid.ux.rendering.WindowsRenderer import ru.fredboy.cavedroid.common.di.GameScope import ru.fredboy.cavedroid.domain.assets.usecase.GetFontUseCase import ru.fredboy.cavedroid.domain.assets.usecase.GetStringHeightUseCase @@ -15,6 +13,8 @@ import ru.fredboy.cavedroid.game.controller.mob.MobController import ru.fredboy.cavedroid.game.window.GameWindowsConfigs import ru.fredboy.cavedroid.game.window.GameWindowsManager import ru.fredboy.cavedroid.game.window.inventory.CreativeInventoryWindow +import ru.fredboy.cavedroid.ux.rendering.IGameRenderer +import ru.fredboy.cavedroid.ux.rendering.WindowsRenderer import javax.inject.Inject import kotlin.math.min @@ -34,21 +34,20 @@ class CreativeWindowRenderer @Inject constructor( private val creativeWindowTexture get() = requireNotNull(textureRegions[CREATIVE_WINDOW_KEY]) private val scrollIndicatorTexture get() = requireNotNull(textureRegions[SCROLL_INDICATOR_KEY]) - override fun draw(spriteBatch: SpriteBatch, shapeRenderer: ShapeRenderer, viewport: Rectangle, delta: Float) { val creativeWindow = creativeWindowTexture val windowX = viewport.width / 2 - creativeWindow.regionWidth / 2 val windowY = viewport.height / 2 - creativeWindow.regionHeight / 2 val oneScrollAmount = GameWindowsConfigs.Creative.scrollIndicatorFullHeight / - (gameWindowsManager.currentWindow as CreativeInventoryWindow).getMaxScroll(itemsRepository) + (gameWindowsManager.currentWindow as CreativeInventoryWindow).getMaxScroll(itemsRepository) spriteBatch.draw(creativeWindow, windowX, windowY) spriteBatch.draw( /* region = */ scrollIndicatorTexture, /* x = */ windowX + GameWindowsConfigs.Creative.scrollIndicatorMarginLeft, - /* y = */ windowY + GameWindowsConfigs.Creative.scrollIndicatorMarginTop - + (gameWindowsManager.creativeScrollAmount * oneScrollAmount) + /* y = */ windowY + GameWindowsConfigs.Creative.scrollIndicatorMarginTop + + (gameWindowsManager.creativeScrollAmount * oneScrollAmount), ) val allItems = itemsRepository.getAllItems() @@ -71,7 +70,7 @@ class CreativeWindowRenderer @Inject constructor( cellWidth = GameWindowsConfigs.Creative.itemsGridColWidth, cellHeight = GameWindowsConfigs.Creative.itemsGridRowHeight, getStringWidth = getStringWidth, - getStringHeight = getStringHeight + getStringHeight = getStringHeight, ) drawItemsGrid( @@ -85,7 +84,7 @@ class CreativeWindowRenderer @Inject constructor( cellWidth = GameWindowsConfigs.Creative.itemsGridColWidth, cellHeight = GameWindowsConfigs.Creative.itemsGridRowHeight, getStringWidth = getStringWidth, - getStringHeight = getStringHeight + getStringHeight = getStringHeight, ) } @@ -93,4 +92,4 @@ class CreativeWindowRenderer @Inject constructor( private const val CREATIVE_WINDOW_KEY = "creative" private const val SCROLL_INDICATOR_KEY = "handle" } -} \ No newline at end of file +} 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 9fb9925..6b25db3 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 @@ -5,8 +5,6 @@ import com.badlogic.gdx.graphics.g2d.Sprite import com.badlogic.gdx.graphics.g2d.SpriteBatch import com.badlogic.gdx.graphics.glutils.ShapeRenderer import com.badlogic.gdx.math.Rectangle -import ru.fredboy.cavedroid.ux.rendering.IGameRenderer -import ru.fredboy.cavedroid.ux.rendering.WindowsRenderer import ru.fredboy.cavedroid.common.di.GameScope import ru.fredboy.cavedroid.common.utils.drawSprite import ru.fredboy.cavedroid.common.utils.withScissors @@ -18,6 +16,8 @@ import ru.fredboy.cavedroid.game.controller.mob.MobController import ru.fredboy.cavedroid.game.window.GameWindowsConfigs import ru.fredboy.cavedroid.game.window.GameWindowsManager import ru.fredboy.cavedroid.game.window.inventory.FurnaceInventoryWindow +import ru.fredboy.cavedroid.ux.rendering.IGameRenderer +import ru.fredboy.cavedroid.ux.rendering.WindowsRenderer import javax.inject.Inject @GameScope @@ -36,10 +36,10 @@ class FurnaceWindowRenderer @Inject constructor( private val furnaceProgress by lazy { Sprite(textureRegions["furnace_progress"]) } private val furnaceBurn by lazy { Sprite(textureRegions["furnace_burn"]) } - + override fun draw(spriteBatch: SpriteBatch, shapeRenderer: ShapeRenderer, viewport: Rectangle, delta: Float) { val windowTexture = furnaceWindowTexture - + val window = gameWindowsManager.currentWindow as FurnaceInventoryWindow val windowX = viewport.width / 2 - windowTexture.regionWidth / 2 @@ -60,7 +60,7 @@ class FurnaceWindowRenderer @Inject constructor( cellWidth = GameWindowsConfigs.Furnace.itemsGridColWidth, cellHeight = GameWindowsConfigs.Furnace.itemsGridRowHeight, getStringWidth = getStringWidth, - getStringHeight = getStringHeight + getStringHeight = getStringHeight, ) drawItemsGrid( @@ -76,7 +76,7 @@ class FurnaceWindowRenderer @Inject constructor( cellWidth = GameWindowsConfigs.Furnace.itemsGridColWidth, cellHeight = GameWindowsConfigs.Furnace.itemsGridRowHeight, getStringWidth = getStringWidth, - getStringHeight = getStringHeight + getStringHeight = getStringHeight, ) window.furnace.fuel.draw( @@ -123,7 +123,7 @@ class FurnaceWindowRenderer @Inject constructor( spriteBatch.drawSprite( sprite = furnaceBurn, x = windowX + GameWindowsConfigs.Furnace.fuelBurnMarginLeft, - y = windowY + GameWindowsConfigs.Furnace.fuelBurnMarginTop + y = windowY + GameWindowsConfigs.Furnace.fuelBurnMarginTop, ) } @@ -160,4 +160,4 @@ class FurnaceWindowRenderer @Inject constructor( companion object { private const val FURNACE_WINDOW_KEY = "furnace" } -} \ No newline at end of file +} 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 8595fb5..53a4a91 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 @@ -5,20 +5,19 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch import com.badlogic.gdx.graphics.glutils.ShapeRenderer import com.badlogic.gdx.math.MathUtils import com.badlogic.gdx.math.Rectangle -import ru.fredboy.cavedroid.ux.rendering.IGameRenderer -import ru.fredboy.cavedroid.ux.rendering.WindowsRenderer import ru.fredboy.cavedroid.common.di.GameScope import ru.fredboy.cavedroid.domain.assets.usecase.GetFontUseCase import ru.fredboy.cavedroid.domain.assets.usecase.GetStringHeightUseCase import ru.fredboy.cavedroid.domain.assets.usecase.GetStringWidthUseCase import ru.fredboy.cavedroid.domain.assets.usecase.GetTextureRegionByNameUseCase import ru.fredboy.cavedroid.domain.configuration.repository.ApplicationContextRepository -import ru.fredboy.cavedroid.domain.configuration.repository.GameContextRepository import ru.fredboy.cavedroid.entity.mob.model.Direction import ru.fredboy.cavedroid.game.controller.mob.MobController import ru.fredboy.cavedroid.game.window.GameWindowsConfigs import ru.fredboy.cavedroid.game.window.GameWindowsManager import ru.fredboy.cavedroid.game.window.inventory.SurvivalInventoryWindow +import ru.fredboy.cavedroid.ux.rendering.IGameRenderer +import ru.fredboy.cavedroid.ux.rendering.WindowsRenderer import javax.inject.Inject import kotlin.math.atan @@ -59,9 +58,9 @@ class SurvivalWindowRenderer @Inject constructor( private fun drawPlayerPortrait(spriteBatch: SpriteBatch, windowX: Float, windowY: Float, delta: Float) { val portraitX = windowX + GameWindowsConfigs.Survival.portraitMarginLeft + - (GameWindowsConfigs.Survival.portraitWidth / 2 - mobController.player.width / 2) + (GameWindowsConfigs.Survival.portraitWidth / 2 - mobController.player.width / 2) val portraitY = windowY + GameWindowsConfigs.Survival.portraitMarginTop + - (GameWindowsConfigs.Survival.portraitHeight / 2 - mobController.player.height / 2) + (GameWindowsConfigs.Survival.portraitHeight / 2 - mobController.player.height / 2) setPortraitHeadRotation(portraitX, portraitY) mobController.player.draw(spriteBatch, portraitX, portraitY, delta) @@ -92,7 +91,7 @@ class SurvivalWindowRenderer @Inject constructor( cellWidth = GameWindowsConfigs.Survival.itemsGridColWidth, cellHeight = GameWindowsConfigs.Survival.itemsGridRowHeight, getStringWidth = getStringWidth, - getStringHeight = getStringHeight + getStringHeight = getStringHeight, ) drawItemsGrid( @@ -108,7 +107,7 @@ class SurvivalWindowRenderer @Inject constructor( cellWidth = GameWindowsConfigs.Survival.itemsGridColWidth, cellHeight = GameWindowsConfigs.Survival.itemsGridRowHeight, getStringWidth = getStringWidth, - getStringHeight = getStringHeight + getStringHeight = getStringHeight, ) drawItemsGrid( @@ -128,7 +127,7 @@ class SurvivalWindowRenderer @Inject constructor( cellWidth = GameWindowsConfigs.Survival.itemsGridColWidth, cellHeight = GameWindowsConfigs.Survival.itemsGridRowHeight, getStringWidth = getStringWidth, - getStringHeight = getStringHeight + getStringHeight = getStringHeight, ) window.craftResult.draw( @@ -154,4 +153,4 @@ class SurvivalWindowRenderer @Inject constructor( companion object { private const val SURVIVAL_WINDOW_KEY = "survival" } -} \ No newline at end of file +} 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 0ba8bfb..9f78599 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 @@ -31,7 +31,7 @@ class CaveDroidApplication( } if (isFullscreen) { - Gdx.graphics.setFullscreenMode(Gdx.graphics.displayMode); + Gdx.graphics.setFullscreenMode(Gdx.graphics.displayMode) } else { Gdx.graphics.setWindowedMode(960, 540) } @@ -53,8 +53,8 @@ class CaveDroidApplication( width = width, height = height, isFullscreen = isFullscreen, - useDynamicCamera = preferencesStore.getPreference("dyncam").toBoolean() - ) + useDynamicCamera = preferencesStore.getPreference("dyncam").toBoolean(), + ), ) .applicationController(this) .preferencesStore(preferencesStore) @@ -101,4 +101,4 @@ class CaveDroidApplication( private const val TAG = "CaveDroidApplication" private const val DEFAULT_VIEWPORT_WIDTH = 480f } -} \ No newline at end of file +} diff --git a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/base/BaseScreen.kt b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/base/BaseScreen.kt index df76db7..d1c21a3 100644 --- a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/base/BaseScreen.kt +++ b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/base/BaseScreen.kt @@ -15,4 +15,4 @@ abstract class BaseScreen( companion object { private const val SCALE = .5f } -} \ No newline at end of file +} diff --git a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/di/ApplicationComponent.kt b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/di/ApplicationComponent.kt index 134d39a..9ad5d5b 100644 --- a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/di/ApplicationComponent.kt +++ b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/di/ApplicationComponent.kt @@ -32,7 +32,7 @@ import javax.inject.Singleton DataItemsModule::class, DataSaveModule::class, ApplicationContextModule::class, - ] + ], ) interface ApplicationComponent { @@ -79,6 +79,5 @@ interface ApplicationComponent { fun preferencesStore(impl: PreferencesStore): Builder fun build(): ApplicationComponent - } -} \ No newline at end of file +} 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 4e3d85c..ff091ca 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 @@ -41,8 +41,8 @@ class GameScreen @Inject constructor( /* viewportWidth = */ applicationContextRepository.getWidth(), /* viewportHeight = */ applicationContextRepository.getHeight(), ) - } - ) + }, + ), ) } @@ -105,18 +105,15 @@ class GameScreen @Inject constructor( } override fun pause() { - } override fun resume() { - } override fun hide() { - } override fun dispose() { resetGameComponent() } -} \ No newline at end of file +} diff --git a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/game/di/GameComponent.kt b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/game/di/GameComponent.kt index b1f48de..e57388c 100644 --- a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/game/di/GameComponent.kt +++ b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/game/di/GameComponent.kt @@ -2,7 +2,13 @@ package ru.fredboy.cavedroid.zygote.game.di import dagger.BindsInstance import dagger.Component -import ru.deadsoftware.cavedroid.generated.module.* +import ru.deadsoftware.cavedroid.generated.module.KeyboardInputHandlersModule +import ru.deadsoftware.cavedroid.generated.module.MouseInputHandlersModule +import ru.deadsoftware.cavedroid.generated.module.PlaceBlockActionsModule +import ru.deadsoftware.cavedroid.generated.module.RenderModule +import ru.deadsoftware.cavedroid.generated.module.UpdateBlockActionsModule +import ru.deadsoftware.cavedroid.generated.module.UseBlockActionsModule +import ru.deadsoftware.cavedroid.generated.module.UseItemActionsModule import ru.fredboy.cavedroid.common.di.GameScope import ru.fredboy.cavedroid.data.configuration.di.GameContextModule import ru.fredboy.cavedroid.data.configuration.model.GameContext @@ -31,7 +37,7 @@ import ru.fredboy.cavedroid.zygote.game.GameProc ControllerDropModule::class, GameContextModule::class, MobControllerModule::class, - ] + ], ) interface GameComponent { @@ -49,4 +55,4 @@ interface GameComponent { fun build(): GameComponent } -} \ No newline at end of file +} 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 7744085..33b7374 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 @@ -119,4 +119,4 @@ object GameModule { initialBackMap = mapData?.retrieveBackMap(), ) } -} \ No newline at end of file +} diff --git a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/MenuScreen.kt b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/MenuScreen.kt index 85481ad..a181f54 100644 --- a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/MenuScreen.kt +++ b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/MenuScreen.kt @@ -64,4 +64,4 @@ class MenuScreen @Inject constructor( menuRenderer.dispose() menuButtonRepository.dispose() } -} \ No newline at end of file +} diff --git a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/ExitGameAction.kt b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/ExitGameAction.kt index 6a5bb9d..f20dbb2 100644 --- a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/ExitGameAction.kt +++ b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/ExitGameAction.kt @@ -18,4 +18,4 @@ class ExitGameAction @Inject constructor( companion object { const val KEY = "exit_game_action" } -} \ No newline at end of file +} diff --git a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/IMenuAction.kt b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/IMenuAction.kt index da754fb..6f5d92e 100644 --- a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/IMenuAction.kt +++ b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/IMenuAction.kt @@ -5,5 +5,4 @@ interface IMenuAction { fun perform() fun canPerform(): Boolean = true - -} \ No newline at end of file +} 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 9277714..38b727d 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 @@ -26,4 +26,4 @@ class LoadGameAction @Inject constructor( companion object { const val KEY = "load_game_action" } -} \ No newline at end of file +} diff --git a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/NewGameCreativeAction.kt b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/NewGameCreativeAction.kt index 9cbbfc9..01f8e2e 100644 --- a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/NewGameCreativeAction.kt +++ b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/NewGameCreativeAction.kt @@ -18,4 +18,4 @@ class NewGameCreativeAction @Inject constructor( companion object { const val KEY = "new_game_creative_action" } -} \ No newline at end of file +} diff --git a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/NewGameSurvivalAction.kt b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/NewGameSurvivalAction.kt index 15fdd90..079077e 100644 --- a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/NewGameSurvivalAction.kt +++ b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/NewGameSurvivalAction.kt @@ -18,4 +18,4 @@ class NewGameSurvivalAction @Inject constructor( companion object { const val KEY = "new_game_survival_action" } -} \ No newline at end of file +} diff --git a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/OpenMainMenuAction.kt b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/OpenMainMenuAction.kt index 3fc2eaf..db42b0c 100644 --- a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/OpenMainMenuAction.kt +++ b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/OpenMainMenuAction.kt @@ -18,4 +18,4 @@ class OpenMainMenuAction @Inject constructor( companion object { const val KEY = "menu_main_action" } -} \ No newline at end of file +} diff --git a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/OpenNewGameMenuAction.kt b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/OpenNewGameMenuAction.kt index 7aaafe4..cc0724f 100644 --- a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/OpenNewGameMenuAction.kt +++ b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/OpenNewGameMenuAction.kt @@ -18,4 +18,4 @@ class OpenNewGameMenuAction @Inject constructor( companion object { const val KEY = "new_game_action" } -} \ No newline at end of file +} diff --git a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/OpenOptionsMenuAction.kt b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/OpenOptionsMenuAction.kt index 9cb0490..2247f4b 100644 --- a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/OpenOptionsMenuAction.kt +++ b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/OpenOptionsMenuAction.kt @@ -18,4 +18,4 @@ class OpenOptionsMenuAction @Inject constructor( companion object { const val KEY = "options_action" } -} \ No newline at end of file +} diff --git a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/di/MenuComponent.kt b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/di/MenuComponent.kt index 81c87eb..22ae838 100644 --- a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/di/MenuComponent.kt +++ b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/di/MenuComponent.kt @@ -17,7 +17,7 @@ import ru.fredboy.cavedroid.zygote.menu.renderer.MenuRenderer DataMenuModule::class, MenuBooleanOptionsModule::class, MenuActionsModule::class, - ] + ], ) interface MenuComponent { 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 b6b56f0..12ba87f 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 @@ -23,7 +23,7 @@ class MenuInputProcessor @Inject constructor( screenX: Int, screenY: Int, pointer: Int, - button: Int + button: Int, ): Boolean { val touchX = applicationContextRepository.getWidth() / Gdx.graphics.width * screenX.toFloat() val touchY = applicationContextRepository.getHeight() / Gdx.graphics.height * screenY.toFloat() @@ -38,7 +38,7 @@ class MenuInputProcessor @Inject constructor( /* x = */ applicationContextRepository.getWidth() / 2 - 100, /* y = */ applicationContextRepository.getHeight() / 4 + index * 30, /* width = */ 200f, - /* height = */ 20f + /* height = */ 20f, ) if (rect.contains(touchX, touchY)) { @@ -64,7 +64,6 @@ class MenuInputProcessor @Inject constructor( } } } - } } @@ -87,7 +86,7 @@ class MenuInputProcessor @Inject constructor( screenX: Int, screenY: Int, pointer: Int, - button: Int + button: Int, ): Boolean { return false } @@ -96,7 +95,7 @@ class MenuInputProcessor @Inject constructor( screenX: Int, screenY: Int, pointer: Int, - button: Int + button: Int, ): Boolean { return false } @@ -116,4 +115,4 @@ class MenuInputProcessor @Inject constructor( companion object { private const val TAG = "MenuInputProcessor" } -} \ No newline at end of file +} 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 a2d5885..f135794 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 @@ -22,4 +22,4 @@ class DynamicCameraMenuBooleanOption @Inject constructor( companion object { const val KEY = "dyncam" } -} \ No newline at end of file +} 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 9865da6..fed064a 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 @@ -22,4 +22,4 @@ class FullscreenMenuBooleanOption @Inject constructor( companion object { const val KEY = "fullscreen" } -} \ No newline at end of file +} diff --git a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/option/bool/IMenuBooleanOption.kt b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/option/bool/IMenuBooleanOption.kt index ba6e30a..f9f72eb 100644 --- a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/option/bool/IMenuBooleanOption.kt +++ b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/option/bool/IMenuBooleanOption.kt @@ -5,5 +5,4 @@ interface IMenuBooleanOption { fun getOption(): Boolean fun toggleOption() - -} \ No newline at end of file +} diff --git a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/renderer/MenuRenderer.kt b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/renderer/MenuRenderer.kt index 5921de7..483a7c1 100644 --- a/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/renderer/MenuRenderer.kt +++ b/core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/renderer/MenuRenderer.kt @@ -62,7 +62,7 @@ class MenuRenderer @Inject constructor( is MenuButton.Simple -> button.label is MenuButton.BooleanOption -> String.format( button.label, - button.optionKeys.map { key -> buttonBooleanOptions[key]?.getOption().toString() } + button.optionKeys.map { key -> buttonBooleanOptions[key]?.getOption().toString() }, ) } @@ -104,8 +104,8 @@ class MenuRenderer @Inject constructor( val backgroundRegionWidth = backgroundRegion.regionWidth val backgroundRegionHeight = backgroundRegion.regionWidth - for (x in 0 .. applicationContextRepository.getWidth().toInt() / backgroundRegionWidth) { - for (y in 0 .. applicationContextRepository.getHeight().toInt() / backgroundRegionHeight) { + for (x in 0..applicationContextRepository.getWidth().toInt() / backgroundRegionWidth) { + for (y in 0..applicationContextRepository.getHeight().toInt() / backgroundRegionHeight) { spriter.draw( /* region = */ backgroundRegion, /* x = */ x * backgroundRegionWidth.toFloat(), @@ -143,9 +143,8 @@ class MenuRenderer @Inject constructor( str = "CaveDroid " + CaveDroidConstants.VERSION, x = 0f, y = applicationContextRepository.getHeight() - getStringHeight("CaveDroid " + CaveDroidConstants.VERSION) * 1.5f, - ); + ) spriter.end() - } fun dispose() { @@ -159,5 +158,4 @@ class MenuRenderer @Inject constructor( private const val KEY_BUTTON_ENABLED_TEXTURE = "button_1" private const val KEY_BUTTON_DISABLED_TEXTURE = "button_0" } - -} \ No newline at end of file +} diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts index 6412b14..f19991f 100644 --- a/desktop/build.gradle.kts +++ b/desktop/build.gradle.kts @@ -30,11 +30,15 @@ tasks.register("dist") { manifest { attributes["Main-Class"] = desktopLauncherClassName } - from(files(configurations.runtimeClasspath.map { classpath -> - classpath.map { file -> - file.takeIf(File::isDirectory) ?: zipTree(file) - } - })) + from( + files( + configurations.runtimeClasspath.map { classpath -> + classpath.map { file -> + file.takeIf(File::isDirectory) ?: zipTree(file) + } + }, + ), + ) with(tasks.jar.get()) } diff --git a/desktop/src/main/kotlin/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.kt b/desktop/src/main/kotlin/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.kt index 55eeb34..3d18042 100644 --- a/desktop/src/main/kotlin/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.kt +++ b/desktop/src/main/kotlin/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.kt @@ -14,7 +14,9 @@ internal object DesktopLauncher { with(config) { setWindowIcon( /* fileType = */ Files.FileType.Internal, - /* ...filePaths = */ "icons/icon512.png", "icons/icon256.png", "icons/icon128.png" + "icons/icon512.png", + "icons/icon256.png", + "icons/icon128.png", ) setTitle("CaveDroid") setWindowedMode(960, 540) @@ -51,4 +53,4 @@ internal object DesktopLauncher { Lwjgl3Application(caveGame, config) } -} \ No newline at end of file +} 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 951330b..bfa7534 100644 --- a/desktop/src/main/kotlin/ru/deadsoftware/cavedroid/desktop/DesktopPreferencesStore.kt +++ b/desktop/src/main/kotlin/ru/deadsoftware/cavedroid/desktop/DesktopPreferencesStore.kt @@ -14,5 +14,4 @@ class DesktopPreferencesStore : PreferencesStore { override fun setPreference(key: String, value: String?) { prefs.put(key, value) } - -} \ No newline at end of file +}