diff --git a/cooperative_cuisine/counter_factory.py b/cooperative_cuisine/counter_factory.py index cf42623877d105f516e9d8ec2f8b3699f128ef05..592def76bf602af71e453b3e4e6543858c04642f 100644 --- a/cooperative_cuisine/counter_factory.py +++ b/cooperative_cuisine/counter_factory.py @@ -52,14 +52,14 @@ from cooperative_cuisine.counters import ( Trashcan, ) from cooperative_cuisine.effects import EffectManager -from cooperative_cuisine.game_items import ( +from cooperative_cuisine.hooks import Hooks +from cooperative_cuisine.items import ( ItemInfo, ItemType, CookingEquipment, Plate, Item, ) -from cooperative_cuisine.hooks import Hooks from cooperative_cuisine.orders import OrderManager from cooperative_cuisine.utils import get_closest diff --git a/cooperative_cuisine/counters.py b/cooperative_cuisine/counters.py index c72c9aead5b169ed21fc2d8fd0bceda211024f52..04ee69c6825214f50081f9b7993d94c80cab99fa 100644 --- a/cooperative_cuisine/counters.py +++ b/cooperative_cuisine/counters.py @@ -72,7 +72,7 @@ if TYPE_CHECKING: import numpy as np import numpy.typing as npt -from cooperative_cuisine.game_items import ( +from cooperative_cuisine.items import ( Item, CookingEquipment, Plate, diff --git a/cooperative_cuisine/effects.py b/cooperative_cuisine/effects.py index ceef2794692a80989d6bdb0eee6c53107223805c..0e5d3ec63a257022f5edaedb7d9046f6802ac015 100644 --- a/cooperative_cuisine/effects.py +++ b/cooperative_cuisine/effects.py @@ -12,14 +12,14 @@ from datetime import timedelta, datetime from random import Random from typing import TYPE_CHECKING, Tuple -from cooperative_cuisine.game_items import ( +from cooperative_cuisine.hooks import Hooks, NEW_FIRE, FIRE_SPREADING +from cooperative_cuisine.items import ( ItemInfo, Item, ItemType, CookingEquipment, Effect, ) -from cooperative_cuisine.hooks import Hooks, NEW_FIRE, FIRE_SPREADING from cooperative_cuisine.utils import get_touching_counters, find_item_on_counters if TYPE_CHECKING: diff --git a/cooperative_cuisine/environment.py b/cooperative_cuisine/environment.py index e5d1c89d40241aec5e061628dac0b25640b445fd..c94d68c007a0b1e021a174a4e4a2fb524a473471 100644 --- a/cooperative_cuisine/environment.py +++ b/cooperative_cuisine/environment.py @@ -22,10 +22,6 @@ from cooperative_cuisine.counters import ( PlateConfig, ) from cooperative_cuisine.effects import EffectManager -from cooperative_cuisine.game_items import ( - ItemInfo, - ItemType, -) from cooperative_cuisine.hooks import ( ITEM_INFO_LOADED, LAYOUT_FILE_PARSED, @@ -46,6 +42,10 @@ from cooperative_cuisine.hooks import ( ITEM_INFO_CONFIG, POST_STEP, ) +from cooperative_cuisine.items import ( + ItemInfo, + ItemType, +) from cooperative_cuisine.movement import Movement from cooperative_cuisine.orders import ( OrderManager, diff --git a/cooperative_cuisine/game_items.py b/cooperative_cuisine/items.py similarity index 100% rename from cooperative_cuisine/game_items.py rename to cooperative_cuisine/items.py diff --git a/cooperative_cuisine/orders.py b/cooperative_cuisine/orders.py index e1e082e15536bcb3996b2469f1e3e82c222e0b09..000493e43dd6851981fe4d9db639cc2f102f9944 100644 --- a/cooperative_cuisine/orders.py +++ b/cooperative_cuisine/orders.py @@ -44,7 +44,6 @@ from datetime import datetime, timedelta from random import Random from typing import Callable, Tuple, Any, Deque, TypedDict, Type -from cooperative_cuisine.game_items import Item, Plate, ItemInfo from cooperative_cuisine.hooks import ( Hooks, SERVE_NOT_ORDERED_MEAL, @@ -55,6 +54,7 @@ from cooperative_cuisine.hooks import ( ORDER_DURATION_SAMPLE, ORDER_EXPIRED, ) +from cooperative_cuisine.items import Item, Plate, ItemInfo log = logging.getLogger(__name__) """The logger for this module.""" diff --git a/cooperative_cuisine/player.py b/cooperative_cuisine/player.py index 82ed1ede3ee513f765d4cc79ca38da8f129dcca6..f4e69c3aa66310f893b854944566a9826bf070f0 100644 --- a/cooperative_cuisine/player.py +++ b/cooperative_cuisine/player.py @@ -16,7 +16,7 @@ import numpy as np import numpy.typing as npt from cooperative_cuisine.counters import Counter -from cooperative_cuisine.game_items import Item, ItemType +from cooperative_cuisine.items import Item, ItemType from cooperative_cuisine.state_representation import PlayerState log = logging.getLogger(__name__) diff --git a/cooperative_cuisine/recipes.py b/cooperative_cuisine/recipes.py index 91b3947cd00ea541c7cc91c2586f33a69c14a91a..dbd5d1c33bdb5db5b88a5d72b362a712e5a7dfef 100644 --- a/cooperative_cuisine/recipes.py +++ b/cooperative_cuisine/recipes.py @@ -6,7 +6,7 @@ import networkx as nx from networkx import DiGraph from cooperative_cuisine import ROOT_DIR -from cooperative_cuisine.game_items import ItemInfo +from cooperative_cuisine.items import ItemInfo class MealGraphDict(TypedDict): diff --git a/cooperative_cuisine/reinforcement_learning/gym_env.py b/cooperative_cuisine/reinforcement_learning/gym_env.py index 6b138cd9c9a9c8b9f44ba327bfde3ec669b21c53..465701fe70ee1771f07e1fe1636744cef7864e0e 100644 --- a/cooperative_cuisine/reinforcement_learning/gym_env.py +++ b/cooperative_cuisine/reinforcement_learning/gym_env.py @@ -26,7 +26,7 @@ from cooperative_cuisine.counters import Counter, CookingCounter, Dispenser from cooperative_cuisine.environment import ( Environment, ) -from cooperative_cuisine.game_items import CookingEquipment +from cooperative_cuisine.items import CookingEquipment from cooperative_cuisine.pygame_2d_vis.drawing import Visualizer diff --git a/tests/test_cooking_equipment.py b/tests/test_cooking_equipment.py index 5bc9fa3bb4dc16a8464d7a2284d2cdbd9b0a67a5..03f936f1a1625b318e46905668009ed8fce659db 100644 --- a/tests/test_cooking_equipment.py +++ b/tests/test_cooking_equipment.py @@ -1,6 +1,6 @@ import pytest -from cooperative_cuisine.game_items import ItemInfo, CookingEquipment, Item, ItemType +from cooperative_cuisine.items import ItemInfo, CookingEquipment, Item, ItemType def test_can_combine_single_other_item(): diff --git a/tests/test_counter.py b/tests/test_counter.py index b0fb93a9bdd3f63d4d98f0377da8e9060fe3c88d..d6860acb3e00eb02a6cfc8703bf3bb9fd8e10f7b 100644 --- a/tests/test_counter.py +++ b/tests/test_counter.py @@ -1,8 +1,8 @@ import numpy as np from cooperative_cuisine.counters import ServingWindow, Dispenser -from cooperative_cuisine.game_items import Item, Plate, ItemInfo, ItemType from cooperative_cuisine.hooks import Hooks +from cooperative_cuisine.items import Item, Plate, ItemInfo, ItemType from cooperative_cuisine.utils import create_init_env_time diff --git a/tests/test_item.py b/tests/test_item.py index 9b3cdb64deb08be2331a1570198dd14c6577b372..5a72924d2c05898adc18be0dc6585435f04471bf 100644 --- a/tests/test_item.py +++ b/tests/test_item.py @@ -1,6 +1,6 @@ import pytest -from cooperative_cuisine.game_items import ItemInfo, Item, ItemType +from cooperative_cuisine.items import ItemInfo, Item, ItemType @pytest.fixture diff --git a/tests/test_start.py b/tests/test_start.py index d52e19db1151b900899f511bc1e17fc561ad7e14..b3dce650ce0b2b16cbfd978f26f5b5ebe123b45c 100644 --- a/tests/test_start.py +++ b/tests/test_start.py @@ -9,9 +9,9 @@ from cooperative_cuisine.counters import Counter, CuttingBoard from cooperative_cuisine.environment import ( Environment, ) -from cooperative_cuisine.game_items import Item, ItemInfo, ItemType from cooperative_cuisine.game_server import PlayerRequestType from cooperative_cuisine.hooks import Hooks +from cooperative_cuisine.items import Item, ItemInfo, ItemType from cooperative_cuisine.server_results import ( PlayerInfo, CreateEnvResult,