DEADSOFTWARE

Add food
[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / game / input / handler / mouse / AbstractInventoryItemsMouseInputHandler.kt
index 4aaff27a031da16592f673cf116928d374253629..3b925b09b58f53bcb5b7de2865f3e37b4a87f3fb 100644 (file)
@@ -3,13 +3,12 @@ package ru.deadsoftware.cavedroid.game.input.handler.mouse
 import com.badlogic.gdx.graphics.g2d.TextureRegion
 import ru.deadsoftware.cavedroid.game.GameItemsHolder
 import ru.deadsoftware.cavedroid.game.GameUiWindow
-import ru.deadsoftware.cavedroid.game.input.IGameInputHandler
+import ru.deadsoftware.cavedroid.game.input.IMouseInputHandler
 import ru.deadsoftware.cavedroid.game.input.action.MouseInputAction
 import ru.deadsoftware.cavedroid.game.input.action.keys.MouseInputActionKey
 import ru.deadsoftware.cavedroid.game.input.isInsideWindow
 import ru.deadsoftware.cavedroid.game.model.item.InventoryItem
 import ru.deadsoftware.cavedroid.game.model.item.InventoryItem.Companion.isNoneOrNull
-import ru.deadsoftware.cavedroid.game.objects.container.Furnace
 import ru.deadsoftware.cavedroid.game.ui.windows.GameWindowsManager
 import ru.deadsoftware.cavedroid.game.ui.windows.inventory.AbstractInventoryWindow
 import ru.deadsoftware.cavedroid.game.ui.windows.inventory.AbstractInventoryWindowWithCraftGrid
@@ -18,7 +17,7 @@ abstract class AbstractInventoryItemsMouseInputHandler(
     private val gameItemsHolder: GameItemsHolder,
     private val gameWindowsManager: GameWindowsManager,
     private val windowType: GameUiWindow,
-) : IGameInputHandler<MouseInputAction> {
+) : IMouseInputHandler {
 
     protected abstract val windowTexture: TextureRegion
 
@@ -59,13 +58,13 @@ abstract class AbstractInventoryItemsMouseInputHandler(
                 if (action.actionKey.pointer == window.selectItemPointer) {
                     window.onLeftCLick(items, gameItemsHolder, index, action.actionKey.pointer)
                 } else {
-                    window.onRightClick(items, index)
+                    window.onRightClick(items, gameItemsHolder, index)
                 }
             }
         } else if (action.actionKey is MouseInputActionKey.Left) {
             window.onLeftCLick(items, gameItemsHolder, index)
         } else {
-            window.onRightClick(items, index)
+            window.onRightClick(items, gameItemsHolder, index)
         }
     }
 
@@ -88,7 +87,7 @@ abstract class AbstractInventoryItemsMouseInputHandler(
         } else {
             if (action.actionKey is MouseInputActionKey.Screen) {
                 if (!action.actionKey.touchUp) {
-                    window.onLeftCLick(items, gameItemsHolder, Furnace.RESULT_INDEX, action.actionKey.pointer)
+                    window.onLeftCLick(items, gameItemsHolder, index, action.actionKey.pointer)
                 }
             } else if (action.actionKey is MouseInputActionKey.Left) {
                 window.onLeftCLick(items, gameItemsHolder, index)