Add crafting

[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / game / windows / GameWindowsManager.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/windows/GameWindowsManager.kt b/core/src/ru/deadsoftware/cavedroid/game/windows/GameWindowsManager.kt
index 302562fb9b60d086b30bc79ca6b1baf22099ef12..b07f1fd5112ea2be09521f05808319a173286b71 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/windows/GameWindowsManager.kt
+++ b/core/src/ru/deadsoftware/cavedroid/game/windows/GameWindowsManager.kt
@@ -5,6 +5,10 @@ import ru.deadsoftware.cavedroid.game.GameScope
 import ru.deadsoftware.cavedroid.game.GameUiWindow
 import ru.deadsoftware.cavedroid.game.mobs.MobsController
 import ru.deadsoftware.cavedroid.game.model.item.InventoryItem
 import ru.deadsoftware.cavedroid.game.GameUiWindow
 import ru.deadsoftware.cavedroid.game.mobs.MobsController
 import ru.deadsoftware.cavedroid.game.model.item.InventoryItem

+import ru.deadsoftware.cavedroid.game.windows.inventory.AbstractInventoryWindow
+import ru.deadsoftware.cavedroid.game.windows.inventory.CraftingInventoryWindow
+import ru.deadsoftware.cavedroid.game.windows.inventory.CreativeInventoryWindow
+import ru.deadsoftware.cavedroid.game.windows.inventory.SurvivalInventoryWindow

 import javax.inject.Inject
 
 @GameScope
 import javax.inject.Inject
 
 @GameScope


@@ -15,22 +19,28 @@ class GameWindowsManager @Inject constructor(
 
     var creativeScrollAmount = 0
     var isDragging = false
 
     var creativeScrollAmount = 0
     var isDragging = false

-    var selectedItem: InventoryItem? = null

 
 

+    var currentWindow: AbstractInventoryWindow? = null
+
+    @JvmName("getCurrentWindowType")

     fun getCurrentWindow(): GameUiWindow {
     fun getCurrentWindow(): GameUiWindow {

-        return mainConfig.gameUiWindow
+        return currentWindow?.type ?: GameUiWindow.NONE

     }
 
     fun openInventory() {
         if (mobsController.player.gameMode == 1) {
     }
 
     fun openInventory() {
         if (mobsController.player.gameMode == 1) {

-            mainConfig.gameUiWindow = GameUiWindow.CREATIVE_INVENTORY
+            currentWindow = CreativeInventoryWindow(GameUiWindow.CREATIVE_INVENTORY)

         } else {
         } else {

-            mainConfig.gameUiWindow = GameUiWindow.SURVIVAL_INVENTORY
+            currentWindow = SurvivalInventoryWindow(GameUiWindow.SURVIVAL_INVENTORY)

         }
     }
 
         }
     }
 

+    fun openCrafting() {
+        currentWindow = CraftingInventoryWindow(GameUiWindow.CRAFTING_TABLE)
+    }
+

     fun closeWindow() {
     fun closeWindow() {

-        mainConfig.gameUiWindow = GameUiWindow.NONE
+        currentWindow = null

     }
 
 }
\ No newline at end of file
     }
 
 }
\ No newline at end of file