DEADSOFTWARE

Format with ktlint
authorfredboy <fredboy@protonmail.com>
Tue, 1 Jul 2025 14:39:27 +0000 (21:39 +0700)
committerfredboy <fredboy@protonmail.com>
Tue, 1 Jul 2025 14:39:38 +0000 (21:39 +0700)
266 files changed:
.editorconfig [new file with mode: 0644]
android/build.gradle.kts
android/src/main/AndroidManifest.xml
android/src/main/kotlin/ru/deadsoftware/cavedroid/AndroidLauncher.kt
android/src/main/kotlin/ru/deadsoftware/cavedroid/AndroidPreferencesStore.kt
android/src/main/res/drawable-anydpi-v26/ic_launcher.xml
build.gradle.kts
buildSrc/src/main/kotlin/Dependencies.kt
core/common/src/main/kotlin/ru/fredboy/cavedroid/common/CaveDroidConstants.kt
core/common/src/main/kotlin/ru/fredboy/cavedroid/common/api/ApplicationController.kt
core/common/src/main/kotlin/ru/fredboy/cavedroid/common/api/PreferencesStore.kt
core/common/src/main/kotlin/ru/fredboy/cavedroid/common/automultibind/MultibindingConfig.kt
core/common/src/main/kotlin/ru/fredboy/cavedroid/common/base/MainConfiguration.kt
core/common/src/main/kotlin/ru/fredboy/cavedroid/common/model/Joystick.kt
core/common/src/main/kotlin/ru/fredboy/cavedroid/common/model/SpriteOrigin.kt
core/common/src/main/kotlin/ru/fredboy/cavedroid/common/utils/CollectionsExtensions.kt
core/common/src/main/kotlin/ru/fredboy/cavedroid/common/utils/RenderingUtils.kt
core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/di/DataAssetsModule.kt
core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/BlockAssetsRepositoryImpl.kt
core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/BlockDamageAssetsRepositoryImpl.kt
core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/FontAssetsRepositoryImpl.kt
core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/ItemsAssetsRepositoryImpl.kt
core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/MobAssetsRepositoryImpl.kt
core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/TextureRegionsAssetsRepositoryImpl.kt
core/data/assets/src/main/kotlin/ru/fredboy/cavedroid/data/assets/internal/TouchButtonsRepositoryImpl.kt
core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/di/ApplicationContextModule.kt
core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/di/GameContextModule.kt
core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/model/GameContext.kt
core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/repository/ApplicationContextRepositoryImpl.kt
core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/repository/GameContextRepositoryImpl.kt
core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/store/ApplicationContextStore.kt
core/data/configuration/src/main/kotlin/ru/fredboy/cavedroid/data/configuration/store/GameContextStore.kt
core/data/items/src/main/kotlin/ru/fredboy/cavedroid/data/items/di/DataItemsModule.kt
core/data/items/src/main/kotlin/ru/fredboy/cavedroid/data/items/mapper/BlockMapper.kt
core/data/items/src/main/kotlin/ru/fredboy/cavedroid/data/items/mapper/ItemMapper.kt
core/data/items/src/main/kotlin/ru/fredboy/cavedroid/data/items/model/GameItemsDto.kt
core/data/items/src/main/kotlin/ru/fredboy/cavedroid/data/items/repository/ItemsRepositoryImpl.kt
core/data/menu/src/main/kotlin/ru/fredboy/cavedroid/data/menu/di/DataMenuModule.kt
core/data/menu/src/main/kotlin/ru/fredboy/cavedroid/data/menu/mapper/MenuButtonMapper.kt
core/data/menu/src/main/kotlin/ru/fredboy/cavedroid/data/menu/repository/MenuButtonRepositoryImpl.kt
core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/di/DataSaveModule.kt
core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/ChestMapper.kt
core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/ContainerControllerMapper.kt
core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/ControlModeMapper.kt
core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/DirectionMapper.kt
core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/DropControllerMapper.kt
core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/DropMapper.kt
core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/FallingBlockMapper.kt
core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/FurnaceMapper.kt
core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/InventoryItemMapper.kt
core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/InventoryMapper.kt
core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/MobControllerMapper.kt
core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/PigMapper.kt
core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/mapper/PlayerMapper.kt
core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/model/SaveDataDto.kt
core/data/save/src/main/kotlin/ru/fredboy/cavedroid/data/save/repository/SaveDataRepositoryImpl.kt
core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/GameAssetsHolder.kt
core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/model/MobSprite.kt
core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/model/TouchButton.kt
core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/AssetsRepository.kt
core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/BlockAssetsRepository.kt
core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/BlockDamageAssetsRepository.kt
core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/FontAssetsRepository.kt
core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/ItemsAssetsRepository.kt
core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/MobAssetsRepository.kt
core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/TextureRegionsAssetsRepository.kt
core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/repository/TouchButtonsAssetsRepository.kt
core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/DisposeAssetsUseCase.kt
core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetBlockDamageFrameCountUseCase.kt
core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetBlockDamageSpriteUseCase.kt
core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetBlockTextureUseCase.kt
core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetFontUseCase.kt
core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetItemTextureUseCase.kt
core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetPigSpritesUseCase.kt
core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetPlayerSpritesUseCase.kt
core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetStringHeightUseCase.kt
core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetStringWidthUseCase.kt
core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetTextureRegionByNameUseCase.kt
core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/GetTouchButtonsUseCase.kt
core/domain/assets/src/main/kotlin/ru/fredboy/cavedroid/domain/assets/usecase/InitializeAssetsUseCase.kt
core/domain/configuration/src/main/kotlin/ru/fredboy/cavedroid/domain/configuration/model/CameraContext.kt
core/domain/configuration/src/main/kotlin/ru/fredboy/cavedroid/domain/configuration/repository/ApplicationContextRepository.kt
core/domain/configuration/src/main/kotlin/ru/fredboy/cavedroid/domain/configuration/repository/GameContextRepository.kt
core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/block/Block.kt
core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/block/BlockAnimationInfo.kt
core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/block/BlockMargins.kt
core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/craft/CraftingRecipe.kt
core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/inventory/Inventory.kt
core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/inventory/InventoryItem.kt
core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/model/item/Item.kt
core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/repository/ItemsRepository.kt
core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/DisposeItemsRepositoryUseCase.kt
core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetBlockByKeyUseCase.kt
core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetBlocksByTypeUseCase.kt
core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetCraftingResultUseCase.kt
core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetFallbackBlockUseCase.kt
core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetFallbackItemUseCase.kt
core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetItemByIndexUseCase.kt
core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/GetItemByKeyUseCase.kt
core/domain/items/src/main/kotlin/ru/fredboy/cavedroid/domain/items/usecase/InitializeItemsRepositoryUseCase.kt
core/domain/menu/src/main/kotlin/ru/fredboy/cavedroid/domain/menu/model/MenuButton.kt
core/domain/menu/src/main/kotlin/ru/fredboy/cavedroid/domain/menu/repository/MenuButtonRepository.kt
core/domain/save/src/main/kotlin/ru/fredboy/cavedroid/domain/save/model/GameMapSaveData.kt
core/domain/save/src/main/kotlin/ru/fredboy/cavedroid/domain/save/model/GameSaveData.kt
core/domain/save/src/main/kotlin/ru/fredboy/cavedroid/domain/save/repository/SaveDataRepository.kt
core/domain/world/src/main/kotlin/ru/fredboy/cavedroid/domain/world/listener/OnBlockDestroyedListener.kt
core/domain/world/src/main/kotlin/ru/fredboy/cavedroid/domain/world/listener/OnBlockPlacedListener.kt
core/domain/world/src/main/kotlin/ru/fredboy/cavedroid/domain/world/model/Layer.kt
core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/abstraction/ContainerFactory.kt
core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/abstraction/ContainerWorldAdapter.kt
core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/model/Chest.kt
core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/model/Container.kt
core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/model/ContainerCoordinates.kt
core/entity/container/src/main/kotlin/ru/fredboy/cavedroid/entity/container/model/Furnace.kt
core/entity/drop/src/main/kotlin/ru/fredboy/cavedroid/entity/drop/abstraction/DropAdapter.kt
core/entity/drop/src/main/kotlin/ru/fredboy/cavedroid/entity/drop/abstraction/DropWorldAdapter.kt
core/entity/drop/src/main/kotlin/ru/fredboy/cavedroid/entity/drop/model/Drop.kt
core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/abstraction/MobBehavior.kt
core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/abstraction/MobWorldAdapter.kt
core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/abstraction/PlayerAdapter.kt
core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/model/Direction.kt
core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/model/FallingBlock.kt
core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/model/Mob.kt
core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/model/Pig.kt
core/entity/mob/src/main/kotlin/ru/fredboy/cavedroid/entity/mob/model/Player.kt
core/game/controller/container/src/main/kotlin/ru/fredboy/cavedroid/game/controller/container/ContainerController.kt
core/game/controller/container/src/main/kotlin/ru/fredboy/cavedroid/game/controller/container/di/ControllerContainerModule.kt
core/game/controller/container/src/main/kotlin/ru/fredboy/cavedroid/game/controller/container/impl/ContainerFactoryImpl.kt
core/game/controller/drop/src/main/kotlin/ru/fredboy/cavedroid/game/controller/drop/DropController.kt
core/game/controller/drop/src/main/kotlin/ru/fredboy/cavedroid/game/controller/drop/di/ControllerDropModule.kt
core/game/controller/drop/src/main/kotlin/ru/fredboy/cavedroid/game/controller/drop/impl/DropAdapterImpl.kt
core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/MobController.kt
core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/behavior/BaseMobBehavior.kt
core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/behavior/FallingBlockMobBehavior.kt
core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/behavior/PigMobBehavior.kt
core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/behavior/PlayerMobBehavior.kt
core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/di/MobControllerModule.kt
core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/factory/FallingBlockFactory.kt
core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/factory/PigFactory.kt
core/game/controller/mob/src/main/kotlin/ru/fredboy/cavedroid/game/controller/mob/impl/PlayerAdapterImpl.kt
core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/GameWindowType.kt
core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/GameWindowsConfigs.kt
core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/GameWindowsManager.kt
core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/TooltipManager.kt
core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/AbstractInventoryWindow.kt
core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/AbstractInventoryWindowWithCraftGrid.kt
core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/ChestInventoryWindow.kt
core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/CraftingInventoryWindow.kt
core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/CreativeInventoryWindow.kt
core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/FurnaceInventoryWindow.kt
core/game/window/src/main/kotlin/ru/fredboy/cavedroid/game/window/inventory/SurvivalInventoryWindow.kt
core/game/world/src/main/kotlin/ru/fredboy/cavedroid/game/world/GameWorld.kt
core/game/world/src/main/kotlin/ru/fredboy/cavedroid/game/world/di/GameWorldModule.kt
core/game/world/src/main/kotlin/ru/fredboy/cavedroid/game/world/generator/Biome.kt
core/game/world/src/main/kotlin/ru/fredboy/cavedroid/game/world/generator/GameWorldGenerator.kt
core/game/world/src/main/kotlin/ru/fredboy/cavedroid/game/world/generator/WorldGeneratorConfig.kt
core/game/world/src/main/kotlin/ru/fredboy/cavedroid/game/world/impl/WorldAdapterImpl.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/GameInputProcessor.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/PlaceBlockActionUtils.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/annotation/BindPlaceBlockAction.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/annotation/BindUseBlockAction.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/annotation/BindUseItemAction.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/placeblock/IPlaceBlockAction.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/placeblock/PlaceBlockItemToForegroundAction.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/placeblock/PlaceSlabAction.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useblock/IUseBlockAction.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useblock/UseChestAction.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useblock/UseCraftingTableAction.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useblock/UseFurnaceAction.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useitem/IUseItemAction.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useitem/UseBedAction.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/action/useitem/UseWaterBucketAction.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/IGameInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/InputUtils.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/action/IGameInputAction.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/action/KeyboardInputAction.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/action/MouseInputAction.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/action/keys/KeyboardInputActionKey.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/action/keys/MouseInputActionKey.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/annotation/BindKeyboardInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/annotation/BindMouseInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/CloseGameWindowKeyboardInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/DropItemKeyboardInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/FlyDownKeyboardInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/FlyUpKeyboardInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/GoLeftKeyboardInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/GoRightKeyboardInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/JumpKeyboardInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/MoveCursorControlsModeKeyboardInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/OpenInventoryKeyboardInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/PauseGameKeyboardInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/SelectHotbarSlotKeyboardInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/StopSwimKeyboardInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/SwimUpKeyboardInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/ToggleControlsModeKeyboardInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/ToggleDebugInfoKeyboardInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/ToggleGameModeKeyboardInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/ToggleMinimapKeyboardInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/keyboard/TurnOnFlyModeKeyboardInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/AbstractInventoryItemsMouseInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/AttackMouseInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/CloseGameWindowMouseInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/CreativeInventoryScrollMouseInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/CursorMouseInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/HotbarMouseInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/SelectChestInventoryItemMouseInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/SelectCraftingInventoryItemMouseInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/SelectCreativeInventoryItemMouseInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/SelectFurnaceInventoryItemMouseInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/SelectSurvivalInventoryItemMouseInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/mouse/UseItemMouseInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/handler/touch/JoystickInputHandler.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/mapper/KeyboardInputActionMapper.kt
core/ux/controls/src/main/kotlin/ru/fredboy/cavedroid/ux/controls/input/mapper/MouseInputActionMapper.kt
core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/annotation/BindUpdateBlockAction.kt
core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/IUpdateBlockAction.kt
core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/UpdateBedLeftAction.kt
core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/UpdateBedRightAction.kt
core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/UpdateGrassAction.kt
core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/UpdateRequiresBlockAction.kt
core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/action/updateblock/UpdateSnowedGrassAction.kt
core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/task/GameWorldBlocksLogicControllerTask.kt
core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/task/GameWorldFluidsLogicControllerTask.kt
core/ux/physics/src/main/kotlin/ru/fredboy/cavedroid/ux/physics/task/GameWorldMobDamageControllerTask.kt
core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/BackgroundBlocksRenderer.kt
core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/BlocksRenderer.kt
core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/DebugInfoStringsProvider.kt
core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/DebugRenderer.kt
core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/DropsRenderer.kt
core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/ForegroundBlocksRenderer.kt
core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/HudRenderer.kt
core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/IGameRenderer.kt
core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/MobsRenderer.kt
core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/TouchControlsRenderer.kt
core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/WindowsRenderer.kt
core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/annotation/BindRenderer.kt
core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/AbstractWindowRenderer.kt
core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/ChestWindowRenderer.kt
core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/CraftingWindowRenderer.kt
core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/CreativeWindowRenderer.kt
core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/FurnaceWindowRenderer.kt
core/ux/rendering/src/main/kotlin/ru/fredboy/cavedroid/ux/rendering/windows/SurvivalWindowRenderer.kt
core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/CaveDroidApplication.kt
core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/base/BaseScreen.kt
core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/di/ApplicationComponent.kt
core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/game/GameScreen.kt
core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/game/di/GameComponent.kt
core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/game/di/GameModule.kt
core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/MenuScreen.kt
core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/ExitGameAction.kt
core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/IMenuAction.kt
core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/LoadGameAction.kt
core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/NewGameCreativeAction.kt
core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/NewGameSurvivalAction.kt
core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/OpenMainMenuAction.kt
core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/OpenNewGameMenuAction.kt
core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/action/OpenOptionsMenuAction.kt
core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/di/MenuComponent.kt
core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/input/MenuInputProcessor.kt
core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/option/bool/DynamicCameraMenuBooleanOption.kt
core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/option/bool/FullscreenMenuBooleanOption.kt
core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/option/bool/IMenuBooleanOption.kt
core/zygote/src/main/kotlin/ru/fredboy/cavedroid/zygote/menu/renderer/MenuRenderer.kt
desktop/build.gradle.kts
desktop/src/main/kotlin/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.kt
desktop/src/main/kotlin/ru/deadsoftware/cavedroid/desktop/DesktopPreferencesStore.kt

diff --git a/.editorconfig b/.editorconfig
new file mode 100644 (file)
index 0000000..ec9a968
--- /dev/null
@@ -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
index 34932be0afe44b25468c2ac84541fca8d873d5e5..eb63e5c4611d848a5635059ec757a0a1ff0ba2ad 100644 (file)
@@ -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
+}
index 9328a4edd5b08ac8f70675819a992dd7e619f620..44285325aeaa81cb53b14ae8e67949a021a2051d 100644 (file)
@@ -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">
         <activity
                 android:exported="true"
                 android:name="ru.deadsoftware.cavedroid.AndroidLauncher"
-                android:label="@string/app_name"
                 android:screenOrientation="sensorLandscape"
                 android:configChanges="keyboard|keyboardHidden|navigation|orientation|screenSize"
                 tools:ignore="LockedOrientationActivity">
index 129379aae68d8056fb27c7af76bd1b44a610ee02..7bf5d851b76d006fc8fab96f0f2a51d6861af23a 100644 (file)
@@ -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
+}
index d334cfef9e32d48efd5142d3245b0836e72bb59d..ed9604058adc4a17f1c79befc580de80349e6292 100644 (file)
@@ -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
+}
index 6b78462d615bfe7003b31d0534dcad416b75ad25..9c60f3555d205c27504c9e2ba1cea921f114f42f 100644 (file)
@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background" />
     <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome/>
 </adaptive-icon>
index 203aceca68e8b16095f46ec0e3c7ed027f974540..72256749846cbae13bd926fa097b164a3774819b 100644 (file)
@@ -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
+}
index 609f671658714b4d4beb35cde475642f717a404e..c688ed7bfa2cca9942fdad9281995bc80fcf09e8 100644 (file)
@@ -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
index 180b694501e8b6fc4acbf7430c66f8345d63a566..2083a66df1a8538c344af26ed75e8d739b0d56c6 100644 (file)
@@ -3,5 +3,4 @@ package ru.fredboy.cavedroid.common
 object CaveDroidConstants {
 
     const val VERSION = "alpha 0.9.2"
-
-}
\ No newline at end of file
+}
index 36b1f07a53846936c11d6c1869b8004abe542bf5..52e73374f3add69fac806a5146acc5daf402e874 100644 (file)
@@ -11,5 +11,4 @@ interface ApplicationController {
     fun loadGame()
 
     fun exitGame()
-
-}
\ No newline at end of file
+}
index 9b48604ce440acad4028f3359939e46e1ad3d8f5..38921fca39b9afcc91d06b41feac69fc10b99b7d 100644 (file)
@@ -5,5 +5,4 @@ interface PreferencesStore {
     fun getPreference(key: String): String?
 
     fun setPreference(key: String, value: String?)
-
-}
\ No newline at end of file
+}
index 06f5d79fd7a61598dd01bcfbf90552adc155ae8a..562b680b138c9a8cedecf86dacd00dea8ac8c47f 100644 (file)
@@ -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
+}
index 7192bcfb4f9f4f7b8123906698dd19dc6e348a9b..858c2c9e4862da6945aaf53d0255e2c28cd24069 100644 (file)
@@ -1,4 +1,3 @@
 package ru.fredboy.cavedroid.common.base
 
-interface MainConfiguration {
-}
\ No newline at end of file
+interface MainConfiguration
index 89272d6fd420a015b3b781072e286e4937edcb31..3f889639997d2694269e2b4f18e7576ee6bdc6af 100644 (file)
@@ -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
+}
index 14a799a348472e6d324f60abc128052886d7509d..e79f5684b49eebdf648c6ca2029a9bccb8eae1ac 100644 (file)
@@ -27,5 +27,4 @@ data class SpriteOrigin(
     fun applyToSprite(sprite: Sprite) {
         sprite.setOrigin(sprite.width * x, sprite.height * y)
     }
-
 }
index 8d8f8f466dc4da40edb4dc2d40151d59a40f3e40..fef5fd1e0558d5c62e7f1e9ed45a0ee793bc6c15 100644 (file)
@@ -15,4 +15,4 @@ fun <T> MutableCollection<T>.retrieveFirst(predicate: (T) -> Boolean): T? {
 
 fun <T> MutableCollection<T>.removeFirst(predicate: (T) -> Boolean): Boolean {
     return retrieveFirst(predicate) != null
-}
\ No newline at end of file
+}
index 01822bca3894ec460e003fac7f62baee62d47966..3631fc588292cdd1317d1c0eec58b8cb45591eb5 100644 (file)
@@ -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()
index 73dc017b26ae3f54f1839eaa45361c0da72d99b1..de7564cd51c85b09f6d7c5854bdff3071e95cdff 100644 (file)
@@ -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
+}
index 4bf0cabe093c07f63b0ec72d1d34d7799124df85..87cd703d0938a1228a1e66d037697a4558f6d71a 100644 (file)
@@ -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
+}
index f073ad3787c2f8cd33242f4e498c7d73864ce478..37f8d96cbd682e0c997e7216759fefe2ed0d2e69 100644 (file)
@@ -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
+}
index c5e2eb39d09802250172bf1c0835278bb7aabdd9..4b071cf2ff2538639281947b48f17d7f5b5eb2c5 100644 (file)
@@ -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
+}
index 0a44ff6f42e154a1a6ddb8e2183bc490e6448a08..b9c8d995bef17d03cac53b9b2e3c610b9bc7536d 100644 (file)
@@ -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
+}
index 7947cbde8ed37ae85d7e7caf5bc4a2e567740b44..3090a8baedec1480d810f65f437c87a8c60a188d 100644 (file)
@@ -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
+}
index f4798164bce3317f158021c7daad3e356095be37..a05cc8204f1d8fca87aded92746a11fe2cb62cc8 100644 (file)
@@ -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"
     }
-
 }
index 14f6c2a8427a5122608337d008036b41a790e0f7..dc4363c41df73f1d75d8ca8e6010be8ce91dcad7 100644 (file)
@@ -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
+}
index aed805516f30a8da8ac18f86848075eaaea4bcc5..8d83e3d39aab58899f15314139e68ef7801ae7a2 100644 (file)
@@ -10,4 +10,4 @@ abstract class ApplicationContextModule {
 
     @Binds
     internal abstract fun bindApplicationContextRepository(impl: ApplicationContextRepositoryImpl): ApplicationContextRepository
-}
\ No newline at end of file
+}
index 5a2a512d9eb1a9af4cc2c449f410f38bc7713e2b..05606ca41bfb49cf72adf7539755a0316ec62540 100644 (file)
@@ -10,4 +10,4 @@ abstract class GameContextModule {
 
     @Binds
     internal abstract fun bindGameContextRepository(impl: GameContextRepositoryImpl): GameContextRepository
-}
\ No newline at end of file
+}
index 888c2c9bbd252ca25f793b9be933775fb4846cae..2edef454932164f1d5a4e8043ede6aed92542311 100644 (file)
@@ -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,
 )
index 1d98372e9a49f134d0d5bcad15e3828126744f40..83f87d38775a70bc2f7990e9020fe9a442f4eeec 100644 (file)
@@ -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
+}
index 5d59cbf6e555e88d8cbdc1d6a5675bda576d3c2a..bf2f9493aedd07511cd4528d6fb7b169277955b6 100644 (file)
@@ -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
index 7c56fde3d9567fd85ef86e3a2dcf9615e22a8ded..218dc6c766fcdb0603f3dd345f0fe1227ab7dabf 100644 (file)
@@ -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
+}
index adaedde60da40ee5cdf242505121ac9507521a70..21d763822223e49025e0f2503ac002f54cccfc67 100644 (file)
@@ -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()
index 7289613dbada940dc7f6531a11afbef6de68b938..2af776a5c2b481eb3b52c47f302bfc750ff2278b 100644 (file)
@@ -10,5 +10,4 @@ abstract class DataItemsModule {
 
     @Binds
     internal abstract fun bindItemsRepository(impl: ItemsRepositoryImpl): ItemsRepository
-
 }
index 27012ebcf767c983eb5e2e7bb315b90818519604..ab791b0a33946dcbc1684a9fadcd507b81604acf 100644 (file)
@@ -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<out Item.Tool>? {
-        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
+}
index c1849dead3783c1d847df55ea401c8f4a74fd03d..eb8ddc2666f16738ebc7e95fdfb3ff2c34a5990f 100644 (file)
@@ -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
+}
index 450c7168763f7ce901957475135de53abeb79319..5dab153ae385808d26c73d1329871f010581b65b 100644 (file)
@@ -7,4 +7,4 @@ import kotlinx.serialization.Serializable
 data class GameItemsDto(
     @SerialName("blocks") val blocks: Map<String, BlockDto>,
     @SerialName("items") val items: Map<String, ItemDto>,
-)
\ No newline at end of file
+)
index 3560265d361265a0fb7b48c0525f7531587ce864..ffdb531dbebfc91cdee713ca4e52f4fb83f3c03a 100644 (file)
@@ -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
+}
index 621edeb9b37a51fc0cf801f00ee981ad194a81d9..29e3e2940b5e20a01f951780dc6c76fba41ed446 100644 (file)
@@ -10,5 +10,4 @@ abstract class DataMenuModule {
 
     @Binds
     internal abstract fun bindMenuButtonsRepository(impl: MenuButtonRepositoryImpl): MenuButtonRepository
-
 }
index 9bafcc9e7c126296972408c54d420b3482343c4a..5a7eb06bc4a1a89425ccfd6b70c421d0949f3628 100644 (file)
@@ -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
+}
index 81b8a98c0fdd6b9a21719db1758cfd1f7bc199d2..2b3d94b55c190fd563d784d2609efd2e4b981426 100644 (file)
@@ -84,5 +84,4 @@ class MenuButtonRepositoryImpl @Inject constructor(
 
         private val JsonFormat = Json { ignoreUnknownKeys = true }
     }
-
-}
\ No newline at end of file
+}
index cc68d6f274aa6f1e83eca868f7b2fa644720e4e2..e72505539877bbdbd4097d6607599fdc782eb994 100644 (file)
@@ -10,5 +10,4 @@ abstract class DataSaveModule {
 
     @Binds
     internal abstract fun bindSaveDataRepository(impl: SaveDataRepositoryImpl): SaveDataRepository
-
 }
index ee22ec86614285e15abee461f3ae33cd57a972bb..68187b5103a05b3e21e988840571ee1fc5dbb04b 100644 (file)
@@ -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
+}
index b9dd15cd4c86ab4b338c120daf90e685538e3cfb..91648c771a8ebfb3921b9d116d252548ac545232 100644 (file)
@@ -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
+}
index e8607dc07b5236145855d168a2d9b167c283bbaf..6875b1ef45f81afcd80ba94067fef63cf1ec10d0 100644 (file)
@@ -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
+}
index 8a0cc5d529515b311d08cb80427727aee54bf979..684f513f82adfd2ceead35318b5a6c168e8d1947 100644 (file)
@@ -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
+}
index e6a51251ed8a508e7e05b4bbaa718e3eb816d784..48c3d01d5ae397809ed3d72234b0d6572426f76d 100644 (file)
@@ -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
+}
index df90da23c82192e3cbb76353bad6037693f2ed17..991067f893fcbb8408a5cab35093f38ec9678f0c 100644 (file)
@@ -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
+}
index 21c43e6a667f05713a01acdc0ed8a93060932e0b..f61958025bc5016531dbbc12e36460c9a2b33b55 100644 (file)
@@ -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
+}
index f5c2b82eb6f855a0f17380cb00b3b251bb3b74a3..4b7f0e0007dbe608c7a25811e335afa018da5ca1 100644 (file)
@@ -45,4 +45,4 @@ class FurnaceMapper @Inject constructor(
     companion object {
         private const val SAVE_DATA_VERSION = 3
     }
-}
\ No newline at end of file
+}
index 3fa2ac0e7d6b105cecc855c4003715a1136e3d72..9976077d81c992fbfbd1b703ed5212cddde0f561 100644 (file)
@@ -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
+}
index a90b03287848fa8e8d1929905bc3964fe107ecc6..6f34019bed90d229a3f47456b3576e30947330a5 100644 (file)
@@ -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
+}
index 4f838f3ecb8cfafcd6b033b2478b1567c574b44e..f9fe23c6990c673fa8d2bb226757e9c70cd01fea 100644 (file)
@@ -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
+}
index 415262cf9160d6150e069a665c73cbcded95b76f..b51bb6216dcb42c6ac201154330c466dc4ee9bbd 100644 (file)
@@ -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
+}
index 95ff279a2bc0a2382084061036038aeb90fd47bc..1dab7a8bbf7ef3ba9017ca14cc013c3b9e085a07 100644 (file)
@@ -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
+}
index dcd2026df084c4f525caf1ad1b5aaf14aa701d30..6305b501bd2e6df5239175f6084920a9ce181459 100644 (file)
@@ -84,7 +84,7 @@ sealed class SaveDataDto {
     data class ChestSaveDataDto(
         override val version: Int,
         override val size: Int,
-        override val items: List<InventoryItemSaveDataDto>
+        override val items: List<InventoryItemSaveDataDto>,
     ) : 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<DropSaveDataDto>
+        val drops: List<DropSaveDataDto>,
     ) : SaveDataDto()
 
     @Serializable
@@ -192,5 +192,4 @@ sealed class SaveDataDto {
         val mobs: List<@Contextual MobSaveDataDto>,
         val player: PlayerSaveDataDto,
     ) : SaveDataDto()
-
-}
\ No newline at end of file
+}
index 426af589ae24123acfe82635dfc28dc591a72920..4cd33b786d682228d6ed5c79f8e876c430cb285a 100644 (file)
@@ -48,7 +48,7 @@ internal class SaveDataRepositoryImpl @Inject constructor(
 
     private fun buildBlocksDictionary(
         foreMap: Array<Array<Block>>,
-        backMap: Array<Array<Block>>
+        backMap: Array<Array<Block>>,
     ): Map<String, Int> {
         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<Array<Block>>, dict: Map<String, Int>): 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<Array<Block>>, Array<Array<Block>>> {
         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<SaveDataDto.ContainerControllerSaveDataDto>(
-            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
+}
index 0149137d33b4de3fe293216334ca19a8a3ae590f..9c50e6f8b96753e52c77b18b3a426a218e935b58 100644 (file)
@@ -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)
     }
-
 }
index 120b90a327d1e83cb55ec19718c69537fc1189b4..8805db411f2c9438a476dcf7736d3c5317891725 100644 (file)
@@ -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
+}
index a93431406277d97632952d2764f607ecdc626f17..5b1d1eb3a18695b874fb06f55d06ae968742bcc7 100644 (file)
@@ -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,
 )
index b797aedb5b46f4cf67309cd08451c3cf3546783b..520a1654ad86567bf3d21fe1e0b57036bcb5cd60 100644 (file)
@@ -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<String, Texture>
+        cache: MutableMap<String, Texture>,
     ): Texture {
         val cached = cache[textureName]
 
@@ -66,5 +66,4 @@ abstract class AssetsRepository : Disposable {
     }
 
     abstract fun initialize()
-
 }
index 035dd4fa8d3155dc070854803efefccef158f37e..153a05aa1e0e472d49becb19d7d6965971ddb9d9 100644 (file)
@@ -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
+}
index dfae46ba5a91af84610df64b91cf62edf7132438..82c66694f8d70fd851f925827b02f8531fa5caf9 100644 (file)
@@ -7,5 +7,4 @@ abstract class BlockDamageAssetsRepository : AssetsRepository() {
     abstract val damageStages: Int
 
     abstract fun getBlockDamageSprite(stage: Int): Sprite
-
 }
index 939a260212f22d39bee19d52f33ceb5338350173..0b7068721d7aa2c221b35200f182aff6f52c9e66 100644 (file)
@@ -9,4 +9,4 @@ abstract class FontAssetsRepository : AssetsRepository() {
     abstract fun getStringHeight(string: String): Float
 
     abstract fun getFont(): BitmapFont
-}
\ No newline at end of file
+}
index 66720f0c7be7285fbdab65d7159a4d60f60690ee..5a987798a2b13bc845a834cfba70b3002b8837f3 100644 (file)
@@ -5,5 +5,4 @@ import com.badlogic.gdx.graphics.Texture
 abstract class ItemsAssetsRepository : AssetsRepository() {
 
     abstract fun getItemTexture(textureName: String): Texture
-
 }
index 85c5ca8367a9aeae7c96f7d19fa65f19f720379a..ecc8d520a6b052dc70d914994715c947805ab093 100644 (file)
@@ -7,5 +7,4 @@ abstract class MobAssetsRepository : AssetsRepository() {
     abstract fun getPlayerSprites(): MobSprite.Player
 
     abstract fun getPigSprites(): MobSprite.Pig
-
-}
\ No newline at end of file
+}
index c84d0ba3281f6cb7d8f6c5fe499800c55bb7cb51..a26c8fa48f35c76b0c3629437d430bd9a3d4f446 100644 (file)
@@ -5,5 +5,4 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion
 abstract class TextureRegionsAssetsRepository : AssetsRepository() {
 
     abstract fun getTextureRegionByName(name: String): TextureRegion?
-
 }
index 07c486b42aea10851659479417919c6ff51b952f..ebf6373aed27853f4e1c10ffee6dd92aa4d3f76b 100644 (file)
@@ -5,5 +5,4 @@ import ru.fredboy.cavedroid.domain.assets.model.TouchButton
 abstract class TouchButtonsAssetsRepository : AssetsRepository() {
 
     abstract fun getTouchButtons(): Map<String, TouchButton>
-
-}
\ No newline at end of file
+}
index 58e152c5403c91c0db32edfe27e51aa3d1d80832..e4fd2568b7e2a49070f26ca20a752cb77b931106 100644 (file)
@@ -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
+}
index 089c86392c0dbee2acc07b19d9de153a9ef5bbc6..6a69980180c6549ce2307f89c4d5a3dc30603d89 100644 (file)
@@ -12,5 +12,4 @@ class GetBlockDamageFrameCountUseCase @Inject constructor(
     operator fun invoke(): Int {
         return gameAssetsHolder.getBlockDamageFrameCount()
     }
-
 }
index 5fb52e5842756d87a7c4f10b504e83c4a35bfee6..4883a55a68c28fa810f14d6a02d69794eb533334 100644 (file)
@@ -13,5 +13,4 @@ class GetBlockDamageSpriteUseCase @Inject constructor(
     operator fun get(stage: Int): Sprite {
         return gameAssetsHolder.getBlockDamageSprite(stage)
     }
-
 }
index d2c07bd7b7ebb20d0134968ed470abac531e4424..59c8a533fb4aad7868b40c141bb44d2c96a645de 100644 (file)
@@ -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
+}
index 032de5e62d2c6a718e48b876f12317a687cfa769..be33e6b8017f5754353467b8b81139712ba0a52e 100644 (file)
@@ -13,5 +13,4 @@ class GetFontUseCase @Inject constructor(
     operator fun invoke(): BitmapFont {
         return gameAssetsHolder.getFont()
     }
-
 }
index 84bfa2cfed05ebc7899995e1ea15dcacaeca20da..aab1077e141ce7ada48c8d9918d9b2d76327ba38 100644 (file)
@@ -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
+}
index e38c6a8ddad247d364d00de6ff6895c259938a02..aea4525d26d99271dc7d6b226a47e2528a9c2895 100644 (file)
@@ -13,5 +13,4 @@ class GetPigSpritesUseCase @Inject constructor(
     operator fun invoke(): MobSprite.Pig {
         return gameAssetsHolder.getPigSprites()
     }
-
 }
index 183ee48cf5af8bc2d7a0f284efafcdc1c6ed4584..42ea98ca96715752b96246408ca295a14c994b3e 100644 (file)
@@ -13,5 +13,4 @@ class GetPlayerSpritesUseCase @Inject constructor(
     operator fun invoke(): MobSprite.Player {
         return gameAssetsHolder.getPlayerSprites()
     }
-
 }
index 0c203e2a16511704876a7fa38a994a5c56689033..6f2cb5ce7f6d40ac2db05faf80b606f90b447eb8 100644 (file)
@@ -12,5 +12,4 @@ class GetStringHeightUseCase @Inject constructor(
     operator fun invoke(string: String): Float {
         return gameAssetsHolder.getStringHeight(string)
     }
-
-}
\ No newline at end of file
+}
index 901617f4ee9cfce9acb61acd28e5d28df988d7bf..ebfa4821f14ce4d4804ef5d998e2053f150d028b 100644 (file)
@@ -12,5 +12,4 @@ class GetStringWidthUseCase @Inject constructor(
     operator fun invoke(string: String): Float {
         return gameAssetsHolder.getStringWidth(string)
     }
-
-}
\ No newline at end of file
+}
index ac7f8f75f05f93da41539dbde3039b3c4ff1dc64..b0a2b35f32efe7468b0f968170796e32a896ac6d 100644 (file)
@@ -13,5 +13,4 @@ class GetTextureRegionByNameUseCase @Inject constructor(
     operator fun get(name: String): TextureRegion? {
         return gameAssetsHolder.getTextureRegionByName(name)
     }
-
 }
index c9e4ed067d2426f22df061018df835102f6aa595..b74049cdeee2d4bf53369957d86a2197ccafa5e1 100644 (file)
@@ -13,5 +13,4 @@ class GetTouchButtonsUseCase @Inject constructor(
     operator fun invoke(): Map<String, TouchButton> {
         return gameAssetsHolder.getTouchButtons()
     }
-
 }
index 94fc9a63dc711ffe4177485663b3a5f2217a2c22..659e769a1f75aa4372cec4f745c2765ef41a2068 100644 (file)
@@ -12,5 +12,4 @@ class InitializeAssetsUseCase @Inject constructor(
     operator fun invoke() {
         gameAssetsHolder.initializeRepository()
     }
-
-}
\ No newline at end of file
+}
index 7a8603e752cab7a0de59a94b6967fa8f4144accd..fceaa9ed07cfbffccc55a55b390037f8b2224d8d 100644 (file)
@@ -16,4 +16,4 @@ data class CameraContext(
     fun getViewportCoordinates(x: Int, y: Int): Pair<Float, Float> {
         return xOnViewport(x) to yOnViewport(y)
     }
-}
\ No newline at end of file
+}
index 115f9a8f606bf34d621950120d4f94b6f47ed1ee..47bd2b43a1145c86f4a68fc8187f7328a1a10a16 100644 (file)
@@ -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
+}
index 43c63d9279d7226044cb4d85d79dd5597489ff9e..12e918b08c5b0ac797e711e8984f759c0f35209a 100644 (file)
@@ -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
+}
index 11e8a71ddfd1b4c5b9f523f97b475573b7288cec..098bf97d4842c7b33c91df5c50ef16ca19d7901f 100644 (file)
@@ -1,5 +1,5 @@
 package ru.fredboy.cavedroid.domain.items.model.block
 
 data class BlockAnimationInfo(
-    val framesCount: Int
+    val framesCount: Int,
 )
index 6f447504c76b743190899c6aefeefe94a8a7b36a..6fd2d2478eb5bd0604438b62e156c48a9f50bfc0 100644 (file)
@@ -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)
     }
-
 }
index 5b24bb592684582c349f90fd84a96aa497517707..838345fbed21e4b0c5ef5c5cbcabf7e198c5766e 100644 (file)
@@ -2,5 +2,5 @@ package ru.fredboy.cavedroid.domain.items.model.craft
 
 data class CraftingRecipe(
     val input: List<Regex>,
-    val output: CraftingResult
+    val output: CraftingResult,
 )
index aaf4fdc17684877e82163c899e07d00976dd570b..18b7e9b13e6cc949fa5770ab2e8910040cd29a7b 100644 (file)
@@ -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<InventoryItem>? = null
+    initialItems: List<InventoryItem>? = null,
 ) {
 
     private val _items: Array<InventoryItem> = 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
+}
index 9d5295c2f7f822d6065e0f4492a6087c96a263b8..6beae1e3487e50080381d94fa36291d2924c1cdb 100644 (file)
@@ -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()
         }
     }
-
 }
index c9125584a871844f762e4ea99b7392cddfb0c426..14492bd5104fd3c24376ea83423bf52d1a01bf62 100644 (file)
@@ -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
+}
index ebbe9107da2c6804bf6fe09fa3cf13b64d6a295f..76ea648d02961594cb1c20ba213fea5e8a4c7741 100644 (file)
@@ -24,5 +24,4 @@ interface ItemsRepository : Disposable {
     fun getCraftingResult(input: List<Item>): InventoryItem
 
     fun getAllItems(): Collection<Item>
-
 }
index 20434524f7f9b5649044390f1f151be064b10093..fd6e1dd8941a7e416e7caec4286a2c77a5848091 100644 (file)
@@ -12,5 +12,4 @@ class DisposeItemsRepositoryUseCase @Inject constructor(
     operator fun invoke() {
         itemsRepository.dispose()
     }
-
-}
\ No newline at end of file
+}
index 3c81e2ce5f4c6394a6ba488dbb67d8aeb9fdc258..dd0b77cf634264bfdce8972ca62865e41b4c4a9c 100644 (file)
@@ -13,5 +13,4 @@ class GetBlockByKeyUseCase @Inject constructor(
     operator fun get(key: String): Block {
         return itemsRepository.getBlockByKey(key)
     }
-
 }
index 4d74119c0ff3798a57e8823552930341e89e3017..fce8e7e94b678ba951bd5014b3970e7ab1863835 100644 (file)
@@ -13,5 +13,4 @@ class GetBlocksByTypeUseCase @Inject constructor(
     operator fun <T : Block> get(type: Class<T>): List<T> {
         return itemsRepository.getBlocksByType(type)
     }
-
 }
index 712045d219b7278a2d95ce65b60327f108d70a49..478dcf32807775e6ef4900d4fc48d3f40b8366fc 100644 (file)
@@ -14,5 +14,4 @@ class GetCraftingResultUseCase @Inject constructor(
     operator fun get(input: List<Item>): InventoryItem {
         return itemsRepository.getCraftingResult(input)
     }
-
 }
index 8fdd460b28b7a5053abac4869b0e3a58d3785bc1..df843a8d43482683510ebcbdf8642f07fe7d5d37 100644 (file)
@@ -13,5 +13,4 @@ class GetFallbackBlockUseCase @Inject constructor(
     operator fun invoke(): Block.None {
         return itemsRepository.fallbackBlock
     }
-
-}
\ No newline at end of file
+}
index 7b093624bcd02a04b5b1cb12c38c433610712b8b..2260d7f6282afa5ca9032209570c357379eeca66 100644 (file)
@@ -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
+}
index 28dafd5206e286f981b9b615171c5958d1ab15c4..d47954f90d0dc68d80db41c340ab150b3041c05f 100644 (file)
@@ -13,5 +13,4 @@ class GetItemByIndexUseCase @Inject constructor(
     operator fun get(index: Int): Item {
         return itemsRepository.getItemByIndex(index)
     }
-
 }
index 2371b0b32063b350880ef0bc43ac9074d0a4506d..b77a131e1231828be8785c9142c05e1fbcc2604a 100644 (file)
@@ -13,5 +13,4 @@ class GetItemByKeyUseCase @Inject constructor(
     operator fun get(key: String): Item {
         return itemsRepository.getItemByKey(key)
     }
-
-}
\ No newline at end of file
+}
index 63b4ec213008fb55c20dcf678f61dbd2b14c3941..95a4abb5eb589d200b189f6b5ce4132bd1fd4e0f 100644 (file)
@@ -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,
index 775643bfef2d131b3045e53d6ecea07e290c4fe2..38d7e36262a999672445463aeb458d4eb3ac6b13 100644 (file)
@@ -14,5 +14,4 @@ interface MenuButtonRepository : Disposable {
     fun getCurrentMenuButtons(): Map<String, MenuButton>?
 
     fun setButtonEnabled(menuKey: String, buttonKey: String, enabled: Boolean)
-
-}
\ No newline at end of file
+}
index 8da22018e63c5a1175beecf16eae947bf40aec77..336455926ae0836d98adee0be063656d7188fc3a 100644 (file)
@@ -4,7 +4,7 @@ import ru.fredboy.cavedroid.domain.items.model.block.Block
 
 class GameMapSaveData(
     private var foreMap: Array<Array<Block>>?,
-    private var backMap: Array<Array<Block>>?
+    private var backMap: Array<Array<Block>>?,
 ) {
     fun retrieveForeMap(): Array<Array<Block>> {
         val value = requireNotNull(foreMap)
index 43ddc7510d54e796b316ac9f92b05238add260d4..c5d772b7a316d1df820ca26c33b7b02e329e1bfd 100644 (file)
@@ -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
+}
index be0dffa03ddc5939562bdbbae924f7cef079d69a..9c0e371a436b18d7ecede97f69b6666b11c27631 100644 (file)
@@ -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
+}
index d790ce08a050769f0f3b7495c507cd9d00490b6d..df35a6ce0b8c433ecb22eaf9689ff3136b234695 100644 (file)
@@ -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
+}
index b88bd0b76310dec06cd0408c0a707d491423c46b..79e970fa32fde430fd30e9ce49666c3f417e00a9 100644 (file)
@@ -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
+}
index b9738a3a1264aba5160fa17dd5380d2ae6e87701..cf6f8410974a48c80b365bac740de03083845b88 100644 (file)
@@ -2,5 +2,5 @@ package ru.fredboy.cavedroid.domain.world.model
 
 enum class Layer(val z: Int) {
     FOREGROUND(0),
-    BACKGROUND(1)
+    BACKGROUND(1),
 }
index 995f2b61d7cb6d8e5a7fe0ba689adb42ef0025af..44ddf4caa96fd691416db03ee1d39b36774387b9 100644 (file)
@@ -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
+}
index 09b2bbd6e989ec7ffdd2993018fc5e1e44dc78a7..a954d26aa5a2913e58eca820e5a7f2b7a5d8b9cf 100644 (file)
@@ -10,7 +10,7 @@ interface ContainerWorldAdapter {
 
     fun checkContainerAtCoordinates(
         coordinates: ContainerCoordinates,
-        requiredType: KClass<out Block.Container>
+        requiredType: KClass<out Block.Container>,
     ): 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
+}
index e07e59cc9db24878d120bf9de8bdf2af954b8ffe..22a1c9022b979c8183ce5b5de9c78b9e8f2dbdc1 100644 (file)
@@ -11,7 +11,7 @@ class Chest(
 ) : Container(
     size = SIZE,
     fallbackItem = fallbackItem,
-    initialItems = initialItems
+    initialItems = initialItems,
 ) {
 
     override val type get() = Block.Chest::class
index 8aa330f73918a6a057405948bd63ec4e2fa64daf..9e5e549736079db79c2a462fa4e835ca21fd58d7 100644 (file)
@@ -10,7 +10,7 @@ import kotlin.reflect.KClass
 abstract class Container(
     val size: Int,
     protected val fallbackItem: Item.None,
-    initialItems: List<InventoryItem>? = null
+    initialItems: List<InventoryItem>? = null,
 ) {
 
     val inventory = Inventory(size, fallbackItem, initialItems)
@@ -20,5 +20,4 @@ abstract class Container(
     abstract val type: KClass<out Block.Container>
 
     abstract fun update(itemByKey: GetItemByKeyUseCase)
-
-}
\ No newline at end of file
+}
index 80af694ccc7ab42fc65dd4f25d3253ac128a856e..931832f5527e2d5c9876f73ce065d28f4b6c5fa7 100644 (file)
@@ -11,7 +11,7 @@ import ru.fredboy.cavedroid.domain.items.usecase.GetItemByKeyUseCase
 
 class Furnace(
     fallbackItem: Item.None,
-    initialItems: List<InventoryItem>? = null
+    initialItems: List<InventoryItem>? = 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
+}
index 28403781e96aa8ef179164e9bb6acd59ba72b232..1c443d8875e9a0bef8d49d1b90bbdb8246728f2a 100644 (file)
@@ -8,5 +8,4 @@ interface DropAdapter {
     fun dropInventory(x: Float, y: Float, inventory: Inventory)
 
     fun dropItems(x: Float, y: Float, items: List<InventoryItem>)
-
-}
\ No newline at end of file
+}
index 693b14e90451682de54ac34c4c9ceedb2b0c13cb..d8cc30360079627b2bef0e10f4fe41f3f39a086a 100644 (file)
@@ -12,5 +12,4 @@ interface DropWorldAdapter {
     fun removeOnBlockDestroyedListener(listener: OnBlockDestroyedListener)
 
     fun removeOnBlockPlacedListener(listener: OnBlockPlacedListener)
-
-}
\ No newline at end of file
+}
index 2cc1b96ded0c8a4047bcf1ac750245095721c94e..799443b9e74989b9f29932d3306930282d9f6cbd 100644 (file)
@@ -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
+}
index 400e44277027deb43670a03765fcbad5bedb8b19..fde74da4eda9ef638fb8993cfb9866868ffe9b24 100644 (file)
@@ -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
+}
index 33bbbbd8efe37869310e2cf1627d0564a4a19a96..e774e25622804a4fb71569475ea299466e87c3d9 100644 (file)
@@ -22,5 +22,4 @@ interface MobWorldAdapter {
     fun destroyBackgroundBlock(x: Int, y: Int, shouldDrop: Boolean)
 
     fun findSpawnPoint(): Vector2
-
-}
\ No newline at end of file
+}
index f1e9b822572f65d8dfddce7db2896cb5e0da3f34..ec8dcb372a1ba2cc98d4f59532dea060ebac051a 100644 (file)
@@ -6,4 +6,4 @@ interface PlayerAdapter {
 
     val width: Float
     val height: Float
-}
\ No newline at end of file
+}
index c822d9788afc0f4a6e895688182ab508a8aa0526..ed8204f50f90f5bcacd96b492d734da6d5a765b1 100644 (file)
@@ -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
index 17dfc538c735869c509060abdefb43d05614da6e..d35c95df26d5abc6de53362ca0762727aca2e596 100644 (file)
@@ -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
+}
index 342691103bb403a9e6c8a0c64142d8b0e3bce881..5ebf8427e81f541c6ce177087c65db112959940f 100644 (file)
@@ -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<InventoryItem> {
         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
+}
index 53593ca7447d7741094a67b50acfae84bb49d78e..2d3b220edbfc3d9311a6cb1e90cafcefb0d002eb 100644 (file)
@@ -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
+}
index eb37e56ea33bfc2848f79f287ff05e393b387436..116de0bd9db2eaa6a7abf898f660432c0b9b5dee 100644 (file)
@@ -51,7 +51,7 @@ class Player(
     var activeSlot
         get() = _activeSlot
         set(value) {
-            if (value in 0 ..< HOTBAR_SIZE) {
+            if (value in 0..<HOTBAR_SIZE) {
                 _activeSlot = value
             }
         }
@@ -198,8 +198,8 @@ class Player(
         val spriteOrigin = item.params.inHandSpriteOrigin
         val handMultiplier = -direction.basis
         val xOffset = (-1 + direction.index) * itemSprite.width + SMALL_ITEM_SIZE / 2 +
-                handMultiplier * itemSprite.width * spriteOrigin.x
-        val yOffset = if (!isSmallSprite) - itemSprite.height / 2 else 0f
+            handMultiplier * itemSprite.width * spriteOrigin.x
+        val yOffset = if (!isSmallSprite) -itemSprite.height / 2 else 0f
 
         val rotate = handAnim + HAND_ITEM_ANGLE_DEG
 
@@ -222,7 +222,6 @@ class Player(
         itemSprite.setPosition(itemX, itemY)
         itemSprite.draw(spriteBatch)
 
-
         // dont forget to reset
         itemSprite.setFlip(false, itemSprite.isFlipY)
         itemSprite.rotation = 0f
@@ -258,7 +257,7 @@ class Player(
 
     enum class ControlMode {
         WALK,
-        CURSOR
+        CURSOR,
     }
 
     companion object {
@@ -278,4 +277,4 @@ class Player(
         private val SMALL_ITEM_SIZE = 8f
         private val HAND_ITEM_ANGLE_DEG = 30f
     }
-}
\ No newline at end of file
+}
index 17d6dd0632c560c24854301944d0d762043a5312..17af546bee35085872d842047963977294fe4487 100644 (file)
@@ -21,7 +21,7 @@ class ContainerController @Inject constructor(
     private val containerWorldAdapter: ContainerWorldAdapter,
     private val containerFactory: ContainerFactory,
     private val dropAdapter: DropAdapter,
-): OnBlockPlacedListener, OnBlockDestroyedListener {
+) : OnBlockPlacedListener, OnBlockDestroyedListener {
 
     val containerMap = mutableMapOf<ContainerCoordinates, Container>()
 
@@ -98,4 +98,4 @@ class ContainerController @Inject constructor(
     companion object {
         private const val TAG = "ContainerControllerImpl"
     }
-}
\ No newline at end of file
+}
index c7cf8b10de62e3bb8b089007c472dc3c32ad2cc4..3080fad407e9fc350a9b65fea8c8279acbdcef8d 100644 (file)
@@ -10,5 +10,4 @@ abstract class ControllerContainerModule {
 
     @Binds
     internal abstract fun bindContainerFactory(impl: ContainerFactoryImpl): ContainerFactory
-
-}
\ No newline at end of file
+}
index e957dd0efb87909ae25738a0e37eaaa60c5bdf1f..cced7078098dd645ab7b10507d23009464ddf5d0 100644 (file)
@@ -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
+}
index 8275613f5c9f58a7854f0fe6624607ccb9830129..a694f52cf35b8f3677fc93868ba7b48d5e03b8a1 100644 (file)
@@ -24,7 +24,7 @@ class DropController @Inject constructor(
     constructor(
         itemsRepository: ItemsRepository,
         dropWorldAdapter: DropWorldAdapter,
-        initialDrop: Collection<Drop>
+        initialDrop: Collection<Drop>,
     ) : 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
+}
index 2e07d3811e17a35049c7d93efeda1a420a50347c..351132539b3579b3400c084ef146ae0621368957 100644 (file)
@@ -10,5 +10,4 @@ abstract class ControllerDropModule {
 
     @Binds
     internal abstract fun bindDropAdapter(impl: DropAdapterImpl): DropAdapter
-
-}
\ No newline at end of file
+}
index a75639b0947e1b998d63bccc42b9aa6b635f86e3..beb790fc5dc592018a07b6115b674f332459fe5f 100644 (file)
@@ -20,5 +20,4 @@ internal class DropAdapterImpl @Inject constructor(
     override fun dropItems(x: Float, y: Float, items: List<InventoryItem>) {
         items.forEach { item -> dropController.addDrop(x, y, item) }
     }
-
-}
\ No newline at end of file
+}
index 88d92016df820ff9cee51e6cfdc7e4c6d8c4bc67..9ba26366ad1265bcb47d05ebdee84e0447da4ea9 100644 (file)
@@ -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
+}
index 1f1f15b77c03213234be2a8da33d985c7a35a827..d1e30137ddbc936c5826445f480d4ec0bff9e055 100644 (file)
@@ -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<MOB : Mob>(
@@ -17,7 +17,7 @@ abstract class BaseMobBehavior<MOB : Mob>(
             }
         } 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<MOB : Mob>(
     companion object {
         private const val TAG = "BaseMobBehavior"
     }
-}
\ No newline at end of file
+}
index 5eef936834d2dec2ad80a7831ecb9656d14dc18c..3dc88e82e4621ffdc919d52f3c91346a347d006a 100644 (file)
@@ -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<Pig>(
     mobType = Pig::class,
@@ -17,5 +17,4 @@ class PigMobBehavior : BaseMobBehavior<Pig>(
             }
         }
     }
-
-}
\ No newline at end of file
+}
index f36fd95e68fb5ebb4479b8f09b7140d3f2377944..5da92c3eea6bdc32efc3a3ffc9dd0db41933b812 100644 (file)
@@ -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<Player>(
     mobType = Player::class,
@@ -80,7 +80,8 @@ class PlayerMobBehavior : BaseMobBehavior<Player>(
         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<Player>(
             blockDamage += 60f * delta * blockDamageMultiplier
         }
     }
-}
\ No newline at end of file
+}
index c966a262309473a9b39f8f60e6adde9532aa0e47..9f02bffd350f049bd7ee25ac3943edbe209f182e 100644 (file)
@@ -10,4 +10,4 @@ abstract class MobControllerModule {
 
     @Binds
     internal abstract fun bindPlayerAdapter(impl: PlayerAdapterImpl): PlayerAdapter
-}
\ No newline at end of file
+}
index c89e6412fd9bf012158d033acabcb5ec4de8ea99..f1e26526748e22fab5b1a198b0e4c5b0741e8943 100644 (file)
@@ -23,4 +23,4 @@ class PlayerAdapterImpl @Inject constructor(
 
     override val height: Float
         get() = player.height
-}
\ No newline at end of file
+}
index f6649ca5672d759b8aa589900111a9c38e3027ba..efa694ca63dd5eaff49a02243b2c560f62d57bdb 100644 (file)
@@ -6,5 +6,5 @@ enum class GameWindowType {
     SURVIVAL_INVENTORY,
     CHEST,
     CRAFTING_TABLE,
-    FURNACE
-}
\ No newline at end of file
+    FURNACE,
+}
index f3e83daee36b0ad73cc761e7933e2227538abc99..36b155086763762939eabc63c7e3de2b42179776 100644 (file)
@@ -121,4 +121,4 @@ object GameWindowsConfigs {
         const val contentsInRow = 9
         const val contentsInCol = 3
     }
-}
\ No newline at end of file
+}
index 0264cf8467decbe594d7953074b25951cfdcb693..5809b5e2bde136fc6868dfcddd9640d7dc4a1dba 100644 (file)
@@ -58,5 +58,4 @@ class GameWindowsManager @Inject constructor(
         currentWindow = null
         tooltipManager.showMouseTooltip("")
     }
-
-}
\ No newline at end of file
+}
index 0fa3344c8954b83ad13dc13c74d773d2c3a91b80..7a6ed54dc969159d12dbcbb611c58806ea17863a 100644 (file)
@@ -34,5 +34,4 @@ class TooltipManager @Inject constructor() {
     companion object {
         private const val TOOLTIP_TIME_S = 2f
     }
-
-}
\ No newline at end of file
+}
index 0aa8b47a0ffa71c09975420180bb217017db6ea1..66348d8eefebf747755498a0674faeaacfadc890 100644 (file)
@@ -18,7 +18,7 @@ abstract class AbstractInventoryWindow {
         items: MutableList<InventoryItem>,
         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
+}
index 39509e4ea0890090743a57f35350762fa88f3579..1e0fbe968b72ca4263bc419ad666bff9767e6c0b 100644 (file)
@@ -20,5 +20,4 @@ abstract class AbstractInventoryWindowWithCraftGrid(
         set(value) {
             craftResultList[0] = value
         }
-
-}
\ No newline at end of file
+}
index cf41d05753aa0f9e5a64dfbbacf12e6ac03e8291..9de51be8cd7fb3df6e0646695d80b5bf1013b9c8 100644 (file)
@@ -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
+}
index 300a564a2f7edffa8f0a4a13805041642f8e6a16..8a1701934f670d447c2b6dae46bf4a397c72515e 100644 (file)
@@ -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
+}
index 782f4b91a6017ca7ae748c2e846080b17c194e94..782df96c0a7b315bbeba45d38fd7c96c59bbaaa2 100644 (file)
@@ -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
+}
index 981199e7c5317a2635ca1eac1e715b789a59cf8c..e3bcef8b7fc7949e43435042ef8625965e027591 100644 (file)
@@ -11,5 +11,4 @@ class FurnaceInventoryWindow(
     override val type = GameWindowType.FURNACE
 
     override var selectedItem: InventoryItem? = null
-
-}
\ No newline at end of file
+}
index eb8f5376e16237f2b8a2c7f4fa5444afe5116179..959e127a930e042b55e858084d9192012b5c22dc 100644 (file)
@@ -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
+}
index 4e8e0ca20c523fd6c015b7f04c5824e5503d927a..5a4a2b12222e045b1ed055d701618b96e8fd7284 100644 (file)
@@ -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..<height) {
             return fallback
         }
 
         val transformedX = transformX(x)
 
-        if (transformedX !in 0 ..< width) {
+        if (transformedX !in 0..<width) {
             return fallback
         }
 
@@ -101,13 +100,13 @@ class GameWorld @Inject constructor(
     }
 
     private fun setMap(x: Int, y: Int, layer: Layer, value: Block, dropOld: Boolean) {
-        if (y !in 0 ..< height) {
+        if (y !in 0..<height) {
             return
         }
 
         val transformedX = transformX(x)
 
-        if (transformedX !in 0 ..< width) {
+        if (transformedX !in 0..<width) {
             return
         }
 
@@ -127,7 +126,7 @@ class GameWorld @Inject constructor(
 
     private fun isSameSlab(slab1: Block, slab2: Block): Boolean {
         return slab1 is Block.Slab && slab2 is Block.Slab &&
-                (slab1.params.key == slab2.otherPartBlockKey || slab1.otherPartBlockKey == slab2.params.key)
+            (slab1.params.key == slab2.otherPartBlockKey || slab1.otherPartBlockKey == slab2.params.key)
     }
 
     fun hasForeAt(x: Int, y: Int): Boolean {
@@ -178,7 +177,8 @@ class GameWorld @Inject constructor(
 
     fun placeToBackground(x: Int, y: Int, value: Block, dropOld: Boolean = false): Boolean {
         val wasPlaced = if (value.isNone() || getBackMap(x, y).isNone() && value.params.hasCollision &&
-            (!value.params.isTransparent || value.params.key == "glass" || value.isChest() || value.isSlab())) {
+            (!value.params.isTransparent || value.params.key == "glass" || value.isChest() || value.isSlab())
+        ) {
             setBackMap(x, y, value, dropOld)
             true
         } else {
@@ -199,4 +199,4 @@ class GameWorld @Inject constructor(
     companion object {
         private const val TAG = "GameWorld"
     }
-}
\ No newline at end of file
+}
index 5bce171121fe3bea08ca0eb83f2814b79a15fd09..f739ce8990cf14b8b7aac498a1960600dc06b1b6 100644 (file)
@@ -18,4 +18,4 @@ abstract class GameWorldModule {
 
     @Binds
     internal abstract fun bindDropWorldAdapter(impl: WorldAdapterImpl): DropWorldAdapter
-}
\ No newline at end of file
+}
index 98d63198c04e73181ec8423e2c8e37e939ed9a52..8ff59a45ae17d5219e151de0ec993a06bd174b04 100644 (file)
@@ -3,5 +3,5 @@ package ru.fredboy.cavedroid.game.world.generator
 enum class Biome {
     PLAINS,
     DESERT,
-    WINTER
-}
\ No newline at end of file
+    WINTER,
+}
index 7f2c65c9562b2dd4efff3bf79f257a2792329a89..cd873b744cfc4cadadbd1f34d77bdfbfe2663eba 100644 (file)
@@ -21,19 +21,21 @@ class GameWorldGenerator(
     private val biomesMap by lazy { generateBiomes() }
 
     private val plainsPlants = listOf("dandelion", "rose", "tallgrass")
-    private val mushrooms = listOf("mushroom_brown", "mushroom_red",)
+    private val mushrooms = listOf("mushroom_brown", "mushroom_red")
 
     private fun generateHeights(): IntArray {
-        val surfaceHeightRange = config.minSurfaceHeight .. config.maxSurfaceHeight
+        val surfaceHeightRange = config.minSurfaceHeight..config.maxSurfaceHeight
         val result = IntArray(config.width)
 
         result[0] = surfaceHeightRange.random(random)
 
-        for (x in 1 ..< config.width) {
+        for (x in 1..<config.width) {
             val previous = result[x - 1]
             var d = random.nextInt(-5, 6).let { if (it !in -4..4) it / abs(it) else 0 }
 
-            if (previous + d !in surfaceHeightRange) { d = -d }
+            if (previous + d !in surfaceHeightRange) {
+                d = -d
+            }
 
             if (result.lastIndex - x < abs(result[0] - previous) * 3) {
                 d = result[0].compareTo(previous).let { if (it != 0) it / abs(it) else 0 }
@@ -62,7 +64,7 @@ class GameWorldGenerator(
     }
 
     private fun winterBiome(x: Int) {
-        assert(x in 0 ..< config.width) { "x not in range of world width" }
+        assert(x in 0..<config.width) { "x not in range of world width" }
 
         val surfaceHeight = heights[x]
 
@@ -81,7 +83,7 @@ class GameWorldGenerator(
             foreMap[x][surfaceHeight - 1] = snow
         }
 
-        for (y in min(surfaceHeight + 1, config.seaLevel) ..< config.height - 1) {
+        for (y in min(surfaceHeight + 1, config.seaLevel)..<config.height - 1) {
             if (y <= surfaceHeight) {
                 backMap[x][y] = dirt
                 continue
@@ -103,7 +105,7 @@ class GameWorldGenerator(
     }
 
     private fun plainsBiome(x: Int) {
-        assert(x in 0 ..< config.width) { "x not in range of world width" }
+        assert(x in 0..<config.width) { "x not in range of world width" }
 
         val surfaceHeight = heights[x]
 
@@ -117,7 +119,7 @@ class GameWorldGenerator(
         backMap[x][surfaceHeight] = grass
         backMap[x][config.height - 1] = bedrock
 
-        for (y in min(surfaceHeight + 1, config.seaLevel) ..< config.height - 1) {
+        for (y in min(surfaceHeight + 1, config.seaLevel)..<config.height - 1) {
             if (y <= surfaceHeight) {
                 backMap[x][y] = dirt
                 continue
@@ -141,7 +143,7 @@ class GameWorldGenerator(
     }
 
     private fun desertBiome(x: Int) {
-        assert(x in 0 ..< config.width) { "x not in range of world width" }
+        assert(x in 0..<config.width) { "x not in range of world width" }
 
         val surfaceHeight = heights[x]
 
@@ -150,13 +152,12 @@ class GameWorldGenerator(
         val sandstone = itemsRepository.getBlockByKey("sandstone")
         val stone = itemsRepository.getBlockByKey("stone")
 
-
         foreMap[x][surfaceHeight] = sand
         foreMap[x][config.height - 1] = bedrock
         backMap[x][surfaceHeight] = sand
         backMap[x][config.height - 1] = bedrock
 
-        for (y in min(surfaceHeight + 1, config.seaLevel) ..< config.height - 1) {
+        for (y in min(surfaceHeight + 1, config.seaLevel)..<config.height - 1) {
             if (y <= surfaceHeight) {
                 backMap[x][y] = sand
                 continue
@@ -183,8 +184,8 @@ class GameWorldGenerator(
     private fun fillWater() {
         val water = itemsRepository.getBlockByKey("water")
 
-        for (x in 0 ..< config.width) {
-            for (y in config.seaLevel ..< config.height) {
+        for (x in 0..<config.width) {
+            for (y in config.seaLevel..<config.height) {
                 if (!foreMap[x][y].isNone()) {
                     break
                 }
@@ -217,8 +218,8 @@ class GameWorldGenerator(
             backMap[x][top] = leaves
         }
 
-        for (x1 in max(0, x - 1) .. min(config.width - 1, x + 1)) {
-            for (y in height .. height + treeH - 4) {
+        for (x1 in max(0, x - 1)..min(config.width - 1, x + 1)) {
+            for (y in height..height + treeH - 4) {
                 foreMap[x1][y] = leaves
                 backMap[x1][y] = leaves
             }
@@ -245,14 +246,14 @@ class GameWorldGenerator(
             backMap[x][top] = leaves
         }
 
-        for (x1 in max(0, x - 1) .. min(config.width - 1, x + 1)) {
+        for (x1 in max(0, x - 1)..min(config.width - 1, x + 1)) {
             val y = height
             foreMap[x1][y] = leaves
             backMap[x1][y] = leaves
         }
 
         for (y in 1..2) {
-            for (x1 in max(0, x - y) .. min(config.width - 1, x + y)) {
+            for (x1 in max(0, x - y)..min(config.width - 1, x + y)) {
                 foreMap[x1][height + 1 + y] = leaves
                 backMap[x1][height + 1 + y] = leaves
             }
@@ -279,7 +280,7 @@ class GameWorldGenerator(
         }
     }
 
-    private fun generateOres(x : Int) {
+    private fun generateOres(x: Int) {
         val stone = itemsRepository.getBlockByKey("stone")
         val coal = itemsRepository.getBlockByKey("coal_ore")
         val iron = itemsRepository.getBlockByKey("iron_ore")
@@ -287,16 +288,16 @@ class GameWorldGenerator(
         val diamond = itemsRepository.getBlockByKey("diamond_ore")
         val lapis = itemsRepository.getBlockByKey("lapis_ore")
 
-        for (y in heights[x] ..< config.height) {
+        for (y in heights[x]..<config.height) {
             val res = random.nextInt(10000)
 
             val h = config.height - y
             val block = when {
                 res in 0..<25 && h < 16 -> 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)
     }
-
 }
index a228cb6bc5bc60e92d80902ca0c7e016d18e3235..616e945f3da02737d1af1499540bf4c506d67552 100644 (file)
@@ -27,7 +27,5 @@ data class WorldGeneratorConfig(
                 seaLevel = 192,
             )
         }
-
     }
-
 }
index 8736dbaa189e4db54b07ee14efedea51588e8a55..dd2505b0150644e4dcfe4952adf20f07c4ea4f9c 100644 (file)
@@ -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..<width) {
                     if (getForegroundBlock(x, y).params.hasCollision) {
                         break
                     } else if (x == width - 1) {
@@ -79,7 +79,7 @@ internal class WorldAdapterImpl @Inject constructor(
 
     override fun checkContainerAtCoordinates(
         coordinates: ContainerCoordinates,
-        requiredType: KClass<out Block.Container>
+        requiredType: KClass<out Block.Container>,
     ): 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
+}
index 028d63016260cb595b54a7bda300c5845bf672b6..44cb5d1ebd4a4df4d42552b2a474c4b5d2079b9b 100644 (file)
@@ -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
+}
index d8cda29f69f1f5b789e7f1d6f0885cdd775f4953..7351be50aee97b6ec019217e154dc357f73988f2 100644 (file)
@@ -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"
 
index df403185e2ce27cc890521d17ff52e5bb51d2fa6..12de70d5e583d458936efe0b20dcf90b91187ce4 100644 (file)
@@ -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)
index 98be714632614fce5710bb6cfe157380e2f80122..a0adf2e48d98c8a33e805b6e09a67e211860a2f5 100644 (file)
@@ -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)
index da6bb6db3b27085f03600c331bb511381ca0023c..a82236b88085f3fe90197fbd65aea17c732b4bfe 100644 (file)
@@ -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)
index 047ef6e73b2c0352c444535bc355ab87e995dcd2..3d1c4b9584fee8d4a9037c46b35a2df07e193770 100644 (file)
@@ -5,5 +5,4 @@ import ru.fredboy.cavedroid.domain.items.model.item.Item
 interface IPlaceBlockAction {
 
     fun place(placeable: Item.Placeable, x: Int, y: Int)
-
 }
index 82c7d849aaa897f5bc3d8d6008d5966cf229e0c0..907b757d5265f0e89fa7c5b5296a9489e09c9077 100644 (file)
@@ -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
+}
index 5ffe1639e22c334f7c0087a94f1a34aa7a501261..04b79d5e0e7d5bf283a3560888301aa29a87ca04 100644 (file)
@@ -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
+}
index 306aeadfe36fb3771f1ff93cba4120463c6676dd..dae9fb423534c0705f55aa10187027d6ca969404 100644 (file)
@@ -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
+}
index c03310b279a1ba34dbc5106fe9ff78fb80f73b0c..562f55ddaa0081e9c16d6faa4364e93b041a4301 100644 (file)
@@ -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
+}
index 392a8ffb11d50bede7ecc4eb9ad6d37e17a64cb6..aae58d88a94d6fec3cb5fa1308b10949f56b09e5 100644 (file)
@@ -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
+}
index fb7af2fa2d0277a7f679ad5764a6b92d86417fff..08b9073324f333f1728d1ce313815a891d6b7a2e 100644 (file)
@@ -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
+}
index 73f6476aa70cdab114c8b36075a146a634be7da6..c45ae53a1976bd137db9988f95be9da5e5fdfbe2 100644 (file)
@@ -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) {
index 29641118ebfa817139bc68e30495cd04b652b087..c02f5e12cf04b829fe8b5c096961bb437f9f9aec 100644 (file)
@@ -28,5 +28,4 @@ class UseWaterBucketAction @Inject constructor(
     companion object {
         const val ACTION_KEY = "use_water_bucket"
     }
-
 }
index 2555f60f1109b17aba932b2a64a82afc9b26a0d0..5cccba31eee63d8905d9cfeafdc0f046ed729fe0 100644 (file)
@@ -21,5 +21,4 @@ interface IGameInputHandler<A : IGameInputAction> {
      * This will not be called if [checkConditions] returned false
      */
     fun handle(action: A)
-
-}
\ No newline at end of file
+}
index fa319e589db988d71095a8d5c59eff2502a76cc3..57d74e24f456a1bad65c27f537dfd83ac9208d19 100644 (file)
@@ -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
 }
index 323882982c19fad2a5b46cf70b4221c6d773f88a..41b9f22e15a15a2eded1e455f3b535c47902bb66 100644 (file)
@@ -1,3 +1,3 @@
 package ru.fredboy.cavedroid.ux.controls.input.action
 
-interface IGameInputAction
\ No newline at end of file
+interface IGameInputAction
index aedfb4b07f1fc95a942825cd17ad40732d3178ba..bc6dac5c0e5dc0be9fd214ddcc80d712189d301a 100644 (file)
@@ -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
index 99e15508747e4fc3bad409018ef80bf8c2d5ca30..620f029f7e10b726da61f4aa60c32e094e386324 100644 (file)
@@ -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
index 87cb9a338641cd02310e1998395ab33a87535c09..bbbd3b93a1518c2156995984c8895342d273f8af 100644 (file)
@@ -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
+}
index 33ed2212f9d6e5b91c52d710748c237fa8b4994f..a7ffd019f4f673e58415c7167daf9fd300800f52 100644 (file)
@@ -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
+}
index a97348c1fe0ac6c43c5446691ab89f4b1c373996..30bc23ce5498761985142b411d4205bc1ae0d953 100644 (file)
@@ -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
index c2479815c90c61e250f60bdf45f444b8b5b0e1b8..bfd5d884ee21c9a2ac5081dddf61524a7a371e01 100644 (file)
@@ -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
index b42e75cfc897c62b220544afcf932c01ffbb73a7..39666c1165cc822661efac0aa8626d16dca7af75 100644 (file)
@@ -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
+}
index 60a9ff89dbe7434b6d6d227b26414295f2608c90..e3f51e4d350884222f6f2a0108d7e5c4b22d24f5 100644 (file)
@@ -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
+}
index 4140e4e35b356106907174a95d0db1e7ac99c8e2..a2e4acc4fc525171b63578fd7a5bcd8b7afb0471 100644 (file)
@@ -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
+}
index 267aa645a38afc9c908c7b5805e2b57dd734a94d..c5901707fa72971e45b65029fd980f889abfdc0e 100644 (file)
@@ -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
+}
index 70937707d0992bc92ede5c288bd42cae9d56abf8..4db1e249470eb411037eb9a8764a550e6a4da1ac 100644 (file)
@@ -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
+}
index dbb165d1de30469879afe2c7d5cd1a87d757a2ac..c3a7a662196a905d46c7f4378d1f70c03b8d113c 100644 (file)
@@ -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
+}
index fbd729db5b717fef320ddb405f10b09fe4982a04..58152e1f650486c3e443fe3278656d3eb516674f 100644 (file)
@@ -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
+}
index 2c74f55dafd8282a4235a188b579687c24e67a34..75bc8ac88e06107e4d1df0e3c7c86c21875508fd 100644 (file)
@@ -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
+}
index 505a2790d77d155c1c8d3835135874f9c950e1c2..6d27dc98fc105e25de98481561f65c1c15971acd 100644 (file)
@@ -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
+}
index 25f598c1ae814e6db284f37e454359419d777182..418c32db7fd48afa16d2064cadd562d6c7a15610 100644 (file)
@@ -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
+}
index d4e56606a456b1501e96eef0c45edc12d1b28439..195828212b030819a1a874760726d8622cf0b169 100644 (file)
@@ -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
+}
index 85643096709644c2729c0e2cd525774be3870faa..32ae3e920705df429e0ca9ad4cbf3adbadbad6d2 100644 (file)
@@ -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
+}
index 5a5b67ac842abb4e4e51cfff1ebda58ade9cd07f..ee70c71f21b2b67457fc35f4dd89231cad955ac9 100644 (file)
@@ -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
+}
index e39c71feb1f6d74db41b96700dad9a1bdb255f9b..eb80b61805027e2f762a197c2f066774c303d5a5 100644 (file)
@@ -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
+}
index 14b6aa46a7a54d5479f0af64ec7a44cec7dfe9d2..ad89b5d0a2cd7f4ce17a8cf08fd0f0f707208d78 100644 (file)
@@ -21,4 +21,4 @@ class ToggleDebugInfoKeyboardInputHandler @Inject constructor(
     override fun handle(action: KeyboardInputAction) {
         gameContextRepository.setShowInfo(!gameContextRepository.shouldShowInfo())
     }
-}
\ No newline at end of file
+}
index 0ff13db36e616ad1f9c481a89fdbb830ff74d542..99ac3e733e5c96b58aab2ad52de9672ee3cb298f 100644 (file)
@@ -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
+}
index 792bfeb7e8df8d770015f51547ca91e8dfb9de2e..e914b2b508831b63ec602276ef5b96de60824d5e 100644 (file)
@@ -21,4 +21,4 @@ class ToggleMinimapKeyboardInputHandler @Inject constructor(
     override fun handle(action: KeyboardInputAction) {
         gameContextRepository.setShowMap(!gameContextRepository.shouldShowMap())
     }
-}
\ No newline at end of file
+}
index 3f69b77b02bb04d513f3005000ca2d3da378143d..e7dfaa785e7571117b8c75bc06f981c36998a101 100644 (file)
@@ -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
+}
index 16e371c2db2d1805fa174df9ed5abc4a0bc2f7a1..923454a28331e8c0c273a334adee13d52fceb163 100644 (file)
@@ -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<InventoryItem>,
         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<InventoryItem>,
         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
+}
index 835d4be408bad66c0741c3f0ea23b79b09537297..7ca10c513bdb8ec6c5c3ab8b07599d81703bd546 100644 (file)
@@ -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
+}
index 073a8ee41ff2328528b5498480725cafd9565ac6..b01db7a098b4f207028c23f47fdf3f44627394a7 100644 (file)
@@ -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()
     }
-
 }
index ef0ec2eb47ea14c22c97a1455ded758c6fdba39a..07d3919c9d3c9625cbf5b29004cd55bdb8f863d6 100644 (file)
@@ -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
+}
index a8f5d1ec2b0a1bc1830eda01dfe626a26da75235..6f3cd6ab13153dd8b2a4b65a777564d37f4e31ae 100644 (file)
@@ -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
+}
index 81ef0ce118ea10d6bf7fffeb51fc706a07c50d56..e471ef3b1efe1d680c19535e4b3e2b48e8001926 100644 (file)
@@ -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
+}
index 6d99e2d0cd3a1fa84ad5a98cd30862eda8cb9908..0b6e035471aa1c10e7947be44cac64dd0d05d965 100644 (file)
@@ -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
+}
index 0e6d2f88cfb4d56059c865f6e46201b886d35f8c..96818b33005a309b82a0dd4363a8343aae199599 100644 (file)
@@ -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
+}
index 2236f3e6e2262f95fcceb856695963a7181338a2..13d0bb33f8d031685afd6d4beddcd78d4016c831 100644 (file)
@@ -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
+}
index 00efbf7bde3f51e98a97d92f3b19918aee64426b..e6dc04aca18905360a9f412e93c872de616fdbff 100644 (file)
@@ -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
+}
index d227ae350a72477eb3ce94e2a6ccb4699280dfdc..381177743a67d8e727a3f9c55d04e7dfc2db5fa9 100644 (file)
@@ -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
+}
index 35aef0bb32fb1bd44d646f6c08a9ef40b828df1b..24a2225040769ddedc88708812f76e7602d22caf 100644 (file)
@@ -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
+}
index fe22fdc185962b1f7c58f5c69a5faac87b23318c..8c2aa7ee6e89e10167f5041c0761515f6a49b464 100644 (file)
@@ -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
+}
index 9fbbfdcb02702d92dd61d223009afdf94d7e46af..e03cfb1776df2ebf798a57c793ed9ff0d586b33e 100644 (file)
@@ -42,5 +42,4 @@ class KeyboardInputActionMapper @Inject constructor() {
 
         return actionKey?.let { KeyboardInputAction(it, isKeyDown) }
     }
-
-}
\ No newline at end of file
+}
index df3ef8d6c0b532cecc90be5cb414065e9dba84c5..058fc171ebd356c1b9b3917c85b439bd0d823240 100644 (file)
@@ -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
+}
index ce3249922d4dd778b15cdc895a1e48844b8c9770..9ee7ba0711445bdb117646e198b0b1c8b71332ed 100644 (file)
@@ -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)
index d4a51c614a28093a9c6287df4fed3b621b1e0f79..39e7e35fcdbb3ae2426fe567a14bce8336c14d79 100644 (file)
@@ -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
+}
index 3a8e02ad011ee4ef7297c02dbf18717efc06c18a..2934bc341ee3ee8288a83d09b7f1839a01ce462a 100644 (file)
@@ -23,4 +23,4 @@ class UpdateBedLeftAction @Inject constructor(
     companion object {
         const val BLOCK_KEY = "bed_l"
     }
-}
\ No newline at end of file
+}
index 71be5806f0f7a969fbe86b0bee4e0e4d826eac80..5d5ce1f1492d68c068a4b0bf290013bd2a3708c3 100644 (file)
@@ -23,4 +23,4 @@ class UpdateBedRightAction @Inject constructor(
     companion object {
         const val BLOCK_KEY = "bed_r"
     }
-}
\ No newline at end of file
+}
index 3a8ddf9a121b4fd4f9522ee09a0e75430bd9f2f1..40b047c699485b27fe6929915221d798756fd4c5 100644 (file)
@@ -27,4 +27,4 @@ class UpdateGrassAction @Inject constructor(
     companion object {
         const val BLOCK_KEY = "grass"
     }
-}
\ No newline at end of file
+}
index 1daa644b1ee2fc210a5c8468b2e134e86ad0b6e0..5d5483aebe10cbb076c6e37db256c36959f43d04 100644 (file)
@@ -29,4 +29,4 @@ class UpdateRequiresBlockAction @Inject constructor(
     companion object {
         const val ACTION_KEY = "requires_block"
     }
-}
\ No newline at end of file
+}
index 7b9d532d491d36e1755bb2e0a46aa57c6da768d4..13960c45aafa2dbc7fe7073a9ab4b266f292510c 100644 (file)
@@ -26,4 +26,4 @@ class UpdateSnowedGrassAction @Inject constructor(
     companion object {
         const val BLOCK_KEY = "grass_snowed"
     }
-}
\ No newline at end of file
+}
index 6d74578579a350c4ee240625272661d330497995..fdf765bf9f8f6fa8bf5f3314f0133a28113a69af 100644 (file)
@@ -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..<startX + CHUNK_WIDTH) {
                 updateBlock(x, y)
             }
         }
@@ -59,5 +59,4 @@ class GameWorldBlocksLogicControllerTask @Inject constructor(
 
         const val WORLD_BLOCKS_LOGIC_UPDATE_INTERVAL_SEC = .1f
     }
-
 }
index 73b9bcc0d3435fecc0eb80ffa23ddaf3cfa0b09d..0d3d1f32ce06acf21fb725a191d1852ee29db582 100644 (file)
@@ -19,7 +19,7 @@ class GameWorldFluidsLogicControllerTask @Inject constructor(
     private val itemsRepository: ItemsRepository,
 ) : Timer.Task() {
 
-    private var updateTick: Short = 0;
+    private var updateTick: Short = 0
 
     private val fluidStatesMap = mutableMapOf<KClass<out Block.Fluid>, List<Block.Fluid>>()
 
@@ -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..<min(gameWorld.width / 2, 32)) {
                 updateFluids(midScreen + x, y)
                 updateFluids(midScreen - x, y)
             }
@@ -170,21 +170,19 @@ class GameWorldFluidsLogicControllerTask @Inject constructor(
 
     private inner class UpdateCommand(
         val priority: Int,
-        val command: Runnable
+        val command: Runnable,
     ) {
 
         constructor(block: Block, x: Int, y: Int, priority: Int) :
-                this(priority, Runnable { gameWorld.setForeMap(x, y, block) })
+            this(priority, Runnable { gameWorld.setForeMap(x, y, block) })
 
         constructor(fluid: Block.Fluid, x: Int, y: Int) :
-                this(fluid, x, y, ((5 - fluid.state) + 1) * (if (fluid.isLava()) 2 else 1))
+            this(fluid, x, y, ((5 - fluid.state) + 1) * (if (fluid.isLava()) 2 else 1))
 
         fun exec() = command.run()
-
     }
 
     companion object {
         const val FLUID_UPDATE_INTERVAL_SEC = 0.25f
     }
-
-}
\ No newline at end of file
+}
index db22c1b4f8c1e04d4cb25d8bec112d29c5a09f25..a1adb4a8dff19fcb41d6f07dc0dd7f142dbcb59b 100644 (file)
@@ -29,12 +29,9 @@ class GameWorldMobDamageControllerTask @Inject constructor(
                 }
             }
         }
-
-
     }
 
     companion object {
         const val ENVIRONMENTAL_MOB_DAMAGE_INTERVAL_SEC = 0.5f
     }
-
-}
\ No newline at end of file
+}
index 349530cc99a83bffd8a70ff05184d50d09586b02..cc0f68afde84de4e7d9172b3314cd8980e09d730 100644 (file)
@@ -22,7 +22,7 @@ class BackgroundBlocksRenderer @Inject constructor(
     mobController: MobController,
     containerController: ContainerController,
     getBlockDamageFrameCount: GetBlockDamageFrameCountUseCase,
-    getBlockDamageSprite: GetBlockDamageSpriteUseCase
+    getBlockDamageSprite: GetBlockDamageSpriteUseCase,
 ) : BlocksRenderer(gameWorld, mobController, containerController, getBlockDamageFrameCount, getBlockDamageSprite) {
 
     override val renderLayer get() = RENDER_LAYER
@@ -58,4 +58,4 @@ class BackgroundBlocksRenderer @Inject constructor(
     companion object {
         private const val RENDER_LAYER = 100000
     }
-}
\ No newline at end of file
+}
index e3a2904bfe6765ebf7a1dee9934b9485defc27ca..be4bd99933d050bf66ec5dcd002955d701236ca5 100644 (file)
@@ -5,9 +5,9 @@ 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.common.utils.px
 import ru.fredboy.cavedroid.domain.assets.usecase.GetBlockDamageFrameCountUseCase
 import ru.fredboy.cavedroid.domain.assets.usecase.GetBlockDamageSpriteUseCase
-import ru.fredboy.cavedroid.common.utils.px
 import ru.fredboy.cavedroid.domain.items.model.block.Block
 import ru.fredboy.cavedroid.domain.world.model.Layer
 import ru.fredboy.cavedroid.entity.container.model.Furnace
@@ -29,7 +29,7 @@ abstract class BlocksRenderer(
         get() = isNone() || params.isTransparent
 
     private fun blockDamageSprite(index: Int): Sprite? {
-        if (index !in 0..< getBlockDamageFrameCount()) {
+        if (index !in 0..<getBlockDamageFrameCount()) {
             return null
         }
         return getBlockDamageSprite[index]
@@ -56,7 +56,7 @@ abstract class BlocksRenderer(
                 /* x = */ cursorX.px - viewport.x + block.params.spriteMargins.left,
                 /* y = */ cursorY.px - viewport.y + block.params.spriteMargins.top,
                 /* width = */ block.spriteWidth,
-                /* height = */ block.spriteHeight
+                /* height = */ block.spriteHeight,
             )
             sprite.draw(spriteBatch)
         }
@@ -66,7 +66,7 @@ abstract class BlocksRenderer(
         shapeRenderer: ShapeRenderer,
         viewport: Rectangle,
         x: Int,
-        y: Int
+        y: Int,
     ) {
         val foregroundBlock = gameWorld.getForeMap(x, y)
         val backgroundBlock = gameWorld.getBackMap(x, y)
@@ -81,7 +81,7 @@ abstract class BlocksRenderer(
                 /* x = */ drawX + marginLeft,
                 /* y = */ drawY + marginTop,
                 /* width = */ backgroundBlock.width,
-                /* height = */ backgroundBlock.height
+                /* height = */ backgroundBlock.height,
             )
         }
     }
@@ -121,5 +121,4 @@ abstract class BlocksRenderer(
     companion object {
         private const val MAX_BLOCK_DAMAGE_INDEX = 10
     }
-
-}
\ No newline at end of file
+}
index 0dcd1db3ab3f941290d614cc1cd2d0edc9a74fbd..f4d4baf8f5e7da1ca43de7d2db1fde7d33d713e8 100644 (file)
@@ -33,7 +33,7 @@ class DebugInfoStringsProvider @Inject constructor(
             "Block: ${gameWorld.getForeMap(player.cursorX, player.cursorY).params.key}",
             "Hand: ${player.activeItem.item.params.key}",
             "Game mode: ${player.gameMode}",
-            "Block damage: ${player.blockDamage}"
+            "Block damage: ${player.blockDamage}",
         )
     }
-}
\ No newline at end of file
+}
index 7d15758fb4473b3b1dc930132de9707379848b2c..c353501b4a5b9e50bf1d1f0b35144b6e18013931 100644 (file)
@@ -5,11 +5,11 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer
 import com.badlogic.gdx.math.Rectangle
 import ru.fredboy.cavedroid.common.di.GameScope
-import ru.fredboy.cavedroid.domain.assets.usecase.GetFontUseCase
 import ru.fredboy.cavedroid.common.utils.bl
 import ru.fredboy.cavedroid.common.utils.drawString
 import ru.fredboy.cavedroid.common.utils.forEachBlockInArea
 import ru.fredboy.cavedroid.common.utils.px
+import ru.fredboy.cavedroid.domain.assets.usecase.GetFontUseCase
 import ru.fredboy.cavedroid.domain.configuration.repository.GameContextRepository
 import ru.fredboy.cavedroid.domain.items.model.block.Block
 import ru.fredboy.cavedroid.game.controller.mob.MobController
@@ -50,13 +50,13 @@ class DebugRenderer @Inject constructor(
         shapeRenderer: ShapeRenderer,
         minimapX: Float,
         minimapY: Float,
-        minimapSize: Float
+        minimapSize: Float,
     ) {
         val mapArea = Rectangle(
             /* x = */ mobController.player.x - (minimapSize.px / 2),
             /* y = */ mobController.player.y - (minimapSize.px / 2),
             /* width = */ minimapSize.px,
-            /* height = */ minimapSize.px
+            /* height = */ minimapSize.px,
         )
 
         spriteBatch.end()
@@ -71,7 +71,7 @@ class DebugRenderer @Inject constructor(
                     /* x = */ minimapX + (x - mapArea.x.bl),
                     /* y = */ minimapY + (y - mapArea.y.bl),
                     /* width = */ 1f,
-                    /* height = */ 1f
+                    /* height = */ 1f,
                 )
             }
         }
@@ -99,10 +99,9 @@ class DebugRenderer @Inject constructor(
                 shapeRenderer = shapeRenderer,
                 minimapX = viewport.width - MinimapConfig.margin - MinimapConfig.size,
                 minimapY = MinimapConfig.margin,
-                minimapSize = MinimapConfig.size
+                minimapSize = MinimapConfig.size,
             )
         }
-
     }
 
     companion object {
@@ -113,4 +112,4 @@ class DebugRenderer @Inject constructor(
             const val size = 64f
         }
     }
-}
\ No newline at end of file
+}
index 8d5e7610fac9b1e0c7d0d59bb74fa4a5124704fa..a52b084f9157b0d3c7eaa5543b0c06c70025d17b 100644 (file)
@@ -38,5 +38,4 @@ class DropsRenderer @Inject constructor(
     companion object {
         private const val RENDER_LAYER = 100200
     }
-
-}
\ No newline at end of file
+}
index 764c106d9d5d495db5f676e73c224d28af7fd21b..2b04553d19c0afc3f189b411b23f19495168d314 100644 (file)
@@ -20,7 +20,7 @@ class ForegroundBlocksRenderer @Inject constructor(
     mobController: MobController,
     containerController: ContainerController,
     getBlockDamageFrameCount: GetBlockDamageFrameCountUseCase,
-    getBlockDamageSprite: GetBlockDamageSpriteUseCase
+    getBlockDamageSprite: GetBlockDamageSpriteUseCase,
 ) : BlocksRenderer(gameWorld, mobController, containerController, getBlockDamageFrameCount, getBlockDamageSprite) {
 
     override val renderLayer get() = RENDER_LAYER
@@ -37,4 +37,4 @@ class ForegroundBlocksRenderer @Inject constructor(
     companion object {
         private const val RENDER_LAYER = 100400
     }
-}
\ No newline at end of file
+}
index f8c01faf23b0fd5d1a11a0c4a73f84effe51b419..e68e68603dc069030fc91eab9d7dc9340dcb03a8 100644 (file)
@@ -64,7 +64,7 @@ class HudRenderer @Inject constructor(
         val totalHearts = Player.MAX_HEALTH / 2
         val wholeHearts = player.health / 2
 
-        for (i in 0..< totalHearts) {
+        for (i in 0..<totalHearts) {
             if (i < wholeHearts) {
                 spriteBatch.draw(wholeHeart, x + i * wholeHeart.regionWidth, y)
             } else if (i == wholeHearts && player.health % 2 == 1) {
@@ -73,13 +73,9 @@ class HudRenderer @Inject constructor(
                 spriteBatch.draw(emptyHeart, x + i * wholeHeart.regionWidth, y)
             }
         }
-
-
-
-
     }
 
-    private fun drawHotbarItems(spriteBatch: SpriteBatch, shapeRenderer: ShapeRenderer,  hotbarX: Float) {
+    private fun drawHotbarItems(spriteBatch: SpriteBatch, shapeRenderer: ShapeRenderer, hotbarX: Float) {
         mobController.player.inventory.items.asSequence().take(HotbarConfig.hotbarCells)
             .forEachIndexed { index, item ->
                 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
+}
index 44ff693a3f1256401a5a424b9aaf621c88e43c97..1ea82102323cfade1b3e9d88a0a1b832cf487eaa 100644 (file)
@@ -15,6 +15,6 @@ interface IGameRenderer {
         spriteBatch: SpriteBatch,
         shapeRenderer: ShapeRenderer,
         viewport: Rectangle,
-        delta: Float
+        delta: Float,
     )
-}
\ No newline at end of file
+}
index cc700efb142a5ce1efd0df2cd55186ea90799131..bc38011259e37ef868ae57f5b926167acf673c72 100644 (file)
@@ -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
+}
index 09c64200e0ee4681ebf3c40c9ee8841b52f87755..00f02db2bbe4e6a790646829d48892187c6666c5 100644 (file)
@@ -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
+}
index e3f811241e9645367ed3abdb3e304679098eb487..b06c3347a67f4f768ea206a3aed43ce1282cb4e5 100644 (file)
@@ -45,4 +45,4 @@ class WindowsRenderer @Inject constructor(
 
         const val RENDER_LAYER = 100600
     }
-}
\ No newline at end of file
+}
index b7a706866f761605554810041bddd90846c53b24..9d868e5339917a6d27433d0721b753f6674ca8e1 100644 (file)
@@ -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
index e9f44a37a4003a3eec972b50f0e1c658aca62af7..ce9492661db0c29f9486c3252a990711b533109d 100644 (file)
@@ -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
+}
index 2b227ab992915eda5cbfc146d47854e598bff6d0..61e5522e5b9bbd6e27b007387823c4b435dbc332 100644 (file)
@@ -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
+}
index 8250c3df9d2d713135decde3207a4afb193b94b9..0ebe4c834e03981065d55b7ad07b595c2fdefce2 100644 (file)
@@ -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
+}
index 66697172a5e417a6e87e5ab83aeb4e8faa13628a..1c93d4b006a091b545d3e0642aba0506f249bec9 100644 (file)
@@ -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
+}
index 9fb992523bbab024bc0925c1f076817331e99923..6b25db3c9d100201edd34374b7cb9bafb08aa376 100644 (file)
@@ -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
+}
index 8595fb507ce36ece9f99804ae9b2060b169ebf23..53a4a915be239d2584b268500b706eb86f44a0f4 100644 (file)
@@ -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
+}
index 0ba8bfbb84d1b2ed49bc08ba9c7aab90346cd07a..9f785993e060851ce898d57395b8652d0451f958 100644 (file)
@@ -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
+}
index df76db7bfe18f33456328bc14b6ef4ddc4d2e3ad..d1c21a3f8028b86b2d58112fb00bc8ca00e27ec5 100644 (file)
@@ -15,4 +15,4 @@ abstract class BaseScreen(
     companion object {
         private const val SCALE = .5f
     }
-}
\ No newline at end of file
+}
index 134d39aef72923673e8a6e71a3afdedc7c36dc8f..9ad5d5b048bda4caa2bc55842058e8c72b1cab25 100644 (file)
@@ -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
+}
index 4e3d85cd3e232481601a1a2225fc67196ad2ef2d..ff091cafe1b15ceb984e5cb4404acb32327c90b7 100644 (file)
@@ -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
+}
index b1f48de6b4310c2e23dc109fd67391106db0bc2d..e57388cd0b5e747d243319ffbd1293f6c8912629 100644 (file)
@@ -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
+}
index 77440850c9cf0fd9f1778d70fca55e7a885f505f..33b7374c712db6b9fa3934deaeac812bbee2ca93 100644 (file)
@@ -119,4 +119,4 @@ object GameModule {
             initialBackMap = mapData?.retrieveBackMap(),
         )
     }
-}
\ No newline at end of file
+}
index 85481adeaea0128e29deecb33de483d902ba98ae..a181f541e25da6893f000efe79a12e8c89d93319 100644 (file)
@@ -64,4 +64,4 @@ class MenuScreen @Inject constructor(
         menuRenderer.dispose()
         menuButtonRepository.dispose()
     }
-}
\ No newline at end of file
+}
index 6a5bb9d461c0be8027617db23a228fde89d223d7..f20dbb23d6fd772dae8a6756f98be8c21fe26706 100644 (file)
@@ -18,4 +18,4 @@ class ExitGameAction @Inject constructor(
     companion object {
         const val KEY = "exit_game_action"
     }
-}
\ No newline at end of file
+}
index da754fb8e85c497b21a7a9579ff7330df8857aac..6f5d92e73f2a37a78fd494f6fef6f878f200e3ad 100644 (file)
@@ -5,5 +5,4 @@ interface IMenuAction {
     fun perform()
 
     fun canPerform(): Boolean = true
-
-}
\ No newline at end of file
+}
index 927771464b45743421d9cab2333a7a410982ba1e..38b727d7da9171bb5a9293ff08bbb5298ad2b45f 100644 (file)
@@ -26,4 +26,4 @@ class LoadGameAction @Inject constructor(
     companion object {
         const val KEY = "load_game_action"
     }
-}
\ No newline at end of file
+}
index 9cbbfc99e1a3b395b4d6f8a768cd0217e4e945a3..01f8e2e116a0ff08d840d3388487b99759bfc7bb 100644 (file)
@@ -18,4 +18,4 @@ class NewGameCreativeAction @Inject constructor(
     companion object {
         const val KEY = "new_game_creative_action"
     }
-}
\ No newline at end of file
+}
index 15fdd905eb4a0d46c3f9c8af64651a4f4ad64b2d..079077ea78a841ff279f6fb60a2aa1299e6407f4 100644 (file)
@@ -18,4 +18,4 @@ class NewGameSurvivalAction @Inject constructor(
     companion object {
         const val KEY = "new_game_survival_action"
     }
-}
\ No newline at end of file
+}
index 3fc2eaf128eae80b97d01b691a126249f064ff66..db42b0ccf51549f20b097f225a025fde2620547f 100644 (file)
@@ -18,4 +18,4 @@ class OpenMainMenuAction @Inject constructor(
     companion object {
         const val KEY = "menu_main_action"
     }
-}
\ No newline at end of file
+}
index 7aaafe44a8275b7fbb7050610b2871480d5ee0a1..cc0724f238ba759112062bf55cdae761634bee96 100644 (file)
@@ -18,4 +18,4 @@ class OpenNewGameMenuAction @Inject constructor(
     companion object {
         const val KEY = "new_game_action"
     }
-}
\ No newline at end of file
+}
index 9cb049067915ac6807a6dc7f91a174f24ce9ad14..2247f4bc410876e1e4a32eacc93b4b4e1709f2e8 100644 (file)
@@ -18,4 +18,4 @@ class OpenOptionsMenuAction @Inject constructor(
     companion object {
         const val KEY = "options_action"
     }
-}
\ No newline at end of file
+}
index 81c87eb67139b1077b0bf6be3a516dd80486ff69..22ae838fb9242dcbbb04a1d81666fb050e69ddcd 100644 (file)
@@ -17,7 +17,7 @@ import ru.fredboy.cavedroid.zygote.menu.renderer.MenuRenderer
         DataMenuModule::class,
         MenuBooleanOptionsModule::class,
         MenuActionsModule::class,
-    ]
+    ],
 )
 interface MenuComponent {
 
index b6b56f0c37557ac1c5b597b94a238c9f06842d15..12ba87fc0bf498f434c84ce6152f525bfd72fa0f 100644 (file)
@@ -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
+}
index a2d588570a040024c148c41658d76c83cc8a7b49..f135794350c5f20f18cb870267aa146f3555356f 100644 (file)
@@ -22,4 +22,4 @@ class DynamicCameraMenuBooleanOption @Inject constructor(
     companion object {
         const val KEY = "dyncam"
     }
-}
\ No newline at end of file
+}
index 9865da66614ae7070836d35fa681ad6650a4a667..fed064a52c8efffb27eb9a891af3744a89df7b6e 100644 (file)
@@ -22,4 +22,4 @@ class FullscreenMenuBooleanOption @Inject constructor(
     companion object {
         const val KEY = "fullscreen"
     }
-}
\ No newline at end of file
+}
index ba6e30a34a3cdec412d4a552da33e05230216788..f9f72ebae618be0f778055069777f473842857d9 100644 (file)
@@ -5,5 +5,4 @@ interface IMenuBooleanOption {
     fun getOption(): Boolean
 
     fun toggleOption()
-
-}
\ No newline at end of file
+}
index 5921de7828125b92b1d58129fa5bf504ca7730a0..483a7c17456c45f72fcb95cf9155232aa42451df 100644 (file)
@@ -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
+}
index 6412b14423cc43e3be6ba2ca5c6b23f5187869c7..f19991f85c5ffaf11b4e6c9ba56b0d0903218dd8 100644 (file)
@@ -30,11 +30,15 @@ tasks.register<Jar>("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())
 }
 
index 55eeb343b3f8a9346728a274422fba5981afc8d4..3d180427e6f178b98fdf803ed284f796ed1b4b2d 100644 (file)
@@ -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
+}
index 951330b05afe2a66cc906126056d33d4e80d926c..bfa75343e184c2c62ec04d9e1986920646b1dd78 100644 (file)
@@ -14,5 +14,4 @@ class DesktopPreferencesStore : PreferencesStore {
     override fun setPreference(key: String, value: String?) {
         prefs.put(key, value)
     }
-
-}
\ No newline at end of file
+}