Skip to content
Snippets Groups Projects
Commit e65743a5 authored by Florian Schröder's avatar Florian Schröder
Browse files

Rename module 'game_items' to 'items'

The module 'game_items' was renamed to 'items'. Every reference to this module across different source code files was consequently updated to reflect this change.
parent 4d93be01
No related branches found
No related tags found
1 merge request!71Resolve "Refactoring Environment class + file"
Pipeline #47540 passed
...@@ -52,14 +52,14 @@ from cooperative_cuisine.counters import ( ...@@ -52,14 +52,14 @@ from cooperative_cuisine.counters import (
Trashcan, Trashcan,
) )
from cooperative_cuisine.effects import EffectManager from cooperative_cuisine.effects import EffectManager
from cooperative_cuisine.game_items import ( from cooperative_cuisine.hooks import Hooks
from cooperative_cuisine.items import (
ItemInfo, ItemInfo,
ItemType, ItemType,
CookingEquipment, CookingEquipment,
Plate, Plate,
Item, Item,
) )
from cooperative_cuisine.hooks import Hooks
from cooperative_cuisine.orders import OrderManager from cooperative_cuisine.orders import OrderManager
from cooperative_cuisine.utils import get_closest from cooperative_cuisine.utils import get_closest
......
...@@ -72,7 +72,7 @@ if TYPE_CHECKING: ...@@ -72,7 +72,7 @@ if TYPE_CHECKING:
import numpy as np import numpy as np
import numpy.typing as npt import numpy.typing as npt
from cooperative_cuisine.game_items import ( from cooperative_cuisine.items import (
Item, Item,
CookingEquipment, CookingEquipment,
Plate, Plate,
......
...@@ -12,14 +12,14 @@ from datetime import timedelta, datetime ...@@ -12,14 +12,14 @@ from datetime import timedelta, datetime
from random import Random from random import Random
from typing import TYPE_CHECKING, Tuple 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, ItemInfo,
Item, Item,
ItemType, ItemType,
CookingEquipment, CookingEquipment,
Effect, Effect,
) )
from cooperative_cuisine.hooks import Hooks, NEW_FIRE, FIRE_SPREADING
from cooperative_cuisine.utils import get_touching_counters, find_item_on_counters from cooperative_cuisine.utils import get_touching_counters, find_item_on_counters
if TYPE_CHECKING: if TYPE_CHECKING:
......
...@@ -22,10 +22,6 @@ from cooperative_cuisine.counters import ( ...@@ -22,10 +22,6 @@ from cooperative_cuisine.counters import (
PlateConfig, PlateConfig,
) )
from cooperative_cuisine.effects import EffectManager from cooperative_cuisine.effects import EffectManager
from cooperative_cuisine.game_items import (
ItemInfo,
ItemType,
)
from cooperative_cuisine.hooks import ( from cooperative_cuisine.hooks import (
ITEM_INFO_LOADED, ITEM_INFO_LOADED,
LAYOUT_FILE_PARSED, LAYOUT_FILE_PARSED,
...@@ -46,6 +42,10 @@ from cooperative_cuisine.hooks import ( ...@@ -46,6 +42,10 @@ from cooperative_cuisine.hooks import (
ITEM_INFO_CONFIG, ITEM_INFO_CONFIG,
POST_STEP, POST_STEP,
) )
from cooperative_cuisine.items import (
ItemInfo,
ItemType,
)
from cooperative_cuisine.movement import Movement from cooperative_cuisine.movement import Movement
from cooperative_cuisine.orders import ( from cooperative_cuisine.orders import (
OrderManager, OrderManager,
......
File moved
...@@ -44,7 +44,6 @@ from datetime import datetime, timedelta ...@@ -44,7 +44,6 @@ from datetime import datetime, timedelta
from random import Random from random import Random
from typing import Callable, Tuple, Any, Deque, TypedDict, Type from typing import Callable, Tuple, Any, Deque, TypedDict, Type
from cooperative_cuisine.game_items import Item, Plate, ItemInfo
from cooperative_cuisine.hooks import ( from cooperative_cuisine.hooks import (
Hooks, Hooks,
SERVE_NOT_ORDERED_MEAL, SERVE_NOT_ORDERED_MEAL,
...@@ -55,6 +54,7 @@ from cooperative_cuisine.hooks import ( ...@@ -55,6 +54,7 @@ from cooperative_cuisine.hooks import (
ORDER_DURATION_SAMPLE, ORDER_DURATION_SAMPLE,
ORDER_EXPIRED, ORDER_EXPIRED,
) )
from cooperative_cuisine.items import Item, Plate, ItemInfo
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
"""The logger for this module.""" """The logger for this module."""
......
...@@ -16,7 +16,7 @@ import numpy as np ...@@ -16,7 +16,7 @@ import numpy as np
import numpy.typing as npt import numpy.typing as npt
from cooperative_cuisine.counters import Counter 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 from cooperative_cuisine.state_representation import PlayerState
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
......
...@@ -6,7 +6,7 @@ import networkx as nx ...@@ -6,7 +6,7 @@ import networkx as nx
from networkx import DiGraph from networkx import DiGraph
from cooperative_cuisine import ROOT_DIR from cooperative_cuisine import ROOT_DIR
from cooperative_cuisine.game_items import ItemInfo from cooperative_cuisine.items import ItemInfo
class MealGraphDict(TypedDict): class MealGraphDict(TypedDict):
......
...@@ -26,7 +26,7 @@ from cooperative_cuisine.counters import Counter, CookingCounter, Dispenser ...@@ -26,7 +26,7 @@ from cooperative_cuisine.counters import Counter, CookingCounter, Dispenser
from cooperative_cuisine.environment import ( from cooperative_cuisine.environment import (
Environment, Environment,
) )
from cooperative_cuisine.game_items import CookingEquipment from cooperative_cuisine.items import CookingEquipment
from cooperative_cuisine.pygame_2d_vis.drawing import Visualizer from cooperative_cuisine.pygame_2d_vis.drawing import Visualizer
......
import pytest 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(): def test_can_combine_single_other_item():
......
import numpy as np import numpy as np
from cooperative_cuisine.counters import ServingWindow, Dispenser 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.hooks import Hooks
from cooperative_cuisine.items import Item, Plate, ItemInfo, ItemType
from cooperative_cuisine.utils import create_init_env_time from cooperative_cuisine.utils import create_init_env_time
......
import pytest import pytest
from cooperative_cuisine.game_items import ItemInfo, Item, ItemType from cooperative_cuisine.items import ItemInfo, Item, ItemType
@pytest.fixture @pytest.fixture
......
...@@ -9,9 +9,9 @@ from cooperative_cuisine.counters import Counter, CuttingBoard ...@@ -9,9 +9,9 @@ from cooperative_cuisine.counters import Counter, CuttingBoard
from cooperative_cuisine.environment import ( from cooperative_cuisine.environment import (
Environment, Environment,
) )
from cooperative_cuisine.game_items import Item, ItemInfo, ItemType
from cooperative_cuisine.game_server import PlayerRequestType from cooperative_cuisine.game_server import PlayerRequestType
from cooperative_cuisine.hooks import Hooks from cooperative_cuisine.hooks import Hooks
from cooperative_cuisine.items import Item, ItemInfo, ItemType
from cooperative_cuisine.server_results import ( from cooperative_cuisine.server_results import (
PlayerInfo, PlayerInfo,
CreateEnvResult, CreateEnvResult,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment