Fix furnace bugs

[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / game / model / item / InventoryItem.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/model/item/InventoryItem.kt b/core/src/ru/deadsoftware/cavedroid/game/model/item/InventoryItem.kt
index 5121ab3f9f778575af8131c553cbe07f035bdefc..acc0d2931efd026c4cfa3dcb9cba8b6e77322ded 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/model/item/InventoryItem.kt
+++ b/core/src/ru/deadsoftware/cavedroid/game/model/item/InventoryItem.kt
@@ -4,6 +4,7 @@ import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer
 import ru.deadsoftware.cavedroid.game.GameItemsHolder
+import ru.deadsoftware.cavedroid.game.mobs.player.Inventory
 import ru.deadsoftware.cavedroid.misc.Assets
 import ru.deadsoftware.cavedroid.misc.utils.drawSprite
 import ru.deadsoftware.cavedroid.misc.utils.drawString
@@ -12,9 +13,18 @@ import java.io.Serializable
 
 class InventoryItem @JvmOverloads constructor(
     val itemKey: String,
-    var amount: Int = 1,
+    _amount: Int = 1,
 ) : Serializable {
 
+    var amount = _amount
+        set(value) {
+            field = if (value < 0) {
+                0
+            } else {
+                value
+            }
+        }
+
     @Transient
     lateinit var item: Item
         private set
@@ -33,11 +43,19 @@ class InventoryItem @JvmOverloads constructor(
 
     @JvmOverloads
     fun add(count: Int = 1) {
+        if (count > 0 && Int.MAX_VALUE - count < amount) {
+            throw IllegalArgumentException("$amount + $count exceeds Int.MAX_VALUE")
+        }
+
         amount += count
     }
 
     @JvmOverloads
     fun subtract(count: Int = 1) {
+        if (count < 0) {
+            throw IllegalArgumentException("Can't subtract negative amount")
+        }
+
         add(-count)
     }
 
@@ -102,4 +120,7 @@ class InventoryItem @JvmOverloads constructor(
         }
     }
 
+    companion object {
+        fun InventoryItem?.isNoneOrNull() = this?.item == null || this.item.isNone()
+    }
 }