X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Frender%2Fwindows%2FCraftingWindowRenderer.kt;h=6772282b15b18968ef3d0d82a27d1f1f8fb3651e;hb=456e76ce31c05500ab7d9e78e2b02019143929a4;hp=3b08ed7b4fcd712bc60ac1e2fbedc6d0683b06d7;hpb=387ad284ceb79b07cba3726fa7350b7e83916815;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/game/render/windows/CraftingWindowRenderer.kt b/core/src/ru/deadsoftware/cavedroid/game/render/windows/CraftingWindowRenderer.kt index 3b08ed7..6772282 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/render/windows/CraftingWindowRenderer.kt +++ b/core/src/ru/deadsoftware/cavedroid/game/render/windows/CraftingWindowRenderer.kt @@ -10,9 +10,9 @@ import ru.deadsoftware.cavedroid.game.GameScope import ru.deadsoftware.cavedroid.game.mobs.MobsController import ru.deadsoftware.cavedroid.game.render.IGameRenderer import ru.deadsoftware.cavedroid.game.render.WindowsRenderer -import ru.deadsoftware.cavedroid.game.windows.GameWindowsConfigs -import ru.deadsoftware.cavedroid.game.windows.GameWindowsManager -import ru.deadsoftware.cavedroid.game.windows.inventory.CraftingInventoryWindow +import ru.deadsoftware.cavedroid.game.ui.windows.GameWindowsConfigs +import ru.deadsoftware.cavedroid.game.ui.windows.GameWindowsManager +import ru.deadsoftware.cavedroid.game.ui.windows.inventory.CraftingInventoryWindow import ru.deadsoftware.cavedroid.misc.Assets import javax.inject.Inject @@ -42,7 +42,7 @@ class CraftingWindowRenderer @Inject constructor( shapeRenderer = shapeRenderer, gridX = windowX + GameWindowsConfigs.Crafting.itemsGridMarginLeft, gridY = windowY + GameWindowsConfigs.Crafting.itemsGridMarginTop, - items = mobsController.player.inventory.asSequence() + items = mobsController.player.inventory.items.asSequence() .drop(GameWindowsConfigs.Crafting.hotbarCells) .take(GameWindowsConfigs.Crafting.itemsInCol * GameWindowsConfigs.Crafting.itemsInRow) .asIterable(), @@ -56,7 +56,7 @@ class CraftingWindowRenderer @Inject constructor( shapeRenderer = shapeRenderer, gridX = windowX + GameWindowsConfigs.Crafting.itemsGridMarginLeft, gridY = windowY + windowTexture.regionHeight - GameWindowsConfigs.Crafting.hotbarOffsetFromBottom, - items = mobsController.player.inventory.asSequence() + items = mobsController.player.inventory.items.asSequence() .take(GameWindowsConfigs.Crafting.hotbarCells) .asIterable(), itemsInRow = GameWindowsConfigs.Crafting.hotbarCells,