X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=inline;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmodel%2Fmapper%2FBlockMapper.kt;h=eb3080fd876233630c269753582beacca3ce9df6;hb=121928e90bdfa3a9d9c8bd708b9f8da28d3807c0;hp=363801c013f02d96b3619b37b230dd37272ec223;hpb=c1fdecd8692e21b59a720eca1a3617cb5eb7c07f;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/model/mapper/BlockMapper.kt b/core/src/ru/deadsoftware/cavedroid/game/model/mapper/BlockMapper.kt
index 363801c..eb3080f 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/model/mapper/BlockMapper.kt
+++ b/core/src/ru/deadsoftware/cavedroid/game/model/mapper/BlockMapper.kt
@@ -6,13 +6,11 @@ import ru.deadsoftware.cavedroid.game.GameItemsHolder
 import ru.deadsoftware.cavedroid.game.model.block.*
 import ru.deadsoftware.cavedroid.game.model.block.Block.*
 import ru.deadsoftware.cavedroid.game.model.dto.BlockDto
-import ru.deadsoftware.cavedroid.misc.utils.AssetLoader
+import ru.deadsoftware.cavedroid.misc.Assets
 import javax.inject.Inject
 
 @Reusable
-class BlockMapper @Inject constructor(
-    private val assetLoader: AssetLoader,
-) {
+class BlockMapper @Inject constructor() {
 
     fun map(key: String, dto: BlockDto): Block {
         val commonBlockParams = mapCommonParams(key, dto)
@@ -81,7 +79,7 @@ class BlockMapper @Inject constructor(
             return null
         }
 
-        return Texture(assetLoader.getAssetHandle("textures/blocks/$textureName.png"))
+        return Assets.blockTextures[textureName]
     }
 
 }
\ No newline at end of file