X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fui%2Fwindows%2FGameWindowsManager.kt;h=1b6611af1e06601615ebc4d6802801c6491cee86;hb=9606fce8cc7c9b264abd7cb38583faaebb610540;hp=56d92d6f8a8de8f7dd381f7971eba99d08565a0c;hpb=13157246344c2b94d24354040f0f2d2fb5beb7ea;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/game/ui/windows/GameWindowsManager.kt b/core/src/ru/deadsoftware/cavedroid/game/ui/windows/GameWindowsManager.kt index 56d92d6..1b6611a 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/ui/windows/GameWindowsManager.kt +++ b/core/src/ru/deadsoftware/cavedroid/game/ui/windows/GameWindowsManager.kt @@ -3,12 +3,10 @@ package ru.deadsoftware.cavedroid.game.ui.windows import ru.deadsoftware.cavedroid.game.GameScope import ru.deadsoftware.cavedroid.game.GameUiWindow import ru.deadsoftware.cavedroid.game.mobs.MobsController -import ru.deadsoftware.cavedroid.game.objects.DropController +import ru.deadsoftware.cavedroid.game.objects.drop.DropController +import ru.deadsoftware.cavedroid.game.objects.furnace.Furnace import ru.deadsoftware.cavedroid.game.ui.TooltipManager -import ru.deadsoftware.cavedroid.game.ui.windows.inventory.AbstractInventoryWindow -import ru.deadsoftware.cavedroid.game.ui.windows.inventory.CraftingInventoryWindow -import ru.deadsoftware.cavedroid.game.ui.windows.inventory.CreativeInventoryWindow -import ru.deadsoftware.cavedroid.game.ui.windows.inventory.SurvivalInventoryWindow +import ru.deadsoftware.cavedroid.game.ui.windows.inventory.* import javax.inject.Inject @GameScope @@ -30,14 +28,18 @@ class GameWindowsManager @Inject constructor( fun openInventory() { if (mobsController.player.gameMode == 1) { - currentWindow = CreativeInventoryWindow(GameUiWindow.CREATIVE_INVENTORY) + currentWindow = CreativeInventoryWindow() } else { - currentWindow = SurvivalInventoryWindow(GameUiWindow.SURVIVAL_INVENTORY) + currentWindow = SurvivalInventoryWindow() } } + fun openFurnace(furnace: Furnace) { + currentWindow = FurnaceInventoryWindow(furnace) + } + fun openCrafting() { - currentWindow = CraftingInventoryWindow(GameUiWindow.CRAFTING_TABLE) + currentWindow = CraftingInventoryWindow() } fun closeWindow() {