Add player tracking for effects and improve trashcan logic

Introduced effect-to-player mapping to track player actions on specific effects. Enhanced item-to-next-counter logic to handle cases where drop-off is rejected. Updated trashcan handling to avoid resetting empty equipment unnecessarily.

cooperative_cuisine/counters.py

@@ -782,9 +782,10 @@ class Trashcan(Counter):
         ):
             return item
         if isinstance(item, CookingEquipment):
-            self.hook(TRASHCAN_USAGE, counter=self, item=item, player=player)
-            item.reset_content()
-            item.reset()
+            if item.content_list:
+                self.hook(TRASHCAN_USAGE, counter=self, item=item, player=player)
+                item.reset_content()
+                item.reset()
             return item
         self.hook(TRASHCAN_USAGE, counter=self, item=item, player=player)
         return None
@@ -1004,9 +1005,17 @@ class Conveyer(Counter):
     def has_fixed_orientation(self) -> bool:
         return True
     
-    def item_to_next_counter(self, item_id, next_counter):
+    def item_to_next_counter(self, item_id, next_counter: Counter, player) -> bool:
         for i, item in enumerate(self.occupied_by):
             if item.uuid == item_id:
-                self.occupied_by.remove(item)
-                next_counter.occupied_by.appendleft(item)
-                return
+                if isinstance(next_counter, Conveyer):
+                    self.occupied_by.remove(item)
+                    next_counter.occupied_by.appendleft(item)
\ No newline at end of file
+                    return True
+                elif next_counter.can_drop_off(item):
+                    ret = next_counter.drop_off(item, player)
+                    if ret is None:
+                        self.occupied_by.remove(item)
+                        return True
+                    return False
+        return False
\ No newline at end of file

cooperative_cuisine/effects.py

@@ -256,7 +256,7 @@ class ConveyerManager(EffectManager):
         self.active_effects: list[Tuple[Effect, Item | Counter]] = []
         """A list of tuples representing the active effects and their target items or counters."""
         self.next_counter: dict[str, Counter] = {}
-        
+        self.effect_to_player = {}
         
 
     def set_counters(self, counters: list[Counter]):
@@ -280,13 +280,15 @@ class ConveyerManager(EffectManager):
             if effect.progres_percentage >= 1.0:
                 if target.uuid in self.next_counter:
                     next_counter = self.next_counter[target.uuid]
-                    delete_effects.append(i)
-                    target.item_to_next_counter(effect.uuid[:-1], next_counter)
-                    self.register_active_effect(
-                        Effect(name=self.effects[0].name, item_info=self.effects[0], uid=effect.uuid,
-                               progress_percentage=0.0), next_counter)
+                    on_new_counter = target.item_to_next_counter(effect.uuid[:-1], next_counter, self.effect_to_player.get(effect.uuid, "0") )
+                    if on_new_counter:
+                        delete_effects.append(i)
+                        self.register_active_effect(
+                            Effect(name=self.effects[0].name, item_info=self.effects[0], uid=effect.uuid,
+                                   progress_percentage=0.0), next_counter)
         for i in reversed(delete_effects):
-            self.active_effects.pop(i)
+            effect, target = self.active_effects.pop(i)
+            target.active_effects.remove(effect)
             
     def remove_active_effect_by_id(self, uid, player: str):
         for effect, target in self.active_effects:
@@ -296,6 +298,7 @@ class ConveyerManager(EffectManager):
                 break
     
     def drop_off_item(self, occupied_by: deque, item: Item, player: str, counter):
+        self.effect_to_player[item.uuid + "-"] = player
         self.register_active_effect(Effect(name=self.effects[0].name, item_info=self.effects[0], uid=item.uuid + "-", progress_percentage=0.5), counter)
         occupied_by.appendleft(item)
         return None