feat: add HasTypeIDWithAmount interface

src/Contracts/HasTypeIDWithAmount.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Seat\Services\Contracts;
+
+/**
+ * This interface is something between HasTypeID and IPriceable for things that have an amount and type but no price, like an asset list.
+ * The goal is to improve cross-plugin item handling compatibility.
+ */
+interface HasTypeIDWithAmount extends HasTypeID
+{
+    /**
+     * @return int The amount of items
+     */
+    public function getAmount(): int;
+}

src/Contracts/IPriceable.php

@@ -27,13 +27,8 @@
  * This interface is in the services package to encourage making classes that describe items compatible across both the
  * seat core and plugin, even if they don't depend on recursivetree/seat-prices-core.
  */
-interface IPriceable extends HasTypeID
+interface IPriceable extends HasTypeID, HasTypeIDWithAmount
 {
-    /**
-     * @return int The amount of items to be appraised by a price provider
-     */
-    public function getAmount(): int;
-
     /**
      * Set the price of this object.
      *

src/Items/EveTypeWithAmount.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Seat\Services\Items;
+
+use Seat\Services\Contracts\HasTypeID;
+use Seat\Services\Contracts\HasTypeIDWithAmount;
+
+/**
+ * A simple implementation on HasTypeIDWithAmount
+ */
+class EveTypeWithAmount extends EveType implements HasTypeIDWithAmount
+{
+    private int $amount;
+
+    /**
+     * @param int|HasTypeID $type_id
+     * @param int $amount
+     */
+    public function __construct(int|HasTypeID $type_id, int $amount)
+    {
+        parent::__construct($type_id);
+        $this->amount = $amount;
+    }
+
+    /**
+     * @return int The amount of items
+     */
+    public function getAmount(): int
+    {
+        return $this->amount;
+    }
+}

src/Items/PriceableEveType.php

@@ -23,33 +23,24 @@
 namespace Seat\Services\Items;
 
 use Seat\Services\Contracts\HasTypeID;
+use Seat\Services\Contracts\HasTypeIDWithAmount;
 use Seat\Services\Contracts\IPriceable;
 
 /**
  * A basic implementation od IPriceable.
  */
-class PriceableEveType extends EveType implements IPriceable
+class PriceableEveType extends EveTypeWithAmount implements IPriceable
 {
     protected float $price;
-    protected float $amount;
 
     /**
      * @param  int|HasTypeID  $type_id  The eve type to be appraised
-     * @param  float  $amount  The amount of this type to be appraised
+     * @param  float|int  $amount  The amount of this type to be appraised
      */
-    public function __construct(int|HasTypeID $type_id, float $amount)
+    public function __construct(int|HasTypeID $type_id, float|int $amount)
     {
-        parent::__construct($type_id);
+        parent::__construct($type_id, (int) $amount);
         $this->price = 0;
-        $this->amount = $amount;
-    }
-
-    /**
-     * @return int The amount of this item to be appraised
-     */
-    public function getAmount(): int
-    {
-        return $this->amount;
     }
 
     /**